Merge packages from the buildlink2 branch back into the main trunk that

have been converted to USE_BUILDLINK2.

5 files changed, 8 insertions, 13 deletions

diff --git a/www/curl/Makefile b/www/curl/Makefile
index 376f2eb0acd..f30303e08e1 100644
--- a/www/curl/Makefile
+++ b/www/curl/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2002/06/10 01:32:37 shell Exp $
+# $NetBSD: Makefile,v 1.20 2002/08/25 21:52:03 jlam Exp $
 
 DISTNAME=	curl-7.9.7
 CATEGORIES=	www
@@ -13,16 +13,11 @@ COMMENT=	client that groks URLs
 # list it into IPv6-ready packages
 BUILD_DEFS+=	USE_INET6
 
-USE_BUILDLINK_ONLY=	yes
+USE_BUILDLINK2=		yes
 GNU_CONFIGURE=		yes
 USE_LIBTOOL=		yes
 LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
-CONFIGURE_ARGS+=	--with-ssl=${BUILDLINK_DIR}
-
-# This causes curl-config not to be regenerated during build-time as it was
-# already created at configure-time.
-#
-AUTOMAKE_POST_PATTERNS+=	curl-config
+CONFIGURE_ARGS+=	--with-ssl=${BUILDLINK_PREFIX.openssl}
 
 post-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/curl
@@ -37,5 +32,5 @@ post-install:
 	${SED} '/php/d' ${WRKSRC}/docs/examples/README >		\
 		${PREFIX}/share/examples/curl/README
 	
-.include "../../security/openssl/buildlink.mk"
+.include "../../security/openssl/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/curl/PLIST b/www/curl/PLIST
index 175674531c8..3e74f5890ee 100644
--- a/www/curl/PLIST
+++ b/www/curl/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2002/06/10 01:32:38 shell Exp $
+@comment $NetBSD: PLIST,v 1.5 2002/08/25 21:52:04 jlam Exp $
 bin/curl
 bin/curl-config
 include/curl/curl.h
diff --git a/www/curl/distinfo b/www/curl/distinfo
index 049bc876f18..ad74ff8fc63 100644
--- a/www/curl/distinfo
+++ b/www/curl/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.14 2002/07/19 04:25:17 mycroft Exp $
+$NetBSD: distinfo,v 1.15 2002/08/25 21:52:04 jlam Exp $
 
 SHA1 (curl-7.9.7.tar.gz) = 6fcb23be788984bcfca7debe5f307ec65fb56101
 Size (curl-7.9.7.tar.gz) = 717489 bytes
diff --git a/www/curl/patches/patch-aa b/www/curl/patches/patch-aa
index c49ccc5dd46..70f422a7538 100644
--- a/www/curl/patches/patch-aa
+++ b/www/curl/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.5 2002/06/11 12:35:14 agc Exp $
+$NetBSD: patch-aa,v 1.6 2002/08/25 21:52:05 jlam Exp $
 
 --- src/writeout.c	2002/06/11 12:31:17	1.1
 +++ src/writeout.c	2002/06/11 12:31:35
diff --git a/www/curl/patches/patch-ab b/www/curl/patches/patch-ab
index 73debccae81..00ec637fcad 100644
--- a/www/curl/patches/patch-ab
+++ b/www/curl/patches/patch-ab
@@ -1,4 +1,4 @@
-$NetBSD: patch-ab,v 1.2 2002/07/19 04:25:18 mycroft Exp $
+$NetBSD: patch-ab,v 1.3 2002/08/25 21:52:05 jlam Exp $
 
 --- lib/ftp.c.orig	Mon Apr 29 11:57:25 2002
 +++ lib/ftp.c	Fri Jul 19 04:22:35 2002