diff options
| -rw-r--r-- | net/tnftp/Makefile | 21 | ||||
| -rw-r--r-- | net/tnftp/options.mk | 22 |
2 files changed, 24 insertions, 19 deletions
diff --git a/net/tnftp/Makefile b/net/tnftp/Makefile index d9bcdfce0e5..9f7574017b5 100644 --- a/net/tnftp/Makefile +++ b/net/tnftp/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.17 2005/09/28 20:52:25 rillig Exp $ +# $NetBSD: Makefile,v 1.18 2005/12/02 17:03:06 wiz Exp $ # DISTNAME= tnftp-20050625 @@ -19,24 +19,7 @@ CONFLICTS+= lukemftp-[0-9]* NO_CHECKSUM= yes -.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/tnftp/options.mk b/net/tnftp/options.mk new file mode 100644 index 00000000000..7f5bc29f7d1 --- /dev/null +++ b/net/tnftp/options.mk @@ -0,0 +1,22 @@ +# $NetBSD: options.mk,v 1.1 2005/12/02 17:03:06 wiz Exp $ + +PKG_OPTIONS_VAR= PKG_OPTIONS.tnftp +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 |