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.

16 files changed, 32 insertions, 16 deletions

diff --git a/databases/mysql-client/Makefile b/databases/mysql-client/Makefile
index 5c337670904..3de39533c13 100644
--- a/databases/mysql-client/Makefile
+++ b/databases/mysql-client/Makefile
@@ -1,9 +1,10 @@
-# $NetBSD: Makefile,v 1.14 2001/05/02 08:22:28 jlam Exp $
+# $NetBSD: Makefile,v 1.15 2001/10/18 15:20:05 veego Exp $
 #
 
 .include "../../databases/mysql-client/Makefile.common"
 
 PKGNAME=		${DISTNAME:S/-/-client-/}
+SVR4_PKGNAME=		mysqc
 COMMENT=		MySQL, a free SQL database (client)
 
 INFO_FILES=		mysql.info
diff --git a/databases/mysql-server/Makefile b/databases/mysql-server/Makefile
index 424d238ee03..11bf2c5415d 100644
--- a/databases/mysql-server/Makefile
+++ b/databases/mysql-server/Makefile
@@ -1,9 +1,10 @@
-# $NetBSD: Makefile,v 1.22 2001/07/08 13:59:16 bad Exp $
+# $NetBSD: Makefile,v 1.23 2001/10/18 15:20:06 veego Exp $
 #
 
 .include "../../databases/mysql-client/Makefile.common"
 
 PKGNAME=		${DISTNAME:S/-/-server-/}
+SVR4_PKGNAME=		mysqs
 COMMENT=		MySQL, a free SQL database (server)
 
 DEPENDS+=		${DISTNAME:S/-/-client-/}:../../databases/mysql-client
diff --git a/databases/openldap/Makefile b/databases/openldap/Makefile
index f0f0d4e6437..c6438e48d45 100644
--- a/databases/openldap/Makefile
+++ b/databases/openldap/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.26 2001/10/01 16:42:30 kleink Exp $
+# $NetBSD: Makefile,v 1.27 2001/10/18 15:20:07 veego Exp $
 #
 
 DISTNAME=	openldap-1.2.13
+SVR4_PKGNAME=	oldap
 CATEGORIES=	databases
 MASTER_SITES=	ftp://ftp.openldap.org/pub/OpenLDAP/openldap-release/
 EXTRACT_SUFX=	.tgz
diff --git a/databases/p5-DBD-CSV/Makefile b/databases/p5-DBD-CSV/Makefile
index 439794e6a4a..c13e74457d8 100644
--- a/databases/p5-DBD-CSV/Makefile
+++ b/databases/p5-DBD-CSV/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.5 2001/05/26 01:53:32 mjl Exp $
+# $NetBSD: Makefile,v 1.6 2001/10/18 15:20:07 veego Exp $
 #
 
 DISTNAME=	DBD-CSV-0.1027
 PKGNAME=	p5-${DISTNAME}
+SVR4_PKGNAME=	p5dcs
 CATEGORIES=	databases perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=DBD/}
 
diff --git a/databases/p5-DBD-Sybase/Makefile b/databases/p5-DBD-Sybase/Makefile
index 7cf6d79941d..fc833e61ffa 100644
--- a/databases/p5-DBD-Sybase/Makefile
+++ b/databases/p5-DBD-Sybase/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.2 2001/02/16 14:17:31 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2001/10/18 15:20:07 veego Exp $
 #
 
 DISTNAME=		DBD-Sybase-0.23
 PKGNAME=		p5-${DISTNAME}
+SVR4_PKGNAME=		p5dsy
 CATEGORIES=		databases perl5
 MASTER_SITES=		${MASTER_SITE_PERL_CPAN:=DBD/}
 
diff --git a/databases/p5-DBD-mysql/Makefile b/databases/p5-DBD-mysql/Makefile
index 29d2fc5e994..8cf01451267 100644
--- a/databases/p5-DBD-mysql/Makefile
+++ b/databases/p5-DBD-mysql/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.13 2001/09/05 17:18:21 jlam Exp $
+# $NetBSD: Makefile,v 1.14 2001/10/18 15:20:07 veego Exp $
 #
 
 DISTNAME=		Msql-Mysql-modules-1.2215
 PKGNAME=		p5-DBD-mysql-1.2215
+SVR4_PKGNAME=		p5dmy
 CATEGORIES=		databases perl5
 MASTER_SITES=		${MASTER_SITE_PERL_CPAN:=DBD/}
 
diff --git a/databases/p5-DBD-postgresql/Makefile b/databases/p5-DBD-postgresql/Makefile
index 6ba3a182e83..810e2bd3912 100644
--- a/databases/p5-DBD-postgresql/Makefile
+++ b/databases/p5-DBD-postgresql/Makefile
@@ -1,9 +1,10 @@
-# $NetBSD: Makefile,v 1.12 2001/09/27 23:17:53 jlam Exp $
+# $NetBSD: Makefile,v 1.13 2001/10/18 15:20:08 veego Exp $
 #
 
 VER=		1.01
 DISTNAME=	DBD-Pg-${VER}
 PKGNAME=	p5-DBD-postgresql-${VER}
+SVR4_PKGNAME=	p5dpo
 CATEGORIES=	databases perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=DBD/}
 
diff --git a/databases/p5-DBI/Makefile b/databases/p5-DBI/Makefile
index afbb556f333..267c0f864d0 100644
--- a/databases/p5-DBI/Makefile
+++ b/databases/p5-DBI/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.9 2001/08/10 11:49:04 mjl Exp $
+# $NetBSD: Makefile,v 1.10 2001/10/18 15:20:08 veego Exp $
 #
 
 DISTNAME=	DBI-1.19
 PKGNAME=	p5-${DISTNAME}
+SVR4_PKGNAME=	p5dbi
 CATEGORIES=	databases perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=DBD/}
 
diff --git a/databases/p5-DBIx-Datasource/Makefile b/databases/p5-DBIx-Datasource/Makefile
index e0472a9ca2c..3963471ce15 100644
--- a/databases/p5-DBIx-Datasource/Makefile
+++ b/databases/p5-DBIx-Datasource/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.2 2001/03/25 04:36:21 mjl Exp $
+# $NetBSD: Makefile,v 1.3 2001/10/18 15:20:08 veego Exp $
 #
 
 DISTNAME=	DBIx-DataSource-0.02
 PKGNAME=	p5-${DISTNAME}
+SVR4_PKGNAME=	p5dxd
 CATEGORIES=	databases perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=DBIx/}
 
diff --git a/databases/p5-DBIx-SearchBuilder/Makefile b/databases/p5-DBIx-SearchBuilder/Makefile
index 644bda5028d..1256c466cd3 100644
--- a/databases/p5-DBIx-SearchBuilder/Makefile
+++ b/databases/p5-DBIx-SearchBuilder/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.3 2001/08/10 12:07:15 mjl Exp $
+# $NetBSD: Makefile,v 1.4 2001/10/18 15:20:09 veego Exp $
 #
 
 DISTNAME=	DBIx-SearchBuilder-0.41
 PKGNAME=	p5-${DISTNAME}
+SVR4_PKGNAME=	p5dxs
 CATEGORIES=	databases perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=DBIx/}
 
diff --git a/databases/p5-MLDBM-Sync/Makefile b/databases/p5-MLDBM-Sync/Makefile
index 670ec46451d..503f313ed19 100644
--- a/databases/p5-MLDBM-Sync/Makefile
+++ b/databases/p5-MLDBM-Sync/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.2 2001/10/05 14:35:16 abs Exp $
+# $NetBSD: Makefile,v 1.3 2001/10/18 15:20:09 veego Exp $
 
 DISTNAME=	MLDBM-Sync-0.15
 PKGNAME=	p5-${DISTNAME}
+SVR4_PKGNAME=	p5msy
 CATEGORIES=	databases perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=MLDBM/}
 
diff --git a/databases/p5-MLDBM/Makefile b/databases/p5-MLDBM/Makefile
index 13107d026bf..74fb748cb50 100644
--- a/databases/p5-MLDBM/Makefile
+++ b/databases/p5-MLDBM/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.4 2001/09/27 23:17:54 jlam Exp $
+# $NetBSD: Makefile,v 1.5 2001/10/18 15:20:09 veego Exp $
 #
 
 DISTNAME=		MLDBM-2.00
 PKGNAME=		p5-MLDBM-2.00
+SVR4_PKGNAME=		p5mld
 CATEGORIES=		databases perl5
 MASTER_SITES=		${MASTER_SITE_PERL_CPAN:=MLDBM/}
 
diff --git a/databases/p5-SQL-Statement/Makefile b/databases/p5-SQL-Statement/Makefile
index d0ebec89df0..ed602b5eac8 100644
--- a/databases/p5-SQL-Statement/Makefile
+++ b/databases/p5-SQL-Statement/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.4 2001/05/26 01:49:12 mjl Exp $
+# $NetBSD: Makefile,v 1.5 2001/10/18 15:20:09 veego Exp $
 #
 
 DISTNAME=	SQL-Statement-0.1020
 PKGNAME=	p5-${DISTNAME}
+SVR4_PKGNAME=	p5sqs
 CATEGORIES=	databases perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=SQL/}
 
diff --git a/databases/p5-gdbm/Makefile b/databases/p5-gdbm/Makefile
index 35d9b7723e0..28ecfb12aed 100644
--- a/databases/p5-gdbm/Makefile
+++ b/databases/p5-gdbm/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.11 2001/10/03 10:13:35 jlam Exp $
+# $NetBSD: Makefile,v 1.12 2001/10/18 15:20:10 veego Exp $
 
 .include "../../lang/perl5/Makefile.common"
 
 PKGNAME=		p5-gdbm-1.05
+SVR4_PKGNAME=		p5gdm
 CATEGORIES+=		perl5
 
 MAINTAINER=		packages@netbsd.org
diff --git a/databases/p5-perl-ldap/Makefile b/databases/p5-perl-ldap/Makefile
index a96c00525c1..e1833a3c27c 100644
--- a/databases/p5-perl-ldap/Makefile
+++ b/databases/p5-perl-ldap/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.10 2001/09/27 23:17:54 jlam Exp $
+# $NetBSD: Makefile,v 1.11 2001/10/18 15:20:10 veego Exp $
 #
 
 DISTNAME=     	perl-ldap-0.23
 PKGNAME=	p5-${DISTNAME}
+SVR4_PKGNAME=	pldap
 CATEGORIES=	databases net devel perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=LWP/}
 
diff --git a/databases/p5-postgresql/Makefile b/databases/p5-postgresql/Makefile
index 40ccb3b4ec5..8b09e931338 100644
--- a/databases/p5-postgresql/Makefile
+++ b/databases/p5-postgresql/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.4 2001/09/27 23:17:54 jlam Exp $
+# $NetBSD: Makefile,v 1.5 2001/10/18 15:20:10 veego Exp $
 
 DISTNAME=	pgsql_perl5-1.9.0
 PKGNAME=	p5-postgresql-1.9.0
+SVR4_PKGNAME=	p5pgs
 CATEGORIES=	databases devel perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=Pg/}