Record build options in the BuildInfo file via BUILD_DEFS. These can be

displayed using the -B option to pkg_info(1). Add USE_SOCKS to BUILD_DEFS
NetBSD · Aug 18, 1999 · d792103 · d792103
1 parent 9ddc439
commit d792103
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 5 deletions.
diff --git a/net/ircII/Makefile b/net/ircII/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 1999/07/15 06:26:27 mrg Exp $
+# $NetBSD: Makefile,v 1.20 1999/08/18 09:11:30 agc Exp $
 # FreeBSD Id: Makefile,v 1.14 1997/05/14 10:35:13 torstenb Exp
 #
 
@@ -16,6 +16,21 @@ CONFIGURE_ENV+=		${IRCII_CONFIGURE_ENV}
 
 PLIST_SRC=		${WRKDIR}/PLIST.tmp
 
+BUILD_DEFS+=		USE_SOCKS
+
+.include "../../mk/bsd.prefs.mk"
+
+# Include SOCKS firewall support
+.if defined(USE_SOCKS) && (${USE_SOCKS} == 4 || ${USE_SOCKS} == 5)
+CONFIGURE_ARGS+=	--with-socks${USE_SOCKS}=${PREFIX}
+.if ${USE_SOCKS} == 4
+DEPENDS+=               socks4-2.2:../../net/socks4
+.else
+DEPENDS+=               socks5-1.0.2:../../net/socks5
+.endif
+.endif
+
+
 pre-install:
 	@(if [ "X${MANZ}" != X"" ]; then \
 		GZSUFFIX=.gz; \
@@ -27,6 +42,7 @@ post-install:
 		${ECHO} Compressing help files; \
 		find ${PREFIX}/share/irc/help -type f -print | xargs ${GZIP_CMD}; \
 	fi
-	${LN} -fs ircII.1 ${PREFIX}/man/man1/irc.1
+	${RM} -f ${PREFIX}/man/man1/irc.1
+	${LN} -s ircII.1 ${PREFIX}/man/man1/irc.1
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/ncftp2/Makefile b/net/ncftp2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 1999/08/16 09:41:24 agc Exp $
+# $NetBSD: Makefile,v 1.18 1999/08/18 09:11:31 agc Exp $
 # FreeBSD Id: Makefile,v 1.39 1998/01/31 17:49:48 jseger Exp
 #
 
@@ -12,6 +12,8 @@ HOMEPAGE=		http://www.ncftp.com/ncftp/
 GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--disable-extra-dirs
 
+BUILD_DEFS+=		USE_SOCKS
+
 .include "../../mk/bsd.prefs.mk"
 
 .if ${OPSYS} == "NetBSD"

diff --git a/security/ssh/Makefile b/security/ssh/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.54 1999/08/18 08:45:20 agc Exp $
+# $NetBSD: Makefile,v 1.55 1999/08/18 09:11:31 agc Exp $
 # FreeBSD Id: Makefile,v 1.47 1997/11/10 22:04:42 dima Exp
 #
 
@@ -169,6 +169,6 @@ post-install:
 # targets precede inclusion of this.
 
 BUILD_DEFS+=		DONT_USE_IDEA SSH_CONF_DIR SSH_SUID USE_RSAREF2
-BUILD_DEFS+=		LIBWRAP_FWD M68060
+BUILD_DEFS+=		LIBWRAP_FWD M68060 USE_SOCKS
 
 .include "../../mk/bsd.pkg.mk"