21 files changed, 30 insertions, 277 deletions

diff --git a/Mk/Uses/perl5.mk b/Mk/Uses/perl5.mk
index debe7f98905d..9d3d8e436474 100644
--- a/Mk/Uses/perl5.mk
+++ b/Mk/Uses/perl5.mk
@@ -50,15 +50,15 @@ PERL_VERSION!=	perl -e 'printf "%vd\n", $$^V;'
 .else
 .include "${PORTSDIR}/Mk/bsd.default-versions.mk"
 .if ${PERL5_DEFAULT} == 5.16
-PERL_VERSION=	5.16.3
+.include "${PORTSDIR}/lang/perl5.16/version.mk"
 .elif ${PERL5_DEFAULT} == 5.18
-PERL_VERSION=	5.18.4
+.include "${PORTSDIR}/lang/perl5.18/version.mk"
 .elif ${PERL5_DEFAULT} == 5.20
-PERL_VERSION=	5.20.2
+.include "${PORTSDIR}/lang/perl5.20/version.mk"
 .elif ${PERL5_DEFAULT} == 5.22
-PERL_VERSION=	5.22.0
+.include "${PORTSDIR}/lang/perl5.22/version.mk"
 .elif ${PERL5_DEFAULT} == devel
-PERL_VERSION=	5.23.3
+.include "${PORTSDIR}/lang/perl5-devel/version.mk"
 # Force PERL_PORT here in case two identical PERL_VERSION.
 PERL_PORT?=	perl5-devel
 .else
diff --git a/lang/perl5-devel/Makefile b/lang/perl5-devel/Makefile
index 4e425b169553..9d43a4372f02 100644
--- a/lang/perl5-devel/Makefile
+++ b/lang/perl5-devel/Makefile
@@ -66,7 +66,7 @@ PERL_MALLOC_CONFIGURE_OFF=	-Dusemymalloc=n
 #PORTSCOUT=	limit:^${PERL_VER}.
 
 # Remember to update Mk/Uses/perl5.mk too.
-PERL_VERSION=	5.23.3
+.include "version.mk"
 PERL_VER=	${PERL_VERSION:C/\.[0-9]+$//}
 PERL_ARCH=	mach
 SITE_PERL_REL?=	lib/perl5/site_perl
@@ -124,7 +124,7 @@ SUB_LIST+=	PERL_VERSION=${PERL_VERSION} \
 		SITEMAN3PREFIX=${SITE_MAN3_PREFIX} \
 		PERL_ARCH=${PERL_ARCH}
 
-SUB_FILES=	perl5_version
+SUB_FILES=	perl5_version perl-man.conf
 
 INSTALL_TARGET=	install-strip
 
@@ -161,7 +161,6 @@ PLIST_SUB+=	PERL_VERSION=${PERL_VERSION} \
 		ARCH_LIB=${_ARCH_LIB}
 PLIST_SUB+=	PORTVERSION=${PORTVERSION} # XXX Remove
 
-.include <bsd.port.pre.mk>
 .include "${PORTSDIR}/Mk/bsd.default-versions.mk"
 
 # if this port is default due PERL5_DEFAULT
@@ -179,17 +178,6 @@ PKGNAMESUFFIX=	${PERL_VER}
 CONFLICTS_INSTALL+=	perl5-*
 .endif
 
-.if ${OSVERSION} >= 900022
-SUB_FILES+=	perl-man.conf
-PLIST_SUB+=	MANCONF=""
-.else
-# FIXME when 8.4 goes out, remove this
-SUB_FILES+=	use.perl
-PLIST_SUB+=	MANCONF="@comment "
-PKGINSTALL=	${WRKDIR}/use.perl
-PKGDEINSTALL=	${WRKDIR}/use.perl
-.endif
-
 # XXX Remove this
 # No need to spam logs, or make me wait
 .if !defined(PACKAGE_BUILDING) && !defined(PERL_DEV_SHUT_UP)
@@ -254,13 +242,11 @@ post-install:
 			${STRIP_CMD} $$f; \
 			${CHMOD} 444 $$f; \
 		done
-.if ${OSVERSION} >= 900022
 	${INSTALL_DATA} ${WRKDIR}/perl-man.conf ${STAGEDIR}${PREFIX}/etc/man.d/perl${PERL_VER}.conf
-.endif
 
 test: build
 	(cd ${WRKSRC}; TEST_JOBS=${MAKE_JOBS_NUMBER} make test_harness)
 
 regression-test: test
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/lang/perl5-devel/files/use.perl.in b/lang/perl5-devel/files/use.perl.in
deleted file mode 100644
index e50f83b9d0d2..000000000000
--- a/lang/perl5-devel/files/use.perl.in
+++ /dev/null
@@ -1,42 +0,0 @@
-#!/bin/sh
-
-# $FreeBSD$
-
-: ${OSVERSION:=`/sbin/sysctl -n kern.osreldate`};
-PERL_VERSION="%%PERL_VERSION%%"
-banner="# added by use.perl $(/bin/date +'%F %T')"
-
-do_cleanup_manpath()
-{
-	if [ -f /etc/manpath.config ] ; then
-		/bin/cp -p /etc/manpath.config /etc/manpath.config.new
-		/usr/bin/awk 's=0;
-			/^#.*use.perl/ { s=1; mode=1 }
-			/^#/ { s=1; if (mode != 1) { mode=0 } }
-			/^OPTIONAL_MANPATH.*perl5/ { s=1; if (mode == 1) { mode=2 } }
-			/^$/ { s=1; if (mode != 2) { mode = 0 } }
-			{ if (s != 1) { mode = 0 } if (mode == 0) print }' /etc/manpath.config >/etc/manpath.config.new
-		/bin/mv /etc/manpath.config /etc/manpath.config.bak
-		/bin/mv /etc/manpath.config.new /etc/manpath.config
-		/bin/rm /etc/manpath.config.bak
-	fi
-}
-
-do_spam_manpath()
-{
-	if [ -f /etc/manpath.config ] ; then
-		echo "${banner}" >>/etc/manpath.config
-		echo "OPTIONAL_MANPATH	${PKG_PREFIX}/%%SITEMAN3PREFIX%%/man" >>/etc/manpath.config
-		echo "OPTIONAL_MANPATH	${PKG_PREFIX}/%%MAN3PREFIX%%/man" >>/etc/manpath.config
-	fi
-}
-
-
-if [ "$2" = "POST-INSTALL" ] ; then
-	do_cleanup_manpath
-	do_spam_manpath
-elif [ "$2" = "POST-DEINSTALL" ] ; then
-	do_cleanup_manpath
-fi
-
-exit 0
diff --git a/lang/perl5-devel/pkg-plist b/lang/perl5-devel/pkg-plist
index d3b0a4531193..2d0856a6d473 100644
--- a/lang/perl5-devel/pkg-plist
+++ b/lang/perl5-devel/pkg-plist
@@ -32,7 +32,7 @@ bin/shasum
 bin/splain
 bin/xsubpp
 bin/zipdetails
-%%MANCONF%%etc/man.d/perl%%PERL_VER%%.conf
+etc/man.d/perl%%PERL_VER%%.conf
 etc/perl5_version
 %%PRIV_LIB%%/AnyDBM_File.pm
 %%PRIV_LIB%%/App/Cpan.pm
diff --git a/lang/perl5-devel/version.mk b/lang/perl5-devel/version.mk
new file mode 100644
index 000000000000..6ca99533f738
--- /dev/null
+++ b/lang/perl5-devel/version.mk
@@ -0,0 +1 @@
+PERL_VERSION=	5.23.3
diff --git a/lang/perl5.16/Makefile b/lang/perl5.16/Makefile
index 58ee594c8320..1227ebf48af4 100644
--- a/lang/perl5.16/Makefile
+++ b/lang/perl5.16/Makefile
@@ -37,7 +37,7 @@ USE_PERL_DESC=		Rewrite links in /usr/bin
 PORTSCOUT=	limit:^${PERL_VER}.
 
 # Remember to update Mk/Uses/perl5.mk too.
-PERL_VERSION=	5.16.3
+.include "version.mk"
 PERL_VER=	${PERL_VERSION:C/\.[0-9]+$//}
 PERL_ARCH=	mach
 SITE_PERL_REL?=	lib/perl5/site_perl
@@ -156,12 +156,6 @@ LIB_DEPENDS+=		libgdbm.so:${PORTSDIR}/databases/gdbm
 CONFIGURE_ARGS+=	-Ui_gdbm
 .endif
 
-.if ${OSVERSION} >= 900022
-PLIST_SUB+=	MANCONF=""
-.else
-PLIST_SUB+=	MANCONF="@comment "
-.endif
-
 .if ${PORT_OPTIONS:MTHREADS}
 #XXX .if ${ARCH} == "amd64"
 #XXX IGNORE=	Threaded perl does not pass tests on ${ARCH}
@@ -242,9 +236,7 @@ post-install:
 			${STRIP_CMD} $$f; \
 			${CHMOD} 444 $$f; \
 		done
-.if ${OSVERSION} >= 900022
 	${INSTALL_DATA} ${WRKDIR}/perl-man.conf ${STAGEDIR}${PREFIX}/etc/man.d/perl${PERL_VER}.conf
-.endif
 
 test: build
 	(cd ${WRKSRC}; TEST_JOBS=${MAKE_JOBS_NUMBER} make test_harness)
diff --git a/lang/perl5.16/files/use.perl.in b/lang/perl5.16/files/use.perl.in
index a31e87c1195c..5936051e6a8a 100644
--- a/lang/perl5.16/files/use.perl.in
+++ b/lang/perl5.16/files/use.perl.in
@@ -5,7 +5,6 @@
 LINK_USRBIN="%%LINK_USRBIN%%"
 : ${OSVERSION:=`/sbin/sysctl -n kern.osreldate`};
 PERL_VERSION="%%PERL_VERSION%%"
-banner="# added by use.perl $(/bin/date +'%F %T')"
 special_link_list="perl perl5"
 
 do_remove_links()
@@ -41,44 +40,13 @@ do_create_links()
 	done
 }
 
-do_cleanup_manpath()
-{
-	if [ -f /etc/manpath.config ] ; then
-		/bin/cp -p /etc/manpath.config /etc/manpath.config.new
-		/usr/bin/awk 's=0;
-			/^#.*use.perl/ { s=1; mode=1 }
-			/^#/ { s=1; if (mode != 1) { mode=0 } }
-			/^OPTIONAL_MANPATH.*perl5/ { s=1; if (mode == 1) { mode=2 } }
-			/^$/ { s=1; if (mode != 2) { mode = 0 } }
-			{ if (s != 1) { mode = 0 } if (mode == 0) print }' /etc/manpath.config >/etc/manpath.config.new
-		/bin/mv /etc/manpath.config /etc/manpath.config.bak
-		/bin/mv /etc/manpath.config.new /etc/manpath.config
-		/bin/rm /etc/manpath.config.bak
-	fi
-}
-
-do_spam_manpath()
-{
-	if [ -f /etc/manpath.config ] ; then
-		echo "${banner}" >>/etc/manpath.config
-		echo "OPTIONAL_MANPATH	${PKG_PREFIX}/%%SITEMAN3PREFIX%%/man" >>/etc/manpath.config
-		echo "OPTIONAL_MANPATH	${PKG_PREFIX}/%%MAN3PREFIX%%/man" >>/etc/manpath.config
-	fi
-}
-
-
 if [ "$2" = "POST-INSTALL" ] ; then
 	if [ ${LINK_USRBIN} = yes ] ; then
 		do_remove_links
 		do_create_links
 	fi
-	if [ "${OSVERSION}" -lt 900022 ] ; then
-		do_cleanup_manpath
-		do_spam_manpath
-	fi
 elif [ "$2" = "POST-DEINSTALL" ] ; then
 	[ ${LINK_USRBIN} = yes ] && do_remove_links
-	[ "${OSVERSION}" -lt 900022 ] && do_cleanup_manpath
 fi
 
 exit 0
diff --git a/lang/perl5.16/pkg-plist b/lang/perl5.16/pkg-plist
index 35aa68c95e94..c1f6171cc07a 100644
--- a/lang/perl5.16/pkg-plist
+++ b/lang/perl5.16/pkg-plist
@@ -40,7 +40,7 @@ bin/shasum
 bin/splain
 bin/xsubpp
 bin/zipdetails
-%%MANCONF%%etc/man.d/perl%%PERL_VER%%.conf
+etc/man.d/perl%%PERL_VER%%.conf
 etc/perl5_version
 %%PRIV_LIB%%/AnyDBM_File.pm
 %%PRIV_LIB%%/App/Cpan.pm
diff --git a/lang/perl5.16/version.mk b/lang/perl5.16/version.mk
new file mode 100644
index 000000000000..67486eedca70
--- /dev/null
+++ b/lang/perl5.16/version.mk
@@ -0,0 +1 @@
+PERL_VERSION=	5.16.3
diff --git a/lang/perl5.18/Makefile b/lang/perl5.18/Makefile
index 55b2fa3c5f5b..9c3220140331 100644
--- a/lang/perl5.18/Makefile
+++ b/lang/perl5.18/Makefile
@@ -53,11 +53,13 @@ THREADS_CONFIGURE_ON=	-Dusethreads=y
 THREADS_CONFIGURE_OFF=	-Dusethreads=n
 PERL_MALLOC_CONFIGURE_ON=	-Dusemymalloc=y
 PERL_MALLOC_CONFIGURE_OFF=	-Dusemymalloc=n
+USE_PERL_SUB_LIST=	LINK_USRBIN=yes
+USE_PERL_SUB_LIST_OFF=	LINK_USRBIN=no
 
 PORTSCOUT=	limit:^${PERL_VER}.
 
 # Remember to update Mk/Uses/perl5.mk too.
-PERL_VERSION=	5.18.4
+.include "version.mk"
 PERL_VER=	${PERL_VERSION:C/\.[0-9]+$//}
 PERL_ARCH=	mach
 SITE_PERL_REL?=	lib/perl5/site_perl
@@ -115,7 +117,6 @@ PKGINSTALL=	${WRKDIR}/use.perl
 PKGDEINSTALL=	${WRKDIR}/use.perl
 INSTALL_TARGET=	install-strip
 
-.include <bsd.port.pre.mk>
 .include "${PORTSDIR}/Mk/bsd.default-versions.mk"
 
 # if this port is default due PERL5_DEFAULT
@@ -161,19 +162,6 @@ PLIST_SUB+=	PERL_VERSION=${PERL_VERSION} \
 		PRIV_LIB=${_PRIV_LIB} \
 		ARCH_LIB=${_ARCH_LIB}
 
-.if ${OSVERSION} >= 900022
-PLIST_SUB+=	MANCONF=""
-.else
-PLIST_SUB+=	MANCONF="@comment "
-.endif
-
-.if ${PORT_OPTIONS:MUSE_PERL}
-LINK_USRBIN=	yes
-.else
-LINK_USRBIN=	no
-.endif
-SUB_LIST+=	LINK_USRBIN=${LINK_USRBIN}
-
 # Put a symlink to the future libperl.so.x.yy so that -lperl works.
 post-extract:
 	${LN} -s libperl.so.${PERL_VERSION} ${WRKSRC}/libperl.so
@@ -216,13 +204,11 @@ post-install:
 			${STRIP_CMD} $$f; \
 			${CHMOD} 444 $$f; \
 		done
-.if ${OSVERSION} >= 900022
 	${INSTALL_DATA} ${WRKDIR}/perl-man.conf ${STAGEDIR}${PREFIX}/etc/man.d/perl${PERL_VER}.conf
-.endif
 
 test: build
 	(cd ${WRKSRC}; TEST_JOBS=${MAKE_JOBS_NUMBER} make test_harness)
 
 regression-test: test
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/lang/perl5.18/files/use.perl.in b/lang/perl5.18/files/use.perl.in
index a31e87c1195c..5936051e6a8a 100644
--- a/lang/perl5.18/files/use.perl.in
+++ b/lang/perl5.18/files/use.perl.in
@@ -5,7 +5,6 @@
 LINK_USRBIN="%%LINK_USRBIN%%"
 : ${OSVERSION:=`/sbin/sysctl -n kern.osreldate`};
 PERL_VERSION="%%PERL_VERSION%%"
-banner="# added by use.perl $(/bin/date +'%F %T')"
 special_link_list="perl perl5"
 
 do_remove_links()
@@ -41,44 +40,13 @@ do_create_links()
 	done
 }
 
-do_cleanup_manpath()
-{
-	if [ -f /etc/manpath.config ] ; then
-		/bin/cp -p /etc/manpath.config /etc/manpath.config.new
-		/usr/bin/awk 's=0;
-			/^#.*use.perl/ { s=1; mode=1 }
-			/^#/ { s=1; if (mode != 1) { mode=0 } }
-			/^OPTIONAL_MANPATH.*perl5/ { s=1; if (mode == 1) { mode=2 } }
-			/^$/ { s=1; if (mode != 2) { mode = 0 } }
-			{ if (s != 1) { mode = 0 } if (mode == 0) print }' /etc/manpath.config >/etc/manpath.config.new
-		/bin/mv /etc/manpath.config /etc/manpath.config.bak
-		/bin/mv /etc/manpath.config.new /etc/manpath.config
-		/bin/rm /etc/manpath.config.bak
-	fi
-}
-
-do_spam_manpath()
-{
-	if [ -f /etc/manpath.config ] ; then
-		echo "${banner}" >>/etc/manpath.config
-		echo "OPTIONAL_MANPATH	${PKG_PREFIX}/%%SITEMAN3PREFIX%%/man" >>/etc/manpath.config
-		echo "OPTIONAL_MANPATH	${PKG_PREFIX}/%%MAN3PREFIX%%/man" >>/etc/manpath.config
-	fi
-}
-
-
 if [ "$2" = "POST-INSTALL" ] ; then
 	if [ ${LINK_USRBIN} = yes ] ; then
 		do_remove_links
 		do_create_links
 	fi
-	if [ "${OSVERSION}" -lt 900022 ] ; then
-		do_cleanup_manpath
-		do_spam_manpath
-	fi
 elif [ "$2" = "POST-DEINSTALL" ] ; then
 	[ ${LINK_USRBIN} = yes ] && do_remove_links
-	[ "${OSVERSION}" -lt 900022 ] && do_cleanup_manpath
 fi
 
 exit 0
diff --git a/lang/perl5.18/pkg-plist b/lang/perl5.18/pkg-plist
index dbce3438d174..d7c58f0065a8 100644
--- a/lang/perl5.18/pkg-plist
+++ b/lang/perl5.18/pkg-plist
@@ -40,7 +40,7 @@ bin/shasum
 bin/splain
 bin/xsubpp
 bin/zipdetails
-%%MANCONF%%etc/man.d/perl%%PERL_VER%%.conf
+etc/man.d/perl%%PERL_VER%%.conf
 etc/perl5_version
 %%PRIV_LIB%%/AnyDBM_File.pm
 %%PRIV_LIB%%/App/Cpan.pm
diff --git a/lang/perl5.18/version.mk b/lang/perl5.18/version.mk
new file mode 100644
index 000000000000..df0e6b7dff74
--- /dev/null
+++ b/lang/perl5.18/version.mk
@@ -0,0 +1 @@
+PERL_VERSION=	5.18.4
diff --git a/lang/perl5.20/Makefile b/lang/perl5.20/Makefile
index 1d14c879bf70..3d6cce40a889 100644
--- a/lang/perl5.20/Makefile
+++ b/lang/perl5.20/Makefile
@@ -53,7 +53,7 @@ PERL_MALLOC_CONFIGURE_OFF=	-Dusemymalloc=n
 PORTSCOUT=	limit:^${PERL_VER}.
 
 # Remember to update Mk/Uses/perl5.mk too.
-PERL_VERSION=	5.20.2
+.include "version.mk"
 PERL_VER=	${PERL_VERSION:C/\.[0-9]+$//}
 PERL_ARCH=	mach
 SITE_PERL_REL?=	lib/perl5/site_perl
@@ -108,7 +108,7 @@ SUB_LIST+=	PERL_VERSION=${PERL_VERSION} \
 		SITEMAN3PREFIX=${SITE_MAN3_PREFIX} \
 		PERL_ARCH=${PERL_ARCH}
 
-SUB_FILES=	perl5_version
+SUB_FILES=	perl5_version perl-man.conf
 
 INSTALL_TARGET=	install-strip
 
@@ -144,7 +144,6 @@ PLIST_SUB+=	PERL_VERSION=${PERL_VERSION} \
 		PRIV_LIB=${_PRIV_LIB} \
 		ARCH_LIB=${_ARCH_LIB}
 
-.include <bsd.port.pre.mk>
 .include "${PORTSDIR}/Mk/bsd.default-versions.mk"
 
 # if this port is default due PERL5_DEFAULT
@@ -158,16 +157,6 @@ PKGNAMESUFFIX=	${PERL_VER}
 CONFLICTS_INSTALL+=	perl5-*
 .endif
 
-.if ${OSVERSION} >= 900022
-SUB_FILES+=	perl-man.conf
-PLIST_SUB+=	MANCONF=""
-.else
-# FIXME when 8.4 goes out, remove this
-SUB_FILES+=	use.perl
-PLIST_SUB+=	MANCONF="@comment "
-PKGINSTALL=	${WRKDIR}/use.perl
-PKGDEINSTALL=	${WRKDIR}/use.perl
-.endif
 
 # Put a symlink to the future libperl.so.x.yy so that -lperl works.
 post-extract:
@@ -210,13 +199,11 @@ post-install:
 			${STRIP_CMD} $$f; \
 			${CHMOD} 444 $$f; \
 		done
-.if ${OSVERSION} >= 900022
 	${INSTALL_DATA} ${WRKDIR}/perl-man.conf ${STAGEDIR}${PREFIX}/etc/man.d/perl${PERL_VER}.conf
-.endif
 
 test: build
 	(cd ${WRKSRC}; TEST_JOBS=${MAKE_JOBS_NUMBER} make test_harness)
 
 regression-test: test
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/lang/perl5.20/files/use.perl.in b/lang/perl5.20/files/use.perl.in
deleted file mode 100644
index e50f83b9d0d2..000000000000
--- a/lang/perl5.20/files/use.perl.in
+++ /dev/null
@@ -1,42 +0,0 @@
-#!/bin/sh
-
-# $FreeBSD$
-
-: ${OSVERSION:=`/sbin/sysctl -n kern.osreldate`};
-PERL_VERSION="%%PERL_VERSION%%"
-banner="# added by use.perl $(/bin/date +'%F %T')"
-
-do_cleanup_manpath()
-{
-	if [ -f /etc/manpath.config ] ; then
-		/bin/cp -p /etc/manpath.config /etc/manpath.config.new
-		/usr/bin/awk 's=0;
-			/^#.*use.perl/ { s=1; mode=1 }
-			/^#/ { s=1; if (mode != 1) { mode=0 } }
-			/^OPTIONAL_MANPATH.*perl5/ { s=1; if (mode == 1) { mode=2 } }
-			/^$/ { s=1; if (mode != 2) { mode = 0 } }
-			{ if (s != 1) { mode = 0 } if (mode == 0) print }' /etc/manpath.config >/etc/manpath.config.new
-		/bin/mv /etc/manpath.config /etc/manpath.config.bak
-		/bin/mv /etc/manpath.config.new /etc/manpath.config
-		/bin/rm /etc/manpath.config.bak
-	fi
-}
-
-do_spam_manpath()
-{
-	if [ -f /etc/manpath.config ] ; then
-		echo "${banner}" >>/etc/manpath.config
-		echo "OPTIONAL_MANPATH	${PKG_PREFIX}/%%SITEMAN3PREFIX%%/man" >>/etc/manpath.config
-		echo "OPTIONAL_MANPATH	${PKG_PREFIX}/%%MAN3PREFIX%%/man" >>/etc/manpath.config
-	fi
-}
-
-
-if [ "$2" = "POST-INSTALL" ] ; then
-	do_cleanup_manpath
-	do_spam_manpath
-elif [ "$2" = "POST-DEINSTALL" ] ; then
-	do_cleanup_manpath
-fi
-
-exit 0
diff --git a/lang/perl5.20/pkg-plist b/lang/perl5.20/pkg-plist
index 5146eeafff70..57ecd46e8d09 100644
--- a/lang/perl5.20/pkg-plist
+++ b/lang/perl5.20/pkg-plist
@@ -36,7 +36,7 @@ bin/shasum
 bin/splain
 bin/xsubpp
 bin/zipdetails
-%%MANCONF%%etc/man.d/perl%%PERL_VER%%.conf
+etc/man.d/perl%%PERL_VER%%.conf
 etc/perl5_version
 %%PRIV_LIB%%/AnyDBM_File.pm
 %%PRIV_LIB%%/App/Cpan.pm
diff --git a/lang/perl5.20/version.mk b/lang/perl5.20/version.mk
new file mode 100644
index 000000000000..fc6609893cf1
--- /dev/null
+++ b/lang/perl5.20/version.mk
@@ -0,0 +1 @@
+PERL_VERSION=	5.20.2
diff --git a/lang/perl5.22/Makefile b/lang/perl5.22/Makefile
index 9521674d338d..ff053c187c11 100644
--- a/lang/perl5.22/Makefile
+++ b/lang/perl5.22/Makefile
@@ -52,7 +52,7 @@ PERL_MALLOC_CONFIGURE_OFF=	-Dusemymalloc=n
 PORTSCOUT=	limit:^${PERL_VER}.
 
 # Remember to update Mk/Uses/perl5.mk too.
-PERL_VERSION=	5.22.0
+.include "version.mk"
 PERL_VER=	${PERL_VERSION:C/\.[0-9]+$//}
 PERL_ARCH=	mach
 SITE_PERL_REL?=	lib/perl5/site_perl
@@ -105,7 +105,8 @@ SUB_LIST+=	PERL_VERSION=${PERL_VERSION} \
 		SITEMAN3PREFIX=${SITE_MAN3_PREFIX} \
 		PERL_ARCH=${PERL_ARCH}
 
-SUB_FILES=	perl5_version
+SUB_FILES=	perl5_version perl-man.conf
+
 
 INSTALL_TARGET=	install-strip
 
@@ -141,7 +142,6 @@ PLIST_SUB+=	PERL_VERSION=${PERL_VERSION} \
 		PRIV_LIB=${_PRIV_LIB} \
 		ARCH_LIB=${_ARCH_LIB}
 
-.include <bsd.port.pre.mk>
 .include "${PORTSDIR}/Mk/bsd.default-versions.mk"
 
 # if this port is default due PERL5_DEFAULT
@@ -155,17 +155,6 @@ PKGNAMESUFFIX=	${PERL_VER}
 CONFLICTS_INSTALL+=	perl5-*
 .endif
 
-.if ${OSVERSION} >= 900022
-SUB_FILES+=	perl-man.conf
-PLIST_SUB+=	MANCONF=""
-.else
-# FIXME when 8.4 goes out, remove this
-SUB_FILES+=	use.perl
-PLIST_SUB+=	MANCONF="@comment "
-PKGINSTALL=	${WRKDIR}/use.perl
-PKGDEINSTALL=	${WRKDIR}/use.perl
-.endif
-
 # Put a symlink to the future libperl.so.x.yy so that -lperl works.
 post-extract:
 	${LN} -s libperl.so.${PERL_VERSION} ${WRKSRC}/libperl.so
@@ -207,13 +196,11 @@ post-install:
 			${STRIP_CMD} $$f; \
 			${CHMOD} 444 $$f; \
 		done
-.if ${OSVERSION} >= 900022
 	${INSTALL_DATA} ${WRKDIR}/perl-man.conf ${STAGEDIR}${PREFIX}/etc/man.d/perl${PERL_VER}.conf
-.endif
 
 test: build
 	(cd ${WRKSRC}; TEST_JOBS=${MAKE_JOBS_NUMBER} make test_harness)
 
 regression-test: test
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/lang/perl5.22/files/use.perl.in b/lang/perl5.22/files/use.perl.in
deleted file mode 100644
index e50f83b9d0d2..000000000000
--- a/lang/perl5.22/files/use.perl.in
+++ /dev/null
@@ -1,42 +0,0 @@
-#!/bin/sh
-
-# $FreeBSD$
-
-: ${OSVERSION:=`/sbin/sysctl -n kern.osreldate`};
-PERL_VERSION="%%PERL_VERSION%%"
-banner="# added by use.perl $(/bin/date +'%F %T')"
-
-do_cleanup_manpath()
-{
-	if [ -f /etc/manpath.config ] ; then
-		/bin/cp -p /etc/manpath.config /etc/manpath.config.new
-		/usr/bin/awk 's=0;
-			/^#.*use.perl/ { s=1; mode=1 }
-			/^#/ { s=1; if (mode != 1) { mode=0 } }
-			/^OPTIONAL_MANPATH.*perl5/ { s=1; if (mode == 1) { mode=2 } }
-			/^$/ { s=1; if (mode != 2) { mode = 0 } }
-			{ if (s != 1) { mode = 0 } if (mode == 0) print }' /etc/manpath.config >/etc/manpath.config.new
-		/bin/mv /etc/manpath.config /etc/manpath.config.bak
-		/bin/mv /etc/manpath.config.new /etc/manpath.config
-		/bin/rm /etc/manpath.config.bak
-	fi
-}
-
-do_spam_manpath()
-{
-	if [ -f /etc/manpath.config ] ; then
-		echo "${banner}" >>/etc/manpath.config
-		echo "OPTIONAL_MANPATH	${PKG_PREFIX}/%%SITEMAN3PREFIX%%/man" >>/etc/manpath.config
-		echo "OPTIONAL_MANPATH	${PKG_PREFIX}/%%MAN3PREFIX%%/man" >>/etc/manpath.config
-	fi
-}
-
-
-if [ "$2" = "POST-INSTALL" ] ; then
-	do_cleanup_manpath
-	do_spam_manpath
-elif [ "$2" = "POST-DEINSTALL" ] ; then
-	do_cleanup_manpath
-fi
-
-exit 0
diff --git a/lang/perl5.22/pkg-plist b/lang/perl5.22/pkg-plist
index 0d2d1aea33ac..f5be326d36ae 100644
--- a/lang/perl5.22/pkg-plist
+++ b/lang/perl5.22/pkg-plist
@@ -32,7 +32,7 @@ bin/shasum
 bin/splain
 bin/xsubpp
 bin/zipdetails
-%%MANCONF%%etc/man.d/perl%%PERL_VER%%.conf
+etc/man.d/perl%%PERL_VER%%.conf
 etc/perl5_version
 %%PRIV_LIB%%/AnyDBM_File.pm
 %%PRIV_LIB%%/App/Cpan.pm
diff --git a/lang/perl5.22/version.mk b/lang/perl5.22/version.mk
new file mode 100644
index 000000000000..9ed42cdde904
--- /dev/null
+++ b/lang/perl5.22/version.mk
@@ -0,0 +1 @@
+PERL_VERSION=	5.22.0