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.

10 files changed, 20 insertions, 10 deletions

diff --git a/mail/cyrus-imapd/Makefile b/mail/cyrus-imapd/Makefile
index ff410b8849d..4c80c758c85 100644
--- a/mail/cyrus-imapd/Makefile
+++ b/mail/cyrus-imapd/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.19 2001/10/15 21:30:36 jlam Exp $
+# $NetBSD: Makefile,v 1.20 2001/10/18 15:20:25 veego Exp $
 
 DISTNAME=		cyrus-imapd-2.0.16
+SVR4_PKGNAME=		cimap
 CATEGORIES=		mail
 MASTER_SITES=		ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/ \
 			ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/OLD-VERSIONS/imap/
diff --git a/mail/p5-Email-Valid/Makefile b/mail/p5-Email-Valid/Makefile
index 1208defb481..49fefd6c028 100644
--- a/mail/p5-Email-Valid/Makefile
+++ b/mail/p5-Email-Valid/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:25 veego Exp $
 
 DISTNAME=		Email-Valid-0.13
 PKGNAME=		p5-${DISTNAME}
+SVR4_PKGNAME=		p5emv
 CATEGORIES=		mail perl5
 MASTER_SITES=		${MASTER_SITE_PERL_CPAN:=Email/}
 
diff --git a/mail/p5-IMAP-Admin/Makefile b/mail/p5-IMAP-Admin/Makefile
index a57d538af14..36f83a271cf 100644
--- a/mail/p5-IMAP-Admin/Makefile
+++ b/mail/p5-IMAP-Admin/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.3 2001/06/05 09:43:10 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2001/10/18 15:20:26 veego Exp $
 #
 
 DISTNAME=       IMAP-Admin-1.4.3
 PKGNAME=        p5-${DISTNAME}
+SVR4_PKGNAME=	p5iad
 CATEGORIES=	mail perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=IMAP/}
 
diff --git a/mail/p5-MIME-Lite/Makefile b/mail/p5-MIME-Lite/Makefile
index 124575ccadd..bdd0af44ebe 100644
--- a/mail/p5-MIME-Lite/Makefile
+++ b/mail/p5-MIME-Lite/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.1.1.1 2001/07/03 14:07:08 abs Exp $
+# $NetBSD: Makefile,v 1.2 2001/10/18 15:20:26 veego Exp $
 
 DISTNAME=		MIME-Lite-2.111
 PKGNAME=		p5-${DISTNAME}
+SVR4_PKGNAME=		p5mil
 CATEGORIES=		www perl5
 MASTER_SITES=		${MASTER_SITE_PERL_CPAN:=HTML/}
 
diff --git a/mail/p5-MIME-tools/Makefile b/mail/p5-MIME-tools/Makefile
index e4803d4bb5d..352138c68fa 100644
--- a/mail/p5-MIME-tools/Makefile
+++ b/mail/p5-MIME-tools/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.5 2001/09/27 23:18:22 jlam Exp $
+# $NetBSD: Makefile,v 1.6 2001/10/18 15:20:26 veego Exp $
 #
 
 DISTNAME=       MIME-tools-5.410
 PKGNAME=        p5-${DISTNAME}
+SVR4_PKGNAME=	p5mit
 CATEGORIES=	perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=MIME/}
 
diff --git a/mail/p5-Mail-Audit/Makefile b/mail/p5-Mail-Audit/Makefile
index 39d4eeab19c..3182540c97a 100644
--- a/mail/p5-Mail-Audit/Makefile
+++ b/mail/p5-Mail-Audit/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.3 2001/09/27 07:36:12 jlam Exp $
+# $NetBSD: Makefile,v 1.4 2001/10/18 15:20:26 veego Exp $
 
 DISTNAME=	Mail-Audit-1.11
 PKGNAME=	p5-${DISTNAME}
+SVR4_PKGNAME=	p5mau
 CATEGORIES=	mail perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=Mail/}
 
diff --git a/mail/p5-Mail-IMAPClient/Makefile b/mail/p5-Mail-IMAPClient/Makefile
index ca088f47a18..9f4e63ad7a8 100644
--- a/mail/p5-Mail-IMAPClient/Makefile
+++ b/mail/p5-Mail-IMAPClient/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.3 2001/02/17 18:24:58 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2001/10/18 15:20:26 veego Exp $
 #
 
 DISTNAME=       Mail-IMAPClient-1.07
 PKGNAME=        p5-${DISTNAME}
+SVR4_PKGNAME=	p5mic
 CATEGORIES=	mail perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=Mail/}
 
diff --git a/mail/p5-Mail-ListDetector/Makefile b/mail/p5-Mail-ListDetector/Makefile
index 7d38fa0a79b..0563203a8ec 100644
--- a/mail/p5-Mail-ListDetector/Makefile
+++ b/mail/p5-Mail-ListDetector/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:27 veego Exp $
 
 DISTNAME=		Mail-ListDetector-0.18
 PKGNAME=		p5-${DISTNAME}
+SVR4_PKGNAME=		p5mli
 CATEGORIES=		mail perl5
 MASTER_SITES=		${MASTER_SITE_PERL_CPAN:=Mail/}
 
diff --git a/mail/p5-Mail-Sendmail/Makefile b/mail/p5-Mail-Sendmail/Makefile
index ac6b4de4cb7..c24d3b37ed3 100644
--- a/mail/p5-Mail-Sendmail/Makefile
+++ b/mail/p5-Mail-Sendmail/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.2 2001/09/27 23:18:22 jlam Exp $
+# $NetBSD: Makefile,v 1.3 2001/10/18 15:20:27 veego Exp $
 
 DISTNAME=	Mail-Sendmail-0.78
 PKGNAME=	p5-${DISTNAME}
+SVR4_PKGNAME=	p5mse
 CATEGORIES=	mail perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=Mail/}
 
diff --git a/mail/p5-MailTools/Makefile b/mail/p5-MailTools/Makefile
index 9d6e0fffdc3..14d538124f6 100644
--- a/mail/p5-MailTools/Makefile
+++ b/mail/p5-MailTools/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.11 2001/09/27 03:54:50 jlam Exp $
+# $NetBSD: Makefile,v 1.12 2001/10/18 15:20:27 veego Exp $
 
 DISTNAME=	MailTools-1.15
 PKGNAME=	p5-${DISTNAME}
+SVR4_PKGNAME=	p5mto
 CATEGORIES=	mail perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=Mail/}