svn commit: r320679 - in head: . Mk lang/perl5.12 lang/perl5.12/files lang/perl5.14 lang/perl5.14/files lang/perl5.16 lang/perl5.16/files mail/cyrus-imapd2 mail/cyrus-imapd22 mail/cyrus-imapd23 mai...

Wed Jun 12 13:01:01 UTC 2013

Author: az
Date: Wed Jun 12 13:00:55 2013
New Revision: 320679
URL: http://svnweb.freebsd.org/changeset/ports/320679

Log:
  - lang/perl5.12 upgrade to 5.12.5
  - lang/perl5.14 upgrade to 5.14.4
  - lang/perl5.16 upgrade to 5.16.3
  - Global modify SITE_PERL[1][2]
  
  [1] - See more info:
  http://docs.freebsd.org/cgi/getmsg.cgi?fetch=26605+0+archive/2013/freebsd-perl/20130609.freebsd-perl
  [2] - Fix for mail/cyrus-imapd* - Approved by portmrg(bapt@)
  
  Please, see ports/UPDATING for upgrade procedure.
  
  Reviewed by:	bapt@ (exp-run), culot@

Deleted:
  head/lang/perl5.12/files/perl-after-upgrade
  head/lang/perl5.14/files/patch-cve-2013-1667
  head/lang/perl5.14/files/patch-freebsd.sh-freebsd10
  head/lang/perl5.14/files/perl-after-upgrade
  head/lang/perl5.16/files/patch-cve-2013-1667
  head/lang/perl5.16/files/perl-after-upgrade
Modified:
  head/Mk/bsd.perl.mk
  head/UPDATING
  head/lang/perl5.12/Makefile
  head/lang/perl5.12/Makefile.man   (contents, props changed)
  head/lang/perl5.12/distinfo   (contents, props changed)
  head/lang/perl5.12/files/perl-man.conf   (contents, props changed)
  head/lang/perl5.12/files/use.perl   (contents, props changed)
  head/lang/perl5.12/pkg-plist   (contents, props changed)
  head/lang/perl5.14/Makefile
  head/lang/perl5.14/Makefile.man   (contents, props changed)
  head/lang/perl5.14/distinfo   (contents, props changed)
  head/lang/perl5.14/files/perl-man.conf   (contents, props changed)
  head/lang/perl5.14/files/use.perl   (contents, props changed)
  head/lang/perl5.14/pkg-plist   (contents, props changed)
  head/lang/perl5.16/Makefile
  head/lang/perl5.16/Makefile.man   (contents, props changed)
  head/lang/perl5.16/distinfo   (contents, props changed)
  head/lang/perl5.16/files/perl-man.conf   (contents, props changed)
  head/lang/perl5.16/files/use.perl   (contents, props changed)
  head/lang/perl5.16/pkg-plist   (contents, props changed)
  head/mail/cyrus-imapd2/Makefile   (contents, props changed)
  head/mail/cyrus-imapd22/Makefile   (contents, props changed)
  head/mail/cyrus-imapd23/Makefile   (contents, props changed)
  head/mail/cyrus-imapd24/Makefile   (contents, props changed)

Modified: head/Mk/bsd.perl.mk
==============================================================================

--- head/Mk/bsd.perl.mk	Wed Jun 12 12:26:21 2013	(r320678)
+++ head/Mk/bsd.perl.mk	Wed Jun 12 13:00:55 2013	(r320679)
@@ -17,6 +17,9 @@
 #				  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 (major.minor without patchlevel)
+#
 # 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.14.2 would give
@@ -31,20 +34,23 @@
 #				  This value is added to PLIST_SUB.
 # USE_PERL5		- If set, this port uses perl5 in one or more of the extract,
 #				  patch, build, install or run phases.
-# PERL_CONFIGURE
-#				- Configure using Perl's MakeMaker.  Implies USE_PERL5.
-# USE_PERL5_BUILD
-#				- If set, this port uses perl5 in one or more of the
+#
+# PERL_CONFIGURE	- Configure using Perl's MakeMaker.  Implies USE_PERL5.
+#
+# USE_PERL5_BUILD	- If set, this port uses perl5 in one or more of the
 #				  extract, patch, build or install phases.
-# USE_PERL5_RUN	- If set, this port uses perl5 for running.
-# PERL_MODBUILD	- Use Module::Build to configure, build and install port.
+#
+# USE_PERL5_RUN		- If set, this port uses perl5 for running.
+#
+# PERL_MODBUILD		- Use Module::Build to configure, build and install port.
 
 .if !defined(_POSTMKINCLUDED) && !defined(Perl_Pre_Include)
 
 Perl_Pre_Include=			bsd.perl.mk
 PERL_Include_MAINTAINER=	perl at FreeBSD.org
 
-PERL_VERSION?=	5.14.2
+PERL_VERSION?=	5.14.4
+PERL_VER?=	${PERL_VERSION:C/\.[0-9]+$//}
 
 .if !defined(PERL_LEVEL) && defined(PERL_VERSION)
 perl_major=		${PERL_VERSION:C|^([1-9]+).*|\1|}
@@ -74,7 +80,7 @@ PERL_PORT?=	perl5.14
 PERL_PORT?=	perl5.12
 .endif
 
-SITE_PERL_REL?=	lib/perl5/site_perl/${PERL_VERSION}
+SITE_PERL_REL?=	lib/perl5/site_perl/${PERL_VER}
 SITE_PERL?=	${LOCALBASE}/${SITE_PERL_REL}
 
 PERL5=		${LOCALBASE}/bin/perl${PERL_VERSION}
@@ -141,7 +147,7 @@ IGNORE=	improper use of USE_PERL5
 Perl_Post_Include=		bsd.perl.mk
 
 PLIST_SUB+=	PERL_VERSION=${PERL_VERSION} \
-			PERL_VER=${PERL_VERSION} \
+			PERL_VER=${PERL_VER} \
 			PERL_ARCH=${PERL_ARCH} \
 			SITE_PERL=${SITE_PERL_REL}
 
@@ -189,7 +195,7 @@ RUN_DEPENDS+=		${PERL5}:${PORTSDIR}/lang
 CONFIGURE_ARGS+=	CC="${CC}" CCFLAGS="${CFLAGS}" PREFIX="${PREFIX}" \
 			INSTALLPRIVLIB="${PREFIX}/lib" INSTALLARCHLIB="${PREFIX}/lib"
 CONFIGURE_SCRIPT?=	Makefile.PL
-MAN3PREFIX?=		${PREFIX}/lib/perl5/${PERL_VERSION}
+MAN3PREFIX?=		${PREFIX}/lib/perl5/${PERL_VER}
 .undef HAS_CONFIGURE
 .endif # defined(PERL_CONFIGURE)
 

Modified: head/UPDATING
==============================================================================
--- head/UPDATING	Wed Jun 12 12:26:21 2013	(r320678)
+++ head/UPDATING	Wed Jun 12 13:00:55 2013	(r320679)
@@ -5,6 +5,27 @@ they are unavoidable.
 You should get into the habit of checking this file for changes each time
 you update your ports collection, before attempting any port upgrades.
 
+20130612:
+  AFFECTS: users of  lang/perl* and any port that depends on it
+  AUTHOR: az at FreeBSD.org
+
+  lang/perl5.12 upgrade from version 5.12.4 to 5.12.5
+  lang/perl5.14 upgrade from version 5.14.2 to 5.14.4
+  lang/perl5.16 upgrade from version 5.16.2 to 5.16.3
+
+  Also was modification to directory structure where
+  is perl installed. Instead major.minor.patchlevel now only major.minor. 
+  The "perl-after-upgrade" script is removed.
+
+  Please rebuild all perl ports and all ports that 
+  depend in it:
+
+  # portmaster -r perl
+    or
+  # portupgrade -rf perl
+    or 
+  # pkg install -fR perl
+
 20130609:
   AFFECTS: users of audio/flac and any port that depends on it
   AUTHOR: naddy at FreeBSD.org

Modified: head/lang/perl5.12/Makefile
==============================================================================
--- head/lang/perl5.12/Makefile	Wed Jun 12 12:26:21 2013	(r320678)
+++ head/lang/perl5.12/Makefile	Wed Jun 12 13:00:55 2013	(r320679)
@@ -3,7 +3,7 @@
 
 PORTNAME=	perl
 PORTVERSION=	${PERL_VERSION}
-PORTREVISION=	5
+PORTREVISION=	0
 CATEGORIES=	lang devel perl5
 MASTER_SITES=	CPAN \
 		${MASTER_SITE_LOCAL:S/$/:local/} \
@@ -37,9 +37,10 @@ USE_PERL_DESC=		Rewrite links in /usr/bi
 
 PORTSCOUT=	limitw:1,even
 
-PERL_VERSION=	5.12.4
+PERL_VERSION=	5.12.5
+PERL_VER=	${PERL_VERSION:C/\.[0-9]+$//}
 PERL_ARCH=	mach
-SITE_PERL_REL?=	lib/perl5/site_perl/${PERL_VERSION}
+SITE_PERL_REL?=	lib/perl5/site_perl/${PERL_VER}
 SITE_PERL?=	${LOCALBASE}/${SITE_PERL_REL}
 
 USE_BZIP2=	yes
@@ -47,13 +48,13 @@ HAS_CONFIGURE=	yes
 MAKE_JOBS_UNSAFE=	yes
 CONFIGURE_SCRIPT=Configure
 CONFIGURE_ARGS=	-sde -Dprefix=${PREFIX} \
-	-Darchlib=${PREFIX}/lib/perl5/${PERL_VERSION}/${PERL_ARCH} \
-	-Dprivlib=${PREFIX}/lib/perl5/${PERL_VERSION} \
-	-Dman3dir=${PREFIX}/lib/perl5/${PERL_VERSION}/perl/man/man3 \
+	-Darchlib=${PREFIX}/lib/perl5/${PERL_VER}/${PERL_ARCH} \
+	-Dprivlib=${PREFIX}/lib/perl5/${PERL_VER} \
+	-Dman3dir=${PREFIX}/lib/perl5/${PERL_VER}/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_VERSION}/man/man3 \
+	-Dsiteman3dir=${PREFIX}/lib/perl5/${PERL_VER}/man/man3 \
 	-Dsiteman1dir=${PREFIX}/man/man1 \
 	-Ui_malloc -Ui_iconv -Uinstallusrbinperl \
 	-Dcc="${CC}" -Duseshrplib -Dinc_version_list=none \
@@ -70,15 +71,15 @@ MAKE_ENV+=	${LOCALE_CLEANUP}
 .if defined(PERL_VENDOR_PREFIX)
 CONFIGURE_ARGS+=	\
 	-Dvendorprefix=${PERL_VENDOR_PREFIX} \
-	-Dvendorarch=${PERL_VENDOR_PREFIX}/lib/perl5/${PERL_VERSION}/${PERL_ARCH} \
+	-Dvendorarch=${PERL_VENDOR_PREFIX}/lib/perl5/${PERL_VER}/${PERL_ARCH} \
 	-Dvendorbin=${PERL_VENDOR_PREFIX}/bin \
-	-Dvendorlib=${PERL_VENDOR_PREFIX}/lib/perl5/${PERL_VERSION} \
-	-Dvendorman3dir=${PERL_VENDOR_PREFIX}/lib/perl5/${PERL_VERSION}/man/man3 \
+	-Dvendorlib=${PERL_VENDOR_PREFIX}/lib/perl5/${PERL_VER} \
+	-Dvendorman3dir=${PERL_VENDOR_PREFIX}/lib/perl5/${PERL_VER}/man/man3 \
 	-Dvendorman1dir=${PERL_VENDOR_PREFIX}/man/man1
 .endif
 
 PLIST_SUB+=	PERL_VERSION=${PERL_VERSION} \
-		PERL_VER=${PERL_VERSION} \
+		PERL_VER=${PERL_VER} \
 		PERL_ARCH=${PERL_ARCH} \
 		SITE_PERL=${SITE_PERL:S|^${LOCALBASE}/||}
 
@@ -148,9 +149,9 @@ NO_LATEST_LINK=	yes
 .if ${PORT_OPTIONS:MGDBM}
 MAN3+=	GDBM_File.3
 .endif
-MAN3PREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}/perl
+MAN3PREFIX=	${PREFIX}/lib/perl5/${PERL_VER}/perl
 
-BSDPAN_DEST=	${PREFIX}/lib/perl5/${PERL_VERSION}/BSDPAN
+BSDPAN_DEST=	${PREFIX}/lib/perl5/${PERL_VER}/BSDPAN
 BSDPAN_FILES=	BSDPAN.pm BSDPAN/Override.pm Config.pm \
 		ExtUtils/MM_Unix.pm \
 		ExtUtils/MakeMaker.pm \
@@ -164,21 +165,19 @@ PKGDEINSTALL=	${WRKDIR}/pkg-deinstall
 post-patch:
 	${SED} -e 's|%%PREFIX%%|${PREFIX}|g;' \
 		-e 's|%%PERL_VERSION%%|${PERL_VERSION}|g;' \
+		-e 's|%%PERL_VER%%|${PERL_VER}|g;' \
 		-e 's|%%PERL_ARCH%%|${PERL_ARCH}|g;' \
 		-e 's|%%MAKE_CONF%%|${__MAKE_CONF}|g;' \
 		-e 's|%%LINK_USRBIN%%|${LINK_USRBIN}|g;' \
 		${FILESDIR}/use.perl \
 		> ${WRKDIR}/use.perl
 	${SED} -e 's|%%PREFIX%%|${PREFIX}|g;' \
-		-e 's|%%PERL_VERSION%%|${PERL_VERSION}|g;' \
+		-e 's|%%PERL_VER%%|${PERL_VER}|g;' \
 		${FILESDIR}/perl-man.conf \
 		> ${WRKDIR}/perl-man.conf
-	${SED} -e 's|%%PERL%%|${PERL}|g; s|%%PERL_VERSION%%|${PERL_VERSION}|g; s|%%PKGNAME%%|${PKGNAME}|g' \
-		${FILESDIR}/perl-after-upgrade \
-		> ${WRKDIR}/perl-after-upgrade
 	${CP} ${WRKDIR}/use.perl ${PKGINSTALL}
 	${CP} ${WRKDIR}/use.perl ${PKGDEINSTALL}
-	${SED} -i '' -e 's|%%PERL_PKGNAME%%|${PKGNAME}|g; s|%%PERL_VER%%|5.12|g;' \
+	${SED} -i '' -e 's|%%PERL_PKGNAME%%|${PKGNAME}|g; s|%%PERL_VER%%|${PERL_VER}|g;' \
 		-e 's!%%BSDPAN_VERSION%%!${BSDPAN_VERSION}!g;' \
 		${BSDPAN_WRKSRC}/ExtUtils/*.pm
 	${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g' \
@@ -200,12 +199,9 @@ pre-su-install:
 post-install:
 	@${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_VERSION} ${PREFIX}/bin/perl5
 .if ${OSVERSION} >= 900022
-	@${INSTALL_DATA} ${WRKDIR}/perl-man.conf ${PREFIX}/etc/man.d/perl${PERL_VERSION}.conf
+	@${INSTALL_DATA} ${WRKDIR}/perl-man.conf ${PREFIX}/etc/man.d/perl${PERL_VER}.conf
 .endif
 .for files in ${BSDPAN_FILES}
 	${MKDIR} ${BSDPAN_DEST}/${files:H}
@@ -214,14 +210,10 @@ post-install:
 .endfor
 	PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
 
+AZ: 
 test: build
 	@(cd ${WRKSRC}; TEST_JOBS=${MAKE_JOBS_NUMBER} make test_harness)
 
 regression-test: test
 
-rebuild-xs:
-	${LOCALBASE}/sbin/portupgrade -f `(${FIND} ${PKG_DBDIR}/p5*/+CONTENTS | \
-		${XARGS} ${GREP} -El 'site_perl.*\.so' | \
-		${SED} -e 's!/var/db/pkg/!!; s!/+CONTENTS!!;')`
-
 .include <bsd.port.post.mk>

Modified: head/lang/perl5.12/Makefile.man
==============================================================================
--- head/lang/perl5.12/Makefile.man	Wed Jun 12 12:26:21 2013	(r320678)
+++ head/lang/perl5.12/Makefile.man	Wed Jun 12 13:00:55 2013	(r320679)
@@ -14,7 +14,6 @@ MAN1+=	h2ph.1
 MAN1+=	h2xs.1
 MAN1+=	instmodsh.1
 MAN1+=	libnetcfg.1
-MAN1+=	perl-after-upgrade.1
 MAN1+=	perl.1
 MAN1+=	perl5004delta.1
 MAN1+=	perl5005delta.1
@@ -31,6 +30,7 @@ MAN1+=	perl5121delta.1
 MAN1+=	perl5122delta.1
 MAN1+=	perl5123delta.1
 MAN1+=	perl5124delta.1
+MAN1+=	perl5125delta.1
 MAN1+=	perl561delta.1
 MAN1+=	perl56delta.1
 MAN1+=	perl570delta.1

Modified: head/lang/perl5.12/distinfo
==============================================================================
--- head/lang/perl5.12/distinfo	Wed Jun 12 12:26:21 2013	(r320678)
+++ head/lang/perl5.12/distinfo	Wed Jun 12 13:00:55 2013	(r320679)
@@ -1,4 +1,4 @@
-SHA256 (perl/perl-5.12.4.tar.bz2) = c920fa01a34b7752e8cbbc99c6921b908df60611d84a29c4377e4a798604767e
-SIZE (perl/perl-5.12.4.tar.bz2) = 12350353
+SHA256 (perl/perl-5.12.5.tar.bz2) = 10749417fd3010aae320a34181ad4cd6a4855c1fc63403b87fa4d630b18e966c
+SIZE (perl/perl-5.12.5.tar.bz2) = 12252744
 SHA256 (perl/BSDPAN-20111107.tar.bz2) = 2f03218a592dc65ebfdc3c6b9394d91dcf4c53aa5290a08458b837baad5a21f9
 SIZE (perl/BSDPAN-20111107.tar.bz2) = 8448

Modified: head/lang/perl5.12/files/perl-man.conf
==============================================================================
--- head/lang/perl5.12/files/perl-man.conf	Wed Jun 12 12:26:21 2013	(r320678)
+++ head/lang/perl5.12/files/perl-man.conf	Wed Jun 12 13:00:55 2013	(r320679)
@@ -1,2 +1,2 @@
-MANPATH %%PREFIX%%/lib/perl5/%%PERL_VERSION%%/man
-MANPATH %%PREFIX%%/lib/perl5/%%PERL_VERSION%%/perl/man
+MANPATH %%PREFIX%%/lib/perl5/%%PERL_VER%%/man
+MANPATH %%PREFIX%%/lib/perl5/%%PERL_VER%%/perl/man

Modified: head/lang/perl5.12/files/use.perl
==============================================================================
--- head/lang/perl5.12/files/use.perl	Wed Jun 12 12:26:21 2013	(r320678)
+++ head/lang/perl5.12/files/use.perl	Wed Jun 12 13:00:55 2013	(r320679)
@@ -4,6 +4,7 @@
 
 this=`echo -n $0 | /usr/bin/sed -e 's!^.*/!!'`
 PERL_VERSION="%%PERL_VERSION%%"
+PERL_VER="%%PERL_VER%%"
 MAKE_CONF=%%MAKE_CONF%%
 banner=`date +"%F %T"`
 banner="# added by use.perl $banner"
@@ -89,9 +90,9 @@ do_create_links()
 do_post_install()
 {
 	INCLUDEDIR=/usr/include
-	install -d ${PKG_PREFIX}/lib/perl5/site_perl/%%PERL_VERSION%%/%%PERL_ARCH%%/auto
-	install -d ${PKG_PREFIX}/lib/perl5/site_perl/%%PERL_VERSION%%/auto
-	install -d ${PKG_PREFIX}/lib/perl5/%%PERL_VERSION%%/man/man3
+	install -d ${PKG_PREFIX}/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto
+	install -d ${PKG_PREFIX}/lib/perl5/site_perl/%%PERL_VER%%/auto
+	install -d ${PKG_PREFIX}/lib/perl5/%%PERL_VER%%/man/man3
 	cd ${INCLUDEDIR} && ${PKG_PREFIX}/bin/h2ph *.h machine/*.h sys/*.h >/dev/null
 }
 
@@ -142,8 +143,8 @@ do_spam_manpath()
 	if [ -f /etc/manpath.config ] ; then
 		echo -n "Spamming /etc/manpath.config..."
 		echo "$banner" >>/etc/manpath.config
-		echo "OPTIONAL_MANPATH	${PKG_PREFIX}/lib/perl5/%%PERL_VERSION%%/man" >>/etc/manpath.config
-		echo "OPTIONAL_MANPATH	${PKG_PREFIX}/lib/perl5/%%PERL_VERSION%%/perl/man" >>/etc/manpath.config
+		echo "OPTIONAL_MANPATH	${PKG_PREFIX}/lib/perl5/%%PERL_VER%%/man" >>/etc/manpath.config
+		echo "OPTIONAL_MANPATH	${PKG_PREFIX}/lib/perl5/%%PERL_VER%%/perl/man" >>/etc/manpath.config
 		echo " Done."
 	fi
 }

Modified: head/lang/perl5.12/pkg-plist
==============================================================================
--- head/lang/perl5.12/pkg-plist	Wed Jun 12 12:26:21 2013	(r320678)
+++ head/lang/perl5.12/pkg-plist	Wed Jun 12 13:00:55 2013	(r320679)
@@ -14,10 +14,9 @@ bin/h2xs
 bin/instmodsh
 bin/libnetcfg
 bin/perl
-bin/perl%%PERL_VER%%
+bin/perl%%PERL_VERSION%%
 @exec ln -fs %D/%F %B/perl5
 @unexec rm -f %B/perl5 2>&1 >/dev/null || true
-bin/perl-after-upgrade
 bin/perlbug
 bin/perldoc
 bin/perlivp
@@ -1043,6 +1042,7 @@ lib/perl5/%%PERL_VER%%/pod/perl5121delta
 lib/perl5/%%PERL_VER%%/pod/perl5122delta.pod
 lib/perl5/%%PERL_VER%%/pod/perl5123delta.pod
 lib/perl5/%%PERL_VER%%/pod/perl5124delta.pod
+lib/perl5/%%PERL_VER%%/pod/perl5125delta.pod
 lib/perl5/%%PERL_VER%%/pod/perl561delta.pod
 lib/perl5/%%PERL_VER%%/pod/perl56delta.pod
 lib/perl5/%%PERL_VER%%/pod/perl570delta.pod

Modified: head/lang/perl5.14/Makefile
==============================================================================
--- head/lang/perl5.14/Makefile	Wed Jun 12 12:26:21 2013	(r320678)
+++ head/lang/perl5.14/Makefile	Wed Jun 12 13:00:55 2013	(r320679)
@@ -3,7 +3,7 @@
 
 PORTNAME=	perl
 PORTVERSION=	${PERL_VERSION}
-PORTREVISION=	3
+PORTREVISION=	0
 CATEGORIES=	lang devel perl5
 MASTER_SITES=	CPAN \
 		${MASTER_SITE_LOCAL:S/$/:local/} \
@@ -37,9 +37,10 @@ USE_PERL_DESC=		Rewrite links in /usr/bi
 
 PORTSCOUT=	limitw:1,even
 
-PERL_VERSION=	5.14.2
+PERL_VERSION=	5.14.4
+PERL_VER=	${PERL_VERSION:C/\.[0-9]+$//}
 PERL_ARCH=	mach
-SITE_PERL_REL?=	lib/perl5/site_perl/${PERL_VERSION}
+SITE_PERL_REL?=	lib/perl5/site_perl/${PERL_VER}
 SITE_PERL?=	${LOCALBASE}/${SITE_PERL_REL}
 
 USE_BZIP2=	yes
@@ -47,13 +48,13 @@ HAS_CONFIGURE=	yes
 MAKE_JOBS_UNSAFE=	yes
 CONFIGURE_SCRIPT=Configure
 CONFIGURE_ARGS=	-sde -Dprefix=${PREFIX} \
-	-Darchlib=${PREFIX}/lib/perl5/${PERL_VERSION}/${PERL_ARCH} \
-	-Dprivlib=${PREFIX}/lib/perl5/${PERL_VERSION} \
-	-Dman3dir=${PREFIX}/lib/perl5/${PERL_VERSION}/perl/man/man3 \
+	-Darchlib=${PREFIX}/lib/perl5/${PERL_VER}/${PERL_ARCH} \
+	-Dprivlib=${PREFIX}/lib/perl5/${PERL_VER} \
+	-Dman3dir=${PREFIX}/lib/perl5/${PERL_VER}/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_VERSION}/man/man3 \
+	-Dsiteman3dir=${PREFIX}/lib/perl5/${PERL_VER}/man/man3 \
 	-Dsiteman1dir=${PREFIX}/man/man1 \
 	-Ui_malloc -Ui_iconv -Uinstallusrbinperl \
 	-Dcc="${CC}" -Duseshrplib -Dinc_version_list=none \
@@ -70,15 +71,15 @@ MAKE_ENV+=	${LOCALE_CLEANUP}
 .if defined(PERL_VENDOR_PREFIX)
 CONFIGURE_ARGS+=	\
 	-Dvendorprefix=${PERL_VENDOR_PREFIX} \
-	-Dvendorarch=${PERL_VENDOR_PREFIX}/lib/perl5/${PERL_VERSION}/${PERL_ARCH} \
+	-Dvendorarch=${PERL_VENDOR_PREFIX}/lib/perl5/${PERL_VER}/${PERL_ARCH} \
 	-Dvendorbin=${PERL_VENDOR_PREFIX}/bin \
-	-Dvendorlib=${PERL_VENDOR_PREFIX}/lib/perl5/${PERL_VERSION} \
-	-Dvendorman3dir=${PERL_VENDOR_PREFIX}/lib/perl5/${PERL_VERSION}/man/man3 \
+	-Dvendorlib=${PERL_VENDOR_PREFIX}/lib/perl5/${PERL_VER} \
+	-Dvendorman3dir=${PERL_VENDOR_PREFIX}/lib/perl5/${PERL_VER}/man/man3 \
 	-Dvendorman1dir=${PERL_VENDOR_PREFIX}/man/man1
 .endif
 
 PLIST_SUB+=	PERL_VERSION=${PERL_VERSION} \
-		PERL_VER=${PERL_VERSION} \
+		PERL_VER=${PERL_VER} \
 		PERL_ARCH=${PERL_ARCH} \
 		SITE_PERL=${SITE_PERL:S|^${LOCALBASE}/||}
 
@@ -148,9 +149,9 @@ LATEST_LINK=	perl
 .if ${PORT_OPTIONS:MGDBM}
 MAN3+=	GDBM_File.3
 .endif
-MAN3PREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}/perl
+MAN3PREFIX=	${PREFIX}/lib/perl5/${PERL_VER}/perl
 
-BSDPAN_DEST=	${PREFIX}/lib/perl5/${PERL_VERSION}/BSDPAN
+BSDPAN_DEST=	${PREFIX}/lib/perl5/${PERL_VER}/BSDPAN
 BSDPAN_FILES=	BSDPAN.pm BSDPAN/Override.pm Config.pm \
 		ExtUtils/MM_Unix.pm \
 		ExtUtils/MakeMaker.pm \
@@ -164,21 +165,19 @@ PKGDEINSTALL=	${WRKDIR}/pkg-deinstall
 post-patch:
 	${SED} -e 's|%%PREFIX%%|${PREFIX}|g;' \
 		-e 's|%%PERL_VERSION%%|${PERL_VERSION}|g;' \
+		-e 's|%%PERL_VER%%|${PERL_VER}|g;' \
 		-e 's|%%PERL_ARCH%%|${PERL_ARCH}|g;' \
 		-e 's|%%MAKE_CONF%%|${__MAKE_CONF}|g;' \
 		-e 's|%%LINK_USRBIN%%|${LINK_USRBIN}|g;' \
 		${FILESDIR}/use.perl \
 		> ${WRKDIR}/use.perl
 	${SED} -e 's|%%PREFIX%%|${PREFIX}|g;' \
-		-e 's|%%PERL_VERSION%%|${PERL_VERSION}|g;' \
+		-e 's|%%PERL_VER%%|${PERL_VER}|g;' \
 		${FILESDIR}/perl-man.conf \
 		> ${WRKDIR}/perl-man.conf
-	${SED} -e 's|%%PERL%%|${PERL}|g; s|%%PERL_VERSION%%|${PERL_VERSION}|g; s|%%PKGNAME%%|${PKGNAME}|g' \
-		${FILESDIR}/perl-after-upgrade \
-		> ${WRKDIR}/perl-after-upgrade
 	${CP} ${WRKDIR}/use.perl ${PKGINSTALL}
 	${CP} ${WRKDIR}/use.perl ${PKGDEINSTALL}
-	${SED} -i '' -e 's|%%PERL_PKGNAME%%|${PKGNAME}|g; s|%%PERL_VER%%|5.14|g;' \
+	${SED} -i '' -e 's|%%PERL_PKGNAME%%|${PKGNAME}|g; s|%%PERL_VER%%|${PERL_VER}|g;' \
 		-e 's!%%BSDPAN_VERSION%%!${BSDPAN_VERSION}!g;' \
 		${BSDPAN_WRKSRC}/ExtUtils/*.pm
 	${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g' \
@@ -200,12 +199,9 @@ pre-su-install:
 post-install:
 	@${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_VERSION} ${PREFIX}/bin/perl5
 .if ${OSVERSION} >= 900022
-	@${INSTALL_DATA} ${WRKDIR}/perl-man.conf ${PREFIX}/etc/man.d/perl${PERL_VERSION}.conf
+	@${INSTALL_DATA} ${WRKDIR}/perl-man.conf ${PREFIX}/etc/man.d/perl${PERL_VER}.conf
 .endif
 .for files in ${BSDPAN_FILES}
 	${MKDIR} ${BSDPAN_DEST}/${files:H}
@@ -214,14 +210,10 @@ post-install:
 .endfor
 	PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
 
+ AZ:
 test: build
 	@(cd ${WRKSRC}; TEST_JOBS=${MAKE_JOBS_NUMBER} make test_harness)
 
 regression-test: test
 
-rebuild-xs:
-	${LOCALBASE}/sbin/portupgrade -f `(${FIND} ${PKG_DBDIR}/p5*/+CONTENTS | \
-		${XARGS} ${GREP} -El 'site_perl.*\.so' | \
-		${SED} -e 's!/var/db/pkg/!!; s!/+CONTENTS!!;')`
-
 .include <bsd.port.post.mk>

Modified: head/lang/perl5.14/Makefile.man
==============================================================================
--- head/lang/perl5.14/Makefile.man	Wed Jun 12 12:26:21 2013	(r320678)
+++ head/lang/perl5.14/Makefile.man	Wed Jun 12 13:00:55 2013	(r320679)
@@ -15,7 +15,6 @@ MAN1+=	h2xs.1
 MAN1+=	instmodsh.1
 MAN1+=	json_pp.1
 MAN1+=	libnetcfg.1
-MAN1+=	perl-after-upgrade.1
 MAN1+=	perl.1
 MAN1+=	perl5004delta.1
 MAN1+=	perl5005delta.1
@@ -46,6 +45,8 @@ MAN1+=	perl5139delta.1
 MAN1+=	perl5140delta.1
 MAN1+=	perl5141delta.1
 MAN1+=	perl5142delta.1
+MAN1+=	perl5143delta.1
+MAN1+=	perl5144delta.1
 MAN1+=	perl561delta.1
 MAN1+=	perl56delta.1
 MAN1+=	perl570delta.1

Modified: head/lang/perl5.14/distinfo
==============================================================================
--- head/lang/perl5.14/distinfo	Wed Jun 12 12:26:21 2013	(r320678)
+++ head/lang/perl5.14/distinfo	Wed Jun 12 13:00:55 2013	(r320679)
@@ -1,4 +1,4 @@
-SHA256 (perl/perl-5.14.2.tar.bz2) = c2a2362e8d1fdd2bfbfde801fcd78241f154c164f00fba76065ab8cc5c7b06cd
-SIZE (perl/perl-5.14.2.tar.bz2) = 13226972
+SHA256 (perl/perl-5.14.4.tar.bz2) = eece8c2b0d491bf6f746bd1f4f1bb7ce26f6b98e91c54690c617d7af38964745
+SIZE (perl/perl-5.14.4.tar.bz2) = 13179295
 SHA256 (perl/BSDPAN-20111107.tar.bz2) = 2f03218a592dc65ebfdc3c6b9394d91dcf4c53aa5290a08458b837baad5a21f9
 SIZE (perl/BSDPAN-20111107.tar.bz2) = 8448

Modified: head/lang/perl5.14/files/perl-man.conf
==============================================================================
--- head/lang/perl5.14/files/perl-man.conf	Wed Jun 12 12:26:21 2013	(r320678)
+++ head/lang/perl5.14/files/perl-man.conf	Wed Jun 12 13:00:55 2013	(r320679)
@@ -1,2 +1,2 @@
-MANPATH %%PREFIX%%/lib/perl5/%%PERL_VERSION%%/man
-MANPATH %%PREFIX%%/lib/perl5/%%PERL_VERSION%%/perl/man
+MANPATH %%PREFIX%%/lib/perl5/%%PERL_VER%%/man
+MANPATH %%PREFIX%%/lib/perl5/%%PERL_VER%%/perl/man

Modified: head/lang/perl5.14/files/use.perl
==============================================================================
--- head/lang/perl5.14/files/use.perl	Wed Jun 12 12:26:21 2013	(r320678)
+++ head/lang/perl5.14/files/use.perl	Wed Jun 12 13:00:55 2013	(r320679)
@@ -4,6 +4,7 @@
 
 this=`echo -n $0 | /usr/bin/sed -e 's!^.*/!!'`
 PERL_VERSION="%%PERL_VERSION%%"
+PERL_VER="%%PERL_VER%%"
 MAKE_CONF=%%MAKE_CONF%%
 banner=`date +"%F %T"`
 banner="# added by use.perl $banner"
@@ -89,9 +90,9 @@ do_create_links()
 do_post_install()
 {
 	INCLUDEDIR=/usr/include
-	install -d ${PKG_PREFIX}/lib/perl5/site_perl/%%PERL_VERSION%%/%%PERL_ARCH%%/auto
-	install -d ${PKG_PREFIX}/lib/perl5/site_perl/%%PERL_VERSION%%/auto
-	install -d ${PKG_PREFIX}/lib/perl5/%%PERL_VERSION%%/man/man3
+	install -d ${PKG_PREFIX}/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto
+	install -d ${PKG_PREFIX}/lib/perl5/site_perl/%%PERL_VER%%/auto
+	install -d ${PKG_PREFIX}/lib/perl5/%%PERL_VER%%/man/man3
 	cd ${INCLUDEDIR} && ${PKG_PREFIX}/bin/h2ph *.h machine/*.h sys/*.h >/dev/null
 }
 
@@ -142,8 +143,8 @@ do_spam_manpath()
 	if [ -f /etc/manpath.config ] ; then
 		echo -n "Spamming /etc/manpath.config..."
 		echo "$banner" >>/etc/manpath.config
-		echo "OPTIONAL_MANPATH	${PKG_PREFIX}/lib/perl5/%%PERL_VERSION%%/man" >>/etc/manpath.config
-		echo "OPTIONAL_MANPATH	${PKG_PREFIX}/lib/perl5/%%PERL_VERSION%%/perl/man" >>/etc/manpath.config
+		echo "OPTIONAL_MANPATH	${PKG_PREFIX}/lib/perl5/%%PERL_VER%%/man" >>/etc/manpath.config
+		echo "OPTIONAL_MANPATH	${PKG_PREFIX}/lib/perl5/%%PERL_VER%%/perl/man" >>/etc/manpath.config
 		echo " Done."
 	fi
 }

Modified: head/lang/perl5.14/pkg-plist
==============================================================================
--- head/lang/perl5.14/pkg-plist	Wed Jun 12 12:26:21 2013	(r320678)
+++ head/lang/perl5.14/pkg-plist	Wed Jun 12 13:00:55 2013	(r320679)
@@ -15,10 +15,9 @@ bin/instmodsh
 bin/json_pp
 bin/libnetcfg
 bin/perl
-bin/perl%%PERL_VER%%
+bin/perl%%PERL_VERSION%%
 @exec ln -fs %D/%F %B/perl5
 @unexec rm -f %B/perl5 2>&1 >/dev/null || true
-bin/perl-after-upgrade
 bin/perlbug
 bin/perldoc
 bin/perlivp
@@ -1121,6 +1120,8 @@ lib/perl5/%%PERL_VER%%/pod/perl5139delta
 lib/perl5/%%PERL_VER%%/pod/perl5140delta.pod
 lib/perl5/%%PERL_VER%%/pod/perl5141delta.pod
 lib/perl5/%%PERL_VER%%/pod/perl5142delta.pod
+lib/perl5/%%PERL_VER%%/pod/perl5143delta.pod
+lib/perl5/%%PERL_VER%%/pod/perl5144delta.pod
 lib/perl5/%%PERL_VER%%/pod/perl561delta.pod
 lib/perl5/%%PERL_VER%%/pod/perl56delta.pod
 lib/perl5/%%PERL_VER%%/pod/perl570delta.pod

Modified: head/lang/perl5.16/Makefile
==============================================================================
--- head/lang/perl5.16/Makefile	Wed Jun 12 12:26:21 2013	(r320678)
+++ head/lang/perl5.16/Makefile	Wed Jun 12 13:00:55 2013	(r320679)
@@ -3,7 +3,7 @@
 
 PORTNAME=	perl
 PORTVERSION=	${PERL_VERSION}
-PORTREVISION=	1
+PORTREVISION=	0
 CATEGORIES=	lang devel perl5
 MASTER_SITES=	CPAN \
 		${MASTER_SITE_LOCAL:S/$/:local/} \
@@ -37,9 +37,10 @@ USE_PERL_DESC=		Rewrite links in /usr/bi
 
 PORTSCOUT=	limitw:1,even
 
-PERL_VERSION=	5.16.2
+PERL_VERSION=	5.16.3
+PERL_VER=	${PERL_VERSION:C/\.[0-9]+$//}
 PERL_ARCH=	mach
-SITE_PERL_REL?=	lib/perl5/site_perl/${PERL_VERSION}
+SITE_PERL_REL?=	lib/perl5/site_perl/${PERL_VER}
 SITE_PERL?=	${LOCALBASE}/${SITE_PERL_REL}
 
 USE_BZIP2=	yes
@@ -47,13 +48,13 @@ HAS_CONFIGURE=	yes
 MAKE_JOBS_UNSAFE=	yes
 CONFIGURE_SCRIPT=Configure
 CONFIGURE_ARGS=	-sde -Dprefix=${PREFIX} \
-	-Darchlib=${PREFIX}/lib/perl5/${PERL_VERSION}/${PERL_ARCH} \
-	-Dprivlib=${PREFIX}/lib/perl5/${PERL_VERSION} \
-	-Dman3dir=${PREFIX}/lib/perl5/${PERL_VERSION}/perl/man/man3 \
+	-Darchlib=${PREFIX}/lib/perl5/${PERL_VER}/${PERL_ARCH} \
+	-Dprivlib=${PREFIX}/lib/perl5/${PERL_VER} \
+	-Dman3dir=${PREFIX}/lib/perl5/${PERL_VER}/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_VERSION}/man/man3 \
+	-Dsiteman3dir=${PREFIX}/lib/perl5/${PERL_VER}/man/man3 \
 	-Dsiteman1dir=${PREFIX}/man/man1 \
 	-Ui_malloc -Ui_iconv -Uinstallusrbinperl \
 	-Dcc="${CC}" -Duseshrplib -Dinc_version_list=none \
@@ -70,15 +71,15 @@ MAKE_ENV+=	${LOCALE_CLEANUP}
 .if defined(PERL_VENDOR_PREFIX)
 CONFIGURE_ARGS+=	\
 	-Dvendorprefix=${PERL_VENDOR_PREFIX} \
-	-Dvendorarch=${PERL_VENDOR_PREFIX}/lib/perl5/${PERL_VERSION}/${PERL_ARCH} \
+	-Dvendorarch=${PERL_VENDOR_PREFIX}/lib/perl5/${PERL_VER}/${PERL_ARCH} \
 	-Dvendorbin=${PERL_VENDOR_PREFIX}/bin \
-	-Dvendorlib=${PERL_VENDOR_PREFIX}/lib/perl5/${PERL_VERSION} \
-	-Dvendorman3dir=${PERL_VENDOR_PREFIX}/lib/perl5/${PERL_VERSION}/man/man3 \
+	-Dvendorlib=${PERL_VENDOR_PREFIX}/lib/perl5/${PERL_VER} \
+	-Dvendorman3dir=${PERL_VENDOR_PREFIX}/lib/perl5/${PERL_VER}/man/man3 \
 	-Dvendorman1dir=${PERL_VENDOR_PREFIX}/man/man1
 .endif
 
 PLIST_SUB+=	PERL_VERSION=${PERL_VERSION} \
-		PERL_VER=${PERL_VERSION} \
+		PERL_VER=${PERL_VER} \
 		PERL_ARCH=${PERL_ARCH} \
 		SITE_PERL=${SITE_PERL:S|^${LOCALBASE}/||}
 
@@ -148,9 +149,9 @@ NO_LATEST_LINK=	yes
 .if ${PORT_OPTIONS:MGDBM}
 MAN3+=	GDBM_File.3
 .endif
-MAN3PREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}/perl
+MAN3PREFIX=	${PREFIX}/lib/perl5/${PERL_VER}/perl
 
-BSDPAN_DEST=	${PREFIX}/lib/perl5/${PERL_VERSION}/BSDPAN
+BSDPAN_DEST=	${PREFIX}/lib/perl5/${PERL_VER}/BSDPAN
 BSDPAN_FILES=	BSDPAN.pm BSDPAN/Override.pm Config.pm \
 		ExtUtils/MM_Unix.pm \
 		ExtUtils/MakeMaker.pm \
@@ -164,21 +165,19 @@ PKGDEINSTALL=	${WRKDIR}/pkg-deinstall
 post-patch:
 	${SED} -e 's|%%PREFIX%%|${PREFIX}|g;' \
 		-e 's|%%PERL_VERSION%%|${PERL_VERSION}|g;' \
+		-e 's|%%PERL_VER%%|${PERL_VER}|g;' \
 		-e 's|%%PERL_ARCH%%|${PERL_ARCH}|g;' \
 		-e 's|%%MAKE_CONF%%|${__MAKE_CONF}|g;' \
 		-e 's|%%LINK_USRBIN%%|${LINK_USRBIN}|g;' \
 		${FILESDIR}/use.perl \
 		> ${WRKDIR}/use.perl
 	${SED} -e 's|%%PREFIX%%|${PREFIX}|g;' \
-		-e 's|%%PERL_VERSION%%|${PERL_VERSION}|g;' \
+		-e 's|%%PERL_VER%%|${PERL_VER}|g;' \
 		${FILESDIR}/perl-man.conf \
 		> ${WRKDIR}/perl-man.conf
-	${SED} -e 's|%%PERL%%|${PERL}|g; s|%%PERL_VERSION%%|${PERL_VERSION}|g; s|%%PKGNAME%%|${PKGNAME}|g' \
-		${FILESDIR}/perl-after-upgrade \
-		> ${WRKDIR}/perl-after-upgrade
 	${CP} ${WRKDIR}/use.perl ${PKGINSTALL}
 	${CP} ${WRKDIR}/use.perl ${PKGDEINSTALL}
-	${SED} -i '' -e 's|%%PERL_PKGNAME%%|${PKGNAME}|g; s|%%PERL_VER%%|5.16|g;' \
+	${SED} -i '' -e 's|%%PERL_PKGNAME%%|${PKGNAME}|g; s|%%PERL_VER%%|%{PERL_VER}|g;' \
 		-e 's!%%BSDPAN_VERSION%%!${BSDPAN_VERSION}!g;' \
 		${BSDPAN_WRKSRC}/ExtUtils/*.pm
 	${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g' \
@@ -200,12 +199,9 @@ pre-su-install:
 post-install:
 	@${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_VERSION} ${PREFIX}/bin/perl5
 .if ${OSVERSION} >= 900022
-	@${INSTALL_DATA} ${WRKDIR}/perl-man.conf ${PREFIX}/etc/man.d/perl${PERL_VERSION}.conf
+	@${INSTALL_DATA} ${WRKDIR}/perl-man.conf ${PREFIX}/etc/man.d/perl${PERL_VER}.conf
 .endif
 .for files in ${BSDPAN_FILES}
 	${MKDIR} ${BSDPAN_DEST}/${files:H}
@@ -214,14 +210,10 @@ post-install:
 .endfor
 	PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
 
+AZ:
 test: build
 	@(cd ${WRKSRC}; TEST_JOBS=${MAKE_JOBS_NUMBER} make test_harness)
 
 regression-test: test
 
-rebuild-xs:
-	${LOCALBASE}/sbin/portupgrade -f `(${FIND} ${PKG_DBDIR}/p5*/+CONTENTS | \
-		${XARGS} ${GREP} -El 'site_perl.*\.so' | \
-		${SED} -e 's!/var/db/pkg/!!; s!/+CONTENTS!!;')`
-
 .include <bsd.port.post.mk>

Modified: head/lang/perl5.16/Makefile.man
==============================================================================
--- head/lang/perl5.16/Makefile.man	Wed Jun 12 12:26:21 2013	(r320678)
+++ head/lang/perl5.16/Makefile.man	Wed Jun 12 13:00:55 2013	(r320679)
@@ -14,7 +14,6 @@ MAN1+=	h2xs.1
 MAN1+=	instmodsh.1
 MAN1+=	json_pp.1
 MAN1+=	libnetcfg.1
-MAN1+=	perl-after-upgrade.1
 MAN1+=	perl.1
 MAN1+=	perl5004delta.1
 MAN1+=	perl5005delta.1
@@ -32,6 +31,7 @@ MAN1+=	perl5142delta.1
 MAN1+=	perl5160delta.1
 MAN1+=	perl5161delta.1
 MAN1+=	perl5162delta.1
+MAN1+=	perl5163delta.1
 MAN1+=	perl561delta.1
 MAN1+=	perl56delta.1
 MAN1+=	perl581delta.1

Modified: head/lang/perl5.16/distinfo
==============================================================================
--- head/lang/perl5.16/distinfo	Wed Jun 12 12:26:21 2013	(r320678)
+++ head/lang/perl5.16/distinfo	Wed Jun 12 13:00:55 2013	(r320679)
@@ -1,4 +1,4 @@
-SHA256 (perl/perl-5.16.2.tar.bz2) = 5ba91d9aa40220c615b644bb48fa5df7fbca4afb1c9e911bdc0ce2a93f072d7d
-SIZE (perl/perl-5.16.2.tar.bz2) = 13725101
+SHA256 (perl/perl-5.16.3.tar.bz2) = bb7bc735e6813b177dcfccd480defcde7eddefa173b5967eac11babd1bfa98e8
+SIZE (perl/perl-5.16.3.tar.bz2) = 13724906
 SHA256 (perl/BSDPAN-20111107.tar.bz2) = 2f03218a592dc65ebfdc3c6b9394d91dcf4c53aa5290a08458b837baad5a21f9
 SIZE (perl/BSDPAN-20111107.tar.bz2) = 8448

Modified: head/lang/perl5.16/files/perl-man.conf
==============================================================================
--- head/lang/perl5.16/files/perl-man.conf	Wed Jun 12 12:26:21 2013	(r320678)
+++ head/lang/perl5.16/files/perl-man.conf	Wed Jun 12 13:00:55 2013	(r320679)
@@ -1,2 +1,2 @@
-MANPATH %%PREFIX%%/lib/perl5/%%PERL_VERSION%%/man
-MANPATH %%PREFIX%%/lib/perl5/%%PERL_VERSION%%/perl/man
+MANPATH %%PREFIX%%/lib/perl5/%%PERL_VER%%/man
+MANPATH %%PREFIX%%/lib/perl5/%%PERL_VER%%/perl/man

Modified: head/lang/perl5.16/files/use.perl
==============================================================================
--- head/lang/perl5.16/files/use.perl	Wed Jun 12 12:26:21 2013	(r320678)
+++ head/lang/perl5.16/files/use.perl	Wed Jun 12 13:00:55 2013	(r320679)
@@ -4,6 +4,7 @@
 
 this=`echo -n $0 | /usr/bin/sed -e 's!^.*/!!'`
 PERL_VERSION="%%PERL_VERSION%%"
+PERL_VER="%%PERL_VER%%"
 MAKE_CONF=%%MAKE_CONF%%
 banner=`date +"%F %T"`
 banner="# added by use.perl $banner"
@@ -89,9 +90,9 @@ do_create_links()
 do_post_install()
 {
 	INCLUDEDIR=/usr/include
-	install -d ${PKG_PREFIX}/lib/perl5/site_perl/%%PERL_VERSION%%/%%PERL_ARCH%%/auto
-	install -d ${PKG_PREFIX}/lib/perl5/site_perl/%%PERL_VERSION%%/auto
-	install -d ${PKG_PREFIX}/lib/perl5/%%PERL_VERSION%%/man/man3
+	install -d ${PKG_PREFIX}/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto
+	install -d ${PKG_PREFIX}/lib/perl5/site_perl/%%PERL_VER%%/auto
+	install -d ${PKG_PREFIX}/lib/perl5/%%PERL_VER%%/man/man3
 	cd ${INCLUDEDIR} && ${PKG_PREFIX}/bin/h2ph *.h machine/*.h sys/*.h >/dev/null
 }
 
@@ -142,8 +143,8 @@ do_spam_manpath()
 	if [ -f /etc/manpath.config ] ; then
 		echo -n "Spamming /etc/manpath.config..."
 		echo "$banner" >>/etc/manpath.config
-		echo "OPTIONAL_MANPATH	${PKG_PREFIX}/lib/perl5/%%PERL_VERSION%%/man" >>/etc/manpath.config
-		echo "OPTIONAL_MANPATH	${PKG_PREFIX}/lib/perl5/%%PERL_VERSION%%/perl/man" >>/etc/manpath.config
+		echo "OPTIONAL_MANPATH	${PKG_PREFIX}/lib/perl5/%%PERL_VER%%/man" >>/etc/manpath.config
+		echo "OPTIONAL_MANPATH	${PKG_PREFIX}/lib/perl5/%%PERL_VER%%/perl/man" >>/etc/manpath.config
 		echo " Done."
 	fi
 }

Modified: head/lang/perl5.16/pkg-plist
==============================================================================
--- head/lang/perl5.16/pkg-plist	Wed Jun 12 12:26:21 2013	(r320678)
+++ head/lang/perl5.16/pkg-plist	Wed Jun 12 13:00:55 2013	(r320679)
@@ -14,10 +14,9 @@ bin/instmodsh
 bin/json_pp
 bin/libnetcfg
 bin/perl
-bin/perl%%PERL_VER%%
+bin/perl%%PERL_VERSION%%
 @exec ln -fs %D/%F %B/perl5
 @unexec rm -f %B/perl5 2>&1 >/dev/null || true
-bin/perl-after-upgrade
 bin/perlbug
 bin/perldoc
 bin/perlivp
@@ -1042,6 +1041,7 @@ lib/perl5/%%PERL_VER%%/pod/perl5143delta
 lib/perl5/%%PERL_VER%%/pod/perl5160delta.pod
 lib/perl5/%%PERL_VER%%/pod/perl5161delta.pod
 lib/perl5/%%PERL_VER%%/pod/perl5162delta.pod
+lib/perl5/%%PERL_VER%%/pod/perl5163delta.pod
 lib/perl5/%%PERL_VER%%/pod/perl561delta.pod
 lib/perl5/%%PERL_VER%%/pod/perl56delta.pod
 lib/perl5/%%PERL_VER%%/pod/perl581delta.pod

Modified: head/mail/cyrus-imapd2/Makefile
==============================================================================
--- head/mail/cyrus-imapd2/Makefile	Wed Jun 12 12:26:21 2013	(r320678)
+++ head/mail/cyrus-imapd2/Makefile	Wed Jun 12 13:00:55 2013	(r320679)
@@ -22,6 +22,8 @@ CONFLICTS=	cyrus-1.* cyrus-imapd-2.[^1].
 
 LATEST_LINK=	${PORTNAME}2
 
+PERLMAN=	${SITE_PERL_REL:S/site_perl\///}
+
 USE_RC_SUBR=	imapd
 
 USE_OPENSSL=	yes
@@ -128,8 +130,8 @@ post-patch:
 
 post-install:
 .for f in ${CYRUS_MAN3}
-		@${GZIP_CMD} ${PREFIX}/lib/perl5/${PERL_VERSION}/man/man3/${f}
-		@${ECHO_CMD} lib/perl5/${PERL_VERSION}/man/man3/${f}.gz \
+		@${GZIP_CMD} ${PREFIX}/${PERLMAN}/man/man3/${f}
+		@${ECHO_CMD} ${PERLMAN}/man/man3/${f}.gz \
 			>>${TMPPLIST}
 .endfor
 .for f in ${CYRUS_MAN8}

Modified: head/mail/cyrus-imapd22/Makefile
==============================================================================
--- head/mail/cyrus-imapd22/Makefile	Wed Jun 12 12:26:21 2013	(r320678)
+++ head/mail/cyrus-imapd22/Makefile	Wed Jun 12 13:00:55 2013	(r320679)
@@ -17,6 +17,8 @@ CONFLICTS=	cyrus-1.* cyrus-imapd-2.[^2].
 
 LATEST_LINK=	${PORTNAME}22
 
+PERLMAN=	${SITE_PERL_REL:S/site_perl\///}
+
 USE_RC_SUBR=	imapd
 USE_OPENSSL=	yes
 USE_PERL5=	yes
@@ -181,8 +183,8 @@ post-patch:
 
 post-install:
 .for f in ${CYRUS_MAN3}
-		@${GZIP_CMD} ${PREFIX}/lib/perl5/${PERL_VERSION}/man/man3/${f}
-		@${ECHO_CMD} lib/perl5/${PERL_VERSION}/man/man3/${f}.gz \
+		@${GZIP_CMD} ${PREFIX}/${PERLMAN}/man/man3/${f}
+		@${ECHO_CMD} ${PERLMAN}/man/man3/${f}.gz \
 			>>${TMPPLIST}
 .endfor
 .for f in ${CYRUS_MAN8}

Modified: head/mail/cyrus-imapd23/Makefile
==============================================================================
--- head/mail/cyrus-imapd23/Makefile	Wed Jun 12 12:26:21 2013	(r320678)
+++ head/mail/cyrus-imapd23/Makefile	Wed Jun 12 13:00:55 2013	(r320679)
@@ -20,6 +20,8 @@ CONFLICTS=	cyrus-1.* cyrus-imapd-2.[^3].
 
 LATEST_LINK=	${PORTNAME}23
 
+PERLMAN=	${SITE_PERL_REL:S/site_perl\///}
+
 USE_RC_SUBR=	imapd
 USE_OPENSSL=	yes
 USE_PERL5=	yes
@@ -234,8 +236,8 @@ post-patch:
 
 post-install:
 .for f in ${CYRUS_MAN3}
-		@${GZIP_CMD} ${PREFIX}/lib/perl5/${PERL_VERSION}/man/man3/${f}
-		@${ECHO_CMD} lib/perl5/${PERL_VERSION}/man/man3/${f}.gz \
+		@${GZIP_CMD} ${PREFIX}/${PERLMAN}/man/man3/${f}
+		@${ECHO_CMD} ${PERLMAN}/man/man3/${f}.gz \
 			>>${TMPPLIST}
 .endfor
 .for f in ${CYRUS_MAN8}

Modified: head/mail/cyrus-imapd24/Makefile
==============================================================================
--- head/mail/cyrus-imapd24/Makefile	Wed Jun 12 12:26:21 2013	(r320678)
+++ head/mail/cyrus-imapd24/Makefile	Wed Jun 12 13:00:55 2013	(r320679)
@@ -20,6 +20,8 @@ CONFLICTS=	cyrus-1.* cyrus-imapd-2.[^4].
 
 LATEST_LINK=	${PORTNAME}24
 
++PERLMAN=	${SITE_PERL_REL:S/site_perl\///}
+
 USE_RC_SUBR=	imapd
 USE_OPENSSL=	yes
 USE_PERL5=	yes
@@ -227,8 +229,8 @@ post-patch:
 
 post-install:
 .for f in ${CYRUS_MAN3}
-		@${GZIP_CMD} ${PREFIX}/lib/perl5/${PERL_VERSION}/man/man3/${f}
-		@${ECHO_CMD} lib/perl5/${PERL_VERSION}/man/man3/${f}.gz \
+		@${GZIP_CMD} ${PREFIX}/${PERLMAN}/man/man3/${f}
+		@${ECHO_CMD} ${PERLMAN}/man/man3/${f}.gz \
 			>>${TMPPLIST}
 .endfor
 .for f in ${CYRUS_MAN8}
