Remove variable PERL_VER from the ports tree at all - because

it is obsolete since Perl 5.6.0.

19 files changed, 121 insertions, 706 deletions

diff --git a/Mk/bsd.perl.mk b/Mk/bsd.perl.mk
index ce142278ad34..2897951d8fe6 100644
--- a/Mk/bsd.perl.mk
+++ b/Mk/bsd.perl.mk
@@ -17,7 +17,6 @@
 #				  installed from a port, but without the version number.
 #				  Use this if you need to replace "#!" lines in scripts.
 # PERL_VERSION	- Full version of perl5 (see below for current value).
-# PERL_VER		- Short version of perl5 (see below for current value).
 # PERL_LEVEL	- Perl version as an integer of the form MNNNPP, where
 #				  M is major version, N is minor version, and P is
 #				  the patch level. E.g., PERL_VERSION=5.6.1 would give
@@ -86,7 +85,6 @@ PERL_Include_MAINTAINER=	perl@FreeBSD.org
 .if defined(_PERL_REFACTORING_COMPLETE)
 
 PERL_VERSION?=	5.8.9
-PERL_VER?=		5.8.9
 
 .if !defined(PERL_LEVEL) && defined(PERL_VERSION)
 perl_major=		${PERL_VERSION:C|\..*||}
@@ -107,7 +105,7 @@ PERL_PORT?=	perl5.8
 PERL_PORT?=	perl5.6
 .endif
 
-SITE_PERL_REL?=	lib/perl5/site_perl/${PERL_VER}
+SITE_PERL_REL?=	lib/perl5/site_perl/${PERL_VERSION}
 SITE_PERL?=	${LOCALBASE}/${SITE_PERL_REL}
 
 PERL5=		${LOCALBASE}/bin/perl${PERL_VERSION}
@@ -178,7 +176,7 @@ Perl_Post_Include=		bsd.perl.mk
 .if defined(_PERL_REFACTORING_COMPLETE)
 
 PLIST_SUB+=	PERL_VERSION=${PERL_VERSION} \
-			PERL_VER=${PERL_VER} \
+			PERL_VER=${PERL_VERSION} \
 			PERL_ARCH=${PERL_ARCH} \
 			SITE_PERL=${SITE_PERL_REL}
 
diff --git a/Mk/bsd.port.mk b/Mk/bsd.port.mk
index 992186d16e69..839966dab118 100644
--- a/Mk/bsd.port.mk
+++ b/Mk/bsd.port.mk
@@ -327,7 +327,6 @@ FreeBSD_MAINTAINER=	portmgr@FreeBSD.org
 #				  installed from a port, but without the version number.
 #				  Use this if you need to replace "#!" lines in scripts.
 # PERL_VERSION	- Full version of perl5 (see below for current value).
-# PERL_VER		- Short version of perl5 (see below for current value).
 # PERL_LEVEL	- Perl version as an integer of the form MNNNPP, where
 #				  M is major version, N is minor version, and P is
 #				  the patch level. E.g., PERL_VERSION=5.6.1 would give
@@ -1408,7 +1407,6 @@ PKGCOMPATDIR?=		${LOCALBASE}/lib/compat/pkg
 .if !defined(_PERL_REFACTORING_COMPLETE)
 
 PERL_VERSION?=	5.8.9
-PERL_VER?=	5.8.9
 
 .if !defined(PERL_LEVEL) && defined(PERL_VERSION)
 perl_major=		${PERL_VERSION:C|^([1-9]+).*|\1|}
@@ -1434,7 +1432,7 @@ PERL_PORT?=	perl5.8
 PERL_PORT?=	perl5.6
 .endif
 
-SITE_PERL_REL?=	lib/perl5/site_perl/${PERL_VER}
+SITE_PERL_REL?=	lib/perl5/site_perl/${PERL_VERSION}
 SITE_PERL?=	${LOCALBASE}/${SITE_PERL_REL}
 
 PERL5=		${LOCALBASE}/bin/perl${PERL_VERSION}
@@ -1920,7 +1918,7 @@ IGNORE=	uses unknown USE_BISON construct
 
 .if !defined(_PERL_REFACTORING_COMPLETE)
 PLIST_SUB+=		PERL_VERSION=${PERL_VERSION} \
-				PERL_VER=${PERL_VER} \
+				PERL_VER=${PERL_VERSION} \
 				PERL_ARCH=${PERL_ARCH} \
 				SITE_PERL=${SITE_PERL_REL}
 .endif  # !defined(_PERL_REFACTORING_COMPLETE)
diff --git a/biology/p5-bioperl/Makefile b/biology/p5-bioperl/Makefile
index 18f9dbdd3bc8..4af9856771c8 100644
--- a/biology/p5-bioperl/Makefile
+++ b/biology/p5-bioperl/Makefile
@@ -16,8 +16,8 @@ DISTNAME=	BioPerl-${PORTVERSION}
 MAINTAINER=	fernan@iib.unsam.edu.ar
 COMMENT=	A collection of Perl modules for bioinformatics
 
-BUILD_DEPENDS=	${LOCALBASE}/lib/perl5/${PERL_VER}/Text/Wrap.pm:${PORTSDIR}/lang/perl5.8 \
-		${LOCALBASE}/lib/perl5/${PERL_VER}/${PERL_ARCH}/DB_File.pm:${PORTSDIR}/lang/perl5.8 \
+BUILD_DEPENDS=	${LOCALBASE}/lib/perl5/${PERL_VERSION}/Text/Wrap.pm:${PORTSDIR}/lang/${PERL_PORT} \
+		${LOCALBASE}/lib/perl5/${PERL_VERSION}/${PERL_ARCH}/DB_File.pm:${PORTSDIR}/lang/${PERL_PORT} \
 		${SITE_PERL}/Bio/ASN1/EntrezGene.pm:${PORTSDIR}/biology/p5-Bio-ASN1-EntrezGene \
 		${SITE_PERL}/Class/AutoClass.pm:${PORTSDIR}/devel/p5-Class-AutoClass \
 		${SITE_PERL}/Data/Stag/ITextWriter.pm:${PORTSDIR}/devel/p5-Data-Stag \
diff --git a/japanese/jcode.pl/Makefile b/japanese/jcode.pl/Makefile
index f757fcee79d5..efdbe7407e02 100644
--- a/japanese/jcode.pl/Makefile
+++ b/japanese/jcode.pl/Makefile
@@ -22,7 +22,7 @@ EXTRACT_BEFORE_ARGS=
 EXTRACT_AFTER_ARGS=	.
 PLIST_SUB=		INSTALL_BASE=${INSTALL_BASE}
 
-INSTALL_BASE=	lib/perl5/site_perl/${PERL_VER}
+INSTALL_BASE=	${SITE_PERL_REL}
 INSTALL_DIR=	${PREFIX}/${INSTALL_BASE}
 
 do-install:
diff --git a/japanese/p5-jcode.pl/Makefile b/japanese/p5-jcode.pl/Makefile
index eaa5212e30ac..cf8b6a7cad4b 100644
--- a/japanese/p5-jcode.pl/Makefile
+++ b/japanese/p5-jcode.pl/Makefile
@@ -23,7 +23,7 @@ NO_BUILD=	YES
 USE_PERL5=	YES
 PLIST_SUB=	INSTALL_BASE=${INSTALL_BASE}
 
-INSTALL_BASE=	lib/perl5/site_perl/${PERL_VER}
+INSTALL_BASE=	${SITE_PERL_REL}
 INSTALL_DIR=	${PREFIX}/${INSTALL_BASE}
 
 .include <bsd.port.pre.mk>
diff --git a/lang/perl5.10/Makefile b/lang/perl5.10/Makefile
index a7e77d1658ef..aef552feba13 100644
--- a/lang/perl5.10/Makefile
+++ b/lang/perl5.10/Makefile
@@ -20,7 +20,7 @@ DIST_SUBDIR=	perl
 
 PATCH_SITES=	${MASTER_SITE_LOCAL:S!$!skv/!} \
 		http://protey.ru/freebsd/distfiles/
-PATCHFILES=	defined-or-${PERL_VER}.bz2
+PATCHFILES=	defined-or-${PERL_VERSION}.bz2
 
 MAINTAINER=	skv@FreeBSD.org
 COMMENT=	Practical Extraction and Report Language
@@ -36,23 +36,22 @@ OPTIONS=	DEBUGGING	"Build with debugging support"		off \
 		SITECUSTOMIZE	"Run-time customization of @INC"	off \
 		USE_PERL	"Rewrite links in /usr/bin"		on
 
-PERL_VER=	5.8.9
+PERL_VERSION=	5.8.9
 PERL_ARCH=	mach
-PERL_VERSION=	${PERL_VER}
-SITE_PERL_REL?=	lib/perl5/site_perl/${PERL_VER}
+SITE_PERL_REL?=	lib/perl5/site_perl/${PERL_VERSION}
 SITE_PERL?=	${LOCALBASE}/${SITE_PERL_REL}
 
 USE_BZIP2=	yes
 HAS_CONFIGURE=	yes
 CONFIGURE_SCRIPT=Configure
 CONFIGURE_ARGS=	-sde -Dprefix=${PREFIX} \
-	-Darchlib=${PREFIX}/lib/perl5/${PERL_VER}/${PERL_ARCH} \
-	-Dprivlib=${PREFIX}/lib/perl5/${PERL_VER} \
-	-Dman3dir=${PREFIX}/lib/perl5/${PERL_VER}/perl/man/man3 \
+	-Darchlib=${PREFIX}/lib/perl5/${PERL_VERSION}/${PERL_ARCH} \
+	-Dprivlib=${PREFIX}/lib/perl5/${PERL_VERSION} \
+	-Dman3dir=${PREFIX}/lib/perl5/${PERL_VERSION}/perl/man/man3 \
 	-Dman1dir=${PREFIX}/man/man1 \
 	-Dsitearch=${PREFIX}/${SITE_PERL_REL}/${PERL_ARCH} \
 	-Dsitelib=${PREFIX}/${SITE_PERL_REL} -Dscriptdir=${PREFIX}/bin \
-	-Dsiteman3dir=${PREFIX}/lib/perl5/${PERL_VER}/man/man3 \
+	-Dsiteman3dir=${PREFIX}/lib/perl5/${PERL_VERSION}/man/man3 \
 	-Dsiteman1dir=${PREFIX}/man/man1 \
 	-Ui_malloc -Ui_iconv -Uinstallusrbinperl \
 	-Dcc="${CC}" -Duseshrplib -Dinc_version_list=none \
@@ -67,7 +66,7 @@ MAKE_ENV+=	${LOCALE_CLEANUP}
 .include <bsd.port.pre.mk>
 
 PLIST_SUB+=	PERL_VERSION=${PERL_VERSION} \
-		PERL_VER=${PERL_VER} \
+		PERL_VER=${PERL_VERSION} \
 		PERL_ARCH=${PERL_ARCH} \
 		SITE_PERL=${SITE_PERL:S|^${LOCALBASE}/||}
 
@@ -135,9 +134,9 @@ PLIST_SUB+=		NEED_USE_PERL="@comment "
 .if defined(WITH_GDBM)
 MAN3+=	GDBM_File.3
 .endif
-MAN3PREFIX=	${PREFIX}/lib/perl5/${PERL_VER}/perl
+MAN3PREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}/perl
 
-BSDPAN_DEST=	${PREFIX}/lib/perl5/${PERL_VER}/BSDPAN
+BSDPAN_DEST=	${PREFIX}/lib/perl5/${PERL_VERSION}/BSDPAN
 BSDPAN_FILES=	BSDPAN.pm BSDPAN/Override.pm Config.pm \
 		ExtUtils/MM_Unix.pm \
 		ExtUtils/MakeMaker.pm \
@@ -150,7 +149,6 @@ PKGDEINSTALL=	${WRKDIR}/pkg-deinstall
 
 post-patch:
 	${SED} -e 's|%%PREFIX%%|${PREFIX}|g;' \
-		-e 's|%%PERL_VER%%|${PERL_VER}|g;' \
 		-e 's|%%PERL_VERSION%%|${PERL_VERSION}|g;' \
 		-e 's|%%PERL_ARCH%%|${PERL_ARCH}|g;' \
 		-e 's|%%MAKE_CONF%%|${__MAKE_CONF}|g;' \
@@ -174,16 +172,16 @@ post-patch:
 .endif
 
 pre-su-install:
-	@${RM} -f ${PREFIX}/bin/perl${PERL_VER}
+	@${RM} -f ${PREFIX}/bin/perl${PERL_VERSION}
 	@${RM} -f ${PREFIX}/bin/perl
 
 post-install:
-	@${STRIP_CMD} ${PREFIX}/bin/perl${PERL_VER}
+	@${STRIP_CMD} ${PREFIX}/bin/perl${PERL_VERSION}
 	@${STRIP_CMD} ${PREFIX}/bin/perl
 	@${PREFIX}/bin/pod2man ${WRKDIR}/perl-after-upgrade >${WRKDIR}/perl-after-upgrade.1
 	@${INSTALL_SCRIPT} ${WRKDIR}/perl-after-upgrade ${PREFIX}/bin/perl-after-upgrade
 	@${INSTALL_MAN} ${WRKDIR}/perl-after-upgrade.1 ${MAN1PREFIX}/man/man1/perl-after-upgrade.1
-	@${LN} -sf ${PREFIX}/bin/perl${PERL_VER} ${PREFIX}/bin/perl5
+	@${LN} -sf ${PREFIX}/bin/perl${PERL_VERSION} ${PREFIX}/bin/perl5
 .for files in ${BSDPAN_FILES}
 	${MKDIR} ${BSDPAN_DEST}/${files:H}
 	${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m ${NOBINMODE} \
diff --git a/lang/perl5.10/files/use.perl b/lang/perl5.10/files/use.perl
index eca7811f3a85..55b7f51ed148 100644
--- a/lang/perl5.10/files/use.perl
+++ b/lang/perl5.10/files/use.perl
@@ -28,9 +28,6 @@ if [ "x$this" = "xuse.perl" ]; then
 		need_spam_manpath=yes
 	elif [ "$1" = "system" ] ; then
 		need_remove_links=yes
-		if [ $osreldate -lt 500036 ] ; then
-			need_base_system_perl=yes
-		fi
 		need_cleanup_make_conf=yes
 		need_cleanup_manpath=yes
 	else
@@ -42,19 +39,14 @@ if [ "x$this" = "xuse.perl" ]; then
 else
 	if [ "$2" = "POST-INSTALL" ] ; then
 		need_remove_links=yes
-		if [ $osreldate -ge 500036 ] ; then
-			need_create_links=yes
-			need_cleanup_make_conf=yes
-			need_cleanup_manpath=yes
-			need_spam_make_conf=yes
-			need_spam_manpath=yes
-		fi
+		need_create_links=yes
+		need_cleanup_make_conf=yes
+		need_cleanup_manpath=yes
+		need_spam_make_conf=yes
+		need_spam_manpath=yes
 		need_post_install=yes
 	elif [ "$2" = "POST-DEINSTALL" ] ; then
 		need_remove_links=yes
-		if [ $osreldate -lt 500036 ] ; then
-			need_base_system_perl=yes
-		fi
 		need_cleanup_make_conf=yes
 		need_cleanup_manpath=yes
 	else
@@ -62,26 +54,6 @@ else
 	fi
 fi
 
-link_list="
-	a2p
-	c2ph
-	find2perl
-	h2ph
-	h2xs
-	perlbug
-	perlcc
-	perldoc
-	pl2pm
-	pod2html
-	pod2latex
-	pod2man
-	pod2text
-	s2p
-	splain
-	suidperl"
-if [ $osreldate -ge 500036 ] ; then
-	link_list=""
-fi
 special_link_list="
 	perl
 	perl5"
@@ -89,7 +61,7 @@ special_link_list="
 do_remove_links()
 {
 	echo "Removing stale symlinks from /usr/bin..."
-	for binary in $link_list $special_link_list
+	for binary in $special_link_list
 	do
 		if [ -L "/usr/bin/$binary" ] ; then
 			echo "    Removing /usr/bin/$binary"
@@ -112,21 +84,6 @@ do_remove_links()
 do_create_links()
 {
 	echo "Creating various symlinks in /usr/bin..."
-	for binary in $link_list
-	do
-		if [ -f "/usr/bin/$binary" ] ; then
-			echo "    Backing up /usr/bin/$binary as /usr/bin/$binary.freebsd"
-			/bin/mv -f "/usr/bin/$binary" "/usr/bin/$binary.freebsd"
-		fi
-		if [ -e "/usr/bin/$binary" ] ; then
-			echo "    *** /usr/bin/$binary is still there, which should not happen"
-		elif [ -e "$PKG_PREFIX/bin/$binary" ] ; then
-			echo "    Symlinking $PKG_PREFIX/bin/$binary to /usr/bin/$binary"
-			/bin/ln -sf "$PKG_PREFIX/bin/$binary" "/usr/bin/$binary"
-		else
-			echo "    *** $PKG_PREFIX/bin/$binary is not there, a symlink won't do any good"
-		fi
-	done
 	for binary in $special_link_list
 	do
 		if [ -f "/usr/bin/$binary" ] ; then
@@ -146,54 +103,6 @@ do_create_links()
 	echo "Done."
 }
 
-do_base_system_perl()
-{
-	echo "Restoring base system perl binaries..."
-	for binary in $link_list
-	do
-		if [ -e "/usr/bin/$binary" ] ; then
-			echo "    *** /usr/bin/$binary is there, which should not happen"
-		else
-			if [ -f "/usr/bin/$binary.freebsd" ] ; then
-				echo "    Moving /usr/bin/$binary.freebsd to /usr/bin/$binary"
-				/bin/mv -f "/usr/bin/$binary.freebsd" "/usr/bin/$binary"
-			else
-				echo "    *** /usr/bin/$binary.freebsd is NOT there, nothing to restore"
-			fi
-		fi
-	done
-	for binary in $special_link_list
-	do
-		if [ -e "/usr/bin/$binary" ] ; then
-			echo "    *** /usr/bin/$binary is there, which should not happen"
-		else
-			bin=`echo $binary | /usr/bin/sed -e 's!perl5!perl!'`
-			bin=`echo $bin | /usr/bin/sed -e 's!suidperl!sperl!'`
-			bins=`/bin/ls /usr/bin/${bin}5.* 2>/dev/null | /usr/bin/sort`
-			bin=""
-			for b in $bins
-			do
-				if [ -f $b -a ! -L $b ] ; then
-					bin=$b
-				fi
-			done
-			if [ -z $bin ] ; then
-				echo "    *** cannot find what /usr/bin/$binary shall be restored FROM"
-			elif [ -f $bin ] ; then
-				echo "    Hardlinking $bin to /usr/bin/$binary"
-				ln -f "$bin" "/usr/bin/$binary"
-			else
-				echo "    *** $bin is NOT there, nothing to restore"
-			fi
-			if [ -f "/usr/bin/$binary.freebsd" ] ; then
-				echo "    Removing backup copy /usr/bin/$binary.freebsd"
-				rm -f "/usr/bin/$binary.freebsd"
-			fi
-		fi
-	done
-	echo "Done."
-}
-
 do_post_install()
 {
 	INCLUDEDIR=/usr/include
@@ -239,11 +148,7 @@ do_spam_make_conf()
 {
 	echo -n "Spamming ${MAKE_CONF}..."
 	echo "$banner" >>${MAKE_CONF}
-	echo "PERL_VER=%%PERL_VER%%" >>${MAKE_CONF}
 	echo "PERL_VERSION=%%PERL_VERSION%%" >>${MAKE_CONF}
-	if [ $osreldate -lt 500036 ] ; then
-		echo "NOPERL=yes" >>${MAKE_CONF}
-	fi
 	echo " Done."
 }
 
@@ -258,7 +163,6 @@ do_spam_manpath()
 
 [ $need_remove_links ] && do_remove_links
 [ $need_create_links ] && do_create_links
-[ $need_base_system_perl ] && do_base_system_perl
 [ $need_post_install ] && do_post_install
 [ $need_cleanup_make_conf ] && do_cleanup_make_conf
 [ $need_spam_make_conf ] && do_spam_make_conf
diff --git a/lang/perl5.12/Makefile b/lang/perl5.12/Makefile
index a7e77d1658ef..aef552feba13 100644
--- a/lang/perl5.12/Makefile
+++ b/lang/perl5.12/Makefile
@@ -20,7 +20,7 @@ DIST_SUBDIR=	perl
 
 PATCH_SITES=	${MASTER_SITE_LOCAL:S!$!skv/!} \
 		http://protey.ru/freebsd/distfiles/
-PATCHFILES=	defined-or-${PERL_VER}.bz2
+PATCHFILES=	defined-or-${PERL_VERSION}.bz2
 
 MAINTAINER=	skv@FreeBSD.org
 COMMENT=	Practical Extraction and Report Language
@@ -36,23 +36,22 @@ OPTIONS=	DEBUGGING	"Build with debugging support"		off \
 		SITECUSTOMIZE	"Run-time customization of @INC"	off \
 		USE_PERL	"Rewrite links in /usr/bin"		on
 
-PERL_VER=	5.8.9
+PERL_VERSION=	5.8.9
 PERL_ARCH=	mach
-PERL_VERSION=	${PERL_VER}
-SITE_PERL_REL?=	lib/perl5/site_perl/${PERL_VER}
+SITE_PERL_REL?=	lib/perl5/site_perl/${PERL_VERSION}
 SITE_PERL?=	${LOCALBASE}/${SITE_PERL_REL}
 
 USE_BZIP2=	yes
 HAS_CONFIGURE=	yes
 CONFIGURE_SCRIPT=Configure
 CONFIGURE_ARGS=	-sde -Dprefix=${PREFIX} \
-	-Darchlib=${PREFIX}/lib/perl5/${PERL_VER}/${PERL_ARCH} \
-	-Dprivlib=${PREFIX}/lib/perl5/${PERL_VER} \
-	-Dman3dir=${PREFIX}/lib/perl5/${PERL_VER}/perl/man/man3 \
+	-Darchlib=${PREFIX}/lib/perl5/${PERL_VERSION}/${PERL_ARCH} \
+	-Dprivlib=${PREFIX}/lib/perl5/${PERL_VERSION} \
+	-Dman3dir=${PREFIX}/lib/perl5/${PERL_VERSION}/perl/man/man3 \
 	-Dman1dir=${PREFIX}/man/man1 \
 	-Dsitearch=${PREFIX}/${SITE_PERL_REL}/${PERL_ARCH} \
 	-Dsitelib=${PREFIX}/${SITE_PERL_REL} -Dscriptdir=${PREFIX}/bin \
-	-Dsiteman3dir=${PREFIX}/lib/perl5/${PERL_VER}/man/man3 \
+	-Dsiteman3dir=${PREFIX}/lib/perl5/${PERL_VERSION}/man/man3 \
 	-Dsiteman1dir=${PREFIX}/man/man1 \
 	-Ui_malloc -Ui_iconv -Uinstallusrbinperl \
 	-Dcc="${CC}" -Duseshrplib -Dinc_version_list=none \
@@ -67,7 +66,7 @@ MAKE_ENV+=	${LOCALE_CLEANUP}
 .include <bsd.port.pre.mk>
 
 PLIST_SUB+=	PERL_VERSION=${PERL_VERSION} \
-		PERL_VER=${PERL_VER} \
+		PERL_VER=${PERL_VERSION} \
 		PERL_ARCH=${PERL_ARCH} \
 		SITE_PERL=${SITE_PERL:S|^${LOCALBASE}/||}
 
@@ -135,9 +134,9 @@ PLIST_SUB+=		NEED_USE_PERL="@comment "
 .if defined(WITH_GDBM)
 MAN3+=	GDBM_File.3
 .endif
-MAN3PREFIX=	${PREFIX}/lib/perl5/${PERL_VER}/perl
+MAN3PREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}/perl
 
-BSDPAN_DEST=	${PREFIX}/lib/perl5/${PERL_VER}/BSDPAN
+BSDPAN_DEST=	${PREFIX}/lib/perl5/${PERL_VERSION}/BSDPAN
 BSDPAN_FILES=	BSDPAN.pm BSDPAN/Override.pm Config.pm \
 		ExtUtils/MM_Unix.pm \
 		ExtUtils/MakeMaker.pm \
@@ -150,7 +149,6 @@ PKGDEINSTALL=	${WRKDIR}/pkg-deinstall
 
 post-patch:
 	${SED} -e 's|%%PREFIX%%|${PREFIX}|g;' \
-		-e 's|%%PERL_VER%%|${PERL_VER}|g;' \
 		-e 's|%%PERL_VERSION%%|${PERL_VERSION}|g;' \
 		-e 's|%%PERL_ARCH%%|${PERL_ARCH}|g;' \
 		-e 's|%%MAKE_CONF%%|${__MAKE_CONF}|g;' \
@@ -174,16 +172,16 @@ post-patch:
 .endif
 
 pre-su-install:
-	@${RM} -f ${PREFIX}/bin/perl${PERL_VER}
+	@${RM} -f ${PREFIX}/bin/perl${PERL_VERSION}
 	@${RM} -f ${PREFIX}/bin/perl
 
 post-install:
-	@${STRIP_CMD} ${PREFIX}/bin/perl${PERL_VER}
+	@${STRIP_CMD} ${PREFIX}/bin/perl${PERL_VERSION}
 	@${STRIP_CMD} ${PREFIX}/bin/perl
 	@${PREFIX}/bin/pod2man ${WRKDIR}/perl-after-upgrade >${WRKDIR}/perl-after-upgrade.1
 	@${INSTALL_SCRIPT} ${WRKDIR}/perl-after-upgrade ${PREFIX}/bin/perl-after-upgrade
 	@${INSTALL_MAN} ${WRKDIR}/perl-after-upgrade.1 ${MAN1PREFIX}/man/man1/perl-after-upgrade.1
-	@${LN} -sf ${PREFIX}/bin/perl${PERL_VER} ${PREFIX}/bin/perl5
+	@${LN} -sf ${PREFIX}/bin/perl${PERL_VERSION} ${PREFIX}/bin/perl5
 .for files in ${BSDPAN_FILES}
 	${MKDIR} ${BSDPAN_DEST}/${files:H}
 	${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m ${NOBINMODE} \
diff --git a/lang/perl5.12/files/use.perl b/lang/perl5.12/files/use.perl
index eca7811f3a85..55b7f51ed148 100644
--- a/lang/perl5.12/files/use.perl
+++ b/lang/perl5.12/files/use.perl
@@ -28,9 +28,6 @@ if [ "x$this" = "xuse.perl" ]; then
 		need_spam_manpath=yes
 	elif [ "$1" = "system" ] ; then
 		need_remove_links=yes
-		if [ $osreldate -lt 500036 ] ; then
-			need_base_system_perl=yes
-		fi
 		need_cleanup_make_conf=yes
 		need_cleanup_manpath=yes
 	else
@@ -42,19 +39,14 @@ if [ "x$this" = "xuse.perl" ]; then
 else
 	if [ "$2" = "POST-INSTALL" ] ; then
 		need_remove_links=yes
-		if [ $osreldate -ge 500036 ] ; then
-			need_create_links=yes
-			need_cleanup_make_conf=yes
-			need_cleanup_manpath=yes
-			need_spam_make_conf=yes
-			need_spam_manpath=yes
-		fi
+		need_create_links=yes
+		need_cleanup_make_conf=yes
+		need_cleanup_manpath=yes
+		need_spam_make_conf=yes
+		need_spam_manpath=yes
 		need_post_install=yes
 	elif [ "$2" = "POST-DEINSTALL" ] ; then
 		need_remove_links=yes
-		if [ $osreldate -lt 500036 ] ; then
-			need_base_system_perl=yes
-		fi
 		need_cleanup_make_conf=yes
 		need_cleanup_manpath=yes
 	else
@@ -62,26 +54,6 @@ else
 	fi
 fi
 
-link_list="
-	a2p
-	c2ph
-	find2perl
-	h2ph
-	h2xs
-	perlbug
-	perlcc
-	perldoc
-	pl2pm
-	pod2html
-	pod2latex
-	pod2man
-	pod2text
-	s2p
-	splain
-	suidperl"
-if [ $osreldate -ge 500036 ] ; then
-	link_list=""
-fi
 special_link_list="
 	perl
 	perl5"
@@ -89,7 +61,7 @@ special_link_list="
 do_remove_links()
 {
 	echo "Removing stale symlinks from /usr/bin..."
-	for binary in $link_list $special_link_list
+	for binary in $special_link_list
 	do
 		if [ -L "/usr/bin/$binary" ] ; then
 			echo "    Removing /usr/bin/$binary"
@@ -112,21 +84,6 @@ do_remove_links()
 do_create_links()
 {
 	echo "Creating various symlinks in /usr/bin..."
-	for binary in $link_list
-	do
-		if [ -f "/usr/bin/$binary" ] ; then
-			echo "    Backing up /usr/bin/$binary as /usr/bin/$binary.freebsd"
-			/bin/mv -f "/usr/bin/$binary" "/usr/bin/$binary.freebsd"
-		fi
-		if [ -e "/usr/bin/$binary" ] ; then
-			echo "    *** /usr/bin/$binary is still there, which should not happen"
-		elif [ -e "$PKG_PREFIX/bin/$binary" ] ; then
-			echo "    Symlinking $PKG_PREFIX/bin/$binary to /usr/bin/$binary"
-			/bin/ln -sf "$PKG_PREFIX/bin/$binary" "/usr/bin/$binary"
-		else
-			echo "    *** $PKG_PREFIX/bin/$binary is not there, a symlink won't do any good"
-		fi
-	done
 	for binary in $special_link_list
 	do
 		if [ -f "/usr/bin/$binary" ] ; then
@@ -146,54 +103,6 @@ do_create_links()
 	echo "Done."
 }
 
-do_base_system_perl()
-{
-	echo "Restoring base system perl binaries..."
-	for binary in $link_list
-	do
-		if [ -e "/usr/bin/$binary" ] ; then
-			echo "    *** /usr/bin/$binary is there, which should not happen"
-		else
-			if [ -f "/usr/bin/$binary.freebsd" ] ; then
-				echo "    Moving /usr/bin/$binary.freebsd to /usr/bin/$binary"
-				/bin/mv -f "/usr/bin/$binary.freebsd" "/usr/bin/$binary"
-			else
-				echo "    *** /usr/bin/$binary.freebsd is NOT there, nothing to restore"
-			fi
-		fi
-	done
-	for binary in $special_link_list
-	do
-		if [ -e "/usr/bin/$binary" ] ; then
-			echo "    *** /usr/bin/$binary is there, which should not happen"
-		else
-			bin=`echo $binary | /usr/bin/sed -e 's!perl5!perl!'`
-			bin=`echo $bin | /usr/bin/sed -e 's!suidperl!sperl!'`
-			bins=`/bin/ls /usr/bin/${bin}5.* 2>/dev/null | /usr/bin/sort`
-			bin=""
-			for b in $bins
-			do
-				if [ -f $b -a ! -L $b ] ; then
-					bin=$b
-				fi
-			done
-			if [ -z $bin ] ; then
-				echo "    *** cannot find what /usr/bin/$binary shall be restored FROM"
-			elif [ -f $bin ] ; then
-				echo "    Hardlinking $bin to /usr/bin/$binary"
-				ln -f "$bin" "/usr/bin/$binary"
-			else
-				echo "    *** $bin is NOT there, nothing to restore"
-			fi
-			if [ -f "/usr/bin/$binary.freebsd" ] ; then
-				echo "    Removing backup copy /usr/bin/$binary.freebsd"
-				rm -f "/usr/bin/$binary.freebsd"
-			fi
-		fi
-	done
-	echo "Done."
-}
-
 do_post_install()
 {
 	INCLUDEDIR=/usr/include
@@ -239,11 +148,7 @@ do_spam_make_conf()
 {
 	echo -n "Spamming ${MAKE_CONF}..."
 	echo "$banner" >>${MAKE_CONF}
-	echo "PERL_VER=%%PERL_VER%%" >>${MAKE_CONF}
 	echo "PERL_VERSION=%%PERL_VERSION%%" >>${MAKE_CONF}
-	if [ $osreldate -lt 500036 ] ; then
-		echo "NOPERL=yes" >>${MAKE_CONF}
-	fi
 	echo " Done."
 }
 
@@ -258,7 +163,6 @@ do_spam_manpath()
 
 [ $need_remove_links ] && do_remove_links
 [ $need_create_links ] && do_create_links
-[ $need_base_system_perl ] && do_base_system_perl
 [ $need_post_install ] && do_post_install
 [ $need_cleanup_make_conf ] && do_cleanup_make_conf
 [ $need_spam_make_conf ] && do_spam_make_conf
diff --git a/lang/perl5.14/Makefile b/lang/perl5.14/Makefile
index a7e77d1658ef..aef552feba13 100644
--- a/lang/perl5.14/Makefile
+++ b/lang/perl5.14/Makefile
@@ -20,7 +20,7 @@ DIST_SUBDIR=	perl
 
 PATCH_SITES=	${MASTER_SITE_LOCAL:S!$!skv/!} \
 		http://protey.ru/freebsd/distfiles/
-PATCHFILES=	defined-or-${PERL_VER}.bz2
+PATCHFILES=	defined-or-${PERL_VERSION}.bz2
 
 MAINTAINER=	skv@FreeBSD.org
 COMMENT=	Practical Extraction and Report Language
@@ -36,23 +36,22 @@ OPTIONS=	DEBUGGING	"Build with debugging support"		off \
 		SITECUSTOMIZE	"Run-time customization of @INC"	off \
 		USE_PERL	"Rewrite links in /usr/bin"		on
 
-PERL_VER=	5.8.9
+PERL_VERSION=	5.8.9
 PERL_ARCH=	mach
-PERL_VERSION=	${PERL_VER}
-SITE_PERL_REL?=	lib/perl5/site_perl/${PERL_VER}
+SITE_PERL_REL?=	lib/perl5/site_perl/${PERL_VERSION}
 SITE_PERL?=	${LOCALBASE}/${SITE_PERL_REL}
 
 USE_BZIP2=	yes
 HAS_CONFIGURE=	yes
 CONFIGURE_SCRIPT=Configure
 CONFIGURE_ARGS=	-sde -Dprefix=${PREFIX} \
-	-Darchlib=${PREFIX}/lib/perl5/${PERL_VER}/${PERL_ARCH} \
-	-Dprivlib=${PREFIX}/lib/perl5/${PERL_VER} \
-	-Dman3dir=${PREFIX}/lib/perl5/${PERL_VER}/perl/man/man3 \
+	-Darchlib=${PREFIX}/lib/perl5/${PERL_VERSION}/${PERL_ARCH} \
+	-Dprivlib=${PREFIX}/lib/perl5/${PERL_VERSION} \
+	-Dman3dir=${PREFIX}/lib/perl5/${PERL_VERSION}/perl/man/man3 \
 	-Dman1dir=${PREFIX}/man/man1 \
 	-Dsitearch=${PREFIX}/${SITE_PERL_REL}/${PERL_ARCH} \
 	-Dsitelib=${PREFIX}/${SITE_PERL_REL} -Dscriptdir=${PREFIX}/bin \
-	-Dsiteman3dir=${PREFIX}/lib/perl5/${PERL_VER}/man/man3 \
+	-Dsiteman3dir=${PREFIX}/lib/perl5/${PERL_VERSION}/man/man3 \
 	-Dsiteman1dir=${PREFIX}/man/man1 \
 	-Ui_malloc -Ui_iconv -Uinstallusrbinperl \
 	-Dcc="${CC}" -Duseshrplib -Dinc_version_list=none \
@@ -67,7 +66,7 @@ MAKE_ENV+=	${LOCALE_CLEANUP}
 .include <bsd.port.pre.mk>
 
 PLIST_SUB+=	PERL_VERSION=${PERL_VERSION} \
-		PERL_VER=${PERL_VER} \
+		PERL_VER=${PERL_VERSION} \
 		PERL_ARCH=${PERL_ARCH} \
 		SITE_PERL=${SITE_PERL:S|^${LOCALBASE}/||}
 
@@ -135,9 +134,9 @@ PLIST_SUB+=		NEED_USE_PERL="@comment "
 .if defined(WITH_GDBM)
 MAN3+=	GDBM_File.3
 .endif
-MAN3PREFIX=	${PREFIX}/lib/perl5/${PERL_VER}/perl
+MAN3PREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}/perl
 
-BSDPAN_DEST=	${PREFIX}/lib/perl5/${PERL_VER}/BSDPAN
+BSDPAN_DEST=	${PREFIX}/lib/perl5/${PERL_VERSION}/BSDPAN
 BSDPAN_FILES=	BSDPAN.pm BSDPAN/Override.pm Config.pm \
 		ExtUtils/MM_Unix.pm \
 		ExtUtils/MakeMaker.pm \
@@ -150,7 +149,6 @@ PKGDEINSTALL=	${WRKDIR}/pkg-deinstall
 
 post-patch:
 	${SED} -e 's|%%PREFIX%%|${PREFIX}|g;' \
-		-e 's|%%PERL_VER%%|${PERL_VER}|g;' \
 		-e 's|%%PERL_VERSION%%|${PERL_VERSION}|g;' \
 		-e 's|%%PERL_ARCH%%|${PERL_ARCH}|g;' \
 		-e 's|%%MAKE_CONF%%|${__MAKE_CONF}|g;' \
@@ -174,16 +172,16 @@ post-patch:
 .endif
 
 pre-su-install:
-	@${RM} -f ${PREFIX}/bin/perl${PERL_VER}
+	@${RM} -f ${PREFIX}/bin/perl${PERL_VERSION}
 	@${RM} -f ${PREFIX}/bin/perl
 
 post-install:
-	@${STRIP_CMD} ${PREFIX}/bin/perl${PERL_VER}
+	@${STRIP_CMD} ${PREFIX}/bin/perl${PERL_VERSION}
 	@${STRIP_CMD} ${PREFIX}/bin/perl
 	@${PREFIX}/bin/pod2man ${WRKDIR}/perl-after-upgrade >${WRKDIR}/perl-after-upgrade.1
 	@${INSTALL_SCRIPT} ${WRKDIR}/perl-after-upgrade ${PREFIX}/bin/perl-after-upgrade
 	@${INSTALL_MAN} ${WRKDIR}/perl-after-upgrade.1 ${MAN1PREFIX}/man/man1/perl-after-upgrade.1
-	@${LN} -sf ${PREFIX}/bin/perl${PERL_VER} ${PREFIX}/bin/perl5
+	@${LN} -sf ${PREFIX}/bin/perl${PERL_VERSION} ${PREFIX}/bin/perl5
 .for files in ${BSDPAN_FILES}
 	${MKDIR} ${BSDPAN_DEST}/${files:H}
 	${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m ${NOBINMODE} \
diff --git a/lang/perl5.14/files/use.perl b/lang/perl5.14/files/use.perl
index eca7811f3a85..55b7f51ed148 100644
--- a/lang/perl5.14/files/use.perl
+++ b/lang/perl5.14/files/use.perl
@@ -28,9 +28,6 @@ if [ "x$this" = "xuse.perl" ]; then
 		need_spam_manpath=yes
 	elif [ "$1" = "system" ] ; then
 		need_remove_links=yes
-		if [ $osreldate -lt 500036 ] ; then
-			need_base_system_perl=yes
-		fi
 		need_cleanup_make_conf=yes
 		need_cleanup_manpath=yes
 	else
@@ -42,19 +39,14 @@ if [ "x$this" = "xuse.perl" ]; then
 else
 	if [ "$2" = "POST-INSTALL" ] ; then
 		need_remove_links=yes
-		if [ $osreldate -ge 500036 ] ; then
-			need_create_links=yes
-			need_cleanup_make_conf=yes
-			need_cleanup_manpath=yes
-			need_spam_make_conf=yes
-			need_spam_manpath=yes
-		fi
+		need_create_links=yes
+		need_cleanup_make_conf=yes
+		need_cleanup_manpath=yes
+		need_spam_make_conf=yes
+		need_spam_manpath=yes
 		need_post_install=yes
 	elif [ "$2" = "POST-DEINSTALL" ] ; then
 		need_remove_links=yes
-		if [ $osreldate -lt 500036 ] ; then
-			need_base_system_perl=yes
-		fi
 		need_cleanup_make_conf=yes
 		need_cleanup_manpath=yes
 	else
@@ -62,26 +54,6 @@ else
 	fi
 fi
 
-link_list="
-	a2p
-	c2ph
-	find2perl
-	h2ph
-	h2xs
-	perlbug
-	perlcc
-	perldoc
-	pl2pm
-	pod2html
-	pod2latex
-	pod2man
-	pod2text
-	s2p
-	splain
-	suidperl"
-if [ $osreldate -ge 500036 ] ; then
-	link_list=""
-fi
 special_link_list="
 	perl
 	perl5"
@@ -89,7 +61,7 @@ special_link_list="
 do_remove_links()
 {
 	echo "Removing stale symlinks from /usr/bin..."
-	for binary in $link_list $special_link_list
+	for binary in $special_link_list
 	do
 		if [ -L "/usr/bin/$binary" ] ; then
 			echo "    Removing /usr/bin/$binary"
@@ -112,21 +84,6 @@ do_remove_links()
 do_create_links()
 {
 	echo "Creating various symlinks in /usr/bin..."
-	for binary in $link_list
-	do
-		if [ -f "/usr/bin/$binary" ] ; then
-			echo "    Backing up /usr/bin/$binary as /usr/bin/$binary.freebsd"
-			/bin/mv -f "/usr/bin/$binary" "/usr/bin/$binary.freebsd"
-		fi
-		if [ -e "/usr/bin/$binary" ] ; then
-			echo "    *** /usr/bin/$binary is still there, which should not happen"
-		elif [ -e "$PKG_PREFIX/bin/$binary" ] ; then
-			echo "    Symlinking $PKG_PREFIX/bin/$binary to /usr/bin/$binary"
-			/bin/ln -sf "$PKG_PREFIX/bin/$binary" "/usr/bin/$binary"
-		else
-			echo "    *** $PKG_PREFIX/bin/$binary is not there, a symlink won't do any good"
-		fi
-	done
 	for binary in $special_link_list
 	do
 		if [ -f "/usr/bin/$binary" ] ; then
@@ -146,54 +103,6 @@ do_create_links()
 	echo "Done."
 }
 
-do_base_system_perl()
-{
-	echo "Restoring base system perl binaries..."
-	for binary in $link_list
-	do
-		if [ -e "/usr/bin/$binary" ] ; then
-			echo "    *** /usr/bin/$binary is there, which should not happen"
-		else
-			if [ -f "/usr/bin/$binary.freebsd" ] ; then
-				echo "    Moving /usr/bin/$binary.freebsd to /usr/bin/$binary"
-				/bin/mv -f "/usr/bin/$binary.freebsd" "/usr/bin/$binary"
-			else
-				echo "    *** /usr/bin/$binary.freebsd is NOT there, nothing to restore"
-			fi
-		fi
-	done
-	for binary in $special_link_list
-	do
-		if [ -e "/usr/bin/$binary" ] ; then
-			echo "    *** /usr/bin/$binary is there, which should not happen"
-		else
-			bin=`echo $binary | /usr/bin/sed -e 's!perl5!perl!'`
-			bin=`echo $bin | /usr/bin/sed -e 's!suidperl!sperl!'`
-			bins=`/bin/ls /usr/bin/${bin}5.* 2>/dev/null | /usr/bin/sort`
-			bin=""
-			for b in $bins
-			do
-				if [ -f $b -a ! -L $b ] ; then
-					bin=$b
-				fi
-			done
-			if [ -z $bin ] ; then
-				echo "    *** cannot find what /usr/bin/$binary shall be restored FROM"
-			elif [ -f $bin ] ; then
-				echo "    Hardlinking $bin to /usr/bin/$binary"
-				ln -f "$bin" "/usr/bin/$binary"
-			else
-				echo "    *** $bin is NOT there, nothing to restore"
-			fi
-			if [ -f "/usr/bin/$binary.freebsd" ] ; then
-				echo "    Removing backup copy /usr/bin/$binary.freebsd"
-				rm -f "/usr/bin/$binary.freebsd"
-			fi
-		fi
-	done
-	echo "Done."
-}
-
 do_post_install()
 {
 	INCLUDEDIR=/usr/include
@@ -239,11 +148,7 @@ do_spam_make_conf()
 {
 	echo -n "Spamming ${MAKE_CONF}..."
 	echo "$banner" >>${MAKE_CONF}
-	echo "PERL_VER=%%PERL_VER%%" >>${MAKE_CONF}
 	echo "PERL_VERSION=%%PERL_VERSION%%" >>${MAKE_CONF}
-	if [ $osreldate -lt 500036 ] ; then
-		echo "NOPERL=yes" >>${MAKE_CONF}
-	fi
 	echo " Done."
 }
 
@@ -258,7 +163,6 @@ do_spam_manpath()
 
 [ $need_remove_links ] && do_remove_links
 [ $need_create_links ] && do_create_links
-[ $need_base_system_perl ] && do_base_system_perl
 [ $need_post_install ] && do_post_install
 [ $need_cleanup_make_conf ] && do_cleanup_make_conf
 [ $need_spam_make_conf ] && do_spam_make_conf
diff --git a/lang/perl5.16/Makefile b/lang/perl5.16/Makefile
index a7e77d1658ef..aef552feba13 100644
--- a/lang/perl5.16/Makefile
+++ b/lang/perl5.16/Makefile
@@ -20,7 +20,7 @@ DIST_SUBDIR=	perl
 
 PATCH_SITES=	${MASTER_SITE_LOCAL:S!$!skv/!} \
 		http://protey.ru/freebsd/distfiles/
-PATCHFILES=	defined-or-${PERL_VER}.bz2
+PATCHFILES=	defined-or-${PERL_VERSION}.bz2
 
 MAINTAINER=	skv@FreeBSD.org
 COMMENT=	Practical Extraction and Report Language
@@ -36,23 +36,22 @@ OPTIONS=	DEBUGGING	"Build with debugging support"		off \
 		SITECUSTOMIZE	"Run-time customization of @INC"	off \
 		USE_PERL	"Rewrite links in /usr/bin"		on
 
-PERL_VER=	5.8.9
+PERL_VERSION=	5.8.9
 PERL_ARCH=	mach
-PERL_VERSION=	${PERL_VER}
-SITE_PERL_REL?=	lib/perl5/site_perl/${PERL_VER}
+SITE_PERL_REL?=	lib/perl5/site_perl/${PERL_VERSION}
 SITE_PERL?=	${LOCALBASE}/${SITE_PERL_REL}
 
 USE_BZIP2=	yes
 HAS_CONFIGURE=	yes
 CONFIGURE_SCRIPT=Configure
 CONFIGURE_ARGS=	-sde -Dprefix=${PREFIX} \
-	-Darchlib=${PREFIX}/lib/perl5/${PERL_VER}/${PERL_ARCH} \
-	-Dprivlib=${PREFIX}/lib/perl5/${PERL_VER} \
-	-Dman3dir=${PREFIX}/lib/perl5/${PERL_VER}/perl/man/man3 \
+	-Darchlib=${PREFIX}/lib/perl5/${PERL_VERSION}/${PERL_ARCH} \
+	-Dprivlib=${PREFIX}/lib/perl5/${PERL_VERSION} \
+	-Dman3dir=${PREFIX}/lib/perl5/${PERL_VERSION}/perl/man/man3 \
 	-Dman1dir=${PREFIX}/man/man1 \
 	-Dsitearch=${PREFIX}/${SITE_PERL_REL}/${PERL_ARCH} \
 	-Dsitelib=${PREFIX}/${SITE_PERL_REL} -Dscriptdir=${PREFIX}/bin \
-	-Dsiteman3dir=${PREFIX}/lib/perl5/${PERL_VER}/man/man3 \
+	-Dsiteman3dir=${PREFIX}/lib/perl5/${PERL_VERSION}/man/man3 \
 	-Dsiteman1dir=${PREFIX}/man/man1 \
 	-Ui_malloc -Ui_iconv -Uinstallusrbinperl \
 	-Dcc="${CC}" -Duseshrplib -Dinc_version_list=none \
@@ -67,7 +66,7 @@ MAKE_ENV+=	${LOCALE_CLEANUP}
 .include <bsd.port.pre.mk>
 
 PLIST_SUB+=	PERL_VERSION=${PERL_VERSION} \
-		PERL_VER=${PERL_VER} \
+		PERL_VER=${PERL_VERSION} \
 		PERL_ARCH=${PERL_ARCH} \
 		SITE_PERL=${SITE_PERL:S|^${LOCALBASE}/||}
 
@@ -135,9 +134,9 @@ PLIST_SUB+=		NEED_USE_PERL="@comment "
 .if defined(WITH_GDBM)
 MAN3+=	GDBM_File.3
 .endif
-MAN3PREFIX=	${PREFIX}/lib/perl5/${PERL_VER}/perl
+MAN3PREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}/perl
 
-BSDPAN_DEST=	${PREFIX}/lib/perl5/${PERL_VER}/BSDPAN
+BSDPAN_DEST=	${PREFIX}/lib/perl5/${PERL_VERSION}/BSDPAN
 BSDPAN_FILES=	BSDPAN.pm BSDPAN/Override.pm Config.pm \
 		ExtUtils/MM_Unix.pm \
 		ExtUtils/MakeMaker.pm \
@@ -150,7 +149,6 @@ PKGDEINSTALL=	${WRKDIR}/pkg-deinstall
 
 post-patch:
 	${SED} -e 's|%%PREFIX%%|${PREFIX}|g;' \
-		-e 's|%%PERL_VER%%|${PERL_VER}|g;' \
 		-e 's|%%PERL_VERSION%%|${PERL_VERSION}|g;' \
 		-e 's|%%PERL_ARCH%%|${PERL_ARCH}|g;' \
 		-e 's|%%MAKE_CONF%%|${__MAKE_CONF}|g;' \
@@ -174,16 +172,16 @@ post-patch:
 .endif
 
 pre-su-install:
-	@${RM} -f ${PREFIX}/bin/perl${PERL_VER}
+	@${RM} -f ${PREFIX}/bin/perl${PERL_VERSION}
 	@${RM} -f ${PREFIX}/bin/perl
 
 post-install:
-	@${STRIP_CMD} ${PREFIX}/bin/perl${PERL_VER}
+	@${STRIP_CMD} ${PREFIX}/bin/perl${PERL_VERSION}
 	@${STRIP_CMD} ${PREFIX}/bin/perl
 	@${PREFIX}/bin/pod2man ${WRKDIR}/perl-after-upgrade >${WRKDIR}/perl-after-upgrade.1
 	@${INSTALL_SCRIPT} ${WRKDIR}/perl-after-upgrade ${PREFIX}/bin/perl-after-upgrade
 	@${INSTALL_MAN} ${WRKDIR}/perl-after-upgrade.1 ${MAN1PREFIX}/man/man1/perl-after-upgrade.1
-	@${LN} -sf ${PREFIX}/bin/perl${PERL_VER} ${PREFIX}/bin/perl5
+	@${LN} -sf ${PREFIX}/bin/perl${PERL_VERSION} ${PREFIX}/bin/perl5
 .for files in ${BSDPAN_FILES}
 	${MKDIR} ${BSDPAN_DEST}/${files:H}
 	${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m ${NOBINMODE} \
diff --git a/lang/perl5.16/files/use.perl b/lang/perl5.16/files/use.perl
index eca7811f3a85..55b7f51ed148 100644
--- a/lang/perl5.16/files/use.perl
+++ b/lang/perl5.16/files/use.perl
@@ -28,9 +28,6 @@ if [ "x$this" = "xuse.perl" ]; then
 		need_spam_manpath=yes
 	elif [ "$1" = "system" ] ; then
 		need_remove_links=yes
-		if [ $osreldate -lt 500036 ] ; then
-			need_base_system_perl=yes
-		fi
 		need_cleanup_make_conf=yes
 		need_cleanup_manpath=yes
 	else
@@ -42,19 +39,14 @@ if [ "x$this" = "xuse.perl" ]; then
 else
 	if [ "$2" = "POST-INSTALL" ] ; then
 		need_remove_links=yes
-		if [ $osreldate -ge 500036 ] ; then
-			need_create_links=yes
-			need_cleanup_make_conf=yes
-			need_cleanup_manpath=yes
-			need_spam_make_conf=yes
-			need_spam_manpath=yes
-		fi
+		need_create_links=yes
+		need_cleanup_make_conf=yes
+		need_cleanup_manpath=yes
+		need_spam_make_conf=yes
+		need_spam_manpath=yes
 		need_post_install=yes
 	elif [ "$2" = "POST-DEINSTALL" ] ; then
 		need_remove_links=yes
-		if [ $osreldate -lt 500036 ] ; then
-			need_base_system_perl=yes
-		fi
 		need_cleanup_make_conf=yes
 		need_cleanup_manpath=yes
 	else
@@ -62,26 +54,6 @@ else
 	fi
 fi
 
-link_list="
-	a2p
-	c2ph
-	find2perl
-	h2ph
-	h2xs
-	perlbug
-	perlcc
-	perldoc
-	pl2pm
-	pod2html
-	pod2latex
-	pod2man
-	pod2text
-	s2p
-	splain
-	suidperl"
-if [ $osreldate -ge 500036 ] ; then
-	link_list=""
-fi
 special_link_list="
 	perl
 	perl5"
@@ -89,7 +61,7 @@ special_link_list="
 do_remove_links()
 {
 	echo "Removing stale symlinks from /usr/bin..."
-	for binary in $link_list $special_link_list
+	for binary in $special_link_list
 	do
 		if [ -L "/usr/bin/$binary" ] ; then
 			echo "    Removing /usr/bin/$binary"
@@ -112,21 +84,6 @@ do_remove_links()
 do_create_links()
 {
 	echo "Creating various symlinks in /usr/bin..."
-	for binary in $link_list
-	do
-		if [ -f "/usr/bin/$binary" ] ; then
-			echo "    Backing up /usr/bin/$binary as /usr/bin/$binary.freebsd"
-			/bin/mv -f "/usr/bin/$binary" "/usr/bin/$binary.freebsd"
-		fi
-		if [ -e "/usr/bin/$binary" ] ; then
-			echo "    *** /usr/bin/$binary is still there, which should not happen"
-		elif [ -e "$PKG_PREFIX/bin/$binary" ] ; then
-			echo "    Symlinking $PKG_PREFIX/bin/$binary to /usr/bin/$binary"
-			/bin/ln -sf "$PKG_PREFIX/bin/$binary" "/usr/bin/$binary"
-		else
-			echo "    *** $PKG_PREFIX/bin/$binary is not there, a symlink won't do any good"
-		fi
-	done
 	for binary in $special_link_list
 	do
 		if [ -f "/usr/bin/$binary" ] ; then
@@ -146,54 +103,6 @@ do_create_links()
 	echo "Done."
 }
 
-do_base_system_perl()
-{
-	echo "Restoring base system perl binaries..."
-	for binary in $link_list
-	do
-		if [ -e "/usr/bin/$binary" ] ; then
-			echo "    *** /usr/bin/$binary is there, which should not happen"
-		else
-			if [ -f "/usr/bin/$binary.freebsd" ] ; then
-				echo "    Moving /usr/bin/$binary.freebsd to /usr/bin/$binary"
-				/bin/mv -f "/usr/bin/$binary.freebsd" "/usr/bin/$binary"
-			else
-				echo "    *** /usr/bin/$binary.freebsd is NOT there, nothing to restore"
-			fi
-		fi
-	done
-	for binary in $special_link_list
-	do
-		if [ -e "/usr/bin/$binary" ] ; then
-			echo "    *** /usr/bin/$binary is there, which should not happen"
-		else
-			bin=`echo $binary | /usr/bin/sed -e 's!perl5!perl!'`
-			bin=`echo $bin | /usr/bin/sed -e 's!suidperl!sperl!'`
-			bins=`/bin/ls /usr/bin/${bin}5.* 2>/dev/null | /usr/bin/sort`
-			bin=""
-			for b in $bins
-			do
-				if [ -f $b -a ! -L $b ] ; then
-					bin=$b
-				fi
-			done
-			if [ -z $bin ] ; then
-				echo "    *** cannot find what /usr/bin/$binary shall be restored FROM"
-			elif [ -f $bin ] ; then
-				echo "    Hardlinking $bin to /usr/bin/$binary"
-				ln -f "$bin" "/usr/bin/$binary"
-			else
-				echo "    *** $bin is NOT there, nothing to restore"
-			fi
-			if [ -f "/usr/bin/$binary.freebsd" ] ; then
-				echo "    Removing backup copy /usr/bin/$binary.freebsd"
-				rm -f "/usr/bin/$binary.freebsd"
-			fi
-		fi
-	done
-	echo "Done."
-}
-
 do_post_install()
 {
 	INCLUDEDIR=/usr/include
@@ -239,11 +148,7 @@ do_spam_make_conf()
 {
 	echo -n "Spamming ${MAKE_CONF}..."
 	echo "$banner" >>${MAKE_CONF}
-	echo "PERL_VER=%%PERL_VER%%" >>${MAKE_CONF}
 	echo "PERL_VERSION=%%PERL_VERSION%%" >>${MAKE_CONF}
-	if [ $osreldate -lt 500036 ] ; then
-		echo "NOPERL=yes" >>${MAKE_CONF}
-	fi
 	echo " Done."
 }
 
@@ -258,7 +163,6 @@ do_spam_manpath()
 
 [ $need_remove_links ] && do_remove_links
 [ $need_create_links ] && do_create_links
-[ $need_base_system_perl ] && do_base_system_perl
 [ $need_post_install ] && do_post_install
 [ $need_cleanup_make_conf ] && do_cleanup_make_conf
 [ $need_spam_make_conf ] && do_spam_make_conf
diff --git a/lang/perl5.6/Makefile b/lang/perl5.6/Makefile
index 4c209e12d97f..aa9b3d9291b2 100644
--- a/lang/perl5.6/Makefile
+++ b/lang/perl5.6/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	perl
-PORTVERSION=	${PERL_VER}
+PORTVERSION=	${PERL_VERSION}
 PORTREVISION=	2
 CATEGORIES=	lang devel perl5
 MASTER_SITES=	CPAN \
@@ -15,7 +15,7 @@ MASTER_SITES=	CPAN \
 MASTER_SITE_SUBDIR=	../../src \
 			tobez/:local
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
-		BSDPAN-${PERL_VER}${EXTRACT_SUFX}:local
+		BSDPAN-${PERL_VERSION}${EXTRACT_SUFX}:local
 
 MAINTAINER=	skv@FreeBSD.org
 COMMENT=	Practical Extraction and Report Language
@@ -25,22 +25,21 @@ DEPRECATED=	no longer under development, please use lang/perl5.8 or lang/perl5.1
 
 CONFLICTS=	perl-5.8.* perl-5.10.*
 
-PERL_VER=	5.6.2
+PERL_VERSION=	5.6.2
 PERL_ARCH=	mach
-PERL_VERSION=	${PERL_VER}
-SITE_PERL_REL?=	lib/perl5/site_perl/${PERL_VER}
+SITE_PERL_REL?=	lib/perl5/site_perl/${PERL_VERSION}
 SITE_PERL?=	${LOCALBASE}/${SITE_PERL_REL}
 
 HAS_CONFIGURE=	yes
 CONFIGURE_SCRIPT=Configure
 CONFIGURE_ARGS=	-sde -Dprefix=${PREFIX} \
-	-Darchlib=${PREFIX}/lib/perl5/${PERL_VER}/${PERL_ARCH} \
-	-Dprivlib=${PREFIX}/lib/perl5/${PERL_VER} \
-	-Dman3dir=${PREFIX}/lib/perl5/${PERL_VER}/perl/man/man3 \
+	-Darchlib=${PREFIX}/lib/perl5/${PERL_VERSION}/${PERL_ARCH} \
+	-Dprivlib=${PREFIX}/lib/perl5/${PERL_VERSION} \
+	-Dman3dir=${PREFIX}/lib/perl5/${PERL_VERSION}/perl/man/man3 \
 	-Dman1dir=${PREFIX}/man/man1 \
 	-Dsitearch=${PREFIX}/${SITE_PERL_REL}/${PERL_ARCH} \
 	-Dsitelib=${PREFIX}/${SITE_PERL_REL} -Dscriptdir=${PREFIX}/bin \
-	-Dsiteman3dir=${PREFIX}/lib/perl5/${PERL_VER}/man/man3 \
+	-Dsiteman3dir=${PREFIX}/lib/perl5/${PERL_VERSION}/man/man3 \
 	-Dsiteman1dir=${PREFIX}/man/man1 \
 	-Ui_malloc -Ui_iconv -Uinstallusrbinperl \
 	-Dcc="${CC}" -Doptimize="${CFLAGS}" -Duseshrplib \
@@ -55,7 +54,7 @@ MAKE_ENV+=	${LOCALE_CLEANUP}
 .include <bsd.port.pre.mk>
 
 PLIST_SUB+=	PERL_VERSION=${PERL_VERSION} \
-		PERL_VER=${PERL_VER} \
+		PERL_VER=${PERL_VERSION} \
 		PERL_ARCH=${PERL_ARCH} \
 		SITE_PERL=${SITE_PERL:S|^${LOCALBASE}/||}
 
@@ -105,12 +104,12 @@ PLIST_SUB+=		NEED_USE_PERL=""
 .if defined(WITH_GDBM)
 MAN3+=	GDBM_File.3
 .endif
-MAN3PREFIX=	${PREFIX}/lib/perl5/${PERL_VER}/perl
+MAN3PREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}/perl
 
 test:
 	@(cd ${WRKSRC}; make test)
 
-BSDPAN_DEST=	${PREFIX}/lib/perl5/${PERL_VER}/BSDPAN
+BSDPAN_DEST=	${PREFIX}/lib/perl5/${PERL_VERSION}/BSDPAN
 BSDPAN_FILES=	BSDPAN.pm BSDPAN/Override.pm Config.pm \
 		ExtUtils/MM_Unix.pm \
 		ExtUtils/MakeMaker.pm \
@@ -122,7 +121,6 @@ PKGDEINSTALL=	${WRKDIR}/pkg-deinstall
 
 post-patch:
 	${SED} -e 's|%%PREFIX%%|${PREFIX}|g;' \
-		-e 's|%%PERL_VER%%|${PERL_VER}|g;' \
 		-e 's|%%PERL_VERSION%%|${PERL_VERSION}|g;' \
 		-e 's|%%PERL_ARCH%%|${PERL_ARCH}|g;' \
 		-e 's|%%MAKE_CONF%%|${__MAKE_CONF}|g;' \
@@ -132,13 +130,13 @@ post-patch:
 	${CP} ${WRKDIR}/use.perl ${PKGDEINSTALL}
 
 pre-su-install:
-	@${RM} -f ${PREFIX}/bin/perl${PERL_VER}
+	@${RM} -f ${PREFIX}/bin/perl${PERL_VERSION}
 	@${RM} -f ${PREFIX}/bin/perl
 
 post-install:
-	@${STRIP_CMD} ${PREFIX}/bin/perl${PERL_VER}
+	@${STRIP_CMD} ${PREFIX}/bin/perl${PERL_VERSION}
 	@${STRIP_CMD} ${PREFIX}/bin/perl
-	@${LN} -sf ${PREFIX}/bin/perl${PERL_VER} ${PREFIX}/bin/perl5
+	@${LN} -sf ${PREFIX}/bin/perl${PERL_VERSION} ${PREFIX}/bin/perl5
 .for file in ${BSDPAN_FILES}
 	${MKDIR} ${BSDPAN_DEST}/${file:H}
 	${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m ${NOBINMODE} \
diff --git a/lang/perl5.6/files/use.perl b/lang/perl5.6/files/use.perl
index c5c8d71a51c0..c5300e151d8c 100644
--- a/lang/perl5.6/files/use.perl
+++ b/lang/perl5.6/files/use.perl
@@ -28,9 +28,6 @@ if [ "x$this" = "xuse.perl" ]; then
 		need_spam_manpath=yes
 	elif [ "$1" = "system" ] ; then
 		need_remove_links=yes
-		if [ $osreldate -lt 500036 ] ; then
-			need_base_system_perl=yes
-		fi
 		need_cleanup_make_conf=yes
 		need_cleanup_manpath=yes
 	else
@@ -46,9 +43,6 @@ else
 		# XXX this needs a more intelligent handling
 		# XXX since we would not want to remove perl5.8's links
 		need_remove_links=yes
-		if [ $osreldate -lt 500036 ] ; then
-			need_base_system_perl=yes
-		fi
 		need_cleanup_make_conf=yes
 		need_cleanup_manpath=yes
 	else
@@ -56,25 +50,6 @@ else
 	fi
 fi
 
-link_list="
-	a2p
-	c2ph
-	find2perl
-	h2ph
-	h2xs
-	perlbug
-	perlcc
-	perldoc
-	pl2pm
-	pod2html
-	pod2latex
-	pod2man
-	pod2text
-	s2p
-	splain"
-if [ $osreldate -ge 500036 ] ; then
-	link_list=""
-fi
 special_link_list="
 	perl
 	perl5
@@ -83,7 +58,7 @@ special_link_list="
 do_remove_links()
 {
 	echo "Removing stale symlinks from /usr/bin..."
-	for binary in $link_list $special_link_list
+	for binary in $special_link_list
 	do
 		if [ -L "/usr/bin/$binary" ] ; then
 			echo "    Removing /usr/bin/$binary"
@@ -106,21 +81,6 @@ do_remove_links()
 do_create_links()
 {
 	echo "Creating various symlinks in /usr/bin..."
-	for binary in $link_list
-	do
-		if [ -f "/usr/bin/$binary" ] ; then
-			echo "    Backing up /usr/bin/$binary as /usr/bin/$binary.freebsd"
-			/bin/mv -f "/usr/bin/$binary" "/usr/bin/$binary.freebsd"
-		fi
-		if [ -e "/usr/bin/$binary" ] ; then
-			echo "    *** /usr/bin/$binary is still there, which should not happen"
-		elif [ -e "$PKG_PREFIX/bin/$binary" ] ; then
-			echo "    Symlinking $PKG_PREFIX/bin/$binary to /usr/bin/$binary"
-			/bin/ln -sf "$PKG_PREFIX/bin/$binary" "/usr/bin/$binary"
-		else
-			echo "    *** $PKG_PREFIX/bin/$binary is not there, a symlink won't do any good"
-		fi
-	done
 	for binary in $special_link_list
 	do
 		if [ -f "/usr/bin/$binary" ] ; then
@@ -140,50 +100,6 @@ do_create_links()
 	echo "Done."
 }
 
-do_base_system_perl()
-{
-	echo "Restoring base system perl binaries..."
-	for binary in $link_list
-	do
-		if [ -e "/usr/bin/$binary" ] ; then
-			echo "    *** /usr/bin/$binary is there, which should not happen"
-		else
-			if [ -f "/usr/bin/$binary.freebsd" ] ; then
-				echo "    Moving /usr/bin/$binary.freebsd to /usr/bin/$binary"
-				/bin/mv -f "/usr/bin/$binary.freebsd" "/usr/bin/$binary"
-			else
-				echo "    *** /usr/bin/$binary.freebsd is NOT there, nothing to restore"
-			fi
-		fi
-	done
-	for binary in $special_link_list
-	do
-		if [ -e "/usr/bin/$binary" ] ; then
-			echo "    *** /usr/bin/$binary is there, which should not happen"
-		else
-			bin=`echo $binary | /usr/bin/sed -e 's!perl5!perl!'`
-			bin=`echo $bin | /usr/bin/sed -e 's!suidperl!sperl!'`
-			bins=`/bin/ls /usr/bin/${bin}5.* 2>/dev/null | /usr/bin/sort`
-			bin=""
-			for b in $bins
-			do
-				if [ -f $b -a ! -L $b ] ; then
-					bin=$b
-				fi
-			done
-			if [ -z $bin ] ; then
-				echo "    *** cannot find what /usr/bin/$binary shall be restored FROM"
-			elif [ -f $bin ] ; then
-				echo "    Hardlinking $bin to /usr/bin/$binary"
-				ln -f "$bin" "/usr/bin/$binary"
-			else
-				echo "    *** $bin is NOT there, nothing to restore"
-			fi
-		fi
-	done
-	echo "Done."
-}
-
 do_post_install()
 {
 	INCLUDEDIR=/usr/include
@@ -229,11 +145,7 @@ do_spam_make_conf()
 {
 	echo -n "Spamming ${MAKE_CONF}..."
 	echo "$banner" >>${MAKE_CONF}
-	echo "PERL_VER=%%PERL_VER%%" >>${MAKE_CONF}
 	echo "PERL_VERSION=%%PERL_VERSION%%" >>${MAKE_CONF}
-	if [ $osreldate -lt 500036 ] ; then
-		echo "NOPERL=yes" >>${MAKE_CONF}
-	fi
 	echo " Done."
 }
 
@@ -248,7 +160,6 @@ do_spam_manpath()
 
 [ $need_remove_links ] && do_remove_links
 [ $need_create_links ] && do_create_links
-[ $need_base_system_perl ] && do_base_system_perl
 [ $need_post_install ] && do_post_install
 [ $need_cleanup_make_conf ] && do_cleanup_make_conf
 [ $need_spam_make_conf ] && do_spam_make_conf
diff --git a/lang/perl5.8/Makefile b/lang/perl5.8/Makefile
index a7e77d1658ef..aef552feba13 100644
--- a/lang/perl5.8/Makefile
+++ b/lang/perl5.8/Makefile
@@ -20,7 +20,7 @@ DIST_SUBDIR=	perl
 
 PATCH_SITES=	${MASTER_SITE_LOCAL:S!$!skv/!} \
 		http://protey.ru/freebsd/distfiles/
-PATCHFILES=	defined-or-${PERL_VER}.bz2
+PATCHFILES=	defined-or-${PERL_VERSION}.bz2
 
 MAINTAINER=	skv@FreeBSD.org
 COMMENT=	Practical Extraction and Report Language
@@ -36,23 +36,22 @@ OPTIONS=	DEBUGGING	"Build with debugging support"		off \
 		SITECUSTOMIZE	"Run-time customization of @INC"	off \
 		USE_PERL	"Rewrite links in /usr/bin"		on
 
-PERL_VER=	5.8.9
+PERL_VERSION=	5.8.9
 PERL_ARCH=	mach
-PERL_VERSION=	${PERL_VER}
-SITE_PERL_REL?=	lib/perl5/site_perl/${PERL_VER}
+SITE_PERL_REL?=	lib/perl5/site_perl/${PERL_VERSION}
 SITE_PERL?=	${LOCALBASE}/${SITE_PERL_REL}
 
 USE_BZIP2=	yes
 HAS_CONFIGURE=	yes
 CONFIGURE_SCRIPT=Configure
 CONFIGURE_ARGS=	-sde -Dprefix=${PREFIX} \
-	-Darchlib=${PREFIX}/lib/perl5/${PERL_VER}/${PERL_ARCH} \
-	-Dprivlib=${PREFIX}/lib/perl5/${PERL_VER} \
-	-Dman3dir=${PREFIX}/lib/perl5/${PERL_VER}/perl/man/man3 \
+	-Darchlib=${PREFIX}/lib/perl5/${PERL_VERSION}/${PERL_ARCH} \
+	-Dprivlib=${PREFIX}/lib/perl5/${PERL_VERSION} \
+	-Dman3dir=${PREFIX}/lib/perl5/${PERL_VERSION}/perl/man/man3 \
 	-Dman1dir=${PREFIX}/man/man1 \
 	-Dsitearch=${PREFIX}/${SITE_PERL_REL}/${PERL_ARCH} \
 	-Dsitelib=${PREFIX}/${SITE_PERL_REL} -Dscriptdir=${PREFIX}/bin \
-	-Dsiteman3dir=${PREFIX}/lib/perl5/${PERL_VER}/man/man3 \
+	-Dsiteman3dir=${PREFIX}/lib/perl5/${PERL_VERSION}/man/man3 \
 	-Dsiteman1dir=${PREFIX}/man/man1 \
 	-Ui_malloc -Ui_iconv -Uinstallusrbinperl \
 	-Dcc="${CC}" -Duseshrplib -Dinc_version_list=none \
@@ -67,7 +66,7 @@ MAKE_ENV+=	${LOCALE_CLEANUP}
 .include <bsd.port.pre.mk>
 
 PLIST_SUB+=	PERL_VERSION=${PERL_VERSION} \
-		PERL_VER=${PERL_VER} \
+		PERL_VER=${PERL_VERSION} \
 		PERL_ARCH=${PERL_ARCH} \
 		SITE_PERL=${SITE_PERL:S|^${LOCALBASE}/||}
 
@@ -135,9 +134,9 @@ PLIST_SUB+=		NEED_USE_PERL="@comment "
 .if defined(WITH_GDBM)
 MAN3+=	GDBM_File.3
 .endif
-MAN3PREFIX=	${PREFIX}/lib/perl5/${PERL_VER}/perl
+MAN3PREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}/perl
 
-BSDPAN_DEST=	${PREFIX}/lib/perl5/${PERL_VER}/BSDPAN
+BSDPAN_DEST=	${PREFIX}/lib/perl5/${PERL_VERSION}/BSDPAN
 BSDPAN_FILES=	BSDPAN.pm BSDPAN/Override.pm Config.pm \
 		ExtUtils/MM_Unix.pm \
 		ExtUtils/MakeMaker.pm \
@@ -150,7 +149,6 @@ PKGDEINSTALL=	${WRKDIR}/pkg-deinstall
 
 post-patch:
 	${SED} -e 's|%%PREFIX%%|${PREFIX}|g;' \
-		-e 's|%%PERL_VER%%|${PERL_VER}|g;' \
 		-e 's|%%PERL_VERSION%%|${PERL_VERSION}|g;' \
 		-e 's|%%PERL_ARCH%%|${PERL_ARCH}|g;' \
 		-e 's|%%MAKE_CONF%%|${__MAKE_CONF}|g;' \
@@ -174,16 +172,16 @@ post-patch:
 .endif
 
 pre-su-install:
-	@${RM} -f ${PREFIX}/bin/perl${PERL_VER}
+	@${RM} -f ${PREFIX}/bin/perl${PERL_VERSION}
 	@${RM} -f ${PREFIX}/bin/perl
 
 post-install:
-	@${STRIP_CMD} ${PREFIX}/bin/perl${PERL_VER}
+	@${STRIP_CMD} ${PREFIX}/bin/perl${PERL_VERSION}
 	@${STRIP_CMD} ${PREFIX}/bin/perl
 	@${PREFIX}/bin/pod2man ${WRKDIR}/perl-after-upgrade >${WRKDIR}/perl-after-upgrade.1
 	@${INSTALL_SCRIPT} ${WRKDIR}/perl-after-upgrade ${PREFIX}/bin/perl-after-upgrade
 	@${INSTALL_MAN} ${WRKDIR}/perl-after-upgrade.1 ${MAN1PREFIX}/man/man1/perl-after-upgrade.1
-	@${LN} -sf ${PREFIX}/bin/perl${PERL_VER} ${PREFIX}/bin/perl5
+	@${LN} -sf ${PREFIX}/bin/perl${PERL_VERSION} ${PREFIX}/bin/perl5
 .for files in ${BSDPAN_FILES}
 	${MKDIR} ${BSDPAN_DEST}/${files:H}
 	${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m ${NOBINMODE} \
diff --git a/lang/perl5.8/files/use.perl b/lang/perl5.8/files/use.perl
index eca7811f3a85..55b7f51ed148 100644
--- a/lang/perl5.8/files/use.perl
+++ b/lang/perl5.8/files/use.perl
@@ -28,9 +28,6 @@ if [ "x$this" = "xuse.perl" ]; then
 		need_spam_manpath=yes
 	elif [ "$1" = "system" ] ; then
 		need_remove_links=yes
-		if [ $osreldate -lt 500036 ] ; then
-			need_base_system_perl=yes
-		fi
 		need_cleanup_make_conf=yes
 		need_cleanup_manpath=yes
 	else
@@ -42,19 +39,14 @@ if [ "x$this" = "xuse.perl" ]; then
 else
 	if [ "$2" = "POST-INSTALL" ] ; then
 		need_remove_links=yes
-		if [ $osreldate -ge 500036 ] ; then
-			need_create_links=yes
-			need_cleanup_make_conf=yes
-			need_cleanup_manpath=yes
-			need_spam_make_conf=yes
-			need_spam_manpath=yes
-		fi
+		need_create_links=yes
+		need_cleanup_make_conf=yes
+		need_cleanup_manpath=yes
+		need_spam_make_conf=yes
+		need_spam_manpath=yes
 		need_post_install=yes
 	elif [ "$2" = "POST-DEINSTALL" ] ; then
 		need_remove_links=yes
-		if [ $osreldate -lt 500036 ] ; then
-			need_base_system_perl=yes
-		fi
 		need_cleanup_make_conf=yes
 		need_cleanup_manpath=yes
 	else
@@ -62,26 +54,6 @@ else
 	fi
 fi
 
-link_list="
-	a2p
-	c2ph
-	find2perl
-	h2ph
-	h2xs
-	perlbug
-	perlcc
-	perldoc
-	pl2pm
-	pod2html
-	pod2latex
-	pod2man
-	pod2text
-	s2p
-	splain
-	suidperl"
-if [ $osreldate -ge 500036 ] ; then
-	link_list=""
-fi
 special_link_list="
 	perl
 	perl5"
@@ -89,7 +61,7 @@ special_link_list="
 do_remove_links()
 {
 	echo "Removing stale symlinks from /usr/bin..."
-	for binary in $link_list $special_link_list
+	for binary in $special_link_list
 	do
 		if [ -L "/usr/bin/$binary" ] ; then
 			echo "    Removing /usr/bin/$binary"
@@ -112,21 +84,6 @@ do_remove_links()
 do_create_links()
 {
 	echo "Creating various symlinks in /usr/bin..."
-	for binary in $link_list
-	do
-		if [ -f "/usr/bin/$binary" ] ; then
-			echo "    Backing up /usr/bin/$binary as /usr/bin/$binary.freebsd"
-			/bin/mv -f "/usr/bin/$binary" "/usr/bin/$binary.freebsd"
-		fi
-		if [ -e "/usr/bin/$binary" ] ; then
-			echo "    *** /usr/bin/$binary is still there, which should not happen"
-		elif [ -e "$PKG_PREFIX/bin/$binary" ] ; then
-			echo "    Symlinking $PKG_PREFIX/bin/$binary to /usr/bin/$binary"
-			/bin/ln -sf "$PKG_PREFIX/bin/$binary" "/usr/bin/$binary"
-		else
-			echo "    *** $PKG_PREFIX/bin/$binary is not there, a symlink won't do any good"
-		fi
-	done
 	for binary in $special_link_list
 	do
 		if [ -f "/usr/bin/$binary" ] ; then
@@ -146,54 +103,6 @@ do_create_links()
 	echo "Done."
 }
 
-do_base_system_perl()
-{
-	echo "Restoring base system perl binaries..."
-	for binary in $link_list
-	do
-		if [ -e "/usr/bin/$binary" ] ; then
-			echo "    *** /usr/bin/$binary is there, which should not happen"
-		else
-			if [ -f "/usr/bin/$binary.freebsd" ] ; then
-				echo "    Moving /usr/bin/$binary.freebsd to /usr/bin/$binary"
-				/bin/mv -f "/usr/bin/$binary.freebsd" "/usr/bin/$binary"
-			else
-				echo "    *** /usr/bin/$binary.freebsd is NOT there, nothing to restore"
-			fi
-		fi
-	done
-	for binary in $special_link_list
-	do
-		if [ -e "/usr/bin/$binary" ] ; then
-			echo "    *** /usr/bin/$binary is there, which should not happen"
-		else
-			bin=`echo $binary | /usr/bin/sed -e 's!perl5!perl!'`
-			bin=`echo $bin | /usr/bin/sed -e 's!suidperl!sperl!'`
-			bins=`/bin/ls /usr/bin/${bin}5.* 2>/dev/null | /usr/bin/sort`
-			bin=""
-			for b in $bins
-			do
-				if [ -f $b -a ! -L $b ] ; then
-					bin=$b
-				fi
-			done
-			if [ -z $bin ] ; then
-				echo "    *** cannot find what /usr/bin/$binary shall be restored FROM"
-			elif [ -f $bin ] ; then
-				echo "    Hardlinking $bin to /usr/bin/$binary"
-				ln -f "$bin" "/usr/bin/$binary"
-			else
-				echo "    *** $bin is NOT there, nothing to restore"
-			fi
-			if [ -f "/usr/bin/$binary.freebsd" ] ; then
-				echo "    Removing backup copy /usr/bin/$binary.freebsd"
-				rm -f "/usr/bin/$binary.freebsd"
-			fi
-		fi
-	done
-	echo "Done."
-}
-
 do_post_install()
 {
 	INCLUDEDIR=/usr/include
@@ -239,11 +148,7 @@ do_spam_make_conf()
 {
 	echo -n "Spamming ${MAKE_CONF}..."
 	echo "$banner" >>${MAKE_CONF}
-	echo "PERL_VER=%%PERL_VER%%" >>${MAKE_CONF}
 	echo "PERL_VERSION=%%PERL_VERSION%%" >>${MAKE_CONF}
-	if [ $osreldate -lt 500036 ] ; then
-		echo "NOPERL=yes" >>${MAKE_CONF}
-	fi
 	echo " Done."
 }
 
@@ -258,7 +163,6 @@ do_spam_manpath()
 
 [ $need_remove_links ] && do_remove_links
 [ $need_create_links ] && do_create_links
-[ $need_base_system_perl ] && do_base_system_perl
 [ $need_post_install ] && do_post_install
 [ $need_cleanup_make_conf ] && do_cleanup_make_conf
 [ $need_spam_make_conf ] && do_spam_make_conf
diff --git a/sysutils/logwatch/Makefile b/sysutils/logwatch/Makefile
index 92415b88f7a9..227737885c54 100644
--- a/sysutils/logwatch/Makefile
+++ b/sysutils/logwatch/Makefile
@@ -22,6 +22,8 @@ DOCS=		HOWTO-Customize-LogWatch License README
 
 NO_BUILD=	yes
 
+MAKE_ENV+=	SITE_PERL_REL=${SITE_PERL_REL}
+
 pre-configure:
 	@${CP} ${FILESDIR}/Makefile ${WRKSRC}
 
diff --git a/sysutils/logwatch/files/Makefile b/sysutils/logwatch/files/Makefile
index ce2dfe368097..3207433388a5 100644
--- a/sysutils/logwatch/files/Makefile
+++ b/sysutils/logwatch/files/Makefile
@@ -8,9 +8,7 @@ LIBEXECDIR?=${PREFIX}/libexec/${PORTNAME}
 CACHEDIR?=${PREFIX}/var/${PORTNAME}
 MANDIR?=${PREFIX}/man
 MAN8DIR?=${MANDIR}/man8
-PERL_VER?=5.8.8
-SITE_PERL_REL?=	lib/perl5/site_perl/${PERL_VER}
-SITE_PERL?=	${PREFIX}/${SITE_PERL_REL}
+SITE_PERL=	${PREFIX}/${SITE_PERL_REL}
 
 all: logwatch