16 files changed, 19 insertions, 45 deletions

diff --git a/ports-mgmt/distilator/Makefile b/ports-mgmt/distilator/Makefile
index db1b0b749cb5..7d0e9d65a377 100644
--- a/ports-mgmt/distilator/Makefile
+++ b/ports-mgmt/distilator/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	distilator
 PORTVERSION=	0.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	ports-mgmt perl5
 MASTER_SITES=	CRITICAL
 
diff --git a/ports-mgmt/distilator/pkg-plist b/ports-mgmt/distilator/pkg-plist
index dde5d665842e..cf2d9c1fabab 100644
--- a/ports-mgmt/distilator/pkg-plist
+++ b/ports-mgmt/distilator/pkg-plist
@@ -3,4 +3,3 @@ bin/distilator
 %%SITE_PERL%%/FreeBSD/Ports/DistilatorCommon.pm
 %%SITE_PERL%%/FreeBSD/Ports/DistilatorSingle.pm
 %%SITE_PERL%%/FreeBSD/Ports/DistilatorThreaded.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/FreeBSD/Ports/Distilator/.packlist
diff --git a/ports-mgmt/p5-App-Pm2Port/Makefile b/ports-mgmt/p5-App-Pm2Port/Makefile
index d904f31b0d9c..7ab1369d3eaf 100644
--- a/ports-mgmt/p5-App-Pm2Port/Makefile
+++ b/ports-mgmt/p5-App-Pm2Port/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	App-Pm2Port
 PORTVERSION=	0.29
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	ports-mgmt perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/ports-mgmt/p5-App-Pm2Port/pkg-plist b/ports-mgmt/p5-App-Pm2Port/pkg-plist
index 1ed1b2c37613..8879d845b05a 100644
--- a/ports-mgmt/p5-App-Pm2Port/pkg-plist
+++ b/ports-mgmt/p5-App-Pm2Port/pkg-plist
@@ -2,7 +2,3 @@ bin/pm2port
 man/man1/pm2port.1.gz
 %%PERL5_MAN3%%/App::Pm2Port.3.gz
 %%SITE_PERL%%/App/Pm2Port.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/App/Pm2Port/.packlist
-@dirrmtry %%SITE_PERL%%/App
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/App/Pm2Port
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/App
diff --git a/ports-mgmt/p5-FreeBSD-Pkgs-FindUpdates/Makefile b/ports-mgmt/p5-FreeBSD-Pkgs-FindUpdates/Makefile
index 7c2f7d34e624..4871ea7782cc 100644
--- a/ports-mgmt/p5-FreeBSD-Pkgs-FindUpdates/Makefile
+++ b/ports-mgmt/p5-FreeBSD-Pkgs-FindUpdates/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	FreeBSD-Pkgs-FindUpdates
 PORTVERSION=	0.3.0
+PORTREVISION=	1
 CATEGORIES=	ports-mgmt sysutils perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:VVELOX
diff --git a/ports-mgmt/p5-FreeBSD-Pkgs-FindUpdates/pkg-plist b/ports-mgmt/p5-FreeBSD-Pkgs-FindUpdates/pkg-plist
index ed51135c8ea2..613895527725 100644
--- a/ports-mgmt/p5-FreeBSD-Pkgs-FindUpdates/pkg-plist
+++ b/ports-mgmt/p5-FreeBSD-Pkgs-FindUpdates/pkg-plist
@@ -1,9 +1,3 @@
 bin/pkg_findupdates
 %%SITE_PERL%%/FreeBSD/Pkgs/FindUpdates.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/FreeBSD/Pkgs/FindUpdates/.packlist
 %%PERL5_MAN3%%/FreeBSD::Pkgs::FindUpdates.3.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/FreeBSD/Pkgs/FindUpdates
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/FreeBSD/Pkgs
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/FreeBSD
-@dirrmtry %%SITE_PERL%%/FreeBSD/Pkgs
-@dirrmtry %%SITE_PERL%%/FreeBSD
diff --git a/ports-mgmt/p5-FreeBSD-Pkgs/Makefile b/ports-mgmt/p5-FreeBSD-Pkgs/Makefile
index ea5db318fafd..0821de57bfec 100644
--- a/ports-mgmt/p5-FreeBSD-Pkgs/Makefile
+++ b/ports-mgmt/p5-FreeBSD-Pkgs/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	FreeBSD-Pkgs
 PORTVERSION=	0.2.0
+PORTREVISION=	1
 CATEGORIES=	ports-mgmt sysutils perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/ports-mgmt/p5-FreeBSD-Pkgs/pkg-plist b/ports-mgmt/p5-FreeBSD-Pkgs/pkg-plist
index 1e646c98b980..aba4b47effdb 100644
--- a/ports-mgmt/p5-FreeBSD-Pkgs/pkg-plist
+++ b/ports-mgmt/p5-FreeBSD-Pkgs/pkg-plist
@@ -1,6 +1,2 @@
 %%SITE_PERL%%/FreeBSD/Pkgs.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/FreeBSD/Pkgs/.packlist
 %%PERL5_MAN3%%/FreeBSD::Pkgs.3.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/FreeBSD/Pkgs
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/FreeBSD
-@dirrmtry %%SITE_PERL%%/FreeBSD
diff --git a/ports-mgmt/p5-FreeBSD-Portindex/Makefile b/ports-mgmt/p5-FreeBSD-Portindex/Makefile
index f5d713f64c0d..7c10ac0d2f43 100644
--- a/ports-mgmt/p5-FreeBSD-Portindex/Makefile
+++ b/ports-mgmt/p5-FreeBSD-Portindex/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	FreeBSD-Portindex
 PORTVERSION=	3.4
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	ports-mgmt perl5
 MASTER_SITES=	http://www.infracaninophile.co.uk/portindex/
 PKGNAMEPREFIX=	p5-
diff --git a/ports-mgmt/p5-FreeBSD-Portindex/pkg-plist b/ports-mgmt/p5-FreeBSD-Portindex/pkg-plist
index 875cd50f086c..050f8eb0c62a 100644
--- a/ports-mgmt/p5-FreeBSD-Portindex/pkg-plist
+++ b/ports-mgmt/p5-FreeBSD-Portindex/pkg-plist
@@ -23,8 +23,3 @@ etc/portindex.cfg.sample
 %%SITE_PERL%%/FreeBSD/Portindex/PortsTreeObject.pm
 %%SITE_PERL%%/FreeBSD/Portindex/Tree.pm
 %%SITE_PERL%%/FreeBSD/Portindex/TreeObject.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/FreeBSD/Portindex/.packlist
-@dirrm %%SITE_PERL%%/FreeBSD/Portindex
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/FreeBSD/Portindex
-@dirrmtry %%SITE_PERL%%/FreeBSD
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/FreeBSD
diff --git a/ports-mgmt/p5-FreeBSD-Ports-INDEXhash/Makefile b/ports-mgmt/p5-FreeBSD-Ports-INDEXhash/Makefile
index 6af629e324dd..67e63d4603da 100644
--- a/ports-mgmt/p5-FreeBSD-Ports-INDEXhash/Makefile
+++ b/ports-mgmt/p5-FreeBSD-Ports-INDEXhash/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	FreeBSD-Ports-INDEXhash
 PORTVERSION=	1.2.2
+PORTREVISION=	1
 CATEGORIES=	ports-mgmt sysutils perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/ports-mgmt/p5-FreeBSD-Ports-INDEXhash/pkg-plist b/ports-mgmt/p5-FreeBSD-Ports-INDEXhash/pkg-plist
index 2a56efa6d5c9..091b08eb27c9 100644
--- a/ports-mgmt/p5-FreeBSD-Ports-INDEXhash/pkg-plist
+++ b/ports-mgmt/p5-FreeBSD-Ports-INDEXhash/pkg-plist
@@ -1,8 +1,2 @@
 %%SITE_PERL%%/FreeBSD/Ports/INDEXhash.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/FreeBSD/Ports/INDEXhash/.packlist
 %%PERL5_MAN3%%/FreeBSD::Ports::INDEXhash.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/FreeBSD/Ports/INDEXhash
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/FreeBSD/Ports
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/FreeBSD
-@dirrmtry %%SITE_PERL%%/FreeBSD/Ports
-@dirrmtry %%SITE_PERL%%/FreeBSD
diff --git a/ports-mgmt/p5-FreeBSD-Ports/Makefile b/ports-mgmt/p5-FreeBSD-Ports/Makefile
index d4ea6abf7a05..986b7d2f7cf5 100644
--- a/ports-mgmt/p5-FreeBSD-Ports/Makefile
+++ b/ports-mgmt/p5-FreeBSD-Ports/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	FreeBSD-Ports
 PORTVERSION=	0.04
+PORTREVISION=	1
 CATEGORIES=	ports-mgmt perl5
 MASTER_SITES=	${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=	tom
diff --git a/ports-mgmt/p5-FreeBSD-Ports/pkg-plist b/ports-mgmt/p5-FreeBSD-Ports/pkg-plist
index d5fc2b80a57e..7a4c042757b5 100644
--- a/ports-mgmt/p5-FreeBSD-Ports/pkg-plist
+++ b/ports-mgmt/p5-FreeBSD-Ports/pkg-plist
@@ -2,8 +2,3 @@
 %%PERL5_MAN3%%/FreeBSD::Ports::Port.3.gz
 %%SITE_PERL%%/FreeBSD/Ports.pm
 %%SITE_PERL%%/FreeBSD/Ports/Port.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/FreeBSD/Ports/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/FreeBSD/Ports
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/FreeBSD
-@dirrmtry %%SITE_PERL%%/FreeBSD/Ports
-@dirrmtry %%SITE_PERL%%/FreeBSD
diff --git a/ports-mgmt/portlint/Makefile b/ports-mgmt/portlint/Makefile
index 8a49a1fc22e6..e80a478a0484 100644
--- a/ports-mgmt/portlint/Makefile
+++ b/ports-mgmt/portlint/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	portlint
 PORTVERSION=	2.16.1
+PORTREVISION=	1
 CATEGORIES=	ports-mgmt
 MASTER_SITES=	# none
 DISTFILES=	# none
diff --git a/ports-mgmt/portscout/Makefile b/ports-mgmt/portscout/Makefile
index 1f98e0fbd4dd..8d62802e1eb9 100644
--- a/ports-mgmt/portscout/Makefile
+++ b/ports-mgmt/portscout/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	portscout
 PORTVERSION=	0.8.1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	ports-mgmt
 MASTER_SITES=	http://mirror.inerd.com/FreeBSD/distfiles/${PORTNAME}/	\
 		http://www.atarininja.org/~wxs/distfiles/		\
@@ -61,18 +61,18 @@ post-patch:
 	@${MV} ${WRKSRC}/docs/*.* ${WRKSRC}
 
 do-install:
-	@${MKDIR} ${STAGEDIR}${SITE_PERL}/Portscout
-	@${MKDIR} ${STAGEDIR}${SITE_PERL}/Portscout/DataSrc
-	@${MKDIR} ${STAGEDIR}${SITE_PERL}/Portscout/SiteHandler
-	@${MKDIR} ${STAGEDIR}${SITE_PERL}/Portscout/SQL
-	${INSTALL_SCRIPT} ${WRKSRC}/Portscout/*.pm ${STAGEDIR}${SITE_PERL}/Portscout/
-	${INSTALL_SCRIPT} ${WRKSRC}/Portscout/DataSrc/*.pm ${STAGEDIR}${SITE_PERL}/Portscout/DataSrc/
-	${INSTALL_SCRIPT} ${WRKSRC}/Portscout/SiteHandler/*.pm ${STAGEDIR}${SITE_PERL}/Portscout/SiteHandler/
-	${INSTALL_SCRIPT} ${WRKSRC}/Portscout/SQL/*.pm ${STAGEDIR}${SITE_PERL}/Portscout/SQL/
-	${INSTALL_SCRIPT} ${WRKSRC}/Portscout.pm ${STAGEDIR}${SITE_PERL}/Portscout.pm
+	@${MKDIR} ${STAGEDIR}${PREFIX}/${SITE_PERL_REL}/Portscout
+	@${MKDIR} ${STAGEDIR}${PREFIX}/${SITE_PERL_REL}/Portscout/DataSrc
+	@${MKDIR} ${STAGEDIR}${PREFIX}/${SITE_PERL_REL}/Portscout/SiteHandler
+	@${MKDIR} ${STAGEDIR}${PREFIX}/${SITE_PERL_REL}/Portscout/SQL
+	${INSTALL_SCRIPT} ${WRKSRC}/Portscout/*.pm ${STAGEDIR}${PREFIX}/${SITE_PERL_REL}/Portscout/
+	${INSTALL_SCRIPT} ${WRKSRC}/Portscout/DataSrc/*.pm ${STAGEDIR}${PREFIX}/${SITE_PERL_REL}/Portscout/DataSrc/
+	${INSTALL_SCRIPT} ${WRKSRC}/Portscout/SiteHandler/*.pm ${STAGEDIR}${PREFIX}/${SITE_PERL_REL}/Portscout/SiteHandler/
+	${INSTALL_SCRIPT} ${WRKSRC}/Portscout/SQL/*.pm ${STAGEDIR}${PREFIX}/${SITE_PERL_REL}/Portscout/SQL/
+	${INSTALL_SCRIPT} ${WRKSRC}/Portscout.pm ${STAGEDIR}${PREFIX}/${SITE_PERL_REL}/Portscout.pm
 	${INSTALL_SCRIPT} ${WRKSRC}/portscout.pl ${STAGEDIR}${PREFIX}/bin/portscout
 
-	${INSTALL_DATA} ${WRKSRC}/portscout.pod ${STAGEDIR}${SITE_PERL}
+	${INSTALL_DATA} ${WRKSRC}/portscout.pod ${STAGEDIR}${PREFIX}/${SITE_PERL_REL}
 
 	pod2man ${WRKSRC}/portscout.pod ${WRKSRC}/portscout.1
 	${INSTALL_MAN} ${WRKSRC}/portscout.1 ${STAGEDIR}${MAN1PREFIX}/man/man1/