Place WRKSRC where it belongs, to make pkglint happy; ok'ed by wiz.

8 files changed, 16 insertions, 20 deletions

diff --git a/wm/9wm/Makefile b/wm/9wm/Makefile
index cc81eef2454..a3da7de5281 100644
--- a/wm/9wm/Makefile
+++ b/wm/9wm/Makefile
@@ -1,9 +1,10 @@
-# $NetBSD: Makefile,v 1.6 2003/03/03 03:32:31 jschauma Exp $
+# $NetBSD: Makefile,v 1.7 2003/03/29 12:42:45 jmmv Exp $
 # FreeBSD Id: Makefile,v 1.4 1997/05/28 06:18:20 fenner Exp
 #
 
 DISTNAME=		9wm-1.1
 PKGREVISION=		1
+WRKSRC=			${WRKDIR}
 CATEGORIES=		plan9 wm
 MASTER_SITES=		ftp://ftp.freefriends.org/arnold/Source/
 EXTRACT_SUFX=		.shar.gz
@@ -12,7 +13,6 @@ MAINTAINER=		packages@netbsd.org
 HOMEPAGE=		http://dhog.g7.org/dhog/9wm.html
 COMMENT=		8 1/2-like Window Manager for X
 
-WRKSRC=			${WRKDIR}
 USE_IMAKE=		yes
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/wm/evilwm/Makefile b/wm/evilwm/Makefile
index dd2af7889f2..95ec16c6516 100644
--- a/wm/evilwm/Makefile
+++ b/wm/evilwm/Makefile
@@ -1,9 +1,10 @@
-# $NetBSD: Makefile,v 1.4 2003/01/30 14:27:47 salo Exp $
+# $NetBSD: Makefile,v 1.5 2003/03/29 12:42:45 jmmv Exp $
 #
 
 DISTNAME=	evilwm_0.99.14.orig
 PKGNAME=	evilwm-0.99.14
 PKGREVISION=	1
+WRKSRC=		${WRKDIR}/${DISTNAME:S/_/-/}
 CATEGORIES=	wm x11
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=evilwm/}
 
@@ -11,8 +12,6 @@ MAINTAINER=	sketch@rd.bbc.co.uk
 HOMEPAGE=	http://evilwm.sourceforge.net/
 COMMENT=	Minimalist Window Manager for X
 
-WRKSRC=		${WRKDIR}/${DISTNAME:S/_/-/}
-
 USE_GMAKE=	YES
 USE_X11=	YES
 
diff --git a/wm/icepref/Makefile b/wm/icepref/Makefile
index edfcaf5cfe7..9c5b9a08a8a 100644
--- a/wm/icepref/Makefile
+++ b/wm/icepref/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.3 2002/11/23 23:23:52 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2003/03/29 12:42:46 jmmv Exp $
 #
 
 DISTNAME=	icepref-1.1
 PKGREVISION=	1
+WRKSRC=		${WRKDIR}/icepref
 CATEGORIES=	wm
 MASTER_SITES=	ftp://ftp.freebsd.org/pub/FreeBSD/distfiles/
 
@@ -11,8 +12,6 @@ MAINTAINER=	ptiJo@noos.fr
 #HOMEPAGE=	http://members.xoom.com/SaintChoj/icepref.html
 COMMENT=	graphical configuration utility for IceWM
 
-WRKSRC=		${WRKDIR}/icepref
-
 USE_BUILDLINK2=	yes
 
 PYTHON_PATCH_SCRIPTS=	icepref
diff --git a/wm/icewmconf/Makefile b/wm/icewmconf/Makefile
index 9102acd3266..a1a69653b07 100644
--- a/wm/icewmconf/Makefile
+++ b/wm/icewmconf/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.2 2002/10/25 09:24:03 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2003/03/29 12:42:46 jmmv Exp $
 
 DISTNAME=	icewmconf-2.1.0
+WRKSRC=		${WRKDIR}
 CATEGORIES=	wm
 MASTER_SITES=	http://sdboyd.dyndns.org/icewmconf/
 
@@ -9,7 +10,6 @@ HOMEPAGE=	http://sdboyd.dyndns.org/icewmconf/
 COMMENT=	Graphical configuration tool for IceWM
 
 USE_BUILDLINK2=	# defined
-WRKSRC=		${WRKDIR}
 FILENAME=	${WRKDIR}/${DISTNAME:C/-.*//}
 NO_BUILD=	# defined
 
diff --git a/wm/olvwm/Makefile b/wm/olvwm/Makefile
index 336d5c5c7c5..539b2fe20f8 100644
--- a/wm/olvwm/Makefile
+++ b/wm/olvwm/Makefile
@@ -1,9 +1,10 @@
-# $NetBSD: Makefile,v 1.6 2003/03/03 03:32:34 jschauma Exp $
+# $NetBSD: Makefile,v 1.7 2003/03/29 12:42:46 jmmv Exp $
 #
 
 DISTNAME=	olvwm4.src4
 PKGNAME=	olvwm-4.4
 PKGREVISION=	1
+WRKSRC=		${WRKDIR}
 CATEGORIES=	x11 wm
 MASTER_SITES=	http://www.akula.com/~jadler/sdo/olvwm/
 
@@ -17,8 +18,6 @@ USE_BUILDLINK2=	# defined
 USE_IMAKE=	# defined
 USE_X11BASE=	# defined
 
-WRKSRC=		${WRKDIR}
-
 .include "../../graphics/xpm/buildlink2.mk"
 .include "../../x11/xview-lib/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/wm/oroborus/Makefile b/wm/oroborus/Makefile
index 65f95ad136e..19171d46d59 100644
--- a/wm/oroborus/Makefile
+++ b/wm/oroborus/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.1.1.1 2003/02/15 07:00:24 salo Exp $
+# $NetBSD: Makefile,v 1.2 2003/03/29 12:42:46 jmmv Exp $
 #
 
 DISTNAME=	oroborus_2.0.11-1
 PKGNAME=	oroborus-2.0.11
+WRKSRC=         ${WRKDIR}/oroborus
 CATEGORIES=	wm
 MASTER_SITES=	http://www.oroborus.org/debian/dists/sid/main/source/x11/
 
@@ -15,6 +16,4 @@ GNU_CONFIGURE=	YES
 USE_XPM=	YES
 USE_X11=	YES
 
-WRKSRC=         ${WRKDIR}/oroborus
-
 .include "../../mk/bsd.pkg.mk"
diff --git a/wm/uwm/Makefile b/wm/uwm/Makefile
index 34e699d71b8..83689d4216a 100644
--- a/wm/uwm/Makefile
+++ b/wm/uwm/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.4 2003/03/03 03:32:36 jschauma Exp $
+# $NetBSD: Makefile,v 1.5 2003/03/29 12:42:46 jmmv Exp $
 
 DISTNAME=	X.V11R3uwm
 PKGNAME=	uwm-19881027
 PKGREVISION=	1
+WRKSRC=		${WRKDIR}/X.V11R3/clients/uwm
 CATEGORIES=	x11 wm
 MASTER_SITES=	${MASTER_SITE_LOCAL}
 
@@ -10,7 +11,6 @@ MAINTAINER=	packages@netbsd.org
 #HOMEPAGE=	http://www.x.org/
 COMMENT=	X11R3 window manager
 
-WRKSRC=		${WRKDIR}/X.V11R3/clients/uwm
 USE_IMAKE=	yes
 
 post-patch:
diff --git a/wm/wmthemes/Makefile b/wm/wmthemes/Makefile
index eb509fe1d86..ad0b552d852 100644
--- a/wm/wmthemes/Makefile
+++ b/wm/wmthemes/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2002/03/14 20:22:37 fredb Exp $
+# $NetBSD: Makefile,v 1.12 2003/03/29 12:42:46 jmmv Exp $
 
 #
 # There is no distinfo file since the files change contents so often on the
@@ -7,6 +7,7 @@
 
 DISTNAME=	wmthemes-0.62
 PKGREVISION=	2
+WRKSRC=		${WRKDIR}
 CATEGORIES=	x11 wm
 MASTER_SITES=	http://download.themes.org/wm/
 DISTFILES=	${THEME_FILES}
@@ -22,7 +23,6 @@ DIST_SUBDIR=	wmthemes
 USE_X11BASE=	yes
 NO_BUILD=	yes
 NO_CHECKSUM=	yes
-WRKSRC=		${WRKDIR}
 
 PLIST_SRC=	${WRKDIR}/PLIST
 THEME_SUBDIRS=	Backgrounds IconSets Icons Pixmaps Sounds Styles Themes