3 files changed, 27 insertions, 28 deletions

diff --git a/cad/p5-GDS2/Makefile b/cad/p5-GDS2/Makefile
index 0b15a11b7b43..3f580a1bb011 100644
--- a/cad/p5-GDS2/Makefile
+++ b/cad/p5-GDS2/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	GDS2
 PORTVERSION=	3.29
+PORTREVISION=	1
 CATEGORIES=	cad perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
@@ -17,11 +18,9 @@ RUN_DEPENDS=	p5-Tk>=804.027:${PORTSDIR}/x11-toolkits/p5-Tk \
 USES=		perl5 shebangfix
 USE_PERL5=	configure
 SHEBANG_FILES=	Examples/*
-PLIST_FILES=	%%SITE_PERL%%/%%PERL_ARCH%%/auto/GDS2/.packlist \
-		%%SITE_PERL%%/GDS2.pm \
+PLIST_FILES=	%%SITE_PERL%%/GDS2.pm \
 		${PROGRAMS:S,^,bin/,} \
 		%%PERL5_MAN3%%/GDS2.3.gz
-PLIST_DIRS=	%%SITE_PERL%%/%%PERL_ARCH%%/auto/GDS2
 
 PROGRAMS=	gds2dump gdsdump2gds modgds2 gdslayers testgds2 \
 		gdspath4topath0 testgdt
diff --git a/cad/p5-Verilog-Perl/Makefile b/cad/p5-Verilog-Perl/Makefile
index 2d119981ccda..2d7115e4b5d5 100644
--- a/cad/p5-Verilog-Perl/Makefile
+++ b/cad/p5-Verilog-Perl/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	Verilog-Perl
 PORTVERSION=	3.404
+PORTREVISION=	1
 CATEGORIES=	cad perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
@@ -22,7 +23,7 @@ CONFIGURE_ENV=	CXX=${CXX}\
 .include <bsd.port.pre.mk>
 
 post-install:
-	${STRIP_CMD} ${STAGEDIR}${SITE_PERL}/${PERL_ARCH}/auto/Verilog/Parser/*.so
+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/${SITE_ARCH_REL}/auto/Verilog/Parser/*.so
 
 regression-test: build
 	make test -C ${WRKSRC}
diff --git a/cad/p5-Verilog-Perl/pkg-plist b/cad/p5-Verilog-Perl/pkg-plist
index 7aed586e8439..6bb05857ad83 100644
--- a/cad/p5-Verilog-Perl/pkg-plist
+++ b/cad/p5-Verilog-Perl/pkg-plist
@@ -24,30 +24,29 @@ bin/vsplitmodule
 %%PERL5_MAN3%%/Verilog::SigParser.3.gz
 %%PERL5_MAN3%%/Verilog::Std.3.gz
 %%PERL5_MAN3%%/Verilog::Verilog-Perl.3.gz
-%%SITE_PERL%%/%%PERL_ARCH%%/Verilog/EditFiles.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Verilog/Getopt.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Verilog/Language.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Verilog/Netlist.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Verilog/Netlist/Cell.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Verilog/Netlist/ContAssign.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Verilog/Netlist/Defparam.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Verilog/Netlist/File.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Verilog/Netlist/Interface.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Verilog/Netlist/Logger.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Verilog/Netlist/ModPort.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Verilog/Netlist/Module.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Verilog/Netlist/Net.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Verilog/Netlist/Pin.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Verilog/Netlist/Port.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Verilog/Netlist/Subclass.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Verilog/Parser.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Verilog/Preproc.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Verilog/SigParser.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Verilog/Std.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/Verilog/Verilog-Perl.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Verilog/Language/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Verilog/Parser/Parser.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Verilog/Preproc/Preproc.so
+%%SITE_ARCH%%/Verilog/EditFiles.pm
+%%SITE_ARCH%%/Verilog/Getopt.pm
+%%SITE_ARCH%%/Verilog/Language.pm
+%%SITE_ARCH%%/Verilog/Netlist.pm
+%%SITE_ARCH%%/Verilog/Netlist/Cell.pm
+%%SITE_ARCH%%/Verilog/Netlist/ContAssign.pm
+%%SITE_ARCH%%/Verilog/Netlist/Defparam.pm
+%%SITE_ARCH%%/Verilog/Netlist/File.pm
+%%SITE_ARCH%%/Verilog/Netlist/Interface.pm
+%%SITE_ARCH%%/Verilog/Netlist/Logger.pm
+%%SITE_ARCH%%/Verilog/Netlist/ModPort.pm
+%%SITE_ARCH%%/Verilog/Netlist/Module.pm
+%%SITE_ARCH%%/Verilog/Netlist/Net.pm
+%%SITE_ARCH%%/Verilog/Netlist/Pin.pm
+%%SITE_ARCH%%/Verilog/Netlist/Port.pm
+%%SITE_ARCH%%/Verilog/Netlist/Subclass.pm
+%%SITE_ARCH%%/Verilog/Parser.pm
+%%SITE_ARCH%%/Verilog/Preproc.pm
+%%SITE_ARCH%%/Verilog/SigParser.pm
+%%SITE_ARCH%%/Verilog/Std.pm
+%%SITE_ARCH%%/Verilog/Verilog-Perl.pod
+%%SITE_ARCH%%/auto/Verilog/Parser/Parser.so
+%%SITE_ARCH%%/auto/Verilog/Preproc/Preproc.so
 man/man1/vhier.1.gz
 man/man1/vpassert.1.gz
 man/man1/vppreproc.1.gz