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.

27 files changed, 54 insertions, 27 deletions

diff --git a/textproc/p5-Convert-ASCII-Armour/Makefile b/textproc/p5-Convert-ASCII-Armour/Makefile
index c2f8e9e81df..32e49018278 100644
--- a/textproc/p5-Convert-ASCII-Armour/Makefile
+++ b/textproc/p5-Convert-ASCII-Armour/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.2 2001/10/03 02:33:55 hubertf Exp $
+# $NetBSD: Makefile,v 1.3 2001/10/18 15:20:40 veego Exp $
 #
 
 DISTNAME=		Convert-ASCII-Armour-1.4
 PKGNAME=		p5-${DISTNAME}
+SVR4_PKGNAME=		p5cas
 CATEGORIES=		converters perl5
 MASTER_SITES=		${MASTER_SITE_PERL_CPAN:=Convert/}
 
diff --git a/textproc/p5-Convert-ASN1/Makefile b/textproc/p5-Convert-ASN1/Makefile
index a39983238a3..e224908af18 100644
--- a/textproc/p5-Convert-ASN1/Makefile
+++ b/textproc/p5-Convert-ASN1/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.6 2001/10/01 16:33:54 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2001/10/18 15:20:40 veego Exp $
 #
 
 DISTNAME=		Convert-ASN1-0.14
 PKGNAME=		p5-${DISTNAME}
+SVR4_PKGNAME=		p5asn
 CATEGORIES=		converters perl5 textproc
 MASTER_SITES=		${MASTER_SITE_PERL_CPAN:=Convert/}
 
diff --git a/textproc/p5-Convert-BER/Makefile b/textproc/p5-Convert-BER/Makefile
index 32857de3d43..620a3e61c1a 100644
--- a/textproc/p5-Convert-BER/Makefile
+++ b/textproc/p5-Convert-BER/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.4 2001/02/17 17:37:36 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2001/10/18 15:20:40 veego Exp $
 #
 
 DISTNAME=	Convert-BER-1.26
 PKGNAME=	p5-${DISTNAME}
+SVR4_PKGNAME=	p5ber
 CATEGORIES=	textproc perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=Convert/}
 
diff --git a/textproc/p5-Convert-PEM/Makefile b/textproc/p5-Convert-PEM/Makefile
index c5bdada6ece..f09535d1e83 100644
--- a/textproc/p5-Convert-PEM/Makefile
+++ b/textproc/p5-Convert-PEM/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.2 2001/10/03 02:33:55 hubertf Exp $
+# $NetBSD: Makefile,v 1.3 2001/10/18 15:20:40 veego Exp $
 #
 
 DISTNAME=		Convert-PEM-0.06
 PKGNAME=		p5-${DISTNAME}
+SVR4_PKGNAME=		p5pem
 CATEGORIES=		converters perl5
 MASTER_SITES=		${MASTER_SITE_PERL_CPAN:=Convert/}
 
diff --git a/textproc/p5-Filter/Makefile b/textproc/p5-Filter/Makefile
index 766144508a6..b1243455ed8 100644
--- a/textproc/p5-Filter/Makefile
+++ b/textproc/p5-Filter/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.4 2001/02/17 17:37:36 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2001/10/18 15:20:41 veego Exp $
 #
 
 DISTNAME=	Filter-1.16
 PKGNAME=	p5-${DISTNAME}
+SVR4_PKGNAME=	p5fil
 CATEGORIES=	textproc perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=Filter/}
 
diff --git a/textproc/p5-PDF-Create/Makefile b/textproc/p5-PDF-Create/Makefile
index c8271f652e0..4be73d25b56 100644
--- a/textproc/p5-PDF-Create/Makefile
+++ b/textproc/p5-PDF-Create/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.1.1.1 2001/10/03 15:34:23 mjl Exp $
+# $NetBSD: Makefile,v 1.2 2001/10/18 15:20:41 veego Exp $
 #
 
 DISTNAME=	PDF-Create-0.01
 PKGNAME=	p5-${DISTNAME}
+SVR4_PKGNAME=	p5pcr
 CATEGORIES=	textproc perl
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=PDF/}
 
diff --git a/textproc/p5-PDF/Makefile b/textproc/p5-PDF/Makefile
index 758b924c10b..bf97c38ca3e 100644
--- a/textproc/p5-PDF/Makefile
+++ b/textproc/p5-PDF/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.1.1.1 2001/10/03 15:30:08 mjl Exp $
+# $NetBSD: Makefile,v 1.2 2001/10/18 15:20:41 veego Exp $
 #
 
 DISTNAME=	PDF-111
 PKGNAME=	p5-PDF-1.11
+SVR4_PKGNAME=	p5pdf
 CATEGORIES=	textproc perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=PDF/}
 EXTRACT_SUFX=	.tgz
diff --git a/textproc/p5-Pod-POM/Makefile b/textproc/p5-Pod-POM/Makefile
index 1f959a72971..6f1183cc563 100644
--- a/textproc/p5-Pod-POM/Makefile
+++ b/textproc/p5-Pod-POM/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.1.1.1 2001/04/16 17:40:41 jtb Exp $
+# $NetBSD: Makefile,v 1.2 2001/10/18 15:20:42 veego Exp $
 #
 
 DISTNAME=       Pod-POM-0.02
 PKGNAME=        p5-${DISTNAME}
+SVR4_PKGNAME=	p5pod
 CATEGORIES=	textproc perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=Pod/}
 
diff --git a/textproc/p5-Text-Autoformat/Makefile b/textproc/p5-Text-Autoformat/Makefile
index 6c665be40c4..7c6de7a01e2 100644
--- a/textproc/p5-Text-Autoformat/Makefile
+++ b/textproc/p5-Text-Autoformat/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.1.1.1 2001/04/16 18:30:53 jtb Exp $
+# $NetBSD: Makefile,v 1.2 2001/10/18 15:20:42 veego Exp $
 
 DISTNAME=       Text-Autoformat-1.04
 PKGNAME=        p5-${DISTNAME}
+SVR4_PKGNAME=	p5tau
 CATEGORIES=	textproc perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=Text/}
 
diff --git a/textproc/p5-Text-Balanced/Makefile b/textproc/p5-Text-Balanced/Makefile
index c1f640ea3c9..1c2ed4748f3 100644
--- a/textproc/p5-Text-Balanced/Makefile
+++ b/textproc/p5-Text-Balanced/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.1 2001/06/10 06:22:18 explorer Exp $
+# $NetBSD: Makefile,v 1.2 2001/10/18 15:20:42 veego Exp $
 #
 
 DISTNAME=	Text-Balanced-1.85
 PKGNAME=	p5-Text-Balanced-1.85
+SVR4_PKGNAME=	p5tba
 CATEGORIES=	textproc perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=Text/}
 
diff --git a/textproc/p5-Text-BibTeX/Makefile b/textproc/p5-Text-BibTeX/Makefile
index 3d81f4ca47e..5aa446a5ee9 100644
--- a/textproc/p5-Text-BibTeX/Makefile
+++ b/textproc/p5-Text-BibTeX/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.1.1.1 2001/02/27 23:39:55 jtb Exp $
+# $NetBSD: Makefile,v 1.2 2001/10/18 15:20:42 veego Exp $
 
 DISTNAME=	Text-BibTeX-0.33
 PKGNAME=	p5-${DISTNAME}
+SVR4_PKGNAME=	p5tbt
 CATEGORIES=	textproc perl5
 MASTER_SITES=	${MASTER_SITE_TEX_CTAN:=biblio/bibtex/utils/btOOL/}
 DISTFILES+=	${DISTNAME}.tar.gz btparse-0.32.tar.gz
diff --git a/textproc/p5-Text-CSV_XS/Makefile b/textproc/p5-Text-CSV_XS/Makefile
index 2e860175ce1..f3a82794961 100644
--- a/textproc/p5-Text-CSV_XS/Makefile
+++ b/textproc/p5-Text-CSV_XS/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.3 2001/03/21 17:23:10 mjl Exp $
+# $NetBSD: Makefile,v 1.4 2001/10/18 15:20:42 veego Exp $
 #
 
 DISTNAME=	Text-CSV_XS-0.22
 PKGNAME=	p5-${DISTNAME}
+SVR4_PKGNAME=	p5tcx
 CATEGORIES=	textproc perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=Text/}
 
diff --git a/textproc/p5-Text-DelimMatch/Makefile b/textproc/p5-Text-DelimMatch/Makefile
index b751813c70a..3399f1e6198 100644
--- a/textproc/p5-Text-DelimMatch/Makefile
+++ b/textproc/p5-Text-DelimMatch/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.2 2001/02/17 17:37:38 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2001/10/18 15:20:43 veego Exp $
 #
 
 DISTNAME=	DelimMatch-1.03
 PKGNAME=	p5-Text-DelimMatch-1.03
+SVR4_PKGNAME=	p5tdm
 CATEGORIES=	textproc perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=Text/}
 
diff --git a/textproc/p5-Text-Template/Makefile b/textproc/p5-Text-Template/Makefile
index fa94d282c81..6c3781af6d2 100644
--- a/textproc/p5-Text-Template/Makefile
+++ b/textproc/p5-Text-Template/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.4 2001/03/25 05:34:26 mjl Exp $
+# $NetBSD: Makefile,v 1.5 2001/10/18 15:20:43 veego Exp $
 #
 
 DISTNAME=       Text-Template-1.31
 PKGNAME=        p5-${DISTNAME}
+SVR4_PKGNAME=	p5tte
 CATEGORIES=	textproc perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=Text/}
 
diff --git a/textproc/p5-Text-Wrapper/Makefile b/textproc/p5-Text-Wrapper/Makefile
index 6874fa1f27d..a8efa560fa2 100644
--- a/textproc/p5-Text-Wrapper/Makefile
+++ b/textproc/p5-Text-Wrapper/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.1.1.1 2001/03/25 06:07:50 mjl Exp $
+# $NetBSD: Makefile,v 1.2 2001/10/18 15:20:43 veego Exp $
 #
 
 DISTNAME=       Text-Wrapper-1.000
 PKGNAME=        p5-Text-Wrapper-1.0
+SVR4_PKGNAME=	p5twr
 CATEGORIES=	textproc perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=Text/}
 
diff --git a/textproc/p5-XML-DOM/Makefile b/textproc/p5-XML-DOM/Makefile
index 2fe868c5766..21251f79979 100644
--- a/textproc/p5-XML-DOM/Makefile
+++ b/textproc/p5-XML-DOM/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.3 2001/09/27 23:18:45 jlam Exp $
+# $NetBSD: Makefile,v 1.4 2001/10/18 15:20:43 veego Exp $
 #
 
 DISTNAME=	XML-DOM-1.31
 PKGNAME=	p5-${DISTNAME}
+SVR4_PKGNAME=	p5xdo
 CATEGORIES=	devel perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=XML/}
 
diff --git a/textproc/p5-XML-Grove/Makefile b/textproc/p5-XML-Grove/Makefile
index 6da0f750aed..235a4e62fb3 100644
--- a/textproc/p5-XML-Grove/Makefile
+++ b/textproc/p5-XML-Grove/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.3 2001/07/20 07:51:52 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2001/10/18 15:20:43 veego Exp $
 #
 
 DISTNAME=	XML-Grove-0.46alpha
 PKGNAME=	p5-${DISTNAME:S/alpha/.0.1/}
+SVR4_PKGNAME=	p5xgr
 CATEGORIES=	textproc perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=XML/}
 
diff --git a/textproc/p5-XML-Node/Makefile b/textproc/p5-XML-Node/Makefile
index 84afd167c52..a09f1a77bd7 100644
--- a/textproc/p5-XML-Node/Makefile
+++ b/textproc/p5-XML-Node/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.4 2001/05/25 02:47:09 hubertf Exp $
+# $NetBSD: Makefile,v 1.5 2001/10/18 15:20:44 veego Exp $
 #
 
 DISTNAME=	XML-Node-0.10
 PKGNAME=	p5-${DISTNAME}nb1
+SVR4_PKGNAME=	p5xno
 CATEGORIES=	textproc perl5
 MASTER_SITES=	http://belmont-shores.ics.uci.edu/pub/ \
 		${MASTER_SITE_PERL_CPAN:=XML/}
diff --git a/textproc/p5-XML-Parser/Makefile b/textproc/p5-XML-Parser/Makefile
index ef060c77ee7..0d9d8cb8fde 100644
--- a/textproc/p5-XML-Parser/Makefile
+++ b/textproc/p5-XML-Parser/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.10 2001/10/16 00:22:04 hubertf Exp $
+# $NetBSD: Makefile,v 1.11 2001/10/18 15:20:44 veego Exp $
 #
 
 DISTNAME=	XML-Parser.2.30
 PKGNAME=	p5-${DISTNAME:S/./-/1}
+SVR4_PKGNAME=	p5xpa
 WRKSRC=		${WRKDIR}/${DISTNAME:S/./-/1}
 CATEGORIES=	textproc perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=XML/}
diff --git a/textproc/p5-XML-RSS/Makefile b/textproc/p5-XML-RSS/Makefile
index ed2223e6219..a4504e88a6d 100644
--- a/textproc/p5-XML-RSS/Makefile
+++ b/textproc/p5-XML-RSS/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.2 2001/04/16 21:57:07 jtb Exp $
+# $NetBSD: Makefile,v 1.3 2001/10/18 15:20:44 veego Exp $
 
 DISTNAME=	XML-RSS-0.97
 PKGNAME=	p5-${DISTNAME}
+SVR4_PKGNAME=	p5xrs
 CATEGORIES=	textproc perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=XML/}
 
diff --git a/textproc/p5-XML-RegExp/Makefile b/textproc/p5-XML-RegExp/Makefile
index 5c583b2831b..52c22fcd698 100644
--- a/textproc/p5-XML-RegExp/Makefile
+++ b/textproc/p5-XML-RegExp/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.3 2001/09/27 23:18:46 jlam Exp $
+# $NetBSD: Makefile,v 1.4 2001/10/18 15:20:44 veego Exp $
 #
 
 DISTNAME=	XML-RegExp-0.03
 PKGNAME=	p5-${DISTNAME}
+SVR4_PKGNAME=	p5xre
 CATEGORIES=	textproc perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=XML/TJMATHER/}
 
diff --git a/textproc/p5-XML-Writer/Makefile b/textproc/p5-XML-Writer/Makefile
index e1865fdbaf7..320be415189 100644
--- a/textproc/p5-XML-Writer/Makefile
+++ b/textproc/p5-XML-Writer/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.2 2001/10/03 10:36:02 jlam Exp $
+# $NetBSD: Makefile,v 1.3 2001/10/18 15:20:44 veego Exp $
 #
 
 DISTNAME=	XML-Writer-0.4
 PKGNAME=	p5-${DISTNAME}
+SVR4_PKGNAME=	p5xwr
 CATEGORIES=	textproc perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=XML/}
 
diff --git a/textproc/p5-XML-XPath/Makefile b/textproc/p5-XML-XPath/Makefile
index 58bc07115ea..5defdad4875 100644
--- a/textproc/p5-XML-XPath/Makefile
+++ b/textproc/p5-XML-XPath/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.3 2001/04/17 01:01:35 jtb Exp $
+# $NetBSD: Makefile,v 1.4 2001/10/18 15:20:45 veego Exp $
 
 DISTNAME=	XML-XPath-1.08
 PKGNAME=	p5-${DISTNAME}
+SVR4_PKGNAME=	p5xxp
 CATEGORIES=	textproc perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=XML/}
 
diff --git a/textproc/p5-XML-XQL/Makefile b/textproc/p5-XML-XQL/Makefile
index 59347349c71..22fc08919b1 100644
--- a/textproc/p5-XML-XQL/Makefile
+++ b/textproc/p5-XML-XQL/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.3 2001/09/27 23:18:46 jlam Exp $
+# $NetBSD: Makefile,v 1.4 2001/10/18 15:20:45 veego Exp $
 #
 
 DISTNAME=	XML-XQL-0.66
 PKGNAME=	p5-${DISTNAME}
+SVR4_PKGNAME=	p5xxq
 CATEGORIES=	textproc perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=XML/}
 
diff --git a/textproc/p5-XML-XSLT/Makefile b/textproc/p5-XML-XSLT/Makefile
index 74255b9cd5a..c9a3405ab88 100644
--- a/textproc/p5-XML-XSLT/Makefile
+++ b/textproc/p5-XML-XSLT/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.1.1.1 2001/10/01 08:51:41 jlam Exp $
+# $NetBSD: Makefile,v 1.2 2001/10/18 15:20:45 veego Exp $
 
 DISTNAME=	XML-XSLT-0.32
 PKGNAME=	p5-${DISTNAME}
+SVR4_PKGNAME=	p5xxs
 CATEGORIES=	textproc perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=XML/}
 
diff --git a/textproc/p5-libxml-enno/Makefile b/textproc/p5-libxml-enno/Makefile
index 22067e9a3d6..e63ae427de8 100644
--- a/textproc/p5-libxml-enno/Makefile
+++ b/textproc/p5-libxml-enno/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.5 2001/09/27 23:18:46 jlam Exp $
+# $NetBSD: Makefile,v 1.6 2001/10/18 15:20:45 veego Exp $
 
 DISTNAME=	libxml-enno-1.05a
 PKGNAME=	p5-${DISTNAME}
+SVR4_PKGNAME=	p5lxe
 CATEGORIES=	textproc perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=../../authors/id/T/TJ/TJMATHER/}
 
diff --git a/textproc/p5-libxml/Makefile b/textproc/p5-libxml/Makefile
index 28bf85e13ef..0281e9059b4 100644
--- a/textproc/p5-libxml/Makefile
+++ b/textproc/p5-libxml/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.1.1.1 2001/04/16 19:56:50 jtb Exp $
+# $NetBSD: Makefile,v 1.2 2001/10/18 15:20:45 veego Exp $
 
 DISTNAME=	libxml-perl-0.07
 PKGNAME=	p5-libxml-0.07
+SVR4_PKGNAME=	p5lxm
 CATEGORIES=	textproc perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=XML/}