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

61 files changed, 40 insertions, 133 deletions

diff --git a/science/metaf2xml/Makefile b/science/metaf2xml/Makefile
index 95c1af15d50..f088e89933f 100644
--- a/science/metaf2xml/Makefile
+++ b/science/metaf2xml/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	metaf2xml
 PORTVERSION=	1.55
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	science perl5
 MASTER_SITES=	SF/${PORTNAME}/${PORTVERSION}
 
diff --git a/science/p5-Algorithm-SVMLight/Makefile b/science/p5-Algorithm-SVMLight/Makefile
index c9d733b3a29..2e0f52f0d1f 100644
--- a/science/p5-Algorithm-SVMLight/Makefile
+++ b/science/p5-Algorithm-SVMLight/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Algorithm-SVMLight
 PORTVERSION=	0.09
+PORTREVISION=	1
 CATEGORIES=	science perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/science/p5-Algorithm-SVMLight/pkg-plist b/science/p5-Algorithm-SVMLight/pkg-plist
index 0d8e65870f9..f26cbf5385f 100644
--- a/science/p5-Algorithm-SVMLight/pkg-plist
+++ b/science/p5-Algorithm-SVMLight/pkg-plist
@@ -1,6 +1,3 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/Algorithm/SVMLight.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Algorithm/SVMLight/SVMLight.so
+%%SITE_ARCH%%/Algorithm/SVMLight.pm
+%%SITE_ARCH%%/auto/Algorithm/SVMLight/SVMLight.so
 %%PERL5_MAN3%%/Algorithm::SVMLight.3.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Algorithm
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Algorithm/SVMLight
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Algorithm
diff --git a/science/p5-Chemistry-3DBuilder/Makefile b/science/p5-Chemistry-3DBuilder/Makefile
index c24cc613822..3641f22f740 100644
--- a/science/p5-Chemistry-3DBuilder/Makefile
+++ b/science/p5-Chemistry-3DBuilder/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Chemistry-3DBuilder
 PORTVERSION=	0.10
+PORTREVISION=	1
 CATEGORIES=	science perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:ITUB
diff --git a/science/p5-Chemistry-3DBuilder/pkg-plist b/science/p5-Chemistry-3DBuilder/pkg-plist
index 7dcc6930b09..1031a3dfd80 100644
--- a/science/p5-Chemistry-3DBuilder/pkg-plist
+++ b/science/p5-Chemistry-3DBuilder/pkg-plist
@@ -1,4 +1,2 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Chemistry/3DBuilder/.packlist
 %%SITE_PERL%%/Chemistry/3DBuilder.pm
 %%PERL5_MAN3%%/Chemistry::3DBuilder.3.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Chemistry/3DBuilder
diff --git a/science/p5-Chemistry-Bond-Find/Makefile b/science/p5-Chemistry-Bond-Find/Makefile
index 865352dad41..370e2f66640 100644
--- a/science/p5-Chemistry-Bond-Find/Makefile
+++ b/science/p5-Chemistry-Bond-Find/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Chemistry-Bond-Find
 PORTVERSION=	0.23
+PORTREVISION=	1
 CATEGORIES=	science perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:ITUB
diff --git a/science/p5-Chemistry-Bond-Find/pkg-plist b/science/p5-Chemistry-Bond-Find/pkg-plist
index f91a859b3fd..829bfda494d 100644
--- a/science/p5-Chemistry-Bond-Find/pkg-plist
+++ b/science/p5-Chemistry-Bond-Find/pkg-plist
@@ -1,8 +1,2 @@
 %%SITE_PERL%%/Chemistry/Bond/Find.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Chemistry/Bond/Find/.packlist
 %%PERL5_MAN3%%/Chemistry::Bond::Find.3.gz
-@dirrmtry %%SITE_PERL%%/Chemistry
-@dirrmtry %%SITE_PERL%%/Chemistry/Bond
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Chemistry/Bond/Find
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Chemistry/Bond
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Chemistry
diff --git a/science/p5-Chemistry-Canonicalize/Makefile b/science/p5-Chemistry-Canonicalize/Makefile
index ce77fa07e9c..71b627b087f 100644
--- a/science/p5-Chemistry-Canonicalize/Makefile
+++ b/science/p5-Chemistry-Canonicalize/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Chemistry-Canonicalize
 PORTVERSION=	0.11
+PORTREVISION=	1
 CATEGORIES=	science perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:ITUB
diff --git a/science/p5-Chemistry-Canonicalize/pkg-plist b/science/p5-Chemistry-Canonicalize/pkg-plist
index 6893531945f..57e0047f7b3 100644
--- a/science/p5-Chemistry-Canonicalize/pkg-plist
+++ b/science/p5-Chemistry-Canonicalize/pkg-plist
@@ -1,5 +1,2 @@
 %%SITE_PERL%%/Chemistry/Canonicalize.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Chemistry/Canonicalize/.packlist
 %%PERL5_MAN3%%/Chemistry::Canonicalize.3.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Chemistry/Canonicalize
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Chemistry
diff --git a/science/p5-Chemistry-Elements/Makefile b/science/p5-Chemistry-Elements/Makefile
index d623286a5a5..67af48a0472 100644
--- a/science/p5-Chemistry-Elements/Makefile
+++ b/science/p5-Chemistry-Elements/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Chemistry-Elements
 PORTVERSION=	1.07
+PORTREVISION=	1
 CATEGORIES=	science perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/science/p5-Chemistry-Elements/pkg-plist b/science/p5-Chemistry-Elements/pkg-plist
index e784994f1f8..2260c9bb75b 100644
--- a/science/p5-Chemistry-Elements/pkg-plist
+++ b/science/p5-Chemistry-Elements/pkg-plist
@@ -1,6 +1,2 @@
 %%PERL5_MAN3%%/Chemistry::Elements.3.gz
 %%SITE_PERL%%/Chemistry/Elements.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Chemistry/Elements/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Chemistry/Elements
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Chemistry
-@dirrmtry %%SITE_PERL%%/Chemistry
diff --git a/science/p5-Chemistry-File-MDLMol/Makefile b/science/p5-Chemistry-File-MDLMol/Makefile
index 726beecbdd3..3593e153e4f 100644
--- a/science/p5-Chemistry-File-MDLMol/Makefile
+++ b/science/p5-Chemistry-File-MDLMol/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Chemistry-File-MDLMol
 PORTVERSION=	0.21
+PORTREVISION=	1
 CATEGORIES=	science perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:ITUB
diff --git a/science/p5-Chemistry-File-MDLMol/pkg-plist b/science/p5-Chemistry-File-MDLMol/pkg-plist
index 5e0bc7dfc5f..615e9beb9de 100644
--- a/science/p5-Chemistry-File-MDLMol/pkg-plist
+++ b/science/p5-Chemistry-File-MDLMol/pkg-plist
@@ -1,8 +1,4 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Chemistry/File/MDLMol/.packlist
 %%SITE_PERL%%/Chemistry/File/MDLMol.pm
 %%SITE_PERL%%/Chemistry/File/SDF.pm
 %%PERL5_MAN3%%/Chemistry::File::MDLMol.3.gz
 %%PERL5_MAN3%%/Chemistry::File::SDF.3.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Chemistry/File/MDLMol
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Chemistry/File
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Chemistry
diff --git a/science/p5-Chemistry-File-Mopac/Makefile b/science/p5-Chemistry-File-Mopac/Makefile
index eb5c95ea2d5..dd4fb03ea6e 100644
--- a/science/p5-Chemistry-File-Mopac/Makefile
+++ b/science/p5-Chemistry-File-Mopac/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Chemistry-File-Mopac
 PORTVERSION=	0.15
+PORTREVISION=	1
 CATEGORIES=	science perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:ITUB
diff --git a/science/p5-Chemistry-File-Mopac/pkg-plist b/science/p5-Chemistry-File-Mopac/pkg-plist
index ae7d2df3f7c..6378086653b 100644
--- a/science/p5-Chemistry-File-Mopac/pkg-plist
+++ b/science/p5-Chemistry-File-Mopac/pkg-plist
@@ -1,6 +1,2 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Chemistry/File/Mopac/.packlist
 %%SITE_PERL%%/Chemistry/File/Mopac.pm
 %%PERL5_MAN3%%/Chemistry::File::Mopac.3.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Chemistry/File/Mopac
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Chemistry/File
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Chemistry
diff --git a/science/p5-Chemistry-File-PDB/Makefile b/science/p5-Chemistry-File-PDB/Makefile
index 921a414515a..d68b6ce9b6f 100644
--- a/science/p5-Chemistry-File-PDB/Makefile
+++ b/science/p5-Chemistry-File-PDB/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Chemistry-File-PDB
 PORTVERSION=	0.23
+PORTREVISION=	1
 CATEGORIES=	science perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/science/p5-Chemistry-File-PDB/pkg-plist b/science/p5-Chemistry-File-PDB/pkg-plist
index c31a5d20b9f..5134a8e5c67 100644
--- a/science/p5-Chemistry-File-PDB/pkg-plist
+++ b/science/p5-Chemistry-File-PDB/pkg-plist
@@ -1,8 +1,2 @@
 %%SITE_PERL%%/Chemistry/File/PDB.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Chemistry/File/PDB/.packlist
 %%PERL5_MAN3%%/Chemistry::File::PDB.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Chemistry/File/PDB
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Chemistry/File
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Chemistry
-@dirrmtry %%SITE_PERL%%/Chemistry/File
-@dirrmtry %%SITE_PERL%%/Chemistry
diff --git a/science/p5-Chemistry-File-SLN/Makefile b/science/p5-Chemistry-File-SLN/Makefile
index 254ea94749f..dfc5b9a7ade 100644
--- a/science/p5-Chemistry-File-SLN/Makefile
+++ b/science/p5-Chemistry-File-SLN/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Chemistry-File-SLN
 PORTVERSION=	0.11
+PORTREVISION=	1
 CATEGORIES=	science perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:ITUB
diff --git a/science/p5-Chemistry-File-SLN/pkg-plist b/science/p5-Chemistry-File-SLN/pkg-plist
index 9f5f0a08574..1aea033891d 100644
--- a/science/p5-Chemistry-File-SLN/pkg-plist
+++ b/science/p5-Chemistry-File-SLN/pkg-plist
@@ -1,7 +1,3 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Chemistry/File/SLN/.packlist
 %%SITE_PERL%%/Chemistry/File/SLN/Parser.pm
 %%SITE_PERL%%/Chemistry/File/SLN.pm
 %%PERL5_MAN3%%/Chemistry::File::SLN.3.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Chemistry/File/SLN
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Chemistry/File
-@dirrmtry %%SITE_PERL%%/Chemistry/File/SLN
diff --git a/science/p5-Chemistry-File-SMARTS/Makefile b/science/p5-Chemistry-File-SMARTS/Makefile
index 2d08a8de9b3..0c2b4c6f4ef 100644
--- a/science/p5-Chemistry-File-SMARTS/Makefile
+++ b/science/p5-Chemistry-File-SMARTS/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Chemistry-File-SMARTS
 PORTVERSION=	0.22
+PORTREVISION=	1
 CATEGORIES=	science perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:ITUB
diff --git a/science/p5-Chemistry-File-SMARTS/pkg-plist b/science/p5-Chemistry-File-SMARTS/pkg-plist
index 072646216f6..55de5ab5ced 100644
--- a/science/p5-Chemistry-File-SMARTS/pkg-plist
+++ b/science/p5-Chemistry-File-SMARTS/pkg-plist
@@ -1,5 +1,2 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Chemistry/File/SMARTS/.packlist
 %%SITE_PERL%%/Chemistry/File/SMARTS.pm
 %%PERL5_MAN3%%/Chemistry::File::SMARTS.3.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Chemistry/File/SMARTS
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Chemistry/File
diff --git a/science/p5-Chemistry-File-SMILES/Makefile b/science/p5-Chemistry-File-SMILES/Makefile
index 9e96c17b0ed..efcec0feed1 100644
--- a/science/p5-Chemistry-File-SMILES/Makefile
+++ b/science/p5-Chemistry-File-SMILES/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Chemistry-File-SMILES
 PORTVERSION=	0.47
+PORTREVISION=	1
 CATEGORIES=	science perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:ITUB
diff --git a/science/p5-Chemistry-File-SMILES/pkg-plist b/science/p5-Chemistry-File-SMILES/pkg-plist
index 88d2d0922b4..02abd015409 100644
--- a/science/p5-Chemistry-File-SMILES/pkg-plist
+++ b/science/p5-Chemistry-File-SMILES/pkg-plist
@@ -1,7 +1,3 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Chemistry/File/SMILES/.packlist
 %%SITE_PERL%%/Chemistry/File/SMILES.pm
 %%SITE_PERL%%/Chemistry/File/write.pl
 %%PERL5_MAN3%%/Chemistry::File::SMILES.3.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Chemistry/File/SMILES
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Chemistry/File
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Chemistry
diff --git a/science/p5-Chemistry-File-VRML/Makefile b/science/p5-Chemistry-File-VRML/Makefile
index 57d90e1c0c9..ebbea0770a2 100644
--- a/science/p5-Chemistry-File-VRML/Makefile
+++ b/science/p5-Chemistry-File-VRML/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Chemistry-File-VRML
 PORTVERSION=	0.10
+PORTREVISION=	1
 CATEGORIES=	science perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:ITUB
diff --git a/science/p5-Chemistry-File-VRML/pkg-plist b/science/p5-Chemistry-File-VRML/pkg-plist
index 70021792372..488635b7d04 100644
--- a/science/p5-Chemistry-File-VRML/pkg-plist
+++ b/science/p5-Chemistry-File-VRML/pkg-plist
@@ -1,5 +1,2 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Chemistry/File/VRML/.packlist
 %%SITE_PERL%%/Chemistry/File/VRML.pm
 %%PERL5_MAN3%%/Chemistry::File::VRML.3.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Chemistry/File/VRML
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Chemistry/File
diff --git a/science/p5-Chemistry-File-XYZ/Makefile b/science/p5-Chemistry-File-XYZ/Makefile
index ed9163c8b9b..ba4642f5ace 100644
--- a/science/p5-Chemistry-File-XYZ/Makefile
+++ b/science/p5-Chemistry-File-XYZ/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Chemistry-File-XYZ
 PORTVERSION=	0.11
+PORTREVISION=	1
 CATEGORIES=	science perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:ITUB
diff --git a/science/p5-Chemistry-File-XYZ/pkg-plist b/science/p5-Chemistry-File-XYZ/pkg-plist
index 5ec012fad7e..aa785788405 100644
--- a/science/p5-Chemistry-File-XYZ/pkg-plist
+++ b/science/p5-Chemistry-File-XYZ/pkg-plist
@@ -1,8 +1,2 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Chemistry/File/XYZ/.packlist
 %%SITE_PERL%%/Chemistry/File/XYZ.pm
 %%PERL5_MAN3%%/Chemistry::File::XYZ.3.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Chemistry/File/XYZ
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Chemistry/File
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Chemistry
-@dirrmtry %%SITE_PERL%%/Chemistry/File
-@dirrmtry %%SITE_PERL%%/Chemistry
diff --git a/science/p5-Chemistry-FormulaPattern/Makefile b/science/p5-Chemistry-FormulaPattern/Makefile
index 8064f9b0663..828f6fba9fc 100644
--- a/science/p5-Chemistry-FormulaPattern/Makefile
+++ b/science/p5-Chemistry-FormulaPattern/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Chemistry-FormulaPattern
 PORTVERSION=	0.10
+PORTREVISION=	1
 CATEGORIES=	science perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:ITUB
diff --git a/science/p5-Chemistry-FormulaPattern/pkg-plist b/science/p5-Chemistry-FormulaPattern/pkg-plist
index dc65fa11211..a3fbd2fde00 100644
--- a/science/p5-Chemistry-FormulaPattern/pkg-plist
+++ b/science/p5-Chemistry-FormulaPattern/pkg-plist
@@ -1,7 +1,4 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Chemistry/FormulaPattern/.packlist
 %%SITE_PERL%%/Chemistry/File/FormulaPattern.pm
 %%SITE_PERL%%/Chemistry/FormulaPattern.pm
 %%PERL5_MAN3%%/Chemistry::FormulaPattern.3.gz
 %%PERL5_MAN3%%/Chemistry::File::FormulaPattern.3.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Chemistry/FormulaPattern
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Chemistry
diff --git a/science/p5-Chemistry-InternalCoords/Makefile b/science/p5-Chemistry-InternalCoords/Makefile
index bf7dc44f77e..bfa405943e0 100644
--- a/science/p5-Chemistry-InternalCoords/Makefile
+++ b/science/p5-Chemistry-InternalCoords/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Chemistry-InternalCoords
 PORTVERSION=	0.18
+PORTREVISION=	1
 CATEGORIES=	science perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:ITUB
diff --git a/science/p5-Chemistry-InternalCoords/pkg-plist b/science/p5-Chemistry-InternalCoords/pkg-plist
index 7dfdb724595..f0e3a1ec20b 100644
--- a/science/p5-Chemistry-InternalCoords/pkg-plist
+++ b/science/p5-Chemistry-InternalCoords/pkg-plist
@@ -1,9 +1,4 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Chemistry/InternalCoords/.packlist
 %%SITE_PERL%%/Chemistry/InternalCoords/Builder.pm
 %%SITE_PERL%%/Chemistry/InternalCoords.pm
 %%PERL5_MAN3%%/Chemistry::InternalCoords.3.gz
 %%PERL5_MAN3%%/Chemistry::InternalCoords::Builder.3.gz
-@dirrmtry %%SITE_PERL%%/Chemistry/InternalCoords
-@dirrmtry %%SITE_PERL%%/Chemistry
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Chemistry/InternalCoords
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Chemistry
diff --git a/science/p5-Chemistry-Isotope/Makefile b/science/p5-Chemistry-Isotope/Makefile
index a22a183da36..d694ce3e147 100644
--- a/science/p5-Chemistry-Isotope/Makefile
+++ b/science/p5-Chemistry-Isotope/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Chemistry-Isotope
 PORTVERSION=	0.11
+PORTREVISION=	1
 CATEGORIES=	science perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:ITUB
diff --git a/science/p5-Chemistry-Isotope/pkg-plist b/science/p5-Chemistry-Isotope/pkg-plist
index 304c7ee80c1..2977581e695 100644
--- a/science/p5-Chemistry-Isotope/pkg-plist
+++ b/science/p5-Chemistry-Isotope/pkg-plist
@@ -1,6 +1,2 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Chemistry/Isotope/.packlist
 %%SITE_PERL%%/Chemistry/Isotope.pm
 %%PERL5_MAN3%%/Chemistry::Isotope.3.gz
-@dirrmtry %%SITE_PERL%%/Chemistry
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Chemistry/Isotope
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Chemistry
diff --git a/science/p5-Chemistry-MacroMol/Makefile b/science/p5-Chemistry-MacroMol/Makefile
index 5b989e3cd2d..0c488e246f6 100644
--- a/science/p5-Chemistry-MacroMol/Makefile
+++ b/science/p5-Chemistry-MacroMol/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Chemistry-MacroMol
 PORTVERSION=	0.06
+PORTREVISION=	1
 CATEGORIES=	science perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/science/p5-Chemistry-MacroMol/pkg-plist b/science/p5-Chemistry-MacroMol/pkg-plist
index 1aad1ee2cf8..8c6e1bddf89 100644
--- a/science/p5-Chemistry-MacroMol/pkg-plist
+++ b/science/p5-Chemistry-MacroMol/pkg-plist
@@ -2,7 +2,3 @@
 %%PERL5_MAN3%%/Chemistry::MacroMol.3.gz
 %%SITE_PERL%%/Chemistry/Domain.pm
 %%SITE_PERL%%/Chemistry/MacroMol.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Chemistry/MacroMol/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Chemistry/MacroMol
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Chemistry
-@dirrmtry %%SITE_PERL%%/Chemistry
diff --git a/science/p5-Chemistry-MidasPattern/Makefile b/science/p5-Chemistry-MidasPattern/Makefile
index 440aa8c280c..67e4d9ad08e 100644
--- a/science/p5-Chemistry-MidasPattern/Makefile
+++ b/science/p5-Chemistry-MidasPattern/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Chemistry-MidasPattern
 PORTVERSION=	0.11
+PORTREVISION=	1
 CATEGORIES=	science perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:ITUB
diff --git a/science/p5-Chemistry-MidasPattern/pkg-plist b/science/p5-Chemistry-MidasPattern/pkg-plist
index da4325a8dcf..cc79059b242 100644
--- a/science/p5-Chemistry-MidasPattern/pkg-plist
+++ b/science/p5-Chemistry-MidasPattern/pkg-plist
@@ -1,7 +1,4 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Chemistry/MidasPattern/.packlist
 %%SITE_PERL%%/Chemistry/File/MidasPattern.pm
 %%SITE_PERL%%/Chemistry/MidasPattern.pm
 %%PERL5_MAN3%%/Chemistry::MidasPattern.3.gz
 %%PERL5_MAN3%%/Chemistry::File::MidasPattern.3.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Chemistry/MidasPattern
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Chemistry
diff --git a/science/p5-Chemistry-Mok/Makefile b/science/p5-Chemistry-Mok/Makefile
index 364a493ad35..8e66b9e2aa0 100644
--- a/science/p5-Chemistry-Mok/Makefile
+++ b/science/p5-Chemistry-Mok/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Chemistry-Mok
 PORTVERSION=	0.25
+PORTREVISION=	1
 CATEGORIES=	science perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:ITUB
diff --git a/science/p5-Chemistry-Mok/pkg-plist b/science/p5-Chemistry-Mok/pkg-plist
index 2f58adb5ade..df28d4d591f 100644
--- a/science/p5-Chemistry-Mok/pkg-plist
+++ b/science/p5-Chemistry-Mok/pkg-plist
@@ -1,6 +1,4 @@
 bin/mok
 %%SITE_PERL%%/Chemistry/Mok.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Chemistry/Mok/.packlist
 %%PERL5_MAN3%%/Chemistry::Mok.3.gz
 man/man1/mok.1.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Chemistry/Mok
diff --git a/science/p5-Chemistry-Mol/Makefile b/science/p5-Chemistry-Mol/Makefile
index cd45bb53ccd..b8d1b13ffa3 100644
--- a/science/p5-Chemistry-Mol/Makefile
+++ b/science/p5-Chemistry-Mol/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Chemistry-Mol
 PORTVERSION=	0.37
+PORTREVISION=	1
 CATEGORIES=	science perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/science/p5-Chemistry-Mol/pkg-plist b/science/p5-Chemistry-Mol/pkg-plist
index 2551becfe39..6f7b55f4c4b 100644
--- a/science/p5-Chemistry-Mol/pkg-plist
+++ b/science/p5-Chemistry-Mol/pkg-plist
@@ -14,8 +14,3 @@
 %%SITE_PERL%%/Chemistry/Mol.pm
 %%SITE_PERL%%/Chemistry/Obj.pm
 %%SITE_PERL%%/Chemistry/Tutorial.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Chemistry/Mol/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Chemistry/Mol
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Chemistry
-@dirrmtry %%SITE_PERL%%/Chemistry/File
-@dirrmtry %%SITE_PERL%%/Chemistry
diff --git a/science/p5-Chemistry-Pattern/Makefile b/science/p5-Chemistry-Pattern/Makefile
index 198d68646f5..3ecd055f5f3 100644
--- a/science/p5-Chemistry-Pattern/Makefile
+++ b/science/p5-Chemistry-Pattern/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Chemistry-Pattern
 PORTVERSION=	0.27
+PORTREVISION=	1
 CATEGORIES=	science perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:ITUB
diff --git a/science/p5-Chemistry-Pattern/pkg-plist b/science/p5-Chemistry-Pattern/pkg-plist
index a87d730179e..8fcfe0775e2 100644
--- a/science/p5-Chemistry-Pattern/pkg-plist
+++ b/science/p5-Chemistry-Pattern/pkg-plist
@@ -1,10 +1,6 @@
 %%SITE_PERL%%/Chemistry/Pattern/Atom.pm
 %%SITE_PERL%%/Chemistry/Pattern/Bond.pm
 %%SITE_PERL%%/Chemistry/Pattern.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Chemistry/Pattern/.packlist
 %%PERL5_MAN3%%/Chemistry::Pattern.3.gz
 %%PERL5_MAN3%%/Chemistry::Pattern::Atom.3.gz
 %%PERL5_MAN3%%/Chemistry::Pattern::Bond.3.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Chemistry/Pattern
-@dirrmtry %%SITE_PERL%%/Chemistry/Pattern
-@dirrmtry %%SITE_PERL%%/Chemistry
diff --git a/science/p5-Chemistry-Reaction/Makefile b/science/p5-Chemistry-Reaction/Makefile
index 12d4490af40..2e28b7e8400 100644
--- a/science/p5-Chemistry-Reaction/Makefile
+++ b/science/p5-Chemistry-Reaction/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Chemistry-Reaction
 PORTVERSION=	0.02
+PORTREVISION=	1
 CATEGORIES=	science perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:ITUB
diff --git a/science/p5-Chemistry-Reaction/pkg-plist b/science/p5-Chemistry-Reaction/pkg-plist
index 14d56be4345..e25de821e84 100644
--- a/science/p5-Chemistry-Reaction/pkg-plist
+++ b/science/p5-Chemistry-Reaction/pkg-plist
@@ -1,5 +1,2 @@
 %%SITE_PERL%%/Chemistry/Reaction.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Chemistry/Reaction/.packlist
 %%PERL5_MAN3%%/Chemistry::Reaction.3.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Chemistry/Reaction
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Chemistry
diff --git a/science/p5-Chemistry-Ring/Makefile b/science/p5-Chemistry-Ring/Makefile
index 3564f93064f..917ad9a5aa1 100644
--- a/science/p5-Chemistry-Ring/Makefile
+++ b/science/p5-Chemistry-Ring/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Chemistry-Ring
 PORTVERSION=	0.20
+PORTREVISION=	1
 CATEGORIES=	science perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:ITUB
diff --git a/science/p5-Chemistry-Ring/pkg-plist b/science/p5-Chemistry-Ring/pkg-plist
index adcf3874c3e..090f3f853a2 100644
--- a/science/p5-Chemistry-Ring/pkg-plist
+++ b/science/p5-Chemistry-Ring/pkg-plist
@@ -1,7 +1,4 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Chemistry/Ring/.packlist
 %%SITE_PERL%%/Chemistry/Ring/Find.pm
 %%SITE_PERL%%/Chemistry/Ring.pm
 %%PERL5_MAN3%%/Chemistry::Ring.3.gz
 %%PERL5_MAN3%%/Chemistry::Ring::Find.3.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Chemistry/Ring
-@dirrmtry %%SITE_PERL%%/Chemistry/Ring
diff --git a/science/p5-Geo-BUFR/Makefile b/science/p5-Geo-BUFR/Makefile
index 77bb8557730..66e721a1f7b 100644
--- a/science/p5-Geo-BUFR/Makefile
+++ b/science/p5-Geo-BUFR/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Geo-BUFR
 PORTVERSION=	1.27
+PORTREVISION=	1
 CATEGORIES=	science perl5 geography
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:PSANNES
diff --git a/science/p5-Geo-BUFR/pkg-plist b/science/p5-Geo-BUFR/pkg-plist
index b785fd182a5..58f2105e7c2 100644
--- a/science/p5-Geo-BUFR/pkg-plist
+++ b/science/p5-Geo-BUFR/pkg-plist
@@ -9,19 +9,15 @@ bin/bufrresolve.pl
 %%PERL5_MAN3%%/Geo::bufrencode.3.gz
 %%PERL5_MAN3%%/Geo::bufrread.3.gz
 %%PERL5_MAN3%%/Geo::bufrresolve.3.gz
-%%SITE_PERL%%/%%PERL_ARCH%%/Geo/BUFR.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Geo/bufr_reencode.pl
-%%SITE_PERL%%/%%PERL_ARCH%%/Geo/bufralter.pl
-%%SITE_PERL%%/%%PERL_ARCH%%/Geo/bufrencode.pl
-%%SITE_PERL%%/%%PERL_ARCH%%/Geo/bufrread.pl
-%%SITE_PERL%%/%%PERL_ARCH%%/Geo/bufrresolve.pl
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Geo/BUFR/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Geo/BUFR/BUFR.so
+%%SITE_ARCH%%/Geo/BUFR.pm
+%%SITE_ARCH%%/Geo/bufr_reencode.pl
+%%SITE_ARCH%%/Geo/bufralter.pl
+%%SITE_ARCH%%/Geo/bufrencode.pl
+%%SITE_ARCH%%/Geo/bufrread.pl
+%%SITE_ARCH%%/Geo/bufrresolve.pl
+%%SITE_ARCH%%/auto/Geo/BUFR/BUFR.so
 man/man1/bufr_reencode.pl.1.gz
 man/man1/bufralter.pl.1.gz
 man/man1/bufrencode.pl.1.gz
 man/man1/bufrread.pl.1.gz
 man/man1/bufrresolve.pl.1.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Geo/BUFR
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Geo
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Geo
diff --git a/science/p5-Geo-Coordinates-Converter-iArea/Makefile b/science/p5-Geo-Coordinates-Converter-iArea/Makefile
index 269ae2c8bca..6d3b563a41e 100644
--- a/science/p5-Geo-Coordinates-Converter-iArea/Makefile
+++ b/science/p5-Geo-Coordinates-Converter-iArea/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Geo-Coordinates-Converter-iArea
 PORTVERSION=	0.14
+PORTREVISION=	1
 CATEGORIES=	science geography perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/science/p5-Geo-Coordinates-Converter-iArea/pkg-plist b/science/p5-Geo-Coordinates-Converter-iArea/pkg-plist
index 2fdeafc916f..00defafb146 100644
--- a/science/p5-Geo-Coordinates-Converter-iArea/pkg-plist
+++ b/science/p5-Geo-Coordinates-Converter-iArea/pkg-plist
@@ -3,6 +3,5 @@
 %%SITE_PERL%%/auto/share/dist/Geo-Coordinates-Converter-iArea/areacode2center.cdb
 %%SITE_PERL%%/auto/share/dist/Geo-Coordinates-Converter-iArea/areacode2name.cdb
 %%SITE_PERL%%/auto/share/dist/Geo-Coordinates-Converter-iArea/meshcode2areacode.cdb
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Geo/Coordinates/Converter/iArea/.packlist
 %%PERL5_MAN3%%/Geo::Coordinates::Converter::Format::IArea.3.gz
 %%PERL5_MAN3%%/Geo::Coordinates::Converter::iArea.3.gz
diff --git a/science/p5-Geo-Coordinates-Converter/Makefile b/science/p5-Geo-Coordinates-Converter/Makefile
index f3ad9fce3de..f38f1df9798 100644
--- a/science/p5-Geo-Coordinates-Converter/Makefile
+++ b/science/p5-Geo-Coordinates-Converter/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Geo-Coordinates-Converter
 PORTVERSION=	0.13
+PORTREVISION=	1
 CATEGORIES=	science geography perl5
 MASTER_SITES=	CPAN
 #MASTER_SITE_SUBDIR=	CPAN:YAPPO
diff --git a/science/p5-Geo-Coordinates-Converter/pkg-plist b/science/p5-Geo-Coordinates-Converter/pkg-plist
index 32e2526f0fa..03abd3bd665 100644
--- a/science/p5-Geo-Coordinates-Converter/pkg-plist
+++ b/science/p5-Geo-Coordinates-Converter/pkg-plist
@@ -19,13 +19,3 @@
 %%SITE_PERL%%/Geo/Coordinates/Converter/Format/Milliseconds.pm
 %%SITE_PERL%%/Geo/Coordinates/Converter/Point.pm
 %%SITE_PERL%%/Geo/Coordinates/Converter/Point/ISO6709.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Geo/Coordinates/Converter/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Geo/Coordinates/Converter
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Geo/Coordinates
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Geo
-@dirrmtry %%SITE_PERL%%/Geo/Coordinates/Converter/Point
-@dirrmtry %%SITE_PERL%%/Geo/Coordinates/Converter/Format
-@dirrmtry %%SITE_PERL%%/Geo/Coordinates/Converter/Datum
-@dirrmtry %%SITE_PERL%%/Geo/Coordinates/Converter
-@dirrmtry %%SITE_PERL%%/Geo/Coordinates
-@dirrmtry %%SITE_PERL%%/Geo
diff --git a/science/p5-Geo-ReadGRIB/Makefile b/science/p5-Geo-ReadGRIB/Makefile
index 4b9166c3296..80ec84a83c3 100644
--- a/science/p5-Geo-ReadGRIB/Makefile
+++ b/science/p5-Geo-ReadGRIB/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Geo-ReadGRIB
 PORTVERSION=	1.21
+PORTREVISION=	1
 CATEGORIES=	science perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/science/p5-Geo-ReadGRIB/pkg-plist b/science/p5-Geo-ReadGRIB/pkg-plist
index f4120a4ee2a..b82a241b79e 100644
--- a/science/p5-Geo-ReadGRIB/pkg-plist
+++ b/science/p5-Geo-ReadGRIB/pkg-plist
@@ -1,4 +1,3 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Geo/ReadGRIB/.packlist
 %%SITE_PERL%%/Geo/wgrib.exe
 %%SITE_PERL%%/Geo/ReadGRIB.pm
 %%SITE_PERL%%/Geo/Sample-GRIB/akw.HTSGW.grb
@@ -8,8 +7,3 @@
 %%PERL5_MAN3%%/Geo::ReadGRIB.3.gz
 %%PERL5_MAN3%%/Geo::ReadGRIB::Place.3.gz
 %%PERL5_MAN3%%/Geo::ReadGRIB::PlaceIterator.3.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Geo/ReadGRIB
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Geo
-@dirrm %%SITE_PERL%%/Geo/Sample-GRIB
-@dirrm %%SITE_PERL%%/Geo/ReadGRIB
-@dirrmtry %%SITE_PERL%%/Geo
diff --git a/science/p5-Geo-WebService-Elevation-USGS/Makefile b/science/p5-Geo-WebService-Elevation-USGS/Makefile
index 3faac10e06d..9635e32cf09 100644
--- a/science/p5-Geo-WebService-Elevation-USGS/Makefile
+++ b/science/p5-Geo-WebService-Elevation-USGS/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Geo-WebService-Elevation-USGS
 PORTVERSION=	0.011
+PORTREVISION=	1
 CATEGORIES=	science perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:WYANT
diff --git a/science/p5-Geo-WebService-Elevation-USGS/pkg-plist b/science/p5-Geo-WebService-Elevation-USGS/pkg-plist
index 83f5c8e80ee..7c5dc49ee92 100644
--- a/science/p5-Geo-WebService-Elevation-USGS/pkg-plist
+++ b/science/p5-Geo-WebService-Elevation-USGS/pkg-plist
@@ -1,10 +1,2 @@
 %%PERL5_MAN3%%/Geo::WebService::Elevation::USGS.3.gz
 %%SITE_PERL%%/Geo/WebService/Elevation/USGS.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Geo/WebService/Elevation/USGS/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Geo/WebService/Elevation/USGS
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Geo/WebService/Elevation
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Geo/WebService
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Geo
-@dirrmtry %%SITE_PERL%%/Geo/WebService/Elevation
-@dirrmtry %%SITE_PERL%%/Geo/WebService
-@dirrmtry %%SITE_PERL%%/Geo
diff --git a/science/p5-PerlMol/Makefile b/science/p5-PerlMol/Makefile
index c1b16964b3e..bd6d96b664c 100644
--- a/science/p5-PerlMol/Makefile
+++ b/science/p5-PerlMol/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	PerlMol
 PORTVERSION=	0.3500
+PORTREVISION=	1
 CATEGORIES=	science perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:ITUB
diff --git a/science/p5-PerlMol/pkg-plist b/science/p5-PerlMol/pkg-plist
index ba6c1c3f2a7..0ef224722e3 100644
--- a/science/p5-PerlMol/pkg-plist
+++ b/science/p5-PerlMol/pkg-plist
@@ -1,4 +1,2 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/PerlMol/.packlist
 %%SITE_PERL%%/PerlMol.pm
 %%PERL5_MAN3%%/PerlMol.3.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/PerlMol
diff --git a/science/p5-Physics-Unit/Makefile b/science/p5-Physics-Unit/Makefile
index bd9c3f0d52b..035c8b5ed87 100644
--- a/science/p5-Physics-Unit/Makefile
+++ b/science/p5-Physics-Unit/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Physics-Unit
 PORTVERSION=	0.53
+PORTREVISION=	1
 CATEGORIES=	science perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/science/p5-Physics-Unit/pkg-plist b/science/p5-Physics-Unit/pkg-plist
index ff0d864f0e6..18a8a5b1797 100644
--- a/science/p5-Physics-Unit/pkg-plist
+++ b/science/p5-Physics-Unit/pkg-plist
@@ -14,7 +14,3 @@ man/man1/physics-unit.1.gz
 %%PERL5_MAN3%%/Physics::Unit::Scalar::Implementation.3.gz
 %%PERL5_MAN3%%/Physics::Unit::UnitsByName.3.gz
 %%PERL5_MAN3%%/Physics::Unit::UnitsByType.3.gz
-@dirrm %%SITE_PERL%%/Physics/Unit/Scalar
-@dirrm %%SITE_PERL%%/Physics/Unit/Script
-@dirrm %%SITE_PERL%%/Physics/Unit
-@dirrmtry %%SITE_PERL%%/Physics