diff options
| author | wiz <wiz@pkgsrc.org> | 2005-12-02 17:05:04 +0000 |
|---|---|---|
| committer | wiz <wiz@pkgsrc.org> | 2005-12-02 17:05:04 +0000 |
| commit | f6210738c358902d2b36080d263168fe6fbe2974 (patch) | |
| tree | 953417cc7955ff8c5ddf9c87c4a931b36f1bd7de | |
| parent | 898e61efd5fa914717f2bcf94680ed5322fd969a (diff) | |
| download | pkgsrc-f6210738c358902d2b36080d263168fe6fbe2974.tar.gz | |
Convert to options framework.
While here, fix two pkglint warnings.
| -rw-r--r-- | www/libwww/Makefile | 21 | ||||
| -rw-r--r-- | www/libwww/options.mk | 17 |
2 files changed, 22 insertions, 16 deletions
diff --git a/www/libwww/Makefile b/www/libwww/Makefile index c5190f86256..933b84a47b2 100644 --- a/www/libwww/Makefile +++ b/www/libwww/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.62 2005/11/03 15:51:59 salo Exp $ +# $NetBSD: Makefile,v 1.63 2005/12/02 17:05:04 wiz Exp $ DISTNAME= w3c-libwww-5.4.0 PKGNAME= libwww-5.4.0 @@ -22,11 +22,13 @@ USE_TOOLS+= gmake perl USE_LIBTOOL= YES GNU_CONFIGURE= YES -CONFIGURE_ARGS= --with-zlib --with-regex --without-x +CONFIGURE_ARGS+= --with-zlib --with-regex --without-x CONFIGURE_ARGS+= --with-ssl="${SSLBASE}" # Avoid an ICE in gcc2 on sparc64 -CONFIGURE_ENV+= F77=${FALSE} +CONFIGURE_ENV+= F77=${FALSE:Q} + +.include "options.mk" DOCDIR= ${PREFIX}/share/doc/libwww @@ -52,19 +54,6 @@ CONFIGURE_ARGS+= --with-md5="${SSLBASE}" PLIST_SUBST+= MD5LIB="" .endif -# Include SOCKS firewall support -.if defined(USE_SOCKS) && (${USE_SOCKS} == 4 || ${USE_SOCKS} == 5) -.if ${USE_SOCKS} == 4 -.include "../../net/socks4/buildlink3.mk" -CONFIGURE_ARGS+= --with-socks4=${BUILDLINK_PREFIX.socks4}/lib/libsocks4.a -CONFIGURE_ARGS+= --with-socks5=no -.else -.include "../../net/socks5/buildlink3.mk" -CONFIGURE_ARGS+= --with-socks4=no -CONFIGURE_ARGS+= --with-socks5=${BUILDLINK_prefix.socks5}/lib/libsocks5.a -.endif -.endif - .include "../../devel/zlib/buildlink3.mk" .include "../../security/openssl/buildlink3.mk" diff --git a/www/libwww/options.mk b/www/libwww/options.mk new file mode 100644 index 00000000000..68769031179 --- /dev/null +++ b/www/libwww/options.mk @@ -0,0 +1,17 @@ +# $NetBSD: options.mk,v 1.1 2005/12/02 17:05:04 wiz Exp $ + +PKG_OPTIONS_VAR= PKG_OPTIONS.libwww +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=${BUILDLINK_PREFIX.socks4}/lib/libsocks4.a +CONFIGURE_ARGS+= --with-socks5=no +.include "../../net/socks4/buildlink3.mk" +.elif !empty(PKG_OPTIONS:Msocks5) +CONFIGURE_ARGS+= --with-socks4=no +CONFIGURE_ARGS+= --with-socks5=${BUILDLINK_prefix.socks5}/lib/libsocks5.a +.include "../../net/socks5/buildlink3.mk" +.endif |