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

have been converted to USE_BUILDLINK2.

5 files changed, 12 insertions, 11 deletions

diff --git a/www/sitecopy/Makefile b/www/sitecopy/Makefile
index 134c6260054..cb0b8fc3b50 100644
--- a/www/sitecopy/Makefile
+++ b/www/sitecopy/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2002/08/20 08:52:33 uebayasi Exp $
+# $NetBSD: Makefile,v 1.12 2002/08/25 21:52:20 jlam Exp $
 
 DISTNAME=		sitecopy-0.11.4
 CATEGORIES=		www
@@ -9,11 +9,11 @@ HOMEPAGE=		http://www.lyra.org/sitecopy/
 COMMENT=		utility for synchronizing remote and local web sites
 
 USE_GMAKE=		# defined
-USE_BUILDLINK_ONLY=	# defined
+USE_BUILDLINK2=		# defined
 BUILD_USES_MSGFMT=	# defined
 
 GNU_CONFIGURE=		# defined
-CONFIGURE_ARGS+=	--with-ssl=${BUILDLINK_DIR}
+CONFIGURE_ARGS+=	--with-ssl=${SSLBASE}
 CONFIGURE_ARGS+=	--with-included-neon
 CONFIGURE_ARGS+=	--enable-libxml
 
@@ -29,8 +29,9 @@ pre-build:
 	${RM} -f ${WRKSRC}/fnmatch.h
 	${LN} -sf ${WRKSRC}/lib/fnmatch.h ${WRKSRC}/fnmatch.h
 
-.include "../../devel/gettext-lib/buildlink.mk"
-.include "../../devel/libgetopt/buildlink.mk"
-.include "../../security/openssl/buildlink.mk"
-.include "../../textproc/libxml/buildlink.mk"
+.include "../../devel/gettext-lib/buildlink2.mk"
+.include "../../devel/libgetopt/buildlink2.mk"
+.include "../../security/openssl/buildlink2.mk"
+.include "../../textproc/libxml/buildlink2.mk"
+
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/sitecopy/PLIST b/www/sitecopy/PLIST
index 36c6f3ad640..34c7c86259d 100644
--- a/www/sitecopy/PLIST
+++ b/www/sitecopy/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2002/08/20 08:52:33 uebayasi Exp $
+@comment $NetBSD: PLIST,v 1.3 2002/08/25 21:52:20 jlam Exp $
 bin/sitecopy
 man/man1/sitecopy.1
 share/doc/sitecopy/FAQ
diff --git a/www/sitecopy/distinfo b/www/sitecopy/distinfo
index 4ec0136ceed..bbc7d2d658c 100644
--- a/www/sitecopy/distinfo
+++ b/www/sitecopy/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.3 2002/08/22 09:45:35 uebayasi Exp $
+$NetBSD: distinfo,v 1.4 2002/08/25 21:52:20 jlam Exp $
 
 SHA1 (sitecopy-0.11.4.tar.gz) = 765e40e769e91fff0323e4cae73ad8048b453a2c
 Size (sitecopy-0.11.4.tar.gz) = 737326 bytes
diff --git a/www/sitecopy/patches/patch-aa b/www/sitecopy/patches/patch-aa
index cc9cd5e600a..5b3f368e4b0 100644
--- a/www/sitecopy/patches/patch-aa
+++ b/www/sitecopy/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.2 2002/08/20 08:52:34 uebayasi Exp $
+$NetBSD: patch-aa,v 1.3 2002/08/25 21:52:21 jlam Exp $
 
 --- Makefile.in.orig	Mon Jan 14 06:02:02 2002
 +++ Makefile.in
diff --git a/www/sitecopy/patches/patch-ab b/www/sitecopy/patches/patch-ab
index 35219df9a09..b7b3919c7de 100644
--- a/www/sitecopy/patches/patch-ab
+++ b/www/sitecopy/patches/patch-ab
@@ -1,4 +1,4 @@
-$NetBSD: patch-ab,v 1.1 2002/08/20 08:52:34 uebayasi Exp $
+$NetBSD: patch-ab,v 1.2 2002/08/25 21:52:22 jlam Exp $
 
 --- src/console_fe.c.orig	Mon Jan 14 05:42:21 2002
 +++ src/console_fe.c