Index: head/Mk/Uses/perl5.mk
===================================================================
--- head/Mk/Uses/perl5.mk	(revision 387464)
+++ head/Mk/Uses/perl5.mk	(revision 387465)
@@ -1,309 +1,311 @@
 # $FreeBSD$
 #
 # Provide support to use perl5
 #
 # PERL5		- Set to full path of perl5, either in the system or
 #		  installed from a port.
 # PERL		- Set to full path of perl5, either in the system or
 #		  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.4 would give
 #		  a PERL_LEVEL of 501404. This can be used in comparisons
 #		  to determine if the version of perl is high enough,
 #		  whether a particular dependency is needed, etc.
 # PERL_ARCH	- Directory name of architecture dependent libraries
 #		  (value: mach).
 # PERL_PORT	- Name of the perl port that is installed
 #		  (for example: perl5.18)
 # SITE_PERL	- Directory name where site specific perl packages go.
 #		  This value is added to PLIST_SUB.
 # SITE_ARCH	- Directory name where arch site specific perl packages go.
 #		  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.
 #		  It can also have configure, modbuild and modbuildtiny when
 #		  the port needs to run Makefile.PL, Build.PL and a
 #		  Module::Build::Tiny flavor of Build.PL.
 #
 # MAINTAINER: perl@FreeBSD.org
 
 .if !defined(_INCLUDE_USES_PERL5_MK)
 _INCLUDE_USES_PERL5_MK=	yes
 
 .if !empty(perl5_ARGS)
 IGNORE=	Incorrect 'USES+=perl5:${perl5_ARGS}' perl5 takes no arguments
 .endif
 
 USE_PERL5?=	run build
 
 .if exists(${LOCALBASE}/bin/perl5)
 .sinclude "${LOCALBASE}/etc/perl5_version"
 .if !defined(PERL_VERSION)
 PERL_VERSION!=	perl -e 'printf "%vd\n", $$^V;'
 .endif
 .else
 .include "${PORTSDIR}/Mk/bsd.default-versions.mk"
 .if ${PERL5_DEFAULT} == 5.16
 PERL_VERSION=	5.16.3
 .elif ${PERL5_DEFAULT} == 5.18
 PERL_VERSION=	5.18.4
 .elif ${PERL5_DEFAULT} == 5.20
 PERL_VERSION=	5.20.2
 .elif ${PERL5_DEFAULT} == 5.21 || ${PERL5_DEFAULT} == devel
 PERL_VERSION=	5.22.0
+# Force PERL_PORT here in case two identical PERL_VERSION.
+PERL_PORT?=	perl5-devel
 .else
 IGNORE=	Invalid perl5 version ${PERL5_DEFAULT}
 .endif
 .endif
 
 PERL_VER?=	${PERL_VERSION:C/\.[0-9]+$//}
 
 .if !defined(PERL_LEVEL) && defined(PERL_VERSION)
 perl_major=	${PERL_VERSION:C|^([1-9]+).*|\1|}
 _perl_minor=	00${PERL_VERSION:C|^([1-9]+)\.([0-9]+).*|\2|}
 perl_minor=	${_perl_minor:C|^.*(...)|\1|}
 .if ${perl_minor} >= 100
 perl_minor=	${PERL_VERSION:C|^([1-9]+)\.([0-9][0-9][0-9]).*|\2|}
 perl_patch=	${PERL_VERSION:C|^.*(..)|\1|}
 .else # ${perl_minor} < 100
 _perl_patch=	0${PERL_VERSION:C|^([1-9]+)\.([0-9]+)\.*|0|}
 perl_patch=	${_perl_patch:C|^.*(..)|\1|}
 .endif # ${perl_minor} < 100
 PERL_LEVEL=	${perl_major}${perl_minor}${perl_patch}
 .else
 PERL_LEVEL=0
 .endif # !defined(PERL_LEVEL) && defined(PERL_VERSION)
 
 PERL_ARCH?=	mach
 
 # there must always be a default to prevent dependency failures such
 # as "ports/lang: not found"
 .if   ${PERL_LEVEL} >= 502100
 PERL_PORT?=	perl5-devel
 .elif   ${PERL_LEVEL} >= 502000
 PERL_PORT?=	perl5.20
 .elif ${PERL_LEVEL} >= 501800
 PERL_PORT?=	perl5.18
 .else # ${PERL_LEVEL} < 501800
 PERL_PORT?=	perl5.16
 .endif
 
 SITE_PERL_REL?=	lib/perl5/site_perl
 SITE_PERL?=	${LOCALBASE}/${SITE_PERL_REL}
 SITE_ARCH_REL?=	${SITE_PERL_REL}/${PERL_ARCH}/${PERL_VER}
 SITE_ARCH?=	${LOCALBASE}/${SITE_ARCH_REL}
 SITE_MAN3_REL?=	${SITE_PERL_REL}/man/man3
 SITE_MAN3?=	${PREFIX}/${SITE_MAN3_REL}
 
 PERL5=		${LOCALBASE}/bin/perl${PERL_VERSION}
 PERL=		${LOCALBASE}/bin/perl
 CONFIGURE_ENV+=	ac_cv_path_PERL=${PERL} ac_cv_path_PERL_PATH=${PERL}
 
 QA_ENV+=	SITE_ARCH_REL=${SITE_ARCH_REL} LIBPERL=libperl.so.${PERL_VER}
 
 # Define the want perl first if defined
 .if ${USE_PERL5:M5*}
 want_perl_sign=		${USE_PERL5:M5*:C|^[0-9.]+||}
 want_perl_ver=		${USE_PERL5:M5*:S|${want_perl_sign}$||}
 want_perl_major=	${want_perl_ver:C|\..*||}
 _want_perl_minor=	${want_perl_ver:S|^${want_perl_major}||:S|^.||:C|\..*||}
 _want_perl_patch=	${want_perl_ver:S|^${want_perl_major}||:S|^.${_want_perl_minor}||:S|^.||:C|\..*||}
 want_perl_minor=	${_want_perl_minor:S|^|000|:C|.*(...)|\1|}
 want_perl_patch=	${_want_perl_patch:S|^|00|:C|.*(..)|\1|}
 USE_PERL5_LEVEL=	${want_perl_major}${want_perl_minor}${want_perl_patch}
 .endif
 
 # All but version
 _USE_PERL5=	${USE_PERL5:N5*}
 
 # Mask unspecified components. E.g. this way "5" will match any "5.x.x".
 .if empty(_want_perl_minor)
 masked_PERL_LEVEL=	${PERL_LEVEL:C|(.....)$|00000|}
 .elif empty(_want_perl_patch)
 masked_PERL_LEVEL=	${PERL_LEVEL:C|(..)$|00|}
 .else
 masked_PERL_LEVEL=	${PERL_LEVEL}
 .endif
 
 .if defined(want_perl_sign)
 .if ${want_perl_sign} == "+"
 .if ${USE_PERL5_LEVEL} > ${masked_PERL_LEVEL}
 USE_PERL5_REASON?=	requires Perl ${want_perl_ver} or later, install lang/perl${want_perl_major}.${want_perl_minor:C|^0||} and try again
 IGNORE=	${USE_PERL5_REASON}
 .endif # ${USE_PERL5_LEVEL} > ${masked_PERL_LEVEL}
 .elif ${want_perl_sign} == ""
 .if ${USE_PERL5_LEVEL} != ${masked_PERL_LEVEL}
 USE_PERL5_REASON?=	requires Perl ${want_perl_ver} exactly
 IGNORE=	${USE_PERL5_REASON}
 .endif # ${USE_PERL5_LEVEL} != ${masked_PERL_LEVEL}
 .elif ${want_perl_sign} == "-"
 .if ${USE_PERL5_LEVEL} <= ${masked_PERL_LEVEL}
 USE_PERL5_REASON?=	requires a Perl version earlier than ${want_perl_ver}
 IGNORE=	${USE_PERL5_REASON}
 .endif # ${USE_PERL5_LEVEL} <= ${masked_PERL_LEVEL}
 .else # wrong suffix
 IGNORE=	improper use of USE_PERL5
 .endif
 .endif
 
 _USES_POST+=	perl5
 .endif
 
 .if defined(_POSTMKINCLUDED) && !defined(_INCLUDE_USES_PERL5_POST_MK)
 _INCLUDE_USES_PERL5_POST_MK=	yes
 
 PLIST_SUB+=	PERL_VERSION=${PERL_VERSION} \
 		PERL_VER=${PERL_VER} \
 		PERL5_MAN3=${SITE_MAN3_REL} \
 		SITE_PERL=${SITE_PERL_REL} \
 		SITE_ARCH=${SITE_ARCH_REL}
 
 # handle perl5 specific manpages
 .for sect in 3
 .if defined(P5MAN${sect})
 _MANPAGES+=	${P5MAN${sect}:S%^%${PREFIX}/lib/perl5/${PERL_VER}/man/man${sect}/%}
 .endif
 .endfor
 MANDIRS+=	${PREFIX}/${SITE_PERL_REL}/man
 
 .if ${_USE_PERL5:Mmodbuild} || ${_USE_PERL5:Mmodbuildtiny}
 _USE_PERL5+=	configure
 ALL_TARGET?=	# empty
 CONFIGURE_ARGS+=--install_path lib="${PREFIX}/${SITE_PERL_REL}" \
 		--install_path arch="${PREFIX}/${SITE_ARCH_REL}" \
 		--install_path script="${PREFIX}/bin" \
 		--install_path bin="${PREFIX}/bin" \
 		--install_path libdoc="${MAN3PREFIX}/man/man3" \
 		--install_path bindoc="${MAN1PREFIX}/man/man1"
 CONFIGURE_SCRIPT?=	Build.PL
 PL_BUILD?=	Build
 CONFIGURE_ARGS+=--destdir ${STAGEDIR}
 DESTDIRNAME=	--destdir
 .if ${_USE_PERL5:Mmodbuild}
 .if ${PORTNAME} != Module-Build
 BUILD_DEPENDS+=	p5-Module-Build>=0.4206:${PORTSDIR}/devel/p5-Module-Build
 .endif
 CONFIGURE_ARGS+=--create_packlist 1
 .endif
 .if ${_USE_PERL5:Mmodbuildtiny}
 .if ${PORTNAME} != Module-Build-Tiny
 BUILD_DEPENDS+=	p5-Module-Build-Tiny>=0.039:${PORTSDIR}/devel/p5-Module-Build-Tiny
 .endif
 CONFIGURE_ARGS+=--create_packlist 1
 .endif
 .elif ${_USE_PERL5:Mconfigure}
 CONFIGURE_ARGS+=INSTALLDIRS="site"
 .endif # modbuild
 
 .if ${_USE_PERL5:Mconfigure}
 _USE_PERL5+=	build run
 # Disable AutoInstall from attempting to install from CPAN directly in
 # the case of missing dependencies.  This causes the build to loop on
 # the build cluster asking for interactive input.
 CONFIGURE_ENV+= PERL_EXTUTILS_AUTOINSTALL="--skipdeps"
 .if defined(BATCH) && !defined(IS_INTERACTIVE)
 CONFIGURE_ENV+=	PERL_MM_USE_DEFAULT="YES"
 .endif # defined(BATCH) && !defined(IS_INTERACTIVE)
 .endif # configure
 
 .if ${_USE_PERL5:Mextract}
 EXTRACT_DEPENDS+=	${PERL5}:${PORTSDIR}/lang/${PERL_PORT}
 .endif
 
 .if ${_USE_PERL5:Mpatch}
 PATCH_DEPENDS+=		${PERL5}:${PORTSDIR}/lang/${PERL_PORT}
 .endif
 
 .if ${_USE_PERL5:Mbuild}
 BUILD_DEPENDS+=		${PERL5}:${PORTSDIR}/lang/${PERL_PORT}
 .endif
 
 .if ${_USE_PERL5:Mrun}
 RUN_DEPENDS+=		${PERL5}:${PORTSDIR}/lang/${PERL_PORT}
 .endif
 
 .if ${_USE_PERL5:Mconfigure}
 CONFIGURE_ARGS+=	CC="${CC}" CCFLAGS="${CFLAGS}" PREFIX="${PREFIX}" \
 			INSTALLPRIVLIB="${PREFIX}/lib" INSTALLARCHLIB="${PREFIX}/lib"
 CONFIGURE_SCRIPT?=	Makefile.PL
 MAN3PREFIX?=		${PREFIX}/${SITE_PERL_REL}
 .undef HAS_CONFIGURE
 
 .if !target(do-configure)
 do-configure:
 	@if [ -f ${SCRIPTDIR}/configure ]; then \
 		cd ${.CURDIR} && ${SETENV} ${SCRIPTS_ENV} ${SH} \
 		${SCRIPTDIR}/configure; \
 	fi
 	@cd ${CONFIGURE_WRKSRC} && \
 		${SETENV} ${CONFIGURE_ENV} \
 		${PERL5} ./${CONFIGURE_SCRIPT} ${CONFIGURE_ARGS}
 .if !${_USE_PERL5:Mmodbuild*}
 	@cd ${CONFIGURE_WRKSRC} && \
 		${PERL5} -pi -e 's/ doc_(perl|site|\$$\(INSTALLDIRS\))_install$$//' Makefile
 .endif # ! modbuild
 .endif # !target(do-configure)
 .endif # configure
 
 .if ${_USE_PERL5:Mmodbuild*}
 .if !target(do-build)
 do-build:
 	@(cd ${BUILD_WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} ${PL_BUILD} ${ALL_TARGET} ${MAKE_ARGS})
 .endif # !target(do-build)
 
 .if !${USES:Mgmake}
 .if !target(do-install)
 do-install:
 	@(cd ${BUILD_WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} ${PL_BUILD} ${INSTALL_TARGET} ${MAKE_ARGS})
 .endif # !target(do-install)
 .endif # ! USES=gmake
 .endif # modbuild
 
 PACKLIST_DIR?=	${PREFIX}/${SITE_ARCH_REL}/auto
 
 # In all those, don't use - before the command so that the user does
 # not wonder what has been ignored by this message "*** Error code 1 (ignored)"
 fix-perl-things:
 # Remove STAGEDIR from .packlist and add the file to the plist.
 	@(if [ -d ${STAGEDIR}${PACKLIST_DIR} ] ; then \
 		${FIND} ${STAGEDIR}${PACKLIST_DIR} -name .packlist | while read f ; do \
 			${SED} -i '' 's|^${STAGEDIR}||' "$$f"; \
 			${ECHO} $$f | ${SED} -e 's|^${STAGEDIR}||' >> ${TMPPLIST}; \
 		done \
 	fi) || :
 
 # Starting with perl 5.20, the empty bootstrap files are not installed any more
 # by ExtUtils::MakeMaker.  As we don't need them anyway, remove them.
 # Module::Build continues to install them, so remove the files unconditionally.
 	@${FIND} ${STAGEDIR} -name '*.bs' -size 0 -delete || :
 
 # Some ports use their own way of building perl modules and generate
 # perllocal.pod, remove it here so that those ports don't include it
 # by mistake in their plists.  It is sometime compressed, so use a
 # shell glob for the removal.  Also, remove the directories that
 # contain it to not leave orphans directories around.
 	@${RM} -f ${STAGEDIR}${PREFIX}/lib/perl5/${PERL_VER}/${PERL_ARCH}/perllocal.pod* || :
 	@${RMDIR} -p ${STAGEDIR}${PREFIX}/lib/perl5/${PERL_VER}/${PERL_ARCH} 2>/dev/null || :
 
 .if !target(regression-test)
 TEST_ARGS+=	${MAKE_ARGS}
 TEST_ENV+=	${MAKE_ENV}
 TEST_TARGET?=	test
 TEST_WRKSRC?=	${BUILD_WRKSRC}
 .if !target(test)
 test: regression-test
 .endif # test
 regression-test: build
 .if ${USE_PERL5:Mmodbuild*}
 	-cd ${TEST_WRKSRC}/ && ${SETENV} ${TEST_ENV} ${PERL5} ${PL_BUILD} ${TEST_TARGET} ${TEST_ARGS}
 .elif ${USE_PERL5:Mconfigure}
 	-cd ${TEST_WRKSRC}/ && ${SETENV} ${TEST_ENV} ${MAKE_CMD} ${TEST_ARGS} ${TEST_TARGET}
 .endif # USE_PERL5:Mmodbuild*
 .endif # regression-test
 .endif # defined(_POSTMKINCLUDED)
Index: head/lang/perl5-devel/Makefile
===================================================================
--- head/lang/perl5-devel/Makefile	(revision 387464)
+++ head/lang/perl5-devel/Makefile	(revision 387465)
@@ -1,259 +1,266 @@
 # Created by: mat
 # $FreeBSD$
 
 PORTNAME=	perl
 #PORTVERSION=	${PERL_VERSION} # XXX
 DISTVERSION=	${GH_TAGNAME:C/^v//:C/-g[0-9a-f]*$//}
 PORTREVISION=	1
 CATEGORIES=	lang devel perl5
 # XXX
 MASTER_SITES=	LOCAL/mat/perl GH CPAN/../../src/5.0
 # XXX Use this naming so that portscout works a bit
 DISTNAME=	${PORTNAME}-${DISTVERSION}
 DIST_SUBDIR=	perl
 
 # XXX
 MAINTAINER=	mat@FreeBSD.org
 COMMENT=	Practical Extraction and Report Language
 
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 LICENSE_FILE_ART10=	${WRKSRC}/Artistic
 LICENSE_FILE_GPLv1=	${WRKSRC}/Copying
 
 CONFLICTS_INSTALL=	perl5.*-*
 
 # XXX
 USE_GITHUB=	yes
 GH_ACCOUNT=	Perl
 GH_PROJECT=	perl5
-GH_TAGNAME=	v5.22.0-RC1
+GH_TAGNAME=	v5.22.0-RC2-1-gdfd03a6
 
 OPTIONS_DEFINE=	DEBUG GDBM PERL_64BITINT PTHREAD \
 		MULTIPLICITY SITECUSTOMIZE
 # it seems perl malloc has problems with threaded perl on FreeBSD
 OPTIONS_RADIO=	EXCLUSIVE
 OPTIONS_RADIO_EXCLUSIVE=	THREADS PERL_MALLOC
 OPTIONS_DEFAULT=	PERL_64BITINT THREADS PTHREAD MULTIPLICITY
 
 EXCLUSIVE_DESC=	Exclusive OPTIONS
 GDBM_DESC=	GDBM_File extension
 PERL_MALLOC_DESC=	Use Perl malloc
 PERL_64BITINT_DESC=	Use 64 bit integers (on i386)
 THREADS_DESC=		Build threaded perl
 PTHREAD_DESC=		Build with -lpthread
 MULTIPLICITY_DESC=	Use multiplicity
 SITECUSTOMIZE_DESC=	Run-time customization of @INC
 
 OPTIONS_SUB=		yes
 DEBUG_CONFIGURE_ON=	-Doptimize="-g" -DDEBUGGING
 DEBUG_CONFIGURE_OFF=	-Doptimize="${CFLAGS}"
 GDBM_CONFIGURE_ON=	-Di_gdbm
 GDBM_CONFIGURE_OFF=	-Ui_gdbm
 GDBM_LIB_DEPENDS=	libgdbm.so:${PORTSDIR}/databases/gdbm
 PERL_64BITINT_CONFIGURE_ON=	-Duse64bitint
 MULTIPLICITY_CONFIGURE_ON=	-Dusemultiplicity=y
 MULTIPLICITY_CONFIGURE_OFF=	-Dusemultiplicity=n
 SITECUSTOMIZE_CONFIGURE_ON=	-Dusesitecustomize
 THREADS_CONFIGURE_ON=	-Dusethreads=y
 THREADS_CONFIGURE_OFF=	-Dusethreads=n
 PERL_MALLOC_CONFIGURE_ON=	-Dusemymalloc=y
 PERL_MALLOC_CONFIGURE_OFF=	-Dusemymalloc=n
 
 # XXX
 # For the "release" Perl ports, this should be:
 #PORTSCOUT=	limit:^${PERL_VER}.
 
 # Remember to update Mk/Uses/perl5.mk too.
 PERL_VERSION=	5.22.0
 PERL_VER=	${PERL_VERSION:C/\.[0-9]+$//}
 PERL_ARCH=	mach
 SITE_PERL_REL?=	lib/perl5/site_perl
 SITE_PERL?=	${PREFIX}/${SITE_PERL_REL}
 SITE_ARCH_REL?=	${SITE_PERL_REL}/${PERL_ARCH}/${PERL_VER}
 SITE_ARCH?=	${PREFIX}/${SITE_ARCH_REL}
 SITE_MAN3_PREFIX=	${SITE_PERL_REL}
 SITE_MAN3_REL?=	${SITE_MAN3_PREFIX}/man/man3
 SITE_MAN3?=	${PREFIX}/${SITE_MAN3_REL}
 
 _PRIV_LIB=	lib/perl5/${PERL_VER}
 _ARCH_LIB=	${_PRIV_LIB}/${PERL_ARCH}
 
 # XXX releases use tar:bzip2 tar:xz
 USES=	cpe
 
 HAS_CONFIGURE=	yes
 CONFIGURE_SCRIPT=Configure
 CONFIGURE_ARGS=	-sde -Dprefix=${PREFIX} \
 	-Dlibperl=libperl.so.${PERL_VERSION} \
 	-Darchlib=${PREFIX}/${_ARCH_LIB} \
 	-Dprivlib=${PREFIX}/${_PRIV_LIB} \
 	-Dman3dir=${PREFIX}/${MAN3PREFIX_REL}/man/man3 \
 	-Dman1dir=${PREFIX}/man/man1 \
 	-Dsitearch=${SITE_ARCH} \
 	-Dsitelib=${SITE_PERL} -Dscriptdir=${PREFIX}/bin \
 	-Dsiteman3dir=${SITE_MAN3} \
 	-Dsiteman1dir=${PREFIX}/man/man1 \
 	-Ui_malloc -Ui_iconv -Uinstallusrbinperl -Dusenm=n \
 	-Dcc="${CC}" -Duseshrplib -Dinc_version_list=none \
 	-Dcf_by=${MAINTAINER:C,@.*,,} -Dcf_email=${MAINTAINER} \
 	-Dcf_time="`env LANG=C ${STAT} -t \"%a %b %d %T %Z %Y\" -f %Sm ${_DISTDIR}/${DISTNAME}${EXTRACT_SUFX}`"
 # Keep the following two in sync.
 # lddlflags is used for all .so linking
 # shrpldflags is used for libperl.so, so remove all the extra bits inherited from lddlflags.
 CONFIGURE_ARGS+= \
 	-Alddlflags='-L${WRKSRC} -L${PREFIX}/${_ARCH_LIB}/CORE -Wl,-rpath=${PREFIX}/${_ARCH_LIB}/CORE -lperl' \
 	-Dshrpldflags='$$(LDDLFLAGS:N-L${WRKSRC}:N-L${PREFIX}/${_ARCH_LIB}/CORE:N-Wl,-rpath=${PREFIX}/${_ARCH_LIB}/CORE:N-lperl) -Wl,-soname,$$(LIBPERL:R)'
 
 # XXX
 CONFIGURE_ARGS+=	-Dusedevel -Uversiononly
 
 LOCALE_CLEANUP=	LANG="" LC_ALL="" LC_COLLATE="" LC_CTYPE="" \
 		LC_MESSAGES="" LC_MONETARY="" LC_NUMERIC="" \
 		LC_TIME=""
 CONFIGURE_ENV+=	${LOCALE_CLEANUP} UNAME_v="$$(uname -v | sed 'y/=/ /')"
 MAKE_ENV+=	${LOCALE_CLEANUP}
 
 SUB_LIST+=	PERL_VERSION=${PERL_VERSION} \
 		PERL_VER=${PERL_VER} \
 		SITE_PERL=${SITE_PERL_REL} \
 		PRIV_LIB=${_PRIV_LIB} \
 		MAN3PREFIX=${MAN3PREFIX_REL} \
 		SITEMAN3PREFIX=${SITE_MAN3_PREFIX} \
 		PERL_ARCH=${PERL_ARCH}
 
 SUB_FILES=	perl5_version
 
 INSTALL_TARGET=	install-strip
 
 .if defined(PERL_VENDOR_PREFIX)
 CONFIGURE_ARGS+=	\
 	-Dvendorprefix=${PERL_VENDOR_PREFIX} \
 	-Dvendorarch=${PERL_VENDOR_PREFIX}/${_ARCH_LIB} \
 	-Dvendorbin=${PERL_VENDOR_PREFIX}/bin \
 	-Dvendorlib=${PERL_VENDOR_PREFIX}/${_PRIV_LIB} \
 	-Dvendorman3dir=${PERL_VENDOR_PREFIX}/${_PRIV_LIB}/man/man3 \
 	-Dvendorman1dir=${PERL_VENDOR_PREFIX}/man/man1
 .endif
 
 # http://perl5.git.perl.org/perl.git/commit/b83080de5c4254
 # PERLIOBUF_DEFAULT_BUFSIZ size in bytes (default: 8192 bytes)
 .if defined(PERLIOBUF_DEFAULT_BUFSIZ)
 CONFIGURE_ARGS+=	\
     -Accflags=-DPERLIOBUF_DEFAULT_BUFSIZ=${PERLIOBUF_DEFAULT_BUFSIZ}
 .endif
 
 MAN3PREFIX_REL=	${_PRIV_LIB}/perl
 MAN3PREFIX=	${PREFIX}/${MAN3PREFIX_REL}
 MANDIRS+=	${MAN3PREFIX}/man
 
 PLIST_SUB+=	PERL_VERSION=${PERL_VERSION} \
 		PERL_VER=${PERL_VER} \
 		PERL_ARCH=${PERL_ARCH} \
 		MAN3=${MAN3PREFIX_REL}/man/man3 \
 		MAN3PREFIX=${MAN3PREFIX_REL} \
 		SITEMAN3PREFIX=${SITE_MAN3_PREFIX} \
 		SITE_PERL=${SITE_PERL_REL} \
 		SITE_ARCH=${SITE_ARCH_REL} \
 		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
 # change PKGNAME to reflect this
-.if ${PERL_VER} == ${PERL5_DEFAULT}
-PKGNAMESUFFIX=	${PERL_VERSION:C/\.[0-9]+\.[0-9]+$//}
+.if ${PERL_VER} == ${PERL5_DEFAULT} || ${PERL5_DEFAULT} == devel # XXX
+PKGNAMESUFFIX=	5
 .else
 # make PKGNAME unique among other lang/perl5.x
+.if defined(GH_TAGNAME) # XXX
+PKGNAMESUFFIX=	5-devel
+.else
 PKGNAMESUFFIX=	${PERL_VER}
+.endif
 # always add default perl5 pkgname to conflicts
 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
 
 .if ${PORT_OPTIONS:MDEBUG}
 STRIP=
 STRIP_CMD=	${TRUE}
 .endif
 
 # XXX
 # No need to spam logs, or make me wait
 .if !defined(PACKAGE_BUILDING) && !defined(PERL_DEV_SHUT_UP)
 pre-everything::
 	@${ECHO_MSG} "########################################"
 	@${ECHO_MSG} ""
 	@${ECHO_MSG} "This is a DEVELOPER only version of Perl"
 	@${ECHO_MSG} ""
 	@${ECHO_MSG} "             DO NOT USE IT"
 	@${ECHO_MSG} ""
 	@${ECHO_MSG} ""
 	@${ECHO_MSG} " Things ARE going to be broken with it"
 	@${ECHO_MSG} "       and it WILL eat your data"
 	@${ECHO_MSG} ""
 	@${ECHO_MSG} "         You have been warned !"
 	@${ECHO_MSG} ""
 	@${ECHO_MSG} "########################################"
 	@sleep 30
 .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
 	${LN} -s libperl.so.${PERL_VERSION} ${WRKSRC}/libperl.so.${PERL_VER}
 
 post-patch:
 	${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g' \
 		${WRKSRC}/Configure ${WRKSRC}/hints/freebsd.sh
 .if ${PORT_OPTIONS:MPTHREAD}
 	${REINPLACE_CMD} -e 's|%%PTHREAD_LIBS%%|-lpthread|g;' \
 		${WRKSRC}/hints/freebsd.sh
 .else
 	${REINPLACE_CMD} -e 's|%%PTHREAD_LIBS%%||g;' \
 		${WRKSRC}/hints/freebsd.sh
 .endif
 
 post-install:
 	${MKDIR} ${STAGEDIR}${SITE_MAN3}
 	${MKDIR} ${STAGEDIR}${SITE_ARCH}/auto
 	${MKDIR} ${STAGEDIR}${SITE_PERL}/auto
 	${LN} ${STAGEDIR}${PREFIX}/bin/perl${PERL_VERSION} ${STAGEDIR}${PREFIX}/bin/perl5
 	${LN} -sf libperl.so.${PERL_VERSION} ${STAGEDIR}${PREFIX}/${_ARCH_LIB}/CORE/libperl.so
 	${LN} -sf libperl.so.${PERL_VERSION} ${STAGEDIR}${PREFIX}/${_ARCH_LIB}/CORE/libperl.so.${PERL_VER}
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/perl${PERL_VERSION}
+	# XXX Force PERL_PORT in case the devel has the same version as the
+	# latest release
+	${ECHO_CMD} "PERL_PORT=	perl5-devel" >> ${WRKDIR}/perl5_version
 	${INSTALL_DATA} ${WRKDIR}/perl5_version ${STAGEDIR}${PREFIX}/etc
 	${MKDIR} ${STAGEDIR}${SITE_ARCH}/machine
 	${MKDIR} ${STAGEDIR}${SITE_ARCH}/sys
 	# h2ph needs perl, but perl is not installed, it's only
 	# staged, so, use the one in WRKDIR 
 	(cd /usr/include && ${SETENV} LD_LIBRARY_PATH=${WRKSRC} \
 		${WRKSRC}/perl -I ${WRKSRC}/lib ${STAGEDIR}${PREFIX}/bin/h2ph \
 		-d ${STAGEDIR}${SITE_ARCH} *.h machine/*.h sys/*.h >/dev/null)
 	@${FIND} ${STAGEDIR}${SITE_ARCH} -name '*.ph' | sed -e 's|${STAGEDIR}||' >> ${TMPPLIST}
 	${FIND} ${STAGEDIR} -name '*.so*' -type f | while read f; \
 		do \
 			${CHMOD} 644 $$f; \
 			${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>
Index: head/lang/perl5-devel/distinfo
===================================================================
--- head/lang/perl5-devel/distinfo	(revision 387464)
+++ head/lang/perl5-devel/distinfo	(revision 387465)
@@ -1,2 +1,2 @@
-SHA256 (perl/perl-5.22.0-RC1_GH0.tar.gz) = 318cc6616bd740c703ebd43e17da6c6cf1cbdb3701d2efb832d37d1e908ce517
-SIZE (perl/perl-5.22.0-RC1_GH0.tar.gz) = 17441498
+SHA256 (perl/perl-5.22.0-RC2-1_GH0.tar.gz) = 0570ad3a5f5e53cc309210eceb4d9719ef2f0fd4800e958ce5166bfc63e7a028
+SIZE (perl/perl-5.22.0-RC2-1_GH0.tar.gz) = 17416825