SVR4 packages have a limit of 9 chars for a package name.

The automatic truncation in gensolpkg doesn't work for packages which
have the same package name for the first 5-6 chars.
e.g. amanda-server and amanda-client would be named amanda and amanda.
Now, we add a SVR4_PKGNAME and use amacl for amanda-client and amase for
amanda-server.
All svr4 packages also have a vendor tag, so we have to reserve some chars
for this tag, which is normaly 3 or 4 chars. Thats why we can only use 6
or 5 chars for SVR4_PKGNAME. I used 5 for all the packages, to give the
vendor tag enough room.
All p5-* packages and a few other packages have now a SVR4_PKGNAME.

50 files changed, 100 insertions, 50 deletions

diff --git a/devel/gettext-lib/Makefile b/devel/gettext-lib/Makefile
index a76991aa4e7..5dbd2df6848 100644
--- a/devel/gettext-lib/Makefile
+++ b/devel/gettext-lib/Makefile
@@ -1,9 +1,10 @@
-# $NetBSD: Makefile,v 1.9 2001/06/28 18:30:26 jlam Exp $
+# $NetBSD: Makefile,v 1.10 2001/10/18 15:20:10 veego Exp $
 # FreeBSD Id: Makefile,v 1.1.1.1 1998/08/09 15:13:33 kuriyama Exp
 #
 
 DISTNAME=		gettext-0.10.35
 PKGNAME=		gettext-lib-0.10.35nb1
+SVR4_PKGNAME=		gttli
 CATEGORIES=		devel
 MASTER_SITES=		${MASTER_SITE_GNU:=gettext/}
 
diff --git a/devel/gettext-m4/Makefile b/devel/gettext-m4/Makefile
index 873e648573b..7121c3c9fd9 100644
--- a/devel/gettext-m4/Makefile
+++ b/devel/gettext-m4/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.1.1.1 2001/06/16 03:30:51 jlam Exp $
+# $NetBSD: Makefile,v 1.2 2001/10/18 15:20:10 veego Exp $
 
 DISTNAME=		gettext-0.10.35
 PKGNAME=		gettext-m4-0.10.35
+SVR4_PKGNAME=		gttm4
 CATEGORIES=		devel
 MASTER_SITES=		${MASTER_SITE_GNU:=gettext/}
 
diff --git a/devel/libslang/Makefile b/devel/libslang/Makefile
index f056a34712a..7134ce32041 100644
--- a/devel/libslang/Makefile
+++ b/devel/libslang/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.31 2001/09/09 03:00:01 mycroft Exp $
+# $NetBSD: Makefile,v 1.32 2001/10/18 15:20:11 veego Exp $
 #
 
 DISTNAME=      	slang-1.4.4
 PKGNAME=       	lib${DISTNAME}
+SVR4_PKGNAME=	lslan
 CATEGORIES=	devel
 MASTER_SITES=  	ftp://space.mit.edu/pub/davis/slang/v1.4/ \
 		http://gd.tuwien.ac.at/editors/davis/slang/v1.4/ \
diff --git a/devel/libtool-base/Makefile b/devel/libtool-base/Makefile
index c8fe878a69d..905331dfb40 100644
--- a/devel/libtool-base/Makefile
+++ b/devel/libtool-base/Makefile
@@ -1,9 +1,10 @@
-# $NetBSD: Makefile,v 1.7 2001/04/20 00:07:29 wiz Exp $
+# $NetBSD: Makefile,v 1.8 2001/10/18 15:20:11 veego Exp $
 #
 
 .include "../libtool/Makefile.common"
 
 PKGNAME=        ${PKGPFX:C/-/-base-/}${PKGREV}
+SVR4_PKGNAME=	ltoob
 
 COMMENT=	Generic shared library support script (the script itself)
 
diff --git a/devel/libtool-info/Makefile b/devel/libtool-info/Makefile
index 04eecbd69d6..a2a70ab671a 100644
--- a/devel/libtool-info/Makefile
+++ b/devel/libtool-info/Makefile
@@ -1,9 +1,10 @@
-# $NetBSD: Makefile,v 1.6 2001/07/09 11:10:32 skrll Exp $
+# $NetBSD: Makefile,v 1.7 2001/10/18 15:20:11 veego Exp $
 #
 
 .include "../libtool/Makefile.common"
 
 PKGNAME=	${PKGPFX:C/-/-info-/}${PKGREV}
+SVR4_PKGNAME=	ltooi
 
 COMMENT=	Generic shared library support script - info pages
 
diff --git a/devel/libtool/Makefile b/devel/libtool/Makefile
index 21be7ea9c93..3c43bedbea3 100644
--- a/devel/libtool/Makefile
+++ b/devel/libtool/Makefile
@@ -1,10 +1,11 @@
-# $NetBSD: Makefile,v 1.33 2001/02/27 08:20:24 skrll Exp $
+# $NetBSD: Makefile,v 1.34 2001/10/18 15:20:11 veego Exp $
 #
 
 DISTFILES=	# empty
 .include "Makefile.common"
 
 PKGNAME=	${PKGPFX}${PKGREV}
+SVR4_PKGNAME=	ltool
 
 DEPENDS+=	${PKGPFX:C/-/-base-/}${PKGREV}:../libtool-base
 DEPENDS+=	${PKGPFX:C/-/-info-/}${PKGREV}:../libtool-info
diff --git a/devel/p5-AppConfig/Makefile b/devel/p5-AppConfig/Makefile
index 1b1cdf2420b..45686e28f64 100644
--- a/devel/p5-AppConfig/Makefile
+++ b/devel/p5-AppConfig/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.1.1.1 2001/04/16 18:46:29 jtb Exp $
+# $NetBSD: Makefile,v 1.2 2001/10/18 15:20:11 veego Exp $
 
 DISTNAME=	AppConfig-1.52
 PKGNAME=	p5-${DISTNAME}
+SVR4_PKGNAME=	p5apc
 CATEGORIES=	devel perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=App/ABW/}
 
diff --git a/devel/p5-AtExit/Makefile b/devel/p5-AtExit/Makefile
index 4a9bba97300..a169488dbbe 100644
--- a/devel/p5-AtExit/Makefile
+++ b/devel/p5-AtExit/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.4 2001/02/16 14:38:45 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2001/10/18 15:20:12 veego Exp $
 #
 
 DISTNAME=	AtExit-2.01
 PKGNAME=	p5-AtExit-2.01
+SVR4_PKGNAME=	p5ate
 CATEGORIES=	devel perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=AtExit/}
 
diff --git a/devel/p5-BSD-Resource/Makefile b/devel/p5-BSD-Resource/Makefile
index 38c1c3f7575..8f96c26809c 100644
--- a/devel/p5-BSD-Resource/Makefile
+++ b/devel/p5-BSD-Resource/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.1.1.1 2001/04/16 21:30:45 jtb Exp $
+# $NetBSD: Makefile,v 1.2 2001/10/18 15:20:12 veego Exp $
 
 DISTNAME=		BSD-Resource-1.10
 PKGNAME=		p5-${DISTNAME}
+SVR4_PKGNAME=		p5bsd
 CATEGORIES=		devel perl5
 MASTER_SITES=		${MASTER_SITE_PERL_CPAN:=BSD/}
 
diff --git a/devel/p5-Bit-Vector/Makefile b/devel/p5-Bit-Vector/Makefile
index 09d54a66ff4..0ed779985ef 100644
--- a/devel/p5-Bit-Vector/Makefile
+++ b/devel/p5-Bit-Vector/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.4 2001/02/16 14:38:46 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2001/10/18 15:20:12 veego Exp $
 #
 
 DISTNAME=	Bit-Vector-5.8
 PKGNAME=	p5-${DISTNAME}
+SVR4_PKGNAME=	p5biv
 CATEGORIES=	devel perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=Bit/}
 
diff --git a/devel/p5-Class-Loader/Makefile b/devel/p5-Class-Loader/Makefile
index 6f3c69974b6..56caea969e3 100644
--- a/devel/p5-Class-Loader/Makefile
+++ b/devel/p5-Class-Loader/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.1 2001/09/30 23:53:24 mcr Exp $
+# $NetBSD: Makefile,v 1.2 2001/10/18 15:20:13 veego Exp $
 #
 
 DISTNAME=		Class-Loader-2.02
 PKGNAME=		p5-${DISTNAME}
+SVR4_PKGNAME=		p5clo
 CATEGORIES=		devel perl5
 MASTER_SITES=		${MASTER_SITE_PERL_CPAN:=Class/}
 
diff --git a/devel/p5-Compress-Zlib/Makefile b/devel/p5-Compress-Zlib/Makefile
index 8a903db5966..40eeab4fd68 100644
--- a/devel/p5-Compress-Zlib/Makefile
+++ b/devel/p5-Compress-Zlib/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.2 2001/10/01 10:33:53 agc Exp $
+# $NetBSD: Makefile,v 1.3 2001/10/18 15:20:13 veego Exp $
 
 DISTNAME=		Compress-Zlib-1.14
 PKGNAME=		p5-${DISTNAME}
+SVR4_PKGNAME=		p5czl
 CATEGORIES=		devel perl5
 MASTER_SITES=		${MASTER_SITE_PERL_CPAN:=Compress/}
 
diff --git a/devel/p5-Config-IniFiles/Makefile b/devel/p5-Config-IniFiles/Makefile
index 8682b80fed0..f2705cac87b 100644
--- a/devel/p5-Config-IniFiles/Makefile
+++ b/devel/p5-Config-IniFiles/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.1.1.1 2001/08/10 12:25:04 mjl Exp $
+# $NetBSD: Makefile,v 1.2 2001/10/18 15:20:13 veego Exp $
 #
 
 DISTNAME=	Config-IniFiles-2.19
 PKGNAME=	p5-${DISTNAME}
+SVR4_PKGNAME=	p5cif
 CATEGORIES=	devel perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=Config/}
 
diff --git a/devel/p5-Curses/Makefile b/devel/p5-Curses/Makefile
index 5ab84a9971f..cf13d475fe9 100644
--- a/devel/p5-Curses/Makefile
+++ b/devel/p5-Curses/Makefile
@@ -1,9 +1,10 @@
-# $NetBSD: Makefile,v 1.9 2001/02/16 14:38:46 wiz Exp $
+# $NetBSD: Makefile,v 1.10 2001/10/18 15:20:13 veego Exp $
 # FreeBSD Id: Makefile,v 1.8 1998/04/04 13:58:26 vanilla Exp
 #
 
 DISTNAME=	Curses-1.05
 PKGNAME=	p5-${DISTNAME}
+SVR4_PKGNAME=	p5cur
 CATEGORIES=	devel perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=Curses/}
 
diff --git a/devel/p5-Data-Buffer/Makefile b/devel/p5-Data-Buffer/Makefile
index 42a2b4968d9..0746e67d97b 100644
--- a/devel/p5-Data-Buffer/Makefile
+++ b/devel/p5-Data-Buffer/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.1 2001/10/02 00:38:23 mcr Exp $
+# $NetBSD: Makefile,v 1.2 2001/10/18 15:20:13 veego Exp $
 #
 
 DISTNAME=		Data-Buffer-0.04
 PKGNAME=		p5-${DISTNAME}
+SVR4_PKGNAME=		p5dbu
 CATEGORIES=		devel perl5
 MASTER_SITES=		${MASTER_SITE_PERL_CPAN:=Data/}
 
diff --git a/devel/p5-Data-ShowTable/Makefile b/devel/p5-Data-ShowTable/Makefile
index 46cb9db753b..d1f4416a9cb 100644
--- a/devel/p5-Data-ShowTable/Makefile
+++ b/devel/p5-Data-ShowTable/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.3 2001/02/16 14:38:47 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2001/10/18 15:20:14 veego Exp $
 #
 
 DISTNAME=		Data-ShowTable-3.3
 PKGNAME=		p5-${DISTNAME}
+SVR4_PKGNAME=		p5dst
 CATEGORIES=		devel perl5
 MASTER_SITES=		${MASTER_SITE_PERL_CPAN:=Data/}
 
diff --git a/devel/p5-Date-Calc/Makefile b/devel/p5-Date-Calc/Makefile
index fdc5279618b..ebbc34ccabb 100644
--- a/devel/p5-Date-Calc/Makefile
+++ b/devel/p5-Date-Calc/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.4 2001/02/27 22:48:19 jtb Exp $
+# $NetBSD: Makefile,v 1.5 2001/10/18 15:20:14 veego Exp $
 #
 
 DISTNAME=     	Date-Calc-4.3
 PKGNAME=       	p5-${DISTNAME}
+SVR4_PKGNAME=	p5dca
 CATEGORIES=	textproc perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=Date/}
 
diff --git a/devel/p5-Date-Manip/Makefile b/devel/p5-Date-Manip/Makefile
index 41aa89737c4..6c44a0e00e6 100644
--- a/devel/p5-Date-Manip/Makefile
+++ b/devel/p5-Date-Manip/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.5 2001/02/28 12:51:39 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2001/10/18 15:20:14 veego Exp $
 #
 
 DISTNAME=     	DateManip-5.39
 PKGNAME=       	p5-Date-Manip-5.39
+SVR4_PKGNAME=	p5dma
 CATEGORIES=	textproc perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=Date/}
 
diff --git a/devel/p5-Devel-SmallProf/Makefile b/devel/p5-Devel-SmallProf/Makefile
index 8c8dbe393ed..e5501476812 100644
--- a/devel/p5-Devel-SmallProf/Makefile
+++ b/devel/p5-Devel-SmallProf/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.5 2001/02/16 14:38:49 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2001/10/18 15:20:14 veego Exp $
 #
 
 DISTNAME=		Devel-SmallProf-0.9
 PKGNAME=		p5-${DISTNAME}
+SVR4_PKGNAME=		p5dsp
 CATEGORIES=		devel perl5
 MASTER_SITES=		${MASTER_SITE_PERL_CPAN:=Devel/}
 
diff --git a/devel/p5-Devel-Symdump/Makefile b/devel/p5-Devel-Symdump/Makefile
index eebb550a2f2..3157b96f1c7 100644
--- a/devel/p5-Devel-Symdump/Makefile
+++ b/devel/p5-Devel-Symdump/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.4 2001/09/29 06:24:06 jlam Exp $
+# $NetBSD: Makefile,v 1.5 2001/10/18 15:20:14 veego Exp $
 #
 
 DISTNAME=	Devel-Symdump-2.01
 PKGNAME=	p5-${DISTNAME}
+SVR4_PKGNAME=	p5dsd
 CATEGORIES=	devel perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=Devel/}
 
diff --git a/devel/p5-Event/Makefile b/devel/p5-Event/Makefile
index 4214056fff3..eaa54567d53 100644
--- a/devel/p5-Event/Makefile
+++ b/devel/p5-Event/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.1 2001/06/10 06:11:28 explorer Exp $
+# $NetBSD: Makefile,v 1.2 2001/10/18 15:20:15 veego Exp $
 
 DISTNAME=	Event-0.81
 PKGNAME=	p5-${DISTNAME}
+SVR4_PKGNAME=	p5eve
 CATEGORIES=	devel perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=../../authors/id/J/JP/JPRIT/}
 
diff --git a/devel/p5-Expect/Makefile b/devel/p5-Expect/Makefile
index 1b088e99b51..d8769fa4a38 100644
--- a/devel/p5-Expect/Makefile
+++ b/devel/p5-Expect/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.8 2001/09/27 23:17:57 jlam Exp $
+# $NetBSD: Makefile,v 1.9 2001/10/18 15:20:15 veego Exp $
 
 DISTNAME=	Expect-1.11
 PKGNAME=	p5-expect-1.11
+SVR4_PKGNAME=	p5exp
 CATEGORIES=	devel perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=Expect/}
 
diff --git a/devel/p5-ExtUtils-F77/Makefile b/devel/p5-ExtUtils-F77/Makefile
index e50485570ff..7ca202be51b 100644
--- a/devel/p5-ExtUtils-F77/Makefile
+++ b/devel/p5-ExtUtils-F77/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.3 2001/04/14 21:43:41 jtb Exp $
+# $NetBSD: Makefile,v 1.4 2001/10/18 15:20:15 veego Exp $
 
 DISTNAME=	ExtUtils-F77-1.13
 PKGNAME=	p5-${DISTNAME}
+SVR4_PKGNAME=	p5ext
 CATEGORIES=	devel perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=ExtUtils/}
 
diff --git a/devel/p5-File-FlockDir/Makefile b/devel/p5-File-FlockDir/Makefile
index dfbe5d8bda1..3c1bd8a946b 100644
--- a/devel/p5-File-FlockDir/Makefile
+++ b/devel/p5-File-FlockDir/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.1.1.1 2001/03/15 18:04:33 wiz Exp $
+# $NetBSD: Makefile,v 1.2 2001/10/18 15:20:15 veego Exp $
 #
 
 DISTNAME=	File-FlockDir-1.02
 PKGNAME=	p5-${DISTNAME}
+SVR4_PKGNAME=	p5ffl
 CATEGORIES=	devel perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=File/}
 
diff --git a/devel/p5-File-PathConvert/Makefile b/devel/p5-File-PathConvert/Makefile
index a1471e56661..7017d5e75fc 100644
--- a/devel/p5-File-PathConvert/Makefile
+++ b/devel/p5-File-PathConvert/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.3 2001/02/16 14:38:50 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2001/10/18 15:20:15 veego Exp $
 #
 
 DISTNAME=	File-PathConvert-0.85
 PKGNAME=	p5-${DISTNAME}
+SVR4_PKGNAME=	p5fpc
 CATEGORIES=	devel perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=File/}
 
diff --git a/devel/p5-File-Temp/Makefile b/devel/p5-File-Temp/Makefile
index 0024d9a635e..e32b785520f 100644
--- a/devel/p5-File-Temp/Makefile
+++ b/devel/p5-File-Temp/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.1.1.1 2001/03/25 06:45:48 mjl Exp $
+# $NetBSD: Makefile,v 1.2 2001/10/18 15:20:16 veego Exp $
 #
 
 DISTNAME=	File-Temp-0.12
 PKGNAME=	p5-${DISTNAME}
+SVR4_PKGNAME=	p5fte
 CATEGORIES=	devel perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=File/}
 
diff --git a/devel/p5-FileKGlob/Makefile b/devel/p5-FileKGlob/Makefile
index 47c6ac8acc0..169e2ef1577 100644
--- a/devel/p5-FileKGlob/Makefile
+++ b/devel/p5-FileKGlob/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.3 2001/02/16 14:38:51 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2001/10/18 15:20:16 veego Exp $
 #
 
 DISTNAME=	FileKGlob
 PKGNAME=	p5-FileKGlob-1.2
+SVR4_PKGNAME=	p5fkg
 WRKSRC=		${WRKDIR}/File
 CATEGORIES=	devel perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=File/}
diff --git a/devel/p5-FreezeThaw/Makefile b/devel/p5-FreezeThaw/Makefile
index 30fafed6ce1..205fafc4460 100644
--- a/devel/p5-FreezeThaw/Makefile
+++ b/devel/p5-FreezeThaw/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.1.1.1 2001/09/15 22:08:48 mjl Exp $
+# $NetBSD: Makefile,v 1.2 2001/10/18 15:20:16 veego Exp $
 #
 
 DISTNAME=	FreezeThaw-0.41
 PKGNAME=	p5-${DISTNAME}
+SVR4_PKGNAME=	p5frt
 CATEGORIES=	devel perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=FreezeThaw/}
 
diff --git a/devel/p5-IO-Stty/Makefile b/devel/p5-IO-Stty/Makefile
index 53a159cdbbe..477b6691220 100644
--- a/devel/p5-IO-Stty/Makefile
+++ b/devel/p5-IO-Stty/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.4 2001/02/16 14:38:51 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2001/10/18 15:20:16 veego Exp $
 
 DISTNAME=	IO-Stty-.02
 PKGNAME=	p5-IO-stty-0.02
+SVR4_PKGNAME=	p5ist
 CATEGORIES=	devel perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=IO/}
 
diff --git a/devel/p5-IO-Tty/Makefile b/devel/p5-IO-Tty/Makefile
index a300bc8546d..71111fec85b 100644
--- a/devel/p5-IO-Tty/Makefile
+++ b/devel/p5-IO-Tty/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.5 2001/02/27 22:46:08 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2001/10/18 15:20:16 veego Exp $
 #
 
 DISTNAME=	IO-Tty-0.04
 PKGNAME=	p5-${DISTNAME:C/T/t/}
+SVR4_PKGNAME=	p5itt
 CATEGORIES=	devel perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=IO/}
 
diff --git a/devel/p5-IO-stringy/Makefile b/devel/p5-IO-stringy/Makefile
index 46c62cd1382..6d3c1990ede 100644
--- a/devel/p5-IO-stringy/Makefile
+++ b/devel/p5-IO-stringy/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.8 2001/05/26 01:44:40 mjl Exp $
+# $NetBSD: Makefile,v 1.9 2001/10/18 15:20:17 veego Exp $
 #
 
 DISTNAME=	IO-stringy-1.220
 PKGNAME=	p5-${DISTNAME}
+SVR4_PKGNAME=	p5isr
 CATEGORIES=	devel perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=IO/}
 
diff --git a/devel/p5-LDAP/Makefile b/devel/p5-LDAP/Makefile
index 715d07df20c..2180f58b96d 100644
--- a/devel/p5-LDAP/Makefile
+++ b/devel/p5-LDAP/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.4 2001/07/27 11:17:42 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2001/10/18 15:20:17 veego Exp $
 #
 
 DISTNAME=	perldap-1.2.2
 PKGNAME=	p5-LDAP-1.2.2
+SVR4_PKGNAME=	p5lda
 CATEGORIES=	devel perl5 databases
 MASTER_SITES=	ftp://ftp.mozilla.org/pub/directory/perldap/
 EXTRACT_SUFX=	.tgz
diff --git a/devel/p5-Log-Dispatch/Makefile b/devel/p5-Log-Dispatch/Makefile
index e899e54e8cd..524aeef3009 100644
--- a/devel/p5-Log-Dispatch/Makefile
+++ b/devel/p5-Log-Dispatch/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.2 2001/06/06 13:18:57 mjl Exp $
+# $NetBSD: Makefile,v 1.3 2001/10/18 15:20:17 veego Exp $
 
 DISTNAME=	Log-Dispatch-1.79
 PKGNAME=	p5-${DISTNAME}
+SVR4_PKGNAME=	p5ldi
 CATEGORIES=	devel perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=Log/}
 
diff --git a/devel/p5-Make/Makefile b/devel/p5-Make/Makefile
index e72536bd53a..b0c99ac8757 100644
--- a/devel/p5-Make/Makefile
+++ b/devel/p5-Make/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.1.1.1 2001/02/27 22:29:30 jtb Exp $
+# $NetBSD: Makefile,v 1.2 2001/10/18 15:20:17 veego Exp $
 
 DISTNAME=	Make-1.00
 PKGNAME=	p5-Make-1.00
+SVR4_PKGNAME=	p5mak
 CATEGORIES=	devel perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=Make/}
 
diff --git a/devel/p5-Memoize/Makefile b/devel/p5-Memoize/Makefile
index 70b4c4639f7..dd4ae992a8b 100644
--- a/devel/p5-Memoize/Makefile
+++ b/devel/p5-Memoize/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.2 2001/08/10 12:17:00 mjl Exp $
+# $NetBSD: Makefile,v 1.3 2001/10/18 15:20:17 veego Exp $
 #
 
 DISTNAME=	Memoize-0.65
 PKGNAME=	p5-${DISTNAME}
+SVR4_PKGNAME=	p5mem
 CATEGORIES=	devel perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=Memoize/}
 
diff --git a/devel/p5-PV/Makefile b/devel/p5-PV/Makefile
index e10a81f7b9c..c5d1cf8b78b 100644
--- a/devel/p5-PV/Makefile
+++ b/devel/p5-PV/Makefile
@@ -1,9 +1,10 @@
-# $NetBSD: Makefile,v 1.9 2001/02/16 14:38:53 wiz Exp $
+# $NetBSD: Makefile,v 1.10 2001/10/18 15:20:18 veego Exp $
 # FreeBSD Id: Makefile,v 1.4 1997/06/24 18:43:28 jfitz Exp
 #
 
 DISTNAME=	PerlVision-1.4
 PKGNAME=	p5-PV-1.4
+SVR4_PKGNAME=	p5pvi
 CATEGORIES=	devel net perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=PV/}
 
diff --git a/devel/p5-Params-Validate/Makefile b/devel/p5-Params-Validate/Makefile
index cb05d2696a6..c8c2e907910 100644
--- a/devel/p5-Params-Validate/Makefile
+++ b/devel/p5-Params-Validate/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.1.1.1 2001/05/22 16:55:51 mjl Exp $
+# $NetBSD: Makefile,v 1.2 2001/10/18 15:20:18 veego Exp $
 
 DISTNAME=	Params-Validate-0.04
 PKGNAME=	p5-${DISTNAME}
+SVR4_PKGNAME=	p5pva
 CATEGORIES=	devel perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=../../authors/id/D/DR/DROLSKY/}
 
diff --git a/devel/p5-Parse-Yapp/Makefile b/devel/p5-Parse-Yapp/Makefile
index 1b2a20eaa87..0b2634a3da0 100644
--- a/devel/p5-Parse-Yapp/Makefile
+++ b/devel/p5-Parse-Yapp/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.1.1.1 2001/04/16 18:03:25 jtb Exp $
+# $NetBSD: Makefile,v 1.2 2001/10/18 15:20:18 veego Exp $
 #
 
 DISTNAME=      	Parse-Yapp-1.04
 PKGNAME=	p5-${DISTNAME}
+SVR4_PKGNAME=	p6pya
 CATEGORIES=	devel perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=Parse/}
 
diff --git a/devel/p5-Safe-Hole/Makefile b/devel/p5-Safe-Hole/Makefile
index e1d858e70d6..a337cce4f15 100644
--- a/devel/p5-Safe-Hole/Makefile
+++ b/devel/p5-Safe-Hole/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.1.1.1 2001/02/27 19:12:27 jtb Exp $
+# $NetBSD: Makefile,v 1.2 2001/10/18 15:20:18 veego Exp $
 #
 
 DISTNAME=	Safe-Hole-0.08
 PKGNAME=	p5-${DISTNAME}
+SVR4_PKGNAME=	p5sho
 CATEGORIES=	devel perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=Safe/}
 
diff --git a/devel/p5-SortVersions/Makefile b/devel/p5-SortVersions/Makefile
index c039c175f91..1b64c4d816e 100644
--- a/devel/p5-SortVersions/Makefile
+++ b/devel/p5-SortVersions/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.1 2001/10/02 01:25:35 mcr Exp $
+# $NetBSD: Makefile,v 1.2 2001/10/18 15:20:18 veego Exp $
 #
 
 DISTNAME=		SortVersions-1.1
 PKGNAME=		p5-${DISTNAME}
+SVR4_PKGNAME=		p5sve
 CATEGORIES=		devel perl5
 MASTER_SITES=		${MASTER_SITE_PERL_CPAN:=Sort/}
 
diff --git a/devel/p5-Storable/Makefile b/devel/p5-Storable/Makefile
index 043508e5af2..d9762873248 100644
--- a/devel/p5-Storable/Makefile
+++ b/devel/p5-Storable/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.4 2001/09/06 12:53:49 mjl Exp $
+# $NetBSD: Makefile,v 1.5 2001/10/18 15:20:19 veego Exp $
 
 DISTNAME=	Storable-1.0.13
 PKGNAME=	p5-${DISTNAME}
+SVR4_PKGNAME=	p5sto
 CATEGORIES=	devel perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=Storable/}
 
diff --git a/devel/p5-Term-ReadKey/Makefile b/devel/p5-Term-ReadKey/Makefile
index 949fa1fa7fd..53876942e6d 100644
--- a/devel/p5-Term-ReadKey/Makefile
+++ b/devel/p5-Term-ReadKey/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.2 2001/02/16 14:38:53 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2001/10/18 15:20:19 veego Exp $
 #
 
 DISTNAME=	TermReadKey-2.14
 PKGNAME=	p5-Term-ReadKey-2.14
+SVR4_PKGNAME=	p5trk
 CATEGORIES=	devel perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=Term/}
 
diff --git a/devel/p5-Test-Cmd/Makefile b/devel/p5-Test-Cmd/Makefile
index 414b420616d..e0cd555058e 100644
--- a/devel/p5-Test-Cmd/Makefile
+++ b/devel/p5-Test-Cmd/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.3 2001/06/17 07:40:59 zuntum Exp $
+# $NetBSD: Makefile,v 1.4 2001/10/18 15:20:19 veego Exp $
 
 DISTNAME=	Test-Cmd-1.04
 PKGNAME=        p5-${DISTNAME}
+SVR4_PKGNAME=	p5tcm
 CATEGORIES=	devel perl5
 MASTER_SITES=	http://www.baldmt.com/Test-Cmd/
 
diff --git a/devel/p5-Test-Harness/Makefile b/devel/p5-Test-Harness/Makefile
index c7c0b75184f..4ef7dabf033 100644
--- a/devel/p5-Test-Harness/Makefile
+++ b/devel/p5-Test-Harness/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.1.1.1 2001/09/27 04:26:49 jlam Exp $
+# $NetBSD: Makefile,v 1.2 2001/10/18 15:20:19 veego Exp $
 
 DISTNAME=		Test-Harness-1.23
 PKGNAME=		p5-${DISTNAME}
+SVR4_PKGNAME=		p5tha
 CATEGORIES=		devel perl5
 MASTER_SITES=		${MASTER_SITE_PERL_CPAN:=Test/}
 
diff --git a/devel/p5-Test-Simple/Makefile b/devel/p5-Test-Simple/Makefile
index ec44053641f..c66e57ab21e 100644
--- a/devel/p5-Test-Simple/Makefile
+++ b/devel/p5-Test-Simple/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.2 2001/09/27 07:36:12 jlam Exp $
+# $NetBSD: Makefile,v 1.3 2001/10/18 15:20:19 veego Exp $
 
 DISTNAME=		Test-Simple-0.17
 PKGNAME=		p5-${DISTNAME}
+SVR4_PKGNAME=		p5tsi
 CATEGORIES=		devel perl5
 MASTER_SITES=		${MASTER_SITE_PERL_CPAN:=Test/}
 
diff --git a/devel/p5-Tie-IxHash/Makefile b/devel/p5-Tie-IxHash/Makefile
index b699661b115..402b34668f4 100644
--- a/devel/p5-Tie-IxHash/Makefile
+++ b/devel/p5-Tie-IxHash/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.1.1.1 2001/03/26 23:49:40 mjl Exp $
+# $NetBSD: Makefile,v 1.2 2001/10/18 15:20:20 veego Exp $
 #
 
 DISTNAME=      	Tie-IxHash-1.21
 PKGNAME=	p5-${DISTNAME}
+SVR4_PKGNAME=	p5tix
 CATEGORIES=	textproc perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=Tie/}
 
diff --git a/devel/p5-Time-HiRes/Makefile b/devel/p5-Time-HiRes/Makefile
index 35e9de18e15..c68e4bc2a2b 100644
--- a/devel/p5-Time-HiRes/Makefile
+++ b/devel/p5-Time-HiRes/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.5 2001/02/16 14:38:54 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2001/10/18 15:20:20 veego Exp $
 #
 
 DISTNAME=		Time-HiRes-01.20
 PKGNAME=		p5-Time-HiRes-01.20
+SVR4_PKGNAME=		p5thr
 CATEGORIES=		devel perl5
 MASTER_SITES=		${MASTER_SITE_PERL_CPAN:=Time/}
 
diff --git a/devel/p5-TimeDate/Makefile b/devel/p5-TimeDate/Makefile
index f2b68176a83..7514390cccd 100644
--- a/devel/p5-TimeDate/Makefile
+++ b/devel/p5-TimeDate/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.7 2001/05/17 08:38:44 abs Exp $
+# $NetBSD: Makefile,v 1.8 2001/10/18 15:20:20 veego Exp $
 #
 
 DISTNAME=      	TimeDate-1.10
 PKGNAME=	p5-${DISTNAME}
+SVR4_PKGNAME=	p5tid
 CATEGORIES=	textproc perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=Date/}
 
diff --git a/devel/p5-WeakRef/Makefile b/devel/p5-WeakRef/Makefile
index 40245adb29a..384bb7b2a88 100644
--- a/devel/p5-WeakRef/Makefile
+++ b/devel/p5-WeakRef/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.1 2001/06/10 05:41:25 explorer Exp $
+# $NetBSD: Makefile,v 1.2 2001/10/18 15:20:20 veego Exp $
 
 DISTNAME=	WeakRef-0.01
 PKGNAME=	p5-${DISTNAME}
+SVR4_PKGNAME=	p5wre
 CATEGORIES=	devel perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=../../authors/id/LUKKA/}
 
diff --git a/devel/p5-perl-headers/Makefile b/devel/p5-perl-headers/Makefile
index a21bbb5a738..ab359caf818 100644
--- a/devel/p5-perl-headers/Makefile
+++ b/devel/p5-perl-headers/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.8 2001/09/12 06:06:32 jlam Exp $
+# $NetBSD: Makefile,v 1.9 2001/10/18 15:20:20 veego Exp $
 
 DISTNAME=		p5-perl-headers
 PKGNAME=		${DISTNAME}-${OS_VERSION}
+SVR4_PKGNAME=		p5plh
 CATEGORIES=		devel perl5
 MASTER_SITES=		# empty
 DISTFILES=		# empty