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.

15 files changed, 30 insertions, 15 deletions

diff --git a/net/libpcap/Makefile b/net/libpcap/Makefile
index 966e003e035..4667b66c724 100644
--- a/net/libpcap/Makefile
+++ b/net/libpcap/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.9 2001/09/27 23:18:28 jlam Exp $
+# $NetBSD: Makefile,v 1.10 2001/10/18 15:20:30 veego Exp $
 
 DISTNAME=		libpcap-0.6.1
+SVR4_PKGNAME=		lpcap
 CATEGORIES=		net
 MASTER_SITES= 		http://www.tcpdump.org/release/
 
diff --git a/net/lukemftp/Makefile b/net/lukemftp/Makefile
index dda43d9b39d..8b41e069034 100644
--- a/net/lukemftp/Makefile
+++ b/net/lukemftp/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.5 2001/02/17 18:19:06 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2001/10/18 15:20:30 veego Exp $
 #
 
 DISTNAME=		lukemftp-1.5
+SVR4_PKGNAME=		luftp
 CATEGORIES=		net
 MASTER_SITES=		ftp://ftp.netbsd.org/pub/NetBSD/misc/lukemftp/
 
diff --git a/net/lukemftpd/Makefile b/net/lukemftpd/Makefile
index 97d32bef884..a74d04072fb 100644
--- a/net/lukemftpd/Makefile
+++ b/net/lukemftpd/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.4 2001/09/27 23:18:28 jlam Exp $
+# $NetBSD: Makefile,v 1.5 2001/10/18 15:20:30 veego Exp $
 #
 
 DISTNAME=		lukemftpd-1.1
+SVR4_PKGNAME=		luftd
 CATEGORIES=		net
 MASTER_SITES=		ftp://ftp.netbsd.org/pub/NetBSD/misc/lukemftp/
 
diff --git a/net/p5-Net-DNS/Makefile b/net/p5-Net-DNS/Makefile
index 76ed93b984e..34069145691 100644
--- a/net/p5-Net-DNS/Makefile
+++ b/net/p5-Net-DNS/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.3 2001/02/17 18:19:21 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2001/10/18 15:20:31 veego Exp $
 #
 
 DISTNAME=		Net-DNS-0.12
 PKGNAME=		p5-${DISTNAME}
+SVR4_PKGNAME=		p5ndn
 CATEGORIES=		net perl5
 MASTER_SITES=		${MASTER_SITE_PERL_CPAN:=Net/}
 
diff --git a/net/p5-Net-Daemon/Makefile b/net/p5-Net-Daemon/Makefile
index 060c06261bd..74fbec6ac7a 100644
--- a/net/p5-Net-Daemon/Makefile
+++ b/net/p5-Net-Daemon/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.4 2001/10/05 09:25:47 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2001/10/18 15:20:31 veego Exp $
 #
 
 DISTNAME=	Net-Daemon-0.35
 PKGNAME=	p5-${DISTNAME}
+SVR4_PKGNAME=	p5nda
 CATEGORIES=	net perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=Net/}
 
diff --git a/net/p5-Net-IRC/Makefile b/net/p5-Net-IRC/Makefile
index 87569c239ff..2ca013d1c2e 100644
--- a/net/p5-Net-IRC/Makefile
+++ b/net/p5-Net-IRC/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.1.1.1 2001/03/05 20:42:11 jtb Exp $
+# $NetBSD: Makefile,v 1.2 2001/10/18 15:20:31 veego Exp $
 
 DISTNAME=		Net-IRC-0.70
 PKGNAME=		p5-${DISTNAME}
+SVR4_PKGNAME=		p5nir
 CATEGORIES=		net perl5
 MASTER_SITES=		${MASTER_SITE_PERL_CPAN:=Net/}
 
diff --git a/net/p5-Net-SNMP/Makefile b/net/p5-Net-SNMP/Makefile
index bf071e28c79..ec69001d03b 100644
--- a/net/p5-Net-SNMP/Makefile
+++ b/net/p5-Net-SNMP/Makefile
@@ -1,9 +1,10 @@
-# $NetBSD: Makefile,v 1.4 2001/02/28 13:06:57 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2001/10/18 15:20:31 veego Exp $
 # FreeBSD Id: Makefile,v 1.13 1997/06/27 18:38:15 jfitz Exp
 #
 
 DISTNAME=	Net-SNMP-3.60
 PKGNAME=	p5-Net-SNMP-3.60
+SVR4_PKGNAME=	p5nsn
 WRKSRC=		${WRKDIR}/Net-SNMP-3.6
 CATEGORIES=	net perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=Net/}
diff --git a/net/p5-Net-TFTP/Makefile b/net/p5-Net-TFTP/Makefile
index d7536a42a6d..06ff542eacd 100644
--- a/net/p5-Net-TFTP/Makefile
+++ b/net/p5-Net-TFTP/Makefile
@@ -1,9 +1,10 @@
-# $NetBSD: Makefile,v 1.2 2001/02/17 18:19:22 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2001/10/18 15:20:32 veego Exp $
 # FreeBSD Id: Makefile,v 1.13 1997/06/27 18:38:15 jfitz Exp
 #
 
 DISTNAME=	Net-TFTP-0.10
 PKGNAME=	p5-Net-TFTP-0.10
+SVR4_PKGNAME=	p5ntf
 WRKSRC=		${WRKDIR}/Net-TFTP-0.10
 CATEGORIES=	net perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=Net/}
diff --git a/net/p5-Net-Telnet/Makefile b/net/p5-Net-Telnet/Makefile
index 5d32e439d63..3dabdda611e 100644
--- a/net/p5-Net-Telnet/Makefile
+++ b/net/p5-Net-Telnet/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.4 2001/02/28 13:14:57 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2001/10/18 15:20:32 veego Exp $
 #
 
 DISTNAME=	Net-Telnet-3.02
 PKGNAME=	p5-${DISTNAME}
+SVR4_PKGNAME=	p5nte
 CATEGORIES=	net perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=Net/}
 
diff --git a/net/p5-Net/Makefile b/net/p5-Net/Makefile
index 333fbbd0f81..591fcff30f2 100644
--- a/net/p5-Net/Makefile
+++ b/net/p5-Net/Makefile
@@ -1,9 +1,10 @@
-# $NetBSD: Makefile,v 1.20 2001/09/27 23:18:29 jlam Exp $
+# $NetBSD: Makefile,v 1.21 2001/10/18 15:20:31 veego Exp $
 # FreeBSD Id: Makefile,v 1.13 1997/06/27 18:38:15 jfitz Exp
 #
 
 DISTNAME=	libnet-1.0703
 PKGNAME=	p5-Net-1.0703
+SVR4_PKGNAME=	p5net
 CATEGORIES=	net perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=Net/}
 
diff --git a/net/p5-SNMP/Makefile b/net/p5-SNMP/Makefile
index cc990990b16..b12d9b9f9d1 100644
--- a/net/p5-SNMP/Makefile
+++ b/net/p5-SNMP/Makefile
@@ -1,9 +1,10 @@
-# $NetBSD: Makefile,v 1.10 2001/02/25 04:18:07 hubertf Exp $
+# $NetBSD: Makefile,v 1.11 2001/10/18 15:20:32 veego Exp $
 # FreeBSD Id: Makefile,v 1.1.1.1 1997/06/27 01:53:13 jfitz Exp
 #
 
 DISTNAME=	SNMP-3.1.0
 PKGNAME=	p5-SNMP-3.1.0
+SVR4_PKGNAME=	p5snm
 CATEGORIES=	net perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=SNMP/}
 
diff --git a/net/p5-SNMP_Session/Makefile b/net/p5-SNMP_Session/Makefile
index af1e9797db0..db2800c8553 100644
--- a/net/p5-SNMP_Session/Makefile
+++ b/net/p5-SNMP_Session/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.2 2001/02/27 21:22:22 jtb Exp $
+# $NetBSD: Makefile,v 1.3 2001/10/18 15:20:32 veego Exp $
 
 DISTNAME=	SNMP_Session-0.83
 PKGNAME=	p5-SNMP_Session-0.83
+SVR4_PKGNAME=	p5sns
 CATEGORIES=	net perl5
 MASTER_SITES=	ftp://ftp.switch.ch/software/sources/network/snmp/perl/
 
diff --git a/net/p5-Socket6/Makefile b/net/p5-Socket6/Makefile
index 54043e75636..1d9be15f15d 100644
--- a/net/p5-Socket6/Makefile
+++ b/net/p5-Socket6/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.6 2001/02/17 18:19:24 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2001/10/18 15:20:32 veego Exp $
 #
 
 DISTNAME=		Socket6-0.08
 PKGNAME=		p5-Socket6-0.08
+SVR4_PKGNAME=		p5so6
 CATEGORIES=		net perl5
 MASTER_SITES=		${MASTER_SITE_PERL_CPAN:=Socket6/}
 
diff --git a/net/p5-Wais/Makefile b/net/p5-Wais/Makefile
index c71e6a7adb4..196c2543ee3 100644
--- a/net/p5-Wais/Makefile
+++ b/net/p5-Wais/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.6 2001/02/17 18:19:25 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2001/10/18 15:20:33 veego Exp $
 #
 
 DISTNAME=	Wais-2.311
 PKGNAME=	p5-Wais-2.311
+SVR4_PKGNAME=	p5wai
 CATEGORIES=	net perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=Wais/}
 
diff --git a/net/p5-ispman/Makefile b/net/p5-ispman/Makefile
index 14f8168c906..d235a786bdb 100644
--- a/net/p5-ispman/Makefile
+++ b/net/p5-ispman/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.4 2001/09/05 17:18:21 jlam Exp $
+# $NetBSD: Makefile,v 1.5 2001/10/18 15:20:33 veego Exp $
 #
 
 DISTNAME=		ispman-0.5
 PKGNAME=		p5-${DISTNAME}
+SVR4_PKGNAME=		p5isp
 WRKSRC=			${WRKDIR}/ispman/Modules/ISPMan
 CATEGORIES=		net perl5
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=ispman/}