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.

9 files changed, 18 insertions, 9 deletions

diff --git a/misc/p5-Array-PrintCols/Makefile b/misc/p5-Array-PrintCols/Makefile
index fc2d6b7e17a..5e1aab8ce80 100644
--- a/misc/p5-Array-PrintCols/Makefile
+++ b/misc/p5-Array-PrintCols/Makefile
@@ -1,9 +1,10 @@
-# $NetBSD: Makefile,v 1.10 2001/04/20 23:56:12 jtb Exp $
+# $NetBSD: Makefile,v 1.11 2001/10/18 15:20:28 veego Exp $
 # FreeBSD Id: Makefile,v 1.9 1997/09/14 02:54:03 jfitz Exp
 #
 
 DISTNAME=		Array-PrintCols-2.1
 PKGNAME=		p5-${DISTNAME}
+SVR4_PKGNAME=		p5arp
 CATEGORIES=		misc perl5
 MASTER_SITES=		${MASTER_SITE_PERL_CPAN:=Array/}
 
diff --git a/misc/p5-Business-CreditCard/Makefile b/misc/p5-Business-CreditCard/Makefile
index 2a95017dff8..f4d4ea21b77 100644
--- a/misc/p5-Business-CreditCard/Makefile
+++ b/misc/p5-Business-CreditCard/Makefile
@@ -1,9 +1,10 @@
-# $NetBSD: Makefile,v 1.9 2001/02/17 18:09:15 wiz Exp $
+# $NetBSD: Makefile,v 1.10 2001/10/18 15:20:28 veego Exp $
 # FreeBSD Id: Makefile,v 1.7 1997/06/24 18:43:06 jfitz Exp
 #
 
 DISTNAME=		Business-CreditCard-0.1
 PKGNAME=		p5-${DISTNAME}
+SVR4_PKGNAME=		p5buc
 CATEGORIES=		misc perl5
 MASTER_SITES=		${MASTER_SITE_PERL_CPAN:=Business/}
 
diff --git a/misc/p5-Business-ISBN/Makefile b/misc/p5-Business-ISBN/Makefile
index 6bf09d49770..ad59d439289 100644
--- a/misc/p5-Business-ISBN/Makefile
+++ b/misc/p5-Business-ISBN/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.2 2001/08/15 19:22:55 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2001/10/18 15:20:28 veego Exp $
 #
 
 DISTNAME=		Business-ISBN-1.60
 PKGNAME=		p5-${DISTNAME}
+SVR4_PKGNAME=		p5bui
 CATEGORIES=		misc perl5
 MASTER_SITES=		${MASTER_SITE_PERL_CPAN:=Business/}
 
diff --git a/misc/p5-Business-UPS/Makefile b/misc/p5-Business-UPS/Makefile
index 43ed0348bf2..06e4c5a13c0 100644
--- a/misc/p5-Business-UPS/Makefile
+++ b/misc/p5-Business-UPS/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.1.1.1 2001/05/03 17:32:00 wiz Exp $
+# $NetBSD: Makefile,v 1.2 2001/10/18 15:20:29 veego Exp $
 #
 
 DISTNAME=		Business-UPS-1.13
 PKGNAME=		p5-${DISTNAME}
+SVR4_PKGNAME=		p5buu
 CATEGORIES=		misc perl5
 MASTER_SITES=		${MASTER_SITE_PERL_CPAN:=Business/}
 
diff --git a/misc/p5-ControlX10-CM11/Makefile b/misc/p5-ControlX10-CM11/Makefile
index 1bae48ab57b..b00ceea741d 100644
--- a/misc/p5-ControlX10-CM11/Makefile
+++ b/misc/p5-ControlX10-CM11/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.2 2001/02/17 18:09:15 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2001/10/18 15:20:29 veego Exp $
 #
 
 DISTNAME=	ControlX10-CM11-2.09
 PKGNAME=	p5-${DISTNAME}
+SVR4_PKGNAME=	p5cx1
 CATEGORIES=	misc perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=ControlX10/}
 
diff --git a/misc/p5-ControlX10-CM17/Makefile b/misc/p5-ControlX10-CM17/Makefile
index d71c4043237..830ff223fe0 100644
--- a/misc/p5-ControlX10-CM17/Makefile
+++ b/misc/p5-ControlX10-CM17/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.1.1.1 2001/09/27 02:45:21 jlam Exp $
+# $NetBSD: Makefile,v 1.2 2001/10/18 15:20:29 veego Exp $
 
 DISTNAME=	ControlX10-CM17-0.07
 PKGNAME=	p5-${DISTNAME}
+SVR4_PKGNAME=	p5cx7
 CATEGORIES=	misc perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=ControlX10/}
 
diff --git a/misc/p5-File-MMagic/Makefile b/misc/p5-File-MMagic/Makefile
index 59a1671dc00..c881c678a1a 100644
--- a/misc/p5-File-MMagic/Makefile
+++ b/misc/p5-File-MMagic/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.3 2001/06/27 14:16:55 taca Exp $
+# $NetBSD: Makefile,v 1.4 2001/10/18 15:20:29 veego Exp $
 
 DISTNAME=		File-MMagic-1.13
 PKGNAME=		p5-${DISTNAME}
+SVR4_PKGNAME=		p5fim
 CATEGORIES=		misc perl5
 MASTER_SITES=		${MASTER_SITE_PERL_CPAN:=File/}
 
diff --git a/misc/p5-Locale-Codes/Makefile b/misc/p5-Locale-Codes/Makefile
index d78a5631549..a77fdf98128 100644
--- a/misc/p5-Locale-Codes/Makefile
+++ b/misc/p5-Locale-Codes/Makefile
@@ -1,9 +1,10 @@
-# $NetBSD: Makefile,v 1.10 2001/04/21 00:05:05 jtb Exp $
+# $NetBSD: Makefile,v 1.11 2001/10/18 15:20:29 veego Exp $
 # FreeBSD Id: Makefile,v 1.1.1.1 1997/06/27 01:51:12 jfitz Exp
 #
 
 DISTNAME=		Locale-Codes-1.06
 PKGNAME=		p5-${DISTNAME}
+SVR4_PKGNAME=		p5lco
 CATEGORIES=		misc perl5
 MASTER_SITES=		${MASTER_SITE_PERL_CPAN:=Locale/}
 
diff --git a/misc/p5-Search/Makefile b/misc/p5-Search/Makefile
index b36354c434d..d5bbf336f96 100644
--- a/misc/p5-Search/Makefile
+++ b/misc/p5-Search/Makefile
@@ -1,9 +1,10 @@
-# $NetBSD: Makefile,v 1.8 2001/02/17 18:09:18 wiz Exp $
+# $NetBSD: Makefile,v 1.9 2001/10/18 15:20:30 veego Exp $
 # FreeBSD Id: Makefile,v 1.9 1997/06/24 18:43:31 jfitz Exp
 #
 
 DISTNAME=		Search-0.2
 PKGNAME=		p5-Search-0.2
+SVR4_PKGNAME=		p5sea
 CATEGORIES=		misc perl5
 MASTER_SITES=		${MASTER_SITE_PERL_CPAN:=Search/}