pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

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



details:   https://anonhg.NetBSD.org/pkgsrc/rev/5c642192594f
branches:  trunk
changeset: 503968:5c642192594f
user:      wiz <wiz%pkgsrc.org@localhost>
date:      Fri Dec 02 17:03:06 2005 +0000

description:
Convert to options framework.

diffstat:

 net/tnftp/Makefile   |  21 ++-------------------
 net/tnftp/options.mk |  22 ++++++++++++++++++++++
 2 files changed, 24 insertions(+), 19 deletions(-)

diffs (61 lines):

diff -r 4f92563e08b9 -r 5c642192594f net/tnftp/Makefile
--- a/net/tnftp/Makefile        Fri Dec 02 17:02:29 2005 +0000
+++ b/net/tnftp/Makefile        Fri Dec 02 17:03:06 2005 +0000
@@ -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 @@
 
 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 -r 4f92563e08b9 -r 5c642192594f net/tnftp/options.mk
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/net/tnftp/options.mk      Fri Dec 02 17:03:06 2005 +0000
@@ -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



Home | Main Index | Thread Index | Old Index