Use ${PERL5} wherever appropriate. Largely untested; hope my eyeball

checks haven't missed anything.

Submitted by:	dima

29 files changed, 98 insertions, 98 deletions

diff --git a/databases/mysql322-client/Makefile b/databases/mysql322-client/Makefile
index 708240ebc2fe..1c86e71c3956 100644
--- a/databases/mysql322-client/Makefile
+++ b/databases/mysql322-client/Makefile
@@ -3,7 +3,7 @@
 # Date created:				26 Jan 1998
 # Whom:					Josh Tiefenbach <josh@ican.net>
 #
-# $Id$
+# $Id: Makefile,v 1.26 1998/09/06 19:58:25 andreas Exp $
 #
 
 DISTNAME=	mysql-3.22.6-alpha
@@ -25,8 +25,8 @@ CONFIGURE_ARGS=	--localstatedir=/var/db/mysql \
 		--without-debug \
 		--without-readline \
 		--without-bench
-CONFIGURE_ENV+=	PERL=${PREFIX}/bin/perl \
-		PERL5=${PREFIX}/bin/perl5 \
+CONFIGURE_ENV+=	PERL=${PERL5} \
+		PERL5=${PERL5} \
 		INSTALL_SCRIPT="${INSTALL_SCRIPT}"
 
 OSVERSION!=	sysctl -n kern.osreldate
@@ -62,7 +62,7 @@ pre-install:
 .if defined(PACKAGE_BUILDING)
 	@ ${RM} -rf /var/db/mysql
 .endif
-	@ ${SETENV} ${MAKE_ENV} ${PREFIX}/bin/perl ${SCRIPTDIR}/check_old_version
+	@ ${SETENV} ${MAKE_ENV} ${PERL5} ${SCRIPTDIR}/check_old_version
 
 post-install:
 	${MKDIR} ${PREFIX}/share/mysql/mysql
diff --git a/databases/mysql322-server/Makefile b/databases/mysql322-server/Makefile
index 708240ebc2fe..1c86e71c3956 100644
--- a/databases/mysql322-server/Makefile
+++ b/databases/mysql322-server/Makefile
@@ -3,7 +3,7 @@
 # Date created:				26 Jan 1998
 # Whom:					Josh Tiefenbach <josh@ican.net>
 #
-# $Id$
+# $Id: Makefile,v 1.26 1998/09/06 19:58:25 andreas Exp $
 #
 
 DISTNAME=	mysql-3.22.6-alpha
@@ -25,8 +25,8 @@ CONFIGURE_ARGS=	--localstatedir=/var/db/mysql \
 		--without-debug \
 		--without-readline \
 		--without-bench
-CONFIGURE_ENV+=	PERL=${PREFIX}/bin/perl \
-		PERL5=${PREFIX}/bin/perl5 \
+CONFIGURE_ENV+=	PERL=${PERL5} \
+		PERL5=${PERL5} \
 		INSTALL_SCRIPT="${INSTALL_SCRIPT}"
 
 OSVERSION!=	sysctl -n kern.osreldate
@@ -62,7 +62,7 @@ pre-install:
 .if defined(PACKAGE_BUILDING)
 	@ ${RM} -rf /var/db/mysql
 .endif
-	@ ${SETENV} ${MAKE_ENV} ${PREFIX}/bin/perl ${SCRIPTDIR}/check_old_version
+	@ ${SETENV} ${MAKE_ENV} ${PERL5} ${SCRIPTDIR}/check_old_version
 
 post-install:
 	${MKDIR} ${PREFIX}/share/mysql/mysql
diff --git a/databases/mysql323-client/Makefile b/databases/mysql323-client/Makefile
index 708240ebc2fe..1c86e71c3956 100644
--- a/databases/mysql323-client/Makefile
+++ b/databases/mysql323-client/Makefile
@@ -3,7 +3,7 @@
 # Date created:				26 Jan 1998
 # Whom:					Josh Tiefenbach <josh@ican.net>
 #
-# $Id$
+# $Id: Makefile,v 1.26 1998/09/06 19:58:25 andreas Exp $
 #
 
 DISTNAME=	mysql-3.22.6-alpha
@@ -25,8 +25,8 @@ CONFIGURE_ARGS=	--localstatedir=/var/db/mysql \
 		--without-debug \
 		--without-readline \
 		--without-bench
-CONFIGURE_ENV+=	PERL=${PREFIX}/bin/perl \
-		PERL5=${PREFIX}/bin/perl5 \
+CONFIGURE_ENV+=	PERL=${PERL5} \
+		PERL5=${PERL5} \
 		INSTALL_SCRIPT="${INSTALL_SCRIPT}"
 
 OSVERSION!=	sysctl -n kern.osreldate
@@ -62,7 +62,7 @@ pre-install:
 .if defined(PACKAGE_BUILDING)
 	@ ${RM} -rf /var/db/mysql
 .endif
-	@ ${SETENV} ${MAKE_ENV} ${PREFIX}/bin/perl ${SCRIPTDIR}/check_old_version
+	@ ${SETENV} ${MAKE_ENV} ${PERL5} ${SCRIPTDIR}/check_old_version
 
 post-install:
 	${MKDIR} ${PREFIX}/share/mysql/mysql
diff --git a/databases/mysql323-server/Makefile b/databases/mysql323-server/Makefile
index 708240ebc2fe..1c86e71c3956 100644
--- a/databases/mysql323-server/Makefile
+++ b/databases/mysql323-server/Makefile
@@ -3,7 +3,7 @@
 # Date created:				26 Jan 1998
 # Whom:					Josh Tiefenbach <josh@ican.net>
 #
-# $Id$
+# $Id: Makefile,v 1.26 1998/09/06 19:58:25 andreas Exp $
 #
 
 DISTNAME=	mysql-3.22.6-alpha
@@ -25,8 +25,8 @@ CONFIGURE_ARGS=	--localstatedir=/var/db/mysql \
 		--without-debug \
 		--without-readline \
 		--without-bench
-CONFIGURE_ENV+=	PERL=${PREFIX}/bin/perl \
-		PERL5=${PREFIX}/bin/perl5 \
+CONFIGURE_ENV+=	PERL=${PERL5} \
+		PERL5=${PERL5} \
 		INSTALL_SCRIPT="${INSTALL_SCRIPT}"
 
 OSVERSION!=	sysctl -n kern.osreldate
@@ -62,7 +62,7 @@ pre-install:
 .if defined(PACKAGE_BUILDING)
 	@ ${RM} -rf /var/db/mysql
 .endif
-	@ ${SETENV} ${MAKE_ENV} ${PREFIX}/bin/perl ${SCRIPTDIR}/check_old_version
+	@ ${SETENV} ${MAKE_ENV} ${PERL5} ${SCRIPTDIR}/check_old_version
 
 post-install:
 	${MKDIR} ${PREFIX}/share/mysql/mysql
diff --git a/databases/mysql40-client/Makefile b/databases/mysql40-client/Makefile
index 708240ebc2fe..1c86e71c3956 100644
--- a/databases/mysql40-client/Makefile
+++ b/databases/mysql40-client/Makefile
@@ -3,7 +3,7 @@
 # Date created:				26 Jan 1998
 # Whom:					Josh Tiefenbach <josh@ican.net>
 #
-# $Id$
+# $Id: Makefile,v 1.26 1998/09/06 19:58:25 andreas Exp $
 #
 
 DISTNAME=	mysql-3.22.6-alpha
@@ -25,8 +25,8 @@ CONFIGURE_ARGS=	--localstatedir=/var/db/mysql \
 		--without-debug \
 		--without-readline \
 		--without-bench
-CONFIGURE_ENV+=	PERL=${PREFIX}/bin/perl \
-		PERL5=${PREFIX}/bin/perl5 \
+CONFIGURE_ENV+=	PERL=${PERL5} \
+		PERL5=${PERL5} \
 		INSTALL_SCRIPT="${INSTALL_SCRIPT}"
 
 OSVERSION!=	sysctl -n kern.osreldate
@@ -62,7 +62,7 @@ pre-install:
 .if defined(PACKAGE_BUILDING)
 	@ ${RM} -rf /var/db/mysql
 .endif
-	@ ${SETENV} ${MAKE_ENV} ${PREFIX}/bin/perl ${SCRIPTDIR}/check_old_version
+	@ ${SETENV} ${MAKE_ENV} ${PERL5} ${SCRIPTDIR}/check_old_version
 
 post-install:
 	${MKDIR} ${PREFIX}/share/mysql/mysql
diff --git a/databases/mysql40-server/Makefile b/databases/mysql40-server/Makefile
index 708240ebc2fe..1c86e71c3956 100644
--- a/databases/mysql40-server/Makefile
+++ b/databases/mysql40-server/Makefile
@@ -3,7 +3,7 @@
 # Date created:				26 Jan 1998
 # Whom:					Josh Tiefenbach <josh@ican.net>
 #
-# $Id$
+# $Id: Makefile,v 1.26 1998/09/06 19:58:25 andreas Exp $
 #
 
 DISTNAME=	mysql-3.22.6-alpha
@@ -25,8 +25,8 @@ CONFIGURE_ARGS=	--localstatedir=/var/db/mysql \
 		--without-debug \
 		--without-readline \
 		--without-bench
-CONFIGURE_ENV+=	PERL=${PREFIX}/bin/perl \
-		PERL5=${PREFIX}/bin/perl5 \
+CONFIGURE_ENV+=	PERL=${PERL5} \
+		PERL5=${PERL5} \
 		INSTALL_SCRIPT="${INSTALL_SCRIPT}"
 
 OSVERSION!=	sysctl -n kern.osreldate
@@ -62,7 +62,7 @@ pre-install:
 .if defined(PACKAGE_BUILDING)
 	@ ${RM} -rf /var/db/mysql
 .endif
-	@ ${SETENV} ${MAKE_ENV} ${PREFIX}/bin/perl ${SCRIPTDIR}/check_old_version
+	@ ${SETENV} ${MAKE_ENV} ${PERL5} ${SCRIPTDIR}/check_old_version
 
 post-install:
 	${MKDIR} ${PREFIX}/share/mysql/mysql
diff --git a/databases/mysql41-client/Makefile b/databases/mysql41-client/Makefile
index 708240ebc2fe..1c86e71c3956 100644
--- a/databases/mysql41-client/Makefile
+++ b/databases/mysql41-client/Makefile
@@ -3,7 +3,7 @@
 # Date created:				26 Jan 1998
 # Whom:					Josh Tiefenbach <josh@ican.net>
 #
-# $Id$
+# $Id: Makefile,v 1.26 1998/09/06 19:58:25 andreas Exp $
 #
 
 DISTNAME=	mysql-3.22.6-alpha
@@ -25,8 +25,8 @@ CONFIGURE_ARGS=	--localstatedir=/var/db/mysql \
 		--without-debug \
 		--without-readline \
 		--without-bench
-CONFIGURE_ENV+=	PERL=${PREFIX}/bin/perl \
-		PERL5=${PREFIX}/bin/perl5 \
+CONFIGURE_ENV+=	PERL=${PERL5} \
+		PERL5=${PERL5} \
 		INSTALL_SCRIPT="${INSTALL_SCRIPT}"
 
 OSVERSION!=	sysctl -n kern.osreldate
@@ -62,7 +62,7 @@ pre-install:
 .if defined(PACKAGE_BUILDING)
 	@ ${RM} -rf /var/db/mysql
 .endif
-	@ ${SETENV} ${MAKE_ENV} ${PREFIX}/bin/perl ${SCRIPTDIR}/check_old_version
+	@ ${SETENV} ${MAKE_ENV} ${PERL5} ${SCRIPTDIR}/check_old_version
 
 post-install:
 	${MKDIR} ${PREFIX}/share/mysql/mysql
diff --git a/databases/mysql41-server/Makefile b/databases/mysql41-server/Makefile
index 708240ebc2fe..1c86e71c3956 100644
--- a/databases/mysql41-server/Makefile
+++ b/databases/mysql41-server/Makefile
@@ -3,7 +3,7 @@
 # Date created:				26 Jan 1998
 # Whom:					Josh Tiefenbach <josh@ican.net>
 #
-# $Id$
+# $Id: Makefile,v 1.26 1998/09/06 19:58:25 andreas Exp $
 #
 
 DISTNAME=	mysql-3.22.6-alpha
@@ -25,8 +25,8 @@ CONFIGURE_ARGS=	--localstatedir=/var/db/mysql \
 		--without-debug \
 		--without-readline \
 		--without-bench
-CONFIGURE_ENV+=	PERL=${PREFIX}/bin/perl \
-		PERL5=${PREFIX}/bin/perl5 \
+CONFIGURE_ENV+=	PERL=${PERL5} \
+		PERL5=${PERL5} \
 		INSTALL_SCRIPT="${INSTALL_SCRIPT}"
 
 OSVERSION!=	sysctl -n kern.osreldate
@@ -62,7 +62,7 @@ pre-install:
 .if defined(PACKAGE_BUILDING)
 	@ ${RM} -rf /var/db/mysql
 .endif
-	@ ${SETENV} ${MAKE_ENV} ${PREFIX}/bin/perl ${SCRIPTDIR}/check_old_version
+	@ ${SETENV} ${MAKE_ENV} ${PERL5} ${SCRIPTDIR}/check_old_version
 
 post-install:
 	${MKDIR} ${PREFIX}/share/mysql/mysql
diff --git a/databases/mysql50-client/Makefile b/databases/mysql50-client/Makefile
index 708240ebc2fe..1c86e71c3956 100644
--- a/databases/mysql50-client/Makefile
+++ b/databases/mysql50-client/Makefile
@@ -3,7 +3,7 @@
 # Date created:				26 Jan 1998
 # Whom:					Josh Tiefenbach <josh@ican.net>
 #
-# $Id$
+# $Id: Makefile,v 1.26 1998/09/06 19:58:25 andreas Exp $
 #
 
 DISTNAME=	mysql-3.22.6-alpha
@@ -25,8 +25,8 @@ CONFIGURE_ARGS=	--localstatedir=/var/db/mysql \
 		--without-debug \
 		--without-readline \
 		--without-bench
-CONFIGURE_ENV+=	PERL=${PREFIX}/bin/perl \
-		PERL5=${PREFIX}/bin/perl5 \
+CONFIGURE_ENV+=	PERL=${PERL5} \
+		PERL5=${PERL5} \
 		INSTALL_SCRIPT="${INSTALL_SCRIPT}"
 
 OSVERSION!=	sysctl -n kern.osreldate
@@ -62,7 +62,7 @@ pre-install:
 .if defined(PACKAGE_BUILDING)
 	@ ${RM} -rf /var/db/mysql
 .endif
-	@ ${SETENV} ${MAKE_ENV} ${PREFIX}/bin/perl ${SCRIPTDIR}/check_old_version
+	@ ${SETENV} ${MAKE_ENV} ${PERL5} ${SCRIPTDIR}/check_old_version
 
 post-install:
 	${MKDIR} ${PREFIX}/share/mysql/mysql
diff --git a/databases/mysql50-server/Makefile b/databases/mysql50-server/Makefile
index 708240ebc2fe..1c86e71c3956 100644
--- a/databases/mysql50-server/Makefile
+++ b/databases/mysql50-server/Makefile
@@ -3,7 +3,7 @@
 # Date created:				26 Jan 1998
 # Whom:					Josh Tiefenbach <josh@ican.net>
 #
-# $Id$
+# $Id: Makefile,v 1.26 1998/09/06 19:58:25 andreas Exp $
 #
 
 DISTNAME=	mysql-3.22.6-alpha
@@ -25,8 +25,8 @@ CONFIGURE_ARGS=	--localstatedir=/var/db/mysql \
 		--without-debug \
 		--without-readline \
 		--without-bench
-CONFIGURE_ENV+=	PERL=${PREFIX}/bin/perl \
-		PERL5=${PREFIX}/bin/perl5 \
+CONFIGURE_ENV+=	PERL=${PERL5} \
+		PERL5=${PERL5} \
 		INSTALL_SCRIPT="${INSTALL_SCRIPT}"
 
 OSVERSION!=	sysctl -n kern.osreldate
@@ -62,7 +62,7 @@ pre-install:
 .if defined(PACKAGE_BUILDING)
 	@ ${RM} -rf /var/db/mysql
 .endif
-	@ ${SETENV} ${MAKE_ENV} ${PREFIX}/bin/perl ${SCRIPTDIR}/check_old_version
+	@ ${SETENV} ${MAKE_ENV} ${PERL5} ${SCRIPTDIR}/check_old_version
 
 post-install:
 	${MKDIR} ${PREFIX}/share/mysql/mysql
diff --git a/databases/mysql51-client/Makefile b/databases/mysql51-client/Makefile
index 708240ebc2fe..1c86e71c3956 100644
--- a/databases/mysql51-client/Makefile
+++ b/databases/mysql51-client/Makefile
@@ -3,7 +3,7 @@
 # Date created:				26 Jan 1998
 # Whom:					Josh Tiefenbach <josh@ican.net>
 #
-# $Id$
+# $Id: Makefile,v 1.26 1998/09/06 19:58:25 andreas Exp $
 #
 
 DISTNAME=	mysql-3.22.6-alpha
@@ -25,8 +25,8 @@ CONFIGURE_ARGS=	--localstatedir=/var/db/mysql \
 		--without-debug \
 		--without-readline \
 		--without-bench
-CONFIGURE_ENV+=	PERL=${PREFIX}/bin/perl \
-		PERL5=${PREFIX}/bin/perl5 \
+CONFIGURE_ENV+=	PERL=${PERL5} \
+		PERL5=${PERL5} \
 		INSTALL_SCRIPT="${INSTALL_SCRIPT}"
 
 OSVERSION!=	sysctl -n kern.osreldate
@@ -62,7 +62,7 @@ pre-install:
 .if defined(PACKAGE_BUILDING)
 	@ ${RM} -rf /var/db/mysql
 .endif
-	@ ${SETENV} ${MAKE_ENV} ${PREFIX}/bin/perl ${SCRIPTDIR}/check_old_version
+	@ ${SETENV} ${MAKE_ENV} ${PERL5} ${SCRIPTDIR}/check_old_version
 
 post-install:
 	${MKDIR} ${PREFIX}/share/mysql/mysql
diff --git a/databases/mysql51-server/Makefile b/databases/mysql51-server/Makefile
index 708240ebc2fe..1c86e71c3956 100644
--- a/databases/mysql51-server/Makefile
+++ b/databases/mysql51-server/Makefile
@@ -3,7 +3,7 @@
 # Date created:				26 Jan 1998
 # Whom:					Josh Tiefenbach <josh@ican.net>
 #
-# $Id$
+# $Id: Makefile,v 1.26 1998/09/06 19:58:25 andreas Exp $
 #
 
 DISTNAME=	mysql-3.22.6-alpha
@@ -25,8 +25,8 @@ CONFIGURE_ARGS=	--localstatedir=/var/db/mysql \
 		--without-debug \
 		--without-readline \
 		--without-bench
-CONFIGURE_ENV+=	PERL=${PREFIX}/bin/perl \
-		PERL5=${PREFIX}/bin/perl5 \
+CONFIGURE_ENV+=	PERL=${PERL5} \
+		PERL5=${PERL5} \
 		INSTALL_SCRIPT="${INSTALL_SCRIPT}"
 
 OSVERSION!=	sysctl -n kern.osreldate
@@ -62,7 +62,7 @@ pre-install:
 .if defined(PACKAGE_BUILDING)
 	@ ${RM} -rf /var/db/mysql
 .endif
-	@ ${SETENV} ${MAKE_ENV} ${PREFIX}/bin/perl ${SCRIPTDIR}/check_old_version
+	@ ${SETENV} ${MAKE_ENV} ${PERL5} ${SCRIPTDIR}/check_old_version
 
 post-install:
 	${MKDIR} ${PREFIX}/share/mysql/mysql
diff --git a/databases/mysql54-client/Makefile b/databases/mysql54-client/Makefile
index 708240ebc2fe..1c86e71c3956 100644
--- a/databases/mysql54-client/Makefile
+++ b/databases/mysql54-client/Makefile
@@ -3,7 +3,7 @@
 # Date created:				26 Jan 1998
 # Whom:					Josh Tiefenbach <josh@ican.net>
 #
-# $Id$
+# $Id: Makefile,v 1.26 1998/09/06 19:58:25 andreas Exp $
 #
 
 DISTNAME=	mysql-3.22.6-alpha
@@ -25,8 +25,8 @@ CONFIGURE_ARGS=	--localstatedir=/var/db/mysql \
 		--without-debug \
 		--without-readline \
 		--without-bench
-CONFIGURE_ENV+=	PERL=${PREFIX}/bin/perl \
-		PERL5=${PREFIX}/bin/perl5 \
+CONFIGURE_ENV+=	PERL=${PERL5} \
+		PERL5=${PERL5} \
 		INSTALL_SCRIPT="${INSTALL_SCRIPT}"
 
 OSVERSION!=	sysctl -n kern.osreldate
@@ -62,7 +62,7 @@ pre-install:
 .if defined(PACKAGE_BUILDING)
 	@ ${RM} -rf /var/db/mysql
 .endif
-	@ ${SETENV} ${MAKE_ENV} ${PREFIX}/bin/perl ${SCRIPTDIR}/check_old_version
+	@ ${SETENV} ${MAKE_ENV} ${PERL5} ${SCRIPTDIR}/check_old_version
 
 post-install:
 	${MKDIR} ${PREFIX}/share/mysql/mysql
diff --git a/databases/mysql54-server/Makefile b/databases/mysql54-server/Makefile
index 708240ebc2fe..1c86e71c3956 100644
--- a/databases/mysql54-server/Makefile
+++ b/databases/mysql54-server/Makefile
@@ -3,7 +3,7 @@
 # Date created:				26 Jan 1998
 # Whom:					Josh Tiefenbach <josh@ican.net>
 #
-# $Id$
+# $Id: Makefile,v 1.26 1998/09/06 19:58:25 andreas Exp $
 #
 
 DISTNAME=	mysql-3.22.6-alpha
@@ -25,8 +25,8 @@ CONFIGURE_ARGS=	--localstatedir=/var/db/mysql \
 		--without-debug \
 		--without-readline \
 		--without-bench
-CONFIGURE_ENV+=	PERL=${PREFIX}/bin/perl \
-		PERL5=${PREFIX}/bin/perl5 \
+CONFIGURE_ENV+=	PERL=${PERL5} \
+		PERL5=${PERL5} \
 		INSTALL_SCRIPT="${INSTALL_SCRIPT}"
 
 OSVERSION!=	sysctl -n kern.osreldate
@@ -62,7 +62,7 @@ pre-install:
 .if defined(PACKAGE_BUILDING)
 	@ ${RM} -rf /var/db/mysql
 .endif
-	@ ${SETENV} ${MAKE_ENV} ${PREFIX}/bin/perl ${SCRIPTDIR}/check_old_version
+	@ ${SETENV} ${MAKE_ENV} ${PERL5} ${SCRIPTDIR}/check_old_version
 
 post-install:
 	${MKDIR} ${PREFIX}/share/mysql/mysql
diff --git a/databases/mysql55-client/Makefile b/databases/mysql55-client/Makefile
index 708240ebc2fe..1c86e71c3956 100644
--- a/databases/mysql55-client/Makefile
+++ b/databases/mysql55-client/Makefile
@@ -3,7 +3,7 @@
 # Date created:				26 Jan 1998
 # Whom:					Josh Tiefenbach <josh@ican.net>
 #
-# $Id$
+# $Id: Makefile,v 1.26 1998/09/06 19:58:25 andreas Exp $
 #
 
 DISTNAME=	mysql-3.22.6-alpha
@@ -25,8 +25,8 @@ CONFIGURE_ARGS=	--localstatedir=/var/db/mysql \
 		--without-debug \
 		--without-readline \
 		--without-bench
-CONFIGURE_ENV+=	PERL=${PREFIX}/bin/perl \
-		PERL5=${PREFIX}/bin/perl5 \
+CONFIGURE_ENV+=	PERL=${PERL5} \
+		PERL5=${PERL5} \
 		INSTALL_SCRIPT="${INSTALL_SCRIPT}"
 
 OSVERSION!=	sysctl -n kern.osreldate
@@ -62,7 +62,7 @@ pre-install:
 .if defined(PACKAGE_BUILDING)
 	@ ${RM} -rf /var/db/mysql
 .endif
-	@ ${SETENV} ${MAKE_ENV} ${PREFIX}/bin/perl ${SCRIPTDIR}/check_old_version
+	@ ${SETENV} ${MAKE_ENV} ${PERL5} ${SCRIPTDIR}/check_old_version
 
 post-install:
 	${MKDIR} ${PREFIX}/share/mysql/mysql
diff --git a/databases/mysql55-server/Makefile b/databases/mysql55-server/Makefile
index 708240ebc2fe..1c86e71c3956 100644
--- a/databases/mysql55-server/Makefile
+++ b/databases/mysql55-server/Makefile
@@ -3,7 +3,7 @@
 # Date created:				26 Jan 1998
 # Whom:					Josh Tiefenbach <josh@ican.net>
 #
-# $Id$
+# $Id: Makefile,v 1.26 1998/09/06 19:58:25 andreas Exp $
 #
 
 DISTNAME=	mysql-3.22.6-alpha
@@ -25,8 +25,8 @@ CONFIGURE_ARGS=	--localstatedir=/var/db/mysql \
 		--without-debug \
 		--without-readline \
 		--without-bench
-CONFIGURE_ENV+=	PERL=${PREFIX}/bin/perl \
-		PERL5=${PREFIX}/bin/perl5 \
+CONFIGURE_ENV+=	PERL=${PERL5} \
+		PERL5=${PERL5} \
 		INSTALL_SCRIPT="${INSTALL_SCRIPT}"
 
 OSVERSION!=	sysctl -n kern.osreldate
@@ -62,7 +62,7 @@ pre-install:
 .if defined(PACKAGE_BUILDING)
 	@ ${RM} -rf /var/db/mysql
 .endif
-	@ ${SETENV} ${MAKE_ENV} ${PREFIX}/bin/perl ${SCRIPTDIR}/check_old_version
+	@ ${SETENV} ${MAKE_ENV} ${PERL5} ${SCRIPTDIR}/check_old_version
 
 post-install:
 	${MKDIR} ${PREFIX}/share/mysql/mysql
diff --git a/databases/mysql60-client/Makefile b/databases/mysql60-client/Makefile
index 708240ebc2fe..1c86e71c3956 100644
--- a/databases/mysql60-client/Makefile
+++ b/databases/mysql60-client/Makefile
@@ -3,7 +3,7 @@
 # Date created:				26 Jan 1998
 # Whom:					Josh Tiefenbach <josh@ican.net>
 #
-# $Id$
+# $Id: Makefile,v 1.26 1998/09/06 19:58:25 andreas Exp $
 #
 
 DISTNAME=	mysql-3.22.6-alpha
@@ -25,8 +25,8 @@ CONFIGURE_ARGS=	--localstatedir=/var/db/mysql \
 		--without-debug \
 		--without-readline \
 		--without-bench
-CONFIGURE_ENV+=	PERL=${PREFIX}/bin/perl \
-		PERL5=${PREFIX}/bin/perl5 \
+CONFIGURE_ENV+=	PERL=${PERL5} \
+		PERL5=${PERL5} \
 		INSTALL_SCRIPT="${INSTALL_SCRIPT}"
 
 OSVERSION!=	sysctl -n kern.osreldate
@@ -62,7 +62,7 @@ pre-install:
 .if defined(PACKAGE_BUILDING)
 	@ ${RM} -rf /var/db/mysql
 .endif
-	@ ${SETENV} ${MAKE_ENV} ${PREFIX}/bin/perl ${SCRIPTDIR}/check_old_version
+	@ ${SETENV} ${MAKE_ENV} ${PERL5} ${SCRIPTDIR}/check_old_version
 
 post-install:
 	${MKDIR} ${PREFIX}/share/mysql/mysql
diff --git a/databases/mysql60-server/Makefile b/databases/mysql60-server/Makefile
index 708240ebc2fe..1c86e71c3956 100644
--- a/databases/mysql60-server/Makefile
+++ b/databases/mysql60-server/Makefile
@@ -3,7 +3,7 @@
 # Date created:				26 Jan 1998
 # Whom:					Josh Tiefenbach <josh@ican.net>
 #
-# $Id$
+# $Id: Makefile,v 1.26 1998/09/06 19:58:25 andreas Exp $
 #
 
 DISTNAME=	mysql-3.22.6-alpha
@@ -25,8 +25,8 @@ CONFIGURE_ARGS=	--localstatedir=/var/db/mysql \
 		--without-debug \
 		--without-readline \
 		--without-bench
-CONFIGURE_ENV+=	PERL=${PREFIX}/bin/perl \
-		PERL5=${PREFIX}/bin/perl5 \
+CONFIGURE_ENV+=	PERL=${PERL5} \
+		PERL5=${PERL5} \
 		INSTALL_SCRIPT="${INSTALL_SCRIPT}"
 
 OSVERSION!=	sysctl -n kern.osreldate
@@ -62,7 +62,7 @@ pre-install:
 .if defined(PACKAGE_BUILDING)
 	@ ${RM} -rf /var/db/mysql
 .endif
-	@ ${SETENV} ${MAKE_ENV} ${PREFIX}/bin/perl ${SCRIPTDIR}/check_old_version
+	@ ${SETENV} ${MAKE_ENV} ${PERL5} ${SCRIPTDIR}/check_old_version
 
 post-install:
 	${MKDIR} ${PREFIX}/share/mysql/mysql
diff --git a/databases/p5-DBD-Pg-13/Makefile b/databases/p5-DBD-Pg-13/Makefile
index bf462b4c760b..c6966c2229fd 100644
--- a/databases/p5-DBD-Pg-13/Makefile
+++ b/databases/p5-DBD-Pg-13/Makefile
@@ -3,7 +3,7 @@
 # Date created:				June 17th 1997
 # Whom:	      				James FitzGibbon <jfitz@FreeBSD.org>
 #
-# $Id: Makefile,v 1.6 1998/05/10 22:12:09 steve Exp $
+# $Id: Makefile,v 1.7 1998/08/23 04:08:44 jseger Exp $
 #
 
 DISTNAME=	DBD-Pg-0.72
@@ -23,6 +23,6 @@ MANPREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
 MAN3=		DBD::Pg.3
 
 do-configure:
-		@cd ${WRKSRC}; ${SETENV} ${CONFIGURE_ENV} ${PREFIX}/bin/perl Makefile.PL
+		@cd ${WRKSRC}; ${SETENV} ${CONFIGURE_ENV} ${PERL5} Makefile.PL
 
 .include <bsd.port.mk>
diff --git a/databases/p5-DBD-Pg/Makefile b/databases/p5-DBD-Pg/Makefile
index bf462b4c760b..c6966c2229fd 100644
--- a/databases/p5-DBD-Pg/Makefile
+++ b/databases/p5-DBD-Pg/Makefile
@@ -3,7 +3,7 @@
 # Date created:				June 17th 1997
 # Whom:	      				James FitzGibbon <jfitz@FreeBSD.org>
 #
-# $Id: Makefile,v 1.6 1998/05/10 22:12:09 steve Exp $
+# $Id: Makefile,v 1.7 1998/08/23 04:08:44 jseger Exp $
 #
 
 DISTNAME=	DBD-Pg-0.72
@@ -23,6 +23,6 @@ MANPREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
 MAN3=		DBD::Pg.3
 
 do-configure:
-		@cd ${WRKSRC}; ${SETENV} ${CONFIGURE_ENV} ${PREFIX}/bin/perl Makefile.PL
+		@cd ${WRKSRC}; ${SETENV} ${CONFIGURE_ENV} ${PERL5} Makefile.PL
 
 .include <bsd.port.mk>
diff --git a/databases/p5-DBD-mysql/Makefile b/databases/p5-DBD-mysql/Makefile
index c89e430150e0..907181e2a2b5 100644
--- a/databases/p5-DBD-mysql/Makefile
+++ b/databases/p5-DBD-mysql/Makefile
@@ -3,7 +3,7 @@
 # Date created:				September 29th 1996
 # Whom:	      				James FitzGibbon <jfitz@FreeBSD.org>
 #
-# $Id: Makefile,v 1.8 1998/08/31 14:02:06 vanilla Exp $
+# $Id: Makefile,v 1.9 1998/09/06 19:28:04 andreas Exp $
 #
 
 DISTNAME=	Msql-Mysql-modules-1.2003
@@ -28,6 +28,6 @@ MAN3=		Bundle::Mysql.3 \
 MAN3PREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
 
 do-configure:
-		@cd ${WRKSRC}; ${SETENV} ${CONFIGURE_ENV} ${PREFIX}/bin/perl Makefile.PL
+		@cd ${WRKSRC}; ${SETENV} ${CONFIGURE_ENV} ${PERL5} Makefile.PL
 
 .include <bsd.port.mk>
diff --git a/databases/p5-DBI-137/Makefile b/databases/p5-DBI-137/Makefile
index b9f6b7a609c1..707fbb7361f7 100644
--- a/databases/p5-DBI-137/Makefile
+++ b/databases/p5-DBI-137/Makefile
@@ -3,7 +3,7 @@
 # Date created:				October 17th 1996
 # Whom:	      				James FitzGibbon <jfitz@FreeBSD.org>
 #
-# $Id: Makefile,v 1.13 1998/08/06 14:57:13 vanilla Exp $
+# $Id: Makefile,v 1.14 1998/08/18 02:51:15 vanilla Exp $
 #
 
 DISTNAME=	DBI-1.00
@@ -30,6 +30,6 @@ MAN3=		DBD::Proxy.3 \
 MAN3PREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
 
 do-configure:
-		@ cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PREFIX}/bin/perl Makefile.PL
+		@ cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL
 
 .include <bsd.port.mk>
diff --git a/databases/p5-DBI/Makefile b/databases/p5-DBI/Makefile
index b9f6b7a609c1..707fbb7361f7 100644
--- a/databases/p5-DBI/Makefile
+++ b/databases/p5-DBI/Makefile
@@ -3,7 +3,7 @@
 # Date created:				October 17th 1996
 # Whom:	      				James FitzGibbon <jfitz@FreeBSD.org>
 #
-# $Id: Makefile,v 1.13 1998/08/06 14:57:13 vanilla Exp $
+# $Id: Makefile,v 1.14 1998/08/18 02:51:15 vanilla Exp $
 #
 
 DISTNAME=	DBI-1.00
@@ -30,6 +30,6 @@ MAN3=		DBD::Proxy.3 \
 MAN3PREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
 
 do-configure:
-		@ cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PREFIX}/bin/perl Makefile.PL
+		@ cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL
 
 .include <bsd.port.mk>
diff --git a/databases/p5-MLDBM/Makefile b/databases/p5-MLDBM/Makefile
index 0cb599ab743e..7883b8392bc8 100644
--- a/databases/p5-MLDBM/Makefile
+++ b/databases/p5-MLDBM/Makefile
@@ -3,7 +3,7 @@
 # Date created:                         December 3 1997
 # Whom:                                 ache@freebsd.org
 #
-# $Id: Makefile,v 1.5 1998/08/19 09:47:25 asami Exp $
+# $Id: Makefile,v 1.6 1998/08/23 04:12:26 jseger Exp $
 #
 
 DISTNAME=       MLDBM-2.00
@@ -23,6 +23,6 @@ MAN3=           MLDBM.3
 MANPREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
 
 do-configure:
-		@ cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PREFIX}/bin/perl Makefile.PL
+		@ cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL
 
 .include <bsd.port.mk>
diff --git a/databases/p5-Msql/Makefile b/databases/p5-Msql/Makefile
index b45d2a70a392..bbefb514f76f 100644
--- a/databases/p5-Msql/Makefile
+++ b/databases/p5-Msql/Makefile
@@ -3,7 +3,7 @@
 # Date created:				September 29th 1996
 # Whom:	      				James FitzGibbon <jfitz@FreeBSD.org>
 #
-#   $Id: Makefile,v 1.17 1998/04/03 02:33:06 jseger Exp $
+#   $Id: Makefile,v 1.18 1998/09/03 13:45:42 asami Exp $
 #
 
 DISTNAME=	Msql-modules-1.1811
@@ -28,6 +28,6 @@ MAN3PREFIX=	${PREFIX}/lib/perl5
 BROKEN=		DEPENDS on databases/msql which is currently BROKEN, also perl5 upgrade
 
 do-configure:
-		@cd ${WRKSRC}; ${SETENV} ${CONFIGURE_ENV} ${PREFIX}/bin/perl Makefile.PL
+		@cd ${WRKSRC}; ${SETENV} ${CONFIGURE_ENV} ${PERL5} Makefile.PL
 
 .include <bsd.port.mk>
diff --git a/databases/p5-Mysql/Makefile b/databases/p5-Mysql/Makefile
index c89e430150e0..907181e2a2b5 100644
--- a/databases/p5-Mysql/Makefile
+++ b/databases/p5-Mysql/Makefile
@@ -3,7 +3,7 @@
 # Date created:				September 29th 1996
 # Whom:	      				James FitzGibbon <jfitz@FreeBSD.org>
 #
-# $Id: Makefile,v 1.8 1998/08/31 14:02:06 vanilla Exp $
+# $Id: Makefile,v 1.9 1998/09/06 19:28:04 andreas Exp $
 #
 
 DISTNAME=	Msql-Mysql-modules-1.2003
@@ -28,6 +28,6 @@ MAN3=		Bundle::Mysql.3 \
 MAN3PREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
 
 do-configure:
-		@cd ${WRKSRC}; ${SETENV} ${CONFIGURE_ENV} ${PREFIX}/bin/perl Makefile.PL
+		@cd ${WRKSRC}; ${SETENV} ${CONFIGURE_ENV} ${PERL5} Makefile.PL
 
 .include <bsd.port.mk>
diff --git a/databases/p5-Pg/Makefile b/databases/p5-Pg/Makefile
index cac172ecbf31..727d85638b9b 100644
--- a/databases/p5-Pg/Makefile
+++ b/databases/p5-Pg/Makefile
@@ -3,7 +3,7 @@
 # Date created:				October 19th 1996
 # Whom:	      				James FitzGibbon <jfitz@FreeBSD.org>
 #
-#   $Id: Makefile,v 1.11 1997/09/14 03:59:53 jfitz Exp $
+#   $Id: Makefile,v 1.12 1998/08/23 14:21:41 jseger Exp $
 #
 
 DISTNAME=	pgsql_perl5-1.6.1
@@ -22,6 +22,6 @@ MAN3=		Pg.3
 MANPREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
 
 do-configure:
-		@ cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PREFIX}/bin/perl Makefile.PL
+		@ cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL
 
 .include <bsd.port.mk>
diff --git a/databases/percona55-client/Makefile b/databases/percona55-client/Makefile
index 708240ebc2fe..1c86e71c3956 100644
--- a/databases/percona55-client/Makefile
+++ b/databases/percona55-client/Makefile
@@ -3,7 +3,7 @@
 # Date created:				26 Jan 1998
 # Whom:					Josh Tiefenbach <josh@ican.net>
 #
-# $Id$
+# $Id: Makefile,v 1.26 1998/09/06 19:58:25 andreas Exp $
 #
 
 DISTNAME=	mysql-3.22.6-alpha
@@ -25,8 +25,8 @@ CONFIGURE_ARGS=	--localstatedir=/var/db/mysql \
 		--without-debug \
 		--without-readline \
 		--without-bench
-CONFIGURE_ENV+=	PERL=${PREFIX}/bin/perl \
-		PERL5=${PREFIX}/bin/perl5 \
+CONFIGURE_ENV+=	PERL=${PERL5} \
+		PERL5=${PERL5} \
 		INSTALL_SCRIPT="${INSTALL_SCRIPT}"
 
 OSVERSION!=	sysctl -n kern.osreldate
@@ -62,7 +62,7 @@ pre-install:
 .if defined(PACKAGE_BUILDING)
 	@ ${RM} -rf /var/db/mysql
 .endif
-	@ ${SETENV} ${MAKE_ENV} ${PREFIX}/bin/perl ${SCRIPTDIR}/check_old_version
+	@ ${SETENV} ${MAKE_ENV} ${PERL5} ${SCRIPTDIR}/check_old_version
 
 post-install:
 	${MKDIR} ${PREFIX}/share/mysql/mysql
diff --git a/databases/percona55-server/Makefile b/databases/percona55-server/Makefile
index 708240ebc2fe..1c86e71c3956 100644
--- a/databases/percona55-server/Makefile
+++ b/databases/percona55-server/Makefile
@@ -3,7 +3,7 @@
 # Date created:				26 Jan 1998
 # Whom:					Josh Tiefenbach <josh@ican.net>
 #
-# $Id$
+# $Id: Makefile,v 1.26 1998/09/06 19:58:25 andreas Exp $
 #
 
 DISTNAME=	mysql-3.22.6-alpha
@@ -25,8 +25,8 @@ CONFIGURE_ARGS=	--localstatedir=/var/db/mysql \
 		--without-debug \
 		--without-readline \
 		--without-bench
-CONFIGURE_ENV+=	PERL=${PREFIX}/bin/perl \
-		PERL5=${PREFIX}/bin/perl5 \
+CONFIGURE_ENV+=	PERL=${PERL5} \
+		PERL5=${PERL5} \
 		INSTALL_SCRIPT="${INSTALL_SCRIPT}"
 
 OSVERSION!=	sysctl -n kern.osreldate
@@ -62,7 +62,7 @@ pre-install:
 .if defined(PACKAGE_BUILDING)
 	@ ${RM} -rf /var/db/mysql
 .endif
-	@ ${SETENV} ${MAKE_ENV} ${PREFIX}/bin/perl ${SCRIPTDIR}/check_old_version
+	@ ${SETENV} ${MAKE_ENV} ${PERL5} ${SCRIPTDIR}/check_old_version
 
 post-install:
 	${MKDIR} ${PREFIX}/share/mysql/mysql