diff --git a/www/p5-CGI-modules/Makefile b/www/p5-CGI-modules/Makefile
index 25c9e85d9262..55a311de24d7 100644
--- a/www/p5-CGI-modules/Makefile
+++ b/www/p5-CGI-modules/Makefile
@@ -3,7 +3,7 @@
 # Date created:				September 30th 1996
 # Whom:	      				James FitzGibbon <jfitz@FreeBSD.org>
 #
-#   $Id: Makefile,v 1.6 1997/05/24 13:17:15 jfitz Exp $
+#   $Id: Makefile,v 1.7 1997/06/24 18:43:06 jfitz Exp $
 #
 
 DISTNAME=	CGI-modules-2.76
@@ -20,7 +20,7 @@ USE_PERL5=	YES
 
 MAN3=		CGI::Base.3 CGI::BasePlus.3 CGI::Carp.3 CGI::Form.3 \
 		CGI::MiniSvr.3 CGI::Request.3
-MANPREFIX=	${PREFIX}/lib/perl5
+MANPREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
 
 do-configure:
 		@ cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PREFIX}/bin/perl Makefile.PL
diff --git a/www/p5-CGI-modules/pkg-plist b/www/p5-CGI-modules/pkg-plist
index f91ba836bba8..f1ba60970511 100644
--- a/www/p5-CGI-modules/pkg-plist
+++ b/www/p5-CGI-modules/pkg-plist
@@ -1,10 +1,10 @@
-lib/perl5/site_perl/CGI/Base.pm
-lib/perl5/site_perl/CGI/Form.pm
-lib/perl5/site_perl/CGI/Carp.pm
-lib/perl5/site_perl/CGI/BasePlus.pm
-lib/perl5/site_perl/CGI/test.pl
-lib/perl5/site_perl/CGI/MiniSvr.pm
-lib/perl5/site_perl/CGI/Request.pm
-lib/perl5/site_perl/i386-freebsd/auto/CGI/.packlist
-@dirrm lib/perl5/site_perl/i386-freebsd/auto/CGI
-@dirrm lib/perl5/site_perl/CGI
+lib/perl5/site_perl/%%PERL_VER%%/CGI/Base.pm
+lib/perl5/site_perl/%%PERL_VER%%/CGI/Form.pm
+lib/perl5/site_perl/%%PERL_VER%%/CGI/Carp.pm
+lib/perl5/site_perl/%%PERL_VER%%/CGI/BasePlus.pm
+lib/perl5/site_perl/%%PERL_VER%%/CGI/test.pl
+lib/perl5/site_perl/%%PERL_VER%%/CGI/MiniSvr.pm
+lib/perl5/site_perl/%%PERL_VER%%/CGI/Request.pm
+lib/perl5/site_perl/%%PERL_VER%%/i386-freebsd/auto/CGI/.packlist
+@dirrm lib/perl5/site_perl/%%PERL_VER%%/i386-freebsd/auto/CGI
+@dirrm lib/perl5/site_perl/%%PERL_VER%%/CGI
diff --git a/www/p5-CGI/Makefile b/www/p5-CGI/Makefile
index 25c9e85d9262..55a311de24d7 100644
--- a/www/p5-CGI/Makefile
+++ b/www/p5-CGI/Makefile
@@ -3,7 +3,7 @@
 # Date created:				September 30th 1996
 # Whom:	      				James FitzGibbon <jfitz@FreeBSD.org>
 #
-#   $Id: Makefile,v 1.6 1997/05/24 13:17:15 jfitz Exp $
+#   $Id: Makefile,v 1.7 1997/06/24 18:43:06 jfitz Exp $
 #
 
 DISTNAME=	CGI-modules-2.76
@@ -20,7 +20,7 @@ USE_PERL5=	YES
 
 MAN3=		CGI::Base.3 CGI::BasePlus.3 CGI::Carp.3 CGI::Form.3 \
 		CGI::MiniSvr.3 CGI::Request.3
-MANPREFIX=	${PREFIX}/lib/perl5
+MANPREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
 
 do-configure:
 		@ cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PREFIX}/bin/perl Makefile.PL
diff --git a/www/p5-CGI/pkg-plist b/www/p5-CGI/pkg-plist
index f91ba836bba8..f1ba60970511 100644
--- a/www/p5-CGI/pkg-plist
+++ b/www/p5-CGI/pkg-plist
@@ -1,10 +1,10 @@
-lib/perl5/site_perl/CGI/Base.pm
-lib/perl5/site_perl/CGI/Form.pm
-lib/perl5/site_perl/CGI/Carp.pm
-lib/perl5/site_perl/CGI/BasePlus.pm
-lib/perl5/site_perl/CGI/test.pl
-lib/perl5/site_perl/CGI/MiniSvr.pm
-lib/perl5/site_perl/CGI/Request.pm
-lib/perl5/site_perl/i386-freebsd/auto/CGI/.packlist
-@dirrm lib/perl5/site_perl/i386-freebsd/auto/CGI
-@dirrm lib/perl5/site_perl/CGI
+lib/perl5/site_perl/%%PERL_VER%%/CGI/Base.pm
+lib/perl5/site_perl/%%PERL_VER%%/CGI/Form.pm
+lib/perl5/site_perl/%%PERL_VER%%/CGI/Carp.pm
+lib/perl5/site_perl/%%PERL_VER%%/CGI/BasePlus.pm
+lib/perl5/site_perl/%%PERL_VER%%/CGI/test.pl
+lib/perl5/site_perl/%%PERL_VER%%/CGI/MiniSvr.pm
+lib/perl5/site_perl/%%PERL_VER%%/CGI/Request.pm
+lib/perl5/site_perl/%%PERL_VER%%/i386-freebsd/auto/CGI/.packlist
+@dirrm lib/perl5/site_perl/%%PERL_VER%%/i386-freebsd/auto/CGI
+@dirrm lib/perl5/site_perl/%%PERL_VER%%/CGI