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

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/4f92563e08b9
branches:  trunk
changeset: 503967:4f92563e08b9
user:      wiz <wiz%pkgsrc.org@localhost>
date:      Fri Dec 02 17:02:29 2005 +0000

description:
Convert to options framework.
Fix a PKGLINT warning while here.

diffstat:

 net/ncftp2/Makefile   |  18 +++---------------
 net/ncftp2/options.mk |  16 ++++++++++++++++
 2 files changed, 19 insertions(+), 15 deletions(-)

diffs (54 lines):

diff -r 8af86e333ec6 -r 4f92563e08b9 net/ncftp2/Makefile
--- a/net/ncftp2/Makefile       Fri Dec 02 17:01:48 2005 +0000
+++ b/net/ncftp2/Makefile       Fri Dec 02 17:02:29 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.39 2005/06/25 00:52:00 kristerw Exp $
+# $NetBSD: Makefile,v 1.40 2005/12/02 17:02:29 wiz Exp $
 
 DISTNAME=              ncftp-2.4.3
 PKGREVISION=           2
@@ -13,22 +13,10 @@
 CONFIGURE_ARGS+=       --disable-extra-dirs
 CONFIGURE_ARGS+=       --disable-ncurses
 CONFIGURE_ENV+=                ac_cv_lib_intl_strftime=no
-CONFIGURE_ENV+=                GZCAT="${GZCAT}"
+CONFIGURE_ENV+=                GZCAT=${GZCAT:Q}
 USE_TOOLS+=            gzcat
 
-.include "../../mk/bsd.prefs.mk"
-
-# Include SOCKS firewall support
-.if defined(USE_SOCKS) && (${USE_SOCKS} == 4 || ${USE_SOCKS} == 5)
-BUILD_DEFS+=           USE_SOCKS
-.  if ${USE_SOCKS} == 4
-CONFIGURE_ARGS+=       --enable-socks
-.    include "../../net/socks4/buildlink3.mk"
-.  else
-CONFIGURE_ARGS+=       --enable-socks5
-.    include "../../net/socks5/buildlink3.mk"
-.  endif
-.endif
+.include "options.mk"
 
 INSTALLATION_DIRS=     bin man/man1
 
diff -r 8af86e333ec6 -r 4f92563e08b9 net/ncftp2/options.mk
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/net/ncftp2/options.mk     Fri Dec 02 17:02:29 2005 +0000
@@ -0,0 +1,16 @@
+# $NetBSD: options.mk,v 1.1 2005/12/02 17:02:29 wiz Exp $
+
+PKG_OPTIONS_VAR=       PKG_OPTIONS.ncftp2
+PKG_OPTIONS_OPTIONAL_GROUPS+=  socks
+PKG_OPTIONS_GROUP.socks=       socks4 socks5
+
+.include "../../mk/bsd.options.mk"
+
+# Include SOCKS firewall support
+.if !empty(PKG_OPTIONS:Msocks4)
+CONFIGURE_ARGS+=       --enable-socks
+.include "../../net/socks4/buildlink3.mk"
+.elif !empty(PKG_OPTIONS:Msocks5)
+CONFIGURE_ARGS+=       --enable-socks5
+.include "../../net/socks5/buildlink3.mk"
+.endif