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

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/299ffbd4f303
branches:  trunk
changeset: 503971:299ffbd4f303
user:      wiz <wiz%pkgsrc.org@localhost>
date:      Fri Dec 02 17:05:04 2005 +0000

description:
Convert to options framework.
While here, fix two pkglint warnings.

diffstat:

 www/libwww/Makefile   |  21 +++++----------------
 www/libwww/options.mk |  17 +++++++++++++++++
 2 files changed, 22 insertions(+), 16 deletions(-)

diffs (66 lines):

diff -r 1b4ec11d539a -r 299ffbd4f303 www/libwww/Makefile
--- a/www/libwww/Makefile       Fri Dec 02 17:03:54 2005 +0000
+++ b/www/libwww/Makefile       Fri Dec 02 17:05:04 2005 +0000
@@ -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_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 @@
 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 -r 1b4ec11d539a -r 299ffbd4f303 www/libwww/options.mk
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/www/libwww/options.mk     Fri Dec 02 17:05:04 2005 +0000
@@ -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