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

have been converted to USE_BUILDLINK2.

5 files changed, 8 insertions, 7 deletions

diff --git a/www/cvsweb/Makefile b/www/cvsweb/Makefile
index 682b213e63f..38bdaf653be 100644
--- a/www/cvsweb/Makefile
+++ b/www/cvsweb/Makefile
@@ -1,5 +1,5 @@
 #
-# $NetBSD: Makefile,v 1.13 2002/08/06 00:01:53 lukem Exp $
+# $NetBSD: Makefile,v 1.14 2002/08/25 21:52:06 jlam Exp $
 #
 
 DISTNAME=		cvsweb-2.0.5
@@ -10,7 +10,7 @@ MAINTAINER=		lukem@netbsd.org
 HOMEPAGE=		http://www.freebsd.org/projects/cvsweb.html
 COMMENT=		Web interface for browsing a CVS repository
 
-USE_BUILDLINK_ONLY=	YES
+USE_BUILDLINK2=		YES
 
 PKG_SYSCONFSUBDIR?=	httpd
 EGDIR=			${PREFIX}/share/examples/${PKGBASE}
@@ -56,6 +56,7 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/${f} ${DOCDIR}/${f}
 .endfor
 
-.include "../../lang/perl5/buildlink.mk"
+.include "../../lang/perl5/buildlink2.mk"
+
 .include "../../mk/bsd.pkg.install.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/cvsweb/PLIST b/www/cvsweb/PLIST
index 137772fd506..aa3ef16dba1 100644
--- a/www/cvsweb/PLIST
+++ b/www/cvsweb/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2002/06/27 03:22:23 lukem Exp $
+@comment $NetBSD: PLIST,v 1.3 2002/08/25 21:52:06 jlam Exp $
 libexec/cgi-bin/cvsweb.cgi
 share/doc/cvsweb/ChangeLog
 share/doc/cvsweb/INSTALL
diff --git a/www/cvsweb/distinfo b/www/cvsweb/distinfo
index 1b52921be46..0312a61a64b 100644
--- a/www/cvsweb/distinfo
+++ b/www/cvsweb/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.7 2002/07/24 11:38:47 martti Exp $
+$NetBSD: distinfo,v 1.8 2002/08/25 21:52:06 jlam Exp $
 
 SHA1 (cvsweb-2.0.5.tar.gz) = 6fb2049eb8f9a79788b9f84523399d761dbc6205
 Size (cvsweb-2.0.5.tar.gz) = 51948 bytes
diff --git a/www/cvsweb/patches/patch-aa b/www/cvsweb/patches/patch-aa
index adc4bc8a931..047560575bc 100644
--- a/www/cvsweb/patches/patch-aa
+++ b/www/cvsweb/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.5 2002/07/24 11:38:47 martti Exp $
+$NetBSD: patch-aa,v 1.6 2002/08/25 21:52:07 jlam Exp $
 
 --- cvsweb.cgi.orig	Tue Jul 23 15:58:32 2002
 +++ cvsweb.cgi	Wed Jul 24 11:01:53 2002
diff --git a/www/cvsweb/patches/patch-ab b/www/cvsweb/patches/patch-ab
index 887883c3ccd..fb5ad4dce57 100644
--- a/www/cvsweb/patches/patch-ab
+++ b/www/cvsweb/patches/patch-ab
@@ -1,4 +1,4 @@
-$NetBSD: patch-ab,v 1.3 2002/07/24 11:38:47 martti Exp $
+$NetBSD: patch-ab,v 1.4 2002/08/25 21:52:07 jlam Exp $
 
 --- cvsweb.conf.orig	Wed Jul 10 17:30:56 2002
 +++ cvsweb.conf	Wed Jul 24 11:02:29 2002