diff options
-rw-r--r-- | net/tnftpd/Makefile | 23 | ||||
-rw-r--r-- | net/tnftpd/options.mk | 22 | ||||
-rw-r--r-- | news/suck/Makefile | 14 | ||||
-rw-r--r-- | news/suck/options.mk | 13 |
4 files changed, 39 insertions, 33 deletions
diff --git a/net/tnftpd/Makefile b/net/tnftpd/Makefile index 8a28bf4a85b..d105eb3d103 100644 --- a/net/tnftpd/Makefile +++ b/net/tnftpd/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2005/06/17 03:50:28 jlam Exp $ +# $NetBSD: Makefile,v 1.11 2005/12/02 17:03:54 wiz Exp $ # DISTNAME= tnftpd-20040810 @@ -21,26 +21,7 @@ CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR} CONF_FILES+= ${EXAMPLEDIR}/ftpd.conf ${PKG_SYSCONFDIR}/ftpd.conf CONF_FILES+= ${EXAMPLEDIR}/ftpusers ${PKG_SYSCONFDIR}/ftpusers -BUILD_DEFS+= USE_INET6 - -.include "../../mk/bsd.prefs.mk" - -# Include SOCKS firewall support -.if defined(USE_SOCKS) && (${USE_SOCKS} == "4" || ${USE_SOCKS} == "5") -. if ${USE_SOCKS} == "4" -DEPENDS+= socks4-2.2:../../net/socks4 -CONFIGURE_ARGS+= --with-socks4 -. else -DEPENDS+= socks5-1.0.2:../../net/socks5 -CONFIGURE_ARGS+= --with-socks5 -. endif -.endif - -.if defined(USE_INET6) && ${USE_INET6} == "YES" -CONFIGURE_ARGS+= --enable-ipv6 -.else -CONFIGURE_ARGS+= --disable-ipv6 -.endif +.include "options.mk" OPSYSVARS+= MAKE_ENV MAKE_ENV.SunOS+= CPPFLAGS="" diff --git a/net/tnftpd/options.mk b/net/tnftpd/options.mk new file mode 100644 index 00000000000..359be5b6737 --- /dev/null +++ b/net/tnftpd/options.mk @@ -0,0 +1,22 @@ +# $NetBSD: options.mk,v 1.1 2005/12/02 17:03:54 wiz Exp $ + +PKG_OPTIONS_VAR= PKG_OPTIONS.tnftpd +PKG_SUPPORTED_OPTIONS= inet6 +PKG_OPTIONS_OPTIONAL_GROUPS+= socks +PKG_OPTIONS_GROUP.socks= socks4 socks5 + +.include "../../mk/bsd.options.mk" + +.if !empty(PKG_OPTIONS:Msocks4) +CONFIGURE_ARGS+= --with-socks4 +.include "../../net/socks4/buildlink3.mk" +.elif !empty(PKG_OPTIONS:Msocks5) +CONFIGURE_ARGS+= --with-socks5 +.include "../../net/socks5/buildlink3.mk" +.endif + +.if !empty(PKG_OPTIONS:Minet6) +CONFIGURE_ARGS+= --enable-ipv6 +.else +CONFIGURE_ARGS+= --disable-ipv6 +.endif diff --git a/news/suck/Makefile b/news/suck/Makefile index 4b93d83d662..c55e4fb67fc 100644 --- a/news/suck/Makefile +++ b/news/suck/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.21 2005/10/15 21:23:00 tonio Exp $ +# $NetBSD: Makefile,v 1.22 2005/12/02 17:04:35 wiz Exp $ # DISTNAME= suck-4.3.2 @@ -14,16 +14,7 @@ COMMENT= Feed a local news server without a dedicated newsfeed GNU_CONFIGURE= yes -.include "../../mk/bsd.prefs.mk" - -# Include SOCKS firewall support -.if defined(USE_SOCKS) && (${USE_SOCKS} == 4 || ${USE_SOCKS} == 5) -.if ${USE_SOCKS} == 4 -.include "../../net/socks4/buildlink3.mk" -.else -.include "../../net/socks5/buildlink3.mk" -.endif -.endif +.include "options.mk" post-patch: ${SED} -e 's|%%%HISTORY%%%|${PREFIX}/etc/news/history|g' \ @@ -35,6 +26,5 @@ post-install: ${CP} ${WRKSRC}/sample/* ${PREFIX}/share/examples/suck ${CHMOD} 644 ${PREFIX}/share/examples/suck/* -#.include "../../databases/gdbm/buildlink3.mk" .include "../../security/openssl/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/news/suck/options.mk b/news/suck/options.mk new file mode 100644 index 00000000000..ffd6c7087ba --- /dev/null +++ b/news/suck/options.mk @@ -0,0 +1,13 @@ +# $NetBSD: options.mk,v 1.1 2005/12/02 17:04:35 wiz Exp $ + +PKG_OPTIONS_VAR= PKG_OPTIONS.suck +PKG_OPTIONS_OPTIONAL_GROUPS+= socks +PKG_OPTIONS_GROUP.socks= socks4 socks5 + +.include "../../mk/bsd.options.mk" + +.if !empty(PKG_OPTIONS:Msocks4) +.include "../../net/socks4/buildlink3.mk" +.elif !empty(PKG_OPTIONS:Msocks5) +.include "../../net/socks5/buildlink3.mk" +.endif |