diff options
| author | wiz <wiz@pkgsrc.org> | 2005-12-02 17:02:29 +0000 |
|---|---|---|
| committer | wiz <wiz@pkgsrc.org> | 2005-12-02 17:02:29 +0000 |
| commit | 89b21a35e473ccedfe842e260d6d205888fcfad9 (patch) | |
| tree | 8b6ff4b47ac458fd65f8da5193b609eef80fa4cf | |
| parent | e3b5126f84c121c6d65be351f8afe39a28ab25e7 (diff) | |
| download | pkgsrc-89b21a35e473ccedfe842e260d6d205888fcfad9.tar.gz | |
Convert to options framework.
Fix a PKGLINT warning while here.
| -rw-r--r-- | net/ncftp2/Makefile | 18 | ||||
| -rw-r--r-- | net/ncftp2/options.mk | 16 |
2 files changed, 19 insertions, 15 deletions
diff --git a/net/ncftp2/Makefile b/net/ncftp2/Makefile index bfc78d60461..802140f19f0 100644 --- a/net/ncftp2/Makefile +++ b/net/ncftp2/Makefile @@ -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 @@ GNU_CONFIGURE= yes 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 --git a/net/ncftp2/options.mk b/net/ncftp2/options.mk new file mode 100644 index 00000000000..c43e7dc4603 --- /dev/null +++ b/net/ncftp2/options.mk @@ -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 |