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

29 files changed, 37 insertions, 89 deletions

diff --git a/print/a2pdf/Makefile b/print/a2pdf/Makefile
index 08e33754e3a7..c3494aadbfe8 100644
--- a/print/a2pdf/Makefile
+++ b/print/a2pdf/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	a2pdf
 PORTVERSION=	1.13
+PORTREVISION=	1
 CATEGORIES=	print perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:JONALLEN
diff --git a/print/a2pdf/pkg-plist b/print/a2pdf/pkg-plist
index 7a66c7b7d0c7..7bd83baf54ac 100644
--- a/print/a2pdf/pkg-plist
+++ b/print/a2pdf/pkg-plist
@@ -1,6 +1,3 @@
 bin/a2pdf
 %%SITE_PERL%%/App/a2pdf.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/a2pdf/.packlist
 man/man1/a2pdf.1.gz
-@dirrmtry %%SITE_PERL%%/App
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/a2pdf
diff --git a/print/axpoint/Makefile b/print/axpoint/Makefile
index 5aa32dc39004..bb0dff774761 100644
--- a/print/axpoint/Makefile
+++ b/print/axpoint/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	axpoint
 PORTVERSION=	1.50
+PORTREVISION=	1
 CATEGORIES=	print perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:MSERGEANT
diff --git a/print/axpoint/pkg-plist b/print/axpoint/pkg-plist
index 58ba940e5d97..28b924862c5d 100644
--- a/print/axpoint/pkg-plist
+++ b/print/axpoint/pkg-plist
@@ -1,9 +1,3 @@
 bin/axpoint
 %%SITE_PERL%%/XML/Handler/AxPoint.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Handler/AxPoint/.packlist
 %%PERL5_MAN3%%/XML::Handler::AxPoint.3.gz
-@dirrmtry %%SITE_PERL%%/XML/Handler
-@dirrmtry %%SITE_PERL%%/XML
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Handler/AxPoint
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Handler
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML
diff --git a/print/foomatic-db-engine/Makefile b/print/foomatic-db-engine/Makefile
index 2df327be8d91..fef34ec0113c 100644
--- a/print/foomatic-db-engine/Makefile
+++ b/print/foomatic-db-engine/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	engine
 PORTVERSION=	4.0.11
-PORTREVISION=	1
+PORTREVISION=	2
 PORTEPOCH=	2
 CATEGORIES=	print
 MASTER_SITES=	http://www.openprinting.org/download/foomatic/ \
diff --git a/print/foomatic-db-engine/pkg-plist b/print/foomatic-db-engine/pkg-plist
index ed2d6ad2d001..539871ce0a07 100644
--- a/print/foomatic-db-engine/pkg-plist
+++ b/print/foomatic-db-engine/pkg-plist
@@ -8,7 +8,6 @@ bin/foomatic-ppd-to-xml
 bin/foomatic-ppdfile
 bin/foomatic-printjob
 bin/foomatic-searchprinter
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Foomatic/.packlist
 %%SITE_PERL%%/Foomatic/DB.pm
 %%SITE_PERL%%/Foomatic/Defaults.pm
 %%SITE_PERL%%/Foomatic/PPD.pm
@@ -42,7 +41,5 @@ share/foomatic/templates/pjl_num_option.xml
 @dirrmtry share/foomatic
 @dirrmtry libexec/cups/driver
 @dirrmtry libexec/cups
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Foomatic
-@dirrm %%SITE_PERL%%/Foomatic
 @dirrmtry etc/foomatic
 @exec mkdir -p %D/etc/foomatic
diff --git a/print/p5-Font-FreeType/Makefile b/print/p5-Font-FreeType/Makefile
index c55caea664ba..aa007ae098e8 100644
--- a/print/p5-Font-FreeType/Makefile
+++ b/print/p5-Font-FreeType/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	Font-FreeType
 PORTVERSION=	0.03
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	print perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/print/p5-Font-FreeType/pkg-plist b/print/p5-Font-FreeType/pkg-plist
index 1afecf1e5c95..142266074dda 100644
--- a/print/p5-Font-FreeType/pkg-plist
+++ b/print/p5-Font-FreeType/pkg-plist
@@ -1,12 +1,7 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/Font/FreeType.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Font/FreeType/Face.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Font/FreeType/Glyph.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Font/FreeType/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Font/FreeType/FreeType.so
+%%SITE_ARCH%%/Font/FreeType.pm
+%%SITE_ARCH%%/Font/FreeType/Face.pm
+%%SITE_ARCH%%/Font/FreeType/Glyph.pm
+%%SITE_ARCH%%/auto/Font/FreeType/FreeType.so
 %%PERL5_MAN3%%/Font::FreeType.3.gz
 %%PERL5_MAN3%%/Font::FreeType::Face.3.gz
 %%PERL5_MAN3%%/Font::FreeType::Glyph.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Font/FreeType
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Font
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Font/FreeType
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Font
diff --git a/print/p5-Net-CUPS/Makefile b/print/p5-Net-CUPS/Makefile
index 28bfc5ac897c..6b22cf9fc78b 100644
--- a/print/p5-Net-CUPS/Makefile
+++ b/print/p5-Net-CUPS/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Net-CUPS
 PORTVERSION=	0.61
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	print perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/print/p5-Net-CUPS/pkg-plist b/print/p5-Net-CUPS/pkg-plist
index c9f1c20d9c1d..a84fc375c0bb 100644
--- a/print/p5-Net-CUPS/pkg-plist
+++ b/print/p5-Net-CUPS/pkg-plist
@@ -1,21 +1,13 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/Net/CUPS.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Net/CUPS/Destination.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Net/CUPS/IPP.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Net/CUPS/PPD.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/CUPS/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/CUPS/CUPS.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/CUPS/Destination/autosplit.ix
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/CUPS/IPP/autosplit.ix
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/CUPS/PPD/autosplit.ix
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/CUPS/autosplit.ix
+%%SITE_ARCH%%/Net/CUPS.pm
+%%SITE_ARCH%%/Net/CUPS/Destination.pm
+%%SITE_ARCH%%/Net/CUPS/IPP.pm
+%%SITE_ARCH%%/Net/CUPS/PPD.pm
+%%SITE_ARCH%%/auto/Net/CUPS/CUPS.so
+%%SITE_ARCH%%/auto/Net/CUPS/Destination/autosplit.ix
+%%SITE_ARCH%%/auto/Net/CUPS/IPP/autosplit.ix
+%%SITE_ARCH%%/auto/Net/CUPS/PPD/autosplit.ix
+%%SITE_ARCH%%/auto/Net/CUPS/autosplit.ix
 %%PERL5_MAN3%%/Net::CUPS.3.gz
 %%PERL5_MAN3%%/Net::CUPS::Destination.3.gz
 %%PERL5_MAN3%%/Net::CUPS::IPP.3.gz
 %%PERL5_MAN3%%/Net::CUPS::PPD.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/CUPS/PPD
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/CUPS/IPP
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/CUPS/Destination
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/CUPS
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Net/CUPS
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Net
diff --git a/print/p5-Net-Printer/Makefile b/print/p5-Net-Printer/Makefile
index 353bd23b97b1..1c347b6d2024 100644
--- a/print/p5-Net-Printer/Makefile
+++ b/print/p5-Net-Printer/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Net-Printer
 PORTVERSION=	1.12
+PORTREVISION=	1
 CATEGORIES=	print perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/print/p5-Net-Printer/pkg-plist b/print/p5-Net-Printer/pkg-plist
index 60923a2f26bb..5dcbea3d6913 100644
--- a/print/p5-Net-Printer/pkg-plist
+++ b/print/p5-Net-Printer/pkg-plist
@@ -1,6 +1,2 @@
 %%SITE_PERL%%/Net/Printer.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Printer/.packlist
 %%PERL5_MAN3%%/Net::Printer.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Printer
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net
-@dirrmtry %%SITE_PERL%%/Net
diff --git a/print/p5-PDF-Template/Makefile b/print/p5-PDF-Template/Makefile
index 2cd621df1305..0ffea07514f1 100644
--- a/print/p5-PDF-Template/Makefile
+++ b/print/p5-PDF-Template/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	PDF-Template
 PORTVERSION=	0.22
+PORTREVISION=	1
 CATEGORIES=	print perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/print/p5-PDF-Template/pkg-plist b/print/p5-PDF-Template/pkg-plist
index 0d9b7c114945..67b210c4aa64 100644
--- a/print/p5-PDF-Template/pkg-plist
+++ b/print/p5-PDF-Template/pkg-plist
@@ -28,7 +28,6 @@
 %%SITE_PERL%%/PDF/Template/Factory.pm
 %%SITE_PERL%%/PDF/Template/Iterator.pm
 %%SITE_PERL%%/PDF/Template/TextObject.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/PDF/Template/.packlist
 %%PERL5_MAN3%%/PDF::Template::Element::Weblink.3.gz
 %%PERL5_MAN3%%/PDF::Template::Container::Scope.3.gz
 %%PERL5_MAN3%%/PDF::Template::Container::Margin.3.gz
@@ -52,9 +51,3 @@
 %%PERL5_MAN3%%/PDF::Template::Element.3.gz
 %%PERL5_MAN3%%/PDF::Template.3.gz
 %%PERL5_MAN3%%/PDF::Template::Element::Line.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/PDF/Template
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/PDF
-@dirrm %%SITE_PERL%%/PDF/Template/Element
-@dirrm %%SITE_PERL%%/PDF/Template/Container
-@dirrm %%SITE_PERL%%/PDF/Template
-@dirrmtry %%SITE_PERL%%/PDF
diff --git a/print/p5-PDFLib/Makefile b/print/p5-PDFLib/Makefile
index 14485aa93b17..774dda0d09be 100644
--- a/print/p5-PDFLib/Makefile
+++ b/print/p5-PDFLib/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	PDFLib
 PORTVERSION=	0.14
+PORTREVISION=	1
 CATEGORIES=	print perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/print/p5-PDFLib/pkg-plist b/print/p5-PDFLib/pkg-plist
index ef0958df3169..11a79b6eaf92 100644
--- a/print/p5-PDFLib/pkg-plist
+++ b/print/p5-PDFLib/pkg-plist
@@ -1,4 +1,2 @@
 %%PERL5_MAN3%%/PDFLib.3.gz
 %%SITE_PERL%%/PDFLib.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/PDFLib/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/PDFLib
diff --git a/print/p5-PostScript-PPD/Makefile b/print/p5-PostScript-PPD/Makefile
index 3f1ef684223c..d2b1da1faf5e 100644
--- a/print/p5-PostScript-PPD/Makefile
+++ b/print/p5-PostScript-PPD/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	PostScript-PPD
 PORTVERSION=	0.0206
+PORTREVISION=	1
 CATEGORIES=	print perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/print/p5-PostScript-PPD/pkg-plist b/print/p5-PostScript-PPD/pkg-plist
index e52d1cd49028..be6c8620e543 100644
--- a/print/p5-PostScript-PPD/pkg-plist
+++ b/print/p5-PostScript-PPD/pkg-plist
@@ -1,6 +1,2 @@
 %%SITE_PERL%%/PostScript/PPD.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/PostScript/PPD/.packlist
 %%PERL5_MAN3%%/PostScript::PPD.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/PostScript/PPD
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/PostScript
-@dirrmtry %%SITE_PERL%%/PostScript
diff --git a/print/p5-PostScript-Simple/Makefile b/print/p5-PostScript-Simple/Makefile
index d550d1d4ce16..5dee21e26fde 100644
--- a/print/p5-PostScript-Simple/Makefile
+++ b/print/p5-PostScript-Simple/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	PostScript-Simple
 PORTVERSION=	0.07
+PORTREVISION=	1
 CATEGORIES=	print perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/print/p5-PostScript-Simple/pkg-plist b/print/p5-PostScript-Simple/pkg-plist
index 0e1a54d15512..0a390f3450f5 100644
--- a/print/p5-PostScript-Simple/pkg-plist
+++ b/print/p5-PostScript-Simple/pkg-plist
@@ -2,8 +2,3 @@
 %%PERL5_MAN3%%/PostScript::Simple::EPS.3.gz
 %%SITE_PERL%%/PostScript/Simple.pm
 %%SITE_PERL%%/PostScript/Simple/EPS.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/PostScript/Simple/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/PostScript/Simple
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/PostScript
-@dirrmtry %%SITE_PERL%%/PostScript/Simple
-@dirrmtry %%SITE_PERL%%/PostScript
diff --git a/print/p5-PostScript/Makefile b/print/p5-PostScript/Makefile
index e6ec6043bb9c..64ad3f52bf46 100644
--- a/print/p5-PostScript/Makefile
+++ b/print/p5-PostScript/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	PostScript
 PORTVERSION=	0.06
+PORTREVISION=	1
 CATEGORIES=	print perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/print/p5-PostScript/pkg-plist b/print/p5-PostScript/pkg-plist
index 1f01e2026428..f0cf5d1beada 100644
--- a/print/p5-PostScript/pkg-plist
+++ b/print/p5-PostScript/pkg-plist
@@ -6,7 +6,3 @@
 %%SITE_PERL%%/PostScript/Metrics.pm
 %%SITE_PERL%%/PostScript/TextBlock.pm
 %%SITE_PERL%%/PostScript/example.pl
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/PostScript/Metrics/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/PostScript/Metrics
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/PostScript
-@dirrmtry %%SITE_PERL%%/PostScript
diff --git a/print/p5-Text-PDF/Makefile b/print/p5-Text-PDF/Makefile
index 8d9a85541f75..791e5202912f 100644
--- a/print/p5-Text-PDF/Makefile
+++ b/print/p5-Text-PDF/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Text-PDF
 PORTVERSION=	0.29a
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	print perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
@@ -20,7 +20,7 @@ post-patch:
 	@${RM} -f ${WRKSRC}/pm_to_blib
 
 post-install:
-	@${MKDIR} ${STAGEDIR}${SITE_PERL}/Text/PDF/examples
-	@${INSTALL_DATA} ${WRKSRC}/examples/* ${STAGEDIR}${SITE_PERL}/Text/PDF/examples
+	@${MKDIR} ${STAGEDIR}${PREFIX}/${SITE_PERL_REL}/Text/PDF/examples
+	@${INSTALL_DATA} ${WRKSRC}/examples/* ${STAGEDIR}${PREFIX}/${SITE_PERL_REL}/Text/PDF/examples
 
 .include <bsd.port.mk>
diff --git a/print/p5-Text-PDF/pkg-plist b/print/p5-Text-PDF/pkg-plist
index 3c0c6bb62897..c37a256f3f46 100644
--- a/print/p5-Text-PDF/pkg-plist
+++ b/print/p5-Text-PDF/pkg-plist
@@ -1,7 +1,6 @@
 bin/pdfbklt
 bin/pdfrevert
 bin/pdfstamp
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/PDF/.packlist
 %%SITE_PERL%%/Text/PDF.pm
 %%SITE_PERL%%/Text/PDF/Array.pm
 %%SITE_PERL%%/Text/PDF/Bool.pm
@@ -50,8 +49,3 @@ bin/pdfstamp
 %%PERL5_MAN3%%/Text::PDF::TTFont.3.gz
 %%PERL5_MAN3%%/Text::PDF::TTFont0.3.gz
 %%PERL5_MAN3%%/Text::PDF::Utils.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/PDF
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text
-@dirrm %%SITE_PERL%%/Text/PDF/examples
-@dirrm %%SITE_PERL%%/Text/PDF
-@dirrmtry %%SITE_PERL%%/Text
diff --git a/print/p5-XML-ApacheFOP/Makefile b/print/p5-XML-ApacheFOP/Makefile
index 263f38c0e507..1630f8bece0a 100644
--- a/print/p5-XML-ApacheFOP/Makefile
+++ b/print/p5-XML-ApacheFOP/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	XML-ApacheFOP
 PORTVERSION=	0.03
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	print perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/print/p5-XML-ApacheFOP/pkg-plist b/print/p5-XML-ApacheFOP/pkg-plist
index b7de164cddb6..866d040c844d 100644
--- a/print/p5-XML-ApacheFOP/pkg-plist
+++ b/print/p5-XML-ApacheFOP/pkg-plist
@@ -1,6 +1,2 @@
 %%SITE_PERL%%/XML/ApacheFOP.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/ApacheFOP/.packlist
 %%PERL5_MAN3%%/XML::ApacheFOP.3.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/ApacheFOP
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML
-@dirrmtry %%SITE_PERL%%/XML
diff --git a/print/pdflib/Makefile b/print/pdflib/Makefile
index f1ef76473288..beaedb661a2e 100644
--- a/print/pdflib/Makefile
+++ b/print/pdflib/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	pdflib
 PORTVERSION=	7.0.5
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	print perl5 java
 MASTER_SITES=	http://www.pdflib.com/binaries/PDFlib/${PORTVERSION:S/.//g}/
 DISTNAME=	PDFlib-Lite-${PORTVERSION}p3
diff --git a/print/pdflib/pkg-plist b/print/pdflib/pkg-plist
index dc9afea610ac..ce1e322f093c 100644
--- a/print/pdflib/pkg-plist
+++ b/print/pdflib/pkg-plist
@@ -6,11 +6,11 @@ lib/libpdf.a
 lib/libpdf.so
 lib/libpdf.so.6
 lib/libpdf.so.6.0.5
-%%PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/pdflib_pl.a
-%%PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/pdflib_pl.pm
-%%PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/pdflib_pl.so
-%%PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/pdflib_pl.so.0
-%%PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/pdflib_pl.so.0.0.0
+%%PERL%%%%SITE_ARCH%%/pdflib_pl.a
+%%PERL%%%%SITE_ARCH%%/pdflib_pl.pm
+%%PERL%%%%SITE_ARCH%%/pdflib_pl.so
+%%PERL%%%%SITE_ARCH%%/pdflib_pl.so.0
+%%PERL%%%%SITE_ARCH%%/pdflib_pl.so.0.0.0
 %%JAVA%%lib/libpdf_java.a
 %%JAVA%%lib/libpdf_java.so
 %%JAVA%%lib/libpdf_java.so.0
diff --git a/print/texlive-infra/Makefile b/print/texlive-infra/Makefile
index 28b2d5983106..8a32fae238fa 100644
--- a/print/texlive-infra/Makefile
+++ b/print/texlive-infra/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	texlive
 PORTVERSION=	34227
+PORTREVISION=	1
 CATEGORIES=	print perl5
 #MASTER_SITES=	ftp://tug.org/tex-archive/systems/texlive/tlnet/archive/
 MASTER_SITES=	LOCAL/hrs
@@ -19,10 +20,10 @@ NO_BUILD=	yes
 NO_WRKSUBDIR=	yes
 
 do-install:
-	@${MKDIR} ${STAGEDIR}${SITE_PERL}/TeXLive \
+	@${MKDIR} ${STAGEDIR}${PREFIX}/${SITE_PERL_REL}/TeXLive \
 	    ${STAGEDIR}${PREFIX}/${TEXMFDISTDIR}/web2c/
 	${INSTALL_DATA} ${WRKSRC}/tlpkg/TeXLive/*.pm \
-	    ${STAGEDIR}${SITE_PERL}/TeXLive
+	    ${STAGEDIR}${PREFIX}/${SITE_PERL_REL}/TeXLive
 	${INSTALL_DATA} ${WRKSRC}/texmf-dist/web2c/fmtutil-hdr.cnf \
 	    ${WRKSRC}/texmf-dist/web2c/updmap-hdr.cfg \
 	    ${STAGEDIR}${PREFIX}/${TEXMFDISTDIR}/web2c/