Get rid of manually adding "nbX" to PKGNAME when a pkg was changed in

pkgsrc. Instead, a new variable PKGREVISION is invented that can get
bumped independent of DISTNAME and PKGNAME.

Example #1:
        DISTNAME=       foo-X.Y
        PKGREVISION=    Z
     => PKGNAME=        foo-X.YnbZ

Example #2:
        DISTNAME=       barthing-X.Y
        PKGNAME=        bar-X.Y
        PKGREVISION=    Z
     => PKGNAME=        bar=X.YnbZ (!)

On subsequent changes, only PKGREVISION needs to be bumped, no more risk
of getting DISTNAME changed accidentally.

7 files changed, 19 insertions, 14 deletions

diff --git a/www/ap-perl/Makefile b/www/ap-perl/Makefile
index a9677e31840..780a2b18541 100644
--- a/www/ap-perl/Makefile
+++ b/www/ap-perl/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.18 2001/11/26 15:02:32 jlam Exp $
+# $NetBSD: Makefile,v 1.19 2001/11/29 01:12:50 hubertf Exp $
 #
 
 DISTNAME=		mod_perl-1.25
-PKGNAME=		ap-perl-1.25nb1
+PKGNAME=		ap-perl-1.25
+PKGREVISION=		1
 CATEGORIES=		www perl5
 MASTER_SITES=		${MASTER_SITE_PERL_CPAN:=Apache/} \
 			http://perl.apache.org/dist/
diff --git a/www/ap-xslt/Makefile b/www/ap-xslt/Makefile
index 28083fea3b2..ffe24e051a2 100644
--- a/www/ap-xslt/Makefile
+++ b/www/ap-xslt/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.5 2001/10/23 17:21:56 jwise Exp $
+# $NetBSD: Makefile,v 1.6 2001/11/29 01:12:50 hubertf Exp $
 
 DISTNAME=	modxslt
-PKGNAME=	ap-xslt-1.1nb1
+PKGNAME=	ap-xslt-1.1
+PKGREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	http://download.sourceforge.net/modxslt/
 
diff --git a/www/apache6/Makefile b/www/apache6/Makefile
index 15a271b86d6..700bd365bfe 100644
--- a/www/apache6/Makefile
+++ b/www/apache6/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.46 2001/11/25 18:59:48 jlam Exp $
+# $NetBSD: Makefile,v 1.47 2001/11/29 01:12:51 hubertf Exp $
 #
 # This package does not compile in mod_ssl support hooks, as it conflicts
 # with IPv6-enable patch.
@@ -8,7 +8,8 @@
 #
 
 DISTNAME=		apache_1.3.22
-PKGNAME=		apache6-1.3.22nb1
+PKGNAME=		apache6-1.3.22
+PKGREVISION=		1
 CATEGORIES=		www
 MASTER_SITES=		http://httpd.apache.org/dist/httpd/ \
 			http://www.apache.de/dist/httpd/ \
diff --git a/www/arena/Makefile b/www/arena/Makefile
index d53746b19be..a24eaca1e70 100644
--- a/www/arena/Makefile
+++ b/www/arena/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.40 2001/09/20 20:54:50 fredb Exp $
+# $NetBSD: Makefile,v 1.41 2001/11/29 01:12:51 hubertf Exp $
 
 DISTNAME=		arena-0.3.62
-PKGNAME=		arena-0.3.62nb1
+PKGREVISION=		1
 WRKSRC=			${WRKDIR}/Arena-0.3.62
 CATEGORIES=		www
 MASTER_SITES=		ftp://ftp.yggdrasil.com/pub/dist/web/arena/
diff --git a/www/checkbot/Makefile b/www/checkbot/Makefile
index bbcb992535a..6fb3befd86a 100644
--- a/www/checkbot/Makefile
+++ b/www/checkbot/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.10 2001/09/27 20:43:04 abs Exp $
+# $NetBSD: Makefile,v 1.11 2001/11/29 01:12:51 hubertf Exp $
 #
 
 DISTNAME=	checkbot-1.64
-PKGNAME=	checkbot-1.64nb1
+PKGREVISION=	1
 CATEGORIES=	www net perl5
 MASTER_SITES=	http://degraaff.org/checkbot/
 
diff --git a/www/libwww/Makefile b/www/libwww/Makefile
index 3b5d17c7c33..58bf2a8c645 100644
--- a/www/libwww/Makefile
+++ b/www/libwww/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.28 2001/08/27 14:35:16 tron Exp $
+# $NetBSD: Makefile,v 1.29 2001/11/29 01:12:51 hubertf Exp $
 
 DISTNAME=		w3c-libwww-5.3.2
-PKGNAME=		libwww-5.3.2nb1
+PKGNAME=		libwww-5.3.2
+PKGREVISION=		1
 CATEGORIES=		www devel
 MASTER_SITES=		http://www.w3.org/Library/Distribution/ \
 			ftp://ftp.uni-hannover.de/pub/mirror/info-systems/WWW/libwww/
diff --git a/www/w3m/Makefile b/www/w3m/Makefile
index e92aaefcc93..e02e79dcf05 100644
--- a/www/w3m/Makefile
+++ b/www/w3m/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.28 2001/09/28 10:10:40 itojun Exp $
+# $NetBSD: Makefile,v 1.29 2001/11/29 01:12:52 hubertf Exp $
 #
 
 DISTNAME=	w3m-0.2.1
-PKGNAME=	w3m-0.2.1.0.19nb2
+PKGNAME=	w3m-0.2.1.0.19
+PKGREVISION=	2
 CATEGORIES=	www
 MASTER_SITES=	ftp://ei5nazha.yz.yamagata-u.ac.jp/w3m/