summaryrefslogtreecommitdiff
path: root/net
diff options
context:
space:
mode:
authorwiz <wiz@pkgsrc.org>2005-12-02 17:03:54 +0000
committerwiz <wiz@pkgsrc.org>2005-12-02 17:03:54 +0000
commit898e61efd5fa914717f2bcf94680ed5322fd969a (patch)
treeea3f6c2e5b7528b1a49353858fc316db8756ab5f /net
parentce892abfa6c46ed7f1da03b9c82755a7eedeb329 (diff)
downloadpkgsrc-898e61efd5fa914717f2bcf94680ed5322fd969a.tar.gz
Convert to options framework.
Diffstat (limited to 'net')
-rw-r--r--net/tnftpd/Makefile23
-rw-r--r--net/tnftpd/options.mk22
2 files changed, 24 insertions, 21 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