Change the way Perl modules are installed, update the default Perl to 5.18.

Before, we had:

  site_perl :           lib/perl5/site_perl/5.18
  site_perl/perl_arch : lib/perl5/site_perl/5.18/mach
  perl_man3 :           lib/perl5/5.18/man/man3

Now we have:

  site_perl : lib/perl5/site_perl
  site_arch : lib/perl5/site_perl/mach/5.18
  perl_man3 : lib/perl5/site_perl/man/man3

Modules without any .so will be installed at the same place regardless of the
Perl version, minimizing the upgrade when the major Perl version is changed.
It uses a version dependent directory for modules with compiled bits.

As PERL_ARCH is no longer needed in plists, it has been removed from
PLIST_SUB.

The USE_PERL5=fixpacklist keyword is removed, the .packlist file is now
always removed, as is perllocal.pod.

The old site_perl and site_perl/arch directories have been kept in the
default Perl @INC for all Perl ports, and will be phased out as these old
Perl versions expire.

PR:		194969
Differential Revision:	https://reviews.freebsd.org/D1019
Exp-run by:	antoine
Reviewed by:	perl@
Approved by:	portmgr

2 files changed, 46 insertions, 51 deletions

diff --git a/textproc/p5-XML-LibXML/Makefile b/textproc/p5-XML-LibXML/Makefile
index 0a7de0d67888..21c1d2ad51d5 100644
--- a/textproc/p5-XML-LibXML/Makefile
+++ b/textproc/p5-XML-LibXML/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	XML-LibXML
 PORTVERSION=	2.0116
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
@@ -30,6 +31,6 @@ PKGDEINSTALL=	${PKGINSTALL}
 CONFLICTS=	p5-XML-LibXML-XPathContext-[0-9]* p5-XML-LibXML-Common-[0-9]*
 
 post-stage:
-	${STRIP_CMD} ${STAGEDIR}${SITE_PERL}/${PERL_ARCH}/auto/XML/LibXML/LibXML.so
+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/${SITE_ARCH_REL}/auto/XML/LibXML/LibXML.so
 
 .include <bsd.port.mk>
diff --git a/textproc/p5-XML-LibXML/pkg-plist b/textproc/p5-XML-LibXML/pkg-plist
index dcc9ce0c3a1a..c8da582df481 100644
--- a/textproc/p5-XML-LibXML/pkg-plist
+++ b/textproc/p5-XML-LibXML/pkg-plist
@@ -1,48 +1,47 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/XML/LibXML.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/XML/LibXML.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/XML/LibXML/Attr.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/XML/LibXML/AttributeHash.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/XML/LibXML/Boolean.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/XML/LibXML/CDATASection.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/XML/LibXML/Comment.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/XML/LibXML/Common.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/XML/LibXML/Common.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/XML/LibXML/DOM.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/XML/LibXML/Devel.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/XML/LibXML/Document.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/XML/LibXML/DocumentFragment.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/XML/LibXML/Dtd.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/XML/LibXML/Element.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/XML/LibXML/ErrNo.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/XML/LibXML/ErrNo.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/XML/LibXML/Error.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/XML/LibXML/Error.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/XML/LibXML/InputCallback.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/XML/LibXML/Literal.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/XML/LibXML/Namespace.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/XML/LibXML/Node.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/XML/LibXML/NodeList.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/XML/LibXML/Number.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/XML/LibXML/PI.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/XML/LibXML/Parser.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/XML/LibXML/Pattern.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/XML/LibXML/Reader.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/XML/LibXML/Reader.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/XML/LibXML/RegExp.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/XML/LibXML/RelaxNG.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/XML/LibXML/SAX.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/XML/LibXML/SAX.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/XML/LibXML/SAX/Builder.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/XML/LibXML/SAX/Builder.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/XML/LibXML/SAX/Generator.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/XML/LibXML/SAX/Parser.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/XML/LibXML/Schema.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/XML/LibXML/Text.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/XML/LibXML/XPathContext.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/XML/LibXML/XPathContext.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/XML/LibXML/XPathExpression.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/LibXML/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/LibXML/LibXML.so
+%%SITE_ARCH%%/XML/LibXML.pm
+%%SITE_ARCH%%/XML/LibXML.pod
+%%SITE_ARCH%%/XML/LibXML/Attr.pod
+%%SITE_ARCH%%/XML/LibXML/AttributeHash.pm
+%%SITE_ARCH%%/XML/LibXML/Boolean.pm
+%%SITE_ARCH%%/XML/LibXML/CDATASection.pod
+%%SITE_ARCH%%/XML/LibXML/Comment.pod
+%%SITE_ARCH%%/XML/LibXML/Common.pm
+%%SITE_ARCH%%/XML/LibXML/Common.pod
+%%SITE_ARCH%%/XML/LibXML/DOM.pod
+%%SITE_ARCH%%/XML/LibXML/Devel.pm
+%%SITE_ARCH%%/XML/LibXML/Document.pod
+%%SITE_ARCH%%/XML/LibXML/DocumentFragment.pod
+%%SITE_ARCH%%/XML/LibXML/Dtd.pod
+%%SITE_ARCH%%/XML/LibXML/Element.pod
+%%SITE_ARCH%%/XML/LibXML/ErrNo.pm
+%%SITE_ARCH%%/XML/LibXML/ErrNo.pod
+%%SITE_ARCH%%/XML/LibXML/Error.pm
+%%SITE_ARCH%%/XML/LibXML/Error.pod
+%%SITE_ARCH%%/XML/LibXML/InputCallback.pod
+%%SITE_ARCH%%/XML/LibXML/Literal.pm
+%%SITE_ARCH%%/XML/LibXML/Namespace.pod
+%%SITE_ARCH%%/XML/LibXML/Node.pod
+%%SITE_ARCH%%/XML/LibXML/NodeList.pm
+%%SITE_ARCH%%/XML/LibXML/Number.pm
+%%SITE_ARCH%%/XML/LibXML/PI.pod
+%%SITE_ARCH%%/XML/LibXML/Parser.pod
+%%SITE_ARCH%%/XML/LibXML/Pattern.pod
+%%SITE_ARCH%%/XML/LibXML/Reader.pm
+%%SITE_ARCH%%/XML/LibXML/Reader.pod
+%%SITE_ARCH%%/XML/LibXML/RegExp.pod
+%%SITE_ARCH%%/XML/LibXML/RelaxNG.pod
+%%SITE_ARCH%%/XML/LibXML/SAX.pm
+%%SITE_ARCH%%/XML/LibXML/SAX.pod
+%%SITE_ARCH%%/XML/LibXML/SAX/Builder.pm
+%%SITE_ARCH%%/XML/LibXML/SAX/Builder.pod
+%%SITE_ARCH%%/XML/LibXML/SAX/Generator.pm
+%%SITE_ARCH%%/XML/LibXML/SAX/Parser.pm
+%%SITE_ARCH%%/XML/LibXML/Schema.pod
+%%SITE_ARCH%%/XML/LibXML/Text.pod
+%%SITE_ARCH%%/XML/LibXML/XPathContext.pm
+%%SITE_ARCH%%/XML/LibXML/XPathContext.pod
+%%SITE_ARCH%%/XML/LibXML/XPathExpression.pod
+%%SITE_ARCH%%/auto/XML/LibXML/LibXML.so
 %%PERL5_MAN3%%/XML::LibXML.3.gz
 %%PERL5_MAN3%%/XML::LibXML::Attr.3.gz
 %%PERL5_MAN3%%/XML::LibXML::AttributeHash.3.gz
@@ -77,8 +76,3 @@
 %%PERL5_MAN3%%/XML::LibXML::Text.3.gz
 %%PERL5_MAN3%%/XML::LibXML::XPathContext.3.gz
 %%PERL5_MAN3%%/XML::LibXML::XPathExpression.3.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/LibXML
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/XML/LibXML/SAX
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/XML/LibXML
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/XML