When constructing the WRKSRC definition, use ${PKGNAME_NOREV} rather than

${PKGNAME}, so that the WRKSRC definition is immune from any subsequent
PKGREVISION changes. With thanks to jmc for the nudge.

39 files changed, 86 insertions, 86 deletions

diff --git a/archivers/unzip/Makefile b/archivers/unzip/Makefile
index 861d84fd42c..96b0dc4a8bd 100644
--- a/archivers/unzip/Makefile
+++ b/archivers/unzip/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.38 2003/06/02 01:21:43 jschauma Exp $
+# $NetBSD: Makefile,v 1.39 2003/06/18 09:22:14 agc Exp $
 # FreeBSD Id: Makefile,v 1.14 1997/06/19 05:30:04 ache Exp
 #
 
 DISTNAME=	unzip550
 PKGNAME=	unzip-5.50
-WRKSRC=		${WRKDIR}/${PKGNAME}
+WRKSRC=		${WRKDIR}/${PKGNAME_NOREV}
 CATEGORIES=	archivers
 MASTER_SITES=	ftp://ftp.info-zip.org/pub/infozip/src/ \
 		ftp://ftp.icce.rug.nl/infozip/src/ \
diff --git a/audio/bladeenc/Makefile b/audio/bladeenc/Makefile
index 82a1b69a24f..036f52b5690 100644
--- a/audio/bladeenc/Makefile
+++ b/audio/bladeenc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2003/06/02 01:21:41 jschauma Exp $
+# $NetBSD: Makefile,v 1.20 2003/06/18 09:22:15 agc Exp $
 #
 
 DISTNAME=		bladeenc-0.94.2-src-stable
@@ -13,7 +13,7 @@ COMMENT=		Free MPEG Audio Layer 3 encoder (not decoder)
 
 USE_GMAKE=		yes
 
-WRKSRC:=		${WRKDIR}/${PKGNAME}
+WRKSRC:=		${WRKDIR}/${PKGNAME_NOREV}
 
 GNU_CONFIGURE=		yes
 
diff --git a/audio/cd-discid/Makefile b/audio/cd-discid/Makefile
index 2837f237e88..76eeb5724a8 100644
--- a/audio/cd-discid/Makefile
+++ b/audio/cd-discid/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.2 2003/03/29 12:40:05 jmmv Exp $
+# $NetBSD: Makefile,v 1.3 2003/06/18 09:22:15 agc Exp $
 
 DISTNAME=	cd-discid_0.7.orig
 PKGNAME=	cd-discid-0.7
-WRKSRC=		${WRKDIR}/${PKGNAME}
+WRKSRC=		${WRKDIR}/${PKGNAME_NOREV}
 CATEGORIES=	audio
 MASTER_SITES=	http://frantica.lly.org/~rcw/cd-discid/
 
diff --git a/audio/flac/Makefile b/audio/flac/Makefile
index 0bccd1358d3..5acf60587ef 100644
--- a/audio/flac/Makefile
+++ b/audio/flac/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.7 2003/02/14 23:25:32 wiz Exp $
+# $NetBSD: Makefile,v 1.8 2003/06/18 09:22:15 agc Exp $
 #
 
 DISTNAME=		flac-1.1.0
-WRKSRC=			${WRKDIR}/${PKGNAME}
+WRKSRC=			${WRKDIR}/${PKGNAME_NOREV}
 CATEGORIES=		audio archivers
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=flac/}
 
diff --git a/audio/id3/Makefile b/audio/id3/Makefile
index 14a1d4989fc..59d4c2d507d 100644
--- a/audio/id3/Makefile
+++ b/audio/id3/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.3 2003/06/02 01:21:38 jschauma Exp $
+# $NetBSD: Makefile,v 1.4 2003/06/18 09:22:16 agc Exp $
 
 DISTNAME=	id3_0.12.orig
 PKGNAME=	id3-0.12
-WRKSRC=		${WRKDIR}/${PKGNAME}
+WRKSRC=		${WRKDIR}/${PKGNAME_NOREV}
 CATEGORIES=	audio
 MASTER_SITES=	http://frantica.lly.org/~rcw/id3/
 
diff --git a/audio/oggasm/Makefile b/audio/oggasm/Makefile
index a0197a4c41e..7417db036f5 100644
--- a/audio/oggasm/Makefile
+++ b/audio/oggasm/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.3 2003/03/29 12:40:08 jmmv Exp $
+# $NetBSD: Makefile,v 1.4 2003/06/18 09:22:16 agc Exp $
 #
 
 DISTNAME=	oggasm_1.4.0
 PKGNAME=	${DISTNAME:S/_/-/}
-WRKSRC=		${WRKDIR}/${PKGNAME}
+WRKSRC=		${WRKDIR}/${PKGNAME_NOREV}
 CATEGORIES=	audio
 MASTER_SITES=	http://oggasm.sourceforge.net/
 
diff --git a/comms/estic/Makefile b/comms/estic/Makefile
index b8f3ec7f78a..9d8d74dc429 100644
--- a/comms/estic/Makefile
+++ b/comms/estic/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.6 2003/03/29 12:40:19 jmmv Exp $
+# $NetBSD: Makefile,v 1.7 2003/06/18 09:22:16 agc Exp $
 
 DISTNAME=	estic-1.61
-WRKSRC=		${WRKDIR}/${PKGNAME:C/-.*//}
+WRKSRC=		${WRKDIR}/${PKGNAME_NOREV:C/-.*//}
 CATEGORIES=	comms
 MASTER_SITES=	ftp://ftp.gwdg.de/pub/misc/isdn/linux/estic/
 EXTRACT_SUFX=	.zip
diff --git a/comms/minicom/Makefile b/comms/minicom/Makefile
index a24a0d2f8fe..b60481805ab 100644
--- a/comms/minicom/Makefile
+++ b/comms/minicom/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.32 2003/06/14 14:42:15 wiz Exp $
+# $NetBSD: Makefile,v 1.33 2003/06/18 09:22:16 agc Exp $
 # FreeBSD Id: Makefile,v 1.13 1998/01/03 10:58:40 obrien Exp
 #
 
 DISTNAME=	${PKGNAME}.src
 PKGNAME=	minicom-1.83.1
-WRKSRC=		${WRKDIR}/${PKGNAME}/src
+WRKSRC=		${WRKDIR}/${PKGNAME_NOREV}/src
 CATEGORIES=	comms
 MASTER_SITES=	${MASTER_SITE_BACKUP}
 #MASTER_SITES=	${MASTER_SITE_SUNSITE:=apps/serialcomm/dialout/} \
diff --git a/devel/ald/Makefile b/devel/ald/Makefile
index 75aff4b51e9..9bd95dad5b0 100644
--- a/devel/ald/Makefile
+++ b/devel/ald/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.3 2003/06/02 01:20:59 jschauma Exp $
+# $NetBSD: Makefile,v 1.4 2003/06/18 09:22:16 agc Exp $
 #
 
 DISTNAME=	ald-0.0.19d
 PKGNAME=	ald-0.0.19
-WRKSRC=		${WRKDIR}/${PKGNAME}
+WRKSRC=		${WRKDIR}/${PKGNAME_NOREV}
 CATEGORIES=	devel
 MASTER_SITES=	http://ellipse.mcs.drexel.edu/source/
 
diff --git a/devel/c4/Makefile b/devel/c4/Makefile
index dfed3d52b57..1e65e27d2d3 100644
--- a/devel/c4/Makefile
+++ b/devel/c4/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.2 2003/03/29 12:40:30 jmmv Exp $
+# $NetBSD: Makefile,v 1.3 2003/06/18 09:22:17 agc Exp $
 #
 
 DISTNAME=	c4
 PKGNAME=	${DISTNAME}-1.6
-WRKSRC=		${WRKDIR}/${PKGNAME}
+WRKSRC=		${WRKDIR}/${PKGNAME_NOREV}
 CATEGORIES=	devel
 MASTER_SITES=	ftp://ftp.perforce.com/perforce/utils/c4/
 
diff --git a/devel/cdk/Makefile b/devel/cdk/Makefile
index 1fc8d58945e..6f0a1f82db6 100644
--- a/devel/cdk/Makefile
+++ b/devel/cdk/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.18 2003/01/24 13:36:19 wiz Exp $
+# $NetBSD: Makefile,v 1.19 2003/06/18 09:22:17 agc Exp $
 #
 
 DISTNAME=		latestCDK
 PKGNAME=		cdk-4.9.9
-WRKSRC=			${WRKDIR}/${PKGNAME}
+WRKSRC=			${WRKDIR}/${PKGNAME_NOREV}
 CATEGORIES=		devel
 MASTER_SITES=		http://www.vexus.ca/release/
 EXTRACT_SUFX=		.tgz
diff --git a/devel/cfitsio/Makefile b/devel/cfitsio/Makefile
index cdcb2caccdd..dd7f18089a1 100644
--- a/devel/cfitsio/Makefile
+++ b/devel/cfitsio/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.6 2003/03/29 12:40:31 jmmv Exp $
+# $NetBSD: Makefile,v 1.7 2003/06/18 09:22:17 agc Exp $
 
 DISTNAME=	cfitsio2037
 PKGNAME=	cfitsio-2.0.37
-WRKSRC=		${WRKDIR}/${PKGNAME:C/-.*//}
+WRKSRC=		${WRKDIR}/${PKGNAME_NOREV:C/-.*//}
 CATEGORIES=	devel
 MASTER_SITES=	ftp://heasarc.gsfc.nasa.gov/software/fitsio/c/
 
diff --git a/editors/bvi/Makefile b/editors/bvi/Makefile
index 9d54ebc82fb..61011ba64da 100644
--- a/editors/bvi/Makefile
+++ b/editors/bvi/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.11 2002/10/25 17:33:59 wiz Exp $
+# $NetBSD: Makefile,v 1.12 2003/06/18 09:22:17 agc Exp $
 #
 
 DISTNAME=	bvi-1.3.0.src
 PKGNAME=	bvi-1.3.0
-WRKSRC=		${WRKDIR}/${PKGNAME}
+WRKSRC=		${WRKDIR}/${PKGNAME_NOREV}
 CATEGORIES=	editors
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=bvi/}
 
diff --git a/editors/easyedit/Makefile b/editors/easyedit/Makefile
index a4e52a2127d..5f755d0acf1 100644
--- a/editors/easyedit/Makefile
+++ b/editors/easyedit/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.4 2003/06/02 01:20:11 jschauma Exp $
+# $NetBSD: Makefile,v 1.5 2003/06/18 09:22:17 agc Exp $
 #
 
 DISTNAME=	ee-1.4.5a.src
 PKGNAME=	easyedit-1.4.5a
-WRKSRC=		${WRKDIR}/${PKGNAME}
+WRKSRC=		${WRKDIR}/${PKGNAME_NOREV}
 CATEGORIES=	editors
 MASTER_SITES=	http://mahon.cwx.net/sources/
 EXTRACT_SUFX=	.tgz
diff --git a/editors/nedit/Makefile b/editors/nedit/Makefile
index 32d41893cdd..d23d0ca19a3 100644
--- a/editors/nedit/Makefile
+++ b/editors/nedit/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.27 2003/06/02 01:20:07 jschauma Exp $
+# $NetBSD: Makefile,v 1.28 2003/06/18 09:22:18 agc Exp $
 
 VERS=		5.3
 DISTNAME=	nedit-${VERS}-source
 PKGNAME=	nedit-${VERS}
-WRKSRC=		${WRKDIR}/${PKGNAME}
+WRKSRC=		${WRKDIR}/${PKGNAME_NOREV}
 CATEGORIES=	editors
 MASTER_SITES=	http://www.nedit.org/ftp/v${VERS:S/./_/g}/ \
 		http://www.au.nedit.org/ftp/v${VERS:S/./_/g}/ \
diff --git a/emulators/spim/Makefile b/emulators/spim/Makefile
index 578046f8fd4..f6d7aef60cc 100644
--- a/emulators/spim/Makefile
+++ b/emulators/spim/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.14 2003/05/05 17:53:12 grant Exp $
+# $NetBSD: Makefile,v 1.15 2003/06/18 09:22:18 agc Exp $
 # FreeBSD Id: Makefile,v 1.5 1997/10/10 06:53:35 obrien Exp
 #
 
 DISTNAME=		spim
 PKGNAME=		spim-6.5
-WRKSRC=			${WRKDIR}/${PKGNAME}
+WRKSRC=			${WRKDIR}/${PKGNAME_NOREV}
 CATEGORIES=		emulators
 MASTER_SITES=		http://www.cs.wisc.edu/~larus/SPIM/ \
 			ftp://ftp.cs.wisc.edu/pub/spim/
diff --git a/emulators/stella/Makefile b/emulators/stella/Makefile
index 9f3d0102d23..798e58aeb0a 100644
--- a/emulators/stella/Makefile
+++ b/emulators/stella/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.9 2003/06/11 20:50:53 abs Exp $
+# $NetBSD: Makefile,v 1.10 2003/06/18 09:22:18 agc Exp $
 
 DISTNAME=	stella-1.1-src
 PKGNAME=	stella-1.1
-WRKSRC=		${WRKDIR}/${PKGNAME}/src/build
+WRKSRC=		${WRKDIR}/${PKGNAME_NOREV}/src/build
 CATEGORIES=	emulators
 MASTER_SITES=	ftp://ftp.eos.ncsu.edu/pub/bsvc/stella/1.1/
 
diff --git a/emulators/x48/Makefile b/emulators/x48/Makefile
index 05f1b64f834..69bf60fd042 100644
--- a/emulators/x48/Makefile
+++ b/emulators/x48/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.5 2003/06/02 01:19:51 jschauma Exp $
+# $NetBSD: Makefile,v 1.6 2003/06/18 09:22:18 agc Exp $
 #
 
 DISTNAME=	x48_041
 PKGNAME=	x48-0.4.1
-WRKSRC=		${WRKDIR}/${PKGNAME}
+WRKSRC=		${WRKDIR}/${PKGNAME_NOREV}
 CATEGORIES=	emulators
 MASTER_SITES=	http://home.earthlink.net/~rmmlgetz/
 
diff --git a/graphics/giftrans/Makefile b/graphics/giftrans/Makefile
index 02c260e8ba9..5c057e26866 100644
--- a/graphics/giftrans/Makefile
+++ b/graphics/giftrans/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.4 2003/03/29 12:41:16 jmmv Exp $
+# $NetBSD: Makefile,v 1.5 2003/06/18 09:22:18 agc Exp $
 #
 
 DISTNAME=	sgif1122
 PKGNAME=	giftrans-1.12.2
-WRKSRC=		${WRKDIR}/usr/src/${PKGNAME}
+WRKSRC=		${WRKDIR}/usr/src/${PKGNAME_NOREV}
 CATEGORIES=	graphics
 MASTER_SITES=	ftp://ftp.fokus.gmd.de/pub/Linux/woven/html/
 EXTRACT_SUFX=	.tgz
diff --git a/graphics/jpeg/Makefile b/graphics/jpeg/Makefile
index ae9bbe6988e..e4f06ce170e 100644
--- a/graphics/jpeg/Makefile
+++ b/graphics/jpeg/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.21 2003/02/22 12:05:54 skrll Exp $
+# $NetBSD: Makefile,v 1.22 2003/06/18 09:22:19 agc Exp $
 #
 
 DISTNAME=		jpegsrc.v6b
 PKGNAME=		jpeg-6b
-WRKSRC=			${WRKDIR}/${PKGNAME}
+WRKSRC=			${WRKDIR}/${PKGNAME_NOREV}
 CATEGORIES=		graphics
 MASTER_SITES=		ftp://ftp.uu.net/graphics/jpeg/
 
diff --git a/graphics/wmphoto/Makefile b/graphics/wmphoto/Makefile
index 3ec7e973ffe..b01c46b5721 100644
--- a/graphics/wmphoto/Makefile
+++ b/graphics/wmphoto/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.4 2003/06/02 01:19:11 jschauma Exp $
+# $NetBSD: Makefile,v 1.5 2003/06/18 09:22:19 agc Exp $
 #
 
 DISTNAME=	wmphoto-0.3a
-WRKSRC=		${WRKDIR}/${PKGNAME}/wmphoto
+WRKSRC=		${WRKDIR}/${PKGNAME_NOREV}/wmphoto
 CATEGORIES=	graphics
 MASTER_SITES=	http://www.dcc.uchile.cl/~amartoq/wmphoto/
 
diff --git a/lang/nhc98/Makefile b/lang/nhc98/Makefile
index 6042cfd1627..76d473ff157 100644
--- a/lang/nhc98/Makefile
+++ b/lang/nhc98/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.18 2003/03/29 12:41:28 jmmv Exp $
+# $NetBSD: Makefile,v 1.19 2003/06/18 09:22:19 agc Exp $
 
 DISTNAME=		nhc98src-1.16
 PKGNAME=		nhc98-1.16
-WRKSRC=			${WRKDIR}/${PKGNAME}
+WRKSRC=			${WRKDIR}/${PKGNAME_NOREV}
 CATEGORIES=		lang
 MASTER_SITES=		ftp://ftp.cs.york.ac.uk/pub/haskell/nhc98/
 
diff --git a/mail/sigrot/Makefile b/mail/sigrot/Makefile
index e129326787f..fdf94b1e639 100644
--- a/mail/sigrot/Makefile
+++ b/mail/sigrot/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.2 2003/06/05 17:20:26 jmmv Exp $
+# $NetBSD: Makefile,v 1.3 2003/06/18 09:22:19 agc Exp $
 
 DISTNAME=	sigrot_1.2-1
 PKGNAME=	sigrot-1.2
-WRKSRC=		${WRKDIR}/${PKGNAME}
+WRKSRC=		${WRKDIR}/${PKGNAME_NOREV}
 CATEGORIES=	mail
 MASTER_SITES=	${MASTER_SITE_DEBIAN:=pool/main/s/sigrot/}
 
diff --git a/math/otter/Makefile b/math/otter/Makefile
index 79bd660430c..c8a025fff4e 100644
--- a/math/otter/Makefile
+++ b/math/otter/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.7 2003/06/02 01:18:28 jschauma Exp $
+# $NetBSD: Makefile,v 1.8 2003/06/18 09:22:21 agc Exp $
 
 DISTNAME=	otter-3.0.6
-WRKSRC=		${WRKDIR}/${PKGNAME}/source
+WRKSRC=		${WRKDIR}/${PKGNAME_NOREV}/source
 CATEGORIES=	math
 MASTER_SITES=	ftp://info.mcs.anl.gov/pub/Otter/
 
@@ -15,18 +15,18 @@ do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/otter ${PREFIX}/bin
 	${INSTALL_DATA_DIR} ${PREFIX}/share/examples/otter
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/otter
-	cd ${WRKDIR}/${PKGNAME} && ${INSTALL_DATA} Announce Changelog 	\
+	cd ${WRKDIR}/${PKGNAME_NOREV} && ${INSTALL_DATA} Announce Changelog \
 		Copying README* ${PREFIX}/share/doc/otter
 	for d in auto fringe ivy kalman misc program split wos;	do	\
 	${INSTALL_DATA_DIR} ${PREFIX}/share/examples/otter/$$d;		\
-	${INSTALL_DATA} ${WRKDIR}/${PKGNAME}/examples/$$d/*		\
+	${INSTALL_DATA} ${WRKDIR}/${PKGNAME_NOREV}/examples/$$d/*	\
 		${PREFIX}/share/examples/otter/$$d;			\
 	done
-	cd ${WRKDIR}/${PKGNAME}/examples && ${INSTALL_SCRIPT} Run_all 	\
+	cd ${WRKDIR}/${PKGNAME_NOREV}/examples && ${INSTALL_SCRIPT} Run_all \
 		objects	summary ${PREFIX}/share/examples/otter
-	${INSTALL_DATA} ${WRKDIR}/${PKGNAME}/examples/README 		\
+	${INSTALL_DATA} ${WRKDIR}/${PKGNAME_NOREV}/examples/README 	\
 		${PREFIX}/share/examples/otter
-	${INSTALL_DATA} ${WRKDIR}/${PKGNAME}/document/* 		\
+	${INSTALL_DATA} ${WRKDIR}/${PKGNAME_NOREV}/document/* 		\
 		${PREFIX}/share/doc/otter
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/mbone/vat/Makefile b/mbone/vat/Makefile
index 0a40c886315..04fb596d25d 100644
--- a/mbone/vat/Makefile
+++ b/mbone/vat/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.42 2002/10/02 22:57:14 wiz Exp $
+# $NetBSD: Makefile,v 1.43 2003/06/18 09:22:21 agc Exp $
 #
 
 DISTNAME=		vatsrc-4.0b2
 PKGNAME=		${DISTNAME:S/src//}
-WRKSRC=			${WRKDIR}/${PKGNAME}
+WRKSRC=			${WRKDIR}/${PKGNAME_NOREV}
 CATEGORIES=		mbone
 MASTER_SITES=		ftp://ftp.ee.lbl.gov/conferencing/vat/alpha-test/
 
diff --git a/mbone/vic/Makefile b/mbone/vic/Makefile
index f55def52407..00225ae9a11 100644
--- a/mbone/vic/Makefile
+++ b/mbone/vic/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.21 2002/10/02 22:53:08 wiz Exp $
+# $NetBSD: Makefile,v 1.22 2003/06/18 09:22:23 agc Exp $
 # FreeBSD Id: Makefile,v 1.12 1997/09/11 03:54:53 fenner Exp
 #
 
 DISTNAME=	vicsrc-2.8
 PKGNAME=	${DISTNAME:S/src//}
-WRKSRC=		${WRKDIR}/${PKGNAME}
+WRKSRC=		${WRKDIR}/${PKGNAME_NOREV}
 CATEGORIES=	mbone tk
 MASTER_SITES=	ftp://ftp.ee.lbl.gov/conferencing/vic/
 
diff --git a/misc/colorize/Makefile b/misc/colorize/Makefile
index 1d426a4847e..429e3589ff3 100644
--- a/misc/colorize/Makefile
+++ b/misc/colorize/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.5 2003/03/29 12:41:48 jmmv Exp $
+# $NetBSD: Makefile,v 1.6 2003/06/18 09:22:23 agc Exp $
 #
 
 DISTNAME=	colorize_0.3.0
 PKGNAME=	colorize-0.3.0
-WRKSRC=		${WRKDIR}/${PKGNAME}
+WRKSRC=		${WRKDIR}/${PKGNAME_NOREV}
 CATEGORIES=	misc
 MASTER_SITES=	http://nrg.martos.bme.hu/release/colorize/download/bz2/
 EXTRACT_SUFX=	.tar.bz2
diff --git a/misc/jitterbug/Makefile b/misc/jitterbug/Makefile
index 2096551a980..6b93c036f9c 100644
--- a/misc/jitterbug/Makefile
+++ b/misc/jitterbug/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.20 2001/12/05 15:00:47 agc Exp $
+# $NetBSD: Makefile,v 1.21 2003/06/18 09:22:23 agc Exp $
 
 DISTNAME=	jitterbug-1.6.2
-WRKSRC=		${WRKDIR}/${PKGNAME}/source
+WRKSRC=		${WRKDIR}/${PKGNAME_NOREV}/source
 CATEGORIES=	misc
 MASTER_SITES=	ftp://jitterbug.samba.org/pub/jitterbug/
 
@@ -21,8 +21,8 @@ ADDGROUP=		${LOCALBASE}/sbin/groupadd
 PLIST_SRC=	${WRKDIR}/PLIST-src
 INSTALL_FILE=	${WRKDIR}/INSTALL
 DEINSTALL_FILE=	${WRKDIR}/DEINSTALL
-CONFIGDIR=	${WRKDIR}/${PKGNAME}/config
-DOCSDIR=	${WRKDIR}/${PKGNAME}/docs
+CONFIGDIR=	${WRKDIR}/${PKGNAME_NOREV}/config
+DOCSDIR=	${WRKDIR}/${PKGNAME_NOREV}/docs
 CGIBINDIR=	libexec/cgi-bin
 
 .include "../../mk/bsd.prefs.mk"
diff --git a/net/iperf/Makefile b/net/iperf/Makefile
index c1b0de71102..a1cfa81e491 100644
--- a/net/iperf/Makefile
+++ b/net/iperf/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.3 2003/06/02 01:17:57 jschauma Exp $
+# $NetBSD: Makefile,v 1.4 2003/06/18 09:22:24 agc Exp $
 #
 
 DISTNAME=	iperf-1.6.5-source
 PKGNAME=	${DISTNAME:C/-source//}
-WRKSRC=		${WRKDIR}/${PKGNAME}
+WRKSRC=		${WRKDIR}/${PKGNAME_NOREV}
 CATEGORIES=	net
 MASTER_SITES=	http://dast.nlanr.net/Projects/Iperf/
 
diff --git a/net/unison/Makefile b/net/unison/Makefile
index 908c7ae1ef5..238ad78abee 100644
--- a/net/unison/Makefile
+++ b/net/unison/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.12 2003/06/02 01:17:39 jschauma Exp $
+# $NetBSD: Makefile,v 1.13 2003/06/18 09:22:24 agc Exp $
 #
 
 DISTNAME=	src
 PKGNAME=	unison-2.9.1
-WRKSRC=		${WRKDIR}/${PKGNAME}
+WRKSRC=		${WRKDIR}/${PKGNAME_NOREV}
 CATEGORIES=	net
 MASTER_SITES=	http://www.cis.upenn.edu/~bcpierce/unison/download/stable/latest/
 
@@ -14,7 +14,7 @@ COMMENT=	file-synchronization tool
 BUILD_DEPENDS=	ocaml>=3.00:../../lang/ocaml
 BUILD_DEPENDS+=	bash>=2.05:../../shells/bash2
 
-DIST_SUBDIR=	${PKGNAME}
+DIST_SUBDIR=	${PKGNAME_NOREV}
 
 # docs: unison-manual.pdf/html/ps/dvi
 USE_GMAKE=	yes
diff --git a/sysutils/cdrdao/Makefile b/sysutils/cdrdao/Makefile
index 593684bd241..175e5793208 100644
--- a/sysutils/cdrdao/Makefile
+++ b/sysutils/cdrdao/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.10 2002/11/10 00:35:08 grant Exp $
+# $NetBSD: Makefile,v 1.11 2003/06/18 09:22:24 agc Exp $
 #
 
 DISTNAME=		${PKGNAME}.src
 PKGNAME=		cdrdao-1.1.7
-WRKSRC=			${WRKDIR}/${PKGNAME}
+WRKSRC=			${WRKDIR}/${PKGNAME_NOREV}
 CATEGORIES=		sysutils
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=cdrdao/}
 
diff --git a/sysutils/extipl/Makefile b/sysutils/extipl/Makefile
index 4524f32aeac..c00534d8c9b 100644
--- a/sysutils/extipl/Makefile
+++ b/sysutils/extipl/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.4 2003/03/29 12:42:27 jmmv Exp $
+# $NetBSD: Makefile,v 1.5 2003/06/18 09:22:24 agc Exp $
 #
 
 DISTNAME=	extipl-5.04
-WRKSRC=		${WRKDIR}/${PKGNAME}/src
+WRKSRC=		${WRKDIR}/${PKGNAME_NOREV}/src
 CATEGORIES=	sysutils
 MASTER_SITES=	http://www.tsden.org/takamiti/extipl/archs/
 
diff --git a/sysutils/lavaps/Makefile b/sysutils/lavaps/Makefile
index 590a2f273de..43f21ab5387 100644
--- a/sysutils/lavaps/Makefile
+++ b/sysutils/lavaps/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.13 2003/03/29 12:42:28 jmmv Exp $
+# $NetBSD: Makefile,v 1.14 2003/06/18 09:22:25 agc Exp $
 #
 
 DISTNAME=	lavaps-1.20
 PKGNAME=	lavaps-1.20
-WRKSRC=		${WRKDIR}/${PKGNAME}
+WRKSRC=		${WRKDIR}/${PKGNAME_NOREV}
 CATEGORIES=	sysutils x11
 MASTER_SITES=	http://www.isi.edu/~johnh/SOFTWARE/LAVAPS/
 
diff --git a/textproc/makeztxt/Makefile b/textproc/makeztxt/Makefile
index 94d6dd9d06c..9f04617bc61 100644
--- a/textproc/makeztxt/Makefile
+++ b/textproc/makeztxt/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.6 2001/03/05 20:16:05 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2003/06/18 09:22:25 agc Exp $
 #
 
 DISTNAME=	${PKGNAME}b-src
 PKGNAME=	makeztxt-1.40
-WRKSRC=		${WRKDIR}/${PKGNAME}b
+WRKSRC=		${WRKDIR}/${PKGNAME_NOREV}b
 CATEGORIES=	textproc converters
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=gutenpalm/}
 
diff --git a/textproc/rman/Makefile b/textproc/rman/Makefile
index 7c8a56797ab..90593f24ac4 100644
--- a/textproc/rman/Makefile
+++ b/textproc/rman/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.21 2003/06/02 01:16:26 jschauma Exp $
+# $NetBSD: Makefile,v 1.22 2003/06/18 09:22:26 agc Exp $
 # FreeBSD Id: Makefile,v 1.17 1997/12/08 15:45:27 tg Exp
 #
 
 DISTNAME=	rman
 PKGNAME=	rman-3.0.9
-WRKSRC=		${WRKDIR}/${PKGNAME}
+WRKSRC=		${WRKDIR}/${PKGNAME_NOREV}
 CATEGORIES=	textproc
 MASTER_SITES=	ftp://polyglot.sourceforge.net/pub/polyglotman/ \
 		http://polyglotman.sourceforge.net/
diff --git a/wm/oroborus/Makefile b/wm/oroborus/Makefile
index 7052cf0ee0f..5664c014b78 100644
--- a/wm/oroborus/Makefile
+++ b/wm/oroborus/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.4 2003/05/27 18:18:48 salo Exp $
+# $NetBSD: Makefile,v 1.5 2003/06/18 09:22:26 agc Exp $
 #
 
 DISTNAME=	oroborus_2.0.12-1
 PKGNAME=	${DISTNAME:S/_/-/:C/-.$//}
-WRKSRC=         ${WRKDIR}/${PKGNAME}
+WRKSRC=         ${WRKDIR}/${PKGNAME_NOREV}
 CATEGORIES=	wm x11
 MASTER_SITES=	http://www.oroborus.org/debian/dists/sid/main/source/x11/
 
diff --git a/www/asWedit/Makefile b/www/asWedit/Makefile
index 499f99322c6..b8833e57e8b 100644
--- a/www/asWedit/Makefile
+++ b/www/asWedit/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.10 2003/06/02 01:16:07 jschauma Exp $
+# $NetBSD: Makefile,v 1.11 2003/06/18 09:22:27 agc Exp $
 
 DISTNAME=		${PKGNAME}-i386.linux
 PKGNAME=		asWedit-4.0.1
-WRKSRC=			${WRKDIR}/${PKGNAME}
+WRKSRC=			${WRKDIR}/${PKGNAME_NOREV}
 CATEGORIES=		www
 MASTER_SITES=		http://www.advasoft.com/asWedit/ \
 			http://gd.tuwien.ac.at/infosys/editors/asWedit/ \
diff --git a/www/cocoon/Makefile b/www/cocoon/Makefile
index b627b83cea5..e32a636c7ba 100644
--- a/www/cocoon/Makefile
+++ b/www/cocoon/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.20 2003/04/10 01:28:28 grant Exp $
+# $NetBSD: Makefile,v 1.21 2003/06/18 09:22:27 agc Exp $
 
 DISTNAME=	Cocoon-1.8.2
 PKGNAME=	cocoon-1.8.2
-WRKSRC=		${WRKDIR}/${PKGNAME}
+WRKSRC=		${WRKDIR}/${PKGNAME_NOREV}
 CATEGORIES=	www
 MASTER_SITES=	http://xml.apache.org/dist/cocoon/cocoon1/
 
diff --git a/x11/tkman/Makefile b/x11/tkman/Makefile
index dfc551a257f..0a9fad21499 100644
--- a/x11/tkman/Makefile
+++ b/x11/tkman/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.32 2003/06/02 01:15:37 jschauma Exp $
+# $NetBSD: Makefile,v 1.33 2003/06/18 09:22:27 agc Exp $
 # FreeBSD Id: Makefile,v 1.28 1997/12/08 15:51:20 tg Exp
 #
 
 DISTNAME=		tkman
 PKGNAME=		tkman-2.1
-WRKSRC=			${WRKDIR}/${PKGNAME}
+WRKSRC=			${WRKDIR}/${PKGNAME_NOREV}
 CATEGORIES=		x11
 MASTER_SITES=		ftp://tkman.sourceforge.net/pub/tkman/ \
 			http://tkman.sourceforge.net/