Index: Mk/Uses/perl5.mk
===================================================================
--- Mk/Uses/perl5.mk
+++ Mk/Uses/perl5.mk
@@ -1,4 +1,5 @@
 # $FreeBSD$
+# ex:ts=4
 #
 # Provide support to use perl5
 #
@@ -23,6 +24,8 @@
 #				  (value: perl5.14)
 # SITE_PERL		- Directory name where site specific perl packages go.
 #				  This value is added to PLIST_SUB.
+# ARCH_PERL		- 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.  The fixpacklist is
 #				  needed in some cases, when a .packlist is created, it may
@@ -94,8 +97,12 @@
 PERL_PORT?=	perl5.14
 .endif
 
-SITE_PERL_REL?=	lib/perl5/site_perl/${PERL_VER}
+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
@@ -155,8 +162,9 @@
 PLIST_SUB+=	PERL_VERSION=${PERL_VERSION} \
 			PERL_VER=${PERL_VER} \
 			PERL_ARCH=${PERL_ARCH} \
-			PERL5_MAN3=lib/perl5/${PERL_VER}/man/man3 \
-			SITE_PERL=${SITE_PERL_REL}
+			PERL5_MAN3=${SITE_MAN3_REL} \
+			SITE_PERL=${SITE_PERL_REL} \
+			SITE_ARCH=${SITE_ARCH_REL}
 
 # handle perl5 specific manpages
 .for sect in 3
@@ -170,7 +178,7 @@
 _USE_PERL5+=	configure
 ALL_TARGET?=	# empty
 CONFIGURE_ARGS+=--install_path lib="${PREFIX}/${SITE_PERL_REL}" \
-				--install_path arch="${PREFIX}/${SITE_PERL_REL}/${PERL_ARCH}" \
+				--install_path arch="${PREFIX}/${SITE_ARCH_REL}" \
 				--install_path script="${PREFIX}/bin" \
 				--install_path bin="${PREFIX}/bin" \
 				--install_path libdoc="${MAN3PREFIX}/man/man3" \
@@ -226,7 +234,7 @@
 CONFIGURE_ARGS+=	CC="${CC}" CCFLAGS="${CFLAGS}" PREFIX="${PREFIX}" \
 			INSTALLPRIVLIB="${PREFIX}/lib" INSTALLARCHLIB="${PREFIX}/lib"
 CONFIGURE_SCRIPT?=	Makefile.PL
-MAN3PREFIX?=		${PREFIX}/lib/perl5/${PERL_VER}
+MAN3PREFIX?=		${PREFIX}/${SITE_PERL_REL}
 .undef HAS_CONFIGURE
 
 .if !target(do-configure)
@@ -261,7 +269,7 @@
 
 .if ${USE_PERL5:Mconfigure} || ${USE_PERL5:Mmodbuildtiny} || ${USE_PERL5:Mfixpacklist}
 fix-packlist::
-	@if [ -d ${STAGEDIR}${PREFIX}/${SITE_PERL_REL}/${PERL_ARCH}/auto ] ; then ${FIND} ${STAGEDIR}${PREFIX}/${SITE_PERL_REL}/${PERL_ARCH}/auto -name .packlist -exec ${SED} -i '' 's|^${STAGEDIR}||' '{}' \; ; fi
+	@if [ -d ${STAGEDIR}${PREFIX}/${SITE_ARCH_REL}/auto ] ; then ${FIND} ${STAGEDIR}${PREFIX}/${SITE_ARCH_REL}/auto -name .packlist -exec ${SED} -i '' 's|^${STAGEDIR}||' '{}' \; ; fi
 .endif
 
 # Starting with perl 5.20, the empty bootstrap files are not installed any more
Index: Mk/bsd.default-versions.mk
===================================================================
--- Mk/bsd.default-versions.mk
+++ Mk/bsd.default-versions.mk
@@ -23,7 +23,7 @@
 GCC_DEFAULT?=		4.8
 LUA_DEFAULT?=		5.2
 MYSQL_DEFAULT?=		5.5
-PERL5_DEFAULT?=		5.16
+PERL5_DEFAULT?=		5.18
 PGSQL_DEFAULT?=		9.2
 PHP_DEFAULT?=		5.4
 PYTHON_DEFAULT?=	2.7
Index: lang/perl5.18/Makefile
===================================================================
--- lang/perl5.18/Makefile
+++ lang/perl5.18/Makefile
@@ -62,8 +62,12 @@
 PERL_VERSION=	5.18.4
 PERL_VER=	${PERL_VERSION:C/\.[0-9]+$//}
 PERL_ARCH=	mach
-SITE_PERL_REL?=	lib/perl5/site_perl/${PERL_VER}
+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_REL?=	${SITE_PERL_REL}/man/man3
+SITE_MAN3?=	${PREFIX}/${SITE_MAN3_REL}
 
 USES=	tar:bzip2 cpe
 HAS_CONFIGURE=	yes
@@ -71,11 +75,11 @@
 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 \
+	-Dman3dir=${PREFIX}/lib/perl5/${PERL_VER}/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 \
+	-Dsitearch=${SITE_ARCH} \
+	-Dsitelib=${SITE_PERL} -Dscriptdir=${PREFIX}/bin \
+	-Dsiteman3dir=${SITE_MAN3} \
 	-Dsiteman1dir=${PREFIX}/man/man1 \
 	-Ui_malloc -Ui_iconv -Uinstallusrbinperl \
 	-Dcc="${CC}" -Duseshrplib -Dinc_version_list=none \
@@ -126,14 +130,17 @@
     -Accflags=-DPERLIOBUF_DEFAULT_BUFSIZ=${PERLIOBUF_DEFAULT_BUFSIZ}
 .endif
 
-MAN3PREFIX=	${PREFIX}/lib/perl5/${PERL_VER}/perl
+MAN3PREFIX_REL=	lib/perl5/${PERL_VER}/perl
+MAN3PREFIX=	${PREFIX}/${MAN3PREFIX_REL}
 MANDIRS+=	${MAN3PREFIX}
 
 PLIST_SUB+=	PERL_VERSION=${PERL_VERSION} \
 		PERL_VER=${PERL_VER} \
 		PERL_ARCH=${PERL_ARCH} \
-		MAN3=${MAN3PREFIX:S|^${PREFIX}/||}/man/man3 \
-		SITE_PERL=${SITE_PERL:S|^${PREFIX}/||}
+		MAN3=${MAN3PREFIX_REL}/man/man3 \
+		SITE_PERL=${SITE_PERL_REL} \
+		SITE_ARCH=${SITE_ARCH_REL} \
+		PERL5_MAN3=${SITE_MAN3_REL}
 
 .if ${PORT_OPTIONS:MDEBUG}
 STRIP=
@@ -182,10 +189,10 @@
 .endif
 
 post-install:
-	${MKDIR} ${STAGEDIR}${PREFIX}/lib/perl5/${PERL_VER}/man/man3
-	${MKDIR} ${STAGEDIR}${SITE_PERL}/${PERL_ARCH}/auto
-	${MKDIR} ${STAGEDIR}${SITE_PERL}/${PERL_ARCH}/machine
-	${MKDIR} ${STAGEDIR}${SITE_PERL}/${PERL_ARCH}/sys
+	${MKDIR} ${STAGEDIR}${SITE_MAN3}
+	${MKDIR} ${STAGEDIR}${SITE_ARCH}/auto
+	${MKDIR} ${STAGEDIR}${SITE_ARCH}/machine
+	${MKDIR} ${STAGEDIR}${SITE_ARCH}/sys
 	${MKDIR} ${STAGEDIR}${SITE_PERL}/auto
 	${LN} ${STAGEDIR}${PREFIX}/bin/perl${PERL_VERSION} ${STAGEDIR}${PREFIX}/bin/perl5
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/perl${PERL_VERSION}