Don't use PKGNAME when setting WRKSRC; use PKGNAME_NOREV instead.

NetBSD · Mar 30, 2004 · a4fbec9 · a4fbec9
1 parent 431a328
commit a4fbec9
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 10 deletions.
diff --git a/audio/libmikmod/Makefile b/audio/libmikmod/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.29 2004/03/23 04:41:00 jlam Exp $
+# $NetBSD: Makefile,v 1.30 2004/03/30 18:32:32 jlam Exp $
 
 DISTNAME=		libmikmod_3.1.10
 PKGNAME=		libmikmod-3.1.10
@@ -16,7 +16,7 @@ USE_BUILDLINK3=		yes
 USE_MAKEINFO=		yes
 INFO_FILES=		mikmod.info
 
-WRKSRC=			${WRKDIR}/${PKGNAME}
+WRKSRC=			${WRKDIR}/${PKGNAME_NOREV}
 CONFIGURE_ARGS+=	--disable-threads
 
 .include "../../mk/bsd.prefs.mk"

diff --git a/devel/apache-ant/Makefile b/devel/apache-ant/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2004/03/29 17:28:33 tv Exp $
+# $NetBSD: Makefile,v 1.8 2004/03/30 18:32:33 jlam Exp $
 #
 # NOTE: if you are depending on ant from another package, please be aware that
 # the ant team has CHANGED the version numbering scheme.  A previous version
@@ -21,7 +21,7 @@ DEPENDS+=	crimson>=1.1.3:../../textproc/crimson
 # Up to version 1.5.1 inclusive this was known as "jakarta-ant".
 CONFLICTS=	jakarta-ant*
 
-WRKSRC=		${WRKDIR}/${PKGNAME}
+WRKSRC=		${WRKDIR}/${PKGNAME_NOREV}
 USE_BUILDLINK2=	# defined
 
 EXTRACT_CMD_OPTS.zip=	-Caq

diff --git a/security/chkrootkit/Makefile b/security/chkrootkit/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2004/02/17 15:33:52 minskim Exp $
+# $NetBSD: Makefile,v 1.2 2004/03/30 18:32:33 jlam Exp $
 #
 
 DISTNAME=		chkrootkit
@@ -12,7 +12,7 @@ COMMENT=		Locally checks for signs of a rootkit
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
-WRKSRC=			${WRKDIR}/${PKGNAME}
+WRKSRC=			${WRKDIR}/${PKGNAME_NOREV}
 DIST_SUBDIR=		${PKGNAME}
 USE_GNU_TOOLS+=		make
 USE_BUILDLINK3=		yes

diff --git a/textproc/crimson/Makefile b/textproc/crimson/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2004/01/20 12:26:49 agc Exp $
+# $NetBSD: Makefile,v 1.15 2004/03/30 18:32:33 jlam Exp $
 #
 # We use the binary distribution of crimson because otherwise we
 # have a bootstrap-loop between apache-ant and crimson, each of which
@@ -13,7 +13,7 @@ MAINTAINER=	[email protected]
 HOMEPAGE=	http://xml.apache.org/crimson/
 COMMENT=	Apache.org implementation of JAXP, SAX, and DOM
 
-WRKSRC=		${WRKDIR}/${PKGNAME}
+WRKSRC=		${WRKDIR}/${PKGNAME_NOREV}
 USE_JAVA=	run
 USE_BUILDLINK2=	# defined
 NO_CONFIGURE=	# defined

diff --git a/www/ap2-auth-mysql/Makefile b/www/ap2-auth-mysql/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2004/03/26 02:27:56 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2004/03/30 18:32:33 jlam Exp $
 #
 
 DISTNAME=		mod_auth_mysql.c
@@ -17,7 +17,7 @@ CONFLICTS+=		ap-auth-mysql-*
 DIST_SUBDIR=		ap2-auth-mysql
 EXTRACT_ONLY=		${DISTNAME}.gz
 
-WRKSRC=			${WRKDIR}/${PKGNAME}
+WRKSRC=			${WRKDIR}/${PKGNAME_NOREV}
 USE_BUILDLINK2=		yes
 NO_CONFIGURE=		yes