Update build dependency on perl to build in correct directory if perl

interpreter is not found.

20 files changed, 40 insertions, 40 deletions

diff --git a/devel/libgtop/Makefile b/devel/libgtop/Makefile
index 000ee12cbe7..d564c1f8f19 100644
--- a/devel/libgtop/Makefile
+++ b/devel/libgtop/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.42 2000/08/27 02:46:04 jlam Exp $
+# $NetBSD: Makefile,v 1.43 2000/09/05 09:33:15 jlam Exp $
 
 DISTNAME=		libgtop-1.0.9
 CATEGORIES=		devel gnome
@@ -7,7 +7,7 @@ MASTER_SITES=		${MASTER_SITE_GNOME:=stable/sources/libgtop/}
 MAINTAINER=		tron@netbsd.org
 HOMEPAGE=		http://www.home-of-linux.org/gnome/libgtop/
 
-BUILD_DEPENDS=		${PERL5}:../../lang/perl5
+BUILD_DEPENDS=		${PERL5}:../../lang/perl5-base
 DEPENDS+=		gettext>=0.10.35nb1:../../devel/gettext
 DEPENDS+=		gnome-libs-*:../../x11/gnome-libs
 DEPENDS+=		guile-[0-9]*:../../lang/guile
diff --git a/devel/ptl2/Makefile b/devel/ptl2/Makefile
index b1d3aa1dfcf..ea820c151be 100644
--- a/devel/ptl2/Makefile
+++ b/devel/ptl2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2000/08/28 09:14:50 jlam Exp $
+# $NetBSD: Makefile,v 1.25 2000/09/05 09:33:15 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=		${PERL5}:../../lang/perl5
+BUILD_DEPENDS=		${PERL5}:../../lang/perl5-base
 
 MAKE_ENV=		INSTALL_PROGRAM="${INSTALL_SCRIPT}"
 PLIST_SRC=		${WRKDIR}/PLIST
diff --git a/graphics/Mesa-glx/Makefile b/graphics/Mesa-glx/Makefile
index fe70e1ceaed..54b5e6b08ff 100644
--- a/graphics/Mesa-glx/Makefile
+++ b/graphics/Mesa-glx/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2000/09/03 10:11:47 wiz Exp $
+# $NetBSD: Makefile,v 1.14 2000/09/05 09:33:15 jlam Exp $
 
 DISTNAME=	glx-20000813
 PKGNAME=	Mesa-${DISTNAME}
@@ -12,7 +12,7 @@ DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
 MAINTAINER=	tron@netbsd.org
 HOMEPAGE=	http://utah-glx.sourceforge.net/
 
-BUILD_DEPENDS+=	${PERL5}:../../lang/perl5
+BUILD_DEPENDS+=	${PERL5}:../../lang/perl5-base
 BUILD_DEPENDS+=	${AUTOCONF}:../../devel/autoconf
 BUILD_DEPENDS+=	${TCLSH}:../../lang/tcl
 
diff --git a/lang/moscow_ml/Makefile b/lang/moscow_ml/Makefile
index 24bed88cd3d..ca83d595f30 100644
--- a/lang/moscow_ml/Makefile
+++ b/lang/moscow_ml/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2000/08/28 09:14:50 jlam Exp $
+# $NetBSD: Makefile,v 1.12 2000/09/05 09:33:16 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+=	${PERL5}:../../lang/perl5
+BUILD_DEPENDS+=	${PERL5}:../../lang/perl5-base
 
 ALL_TARGET=	clean world
 
diff --git a/net/ethereal/Makefile b/net/ethereal/Makefile
index 04764133963..169c826326f 100644
--- a/net/ethereal/Makefile
+++ b/net/ethereal/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.33 2000/08/28 09:14:50 jlam Exp $
+# $NetBSD: Makefile,v 1.34 2000/09/05 09:33:16 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+=		${PERL5}:../../lang/perl5
+BUILD_DEPENDS+=		${PERL5}:../../lang/perl5-base
 
 USE_X11=		yes
 GNU_CONFIGURE=		yes
diff --git a/net/freewais-sf/Makefile b/net/freewais-sf/Makefile
index 0a044e527e0..4a7eedcdc71 100644
--- a/net/freewais-sf/Makefile
+++ b/net/freewais-sf/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2000/08/27 06:07:43 jlam Exp $
+# $NetBSD: Makefile,v 1.6 2000/09/05 09:33:16 jlam Exp $
 #
 
 DISTNAME=	freeWAIS-sf-2.2.12
@@ -9,7 +9,7 @@ MASTER_SITES=	ftp://ls6-ftp.cs.uni-dortmund.de/pub/src/freeWAIS-sf/
 MAINTAINER=	bad@NetBSD.org
 HOMEPAGE=	http://ls6-www.informatik.uni-dortmund.de/ir/projects/freeWAIS-sf/index.html
 
-BUILD_DEPENDS=	${PERL5}:../../lang/perl5
+BUILD_DEPENDS=	${PERL5}:../../lang/perl5-base
 
 USE_LIBTOOL=	# defined
 
diff --git a/security/openssh/Makefile b/security/openssh/Makefile
index a49ffa8c393..9dcde79b1bf 100644
--- a/security/openssh/Makefile
+++ b/security/openssh/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2000/09/04 00:47:49 itojun Exp $
+# $NetBSD: Makefile,v 1.26 2000/09/05 09:33:16 jlam Exp $
 #
 
 DISTNAME=		openssh-2.2.0p1
@@ -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+=		${PERL5}:../../lang/perl5
+BUILD_DEPENDS+=		${PERL5}:../../lang/perl5-base
 BUILD_DEPENDS+=		autoreconf:../../devel/autoconf
 
 # Check for a usable installed version of OpenSSL.  Version must be greater
diff --git a/security/pgp5/Makefile b/security/pgp5/Makefile
index fb5f2327b2c..4e9bdbf970f 100644
--- a/security/pgp5/Makefile
+++ b/security/pgp5/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2000/08/28 09:14:51 jlam Exp $
+# $NetBSD: Makefile,v 1.7 2000/09/05 09:33:16 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=	${PERL5}:../../lang/perl5
+BUILD_DEPENDS=	${PERL5}:../../lang/perl5-base
 
 RESTRICTED=	"Cryptographic software"
 NO_SRC_ON_FTP=	${RESTRICTED}
diff --git a/sysutils/xps/Makefile b/sysutils/xps/Makefile
index eaa5d9b2d1b..505ebd3cd7f 100644
--- a/sysutils/xps/Makefile
+++ b/sysutils/xps/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2000/09/03 13:32:26 wiz Exp $
+# $NetBSD: Makefile,v 1.10 2000/09/05 09:33:16 jlam Exp $
 
 DISTNAME=	xps-3.14
 CATEGORIES=	sysutils
@@ -7,7 +7,7 @@ MASTER_SITES=	ftp://ftp.netwinder.org/users/r/rocky/
 MAINTAINER=	packages@netbsd.org
 HOMEPAGE=	http://www.netwinder.org/~rocky/xps-home/
 
-BUILD_DEPENDS=	${PERL5}:../../lang/perl5
+BUILD_DEPENDS=	${PERL5}:../../lang/perl5-base
 
 USE_GMAKE=	# defined
 USE_X11BASE=	# defined
diff --git a/www/ap-auth-cookie/Makefile b/www/ap-auth-cookie/Makefile
index d76d2dd8a52..adf1929b97e 100644
--- a/www/ap-auth-cookie/Makefile
+++ b/www/ap-auth-cookie/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2000/08/28 09:14:51 jlam Exp $
+# $NetBSD: Makefile,v 1.16 2000/09/05 09:33:16 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=	${PERL5}:../../lang/perl5
+BUILD_DEPENDS=	${PERL5}:../../lang/perl5-base
 
 EXTRACT_CMD=	${DO_NADA}
 
diff --git a/www/ap-auth-ldap/Makefile b/www/ap-auth-ldap/Makefile
index 615ff3dcf81..a6cfe7ef0c4 100644
--- a/www/ap-auth-ldap/Makefile
+++ b/www/ap-auth-ldap/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2000/08/28 09:14:51 jlam Exp $
+# $NetBSD: Makefile,v 1.4 2000/09/05 09:33:17 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=	${PERL5}:../../lang/perl5
+BUILD_DEPENDS=	${PERL5}:../../lang/perl5-base
 
 do-build:
 	@cd ${WRKSRC} && ${LOCALBASE}/sbin/apxs -c			\
diff --git a/www/ap-auth-postgresql/Makefile b/www/ap-auth-postgresql/Makefile
index 73c0152e965..3562adc103b 100644
--- a/www/ap-auth-postgresql/Makefile
+++ b/www/ap-auth-postgresql/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2000/08/28 09:14:51 jlam Exp $
+# $NetBSD: Makefile,v 1.5 2000/09/05 09:33:17 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=	${PERL5}:../../lang/perl5
+BUILD_DEPENDS=	${PERL5}:../../lang/perl5-base
 
 CPPFLAGS+=	-I${LOCALBASE}/include/pgsql
 LIBS=		-lpq -lcrypt
diff --git a/www/ap-csacek/Makefile b/www/ap-csacek/Makefile
index a7a2c83ffd1..bbaefe4686b 100644
--- a/www/ap-csacek/Makefile
+++ b/www/ap-csacek/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2000/08/29 19:03:51 jlam Exp $
+# $NetBSD: Makefile,v 1.6 2000/09/05 09:33:17 jlam Exp $
 #
 
 DISTNAME=	csacek-2.1.4
@@ -13,7 +13,7 @@ HOMEPAGE=	http://www.csacek.cz/
 
 DEPENDS+=	apache*-1.3*:../../www/apache
 # For "apxs":
-BUILD_DEPENDS=	${PERL5}:../../lang/perl5
+BUILD_DEPENDS=	${PERL5}:../../lang/perl5-base
 
 HAS_CONFIGURE=	yes
 
diff --git a/www/ap-dtcl/Makefile b/www/ap-dtcl/Makefile
index f85e29729da..0409b3603aa 100644
--- a/www/ap-dtcl/Makefile
+++ b/www/ap-dtcl/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2000/08/30 00:22:18 jwise Exp $
+# $NetBSD: Makefile,v 1.6 2000/09/05 09:33:17 jlam Exp $
 
 DISTNAME=	libapache-mod-dtcl_0.8.1-1
 PKGNAME=	ap-dtcl-0.8.1
@@ -12,7 +12,7 @@ HOMEPAGE=	http://comanche.com.dtu.dk/dave/
 DEPENDS+=	apache-1.3.*:../../www/apache
 DEPENDS+=	tcl-8.3.2:../../lang/tcl
 # For "apxs":
-BUILD_DEPENDS=	${PERL5}:../../lang/perl5
+BUILD_DEPENDS=	${PERL5}:../../lang/perl5-base
 
 INCLUDES=	-I${PREFIX}/include/
 LIBS=		-L${PREFIX}/lib -Wl,-R${PREFIX}/lib -ltcl83 -lm
diff --git a/www/ap-fastcgi/Makefile b/www/ap-fastcgi/Makefile
index ea0209a384d..efef582d776 100644
--- a/www/ap-fastcgi/Makefile
+++ b/www/ap-fastcgi/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2000/08/28 09:14:51 jlam Exp $
+# $NetBSD: Makefile,v 1.13 2000/09/05 09:33:17 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=	${PERL5}:../../lang/perl5
+BUILD_DEPENDS=	${PERL5}:../../lang/perl5-base
 
 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 494b29e8dee..5dfe823b196 100644
--- a/www/ap-jserv/Makefile
+++ b/www/ap-jserv/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2000/08/28 09:14:52 jlam Exp $
+# $NetBSD: Makefile,v 1.14 2000/09/05 09:33:17 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=	${PERL5}:../../lang/perl5
+BUILD_DEPENDS=	${PERL5}:../../lang/perl5-base
 
 .include "../../mk/bsd.prefs.mk"
 
diff --git a/www/ap-ssl/Makefile b/www/ap-ssl/Makefile
index 162378fa623..713ae80d745 100644
--- a/www/ap-ssl/Makefile
+++ b/www/ap-ssl/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2000/09/03 13:36:36 wiz Exp $
+# $NetBSD: Makefile,v 1.20 2000/09/05 09:33:17 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+=	${PERL5}:../../lang/perl5
+BUILD_DEPENDS+=	${PERL5}:../../lang/perl5-base
 
 CONFLICTS=	apache-1.3.[0123456789] apache-*modssl-* apache6-*
 
diff --git a/www/php3/Makefile b/www/php3/Makefile
index 370544704b1..36540545f15 100644
--- a/www/php3/Makefile
+++ b/www/php3/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2000/09/03 13:40:30 wiz Exp $
+# $NetBSD: Makefile,v 1.19 2000/09/05 09:33:18 jlam Exp $
 #
 
 DISTNAME=	php-${PHP_VERSION}
@@ -10,7 +10,7 @@ DISTFILES+=	${DISTNAME}.tar.gz
 MAINTAINER=	cjs@netbsd.org
 HOMEPAGE=	http://www.php.net/
 
-BUILD_DEPENDS+=	${PERL5}:../../lang/perl5
+BUILD_DEPENDS+=	${PERL5}:../../lang/perl5-base
 DEPENDS+=	gdbm>=1.7.3:../../databases/gdbm
 
 .include "../../mk/bsd.prefs.mk"
diff --git a/www/squid/Makefile b/www/squid/Makefile
index 75e3ff3e0d4..516c3d3d453 100644
--- a/www/squid/Makefile
+++ b/www/squid/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.31 2000/09/03 13:42:22 wiz Exp $
+# $NetBSD: Makefile,v 1.32 2000/09/05 09:33:18 jlam Exp $
 
 DISTNAME=	squid-2.3.STABLE3-src
 PKGNAME=	squid-2.3s3
@@ -18,7 +18,7 @@ PATCHFILES=	squid-2.3.stable3-carp_compile.patch \
 MAINTAINER=	tron@netbsd.org
 HOMEPAGE=	http://www.squid-cache.org/
 
-BUILD_DEPENDS+=	${PERL5}:../../lang/perl5
+BUILD_DEPENDS+=	${PERL5}:../../lang/perl5-base
 
 GNU_CONFIGURE=	# defined
 CONFIGURE_ARGS+= --sysconfdir=/etc \
diff --git a/x11/gtk/Makefile b/x11/gtk/Makefile
index dfbd0e28da2..2dc2cff242c 100644
--- a/x11/gtk/Makefile
+++ b/x11/gtk/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.46 2000/08/28 09:14:52 jlam Exp $
+# $NetBSD: Makefile,v 1.47 2000/09/05 09:33:18 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+=		${PERL5}:../../lang/perl5
+BUILD_DEPENDS+=		${PERL5}:../../lang/perl5-base
 
 USE_LIBTOOL=		yes
 LTCONFIG_OVERRIDE=	${WRKSRC}/ltconfig