Merge changes in packages from the buildlink2 branch that have

buildlink2.mk files back into the main trunk.  This provides sufficient
buildlink2 infrastructure to start merging other packages from the
buildlink2 branch that have already been converted to use the buildlink2
framework.

6 files changed, 71 insertions, 10 deletions

diff --git a/www/libwww/Makefile b/www/libwww/Makefile
index 46bc7ef163b..ac6830e2c3d 100644
--- a/www/libwww/Makefile
+++ b/www/libwww/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.35 2002/08/07 15:56:22 fredb Exp $
+# $NetBSD: Makefile,v 1.36 2002/08/25 18:40:21 jlam Exp $
 
 DISTNAME=		w3c-libwww-5.3.2
 PKGNAME=		libwww-5.3.2
@@ -13,14 +13,14 @@ COMMENT=		The W3C Reference Library
 
 BUILD_DEPENDS+=		automake>=1.4:../../devel/automake
 
-USE_BUILDLINK_ONLY=	YES
+USE_BUILDLINK2=		YES
 USE_GMAKE=		YES
 USE_LIBTOOL=		YES
 USE_PERL5=		build
 
-GNU_CONFIGURE=		yes
+GNU_CONFIGURE=		YES
 CONFIGURE_ARGS=		--with-zlib --with-regex --without-x
-CONFIGURE_ARGS+=	--with-ssl="${BUILDLINK_PREFIX.openssl}"
+CONFIGURE_ARGS+=	--with-ssl="${SSLBASE}"
 
 DOCDIR=			${PREFIX}/share/doc/libwww
 LTCONFIG_OVERRIDE=	${WRKSRC}/config/ltconfig
@@ -31,6 +31,22 @@ pre-configure:
 	    ${LOCALBASE}/bin/automake && \
 	    ${LOCALBASE}/bin/autoconf
 
-.include "../../devel/zlib/buildlink.mk"
-.include "../../security/openssl/buildlink.mk"
+.include "../../mk/bsd.prefs.mk"
+
+# Include SOCKS firewall support
+.if defined(USE_SOCKS) && (${USE_SOCKS} == 4 || ${USE_SOCKS} == 5)
+.if ${USE_SOCKS} == 4
+.include "../../net/socks4/buildlink.mk"
+CONFIGURE_ARGS+= 	--with-socks4=${BUILDLINK_PREFIX.socks4}/lib/libsocks4.a
+CONFIGURE_ARGS+=	--with-socks5=no
+.else
+.include "../../net/socks5/buildlink.mk"
+CONFIGURE_ARGS+=	--with-socks4=no
+CONFIGURE_ARGS+= 	--with-socks5=${BUILDLINK_prefix.socks5}/lib/libsocks5.a
+.endif
+.endif
+
+.include "../../devel/zlib/buildlink2.mk"
+.include "../../security/openssl/buildlink2.mk"
+
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/libwww/buildlink.mk b/www/libwww/buildlink.mk
index e2e252eedba..b620fff587b 100644
--- a/www/libwww/buildlink.mk
+++ b/www/libwww/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.9 2002/07/15 14:39:21 fredb Exp $
+# $NetBSD: buildlink.mk,v 1.10 2002/08/25 18:40:21 jlam Exp $
 #
 # This Makefile fragment is included by packages that use libwww.
 #
diff --git a/www/libwww/buildlink2.mk b/www/libwww/buildlink2.mk
new file mode 100644
index 00000000000..e77dbf5150a
--- /dev/null
+++ b/www/libwww/buildlink2.mk
@@ -0,0 +1,45 @@
+# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 18:40:22 jlam Exp $
+
+.if !defined(LIBWWW_BUILDLINK2_MK)
+LIBWWW_BUILDLINK2_MK=	# defined
+
+BUILDLINK_PACKAGES+=		libwww
+BUILDLINK_DEPENDS.libwww?=	libwww>=5.3.2nb2
+BUILDLINK_PKGSRCDIR.libwww?=	../../www/libwww
+
+EVAL_PREFIX+=			BUILDLINK_PREFIX.libwww=libwww
+BUILDLINK_PREFIX.libwww_DEFAULT=	${LOCALBASE}
+BUILDLINK_FILES.libwww=		include/wwwconf.h
+BUILDLINK_FILES.libwww+=	include/w3c-libwww/*
+BUILDLINK_FILES.libwww+=	lib/libmd5.*
+BUILDLINK_FILES.libwww+=	lib/libpics.*
+BUILDLINK_FILES.libwww+=	lib/libwwwapp.*
+BUILDLINK_FILES.libwww+=	lib/libwwwcache.*
+BUILDLINK_FILES.libwww+=	lib/libwwwcore.*
+BUILDLINK_FILES.libwww+=	lib/libwwwdir.*
+BUILDLINK_FILES.libwww+=	lib/libwwwfile.*
+BUILDLINK_FILES.libwww+=	lib/libwwwftp.*
+BUILDLINK_FILES.libwww+=	lib/libwwwgopher.*
+BUILDLINK_FILES.libwww+=	lib/libwwwhttp.*
+BUILDLINK_FILES.libwww+=	lib/libwwwhtml.*
+BUILDLINK_FILES.libwww+=	lib/libwwwinit.*
+BUILDLINK_FILES.libwww+=	lib/libwwwmime.*
+BUILDLINK_FILES.libwww+=	lib/libwwwmux.*
+BUILDLINK_FILES.libwww+=	lib/libwwwnews.*
+BUILDLINK_FILES.libwww+=	lib/libwwwssl.*
+BUILDLINK_FILES.libwww+=	lib/libwwwstream.*
+BUILDLINK_FILES.libwww+=	lib/libwwwtelnet.*
+BUILDLINK_FILES.libwww+=	lib/libwwwtrans.*
+BUILDLINK_FILES.libwww+=	lib/libwwwutils.*
+BUILDLINK_FILES.libwww+=	lib/libwwwxml.*
+BUILDLINK_FILES.libwww+=	lib/libwwwzip.*
+BUILDLINK_FILES.libwww+=	lib/libxmlparse.*
+BUILDLINK_FILES.libwww+=	lib/libxmltok.*
+
+.include "../../devel/zlib/buildlink2.mk"
+
+BUILDLINK_TARGETS+=	libwww-buildlink
+
+libwww-buildlink: _BUILDLINK_USE
+
+.endif	# LIBWWW_BUILDLINK2_MK
diff --git a/www/libwww/distinfo b/www/libwww/distinfo
index 75a9e5def45..8db016f4bbb 100644
--- a/www/libwww/distinfo
+++ b/www/libwww/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.7 2002/08/07 15:56:23 fredb Exp $
+$NetBSD: distinfo,v 1.8 2002/08/25 18:40:22 jlam Exp $
 
 SHA1 (w3c-libwww-5.3.2.tar.gz) = c50f3624889b3a0ebc720264a1b9b64990457516
 Size (w3c-libwww-5.3.2.tar.gz) = 1956340 bytes
diff --git a/www/libwww/patches/patch-ah b/www/libwww/patches/patch-ah
index b49fcc8a4cc..506d67faf0c 100644
--- a/www/libwww/patches/patch-ah
+++ b/www/libwww/patches/patch-ah
@@ -1,4 +1,4 @@
-$NetBSD: patch-ah,v 1.5 2002/08/07 15:56:24 fredb Exp $
+$NetBSD: patch-ah,v 1.6 2002/08/25 18:40:23 jlam Exp $
 --- configure.in.orig	Thu Dec 14 11:49:06 2000
 +++ configure.in	Tue Aug 28 17:09:57 2001
 @@ -213,7 +213,12 @@
diff --git a/www/libwww/patches/patch-aj b/www/libwww/patches/patch-aj
index ba756c65bc7..ccb68746dd4 100644
--- a/www/libwww/patches/patch-aj
+++ b/www/libwww/patches/patch-aj
@@ -1,4 +1,4 @@
-$NetBSD: patch-aj,v 1.2 2002/05/20 19:07:42 cjep Exp $
+$NetBSD: patch-aj,v 1.3 2002/08/25 18:40:23 jlam Exp $
 --- acinclude.m4.orig	Tue Aug 28 14:56:47 2001
 +++ acinclude.m4	Tue Aug 28 14:58:27 2001
 @@ -251,19 +251,6 @@