From dfbf38a3ef25dda3800d125bfd25148ae1c64431 Mon Sep 17 00:00:00 2001
From: hubertf <hubertf>
Date: Thu, 29 Nov 2001 01:12:24 +0000
Subject: 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.
---
 sysutils/aperture/Makefile | 5 +++--
 sysutils/kapm/Makefile     | 4 ++--
 sysutils/mtools/Makefile   | 4 ++--
 sysutils/rtty/Makefile     | 4 ++--
 sysutils/tload/Makefile    | 5 +++--
 sysutils/xbatt/Makefile    | 5 +++--
 sysutils/xbattbar/Makefile | 5 +++--
 sysutils/xdu/Makefile      | 4 ++--
 8 files changed, 20 insertions(+), 16 deletions(-)

(limited to 'sysutils')

diff --git a/sysutils/aperture/Makefile b/sysutils/aperture/Makefile
index e81bce02463..d453ba941d0 100644
--- a/sysutils/aperture/Makefile
+++ b/sysutils/aperture/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.15 2001/09/09 20:36:46 agc Exp $
+# $NetBSD: Makefile,v 1.16 2001/11/29 01:12:47 hubertf Exp $
 
 DISTNAME=	apNetBSD
-PKGNAME=	aperture-2.0nb1
+PKGNAME=	aperture-2.0
+PKGREVISION=	1
 CATEGORIES=	sysutils x11
 EXTRACT_SUFX=	.shar
 
diff --git a/sysutils/kapm/Makefile b/sysutils/kapm/Makefile
index 6dfed18df8a..320a07bb0b7 100644
--- a/sysutils/kapm/Makefile
+++ b/sysutils/kapm/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.11 2001/11/26 23:09:29 hubertf Exp $
+# $NetBSD: Makefile,v 1.12 2001/11/29 01:12:48 hubertf Exp $
 #
 
 DISTNAME=	kapm-0.3.1
-PKGNAME=	${DISTNAME}nb1
+PKGREVISION=	1
 CATEGORIES=	sysutils x11 kde
 MASTER_SITES=	ftp://bodnar42.dhs.org/pub/kapm/
 
diff --git a/sysutils/mtools/Makefile b/sysutils/mtools/Makefile
index ebd3e52fc52..4f3bbc18d88 100644
--- a/sysutils/mtools/Makefile
+++ b/sysutils/mtools/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.24 2001/06/11 06:34:50 jlam Exp $
+# $NetBSD: Makefile,v 1.25 2001/11/29 01:12:48 hubertf Exp $
 #
 
 DISTNAME=	mtools-3.9.7
-PKGNAME=	mtools-3.9.7nb1
+PKGREVISION=	1
 CATEGORIES=	sysutils
 MASTER_SITES=	ftp://ftp.tux.org/pub/tux/knaff/mtools/
 
diff --git a/sysutils/rtty/Makefile b/sysutils/rtty/Makefile
index 0ae1e5732c9..5352b27f1ac 100644
--- a/sysutils/rtty/Makefile
+++ b/sysutils/rtty/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.14 2001/09/09 20:36:47 agc Exp $
+# $NetBSD: Makefile,v 1.15 2001/11/29 01:12:48 hubertf Exp $
 # FreeBSD Id: Makefile,v 1.3 1997/01/06 12:13:36 jkh Exp
 #
 
 DISTNAME=       rtty-3.2
-PKGNAME=	${DISTNAME}nb1
+PKGREVISION=       1
 CATEGORIES=	sysutils
 MASTER_SITES=   ftp://ftp.vix.com/pub/vixie/
 
diff --git a/sysutils/tload/Makefile b/sysutils/tload/Makefile
index ad2f7811d76..2af9833e87a 100644
--- a/sysutils/tload/Makefile
+++ b/sysutils/tload/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.4 2001/05/22 02:59:25 hubertf Exp $
+# $NetBSD: Makefile,v 1.5 2001/11/29 01:12:48 hubertf Exp $
 #
 
 DISTNAME=	procps-2.0.6
-PKGNAME=	tload-2.0.6nb1
+PKGNAME=	tload-2.0.6
+PKGREVISION=	1
 CATEGORIES=	sysutils
 MASTER_SITES=	ftp://people.redhat.com/johnsonm/procps/
 
diff --git a/sysutils/xbatt/Makefile b/sysutils/xbatt/Makefile
index 4ea42dea91f..30a44693bba 100644
--- a/sysutils/xbatt/Makefile
+++ b/sysutils/xbatt/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.8 2001/11/26 20:02:35 wiz Exp $
+# $NetBSD: Makefile,v 1.9 2001/11/29 01:12:48 hubertf Exp $
 #
 
 DISTNAME=	xbatt-1.3pr1
-PKGNAME=	xbatt-1.3.1nb1
+PKGNAME=	xbatt-1.3.1
+PKGREVISION=	1
 WRKSRC=		${WRKDIR}/xbatt-1.3
 CATEGORIES=	sysutils x11
 MASTER_SITES=	http://www2.clave.gr.jp/~eto/xbatt/
diff --git a/sysutils/xbattbar/Makefile b/sysutils/xbattbar/Makefile
index 5747325db80..e11649fc2ff 100644
--- a/sysutils/xbattbar/Makefile
+++ b/sysutils/xbattbar/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.9 2001/11/26 20:07:34 wiz Exp $
+# $NetBSD: Makefile,v 1.10 2001/11/29 01:12:49 hubertf Exp $
 
 DISTNAME=	${PKGNAME:S/-/_/}
-PKGNAME=	xbattbar-1.4.2nb1
+PKGNAME=	xbattbar-1.4.2
+PKGREVISION=	1
 WRKSRC=		${WRKDIR}/${PKGNAME}
 CATEGORIES=	sysutils x11
 MASTER_SITES=	http://infonet.aist-nara.ac.jp/member/suguru/
diff --git a/sysutils/xdu/Makefile b/sysutils/xdu/Makefile
index 073dd1967a3..37549f84976 100644
--- a/sysutils/xdu/Makefile
+++ b/sysutils/xdu/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.5 2001/08/25 16:34:26 hubertf Exp $
+# $NetBSD: Makefile,v 1.6 2001/11/29 01:12:49 hubertf Exp $
 #
 
 DISTNAME=	xdu-3.0
-PKGNAME=	xdu-3.0nb2
+PKGREVISION=	2
 CATEGORIES=	sysutils x11
 MASTER_SITES=	http://sd.wareonearth.com/~phil/xdu/ ftp://ftp.arl.mil/pub/
 EXTRACT_SUFX=	.tar.Z
-- 
cgit v1.2.3