Change explicit build dependencies on perl into "USE_PERL5=build". This

makes these packages build correctly on Darwin where perl>=5.8.0 is
required.

16 files changed, 33 insertions, 42 deletions

diff --git a/www/ap-auth-cookie/Makefile b/www/ap-auth-cookie/Makefile
index 96a9502bdc4..671e558aa3d 100644
--- a/www/ap-auth-cookie/Makefile
+++ b/www/ap-auth-cookie/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2001/09/09 20:36:52 agc Exp $
+# $NetBSD: Makefile,v 1.22 2002/07/24 19:45:29 jlam Exp $
 #
 # There are a few more mod_auth_cookie's out there doing slightly
 # different things.  This one pkg would be a good place to dump them all in
@@ -15,8 +15,7 @@ HOMEPAGE=	ftp://ftp.kciLink.com/pub/mod_auth_cookie.txt
 COMMENT=	Cookie-based authentication for Apache
 
 DEPENDS+=	apache{,6}-1.3.*:../../www/apache
-# For "apxs":
-BUILD_DEPENDS=	perl>=${PERL5_REQD}:../../lang/perl5
+USE_PERL5=	build	# for "apxs"
 
 EXTRACT_CMD=	${DO_NADA}
 WRKSRC=		${WRKDIR}
diff --git a/www/ap-auth-postgresql/Makefile b/www/ap-auth-postgresql/Makefile
index b6e705bd87d..9aabc6d6311 100644
--- a/www/ap-auth-postgresql/Makefile
+++ b/www/ap-auth-postgresql/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2001/09/27 23:18:50 jlam Exp $
+# $NetBSD: Makefile,v 1.13 2002/07/24 19:45:29 jlam Exp $
 
 DISTNAME=	AuthPG-1.2b2
 PKGNAME=	ap-auth-postgresql-1.2b2
@@ -11,8 +11,7 @@ COMMENT=	Module to allow apache authentication against a Postgresql database
 
 DEPENDS+=	apache{,6}-1.3.*:../../www/apache
 DEPENDS+=	postgresql-{6.5.3*,7.0*,lib-[0-9]*}:../../databases/postgresql-lib
-# For "apxs":
-BUILD_DEPENDS=	perl>=${PERL5_REQD}:../../lang/perl5
+USE_PERL5=	build	# for "apxs"
 
 CPPFLAGS+=	-I${LOCALBASE}/include/pgsql
 LIBS=		-lpq -lcrypt
diff --git a/www/ap-csacek/Makefile b/www/ap-csacek/Makefile
index a471ce5162c..882eca98f07 100644
--- a/www/ap-csacek/Makefile
+++ b/www/ap-csacek/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2002/03/10 20:21:57 jdolecek Exp $
+# $NetBSD: Makefile,v 1.15 2002/07/24 19:45:29 jlam Exp $
 #
 
 DISTNAME=	csacek-2.1.9
@@ -13,8 +13,7 @@ HOMEPAGE=	http://www.csacek.cz/
 COMMENT=	on-fly code set recoder
 
 DEPENDS+=	apache{,6}-1.3*:../../www/apache
-# For "apxs":
-BUILD_DEPENDS=	perl>=${PERL5_REQD}:../../lang/perl5
+USE_PERL5=	build	# for "apxs"
 
 HAS_CONFIGURE=	yes
 
diff --git a/www/ap-fastcgi/Makefile b/www/ap-fastcgi/Makefile
index 05b81c6a54a..8971ad85f2d 100644
--- a/www/ap-fastcgi/Makefile
+++ b/www/ap-fastcgi/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2001/05/20 05:23:27 jonb Exp $
+# $NetBSD: Makefile,v 1.20 2002/07/24 19:45:29 jlam Exp $
 #
 
 DISTNAME=	mod_fastcgi_2.2.10
@@ -11,8 +11,7 @@ HOMEPAGE=	http://www.fastcgi.com/
 COMMENT=	New, improved CGI-like interface module for Apache
 
 DEPENDS+=	apache{,6}-1.3.*:../../www/apache
-# For "apxs":
-BUILD_DEPENDS=	perl>=${PERL5_REQD}:../../lang/perl5
+USE_PERL5=	build	# for "apxs"
 
 do-build:
 	@cd ${WRKSRC} && ${PREFIX}/sbin/apxs -c -o mod_fastcgi.so *.c
diff --git a/www/ap-gzip/Makefile b/www/ap-gzip/Makefile
index e48a4bf6a5f..04962bbec16 100644
--- a/www/ap-gzip/Makefile
+++ b/www/ap-gzip/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2002/04/01 17:44:43 tv Exp $
+# $NetBSD: Makefile,v 1.2 2002/07/24 19:45:29 jlam Exp $
 #
 
 DISTNAME=	mod_gzip.c
@@ -13,8 +13,7 @@ HOMEPAGE=	http://www.remotecommunications.com/apache/mod_gzip/
 COMMENT=	On-the-fly GZIP compression for Apache 1.3.x
 
 DEPENDS+=	apache{,6}-1.3.*:../../www/apache
-# For "apxs":
-BUILD_DEPENDS=	perl>=${PERL5_REQD}:../../lang/perl5
+USE_PERL5=	build	# for "apxs"
 
 VERSION=	1.3.19.1a
 DIST_SUBDIR=	${PKGNAME}
diff --git a/www/ap-jk/Makefile b/www/ap-jk/Makefile
index 74deeaf4e96..2a09762909f 100644
--- a/www/ap-jk/Makefile
+++ b/www/ap-jk/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2002/04/19 15:54:20 jwise Exp $
+# $NetBSD: Makefile,v 1.9 2002/07/24 19:45:30 jlam Exp $
 
 DISTNAME=	jakarta-tomcat-3.2.4-src
 PKGNAME=	ap-jk-3.2.4
@@ -12,8 +12,7 @@ COMMENT=	improved connector for accessing Jakarta Tomcat or JServ from Apache
 DEPENDS+=	apache{,6}-1.3.*:../../www/apache
 
 USE_JAVA=	yes
-# For "apxs":
-BUILD_DEPENDS+=	perl>=${PERL5_REQD}:../../lang/perl5
+USE_PERL5=	build	# for "apxs"
 
 EXTRACT_ELEMENTS=	${DISTNAME}/src/native
 WRKSRC=		${WRKDIR}/${DISTNAME}/src/native/apache1.3
diff --git a/www/ap-jserv/Makefile b/www/ap-jserv/Makefile
index 97448099ba4..72a5d080413 100644
--- a/www/ap-jserv/Makefile
+++ b/www/ap-jserv/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2002/02/28 18:32:19 jlam Exp $
+# $NetBSD: Makefile,v 1.21 2002/07/24 19:45:30 jlam Exp $
 
 DISTNAME=	ApacheJServ-1.1.2
 PKGNAME=	ap-jserv-1.1.2
@@ -12,8 +12,7 @@ COMMENT=	older Java Servlet engine for Apache Server
 DEPENDS+=	{apache-1.3.9*,apache-1.3.[1-9][0-9]*,apache6-1.3.9*,apache6-1.3.[1-9][0-9]*}:../../www/apache
 # yes, this needs _exactly_ version 2.0
 DEPENDS+=	jsdk-2.0:../../www/jsdk20
-# For "apxs":
-BUILD_DEPENDS=	perl>=${PERL5_REQD}:../../lang/perl5
+USE_PERL5=	build	# for "apxs"
 
 .include "../../mk/bsd.prefs.mk"
 
diff --git a/www/ap-layout/Makefile b/www/ap-layout/Makefile
index 54df937f9e9..a1bb36f44cd 100644
--- a/www/ap-layout/Makefile
+++ b/www/ap-layout/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2002/02/25 02:55:22 grant Exp $
+# $NetBSD: Makefile,v 1.2 2002/07/24 19:45:30 jlam Exp $
 #
 
 DISTNAME=	mod_layout-3.0.4
@@ -12,8 +12,7 @@ HOMEPAGE=	http://software.tangent.org/
 COMMENT=	Apache module to wrap static or dynamic content
 
 DEPENDS+=	apache{,6}-1.3.*:../../www/apache
-# For "apxs":
-BUILD_DEPENDS=	perl>=${PERL5_REQD}:../../lang/perl5
+USE_PERL5=	build	# for "apxs"
 
 LAYOUT_DIR=	${PREFIX}/share/httpd/htdocs/manual/mod/mod_layout
 
diff --git a/www/ap-mp3/Makefile b/www/ap-mp3/Makefile
index 037024eb3af..05247fc3629 100644
--- a/www/ap-mp3/Makefile
+++ b/www/ap-mp3/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2002/02/25 03:00:49 grant Exp $
+# $NetBSD: Makefile,v 1.2 2002/07/24 19:45:30 jlam Exp $
 #
 
 DISTNAME=	mod_mp3-0.35
@@ -12,8 +12,7 @@ HOMEPAGE=	http://software.tangent.org/media/
 COMMENT=	apache module for streaming mp3 files
 
 DEPENDS+=	apache{,6}-1.3.*:../../www/apache
-# For "apxs":
-BUILD_DEPENDS=	perl>=${PERL5_REQD}:../../lang/perl5
+USE_PERL5=	build	# for "apxs"
 
 DOC_DIR=	${PREFIX}/share/httpd/htdocs/manual/mod/mod_mp3
 
diff --git a/www/ap-xslt/Makefile b/www/ap-xslt/Makefile
index 4cc499315da..a9272ac2678 100644
--- a/www/ap-xslt/Makefile
+++ b/www/ap-xslt/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2002/01/22 22:21:41 wiz Exp $
+# $NetBSD: Makefile,v 1.9 2002/07/24 19:45:30 jlam Exp $
 
 DISTNAME=	modxslt
 PKGNAME=	ap-xslt-1.1
@@ -13,8 +13,7 @@ COMMENT=	Simple, fast XSLT transformations for apache
 DEPENDS+=	apache{,6}-1.3.*:../../www/apache
 DEPENDS+=	sablotron-*:../../textproc/sablotron
 
-# For "apxs":
-BUILD_DEPENDS+= perl>=${PERL5_REQD}:../../lang/perl5
+USE_PERL5=	build	# for "apxs"
 
 do-install:
 		${LOCALBASE}/sbin/apxs -i ${WRKSRC}/mod_xslt.so
diff --git a/www/libwww/Makefile b/www/libwww/Makefile
index 78d1314b6d3..093fc6d993f 100644
--- a/www/libwww/Makefile
+++ b/www/libwww/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.32 2002/07/15 14:39:21 fredb Exp $
+# $NetBSD: Makefile,v 1.33 2002/07/24 19:45:31 jlam Exp $
 
 DISTNAME=		w3c-libwww-5.3.2
 PKGNAME=		libwww-5.3.2
@@ -12,13 +12,13 @@ HOMEPAGE=		http://www.w3.org/Library/
 COMMENT=		The W3C Reference Library
 
 BUILD_DEPENDS+=		automake>=1.4:../../devel/automake
-BUILD_DEPENDS+=		perl>=${PERL5_REQD}:../../lang/perl5
 
 BUILDLINK_DEPENDS.openssl= openssl-*
 
 USE_BUILDLINK_ONLY=	YES
 USE_GMAKE=		YES
 USE_LIBTOOL=		YES
+USE_PERL5=		build
 
 GNU_CONFIGURE=		yes
 CONFIGURE_ARGS=		--with-zlib --with-regex --without-x
diff --git a/www/mozilla/Makefile b/www/mozilla/Makefile
index 8ee2e2e6bf7..210c37532ec 100644
--- a/www/mozilla/Makefile
+++ b/www/mozilla/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.92 2002/07/12 13:07:27 taya Exp $
+# $NetBSD: Makefile,v 1.93 2002/07/24 19:45:31 jlam Exp $
 
 MOZ_VER=	1.0
 DISTNAME=	mozilla-source-${MOZ_VER}
@@ -13,10 +13,10 @@ MAINTAINER=	taya@netbsd.org
 HOMEPAGE=	http://www.mozilla.org/
 COMMENT=	Open-source version of the Netscape browser
 
-BUILD_DEPENDS+=	perl>=5.6:../../lang/perl5
 BUILD_DEPENDS+=	zip>=2.3:../../archivers/zip
 BUILD_DEPENDS+=	autoconf>=2.13:../../devel/autoconf
 
+USE_PERL5=	build
 USE_GMAKE=	yes
 USE_X11BASE=	yes
 GNU_CONFIGURE=	yes
diff --git a/www/php3/Makefile b/www/php3/Makefile
index db442731c06..d1fc43630c5 100644
--- a/www/php3/Makefile
+++ b/www/php3/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.33 2002/02/28 15:07:17 jlam Exp $
+# $NetBSD: Makefile,v 1.34 2002/07/24 19:45:31 jlam Exp $
 
 PKGNAME=		php-${BASE_VERS}
 PKGREVISION?=		1
@@ -9,7 +9,7 @@ USE_BUILDLINK_ONLY=	yes
 
 .include "Makefile.common"
 
-BUILD_DEPENDS+=		perl>=${PERL5_REQD}:../../lang/perl5
+USE_PERL5=		build
 
 CPPFLAGS+=		-DPHP_INTERNAL_FUNCS
 FILES_SUBST+=		PHP_EXTENSION_DIR=${PHP_EXTENSION_DIR}
diff --git a/www/php3/Makefile.module b/www/php3/Makefile.module
index 0477b80bea0..c9e5cab48b2 100644
--- a/www/php3/Makefile.module
+++ b/www/php3/Makefile.module
@@ -1,13 +1,14 @@
-# $NetBSD: Makefile.module,v 1.2 2002/03/02 18:48:24 jlam Exp $
+# $NetBSD: Makefile.module,v 1.3 2002/07/24 19:45:31 jlam Exp $
 
 .include "../../www/php3/Makefile.common"
 
 PKGNAME=		php-${MODNAME}-${BASE_VERS}
 PKGREVISION?=		# empty
 
-BUILD_DEPENDS+=		perl>=${PERL5_REQD}:../../lang/perl5
 DEPENDS+=		php-${BASE_VERS}*:../../www/php3
 
+USE_PERL5=		build
+
 PKGMODNAME=		${MODNAME:S/-/_/}
 MODULESDIR=		${WRKSRC}/functions
 PLIST_SUBST+=		MODNAME=${PKGMODNAME}
diff --git a/www/quanta/Makefile b/www/quanta/Makefile
index 05d4339e11b..2fd631b0511 100644
--- a/www/quanta/Makefile
+++ b/www/quanta/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2002/03/13 17:37:52 fredb Exp $
+# $NetBSD: Makefile,v 1.10 2002/07/24 19:45:31 jlam Exp $
 
 DISTNAME=	quanta-2.0-pr2
 PKGNAME=	quanta-1.9.9.2
@@ -13,11 +13,11 @@ COMMENT= 	HTML editor suitable for experienced web developers
 
 BUILD_DEPENDS+=	qt2-designer-kde>=2.3.1nb2:../../x11/qt2-designer-kde
 BUILD_DEPENDS+=	automake>=1.4:../../devel/automake
-BUILD_DEPENDS+=	perl>=${PERL5_REQD}:../../lang/perl5
 
 BUILD_USES_MSGFMT=	YES
 USE_BUILDLINK_ONLY=	YES
 
+USE_PERL5=		build
 USE_GMAKE=              YES
 GNU_CONFIGURE=          YES
 USE_LIBTOOL=            YES
diff --git a/www/squid/Makefile b/www/squid/Makefile
index b76b832b821..8bf55f7364e 100644
--- a/www/squid/Makefile
+++ b/www/squid/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.64 2002/07/04 06:11:44 tron Exp $
+# $NetBSD: Makefile,v 1.65 2002/07/24 19:45:32 jlam Exp $
 
 DISTNAME=	squid-2.4.STABLE7-src
 PKGNAME=	squid-2.4.7
@@ -11,7 +11,7 @@ MAINTAINER=	tron@netbsd.org
 HOMEPAGE=	http://www.squid-cache.org/
 COMMENT=	Post-Harvest_cached WWW proxy cache and accelerator
 
-BUILD_DEPENDS+=	perl>=${PERL5_REQD}:../../lang/perl5
+USE_PERL5=	build
 
 .include "../../mk/bsd.prefs.mk"
 GNU_CONFIGURE=	YES