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.

11 files changed, 29 insertions, 22 deletions

diff --git a/graphics/Mesa/Makefile b/graphics/Mesa/Makefile
index 13d851fa471..680b2c987bb 100644
--- a/graphics/Mesa/Makefile
+++ b/graphics/Mesa/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.42 2001/09/27 23:18:09 jlam Exp $
+# $NetBSD: Makefile,v 1.43 2001/11/29 01:12:34 hubertf Exp $
 #
 
 .include "Makefile.common"
 
 DISTNAME=	Mesa-${MESA_VERSION}
-PKGNAME=	${DISTNAME}nb1
+PKGREVISION=	1
 CATEGORIES=	graphics
 MASTER_SITES= 	# empty
 DISTFILES=	# empty
diff --git a/graphics/avifile-devel/Makefile b/graphics/avifile-devel/Makefile
index 5d0fc09fbc5..8dacea88a58 100644
--- a/graphics/avifile-devel/Makefile
+++ b/graphics/avifile-devel/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.22 2001/10/24 22:10:59 jlam Exp $
+# $NetBSD: Makefile,v 1.23 2001/11/29 01:12:34 hubertf Exp $
 #
 
 DISTNAME=	avifile-0.6.20010814
-PKGNAME=	${DISTNAME}nb1
+PKGREVISION=	1
 CATEGORIES=	graphics
 MASTER_SITES=	http://zuntum.utech.lublin.pl/distfiles/
 EXTRACT_SUFX=	.tar.bz2
diff --git a/graphics/blender/Makefile b/graphics/blender/Makefile
index b9449f2dfa9..2295a97b163 100644
--- a/graphics/blender/Makefile
+++ b/graphics/blender/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.9 2001/11/27 03:49:44 hubertf Exp $
+# $NetBSD: Makefile,v 1.10 2001/11/29 01:12:34 hubertf Exp $
 #
 
-PKGNAME=	blender-2.11nb4
+PKGNAME=	blender-2.11
+PKGREVISION=	4
 CATEGORIES=	graphics
 MASTER_SITES=	ftp://www.blender.nl/pub/
 
diff --git a/graphics/dvdview/Makefile b/graphics/dvdview/Makefile
index 95d06e034d2..83b59e03ca2 100644
--- a/graphics/dvdview/Makefile
+++ b/graphics/dvdview/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.4 2001/08/30 22:56:42 elric Exp $
+# $NetBSD: Makefile,v 1.5 2001/11/29 01:12:35 hubertf Exp $
 
 DISTNAME=	dvdview1.1.0
-PKGNAME=	dvdview-1.1.0nb1
+PKGNAME=	dvdview-1.1.0
+PKGREVISION=	1
 CATEGORIES=	graphics
 MASTER_SITES=	http://rachmaninoff.informatik.uni-mannheim.de/dvdview/arch/
 
diff --git a/graphics/g2/Makefile b/graphics/g2/Makefile
index 29ca5fd9232..6abdf62671d 100644
--- a/graphics/g2/Makefile
+++ b/graphics/g2/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.6 2001/05/03 21:17:23 jtb Exp $
+# $NetBSD: Makefile,v 1.7 2001/11/29 01:12:35 hubertf Exp $
 
 DISTNAME=		g2-0.40
-PKGNAME=		g2-0.40nb1
+PKGREVISION=		1
 CATEGORIES=		graphics
 MASTER_SITES=		ftp://g2.sourceforge.net/pub/g2/
 
diff --git a/graphics/gphoto2/Makefile b/graphics/gphoto2/Makefile
index 99b16ce329a..86c5ad7b1e8 100644
--- a/graphics/gphoto2/Makefile
+++ b/graphics/gphoto2/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.4 2001/08/02 12:16:05 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2001/11/29 01:12:35 hubertf Exp $
 
 DISTNAME=	gphoto-2.0beta1
-PKGNAME=	gphoto-2.0.0.1nb1
+PKGNAME=	gphoto-2.0.0.1
+PKGREVISION=	1
 CATEGORIES=	graphics
 MASTER_SITES=	http://www.gphoto.net/dist/
 
diff --git a/graphics/iGMT/Makefile b/graphics/iGMT/Makefile
index adf1f254b01..a1713256227 100644
--- a/graphics/iGMT/Makefile
+++ b/graphics/iGMT/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.11 2001/05/19 17:48:27 jtb Exp $
+# $NetBSD: Makefile,v 1.12 2001/11/29 01:12:36 hubertf Exp $
 
 DISTNAME=		igmt_v1.2
-PKGNAME=		iGMT-1.2nb1
+PKGNAME=		iGMT-1.2
+PKGREVISION=		1
 CATEGORIES=		graphics
 MASTER_SITES=		http://op.gfz-potsdam.de/igmt/
 
diff --git a/graphics/mpeg_encode/Makefile b/graphics/mpeg_encode/Makefile
index d071dfcb69d..dcee656676a 100644
--- a/graphics/mpeg_encode/Makefile
+++ b/graphics/mpeg_encode/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.2 2001/09/22 17:48:26 hubertf Exp $
+# $NetBSD: Makefile,v 1.3 2001/11/29 01:12:36 hubertf Exp $
 #
 
 DISTNAME=	mpeg_encode-1.5b-src
-PKGNAME=	${DISTNAME:S/-src//}nb1
+PKGNAME=	${DISTNAME:S/-src//}
+PKGREVISION=	1
 CATEGORIES=	graphics net
 MASTER_SITES=	ftp://mm-ftp.cs.berkeley.edu/pub/multimedia/mpeg/encode/
 
diff --git a/graphics/xanim/Makefile b/graphics/xanim/Makefile
index a8dc97cb117..f468ed757b5 100644
--- a/graphics/xanim/Makefile
+++ b/graphics/xanim/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.23 2001/10/21 15:40:51 mycroft Exp $
+# $NetBSD: Makefile,v 1.24 2001/11/29 01:12:36 hubertf Exp $
 
 DISTNAME=	xanim2801
-PKGNAME=	xanim-2.80.1nb1
+PKGNAME=	xanim-2.80.1
+PKGREVISION=	1
 CATEGORIES=	graphics x11
 MASTER_SITES=	ftp://xanim.va.pubnix.com/\
 		ftp://xanim.va.pubnix.com/modules/ \
diff --git a/graphics/xart/Makefile b/graphics/xart/Makefile
index 5f64fb9f5a5..687fc8f0f33 100644
--- a/graphics/xart/Makefile
+++ b/graphics/xart/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.24 2001/08/22 17:38:58 jlam Exp $
+# $NetBSD: Makefile,v 1.25 2001/11/29 01:12:37 hubertf Exp $
 #
 
 DISTNAME=       xart19980415
-PKGNAME=	xart-19980415nb1
+PKGNAME=	xart-19980415
+PKGREVISION=       1
 WRKSRC=		${WRKDIR}/19980415
 CATEGORIES=	graphics x11
 MASTER_SITES=	http://linux01.gwdg.de/~rhohen/linux/
diff --git a/graphics/xv/Makefile b/graphics/xv/Makefile
index 0b3194fc215..84a8dff8662 100644
--- a/graphics/xv/Makefile
+++ b/graphics/xv/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.39 2001/09/27 23:18:14 jlam Exp $
+# $NetBSD: Makefile,v 1.40 2001/11/29 01:12:37 hubertf Exp $
 
 DISTNAME=	xv-3.10a
-PKGNAME=	${DISTNAME}nb1
+PKGREVISION=	1
 CATEGORIES=     graphics x11
 MASTER_SITES=	ftp://ftp.cis.upenn.edu/pub/xv/ \
 		ftp://ftp.kuis.kyoto-u.ac.jp/X11/contrib/clients/xv/ \