PERL5_REQD is now a list of values, so append to its value instead of

setting it.

18 files changed, 35 insertions, 36 deletions

diff --git a/comms/esms/Makefile b/comms/esms/Makefile
index 64a1d48cfd8..d693246646e 100644
--- a/comms/esms/Makefile
+++ b/comms/esms/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2003/07/17 21:26:40 grant Exp $
+# $NetBSD: Makefile,v 1.5 2004/02/10 02:22:49 jlam Exp $
 
 DISTNAME=	esms-0.9.5
 CATEGORIES=	comms
@@ -15,7 +15,7 @@ DEPENDS+=	p5-HTML-Tree>=3.11:../../www/p5-HTML-Tree
 GNU_CONFIGURE=	YES
 
 USE_PERL5=	YES
-PERL5_REQD?=	5.6.1
+PERL5_REQD+=	5.6.1
 REPLACE_PERL=	esms
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/autoconf/Makefile b/devel/autoconf/Makefile
index f08c9ddbc5d..4cda23d8c91 100644
--- a/devel/autoconf/Makefile
+++ b/devel/autoconf/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.46 2004/01/05 23:20:29 jlam Exp $
+# $NetBSD: Makefile,v 1.47 2004/02/10 02:22:50 jlam Exp $
 
 DISTNAME=		autoconf-2.59
 CATEGORIES=		devel
@@ -25,7 +25,7 @@ M4=			${LOCALBASE}/bin/gm4
 
 INFO_FILES=		autoconf.info standards.info
 
-PERL5_REQD=		5.6
+PERL5_REQD+=		5.6
 TEXINFO_REQD=		4.0
 
 AUTOMAKE_OVERRIDE=	NO
diff --git a/devel/automake/Makefile b/devel/automake/Makefile
index e9f76c12ae5..4be509eaabf 100644
--- a/devel/automake/Makefile
+++ b/devel/automake/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.47 2004/02/07 17:05:38 wiz Exp $
+# $NetBSD: Makefile,v 1.48 2004/02/10 02:22:50 jlam Exp $
 #
 
 DISTNAME=	automake-1.8.2
@@ -29,7 +29,7 @@ USE_MAKEINFO=		YES
 TEXINFO_REQD=		4.5
 INFO_FILES=		automake.info
 
-PERL5_REQD=		5.5
+PERL5_REQD+=		5.5
 
 TEST_TARGET=		check
 
diff --git a/devel/automake17/Makefile b/devel/automake17/Makefile
index 2c184d3b694..c29ada094b2 100644
--- a/devel/automake17/Makefile
+++ b/devel/automake17/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2003/12/12 19:39:19 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2004/02/10 02:22:50 jlam Exp $
 #
 
 DISTNAME=	automake-1.7.9
@@ -29,7 +29,7 @@ USE_MAKEINFO=		YES
 TEXINFO_REQD=		4.0
 INFO_FILES=		automake17.info
 
-PERL5_REQD=		5.5
+PERL5_REQD+=		5.5
 
 TEST_TARGET=		check
 
diff --git a/devel/p5-subversion/Makefile b/devel/p5-subversion/Makefile
index 6866294afc3..42d2b0f9938 100644
--- a/devel/p5-subversion/Makefile
+++ b/devel/p5-subversion/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2004/01/21 10:09:09 jlam Exp $
+# $NetBSD: Makefile,v 1.7 2004/02/10 02:22:50 jlam Exp $
 
 PKGNAME=	p5-subversion-${SVNVER}
 COMMENT=	Perl bindings for Subversion
@@ -7,7 +7,7 @@ COMMENT=	Perl bindings for Subversion
 
 CONFIGURE_ENV+=		PERL=${PERL5}
 
-PERL5_REQD=		5.8
+PERL5_REQD+=		5.8
 PERL_DIR=		${WRKSRC}/subversion/bindings/swig/perl
 ALL_TARGET=		swig-pl-lib
 INSTALL_TARGET=		install-swig-pl-lib
diff --git a/mail/courier-auth/Makefile.authdaemond b/mail/courier-auth/Makefile.authdaemond
index bab3a4d721c..2b6270afbf3 100644
--- a/mail/courier-auth/Makefile.authdaemond
+++ b/mail/courier-auth/Makefile.authdaemond
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile.authdaemond,v 1.5 2004/01/11 19:41:39 cjep Exp $
+# $NetBSD: Makefile.authdaemond,v 1.6 2004/02/10 02:22:50 jlam Exp $
 
 .include "../../mail/courier-auth/Makefile.common"
 
-PERL5_REQD=		5.6.0
+PERL5_REQD+=		5.6.0
 USE_PERL5?=		build
 
 WRKSRC_FILES=		config.guess config.sub configure		\
diff --git a/mail/courier-maildirmake/Makefile b/mail/courier-maildirmake/Makefile
index 98975463ef2..ee0c7a1f53d 100644
--- a/mail/courier-maildirmake/Makefile
+++ b/mail/courier-maildirmake/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.13 2003/08/30 22:51:20 jlam Exp $
+# $NetBSD: Makefile,v 1.14 2004/02/10 02:22:50 jlam Exp $
 
 PKGNAME=	courier-maildirmake-${BASE_VERS}
 PKGREVISION?=	1
 COMMENT=	Courier Maildir utilities
 
-PERL5_REQD=	5.6.0
+PERL5_REQD+=	5.6.0
 USE_PERL5=	build
 REPLACE_PERL=	sysconftool
 
diff --git a/mail/maildrop/Makefile b/mail/maildrop/Makefile
index c219f07442e..0ae0dcac609 100644
--- a/mail/maildrop/Makefile
+++ b/mail/maildrop/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.13 2003/05/29 23:14:09 grant Exp $
+# $NetBSD: Makefile,v 1.14 2004/02/10 02:22:50 jlam Exp $
 
 DISTNAME=	maildrop-1.3.9
 COMMENT=	Courier mail delivery agent with filtering abilities
 HOMEPAGE=	http://www.flounder.net/~mrsam/maildrop/
 
-PERL5_REQD=	5.6.0
+PERL5_REQD+=	5.6.0
 USE_PERL5=	build
 DEPENDS+=	courier-maildirmake>=0.37.1:../../mail/courier-maildirmake
 
diff --git a/mail/spamassassin/Makefile b/mail/spamassassin/Makefile
index c1451813a77..7a542c729d8 100644
--- a/mail/spamassassin/Makefile
+++ b/mail/spamassassin/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.41 2004/01/26 15:25:00 cube Exp $
+# $NetBSD: Makefile,v 1.42 2004/02/10 02:22:50 jlam Exp $
 
 DISTNAME=	Mail-SpamAssassin-${PKGVERSION}
 PKGNAME=	spamassassin-2.63
@@ -19,7 +19,7 @@ PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
 .include "../../mk/bsd.prefs.mk"
 
-PERL5_REQD=	5.6.0	# MakeMaker >= 5.45 needed
+PERL5_REQD+=	5.6.0	# MakeMaker >= 5.45 needed
 
 DEPENDS+=	p5-Net-DNS>=0.29:../../net/p5-Net-DNS
 DEPENDS+=	p5-HTML-Parser>=3.29:../../www/p5-HTML-Parser
diff --git a/mail/sympa/Makefile b/mail/sympa/Makefile
index 8564cbd05d0..695c20f503d 100644
--- a/mail/sympa/Makefile
+++ b/mail/sympa/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2004/01/12 09:46:04 cjep Exp $
+# $NetBSD: Makefile,v 1.7 2004/02/10 02:22:50 jlam Exp $
 #
 
 DISTNAME=	sympa-3.4.2
@@ -31,7 +31,7 @@ USE_PKGINSTALL=		YES
 GNU_CONFIGURE=		YES
 CONFIGURE_ARGS+=	--with-piddir=/var/run
 
-PERL5_REQD=	5.005
+PERL5_REQD+=	5.005
 
 PKG_GROUPS?=	sympa
 PKG_USERS?=	sympa:sympa
diff --git a/net/mrtg/Makefile b/net/mrtg/Makefile
index 5696fa3b698..49927132f59 100644
--- a/net/mrtg/Makefile
+++ b/net/mrtg/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.46 2003/12/17 14:22:48 martti Exp $
+# $NetBSD: Makefile,v 1.47 2004/02/10 02:22:50 jlam Exp $
 
 DISTNAME=	mrtg-2.10.11
 PKGREVISION=	1
@@ -29,7 +29,7 @@ COMMENT=	The Multi-Router Traffic Grapher
 
 USE_BUILDLINK2=	YES
 USE_PERL5=	YES
-PERL5_REQD=	5.6.1
+PERL5_REQD+=	5.6.1
 USE_X11=	YES
 GNU_CONFIGURE=	YES
 BUILD_DEFS+=	USE_INET6
diff --git a/net/p5-Net-DNS/Makefile b/net/p5-Net-DNS/Makefile
index 7e7f41b56e6..bd81dfc5514 100644
--- a/net/p5-Net-DNS/Makefile
+++ b/net/p5-Net-DNS/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2004/01/25 16:56:27 jlam Exp $
+# $NetBSD: Makefile,v 1.19 2004/02/10 02:22:50 jlam Exp $
 #
 
 DISTNAME=		Net-DNS-0.45
@@ -20,7 +20,7 @@ DEPENDS+=		p5-Digest-MD5>=2.12:../../security/p5-Digest-MD5
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
 USE_BUILDLINK3=		YES
-PERL5_REQD=		5.6.0
+PERL5_REQD+=		5.6.0
 MAKE_PARAMS=		--online-tests
 
 PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/Net/DNS/.packlist
diff --git a/net/smokeping/Makefile b/net/smokeping/Makefile
index 943d8ab77ae..89c60ddddab 100644
--- a/net/smokeping/Makefile
+++ b/net/smokeping/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2003/07/21 17:11:16 martti Exp $
+# $NetBSD: Makefile,v 1.4 2004/02/10 02:22:50 jlam Exp $
 
 DISTNAME=	smokeping-1.19
 CATEGORIES=	net
@@ -14,7 +14,7 @@ DEPENDS+=	p5-Digest-MD5>=2.20:../../security/p5-Digest-MD5
 DEPENDS+=	p5-libwww>=5.64:../../www/p5-libwww
 
 USE_PERL5=	YES
-PERL5_REQD=	5.6.0
+PERL5_REQD+=	5.6.0
 USE_PKGINSTALL=	yes
 
 PKG_SYSCONFSUBDIR?=     smokeping
diff --git a/pkgtools/pkgdiff/Makefile b/pkgtools/pkgdiff/Makefile
index 1dbfce0886a..c27f1f5b2ea 100644
--- a/pkgtools/pkgdiff/Makefile
+++ b/pkgtools/pkgdiff/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.45 2004/01/20 12:23:57 agc Exp $
+# $NetBSD: Makefile,v 1.46 2004/02/10 02:22:50 jlam Exp $
 #
 
 DISTNAME=	pkgdiff-0.113
@@ -12,7 +12,7 @@ COMMENT=	Tools to ease creating and maintaining patches for pkgsrc
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
-PERL5_REQD=	5.6.0
+PERL5_REQD+=	5.6.0
 
 EXTRACT_ONLY=	# empty
 NO_CHECKSUM=	yes
diff --git a/textproc/eperl/Makefile b/textproc/eperl/Makefile
index c9a053e556e..afcf97c44b2 100644
--- a/textproc/eperl/Makefile
+++ b/textproc/eperl/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2003/07/17 22:54:14 grant Exp $
+# $NetBSD: Makefile,v 1.19 2004/02/10 02:22:50 jlam Exp $
 
 DISTNAME=	eperl-2.2.14
 CATEGORIES=	lang perl5 textproc
@@ -9,7 +9,6 @@ HOMEPAGE=	http://www.engelschall.com/sw/eperl/
 COMMENT=	Interpreter/preprocessor for Perl embedded in text documents
 
 USE_BUILDLINK2=	YES
-LIBPERL5_REQD=	${PERL5_REQD}
 PERL5_PACKLIST=	${PERL5_SITEARCH}/auto/Parse/ePerl/.packlist
 
 GNU_CONFIGURE=		YES
diff --git a/textproc/p5-XML-Xerces/Makefile b/textproc/p5-XML-Xerces/Makefile
index 8f9022d9e12..409dd6f2fb9 100644
--- a/textproc/p5-XML-Xerces/Makefile
+++ b/textproc/p5-XML-Xerces/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2004/01/24 15:13:20 grant Exp $
+# $NetBSD: Makefile,v 1.4 2004/02/10 02:22:50 jlam Exp $
 #
 
 DISTNAME=	XML-Xerces-1.7.0-3
@@ -14,7 +14,7 @@ CONFLICTS+=	XML-Xerces-[0-9]*
 
 USE_BUILDLINK2=	YES
 USE_GNU_TOOLS+=	make
-PERL5_REQD=	5.6.0
+PERL5_REQD+=	5.6.0
 PERL5_PACKLIST=	${PERL5_SITEARCH}/auto/XML/Xerces/.packlist
 
 MAKE_ENV+=	XERCESCROOT="${BUILDLINK_PREFIX.xerces-c}"
diff --git a/www/ap-perl/Makefile b/www/ap-perl/Makefile
index 60b92d054c2..e72ccde8173 100644
--- a/www/ap-perl/Makefile
+++ b/www/ap-perl/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.28 2003/07/17 22:55:26 grant Exp $
+# $NetBSD: Makefile,v 1.29 2004/02/10 02:22:50 jlam Exp $
 #
 # NOTE:	Versions 1.27 and 1.28 cause apache to dump core,
 #	so this packages has been left at version 1.25
@@ -23,7 +23,7 @@ DEPENDS+=		p5-BSD-Resource>=1.10:../../devel/p5-BSD-Resource
 
 USE_BUILDLINK2=		YES
 APACHE_MODULE=		YES
-LIBPERL5_REQD=		${PERL5_REQD}
+LIBPERL5_REQD=		${_PERL5_REQD}
 PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/mod_perl/.packlist
 
 MAKE_PARAMS+=		USE_APXS=1
diff --git a/www/ap2-perl/Makefile b/www/ap2-perl/Makefile
index f7f1363c4eb..716769c457f 100644
--- a/www/ap2-perl/Makefile
+++ b/www/ap2-perl/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2004/01/17 12:36:03 bad Exp $
+# $NetBSD: Makefile,v 1.10 2004/02/10 02:22:50 jlam Exp $
 #
 # NOTE: This package is *BETA*.  If it doesn't work, then check the
 #	modperl-2.0 mailing lists for help.
@@ -17,7 +17,7 @@ CONFLICTS=		ap-perl-[0-9]*
 
 USE_BUILDLINK2=		# defined
 APACHE_MODULE=		# defined
-PERL5_REQD?=		5.6.0
+PERL5_REQD+=		5.6.0
 PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/mod_perl/.packlist
 
 MAKE_PARAMS+=		MP_APXS=${APXS}