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.

12 files changed, 28 insertions, 24 deletions

diff --git a/devel/GConf/Makefile b/devel/GConf/Makefile
index 756a40d59dc..3ebe913b61d 100644
--- a/devel/GConf/Makefile
+++ b/devel/GConf/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.22 2001/10/24 22:10:50 jlam Exp $
+# $NetBSD: Makefile,v 1.23 2001/11/29 01:12:28 hubertf Exp $
 #
 
 DISTNAME=		GConf-1.0.4
-PKGNAME=		GConf-1.0.4nb1
+PKGREVISION=		1
 CATEGORIES=		devel gnome
 MASTER_SITES=		${MASTER_SITE_GNOME:=stable/sources/GConf/}
 EXTRACT_SUFX=		.tar.bz2
diff --git a/devel/automake/Makefile b/devel/automake/Makefile
index d6585874c6d..693815dd782 100644
--- a/devel/automake/Makefile
+++ b/devel/automake/Makefile
@@ -1,9 +1,10 @@
-# $NetBSD: Makefile,v 1.24 2001/11/28 05:20:46 jlam Exp $
+# $NetBSD: Makefile,v 1.25 2001/11/29 01:12:28 hubertf Exp $
 # FreeBSD Id: Makefile,v 1.5 1997/09/19 09:29:04 max Exp
 #
 
 DISTNAME=	automake-1.4-p5
-PKGNAME=	${DISTNAME:C/-p/./}nb1
+PKGNAME=	${DISTNAME:C/-p/./}
+PKGREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_GNU:=automake/}
 
diff --git a/devel/cvs/Makefile b/devel/cvs/Makefile
index 93bdf8f780c..b73b1115342 100644
--- a/devel/cvs/Makefile
+++ b/devel/cvs/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.44 2001/09/27 23:17:55 jlam Exp $
+# $NetBSD: Makefile,v 1.45 2001/11/29 01:12:28 hubertf Exp $
 #
 
 DISTNAME=	cvs-1.11
-PKGNAME=	${DISTNAME}nb2
+PKGREVISION=	2
 CATEGORIES=	devel
 MASTER_SITES=	ftp://ftp.cvshome.org/pub/${DISTNAME}/ \
 		${MASTER_SITE_GNU:=cvs/}
diff --git a/devel/electricfence/Makefile b/devel/electricfence/Makefile
index d0e09865ebe..a8512faf2f3 100644
--- a/devel/electricfence/Makefile
+++ b/devel/electricfence/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.6 2001/11/10 19:59:00 agc Exp $
+# $NetBSD: Makefile,v 1.7 2001/11/29 01:12:29 hubertf Exp $
 
 DISTNAME=		ElectricFence-2.1
-PKGNAME=		ElectricFence-2.1nb1
+PKGREVISION=		1
 CATEGORIES=		devel
 MASTER_SITES=		ftp://ftp.perens.com/pub/ElectricFence/
 
diff --git a/devel/gettext-lib/Makefile b/devel/gettext-lib/Makefile
index 5dbd2df6848..38012afebbb 100644
--- a/devel/gettext-lib/Makefile
+++ b/devel/gettext-lib/Makefile
@@ -1,9 +1,10 @@
-# $NetBSD: Makefile,v 1.10 2001/10/18 15:20:10 veego Exp $
+# $NetBSD: Makefile,v 1.11 2001/11/29 01:12:29 hubertf Exp $
 # FreeBSD Id: Makefile,v 1.1.1.1 1998/08/09 15:13:33 kuriyama Exp
 #
 
 DISTNAME=		gettext-0.10.35
-PKGNAME=		gettext-lib-0.10.35nb1
+PKGNAME=		gettext-lib-0.10.35
+PKGREVISION=		1
 SVR4_PKGNAME=		gttli
 CATEGORIES=		devel
 MASTER_SITES=		${MASTER_SITE_GNU:=gettext/}
diff --git a/devel/gettext/Makefile b/devel/gettext/Makefile
index f868248ad2c..b5f332b0a34 100644
--- a/devel/gettext/Makefile
+++ b/devel/gettext/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.32 2001/08/02 18:11:02 jlam Exp $
+# $NetBSD: Makefile,v 1.33 2001/11/29 01:12:29 hubertf Exp $
 # FreeBSD Id: Makefile,v 1.1.1.1 1998/08/09 15:13:33 kuriyama Exp
 #
 
 DISTNAME=		gettext-0.10.35
-PKGNAME=		gettext-0.10.35nb2
+PKGREVISION=		2
 CATEGORIES=		devel
 MASTER_SITES=		${MASTER_SITE_GNU:=gettext/}
 
diff --git a/devel/libstroke/Makefile b/devel/libstroke/Makefile
index d990879fbd7..016c1e6e825 100644
--- a/devel/libstroke/Makefile
+++ b/devel/libstroke/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.7 2001/02/16 14:38:39 wiz Exp $
+# $NetBSD: Makefile,v 1.8 2001/11/29 01:12:29 hubertf Exp $
 #
 
 DISTNAME=		libstroke-0.3
-PKGNAME=		libstroke-0.3nb1
+PKGREVISION=		1
 CATEGORIES=		devel
 MASTER_SITES=		http://www.etla.net/libstroke/
 
diff --git a/devel/noweb/Makefile b/devel/noweb/Makefile
index bc057332c8c..44c791c1df9 100644
--- a/devel/noweb/Makefile
+++ b/devel/noweb/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.22 2001/07/27 10:50:48 wiz Exp $
+# $NetBSD: Makefile,v 1.23 2001/11/29 01:12:30 hubertf Exp $
 # FreeBSD Id: Makefile,v 1.10 1997/09/15 07:22:06 tg Exp
 #
 
 DISTNAME=		noweb-2.9a
-PKGNAME=		noweb-2.9anb1
+PKGREVISION=		1
 CATEGORIES=		devel
 MASTER_SITES=		ftp://ftp.cs.virginia.edu/pub/nr/
 EXTRACT_SUFX=		.tgz
diff --git a/devel/pilrc/Makefile b/devel/pilrc/Makefile
index 0a767e922d2..8afb2fb2e96 100644
--- a/devel/pilrc/Makefile
+++ b/devel/pilrc/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.8 2001/06/29 04:54:51 jlam Exp $
+# $NetBSD: Makefile,v 1.9 2001/11/29 01:12:30 hubertf Exp $
 #
 
 DISTNAME=	pilrc-2.8p4
-PKGNAME=	pilrc-2.8.4nb1
+PKGNAME=	pilrc-2.8.4
+PKGREVISION=	1
 WRKSRC=		${WRKDIR}/pilrc-2.8p4
 CATEGORIES=	devel
 MASTER_SITES=	http://www.ardiri.com/download/palm/pilrc/patch/
diff --git a/devel/rcs/Makefile b/devel/rcs/Makefile
index 6428e299d88..3779e5a07b4 100644
--- a/devel/rcs/Makefile
+++ b/devel/rcs/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.10 2001/11/12 03:06:31 wiz Exp $
+# $NetBSD: Makefile,v 1.11 2001/11/29 01:12:30 hubertf Exp $
 #
 
 DISTNAME=		rcs-5.7
-PKGNAME=		rcs-5.7nb1
+PKGREVISION=		1
 CATEGORIES=		devel
 MASTER_SITES=		${MASTER_SITE_GNU:=rcs/}
 
diff --git a/devel/unproven-pthreads/Makefile b/devel/unproven-pthreads/Makefile
index 39a84be6855..f97621783a3 100644
--- a/devel/unproven-pthreads/Makefile
+++ b/devel/unproven-pthreads/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.26 2001/09/27 23:17:58 jlam Exp $
+# $NetBSD: Makefile,v 1.27 2001/11/29 01:12:30 hubertf Exp $
 #
 
 DISTNAME=		unproven-pthreads-0.17
-PKGNAME=		${DISTNAME}nb2
+PKGREVISION=		2
 CATEGORIES=		devel
 MASTER_SITES=		ftp://ftp.flame.org/pub/netbsd/
 
diff --git a/devel/w32api/Makefile b/devel/w32api/Makefile
index 43de20edbb9..2352729c824 100644
--- a/devel/w32api/Makefile
+++ b/devel/w32api/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.7 2001/11/02 00:30:10 kent Exp $
+# $NetBSD: Makefile,v 1.8 2001/11/29 01:12:30 hubertf Exp $
 # $PEACE: Makefile,v 1.15 2001/10/20 03:00:07 kent Exp $
 
 DISTNAME=		w32api-1.1-src
-PKGNAME=		w32api-1.1nb1
+PKGNAME=		w32api-1.1
+PKGREVISION=		1
 WRKSRC=			${WRKDIR}/${DISTNAME:S/-src//}
 CATEGORIES=		devel
 MASTER_SITES=		http://prdownloads.sourceforge.net/mingw/