From 5542206cbab4ff38cfe05a48a6dcf0205f5c9ff5 Mon Sep 17 00:00:00 2001 From: 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. --- net/ORBit/Makefile | 4 ++-- net/ispman/Makefile | 4 ++-- net/mouse-pppoe/Makefile | 5 +++-- net/mtr-gtk/Makefile | 5 +++-- net/mtr/Makefile | 4 ++-- net/napshare/Makefile | 4 ++-- net/netatalk-asun/Makefile | 5 +++-- net/netatalk/Makefile | 5 +++-- net/nocol/Makefile | 4 ++-- net/ntop/Makefile | 4 ++-- net/pload/Makefile | 4 ++-- net/ra-rtsp-proxy/Makefile | 5 +++-- net/wmnet/Makefile | 4 ++-- 13 files changed, 31 insertions(+), 26 deletions(-) (limited to 'net') diff --git a/net/ORBit/Makefile b/net/ORBit/Makefile index 5ff31b9231a..c868be4fc76 100644 --- a/net/ORBit/Makefile +++ b/net/ORBit/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.69 2001/10/15 22:34:00 wiz Exp $ +# $NetBSD: Makefile,v 1.70 2001/11/29 01:12:41 hubertf Exp $ # DISTNAME= ORBit-0.${ORBIT_MAJOR}.${ORBIT_MINOR} -PKGNAME= ${DISTNAME}nb1 +PKGREVISION= 1 CATEGORIES= net MASTER_SITES= ${MASTER_SITE_GNOME:=stable/sources/ORBit/} EXTRACT_SUFX= .tar.bz2 diff --git a/net/ispman/Makefile b/net/ispman/Makefile index 29a0092028a..aa4beff17fd 100644 --- a/net/ispman/Makefile +++ b/net/ispman/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.7 2001/03/22 13:29:18 wiz Exp $ +# $NetBSD: Makefile,v 1.8 2001/11/29 01:12:41 hubertf Exp $ # DISTNAME= ispman-0.5 -PKGNAME= ${DISTNAME}nb1 +PKGREVISION= 1 WRKSRC= ${WRKDIR}/ispman CATEGORIES= net MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=ispman/} diff --git a/net/mouse-pppoe/Makefile b/net/mouse-pppoe/Makefile index e34d1c89a03..d4449008046 100644 --- a/net/mouse-pppoe/Makefile +++ b/net/mouse-pppoe/Makefile @@ -1,7 +1,8 @@ -# $NetBSD: Makefile,v 1.8 2001/09/09 20:36:38 agc Exp $ +# $NetBSD: Makefile,v 1.9 2001/11/29 01:12:42 hubertf Exp $ DISTNAME= pppoe.20000912 -PKGNAME= mouse-${DISTNAME:S/./-/}nb1 +PKGNAME= mouse-${DISTNAME:S/./-/} +PKGREVISION= 1 CATEGORIES= net MASTER_SITES= ftp://ftp.netbsd.org/pub/NetBSD/misc/mouse/pppoe/ diff --git a/net/mtr-gtk/Makefile b/net/mtr-gtk/Makefile index 7f114b4e06d..6ab79cbafbe 100644 --- a/net/mtr-gtk/Makefile +++ b/net/mtr-gtk/Makefile @@ -1,8 +1,9 @@ -# $NetBSD: Makefile,v 1.2 2001/11/04 14:09:32 wiz Exp $ +# $NetBSD: Makefile,v 1.3 2001/11/29 01:12:42 hubertf Exp $ # DISTNAME= mtr-0.42 -PKGNAME= mtr-gtk-0.42nb1 +PKGNAME= mtr-gtk-0.42 +PKGREVISION= 1 CATEGORIES= net MASTER_SITES= ftp://ftp.bitwizard.nl/mtr/ \ http://www.giovannelli.it/~gmarco/files/ diff --git a/net/mtr/Makefile b/net/mtr/Makefile index 9d77b186f48..e14d6eb3287 100644 --- a/net/mtr/Makefile +++ b/net/mtr/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.20 2001/11/04 14:09:31 wiz Exp $ +# $NetBSD: Makefile,v 1.21 2001/11/29 01:12:42 hubertf Exp $ # DISTNAME= mtr-0.42 -PKGNAME= ${DISTNAME}nb1 +PKGREVISION= 1 CATEGORIES= net MASTER_SITES= ftp://ftp.bitwizard.nl/mtr/ \ http://www.giovannelli.it/~gmarco/files/ diff --git a/net/napshare/Makefile b/net/napshare/Makefile index 9c1f84557c3..a051f5066d7 100644 --- a/net/napshare/Makefile +++ b/net/napshare/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.2 2001/09/22 16:22:30 tron Exp $ +# $NetBSD: Makefile,v 1.3 2001/11/29 01:12:42 hubertf Exp $ DISTNAME= napshare-0.1 -PKGNAME= ${DISTNAME}nb1 +PKGREVISION= 1 CATEGORIES= net MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=napshare/} diff --git a/net/netatalk-asun/Makefile b/net/netatalk-asun/Makefile index d1c76b8b469..d07ed48a22b 100644 --- a/net/netatalk-asun/Makefile +++ b/net/netatalk-asun/Makefile @@ -1,7 +1,8 @@ -# $NetBSD: Makefile,v 1.11 2001/09/27 23:18:28 jlam Exp $ +# $NetBSD: Makefile,v 1.12 2001/11/29 01:12:43 hubertf Exp $ DISTNAME= netatalk-1.4b2+asun2.1.3 -PKGNAME= netatalk-asun-2.1.3nb5 +PKGNAME= netatalk-asun-2.1.3 +PKGREVISION= 5 CATEGORIES= net print MASTER_SITES= ftp://ftp.cobaltnet.com/pub/users/asun/release/ \ ftp://ftp.hanse.de/sites/transit/mirror/ftp.u.washington.edu/public/asun/ diff --git a/net/netatalk/Makefile b/net/netatalk/Makefile index ee7d6e7f366..552e7d52b41 100644 --- a/net/netatalk/Makefile +++ b/net/netatalk/Makefile @@ -1,8 +1,9 @@ -# $NetBSD: Makefile,v 1.12 2001/02/17 18:19:12 wiz Exp $ +# $NetBSD: Makefile,v 1.13 2001/11/29 01:12:43 hubertf Exp $ # DISTNAME= netatalk-990130 -PKGNAME= netatalk-umich-19990130nb2 +PKGNAME= netatalk-umich-19990130 +PKGREVISION= 2 WRKSRC= ${WRKDIR}/netatalk-990130 CATEGORIES= net MASTER_SITES= ftp://terminator.rs.itd.umich.edu/unix/netatalk/ diff --git a/net/nocol/Makefile b/net/nocol/Makefile index 085a336b256..a631c2c5d4d 100644 --- a/net/nocol/Makefile +++ b/net/nocol/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.13 2001/02/25 04:18:06 hubertf Exp $ +# $NetBSD: Makefile,v 1.14 2001/11/29 01:12:43 hubertf Exp $ # DISTNAME= nocol-4.3.1 -PKGNAME= nocol-4.3.1nb1 +PKGREVISION= 1 CATEGORIES= net MASTER_SITES= http://www.netplex-tech.com/software/nocol/downloads/ diff --git a/net/ntop/Makefile b/net/ntop/Makefile index 44caffe4b7a..52ec2ea2d27 100644 --- a/net/ntop/Makefile +++ b/net/ntop/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.21 2001/09/10 17:33:40 wiz Exp $ +# $NetBSD: Makefile,v 1.22 2001/11/29 01:12:43 hubertf Exp $ DISTNAME= ntop-1.1 -PKGNAME= ntop-1.1nb1 +PKGREVISION= 1 CATEGORIES= net MASTER_SITES= ftp://ftp.unipi.it/pub/local/ntop/source/ EXTRACT_SUFX= -src.tar.gz diff --git a/net/pload/Makefile b/net/pload/Makefile index 26af05f81f9..60ba30b89fe 100644 --- a/net/pload/Makefile +++ b/net/pload/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.8 2001/02/17 18:19:27 wiz Exp $ +# $NetBSD: Makefile,v 1.9 2001/11/29 01:12:43 hubertf Exp $ # DISTNAME= pload-0.9.4 -PKGNAME= pload-0.9.4nb1 +PKGREVISION= 1 CATEGORIES= net x11 MASTER_SITES= http://www.engr.utk.edu/~mdsmith/pload/ diff --git a/net/ra-rtsp-proxy/Makefile b/net/ra-rtsp-proxy/Makefile index e8eb6e5ca47..329d40f39c4 100644 --- a/net/ra-rtsp-proxy/Makefile +++ b/net/ra-rtsp-proxy/Makefile @@ -1,7 +1,8 @@ -# $NetBSD: Makefile,v 1.15 2001/10/31 14:34:57 tv Exp $ +# $NetBSD: Makefile,v 1.16 2001/11/29 01:12:44 hubertf Exp $ DISTNAME= rtspd-src-1.0.0.0 -PKGNAME= ra-rtsp-proxy-1.0.0.0nb1 +PKGNAME= ra-rtsp-proxy-1.0.0.0 +PKGREVISION= 1 CATEGORIES= net MASTER_SITES= http://docs.real.com/docs/proxykit/ diff --git a/net/wmnet/Makefile b/net/wmnet/Makefile index d9324ab1e58..5f820b73eb6 100644 --- a/net/wmnet/Makefile +++ b/net/wmnet/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.5 2001/06/30 09:55:57 wiz Exp $ +# $NetBSD: Makefile,v 1.6 2001/11/29 01:12:44 hubertf Exp $ DISTNAME= wmnet-1.06 -PKGNAME= ${DISTNAME}nb2 +PKGREVISION= 2 CATEGORIES= net x11 MASTER_SITES= http://www.digitalkaos.net/linux/wmnet/download/ -- cgit v1.2.3