68 files changed, 293 insertions, 348 deletions

diff --git a/devel/p5-BSD-Resource/Makefile b/devel/p5-BSD-Resource/Makefile
index 8615d8cd0c6b..7bce500da0d1 100644
--- a/devel/p5-BSD-Resource/Makefile
+++ b/devel/p5-BSD-Resource/Makefile
@@ -3,7 +3,7 @@
 # Date created:				October 20th 1996
 # Whom:	      				James FitzGibbon <jfitz@FreeBSD.org>
 #
-# $Id: Makefile,v 1.8 1997/06/27 02:27:00 jfitz Exp $
+# $Id: Makefile,v 1.9 1998/02/18 18:12:39 vanilla Exp $
 #
 
 DISTNAME=	BSD-Resource-1.0701
@@ -17,7 +17,7 @@ MAINTAINER=	jfitz@FreeBSD.ORG
 USE_PERL5=	YES
 
 MAN3=		BSD::Resource.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/devel/p5-BSD-Resource/pkg-plist b/devel/p5-BSD-Resource/pkg-plist
index 99528a6aafe0..5d369e55da42 100644
--- a/devel/p5-BSD-Resource/pkg-plist
+++ b/devel/p5-BSD-Resource/pkg-plist
@@ -1,33 +1,32 @@
-lib/perl5/man/man3/BSD::Resource.3.gz
-lib/perl5/site_perl/BSD/Resource.pm
-lib/perl5/site_perl/auto/BSD/Resource/_g.al
-lib/perl5/site_perl/auto/BSD/Resource/autosplit.ix
-lib/perl5/site_perl/auto/BSD/Resource/get_rlimits.al
-lib/perl5/site_perl/auto/BSD/Resource/getpriority.al
-lib/perl5/site_perl/auto/BSD/Resource/getrlimit.al
-lib/perl5/site_perl/auto/BSD/Resource/getrusage.al
-lib/perl5/site_perl/auto/BSD/Resource/hard.al
-lib/perl5/site_perl/auto/BSD/Resource/idrss.al
-lib/perl5/site_perl/auto/BSD/Resource/inblock.al
-lib/perl5/site_perl/auto/BSD/Resource/ixrss.al
-lib/perl5/site_perl/auto/BSD/Resource/majflt.al
-lib/perl5/site_perl/auto/BSD/Resource/maxrss.al
-lib/perl5/site_perl/auto/BSD/Resource/minflt.al
-lib/perl5/site_perl/auto/BSD/Resource/msgrcv.al
-lib/perl5/site_perl/auto/BSD/Resource/msgsnd.al
-lib/perl5/site_perl/auto/BSD/Resource/nivcsw.al
-lib/perl5/site_perl/auto/BSD/Resource/nsignals.al
-lib/perl5/site_perl/auto/BSD/Resource/nswap.al
-lib/perl5/site_perl/auto/BSD/Resource/nvcsw.al
-lib/perl5/site_perl/auto/BSD/Resource/oublock.al
-lib/perl5/site_perl/auto/BSD/Resource/setpriority.al
-lib/perl5/site_perl/auto/BSD/Resource/setrlimit.al
-lib/perl5/site_perl/auto/BSD/Resource/soft.al
-lib/perl5/site_perl/auto/BSD/Resource/stime.al
-lib/perl5/site_perl/auto/BSD/Resource/times.al
-lib/perl5/site_perl/auto/BSD/Resource/utime.al
-lib/perl5/site_perl/i386-freebsd/auto/BSD/Resource/Resource.bs
-lib/perl5/site_perl/i386-freebsd/auto/BSD/Resource/Resource.so
-lib/perl5/site_perl/i386-freebsd/auto/BSD/Resource/.packlist
-@dirrm lib/perl5/site_perl/i386-freebsd/auto/BSD/Resource
-@dirrm lib/perl5/site_perl/auto/BSD/Resource
+lib/perl5/site_perl/%%PERL_VER%%/i386-freebsd/BSD/Resource.pm
+lib/perl5/site_perl/%%PERL_VER%%/i386-freebsd/auto/BSD/Resource/_g.al
+lib/perl5/site_perl/%%PERL_VER%%/i386-freebsd/auto/BSD/Resource/autosplit.ix
+lib/perl5/site_perl/%%PERL_VER%%/i386-freebsd/auto/BSD/Resource/get_rlimits.al
+lib/perl5/site_perl/%%PERL_VER%%/i386-freebsd/auto/BSD/Resource/getpriority.al
+lib/perl5/site_perl/%%PERL_VER%%/i386-freebsd/auto/BSD/Resource/getrlimit.al
+lib/perl5/site_perl/%%PERL_VER%%/i386-freebsd/auto/BSD/Resource/getrusage.al
+lib/perl5/site_perl/%%PERL_VER%%/i386-freebsd/auto/BSD/Resource/hard.al
+lib/perl5/site_perl/%%PERL_VER%%/i386-freebsd/auto/BSD/Resource/idrss.al
+lib/perl5/site_perl/%%PERL_VER%%/i386-freebsd/auto/BSD/Resource/inblock.al
+lib/perl5/site_perl/%%PERL_VER%%/i386-freebsd/auto/BSD/Resource/ixrss.al
+lib/perl5/site_perl/%%PERL_VER%%/i386-freebsd/auto/BSD/Resource/majflt.al
+lib/perl5/site_perl/%%PERL_VER%%/i386-freebsd/auto/BSD/Resource/maxrss.al
+lib/perl5/site_perl/%%PERL_VER%%/i386-freebsd/auto/BSD/Resource/minflt.al
+lib/perl5/site_perl/%%PERL_VER%%/i386-freebsd/auto/BSD/Resource/msgrcv.al
+lib/perl5/site_perl/%%PERL_VER%%/i386-freebsd/auto/BSD/Resource/msgsnd.al
+lib/perl5/site_perl/%%PERL_VER%%/i386-freebsd/auto/BSD/Resource/nivcsw.al
+lib/perl5/site_perl/%%PERL_VER%%/i386-freebsd/auto/BSD/Resource/nsignals.al
+lib/perl5/site_perl/%%PERL_VER%%/i386-freebsd/auto/BSD/Resource/nswap.al
+lib/perl5/site_perl/%%PERL_VER%%/i386-freebsd/auto/BSD/Resource/nvcsw.al
+lib/perl5/site_perl/%%PERL_VER%%/i386-freebsd/auto/BSD/Resource/oublock.al
+lib/perl5/site_perl/%%PERL_VER%%/i386-freebsd/auto/BSD/Resource/setpriority.al
+lib/perl5/site_perl/%%PERL_VER%%/i386-freebsd/auto/BSD/Resource/setrlimit.al
+lib/perl5/site_perl/%%PERL_VER%%/i386-freebsd/auto/BSD/Resource/soft.al
+lib/perl5/site_perl/%%PERL_VER%%/i386-freebsd/auto/BSD/Resource/stime.al
+lib/perl5/site_perl/%%PERL_VER%%/i386-freebsd/auto/BSD/Resource/times.al
+lib/perl5/site_perl/%%PERL_VER%%/i386-freebsd/auto/BSD/Resource/utime.al
+lib/perl5/site_perl/%%PERL_VER%%/i386-freebsd/auto/BSD/Resource/Resource.bs
+lib/perl5/site_perl/%%PERL_VER%%/i386-freebsd/auto/BSD/Resource/Resource.so
+lib/perl5/site_perl/%%PERL_VER%%/i386-freebsd/auto/BSD/Resource/.packlist
+@dirrm lib/perl5/site_perl/%%PERL_VER%%/i386-freebsd/auto/BSD/Resource
+@dirrm lib/perl5/site_perl/%%PERL_VER%%/i386-freebsd/BSD
diff --git a/devel/p5-C-Scan/Makefile b/devel/p5-C-Scan/Makefile
index aaf87830d64d..a0e14e51fdb8 100644
--- a/devel/p5-C-Scan/Makefile
+++ b/devel/p5-C-Scan/Makefile
@@ -3,7 +3,7 @@
 # Date created:				October 20th 1996
 # Whom:	      				James FitzGibbon <jfitz@FreeBSD.org>
 #
-# $Id: Makefile,v 1.9 1997/09/14 02:54:12 jfitz Exp $
+# $Id: Makefile,v 1.10 1998/04/04 13:55:57 vanilla Exp $
 #
 
 DISTNAME=	C-Scan-0.5
@@ -14,12 +14,12 @@ MASTER_SITE_SUBDIR=	C
 
 MAINTAINER=	jfitz@FreeBSD.ORG
 
-BUILD_DEPENDS= 	${PREFIX}/lib/perl5/site_perl/Data/Flow.pm:${PORTSDIR}/devel/p5-Data-Flow
+BUILD_DEPENDS= 	${PREFIX}/lib/perl5/site_perl/${PERL_VER}/Data/Flow.pm:${PORTSDIR}/devel/p5-Data-Flow
 
 USE_PERL5=	YES
 
 MAN3=		C::Scan.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/devel/p5-C-Scan/pkg-plist b/devel/p5-C-Scan/pkg-plist
index 07f5b9569e4c..d980018d5a71 100644
--- a/devel/p5-C-Scan/pkg-plist
+++ b/devel/p5-C-Scan/pkg-plist
@@ -1,4 +1,3 @@
-lib/perl5/man/man3/C::Scan.3.gz
-lib/perl5/site_perl/C/Scan.pm
-lib/perl5/site_perl/i386-freebsd/auto/C/Scan/.packlist
-@dirrm lib/perl5/site_perl/i386-freebsd/auto/C/Scan
+lib/perl5/site_perl/%%PERL_VER%%/C/Scan.pm
+lib/perl5/site_perl/%%PERL_VER%%/i386-freebsd/auto/C/Scan/.packlist
+@dirrm lib/perl5/site_perl/%%PERL_VER%%/i386-freebsd/auto/C/Scan
diff --git a/devel/p5-Config-IniFiles/Makefile b/devel/p5-Config-IniFiles/Makefile
index d73986ec1bb3..e03fd1cc73c3 100644
--- a/devel/p5-Config-IniFiles/Makefile
+++ b/devel/p5-Config-IniFiles/Makefile
@@ -3,7 +3,7 @@
 # Date created:				October 21st 1996
 # Whom:	      				James FitzGibbon <jfitz@FreeBSD.org>
 #
-#   $Id: Makefile,v 1.6 1997/06/24 18:43:22 jfitz Exp $
+#   $Id: Makefile,v 1.7 1997/09/14 02:54:56 jfitz Exp $
 #
 
 DISTNAME=	IniConf.pm-0.92
@@ -17,7 +17,7 @@ MAINTAINER=	jfitz@FreeBSD.ORG
 USE_PERL5=	YES
 
 MAN3=		IniConf.pm.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/devel/p5-Config-IniFiles/pkg-plist b/devel/p5-Config-IniFiles/pkg-plist
index a94e334b729a..be9c914dfa37 100644
--- a/devel/p5-Config-IniFiles/pkg-plist
+++ b/devel/p5-Config-IniFiles/pkg-plist
@@ -1,4 +1,3 @@
-lib/perl5/man/man3/IniConf.pm.3.gz
-lib/perl5/site_perl/IniConf.pm
-lib/perl5/site_perl/i386-freebsd/auto/IniConf.pm/.packlist
-@dirrm lib/perl5/site_perl/i386-freebsd/auto/IniConf.pm
+lib/perl5/site_perl/%%PERL_VER%%/IniConf.pm
+lib/perl5/site_perl/%%PERL_VER%%/i386-freebsd/auto/IniConf.pm/.packlist
+@dirrm lib/perl5/site_perl/%%PERL_VER%%/i386-freebsd/auto/IniConf.pm
diff --git a/devel/p5-Curses/Makefile b/devel/p5-Curses/Makefile
index c72fd0e3df0f..8250b1bdbf3a 100644
--- a/devel/p5-Curses/Makefile
+++ b/devel/p5-Curses/Makefile
@@ -3,7 +3,7 @@
 # Date created:				October 17th 1996
 # Whom:	      				James FitzGibbon <jfitz@FreeBSD.org>
 #
-# $Id: Makefile,v 1.7 1997/06/24 18:43:09 jfitz Exp $
+# $Id: Makefile,v 1.8 1998/04/04 13:58:26 vanilla Exp $
 #
 
 DISTNAME=	Curses-1.02
@@ -17,7 +17,7 @@ MAINTAINER=	jfitz@FreeBSD.ORG
 USE_PERL5=	YES
 
 MAN3=		Curses.3
-MANPREFIX=	${PREFIX}/lib/perl5
+MANPREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
 
 pre-configure:
 		@ ln -s ${WRKSRC}/hints/c-freebsd.ncurses.h ${WRKSRC}/c-config.h
diff --git a/devel/p5-Curses/pkg-plist b/devel/p5-Curses/pkg-plist
index a18d6b18eae1..9acc9e606127 100644
--- a/devel/p5-Curses/pkg-plist
+++ b/devel/p5-Curses/pkg-plist
@@ -1,6 +1,5 @@
-lib/perl5/man/man3/Curses.3.gz
-lib/perl5/site_perl/Curses.pm
-lib/perl5/site_perl/i386-freebsd/auto/Curses/Curses.bs
-lib/perl5/site_perl/i386-freebsd/auto/Curses/Curses.so
-lib/perl5/site_perl/i386-freebsd/auto/Curses/.packlist
-@dirrm lib/perl5/site_perl/i386-freebsd/auto/Curses
+lib/perl5/site_perl/%%PERL_VER%%/i386-freebsd/Curses.pm
+lib/perl5/site_perl/%%PERL_VER%%/i386-freebsd/auto/Curses/Curses.bs
+lib/perl5/site_perl/%%PERL_VER%%/i386-freebsd/auto/Curses/Curses.so
+lib/perl5/site_perl/%%PERL_VER%%/i386-freebsd/auto/Curses/.packlist
+@dirrm lib/perl5/site_perl/%%PERL_VER%%/i386-freebsd/auto/Curses
diff --git a/devel/p5-Data-Flow/Makefile b/devel/p5-Data-Flow/Makefile
index b2c6f9dbe19c..d35715e7c2aa 100644
--- a/devel/p5-Data-Flow/Makefile
+++ b/devel/p5-Data-Flow/Makefile
@@ -3,7 +3,7 @@
 # Date created:				October 20th 1996
 # Whom:	      				James FitzGibbon <jfitz@FreeBSD.org>
 #
-#   $Id: Makefile,v 1.6 1997/06/24 18:43:12 jfitz Exp $
+#   $Id: Makefile,v 1.7 1997/09/14 02:54:33 jfitz Exp $
 #
 
 DISTNAME=	Data-Flow-0.05
@@ -17,7 +17,7 @@ MAINTAINER=	jfitz@FreeBSD.ORG
 USE_PERL5=	YES
 
 MAN3=		Data::Flow.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/devel/p5-Data-Flow/pkg-plist b/devel/p5-Data-Flow/pkg-plist
index ef828c2d8d85..846f0d022aff 100644
--- a/devel/p5-Data-Flow/pkg-plist
+++ b/devel/p5-Data-Flow/pkg-plist
@@ -1,5 +1,4 @@
-lib/perl5/man/man3/Data::Flow.3.gz
-lib/perl5/site_perl/Data/Flow.pm
-lib/perl5/site_perl/auto/Data/Flow/autosplit.ix
-lib/perl5/site_perl/i386-freebsd/auto/Data/Flow/.packlist
-@dirrm lib/perl5/site_perl/i386-freebsd/auto/Data/Flow
+lib/perl5/site_perl/%%PERL_VER%%/Data/Flow.pm
+lib/perl5/site_perl/%%PERL_VER%%/auto/Data/Flow/autosplit.ix
+lib/perl5/site_perl/%%PERL_VER%%/i386-freebsd/auto/Data/Flow/.packlist
+@dirrm lib/perl5/site_perl/%%PERL_VER%%/i386-freebsd/auto/Data/Flow
diff --git a/devel/p5-Data-ShowTable/Makefile b/devel/p5-Data-ShowTable/Makefile
index c73b9264468c..cc7ccab0121e 100644
--- a/devel/p5-Data-ShowTable/Makefile
+++ b/devel/p5-Data-ShowTable/Makefile
@@ -3,7 +3,7 @@
 # Date created:				September 10th 1997
 # Whom:	      				James FitzGibbon <jfitz@FreeBSD.org>
 #
-# $Id: Makefile,v 1.2 1998/04/19 10:43:52 asami Exp $
+# $Id: Makefile,v 1.3 1998/08/06 14:59:52 vanilla Exp $
 #
 
 DISTNAME=	Data-ShowTable-3.3
@@ -18,7 +18,7 @@ USE_PERL5=	YES
 
 MAN1=		showtable.1
 MAN3=		Data::ShowTable.3
-MAN3PREFIX=	${PREFIX}/lib/perl5/5.00501
+MAN3PREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
 
 do-configure:
 		@cd ${WRKSRC}; ${SETENV} ${CONFIGURE_ENV} ${PREFIX}/bin/perl Makefile.PL
diff --git a/devel/p5-Data-ShowTable/pkg-plist b/devel/p5-Data-ShowTable/pkg-plist
index 143d6303a0da..5f71f7998168 100644
--- a/devel/p5-Data-ShowTable/pkg-plist
+++ b/devel/p5-Data-ShowTable/pkg-plist
@@ -1,6 +1,4 @@
 bin/showtable
-lib/perl5/5.00501/man/man3/Data::ShowTable.3.gz
-lib/perl5/site_perl/5.005/Data/ShowTable.pm
-lib/perl5/site_perl/5.005/i386-freebsd/auto/Data/ShowTable/.packlist
-man/man1/showtable.1.gz
-@dirrm lib/perl5/site_perl/5.005/i386-freebsd/auto/Data/ShowTable
+lib/perl5/site_perl/%%PERL_VER%%/Data/ShowTable.pm
+lib/perl5/site_perl/%%PERL_VER%%/i386-freebsd/auto/Data/ShowTable/.packlist
+@dirrm lib/perl5/site_perl/%%PERL_VER%%/i386-freebsd/auto/Data/ShowTable
diff --git a/devel/p5-Date-Manip/Makefile b/devel/p5-Date-Manip/Makefile
index 60e15fc8d802..09640a7ba60d 100644
--- a/devel/p5-Date-Manip/Makefile
+++ b/devel/p5-Date-Manip/Makefile
@@ -3,7 +3,7 @@
 # Date created:				April 28th 1996
 # Whom:	      				James FitzGibbon <jfitz@FreeBSD.org>
 #
-# $Id: Makefile,v 1.4 1998/02/18 15:28:12 vanilla Exp $
+# $Id: Makefile,v 1.5 1998/05/13 17:22:34 vanilla Exp $
 #
 
 DISTNAME=	DateManip-5.31
@@ -17,7 +17,7 @@ MAINTAINER=	jfitz@FreeBSD.ORG
 USE_PERL5=	YES
 
 MAN3=		Date::Manip.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/devel/p5-Date-Manip/pkg-plist b/devel/p5-Date-Manip/pkg-plist
index da90590e175a..c6aba5f64fad 100644
--- a/devel/p5-Date-Manip/pkg-plist
+++ b/devel/p5-Date-Manip/pkg-plist
@@ -1,5 +1,4 @@
-lib/perl5/man/man3/Date::Manip.3.gz
-lib/perl5/site_perl/Date/Manip.pm
-lib/perl5/site_perl/Date/Manip.pod
-lib/perl5/site_perl/i386-freebsd/auto/Date/Manip/.packlist
-@dirrm lib/perl5/site_perl/i386-freebsd/auto/Date/Manip
+lib/perl5/site_perl/%%PERL_VER%%/Date/Manip.pm
+lib/perl5/site_perl/%%PERL_VER%%/Date/Manip.pod
+lib/perl5/site_perl/%%PERL_VER%%/i386-freebsd/auto/Date/Manip/.packlist
+@dirrm lib/perl5/site_perl/%%PERL_VER%%/i386-freebsd/auto/Date/Manip
diff --git a/devel/p5-Devel-DProf/Makefile b/devel/p5-Devel-DProf/Makefile
index cfe5fc5650fc..6d366657ef9c 100644
--- a/devel/p5-Devel-DProf/Makefile
+++ b/devel/p5-Devel-DProf/Makefile
@@ -3,7 +3,7 @@
 # Date created:				June 15th 1997
 # Whom:	      				James FitzGibbon <jfitz@FreeBSD.org>
 #
-#   $Id: Makefile,v 1.2 1997/06/17 22:48:05 jfitz Exp $
+#   $Id: Makefile,v 1.3 1997/06/24 18:43:13 jfitz Exp $
 #
 
 DISTNAME=	DProf-19970614
@@ -18,7 +18,7 @@ USE_PERL5=	YES
 
 MAN1PREFIX=	${PREFIX}
 MAN1=		dprofpp.1
-MAN3PREFIX=	${PREFIX}/lib/perl5
+MAN3PREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
 MAN3=		Devel::DProf.3
 
 do-configure:
diff --git a/devel/p5-Devel-DProf/pkg-plist b/devel/p5-Devel-DProf/pkg-plist
index 44cca962c899..40e3d9657ae8 100644
--- a/devel/p5-Devel-DProf/pkg-plist
+++ b/devel/p5-Devel-DProf/pkg-plist
@@ -1,8 +1,6 @@
 bin/dprofpp
-man/man1/dprofpp.1.gz
-lib/perl5/man/man3/Devel::DProf.3.gz
-lib/perl5/site_perl/Devel/DProf.pm
-lib/perl5/site_perl/i386-freebsd/auto/Devel/DProf/DProf.bs
-lib/perl5/site_perl/i386-freebsd/auto/Devel/DProf/DProf.so
-lib/perl5/site_perl/i386-freebsd/auto/Devel/DProf/.packlist
-@dirrm lib/perl5/site_perl/i386-freebsd/auto/Devel/DProf
+lib/perl5/site_perl/%%PERL_VER%%/i386-freebsd/Devel/DProf.pm
+lib/perl5/site_perl/%%PERL_VER%%/i386-freebsd/auto/Devel/DProf/DProf.bs
+lib/perl5/site_perl/%%PERL_VER%%/i386-freebsd/auto/Devel/DProf/DProf.so
+lib/perl5/site_perl/%%PERL_VER%%/i386-freebsd/auto/Devel/DProf/.packlist
+@dirrm lib/perl5/site_perl/%%PERL_VER%%/i386-freebsd/auto/Devel/DProf
diff --git a/devel/p5-Devel-Peek/Makefile b/devel/p5-Devel-Peek/Makefile
index d54d57fd53e7..9ab7009aecc2 100644
--- a/devel/p5-Devel-Peek/Makefile
+++ b/devel/p5-Devel-Peek/Makefile
@@ -3,7 +3,7 @@
 # Date created:				June 15th 1997
 # Whom:	      				James FitzGibbon <jfitz@FreeBSD.org>
 #
-# $Id: Makefile,v 1.6 1998/06/24 15:53:11 vanilla Exp $
+# $Id: Makefile,v 1.7 1998/08/06 15:00:58 vanilla Exp $
 #
 
 DISTNAME=	Devel-Peek-0.94
@@ -16,7 +16,7 @@ MAINTAINER=	jfitz@FreeBSD.ORG
 
 USE_PERL5=	YES
 
-MANPREFIX=	${PREFIX}/lib/perl5/5.00501
+MANPREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
 MAN3=		Devel::Peek.3
 
 do-configure:
diff --git a/devel/p5-Devel-Peek/pkg-plist b/devel/p5-Devel-Peek/pkg-plist
index 9c13d34f4bc0..166d1f1bb6de 100644
--- a/devel/p5-Devel-Peek/pkg-plist
+++ b/devel/p5-Devel-Peek/pkg-plist
@@ -1,6 +1,5 @@
-lib/perl5/5.00501/man/man3/Devel::Peek.3.gz
-lib/perl5/site_perl/5.005/i386-freebsd/Devel/Peek.pm
-lib/perl5/site_perl/5.005/i386-freebsd/auto/Devel/Peek/Peek.bs
-lib/perl5/site_perl/5.005/i386-freebsd/auto/Devel/Peek/Peek.so
-lib/perl5/site_perl/5.005/i386-freebsd/auto/Devel/Peek/.packlist
-@dirrm lib/perl5/site_perl/5.005/i386-freebsd/auto/Devel/Peek
+lib/perl5/site_perl/%%PERL_VER%%/i386-freebsd/Devel/Peek.pm
+lib/perl5/site_perl/%%PERL_VER%%/i386-freebsd/auto/Devel/Peek/Peek.bs
+lib/perl5/site_perl/%%PERL_VER%%/i386-freebsd/auto/Devel/Peek/Peek.so
+lib/perl5/site_perl/%%PERL_VER%%/i386-freebsd/auto/Devel/Peek/.packlist
+@dirrm lib/perl5/site_perl/%%PERL_VER%%/i386-freebsd/auto/Devel/Peek
diff --git a/devel/p5-Devel-Symdump/Makefile b/devel/p5-Devel-Symdump/Makefile
index b705d3ffc866..e4f66f59b61d 100644
--- a/devel/p5-Devel-Symdump/Makefile
+++ b/devel/p5-Devel-Symdump/Makefile
@@ -3,7 +3,7 @@
 # Date created:				June 15th 1997
 # Whom:	      				James FitzGibbon <jfitz@FreeBSD.org>
 #
-# $Id: Makefile,v 1.2 1997/06/24 18:43:17 jfitz Exp $
+# $Id: Makefile,v 1.3 1998/08/06 15:03:14 vanilla Exp $
 #
 
 DISTNAME=	Devel-Symdump-2.00
@@ -16,7 +16,7 @@ MAINTAINER=	jfitz@FreeBSD.ORG
 
 USE_PERL5=	YES
 
-MANPREFIX=	${PREFIX}/lib/perl5/5.00501
+MANPREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
 MAN3=		Devel::Symdump.3
 
 do-configure:
diff --git a/devel/p5-Devel-Symdump/pkg-plist b/devel/p5-Devel-Symdump/pkg-plist
index 6bab5f6a84b7..1a73fc8328f2 100644
--- a/devel/p5-Devel-Symdump/pkg-plist
+++ b/devel/p5-Devel-Symdump/pkg-plist
@@ -1,6 +1,5 @@
-lib/perl5/5.00501/man/man3/Devel::Symdump.3.gz
-lib/perl5/site_perl/5.005/Devel/Symdump.pm
-lib/perl5/site_perl/5.005/Devel/Symdump/Export.pm
-lib/perl5/site_perl/5.005/i386-freebsd/auto/Devel/Symdump/.packlist
-@dirrm lib/perl5/site_perl/5.005/i386-freebsd/auto/Devel/Symdump
-@dirrm lib/perl5/site_perl/5.005/Devel/Symdump
+lib/perl5/site_perl/%%PERL_VER%%/Devel/Symdump.pm
+lib/perl5/site_perl/%%PERL_VER%%/Devel/Symdump/Export.pm
+lib/perl5/site_perl/%%PERL_VER%%/i386-freebsd/auto/Devel/Symdump/.packlist
+@dirrm lib/perl5/site_perl/%%PERL_VER%%/i386-freebsd/auto/Devel/Symdump
+@dirrm lib/perl5/site_perl/%%PERL_VER%%/Devel/Symdump
diff --git a/devel/p5-Errno/Makefile b/devel/p5-Errno/Makefile
index d68a2c812103..395bc6917e5e 100644
--- a/devel/p5-Errno/Makefile
+++ b/devel/p5-Errno/Makefile
@@ -3,7 +3,7 @@
 # Date created:				June 26th 1997
 # Whom:	      				James FitzGibbon <jfitz@FreeBSD.ORG>
 #
-# $Id: Makefile,v 1.1.1.1 1997/06/27 01:36:21 jfitz Exp $
+# $Id: Makefile,v 1.2 1998/05/13 17:23:38 vanilla Exp $
 #
 
 DISTNAME=	Errno-1.02
@@ -16,7 +16,7 @@ MAINTAINER=	jfitz@FreeBSD.ORG
 
 USE_PERL5=	YES
 
-MANPREFIX=	${PREFIX}/lib/perl5
+MANPREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
 MAN3=		Errno.3
 
 do-configure:
diff --git a/devel/p5-Errno/pkg-plist b/devel/p5-Errno/pkg-plist
index 38dc337dbea7..216f79943ced 100644
--- a/devel/p5-Errno/pkg-plist
+++ b/devel/p5-Errno/pkg-plist
@@ -1,4 +1,3 @@
-lib/perl5/man/man3/Errno.3.gz
-lib/perl5/site_perl/Errno.pm
-lib/perl5/site_perl/i386-freebsd/auto/Errno/.packlist
-@dirrm lib/perl5/site_perl/i386-freebsd/auto/Errno
+lib/perl5/site_perl/%%PERL_VER%%/Errno.pm
+lib/perl5/site_perl/%%PERL_VER%%/i386-freebsd/auto/Errno/.packlist
+@dirrm lib/perl5/site_perl/%%PERL_VER%%/i386-freebsd/auto/Errno
diff --git a/devel/p5-File-BasicFlock/Makefile b/devel/p5-File-BasicFlock/Makefile
index 95b23b850053..96aa67bbde3e 100644
--- a/devel/p5-File-BasicFlock/Makefile
+++ b/devel/p5-File-BasicFlock/Makefile
@@ -3,7 +3,7 @@
 # Date created:				
 # Whom:	      				James FitzGibbon <jfitz@FreeBSD.org>
 #
-#   $Id: Makefile,v 1.5 1997/05/24 13:17:02 jfitz Exp $
+#   $Id: Makefile,v 1.6 1997/06/24 18:43:17 jfitz Exp $
 #
 
 DISTNAME=	File-BasicFLock-96.072401
@@ -17,7 +17,7 @@ MAINTAINER=	jfitz@FreeBSD.ORG
 USE_PERL5=	YES
 
 MAN3=		File::BasicFlock.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/devel/p5-File-BasicFlock/pkg-plist b/devel/p5-File-BasicFlock/pkg-plist
index 3a8cfc056986..71f3941d0402 100644
--- a/devel/p5-File-BasicFlock/pkg-plist
+++ b/devel/p5-File-BasicFlock/pkg-plist
@@ -1,2 +1 @@
-lib/perl5/man/man3/File::BasicFlock.3.gz
-lib/perl5/site_perl/File/BasicFlock.pm
+lib/perl5/site_perl/%%PERL_VER%%/File/BasicFlock.pm
diff --git a/devel/p5-File-Lock/pkg-plist b/devel/p5-File-Lock/pkg-plist
index adf388e1bd46..42b6d95a2648 100644
--- a/devel/p5-File-Lock/pkg-plist
+++ b/devel/p5-File-Lock/pkg-plist
@@ -1,11 +1,11 @@
-lib/perl5/site_perl/File/Lock.pm
-lib/perl5/site_perl/auto/File/Lock/autosplit.ix
-lib/perl5/site_perl/auto/File/Lock/info.al
-lib/perl5/site_perl/auto/File/Lock/pid.al
-lib/perl5/site_perl/auto/File/Lock/sysid.al
-lib/perl5/site_perl/auto/File/Lock/test.al
-lib/perl5/site_perl/i386-freebsd/auto/File/Lock/Lock.bs
-lib/perl5/site_perl/i386-freebsd/auto/File/Lock/Lock.so
-lib/perl5/site_perl/i386-freebsd/auto/File/Lock/.packlist
-@dirrm lib/perl5/site_perl/i386-freebsd/auto/File/Lock
-@dirrm lib/perl5/site_perl/auto/File/Lock
\ No newline at end of file
+lib/perl5/site_perl/%%PERL_VER%%/i386-freebsd/File/Lock.pm
+lib/perl5/site_perl/%%PERL_VER%%/i386-freebsd/auto/File/Lock/autosplit.ix
+lib/perl5/site_perl/%%PERL_VER%%/i386-freebsd/auto/File/Lock/info.al
+lib/perl5/site_perl/%%PERL_VER%%/i386-freebsd/auto/File/Lock/pid.al
+lib/perl5/site_perl/%%PERL_VER%%/i386-freebsd/auto/File/Lock/sysid.al
+lib/perl5/site_perl/%%PERL_VER%%/i386-freebsd/auto/File/Lock/test.al
+lib/perl5/site_perl/%%PERL_VER%%/i386-freebsd/auto/File/Lock/Lock.bs
+lib/perl5/site_perl/%%PERL_VER%%/i386-freebsd/auto/File/Lock/Lock.so
+lib/perl5/site_perl/%%PERL_VER%%/i386-freebsd/auto/File/Lock/.packlist
+@dirrm lib/perl5/site_perl/%%PERL_VER%%/i386-freebsd/auto/File/Lock
+@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/i386-freebsd/auto/File 2>/dev/null || true
diff --git a/devel/p5-File-Slurp/Makefile b/devel/p5-File-Slurp/Makefile
index 849ac0d5003f..e606095cad09 100644
--- a/devel/p5-File-Slurp/Makefile
+++ b/devel/p5-File-Slurp/Makefile
@@ -3,7 +3,7 @@
 # Date created:				October 17th 1996
 # Whom:	      				James FitzGibbon <jfitz@FreeBSD.org>
 #
-#   $Id: Makefile,v 1.5 1997/05/24 13:17:02 jfitz Exp $
+#   $Id: Makefile,v 1.6 1997/06/24 18:43:18 jfitz Exp $
 #
 
 DISTNAME=	File-Slurp-96.042202
@@ -17,7 +17,7 @@ MAINTAINER=	jfitz@FreeBSD.ORG
 USE_PERL5=	YES
 
 MAN3=		File::Slurp.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/devel/p5-File-Slurp/pkg-plist b/devel/p5-File-Slurp/pkg-plist
index e5f2829613b7..d20b7f5e799c 100644
--- a/devel/p5-File-Slurp/pkg-plist
+++ b/devel/p5-File-Slurp/pkg-plist
@@ -1,2 +1 @@
-lib/perl5/man/man3/File::Slurp.3.gz
-lib/perl5/site_perl/File/Slurp.pm
+lib/perl5/site_perl/%%PERL_VER%%/File/Slurp.pm
diff --git a/devel/p5-File-Sync/Makefile b/devel/p5-File-Sync/Makefile
index 0443185f9bac..2f2e48d83eff 100644
--- a/devel/p5-File-Sync/Makefile
+++ b/devel/p5-File-Sync/Makefile
@@ -3,7 +3,7 @@
 # Date created:		6 March 1998
 # Whom:			Jun Kuriyama <kuriyama@opt.phys.waseda.ac.jp>
 #
-# $Id: Makefile,v 1.1.1.1 1998/03/15 20:17:58 steve Exp $
+# $Id: Makefile,v 1.2 1998/03/21 02:06:11 asami Exp $
 #
 
 DISTNAME=	File-Sync-0.06
@@ -18,7 +18,7 @@ USE_PERL5=	YES
 
 MAN3=		File::Sync.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/devel/p5-File-Sync/pkg-plist b/devel/p5-File-Sync/pkg-plist
index b9756bee6dc1..138187a67a24 100644
--- a/devel/p5-File-Sync/pkg-plist
+++ b/devel/p5-File-Sync/pkg-plist
@@ -1,8 +1,5 @@
-lib/perl5/man/man3/File::Sync.3.gz
-lib/perl5/site_perl/File/Sync.pm
-lib/perl5/site_perl/auto/File/Sync/autosplit.ix
-lib/perl5/site_perl/i386-freebsd/auto/File/Sync/Sync.so
-lib/perl5/site_perl/i386-freebsd/auto/File/Sync/Sync.bs
-lib/perl5/site_perl/i386-freebsd/auto/File/Sync/.packlist
-@dirrm lib/perl5/site_perl/auto/File/Sync
-@dirrm lib/perl5/site_perl/i386-freebsd/auto/File/Sync
+lib/perl5/site_perl/%%PERL_VER%%/i386-freebsd/auto/File/Sync/autosplit.ix
+lib/perl5/site_perl/%%PERL_VER%%/i386-freebsd/auto/File/Sync/Sync.so
+lib/perl5/site_perl/%%PERL_VER%%/i386-freebsd/auto/File/Sync/Sync.bs
+lib/perl5/site_perl/%%PERL_VER%%/i386-freebsd/auto/File/Sync/.packlist
+@dirrm lib/perl5/site_perl/%%PERL_VER%%/i386-freebsd/auto/File/Sync
diff --git a/devel/p5-File-Tools/Makefile b/devel/p5-File-Tools/Makefile
index fa197c32acb5..039f8bb1fa5d 100644
--- a/devel/p5-File-Tools/Makefile
+++ b/devel/p5-File-Tools/Makefile
@@ -3,7 +3,7 @@
 # Date created:				October 17th 1996
 # Whom:	      				James FitzGibbon <jfitz@FreeBSD.org>
 #
-#   $Id: Makefile,v 1.5 1997/05/24 13:17:02 jfitz Exp $
+#   $Id: Makefile,v 1.6 1997/06/24 18:43:19 jfitz Exp $
 #
 
 DISTNAME=	File-Tools-2.0
@@ -17,7 +17,7 @@ MAINTAINER=	jfitz@FreeBSD.ORG
 USE_PERL5=	YES
 
 MAN3=		File::Tools.3 File::Recurse.3 File::Copy.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/devel/p5-File-Tools/pkg-plist b/devel/p5-File-Tools/pkg-plist
index bedf61b94d3d..20eeb93a25a2 100644
--- a/devel/p5-File-Tools/pkg-plist
+++ b/devel/p5-File-Tools/pkg-plist
@@ -1,6 +1,3 @@
-lib/perl5/man/man3/File::Copy.3.gz
-lib/perl5/man/man3/File::Recurse.3.gz
-lib/perl5/man/man3/File::Tools.3.gz
-lib/perl5/site_perl/File/Copy.pm
-lib/perl5/site_perl/File/Recurse.pm
-lib/perl5/site_perl/File/Tools.pm
+lib/perl5/site_perl/%%PERL_VER%%/File/Copy.pm
+lib/perl5/site_perl/%%PERL_VER%%/File/Recurse.pm
+lib/perl5/site_perl/%%PERL_VER%%/File/Tools.pm
diff --git a/devel/p5-Filter/Makefile b/devel/p5-Filter/Makefile
index c3b8eb49539a..8b448d27ab15 100644
--- a/devel/p5-Filter/Makefile
+++ b/devel/p5-Filter/Makefile
@@ -3,7 +3,7 @@
 # Date created:				June 26th 1997
 # Whom:	      				James FitzGibbon <jfitz@FreeBSD.ORG>
 #
-# $Id: Makefile,v 1.1.1.1 1997/06/27 01:37:45 jfitz Exp $
+# $Id: Makefile,v 1.2 1998/02/18 18:21:36 vanilla Exp $
 #
 
 DISTNAME=	Filter-1.14
@@ -16,7 +16,7 @@ MAINTAINER=	jfitz@FreeBSD.ORG
 
 USE_PERL5=	YES
 
-MANPREFIX=	${PREFIX}/lib/perl5
+MANPREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
 MAN3=		Filter::Util::Call.3 Filter::Util::Exec.3 Filter::cpp.3 \
 		Filter::decrypt.3 Filter::exec.3 Filter::sh.3 Filter::tee.3
 
diff --git a/devel/p5-Filter/pkg-plist b/devel/p5-Filter/pkg-plist
index 671360522481..970c7bf6ad1b 100644
--- a/devel/p5-Filter/pkg-plist
+++ b/devel/p5-Filter/pkg-plist
@@ -1,29 +1,23 @@
-lib/perl5/man/man3/Filter::Util::Call.3.gz
-lib/perl5/man/man3/Filter::Util::Exec.3.gz
-lib/perl5/man/man3/Filter::cpp.3.gz
-lib/perl5/man/man3/Filter::decrypt.3.gz
-lib/perl5/man/man3/Filter::exec.3.gz
-lib/perl5/man/man3/Filter::sh.3.gz
-lib/perl5/man/man3/Filter::tee.3.gz
-lib/perl5/site_perl/Filter/Util/Call.pm
-lib/perl5/site_perl/Filter/Util/Exec.pm
-lib/perl5/site_perl/Filter/cpp.pm
-lib/perl5/site_perl/Filter/decrypt.pm
-lib/perl5/site_perl/Filter/exec.pm
-lib/perl5/site_perl/Filter/sh.pm
-lib/perl5/site_perl/Filter/tee.pm
-lib/perl5/site_perl/i386-freebsd/auto/Filter/Util/Call/Call.bs
-lib/perl5/site_perl/i386-freebsd/auto/Filter/Util/Call/Call.so
-lib/perl5/site_perl/i386-freebsd/auto/Filter/Util/Exec/Exec.bs
-lib/perl5/site_perl/i386-freebsd/auto/Filter/Util/Exec/Exec.so
-lib/perl5/site_perl/i386-freebsd/auto/Filter/decrypt/decrypt.bs
-lib/perl5/site_perl/i386-freebsd/auto/Filter/decrypt/decrypt.so
-lib/perl5/site_perl/i386-freebsd/auto/Filter/tee/tee.bs
-lib/perl5/site_perl/i386-freebsd/auto/Filter/tee/tee.so
-lib/perl5/site_perl/i386-freebsd/auto/Filter/.packlist
-@dirrm lib/perl5/site_perl/i386-freebsd/auto/Filter/Util/Call
-@dirrm lib/perl5/site_perl/i386-freebsd/auto/Filter/Util/Exec
-@dirrm lib/perl5/site_perl/i386-freebsd/auto/Filter/Util
-@dirrm lib/perl5/site_perl/i386-freebsd/auto/Filter/decrypt
-@dirrm lib/perl5/site_perl/i386-freebsd/auto/Filter/tee
-@dirrm lib/perl5/site_perl/Filter/Util
+lib/perl5/site_perl/%%PERL_VER%%/i386-freebsd/Filter/Util/Call.pm
+lib/perl5/site_perl/%%PERL_VER%%/i386-freebsd/Filter/Util/Exec.pm
+lib/perl5/site_perl/%%PERL_VER%%/i386-freebsd/Filter/cpp.pm
+lib/perl5/site_perl/%%PERL_VER%%/i386-freebsd/Filter/decrypt.pm
+lib/perl5/site_perl/%%PERL_VER%%/i386-freebsd/Filter/exec.pm
+lib/perl5/site_perl/%%PERL_VER%%/i386-freebsd/Filter/sh.pm
+lib/perl5/site_perl/%%PERL_VER%%/i386-freebsd/Filter/tee.pm
+lib/perl5/site_perl/%%PERL_VER%%/i386-freebsd/auto/Filter/Util/Call/Call.bs
+lib/perl5/site_perl/%%PERL_VER%%/i386-freebsd/auto/Filter/Util/Call/Call.so
+lib/perl5/site_perl/%%PERL_VER%%/i386-freebsd/auto/Filter/Util/Exec/Exec.bs
+lib/perl5/site_perl/%%PERL_VER%%/i386-freebsd/auto/Filter/Util/Exec/Exec.so
+lib/perl5/site_perl/%%PERL_VER%%/i386-freebsd/auto/Filter/decrypt/decrypt.bs
+lib/perl5/site_perl/%%PERL_VER%%/i386-freebsd/auto/Filter/decrypt/decrypt.so
+lib/perl5/site_perl/%%PERL_VER%%/i386-freebsd/auto/Filter/tee/tee.bs
+lib/perl5/site_perl/%%PERL_VER%%/i386-freebsd/auto/Filter/tee/tee.so
+lib/perl5/site_perl/%%PERL_VER%%/i386-freebsd/auto/Filter/.packlist
+@dirrm lib/perl5/site_perl/%%PERL_VER%%/i386-freebsd/auto/Filter/Util/Call
+@dirrm lib/perl5/site_perl/%%PERL_VER%%/i386-freebsd/auto/Filter/Util/Exec
+@dirrm lib/perl5/site_perl/%%PERL_VER%%/i386-freebsd/auto/Filter/Util
+@dirrm lib/perl5/site_perl/%%PERL_VER%%/i386-freebsd/auto/Filter/decrypt
+@dirrm lib/perl5/site_perl/%%PERL_VER%%/i386-freebsd/auto/Filter/tee
+@dirrm lib/perl5/site_perl/%%PERL_VER%%/i386-freebsd/Filter/Util
+@dirrm lib/perl5/site_perl/%%PERL_VER%%/i386-freebsd/Filter
diff --git a/devel/p5-FreezeThaw/Makefile b/devel/p5-FreezeThaw/Makefile
index 29ae919ab9af..18d4c59c221c 100644
--- a/devel/p5-FreezeThaw/Makefile
+++ b/devel/p5-FreezeThaw/Makefile
@@ -3,7 +3,7 @@
 # Date created:				September 10th 1997
 # Whom:	      				James FitzGibbon <jfitz@FreeBSD.org>
 #
-# $Id: Makefile,v 1.1.1.1 1997/09/13 17:44:00 jfitz Exp $
+# $Id: Makefile,v 1.2 1998/05/14 08:15:36 vanilla Exp $
 #
 
 DISTNAME=	FreezeThaw-0.3
@@ -17,7 +17,7 @@ MAINTAINER=	jfitz@FreeBSD.ORG
 USE_PERL5=	YES
 
 MAN3=		FreezeThaw.3
-MAN3PREFIX=	${PREFIX}/lib/perl5
+MAN3PREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
 
 do-configure:
 		@cd ${WRKSRC}; ${SETENV} ${CONFIGURE_ENV} ${PREFIX}/bin/perl Makefile.PL
diff --git a/devel/p5-FreezeThaw/pkg-plist b/devel/p5-FreezeThaw/pkg-plist
index d4b0a9fc198c..2b423a1805b0 100644
--- a/devel/p5-FreezeThaw/pkg-plist
+++ b/devel/p5-FreezeThaw/pkg-plist
@@ -1,4 +1,3 @@
-lib/perl5/man/man3/FreezeThaw.3.gz
-lib/perl5/site_perl/FreezeThaw.pm
-lib/perl5/site_perl/i386-freebsd/auto/FreezeThaw/.packlist
-@dirrm lib/perl5/site_perl/i386-freebsd/auto/FreezeThaw
+lib/perl5/site_perl/%%PERL_VER%%/FreezeThaw.pm
+lib/perl5/site_perl/%%PERL_VER%%/i386-freebsd/auto/FreezeThaw/.packlist
+@dirrm lib/perl5/site_perl/%%PERL_VER%%/i386-freebsd/auto/FreezeThaw
diff --git a/devel/p5-IO-stringy/Makefile b/devel/p5-IO-stringy/Makefile
index 7a8b9892ae06..603416abe96d 100644
--- a/devel/p5-IO-stringy/Makefile
+++ b/devel/p5-IO-stringy/Makefile
@@ -3,7 +3,7 @@
 # Date created:				April 27 1998
 # Whom:	      				Eivind Eklund <eivind@FreeBSD.ORG>
 #
-# $Id: Makefile,v 1.2 1998/05/13 17:25:36 vanilla Exp $
+# $Id: Makefile,v 1.3 1998/08/06 15:08:42 vanilla Exp $
 #
 
 DISTNAME=	IO-stringy-1.203
@@ -20,7 +20,7 @@ MAN3=		IO::AtomicFile.3 IO::Lines.3 IO::Scalar.3 \
 		IO::ScalarArray.3 IO::Stringy.3 \
 		IO::Wrap.3 IO::WrapTie.3
 
-MANPREFIX=	${PREFIX}/lib/perl5/5.00501
+MANPREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
 
 do-configure:
 	@cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PREFIX}/bin/perl Makefile.PL
diff --git a/devel/p5-IO-stringy/pkg-plist b/devel/p5-IO-stringy/pkg-plist
index 7c870a5963fd..711eba364d6d 100644
--- a/devel/p5-IO-stringy/pkg-plist
+++ b/devel/p5-IO-stringy/pkg-plist
@@ -1,16 +1,9 @@
-lib/perl5/5.00501/man/man3/IO::AtomicFile.3.gz
-lib/perl5/5.00501/man/man3/IO::Lines.3.gz
-lib/perl5/5.00501/man/man3/IO::Scalar.3.gz
-lib/perl5/5.00501/man/man3/IO::ScalarArray.3.gz
-lib/perl5/5.00501/man/man3/IO::Stringy.3.gz
-lib/perl5/5.00501/man/man3/IO::Wrap.3.gz
-lib/perl5/5.00501/man/man3/IO::WrapTie.3.gz
-lib/perl5/site_perl/5.005/IO/AtomicFile.pm
-lib/perl5/site_perl/5.005/IO/Lines.pm
-lib/perl5/site_perl/5.005/IO/Scalar.pm
-lib/perl5/site_perl/5.005/IO/ScalarArray.pm
-lib/perl5/site_perl/5.005/IO/Stringy.pm
-lib/perl5/site_perl/5.005/IO/Wrap.pm
-lib/perl5/site_perl/5.005/IO/WrapTie.pm
-lib/perl5/site_perl/5.005/i386-freebsd/auto/IO-stringy/.packlist
-@dirrm lib/perl5/site_perl/5.005/i386-freebsd/auto/IO-stringy
+lib/perl5/site_perl/%%PERL_VER%%/IO/AtomicFile.pm
+lib/perl5/site_perl/%%PERL_VER%%/IO/Lines.pm
+lib/perl5/site_perl/%%PERL_VER%%/IO/Scalar.pm
+lib/perl5/site_perl/%%PERL_VER%%/IO/ScalarArray.pm
+lib/perl5/site_perl/%%PERL_VER%%/IO/Stringy.pm
+lib/perl5/site_perl/%%PERL_VER%%/IO/Wrap.pm
+lib/perl5/site_perl/%%PERL_VER%%/IO/WrapTie.pm
+lib/perl5/site_perl/%%PERL_VER%%/i386-freebsd/auto/IO-stringy/.packlist
+@dirrm lib/perl5/site_perl/%%PERL_VER%%/i386-freebsd/auto/IO-stringy
diff --git a/devel/p5-Include/Makefile b/devel/p5-Include/Makefile
index d1ce26a58626..94bada84100e 100644
--- a/devel/p5-Include/Makefile
+++ b/devel/p5-Include/Makefile
@@ -3,7 +3,7 @@
 # Date created:				October 21st 1996
 # Whom:	      				James FitzGibbon <jfitz@FreeBSD.org>
 #
-#   $Id: Makefile,v 1.6 1997/05/24 13:17:03 jfitz Exp $
+#   $Id: Makefile,v 1.7 1997/06/24 18:43:21 jfitz Exp $
 #
 
 DISTNAME=	Include-1.02a
@@ -17,7 +17,7 @@ MAINTAINER=	jfitz@FreeBSD.ORG
 USE_PERL5=	YES
 
 MAN3=		Include.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/devel/p5-Include/pkg-plist b/devel/p5-Include/pkg-plist
index df2c924ff232..c6d298d17be6 100644
--- a/devel/p5-Include/pkg-plist
+++ b/devel/p5-Include/pkg-plist
@@ -1,4 +1,3 @@
-lib/perl5/man/man3/Include.3.gz
-lib/perl5/site_perl/Include.pm
-lib/perl5/site_perl/i386-freebsd/auto/Include/.packlist
-@dirrm lib/perl5/site_perl/i386-freebsd/auto/Include
+lib/perl5/site_perl/%%PERL_VER%%/Include.pm
+lib/perl5/site_perl/%%PERL_VER%%/i386-freebsd/auto/Include/.packlist
+@dirrm lib/perl5/site_perl/%%PERL_VER%%/i386-freebsd/auto/Include
diff --git a/devel/p5-IniConf/Makefile b/devel/p5-IniConf/Makefile
index d73986ec1bb3..e03fd1cc73c3 100644
--- a/devel/p5-IniConf/Makefile
+++ b/devel/p5-IniConf/Makefile
@@ -3,7 +3,7 @@
 # Date created:				October 21st 1996
 # Whom:	      				James FitzGibbon <jfitz@FreeBSD.org>
 #
-#   $Id: Makefile,v 1.6 1997/06/24 18:43:22 jfitz Exp $
+#   $Id: Makefile,v 1.7 1997/09/14 02:54:56 jfitz Exp $
 #
 
 DISTNAME=	IniConf.pm-0.92
@@ -17,7 +17,7 @@ MAINTAINER=	jfitz@FreeBSD.ORG
 USE_PERL5=	YES
 
 MAN3=		IniConf.pm.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/devel/p5-IniConf/pkg-plist b/devel/p5-IniConf/pkg-plist
index a94e334b729a..be9c914dfa37 100644
--- a/devel/p5-IniConf/pkg-plist
+++ b/devel/p5-IniConf/pkg-plist
@@ -1,4 +1,3 @@
-lib/perl5/man/man3/IniConf.pm.3.gz
-lib/perl5/site_perl/IniConf.pm
-lib/perl5/site_perl/i386-freebsd/auto/IniConf.pm/.packlist
-@dirrm lib/perl5/site_perl/i386-freebsd/auto/IniConf.pm
+lib/perl5/site_perl/%%PERL_VER%%/IniConf.pm
+lib/perl5/site_perl/%%PERL_VER%%/i386-freebsd/auto/IniConf.pm/.packlist
+@dirrm lib/perl5/site_perl/%%PERL_VER%%/i386-freebsd/auto/IniConf.pm
diff --git a/devel/p5-PV/Makefile b/devel/p5-PV/Makefile
index 30d5d15bfb9c..881aa4d610e4 100644
--- a/devel/p5-PV/Makefile
+++ b/devel/p5-PV/Makefile
@@ -3,7 +3,7 @@
 # Date created:				April 18th 1997
 # Whom:	      				James FitzGibbon <jfitz@FreeBSD.org>
 #
-#   $Id: Makefile,v 1.3 1997/05/24 13:17:08 jfitz Exp $
+#   $Id: Makefile,v 1.4 1997/06/24 18:43:28 jfitz Exp $
 #
 
 DISTNAME=	perlvision
@@ -15,7 +15,7 @@ EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	jfitz@FreeBSD.ORG
 
-RUN_DEPENDS=	${PREFIX}/lib/perl5/site_perl/Curses.pm:${PORTSDIR}/devel/p5-Curses
+RUN_DEPENDS=	${PREFIX}/lib/perl5/site_perl/${PERL_VER}/i386-freebsd/Curses.pm:${PORTSDIR}/devel/p5-Curses
 
 USE_PERL5=	YES
 
diff --git a/devel/p5-Penguin-Easy/Makefile b/devel/p5-Penguin-Easy/Makefile
index 44052542796d..b13936836845 100644
--- a/devel/p5-Penguin-Easy/Makefile
+++ b/devel/p5-Penguin-Easy/Makefile
@@ -3,7 +3,7 @@
 # Date created:				May 28th 1997
 # Whom:	      				James FitzGibbon <jfitz@FreeBSD.org>
 #
-#   $Id: Makefile,v 1.1.1.1 1997/05/30 20:04:12 jfitz Exp $
+#   $Id: Makefile,v 1.2 1997/06/24 18:43:29 jfitz Exp $
 #
 
 DISTNAME=	Penguin-Easy-1.1
@@ -14,11 +14,11 @@ MASTER_SITE_SUBDIR=	Penguin
 
 MAINTAINER=	jfitz@FreeBSD.ORG
 
-BUILD_DEPENDS= 	${PREFIX}/lib/perl5/site_perl/Penguin.pm:${PORTSDIR}/devel/p5-Penguin
+BUILD_DEPENDS= 	${PREFIX}/lib/perl5/site_perl/${PERL_VER}/Penguin.pm:${PORTSDIR}/devel/p5-Penguin
 
 USE_PERL5=	YES
 
-MANPREFIX=	${PREFIX}/lib/perl5
+MANPREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
 MAN3=		Penguin::Easy.3
 
 do-configure:
diff --git a/devel/p5-Penguin-Easy/pkg-plist b/devel/p5-Penguin-Easy/pkg-plist
index 7199f7bfabbc..104ec5d36457 100644
--- a/devel/p5-Penguin-Easy/pkg-plist
+++ b/devel/p5-Penguin-Easy/pkg-plist
@@ -1,9 +1,8 @@
-lib/perl5/man/man3/Penguin::Easy.3.gz
-lib/perl5/site_perl/Penguin/Easy.pm
+lib/perl5/site_perl/%%PERL_VER%%/Penguin/Easy.pm
 lib/perl5/site_perl/Penguin/Easy/doc/Penguin-howto
 lib/perl5/site_perl/Penguin/Easy/bin/ep
-lib/perl5/site_perl/i386-freebsd/auto/Penguin/Easy/.packlist
-@dirrm lib/perl5/site_perl/i386-freebsd/auto/Penguin/Easy
+lib/perl5/site_perl/%%PERL_VER%%/i386-freebsd/auto/Penguin/Easy/.packlist
+@dirrm lib/perl5/site_perl/%%PERL_VER%%/i386-freebsd/auto/Penguin/Easy
 @dirrm lib/perl5/site_perl/Penguin/Easy/doc
 @dirrm lib/perl5/site_perl/Penguin/Easy/bin
 @dirrm lib/perl5/site_perl/Penguin/Easy
diff --git a/devel/p5-Penguin/pkg-plist b/devel/p5-Penguin/pkg-plist
index 188f3ea7e7ad..c0e76a5f5eed 100644
--- a/devel/p5-Penguin/pkg-plist
+++ b/devel/p5-Penguin/pkg-plist
@@ -1,17 +1,17 @@
-lib/perl5/site_perl/Penguin.pm
-lib/perl5/site_perl/Penguin/Channel/TCP.pm
-lib/perl5/site_perl/Penguin/Channel/TCP/Client.pm
-lib/perl5/site_perl/Penguin/Channel/TCP/Server.pm
-lib/perl5/site_perl/Penguin/Compartment.pm
-lib/perl5/site_perl/Penguin/Frame/Code.pm
-lib/perl5/site_perl/Penguin/Frame/Data.pm
-lib/perl5/site_perl/Penguin/PGP.pm
-lib/perl5/site_perl/Penguin/Rights.pm
-lib/perl5/site_perl/Penguin/Trivial/Client.pm
-lib/perl5/site_perl/Penguin/Trivial/Server.pm
-lib/perl5/site_perl/Penguin/Wrapper/PGP.pm
-lib/perl5/site_perl/Penguin/Wrapper/Transparent.pm
-lib/perl5/site_perl/i386-freebsd/auto/Penguin/.packlist
+lib/perl5/site_perl/%%PERL_VER%%/Penguin.pm
+lib/perl5/site_perl/%%PERL_VER%%/Penguin/Channel/TCP.pm
+lib/perl5/site_perl/%%PERL_VER%%/Penguin/Channel/TCP/Client.pm
+lib/perl5/site_perl/%%PERL_VER%%/Penguin/Channel/TCP/Server.pm
+lib/perl5/site_perl/%%PERL_VER%%/Penguin/Compartment.pm
+lib/perl5/site_perl/%%PERL_VER%%/Penguin/Frame/Code.pm
+lib/perl5/site_perl/%%PERL_VER%%/Penguin/Frame/Data.pm
+lib/perl5/site_perl/%%PERL_VER%%/Penguin/PGP.pm
+lib/perl5/site_perl/%%PERL_VER%%/Penguin/Rights.pm
+lib/perl5/site_perl/%%PERL_VER%%/Penguin/Trivial/Client.pm
+lib/perl5/site_perl/%%PERL_VER%%/Penguin/Trivial/Server.pm
+lib/perl5/site_perl/%%PERL_VER%%/Penguin/Wrapper/PGP.pm
+lib/perl5/site_perl/%%PERL_VER%%/Penguin/Wrapper/Transparent.pm
+lib/perl5/site_perl/%%PERL_VER%%/i386-freebsd/auto/Penguin/.packlist
 lib/perl5/site_perl/Penguin/bin/.pen
 lib/perl5/site_perl/Penguin/bin/makeapplet
 lib/perl5/site_perl/Penguin/bin/pclient
@@ -31,13 +31,14 @@ lib/perl5/site_perl/Penguin/doc/MODULE_NOTES
 lib/perl5/site_perl/Penguin/doc/README
 lib/perl5/site_perl/Penguin/doc/SECURITY
 lib/perl5/site_perl/Penguin/doc/TODO
-@dirrm lib/perl5/site_perl/Penguin/Channel/TCP
-@dirrm lib/perl5/site_perl/Penguin/Channel
-@dirrm lib/perl5/site_perl/Penguin/Frame
-@dirrm lib/perl5/site_perl/Penguin/Trivial
-@dirrm lib/perl5/site_perl/Penguin/Wrapper
+@dirrm lib/perl5/site_perl/%%PERL_VER%%/Penguin/Channel/TCP
+@dirrm lib/perl5/site_perl/%%PERL_VER%%/Penguin/Channel
+@dirrm lib/perl5/site_perl/%%PERL_VER%%/Penguin/Frame
+@dirrm lib/perl5/site_perl/%%PERL_VER%%/Penguin/Trivial
+@dirrm lib/perl5/site_perl/%%PERL_VER%%/Penguin/Wrapper
+@unexec rmdir lib/perl5/site_perl/%%PERL_VER%%/Penguin 2>/dev/null || true
 @dirrm lib/perl5/site_perl/Penguin/bin
 @dirrm lib/perl5/site_perl/Penguin/misc
 @dirrm lib/perl5/site_perl/Penguin/doc
-@dirrm lib/perl5/site_perl/Penguin
-@dirrm lib/perl5/site_perl/i386-freebsd/auto/Penguin
+@unexec rmdir lib/perl5/site_perl/Penguin 2>/dev/null || true
+@unexec rmdir lib/perl5/site_perl/%%PERL_VER%%/i386-freebsd/auto/Penguin 2>/dev/null || true
diff --git a/devel/p5-Proc-Simple/Makefile b/devel/p5-Proc-Simple/Makefile
index 2d7776cab97e..55854e877470 100644
--- a/devel/p5-Proc-Simple/Makefile
+++ b/devel/p5-Proc-Simple/Makefile
@@ -3,7 +3,7 @@
 # Date created:				June 26th 1997
 # Whom:	      				James FitzGibbon <jfitz@FreeBSD.ORG>
 #
-#   $Id$
+#   $Id: Makefile,v 1.1.1.1 1997/06/27 01:52:15 jfitz Exp $
 #
 
 DISTNAME=	Proc-Simple-1.12
@@ -16,7 +16,7 @@ MAINTAINER=	jfitz@FreeBSD.ORG
 
 USE_PERL5=	YES
 
-MANPREFIX=	${PREFIX}/lib/perl5
+MANPREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
 MAN3=		Proc::Simple.3
 
 do-configure:
diff --git a/devel/p5-Proc-Simple/pkg-plist b/devel/p5-Proc-Simple/pkg-plist
index 99d7c04b213e..97c857755c26 100644
--- a/devel/p5-Proc-Simple/pkg-plist
+++ b/devel/p5-Proc-Simple/pkg-plist
@@ -1,4 +1,3 @@
-lib/perl5/man/man3/Proc::Simple.3.gz
-lib/perl5/site_perl/Proc/Simple.pm
-lib/perl5/site_perl/i386-freebsd/auto/Proc/Simple/.packlist
-@dirrm lib/perl5/site_perl/i386-freebsd/auto/Proc/Simple
+lib/perl5/site_perl/%%PERL_VER%%/Proc/Simple.pm
+lib/perl5/site_perl/%%PERL_VER%%/i386-freebsd/auto/Proc/Simple/.packlist
+@dirrm lib/perl5/site_perl/%%PERL_VER%%/i386-freebsd/auto/Proc/Simple
diff --git a/devel/p5-ReadLine-Gnu/Makefile b/devel/p5-ReadLine-Gnu/Makefile
index 8834ee4e3afc..fc81b7402c57 100644
--- a/devel/p5-ReadLine-Gnu/Makefile
+++ b/devel/p5-ReadLine-Gnu/Makefile
@@ -3,7 +3,7 @@
 # Date created:				19 February 1998
 # Whom:	      				Matthew Hunt <mph@pobox.com>
 #
-# $Id: Makefile,v 1.3 1998/04/22 21:35:20 mph Exp $
+# $Id: Makefile,v 1.4 1998/06/15 04:48:36 mph Exp $
 #
 
 DISTNAME=	Term-ReadLine-Gnu-1.01
@@ -17,7 +17,7 @@ MAINTAINER=	mph@freebsd.org
 USE_PERL5=	YES
 
 MAN3=		Term::ReadLine::Gnu.3
-MANPREFIX=	${PREFIX}/lib/perl5
+MANPREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
 
 # We override LDDLFLAGS and LDFLAGS to keep it from adding -L/usr/local/lib
 # automatically.  There is sometimes an old libreadline in /usr/local/lib
diff --git a/devel/p5-ReadLine-Gnu/pkg-plist b/devel/p5-ReadLine-Gnu/pkg-plist
index 27e917f763a5..49b658bb428b 100644
--- a/devel/p5-ReadLine-Gnu/pkg-plist
+++ b/devel/p5-ReadLine-Gnu/pkg-plist
@@ -1,6 +1,5 @@
-lib/perl5/site_perl/i386-freebsd/auto/Term/ReadLine/Gnu/Gnu.so
-lib/perl5/site_perl/i386-freebsd/auto/Term/ReadLine/Gnu/Gnu.bs
-lib/perl5/site_perl/Term/ReadLine/Gnu.pm
-lib/perl5/man/man3/Term::ReadLine::Gnu.3.gz
-lib/perl5/site_perl/i386-freebsd/auto/Term/ReadLine/Gnu/.packlist
-@dirrm lib/perl5/site_perl/i386-freebsd/auto/Term/ReadLine/Gnu
+lib/perl5/site_perl/%%PERL_VER%%/i386-freebsd/auto/Term/ReadLine/Gnu/Gnu.so
+lib/perl5/site_perl/%%PERL_VER%%/i386-freebsd/auto/Term/ReadLine/Gnu/Gnu.bs
+lib/perl5/site_perl/%%PERL_VER%%/i386-freebsd/Term/ReadLine/Gnu.pm
+lib/perl5/site_perl/%%PERL_VER%%/i386-freebsd/auto/Term/ReadLine/Gnu/.packlist
+@dirrm lib/perl5/site_perl/%%PERL_VER%%/i386-freebsd/auto/Term/ReadLine/Gnu
diff --git a/devel/p5-ReadLine-Perl/pkg-plist b/devel/p5-ReadLine-Perl/pkg-plist
index d8184aa84dc3..b67f9b021796 100644
--- a/devel/p5-ReadLine-Perl/pkg-plist
+++ b/devel/p5-ReadLine-Perl/pkg-plist
@@ -1,3 +1,3 @@
-lib/perl5/site_perl/Term/ReadLine/Perl.pm
-lib/perl5/site_perl/Term/ReadLine/readline.pm
-lib/perl5/site_perl/i386-freebsd/auto/Term/ReadLine/.packlist
+lib/perl5/site_perl/%%PERL_VER%%/Term/ReadLine/Perl.pm
+lib/perl5/site_perl/%%PERL_VER%%/Term/ReadLine/readline.pm
+lib/perl5/site_perl/%%PERL_VER%%/i386-freebsd/auto/Term/ReadLine/.packlist
diff --git a/devel/p5-Religion/Makefile b/devel/p5-Religion/Makefile
index b86a9805e386..c87f58cda15c 100644
--- a/devel/p5-Religion/Makefile
+++ b/devel/p5-Religion/Makefile
@@ -3,7 +3,7 @@
 # Date created:				October 24th 1996
 # Whom:	      				James FitzGibbon <jfitz@FreeBSD.org>
 #
-#   $Id: Makefile,v 1.5 1997/05/24 13:17:08 jfitz Exp $
+#   $Id: Makefile,v 1.6 1997/06/24 18:43:30 jfitz Exp $
 #
 
 DISTNAME=	Religion-1.04
@@ -17,7 +17,7 @@ MAINTAINER=	jfitz@FreeBSD.ORG
 USE_PERL5=	YES
 
 MAN3=		Religion.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/devel/p5-Religion/pkg-plist b/devel/p5-Religion/pkg-plist
index 71d135971ab7..1d926314e138 100644
--- a/devel/p5-Religion/pkg-plist
+++ b/devel/p5-Religion/pkg-plist
@@ -1,4 +1,3 @@
-lib/perl5/man/man3/Religion.3.gz
-lib/perl5/site_perl/Religion.pm
-lib/perl5/site_perl/i386-freebsd/auto/Religion/.packlist
-@dirrm lib/perl5/site_perl/i386-freebsd/auto/Religion
+lib/perl5/site_perl/%%PERL_VER%%/Religion.pm
+lib/perl5/site_perl/%%PERL_VER%%/i386-freebsd/auto/Religion/.packlist
+@dirrm lib/perl5/site_perl/%%PERL_VER%%/i386-freebsd/auto/Religion
diff --git a/devel/p5-Resources/Makefile b/devel/p5-Resources/Makefile
index 1b8cf47ded65..3135969244d0 100644
--- a/devel/p5-Resources/Makefile
+++ b/devel/p5-Resources/Makefile
@@ -3,7 +3,7 @@
 # Date created:				October 24th 1996
 # Whom:	      				James FitzGibbon <jfitz@FreeBSD.org>
 #
-#   $Id: Makefile,v 1.6 1997/05/24 13:17:08 jfitz Exp $
+#   $Id: Makefile,v 1.7 1997/06/24 18:43:31 jfitz Exp $
 #
 
 DISTNAME=	Resources-1.04
@@ -17,7 +17,7 @@ MAINTAINER=	jfitz@FreeBSD.ORG
 USE_PERL5=	YES
 
 MAN3=		Resources.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/devel/p5-Resources/pkg-plist b/devel/p5-Resources/pkg-plist
index eab16c98b522..10458188425a 100644
--- a/devel/p5-Resources/pkg-plist
+++ b/devel/p5-Resources/pkg-plist
@@ -1,4 +1,3 @@
-lib/perl5/man/man3/Resources.3.gz
-lib/perl5/site_perl/Resources.pm
-lib/perl5/site_perl/i386-freebsd/auto/Resources/.packlist
-@dirrm lib/perl5/site_perl/i386-freebsd/auto/Resources
+lib/perl5/site_perl/%%PERL_VER%%/Resources.pm
+lib/perl5/site_perl/%%PERL_VER%%/i386-freebsd/auto/Resources/.packlist
+@dirrm lib/perl5/site_perl/%%PERL_VER%%/i386-freebsd/auto/Resources
diff --git a/devel/p5-Sort-Versions/Makefile b/devel/p5-Sort-Versions/Makefile
index c015236b9237..18a00031f241 100644
--- a/devel/p5-Sort-Versions/Makefile
+++ b/devel/p5-Sort-Versions/Makefile
@@ -3,7 +3,7 @@
 # Date created:				June 26th 1997
 # Whom:	      				James FitzGibbon <jfitz@FreeBSD.ORG>
 #
-#   $Id$
+#   $Id: Makefile,v 1.1.1.1 1997/06/27 01:54:30 jfitz Exp $
 #
 
 DISTNAME=	SortVersions-1.1
@@ -16,7 +16,7 @@ MAINTAINER=	jfitz@FreeBSD.ORG
 
 USE_PERL5=	YES
 
-MANPREFIX=	${PREFIX}/lib/perl5
+MANPREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
 MAN3=		Sort::Versions.3
 
 do-configure:
diff --git a/devel/p5-Sort-Versions/pkg-plist b/devel/p5-Sort-Versions/pkg-plist
index a68190ea81b3..ea00cb1f2f47 100644
--- a/devel/p5-Sort-Versions/pkg-plist
+++ b/devel/p5-Sort-Versions/pkg-plist
@@ -1,4 +1,3 @@
-lib/perl5/man/man3/Sort::Versions.3.gz
-lib/perl5/site_perl/Sort/Versions.pm
-lib/perl5/site_perl/i386-freebsd/auto/Sort/Versions/.packlist
-@dirrm lib/perl5/site_perl/i386-freebsd/auto/Sort/Versions
+lib/perl5/site_perl/%%PERL_VER%%/Sort/Versions.pm
+lib/perl5/site_perl/%%PERL_VER%%/i386-freebsd/auto/Sort/Versions/.packlist
+@dirrm lib/perl5/site_perl/%%PERL_VER%%/i386-freebsd/auto/Sort/Versions
diff --git a/devel/p5-Storable/Makefile b/devel/p5-Storable/Makefile
index 5f02e516fb03..df29c098209c 100644
--- a/devel/p5-Storable/Makefile
+++ b/devel/p5-Storable/Makefile
@@ -3,7 +3,7 @@
 # Date created:				July 7th 1997
 # Whom:	      				James FitzGibbon <jfitz@FreeBSD.org>
 #
-# $Id: Makefile,v 1.9 1998/06/26 01:41:19 asami Exp $
+# $Id: Makefile,v 1.10 1998/06/26 11:50:40 vanilla Exp $
 #
 
 DISTNAME=	Storable-0.6@2
@@ -16,7 +16,7 @@ MAINTAINER=	jfitz@FreeBSD.ORG
 
 USE_PERL5=	YES
 
-MANPREFIX=	${PREFIX}/lib/perl5
+MANPREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
 MAN3=		Storable.3
 
 do-configure:
diff --git a/devel/p5-Storable/pkg-plist b/devel/p5-Storable/pkg-plist
index b41e5fa60917..7f381228d9a0 100644
--- a/devel/p5-Storable/pkg-plist
+++ b/devel/p5-Storable/pkg-plist
@@ -1,20 +1,18 @@
-lib/perl5/man/man3/Storable.3.gz
-lib/perl5/site_perl/Storable.pm
-lib/perl5/site_perl/auto/Storable/_freeze.al
-lib/perl5/site_perl/auto/Storable/_store.al
-lib/perl5/site_perl/auto/Storable/_store_fd.al
-lib/perl5/site_perl/auto/Storable/autosplit.ix
-lib/perl5/site_perl/auto/Storable/freeze.al
-lib/perl5/site_perl/auto/Storable/nfreeze.al
-lib/perl5/site_perl/auto/Storable/nstore.al
-lib/perl5/site_perl/auto/Storable/nstore_fd.al
-lib/perl5/site_perl/auto/Storable/retrieve.al
-lib/perl5/site_perl/auto/Storable/retrieve_fd.al
-lib/perl5/site_perl/auto/Storable/store.al
-lib/perl5/site_perl/auto/Storable/store_fd.al
-lib/perl5/site_perl/auto/Storable/thaw.al
-lib/perl5/site_perl/i386-freebsd/auto/Storable/Storable.bs
-lib/perl5/site_perl/i386-freebsd/auto/Storable/Storable.so
-lib/perl5/site_perl/i386-freebsd/auto/Storable/.packlist
-@dirrm lib/perl5/site_perl/i386-freebsd/auto/Storable
-@dirrm lib/perl5/site_perl/auto/Storable
+lib/perl5/site_perl/%%PERL_VER%%/i386-freebsd/Storable.pm
+lib/perl5/site_perl/%%PERL_VER%%/i386-freebsd/auto/Storable/_freeze.al
+lib/perl5/site_perl/%%PERL_VER%%/i386-freebsd/auto/Storable/_store.al
+lib/perl5/site_perl/%%PERL_VER%%/i386-freebsd/auto/Storable/_store_fd.al
+lib/perl5/site_perl/%%PERL_VER%%/i386-freebsd/auto/Storable/autosplit.ix
+lib/perl5/site_perl/%%PERL_VER%%/i386-freebsd/auto/Storable/freeze.al
+lib/perl5/site_perl/%%PERL_VER%%/i386-freebsd/auto/Storable/nfreeze.al
+lib/perl5/site_perl/%%PERL_VER%%/i386-freebsd/auto/Storable/nstore.al
+lib/perl5/site_perl/%%PERL_VER%%/i386-freebsd/auto/Storable/nstore_fd.al
+lib/perl5/site_perl/%%PERL_VER%%/i386-freebsd/auto/Storable/retrieve.al
+lib/perl5/site_perl/%%PERL_VER%%/i386-freebsd/auto/Storable/retrieve_fd.al
+lib/perl5/site_perl/%%PERL_VER%%/i386-freebsd/auto/Storable/store.al
+lib/perl5/site_perl/%%PERL_VER%%/i386-freebsd/auto/Storable/store_fd.al
+lib/perl5/site_perl/%%PERL_VER%%/i386-freebsd/auto/Storable/thaw.al
+lib/perl5/site_perl/%%PERL_VER%%/i386-freebsd/auto/Storable/Storable.bs
+lib/perl5/site_perl/%%PERL_VER%%/i386-freebsd/auto/Storable/Storable.so
+lib/perl5/site_perl/%%PERL_VER%%/i386-freebsd/auto/Storable/.packlist
+@dirrm lib/perl5/site_perl/%%PERL_VER%%/i386-freebsd/auto/Storable
diff --git a/devel/p5-Term-Query/Makefile b/devel/p5-Term-Query/Makefile
index 4d8fee96f935..41bf0226b905 100644
--- a/devel/p5-Term-Query/Makefile
+++ b/devel/p5-Term-Query/Makefile
@@ -3,7 +3,7 @@
 # Date created:				21 May 1998
 # Whom:	      				Garrett Wollman <wollman@lcs.mit.edu>
 #
-# $Id$
+# $Id: Makefile,v 1.1.1.1 1998/05/22 02:07:30 mph Exp $
 #
 
 DISTNAME=	Term-Query-2.0
@@ -14,11 +14,11 @@ MASTER_SITE_SUBDIR=	Term
 
 MAINTAINER=	ports@FreeBSD.ORG
 
-RUN_DEPENDS=	${PREFIX}/lib/perl5/site_perl/Array/PrintCols.pm:${PORTSDIR}/misc/p5-Array-PrintCols
+RUN_DEPENDS=	${PREFIX}/lib/perl5/site_perl/${PERL_VER}/Array/PrintCols.pm:${PORTSDIR}/misc/p5-Array-PrintCols
 
 USE_PERL5=	YES
 
-MANPREFIX=	${PREFIX}/lib/perl5
+MANPREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
 MAN3=		Term::Query.3
 
 do-configure:
diff --git a/devel/p5-Term-Query/pkg-plist b/devel/p5-Term-Query/pkg-plist
index 8dbb1aba9ab8..a05e74ca9c9c 100644
--- a/devel/p5-Term-Query/pkg-plist
+++ b/devel/p5-Term-Query/pkg-plist
@@ -1,6 +1,5 @@
-lib/perl5/site_perl/Term/Query.pm
-lib/perl5/site_perl/Term/Tester.pm
-lib/perl5/site_perl/Term/Query_Test.pl
-lib/perl5/man/man3/Term::Query.3.gz
-lib/perl5/site_perl/i386-freebsd/auto/Term/Query/.packlist
-@dirrm lib/perl5/site_perl/i386-freebsd/auto/Term/Query
+lib/perl5/site_perl/%%PERL_VER%%/Term/Query.pm
+lib/perl5/site_perl/%%PERL_VER%%/Term/Tester.pm
+lib/perl5/site_perl/%%PERL_VER%%/Term/Query_Test.pl
+lib/perl5/site_perl/%%PERL_VER%%/i386-freebsd/auto/Term/Query/.packlist
+@dirrm lib/perl5/site_perl/%%PERL_VER%%/i386-freebsd/auto/Term/Query
diff --git a/devel/p5-Term-ReadKey/Makefile b/devel/p5-Term-ReadKey/Makefile
index 39eea5dae254..9f7760c16e08 100644
--- a/devel/p5-Term-ReadKey/Makefile
+++ b/devel/p5-Term-ReadKey/Makefile
@@ -3,7 +3,7 @@
 # Date created:				June 26th 1997
 # Whom:	      				James FitzGibbon <jfitz@FreeBSD.ORG>
 #
-# $Id: Makefile,v 1.1.1.1 1997/06/27 01:56:01 jfitz Exp $
+# $Id: Makefile,v 1.2 1998/03/11 03:02:53 vanilla Exp $
 #
 
 DISTNAME=	TermReadKey-2.12
@@ -16,7 +16,7 @@ MAINTAINER=	jfitz@FreeBSD.ORG
 
 USE_PERL5=	YES
 
-MANPREFIX=	${PREFIX}/lib/perl5
+MANPREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
 MAN3=		Term::ReadKey.3
 
 do-configure:
diff --git a/devel/p5-Term-ReadKey/pkg-plist b/devel/p5-Term-ReadKey/pkg-plist
index 018dcbdec823..40599d78939d 100644
--- a/devel/p5-Term-ReadKey/pkg-plist
+++ b/devel/p5-Term-ReadKey/pkg-plist
@@ -1,8 +1,7 @@
-lib/perl5/man/man3/Term::ReadKey.3.gz
-lib/perl5/site_perl/Term/ReadKey.pm
-lib/perl5/site_perl/auto/Term/ReadKey/autosplit.ix
-lib/perl5/site_perl/i386-freebsd/auto/Term/ReadKey/ReadKey.bs
-lib/perl5/site_perl/i386-freebsd/auto/Term/ReadKey/ReadKey.so
-lib/perl5/site_perl/i386-freebsd/auto/Term/ReadKey/.packlist
-@dirrm lib/perl5/site_perl/i386-freebsd/auto/Term/ReadKey
-@dirrm lib/perl5/site_perl/auto/Term/ReadKey
+lib/perl5/site_perl/%%PERL_VER%%/i386-freebsd/Term/ReadKey.pm
+lib/perl5/site_perl/%%PERL_VER%%/i386-freebsd/auto/Term/ReadKey/autosplit.ix
+lib/perl5/site_perl/%%PERL_VER%%/i386-freebsd/auto/Term/ReadKey/ReadKey.bs
+lib/perl5/site_perl/%%PERL_VER%%/i386-freebsd/auto/Term/ReadKey/ReadKey.so
+lib/perl5/site_perl/%%PERL_VER%%/i386-freebsd/auto/Term/ReadKey/.packlist
+@dirrm lib/perl5/site_perl/%%PERL_VER%%/i386-freebsd/auto/Term/ReadKey
+@unexec rmdir lib/perl5/site_perl/%%PERL_VER%%/i386-freebsd/auto/Term 2>/dev/null || true
diff --git a/devel/p5-Time/Makefile b/devel/p5-Time/Makefile
index 1c95d265d941..eb5ef8c1c1a7 100644
--- a/devel/p5-Time/Makefile
+++ b/devel/p5-Time/Makefile
@@ -3,7 +3,7 @@
 # Date created:				October 12th 1996
 # Whom:	      				James FitzGibbon <jfitz@FreeBSD.org>
 #
-# $Id: Makefile,v 1.7 1997/06/24 18:43:33 jfitz Exp $
+# $Id: Makefile,v 1.8 1998/03/11 03:05:06 vanilla Exp $
 #
 
 DISTNAME=	Time-modules-97.092101
@@ -18,7 +18,7 @@ USE_PERL5=	YES
 
 MAN3=		Time::CTime.3 Time::JulianDay.3 Time::ParseDate.3 \
 		Time::Timezone.3 Time::DaysInMonth.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/devel/p5-Time/pkg-plist b/devel/p5-Time/pkg-plist
index b732946fe586..66a236484cbe 100644
--- a/devel/p5-Time/pkg-plist
+++ b/devel/p5-Time/pkg-plist
@@ -1,12 +1,7 @@
-lib/perl5/man/man3/Time::CTime.3.gz
-lib/perl5/man/man3/Time::DaysInMonth.3.gz
-lib/perl5/man/man3/Time::JulianDay.3.gz
-lib/perl5/man/man3/Time::ParseDate.3.gz
-lib/perl5/man/man3/Time::Timezone.3.gz
-lib/perl5/site_perl/Time/CTime.pm
-lib/perl5/site_perl/Time/DaysInMonth.pm
-lib/perl5/site_perl/Time/JulianDay.pm
-lib/perl5/site_perl/Time/ParseDate.pm
-lib/perl5/site_perl/Time/Timezone.pm
-lib/perl5/site_perl/i386-freebsd/auto/Time-modules/.packlist
-@dirrm lib/perl5/site_perl/i386-freebsd/auto/Time-modules
+lib/perl5/site_perl/%%PERL_VER%%/Time/CTime.pm
+lib/perl5/site_perl/%%PERL_VER%%/Time/DaysInMonth.pm
+lib/perl5/site_perl/%%PERL_VER%%/Time/JulianDay.pm
+lib/perl5/site_perl/%%PERL_VER%%/Time/ParseDate.pm
+lib/perl5/site_perl/%%PERL_VER%%/Time/Timezone.pm
+lib/perl5/site_perl/%%PERL_VER%%/i386-freebsd/auto/Time-modules/.packlist
+@dirrm lib/perl5/site_perl/%%PERL_VER%%/i386-freebsd/auto/Time-modules
diff --git a/devel/p5-TimeDate/Makefile b/devel/p5-TimeDate/Makefile
index 1808cfe6eb2d..c31fba99cee5 100644
--- a/devel/p5-TimeDate/Makefile
+++ b/devel/p5-TimeDate/Makefile
@@ -3,7 +3,7 @@
 # Date created:			Mon Sep  1 17:03:41 CEST 1997
 # Whom:				Andreas Klemm <andreas@klemm.gtn.com>
 #
-# $Id: Makefile,v 1.2 1997/10/04 14:53:08 andreas Exp $
+# $Id: Makefile,v 1.3 1998/03/11 03:06:20 vanilla Exp $
 #
 
 DISTNAME=	TimeDate-1.08
@@ -18,7 +18,7 @@ USE_PERL5=	YES
 
 MAN3=		Date::Format.3 Date::Parse.3 Time::Zone.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/devel/p5-TimeDate/pkg-plist b/devel/p5-TimeDate/pkg-plist
index 8f47b82237dc..43a0527c7995 100644
--- a/devel/p5-TimeDate/pkg-plist
+++ b/devel/p5-TimeDate/pkg-plist
@@ -1,9 +1,6 @@
-lib/perl5/man/man3/Date::Format.3.gz
-lib/perl5/man/man3/Date::Parse.3.gz
-lib/perl5/man/man3/Time::Zone.3.gz
-lib/perl5/site_perl/Date/Format.pm
-lib/perl5/site_perl/Date/Language.pm
-lib/perl5/site_perl/Date/Parse.pm
-lib/perl5/site_perl/Time/Zone.pm
-lib/perl5/site_perl/i386-freebsd/auto/TimeDate/.packlist
-@dirrm lib/perl5/site_perl/i386-freebsd/auto/TimeDate
+lib/perl5/site_perl/%%PERL_VER%%/Date/Format.pm
+lib/perl5/site_perl/%%PERL_VER%%/Date/Language.pm
+lib/perl5/site_perl/%%PERL_VER%%/Date/Parse.pm
+lib/perl5/site_perl/%%PERL_VER%%/Time/Zone.pm
+lib/perl5/site_perl/%%PERL_VER%%/i386-freebsd/auto/TimeDate/.packlist
+@dirrm lib/perl5/site_perl/%%PERL_VER%%/i386-freebsd/auto/TimeDate
diff --git a/devel/p5-TraceFuncs/Makefile b/devel/p5-TraceFuncs/Makefile
index de0c906adad1..323d340f70d8 100644
--- a/devel/p5-TraceFuncs/Makefile
+++ b/devel/p5-TraceFuncs/Makefile
@@ -3,7 +3,7 @@
 # Date created:				June 26th 1997
 # Whom:	      				James FitzGibbon <jfitz@FreeBSD.ORG>
 #
-#   $Id$
+#   $Id: Makefile,v 1.1.1.1 1997/06/27 01:57:29 jfitz Exp $
 #
 
 DISTNAME=	traceFunc-0.1
@@ -16,7 +16,7 @@ MAINTAINER=	jfitz@FreeBSD.ORG
 
 USE_PERL5=	YES
 
-MANPREFIX=	${PREFIX}/lib/perl5
+MANPREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
 MAN3=		Devel::TraceFuncs.3
 
 do-configure:
diff --git a/devel/p5-TraceFuncs/pkg-plist b/devel/p5-TraceFuncs/pkg-plist
index e6dd6962a342..4dbd66d71c67 100644
--- a/devel/p5-TraceFuncs/pkg-plist
+++ b/devel/p5-TraceFuncs/pkg-plist
@@ -1,3 +1,2 @@
-lib/perl5/man/man3/Devel::TraceFuncs.3.gz
-lib/perl5/site_perl/Devel/TraceFuncs.pm
-lib/perl5/site_perl/i386-freebsd/auto/Devel/.packlist
+lib/perl5/site_perl/%%PERL_VER%%/Devel/TraceFuncs.pm
+lib/perl5/site_perl/%%PERL_VER%%/i386-freebsd/auto/Devel/.packlist