Use PERL5 variable for location of perl5 binary.

21 files changed, 49 insertions, 50 deletions

diff --git a/devel/cvs-current/Makefile b/devel/cvs-current/Makefile
index 9f52a250810..96c73910b67 100644
--- a/devel/cvs-current/Makefile
+++ b/devel/cvs-current/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2000/08/10 17:00:39 thorpej Exp $
+# $NetBSD: Makefile,v 1.10 2000/08/28 09:14:50 jlam Exp $
 #
 
 DISTNAME=       cvs-1.10.8
@@ -38,7 +38,7 @@ CONFIGURE_ARGS+=	--with-krb4=no
 CFLAGS+=	-DLOCALID=\"\\\"${RCS_LOCALID}\\\"\"
 .endif
 
-CONFIGURE_ENV+=	perl_path=${LOCALBASE}/bin/perl
+CONFIGURE_ENV+=	perl_path=${PERL5}
 
 INFO_FILES=	cvs.info cvsclient.info
 
diff --git a/devel/cvs/Makefile b/devel/cvs/Makefile
index 29bdc5df16c..77ddf70feff 100644
--- a/devel/cvs/Makefile
+++ b/devel/cvs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.28 2000/08/10 17:00:39 thorpej Exp $
+# $NetBSD: Makefile,v 1.29 2000/08/28 09:14:50 jlam Exp $
 #
 
 DISTNAME=       cvs-1.10
@@ -40,7 +40,7 @@ CONFIGURE_ARGS+=	--with-krb4=no
 CFLAGS+=	-DLOCALID=\"\\\"${RCS_LOCALID}\\\"\"
 .endif
 
-CONFIGURE_ENV+=	perl_path=${LOCALBASE}/bin/perl
+CONFIGURE_ENV+=	perl_path=${PERL5}
 
 INFO_FILES=	cvs.info cvsclient.info
 
diff --git a/devel/ptl2/Makefile b/devel/ptl2/Makefile
index 8170827982e..b1d3aa1dfcf 100644
--- a/devel/ptl2/Makefile
+++ b/devel/ptl2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2000/07/17 12:40:02 msaitoh Exp $
+# $NetBSD: Makefile,v 1.24 2000/08/28 09:14:50 jlam Exp $
 
 DISTNAME=		PTL-2.1.4
 PKGNAME=		ptl-2.1.4
@@ -10,7 +10,7 @@ PATCH_SITES=		${MASTER_SITES}
 MAINTAINER=		msaitoh@netbsd.org
 HOMEPAGE=		http://www.media.osaka-cu.ac.jp/~k-abe/PTL/
 
-BUILD_DEPENDS=		${LOCALBASE}/bin/perl:../../lang/perl5
+BUILD_DEPENDS=		${PERL5}:../../lang/perl5
 
 MAKE_ENV=		INSTALL_PROGRAM="${INSTALL_SCRIPT}"
 PLIST_SRC=		${WRKDIR}/PLIST
diff --git a/lang/moscow_ml/Makefile b/lang/moscow_ml/Makefile
index f6ea6b601bd..24bed88cd3d 100644
--- a/lang/moscow_ml/Makefile
+++ b/lang/moscow_ml/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2000/08/23 21:57:58 tron Exp $
+# $NetBSD: Makefile,v 1.11 2000/08/28 09:14:50 jlam Exp $
 
 DISTNAME=       mos20src
 PKGNAME=        moscow_ml-2.00
@@ -10,7 +10,7 @@ MASTER_SITES=	ftp://ftp.dina.kvl.dk/pub/mosml/ \
 MAINTAINER=	lamj@stat.cmu.edu
 HOMEPAGE=	http://www.dina.kvl.dk/~sestoft/mosml.html
 
-BUILD_DEPENDS+=	${LOCALBASE}/bin/perl:../../lang/perl5
+BUILD_DEPENDS+=	${PERL5}:../../lang/perl5
 
 ALL_TARGET=	clean world
 
diff --git a/net/ethereal/Makefile b/net/ethereal/Makefile
index 721fbbb34a8..04764133963 100644
--- a/net/ethereal/Makefile
+++ b/net/ethereal/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.32 2000/08/05 07:33:37 tron Exp $
+# $NetBSD: Makefile,v 1.33 2000/08/28 09:14:50 jlam Exp $
 #
 
 DISTNAME=		ethereal-${ETHEREAL_VERSION}
@@ -10,7 +10,7 @@ MAINTAINER=		frueauf@netbsd.org
 HOMEPAGE=		http://ethereal.zing.org/
 
 DEPENDS=		gtk+-1.2.*:../../x11/gtk
-BUILD_DEPENDS+=		${LOCALBASE}/bin/perl:../../lang/perl5
+BUILD_DEPENDS+=		${PERL5}:../../lang/perl5
 
 USE_X11=		yes
 GNU_CONFIGURE=		yes
diff --git a/net/vnc/Makefile b/net/vnc/Makefile
index 12f3997ab06..ddba9054ccf 100644
--- a/net/vnc/Makefile
+++ b/net/vnc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2000/07/11 10:00:39 agc Exp $
+# $NetBSD: Makefile,v 1.12 2000/08/28 09:14:50 jlam Exp $
 # FreeBSD Id: Makefile,v 1.2 1998/03/19 01:54:59 msmith Exp
 #
 
@@ -12,7 +12,7 @@ DISTFILES=		vnc-3.3.3r1_unixsrc.tgz \
 MAINTAINER=	 	packages@netbsd.org
 HOMEPAGE=		http://www.uk.research.att.com/vnc/
 
-USE_PERL5=		yes
+USE_PERL5=		# defined
 
 # Is this for real? The code was developed in the UK,
 # but the DES parts came from the USA in the first place.
@@ -20,8 +20,8 @@ RESTRICTED=		Contains cryptographic software
 
 WRKSRC=			${WRKDIR}/vnc_unixsrc
 
-USE_IMAKE=		yes
-NO_INSTALL_MANPAGES=	yes
+USE_IMAKE=		# defined
+NO_INSTALL_MANPAGES=	# defined
 
 ALL_TARGET=    		World
 
@@ -32,7 +32,7 @@ post-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/vncviewer/vncviewer ${PREFIX}/bin/vncviewer
 	${INSTALL_PROGRAM} ${WRKSRC}/vncpasswd/vncpasswd ${PREFIX}/bin/vncpasswd
 	${SED} -e 's|/usr/local/vnc/classes|${X11PREFIX}/share/vnc/classes|g' \
-		-e 's|/usr/bin/perl|${LOCALBASE}/bin/perl|g' \
+		-e 's|/usr/bin/perl|${PERL5}|g' \
 		< ${WRKSRC}/vncserver \
 		> ${WRKSRC}/vncserver.local
 	${INSTALL_SCRIPT} ${WRKSRC}/vncserver.local ${PREFIX}/bin/vncserver
diff --git a/security/openssh/Makefile b/security/openssh/Makefile
index 7e01b9ffdc1..dd535da9364 100644
--- a/security/openssh/Makefile
+++ b/security/openssh/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2000/08/18 22:46:48 hubertf Exp $
+# $NetBSD: Makefile,v 1.23 2000/08/28 09:14:51 jlam Exp $
 #
 
 DISTNAME=		openssh-2.1.1p4
@@ -16,7 +16,7 @@ MASTER_SITES=		http://the.wiretapped.net/security/cryptography/ssh/OpenSSH/files
 MAINTAINER=		packages@netbsd.org
 HOMEPAGE=		http://www.openssh.com/
 
-BUILD_DEPENDS+=		${LOCALBASE}/bin/perl:../../lang/perl5
+BUILD_DEPENDS+=		${PERL5}:../../lang/perl5
 BUILD_DEPENDS+=		autoreconf:../../devel/autoconf
 
 # Check for a usable installed version of OpenSSL.  Version must be greater
@@ -44,7 +44,6 @@ CONFLICTS=		ssh-[0-9]* ssh6-[0-9]*
 # retain the following line, for IPv6-ready pkgsrc webpage 
 BUILD_DEFS+=		USE_INET6
 BUILD_DEFS+=		SSH_CONF_DIR
-# USE_PERL5=		yes
 
 RESTRICTED=		"Crypto; export-controlled"
 NO_SRC_ON_FTP=	${RESTRICTED}
diff --git a/security/pgp5/Makefile b/security/pgp5/Makefile
index a0a4defe59b..fb5f2327b2c 100644
--- a/security/pgp5/Makefile
+++ b/security/pgp5/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2000/08/18 22:46:49 hubertf Exp $
+# $NetBSD: Makefile,v 1.6 2000/08/28 09:14:51 jlam Exp $
 #
 
 DISTNAME=	pgp50i-unix-src
@@ -17,7 +17,7 @@ MASTER_SITES=	ftp://ftp.pgpi.com/pub/pgp/5.0/unix/ \
 MAINTAINER=	mjl@netbsd.org
 HOMEPAGE=       http://www.pgpi.com/
 
-BUILD_DEPENDS=	${LOCALBASE}/bin/perl:../../lang/perl5
+BUILD_DEPENDS=	${PERL5}:../../lang/perl5
 
 RESTRICTED=	"Cryptographic software"
 NO_SRC_ON_FTP=	${RESTRICTED}
diff --git a/sysutils/xps/Makefile b/sysutils/xps/Makefile
index 776426cd889..55f32ab05ba 100644
--- a/sysutils/xps/Makefile
+++ b/sysutils/xps/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 1999/07/13 01:42:43 sakamoto Exp $
+# $NetBSD: Makefile,v 1.8 2000/08/28 09:14:51 jlam Exp $
 
 DISTNAME=	xps-3.14
 CATEGORIES=	sysutils
@@ -7,12 +7,12 @@ MASTER_SITES=	ftp://ftp.netwinder.org/users/r/rocky/
 MAINTAINER=	packages@netbsd.org
 HOMEPAGE=	http://www.netwinder.org/~rocky/xps-home/
 
-BUILD_DEPENDS=	${LOCALBASE}/bin/perl:${PKGSRCDIR}/lang/perl5
+BUILD_DEPENDS=	${PERL5}:../..//lang/perl5
 
-USE_GMAKE=	YES
-USE_X11BASE=	YES
-USE_MOTIF=	YES
+USE_GMAKE=	# defined
+USE_X11BASE=	# defined
+USE_MOTIF=	# defined
 
-GNU_CONFIGURE=	YES
+GNU_CONFIGURE=	# defined
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/ap-auth-cookie/Makefile b/www/ap-auth-cookie/Makefile
index 7c249523058..d76d2dd8a52 100644
--- a/www/ap-auth-cookie/Makefile
+++ b/www/ap-auth-cookie/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 1999/11/21 22:12:58 tron Exp $
+# $NetBSD: Makefile,v 1.15 2000/08/28 09:14:51 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
@@ -16,7 +16,7 @@ HOMEPAGE=	ftp://ftp.kciLink.com/pub/mod_auth_cookie.txt
 
 DEPENDS+=	apache-1.3.*:../../www/apache
 # For "apxs":
-BUILD_DEPENDS=	${LOCALBASE}/bin/perl:../../lang/perl5
+BUILD_DEPENDS=	${PERL5}:../../lang/perl5
 
 EXTRACT_CMD=	${DO_NADA}
 
diff --git a/www/ap-auth-ldap/Makefile b/www/ap-auth-ldap/Makefile
index 103efd9011b..615ff3dcf81 100644
--- a/www/ap-auth-ldap/Makefile
+++ b/www/ap-auth-ldap/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2000/06/15 12:55:37 kleink Exp $
+# $NetBSD: Makefile,v 1.3 2000/08/28 09:14:51 jlam Exp $
 
 DISTNAME=	auth_ldap-1.4.2
 PKGNAME=	ap-auth-ldap-1.4.2
@@ -12,7 +12,7 @@ DEPENDS+=	apache-1.3.*:../../www/apache
 DEPENDS+=	openldap-1.2.*:../../databases/openldap
 
 # For "apxs":
-BUILD_DEPENDS=	${LOCALBASE}/bin/perl:../../lang/perl5
+BUILD_DEPENDS=	${PERL5}:../../lang/perl5
 
 do-build:
 	@cd ${WRKSRC} && ${LOCALBASE}/sbin/apxs -c			\
diff --git a/www/ap-auth-postgresql/Makefile b/www/ap-auth-postgresql/Makefile
index 7fbb2db040b..73c0152e965 100644
--- a/www/ap-auth-postgresql/Makefile
+++ b/www/ap-auth-postgresql/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2000/06/21 16:07:35 darcy Exp $
+# $NetBSD: Makefile,v 1.4 2000/08/28 09:14:51 jlam Exp $
 
 DISTNAME=	AuthPG-1.2b2
 PKGNAME=	ap-auth-postgresql-1.2b2
@@ -11,7 +11,7 @@ HOMEPAGE=	http://home.bawi.org/~minskim/authpg/
 DEPENDS+=	apache-1.3.*:../../www/apache
 DEPENDS+=	postgresql-*:../../databases/postgresql
 # For "apxs":
-BUILD_DEPENDS=	${LOCALBASE}/bin/perl:../../lang/perl5
+BUILD_DEPENDS=	${PERL5}:../../lang/perl5
 
 CPPFLAGS+=	-I${LOCALBASE}/include/pgsql
 LIBS=		-lpq -lcrypt
diff --git a/www/ap-dtcl/Makefile b/www/ap-dtcl/Makefile
index 81ab1ddcf9f..f9164d9e85e 100644
--- a/www/ap-dtcl/Makefile
+++ b/www/ap-dtcl/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 1999/11/21 22:12:59 tron Exp $
+# $NetBSD: Makefile,v 1.4 2000/08/28 09:14:51 jlam Exp $
 
 DISTNAME=	libapache-mod-dtcl_0.6.4-1
 PKGNAME=	ap-dtcl-0.6.4
@@ -12,7 +12,7 @@ HOMEPAGE=	http://comanche.com.dtu.dk/dave/
 DEPENDS+=	apache-1.3.*:../../www/apache
 DEPENDS+=	tcl-*:../../lang/tcl80
 # For "apxs":
-BUILD_DEPENDS=	${LOCALBASE}/bin/perl:../../lang/perl5
+BUILD_DEPENDS=	${PERL5}:../../lang/perl5
 
 INCLUDES=	-I${PREFIX}/include/tcl8.0
 LIBS=		-L${PREFIX}/lib -Wl,-R${PREFIX}/lib -ltcl80 -lm
diff --git a/www/ap-fastcgi/Makefile b/www/ap-fastcgi/Makefile
index d5bbb3f7614..ea0209a384d 100644
--- a/www/ap-fastcgi/Makefile
+++ b/www/ap-fastcgi/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2000/05/18 10:11:05 mjl Exp $
+# $NetBSD: Makefile,v 1.12 2000/08/28 09:14:51 jlam Exp $
 #
 
 DISTNAME=	mod_fastcgi_2.2.4
@@ -11,7 +11,7 @@ HOMEPAGE=	http://www.fastcgi.com/
 
 DEPENDS+=	apache-1.3.*:../../www/apache
 # For "apxs":
-BUILD_DEPENDS=	${LOCALBASE}/bin/perl:../../lang/perl5
+BUILD_DEPENDS=	${PERL5}:../../lang/perl5
 
 do-build:
 	@cd ${WRKSRC} && ${PREFIX}/sbin/apxs -c -o mod_fastcgi.so *.c
diff --git a/www/ap-jserv/Makefile b/www/ap-jserv/Makefile
index 9bd9eb80c63..494b29e8dee 100644
--- a/www/ap-jserv/Makefile
+++ b/www/ap-jserv/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2000/08/15 13:49:04 wiz Exp $
+# $NetBSD: Makefile,v 1.13 2000/08/28 09:14:52 jlam Exp $
 
 DISTNAME=	ApacheJServ-1.1.2
 PKGNAME=	ap-jserv-1.1.2
@@ -12,7 +12,7 @@ DEPENDS+=	apache>=1.3.9:../../www/apache
 # yes, this needs _exactly_ version 2.0
 DEPENDS+=	jsdk-2.0:../../www/jsdk20
 # For "apxs":
-BUILD_DEPENDS=	${LOCALBASE}/bin/perl:../../lang/perl5
+BUILD_DEPENDS=	${PERL5}:../../lang/perl5
 
 .include "../../mk/bsd.prefs.mk"
 
diff --git a/www/ap-ssl/Makefile b/www/ap-ssl/Makefile
index 85671cbf1b4..56ab9ca7b14 100644
--- a/www/ap-ssl/Makefile
+++ b/www/ap-ssl/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2000/07/21 16:59:28 tron Exp $
+# $NetBSD: Makefile,v 1.18 2000/08/28 09:14:52 jlam Exp $
 #
 
 DISTNAME=	mod_ssl-2.6.3-1.3.12
@@ -11,7 +11,7 @@ HOMEPAGE=	http://www.modssl.org/
 
 DEPENDS+=	apache-1.3.12:../../www/apache
 # For "apxs":
-BUILD_DEPENDS+=	${LOCALBASE}/bin/perl:../../lang/perl5
+BUILD_DEPENDS+=	${PERL5}:../../lang/perl5
 
 CONFLICTS=	apache-1.3.[0123456789] apache-*modssl-* apache6-*
 
diff --git a/www/apache/Makefile b/www/apache/Makefile
index d8576e76977..feea64ba7ee 100644
--- a/www/apache/Makefile
+++ b/www/apache/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.46 2000/04/24 13:13:22 tron Exp $
+# $NetBSD: Makefile,v 1.47 2000/08/28 09:14:52 jlam Exp $
 #
 # The fourth number in the PKGNAME version indicates a NetBSD pkg revision
 # (to indicate changes in the shipped third party patches such as the mod_ssl
@@ -36,7 +36,7 @@ CONFIGURE_ARGS+=	--prefix=${PREFIX} --libexecdir=${PREFIX}/lib/httpd \
 			--enable-rule=EAPI --enable-module=most \
 			--disable-module=ssl --enable-module=auth_db \
 			--disable-module=auth_dbm \
-			--with-perl=${PREFIX}/bin/perl
+			--with-perl=${PERL5}
 CONFIGURE_ENV+=		OPTIM="${OPTIM}"
 
 .include "../../mk/bsd.prefs.mk"
diff --git a/www/apache6/Makefile b/www/apache6/Makefile
index 45fcbdab02c..98edc6441b8 100644
--- a/www/apache6/Makefile
+++ b/www/apache6/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2000/08/15 10:31:24 itojun Exp $
+# $NetBSD: Makefile,v 1.16 2000/08/28 09:14:52 jlam Exp $
 #
 # The fourth number in the PKGNAME version indicates a NetBSD pkg revision
 # (to indicate changes in the shipped third party patches such as the mod_ssl
@@ -42,7 +42,7 @@ CONFIGURE_ARGS+=	--prefix=${PREFIX} --libexecdir=${PREFIX}/lib/httpd \
 			--enable-module=most \
 			--enable-module=auth_db \
 			--disable-module=auth_dbm \
-			--with-perl=${PREFIX}/bin/perl
+			--with-perl=${PERL5}
 #			--enable-rule=EAPI --disable-module=ssl 
 CONFIGURE_SCRIPT=	${WRKSRC}/configure.v6
 CONFIGURE_ENV+=		OPTIM="${OPTIM}"
diff --git a/www/mozilla/Makefile b/www/mozilla/Makefile
index 537dac5fcfb..03f6578c87c 100644
--- a/www/mozilla/Makefile
+++ b/www/mozilla/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.35 2000/08/17 13:11:08 wiz Exp $: Makefile,v 1.30 2000/06/17 22:14:00 tsarna Exp $
+# $NetBSD: Makefile,v 1.36 2000/08/28 09:14:52 jlam Exp $: Makefile,v 1.30 2000/06/17 22:14:00 tsarna Exp $
 
 DISTNAME=	mozilla-source-M17
 PKGNAME=	mozilla-5.0m17
@@ -10,7 +10,7 @@ EXTRACT_SUFX=	.tar.bz2
 MAINTAINER=	packages@netbsd.org
 HOMEPAGE=	http://www.mozilla.org/
 
-BUILD_DEPENDS+=	${LOCALBASE}/bin/perl:../../lang/perl5
+BUILD_DEPENDS+=	${PERL5}:../../lang/perl5
 BUILD_DEPENDS+=	autoconf:../../devel/autoconf
 DEPENDS+=	gtk+>=1.2.8:../../x11/gtk
 DEPENDS+=	ORBit>=0.5.1:../../net/ORBit
diff --git a/x11/gtk/Makefile b/x11/gtk/Makefile
index 240fb72fd88..dfbd0e28da2 100644
--- a/x11/gtk/Makefile
+++ b/x11/gtk/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.45 2000/07/31 04:14:11 jlam Exp $
+# $NetBSD: Makefile,v 1.46 2000/08/28 09:14:52 jlam Exp $
 
 DISTNAME=		gtk+-1.2.8
 CATEGORIES=		x11
@@ -12,7 +12,7 @@ HOMEPAGE=		http://www.gtk.org/
 
 DEPENDS+=		gettext>=0.10.35nb1:../../devel/gettext
 DEPENDS+=		glib>=1.2.8:../../devel/glib
-BUILD_DEPENDS+=		${LOCALBASE}/bin/perl:../../lang/perl5
+BUILD_DEPENDS+=		${PERL5}:../../lang/perl5
 
 USE_LIBTOOL=		yes
 LTCONFIG_OVERRIDE=	${WRKSRC}/ltconfig
diff --git a/x11/type1inst/Makefile b/x11/type1inst/Makefile
index 698c01fcd9a..86eccee585d 100644
--- a/x11/type1inst/Makefile
+++ b/x11/type1inst/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2000/07/11 10:33:50 agc Exp $
+# $NetBSD: Makefile,v 1.4 2000/08/28 09:14:52 jlam Exp $
 #
 
 DISTNAME=		type1inst-0.6.1
@@ -13,7 +13,7 @@ USE_X11BASE=		yes
 post-patch:
 	@for patchee in ${WRKSRC}/type1inst ${WRKSRC}/t1embed; do \
 		${MV} -f $$patchee ${WRKSRC}/foo ; \
-		${SED} -e 's@XXXPERLXXX@${LOCALBASE}/bin/perl@g' \
+		${SED} -e 's@XXXPERLXXX@${PERL5}@g' \
 			<${WRKSRC}/foo > $$patchee ; \
 	done
 	@${RM} -f ${WRKSRC}/foo