summaryrefslogtreecommitdiff
path: root/x11
diff options
context:
space:
mode:
authorhubertf <hubertf>2001-11-29 01:12:24 +0000
committerhubertf <hubertf>2001-11-29 01:12:24 +0000
commitdfbf38a3ef25dda3800d125bfd25148ae1c64431 (patch)
tree57da34d13a725a0c61343ca8eabdee3d27dfbd9a /x11
parent860d7f9af53233c444d6a575ba4ac0748bc4dc74 (diff)
downloadpkgsrc-dfbf38a3ef25dda3800d125bfd25148ae1c64431.tar.gz
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.
Diffstat (limited to 'x11')
-rw-r--r--x11/qt2-designer-kde/Makefile5
-rw-r--r--x11/qt2-designer/Makefile5
-rw-r--r--x11/qt2-libs/Makefile5
-rw-r--r--x11/tk/Makefile5
-rw-r--r--x11/xearth/Makefile4
-rw-r--r--x11/xforms/Makefile5
-rw-r--r--x11/xfstt/Makefile4
-rw-r--r--x11/xview-config/Makefile5
-rw-r--r--x11/xview-lib/Makefile5
9 files changed, 25 insertions, 18 deletions
diff --git a/x11/qt2-designer-kde/Makefile b/x11/qt2-designer-kde/Makefile
index ed3e89a8d70..54a19482d1c 100644
--- a/x11/qt2-designer-kde/Makefile
+++ b/x11/qt2-designer-kde/Makefile
@@ -1,9 +1,10 @@
-# $NetBSD: Makefile,v 1.7 2001/11/16 09:09:33 jlam Exp $
+# $NetBSD: Makefile,v 1.8 2001/11/29 01:12:52 hubertf Exp $
#
.include "../qt2-libs/Makefile.common"
-PKGNAME= qt2-designer-kde-${QTVERSION}nb1
+PKGNAME= qt2-designer-kde-${QTVERSION}
+PKGREVISION= 1
COMMENT= Visual (WYSIWYG) QT GUI builder with KDE widget support
CONFLICTS+= qt2-designer-[0-9]*
diff --git a/x11/qt2-designer/Makefile b/x11/qt2-designer/Makefile
index e91b84e7627..5691ce53e8d 100644
--- a/x11/qt2-designer/Makefile
+++ b/x11/qt2-designer/Makefile
@@ -1,9 +1,10 @@
-# $NetBSD: Makefile,v 1.14 2001/11/16 09:09:33 jlam Exp $
+# $NetBSD: Makefile,v 1.15 2001/11/29 01:12:52 hubertf Exp $
#
.include "../qt2-libs/Makefile.common"
-PKGNAME= qt2-designer-${QTVERSION}nb1
+PKGNAME= qt2-designer-${QTVERSION}
+PKGREVISION= 1
COMMENT= Visual (WYSIWYG) QT GUI builder
CONFLICTS+= qt2-designer-kde-[0-9]*
diff --git a/x11/qt2-libs/Makefile b/x11/qt2-libs/Makefile
index 2f15f3f8da5..341311c267b 100644
--- a/x11/qt2-libs/Makefile
+++ b/x11/qt2-libs/Makefile
@@ -1,10 +1,11 @@
-# $NetBSD: Makefile,v 1.15 2001/11/16 09:08:05 jlam Exp $
+# $NetBSD: Makefile,v 1.16 2001/11/29 01:12:52 hubertf Exp $
#
#USE_MESA= yes
.include "../qt2-libs/Makefile.common"
-PKGNAME= qt2-libs-${QTVERSION}nb1
+PKGNAME= qt2-libs-${QTVERSION}
+PKGREVISION= 1
COMMENT= C++ X GUI toolkit
USE_BUILDLINK_ONLY= yes
diff --git a/x11/tk/Makefile b/x11/tk/Makefile
index 3fa3583c527..3cf2c51cc1e 100644
--- a/x11/tk/Makefile
+++ b/x11/tk/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.15 2001/10/24 22:11:15 jlam Exp $
+# $NetBSD: Makefile,v 1.16 2001/11/29 01:12:52 hubertf Exp $
DISTNAME= tk8.3.2
-PKGNAME= tk-8.3.2nb1
+PKGNAME= tk-8.3.2
+PKGREVISION= 1
CATEGORIES= x11
MASTER_SITES= ftp://ftp.scriptics.com/pub/tcl/tcl8_3/ \
ftp://ftp.informatik.uni-hamburg.de/pub/soft/lang/tcl/tcl8_3/
diff --git a/x11/xearth/Makefile b/x11/xearth/Makefile
index d245483dfb3..f570821a985 100644
--- a/x11/xearth/Makefile
+++ b/x11/xearth/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.8 2001/07/10 14:32:32 atatat Exp $
+# $NetBSD: Makefile,v 1.9 2001/11/29 01:12:53 hubertf Exp $
#
DISTNAME= xearth-1.1
-PKGNAME= xearth-1.1nb1
+PKGREVISION= 1
CATEGORIES= x11
MASTER_SITES= ftp://cag.lcs.mit.edu/pub/tuna/ \
ftp://ftp.cs.colorado.edu/users/tuna/
diff --git a/x11/xforms/Makefile b/x11/xforms/Makefile
index 9cde184736d..4549e696585 100644
--- a/x11/xforms/Makefile
+++ b/x11/xforms/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.37 2001/08/09 13:45:43 wiz Exp $
+# $NetBSD: Makefile,v 1.38 2001/11/29 01:12:53 hubertf Exp $
#
DISTNAME= bxform-088
-PKGNAME= xforms-0.88nb1
+PKGNAME= xforms-0.88
+PKGREVISION= 1
WRKSRC= ${WRKDIR}/xforms
CATEGORIES= x11
MASTER_SITES= ftp://ncmir.ucsd.edu/pub/xforms/${ARCH_SUBDIR}/
diff --git a/x11/xfstt/Makefile b/x11/xfstt/Makefile
index 65154726715..78c4098672b 100644
--- a/x11/xfstt/Makefile
+++ b/x11/xfstt/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.5 2001/02/28 10:42:03 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2001/11/29 01:12:53 hubertf Exp $
#
DISTNAME= xfstt-1.1
-PKGNAME= ${DISTNAME}nb1
+PKGREVISION= 1
CATEGORIES= x11 net
MASTER_SITES= ${MASTER_SITE_SUNSITE:=X11/fonts/}
diff --git a/x11/xview-config/Makefile b/x11/xview-config/Makefile
index 9e70f978bff..4daba9a4b56 100644
--- a/x11/xview-config/Makefile
+++ b/x11/xview-config/Makefile
@@ -1,9 +1,10 @@
-# $NetBSD: Makefile,v 1.12 2001/02/17 17:07:29 wiz Exp $
+# $NetBSD: Makefile,v 1.13 2001/11/29 01:12:53 hubertf Exp $
# $FreeBSD Id: Makefile,v 1.9 1998/05/04 03:34:50 steve Exp
#
DISTNAME= xview3.2p1-X11R6
-PKGNAME= xview-config-3.2.1nb2
+PKGNAME= xview-config-3.2.1
+PKGREVISION= 2
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_LOCAL}
diff --git a/x11/xview-lib/Makefile b/x11/xview-lib/Makefile
index e9312357c9a..d3019516136 100644
--- a/x11/xview-lib/Makefile
+++ b/x11/xview-lib/Makefile
@@ -1,9 +1,10 @@
-# $NetBSD: Makefile,v 1.16 2001/05/11 20:41:31 dmcmahill Exp $
+# $NetBSD: Makefile,v 1.17 2001/11/29 01:12:53 hubertf Exp $
# $FreeBSD Id: Makefile,v 1.13 1997/07/17 15:13:03 max Exp
#
DISTNAME= xview3.2p1-X11R6
-PKGNAME= xview-lib-3.2.1nb2
+PKGNAME= xview-lib-3.2.1
+PKGREVISION= 2
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_LOCAL}