To ease up with future upgrades, move PERL_VERSION into a separate file.

While there, remove 8.4 support, and do some cleanup.

Sponsored by:	Absolight

4 files changed, 3 insertions, 42 deletions

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