[pkgsrc/trunk]: pkgsrc Convert to options framework.

[wiz <wiz%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/1b4ec11d539a
branches:  trunk
changeset: 503970:1b4ec11d539a
user:      wiz <wiz%pkgsrc.org@localhost>
date:      Fri Dec 02 17:03:54 2005 +0000

description:
Convert to options framework.

diffstat:

 net/tnftpd/Makefile   |  23 ++---------------------
 net/tnftpd/options.mk |  22 ++++++++++++++++++++++
 news/suck/Makefile    |  14 ++------------
 news/suck/options.mk  |  13 +++++++++++++
 4 files changed, 39 insertions(+), 33 deletions(-)

diffs (114 lines):

diff -r 5bfb945795f1 -r 1b4ec11d539a net/tnftpd/Makefile
--- a/net/tnftpd/Makefile       Fri Dec 02 17:03:28 2005 +0000
+++ b/net/tnftpd/Makefile       Fri Dec 02 17:03:54 2005 +0000
@@ -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 @@
 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 -r 5bfb945795f1 -r 1b4ec11d539a net/tnftpd/options.mk
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/net/tnftpd/options.mk     Fri Dec 02 17:03:54 2005 +0000
@@ -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 -r 5bfb945795f1 -r 1b4ec11d539a news/suck/Makefile
--- a/news/suck/Makefile        Fri Dec 02 17:03:28 2005 +0000
+++ b/news/suck/Makefile        Fri Dec 02 17:03:54 2005 +0000
@@ -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 @@
 
 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 @@
        ${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 -r 5bfb945795f1 -r 1b4ec11d539a news/suck/options.mk
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/news/suck/options.mk      Fri Dec 02 17:03:54 2005 +0000
@@ -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