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

93 files changed, 186 insertions, 245 deletions

diff --git a/x11/9term/Makefile b/x11/9term/Makefile
index 90d27937868..e27428c2169 100644
--- a/x11/9term/Makefile
+++ b/x11/9term/Makefile
@@ -1,9 +1,10 @@
-# $NetBSD: Makefile,v 1.10 2002/08/25 21:52:26 jlam Exp $
+# $NetBSD: Makefile,v 1.11 2003/03/29 12:42:57 jmmv Exp $
 # FreeBSD Id: Makefile,v 1.5 1996/12/07 23:43:56 asami Exp
 #
 
 DISTNAME=		9term.1.6.3
 PKGNAME=		9term-1.6.3
+WRKSRC=			${WRKDIR}
 CATEGORIES=		plan9 x11
 MASTER_SITES=		ftp://ftp.ecf.toronto.edu/pub/plan9/matty/
 
@@ -19,7 +20,6 @@ USE_BUILDLINK2=		yes
 USE_X11=		yes
 
 MANCOMPRESSED=		yes
-WRKSRC=			${WRKDIR}
 MAKE_ENV+=		SAM_DIR=${BUILDLINK_PREFIX.sam}
 
 .include "../../editors/sam/buildlink2.mk"
diff --git a/x11/XF86Setup/Makefile b/x11/XF86Setup/Makefile
index 34e21fc6df8..bf1c18bd93d 100644
--- a/x11/XF86Setup/Makefile
+++ b/x11/XF86Setup/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.25 2003/03/03 04:17:46 jschauma Exp $
+# $NetBSD: Makefile,v 1.26 2003/03/29 12:42:57 jmmv Exp $
 
 DISTNAME=		XF86Setup-3.3.6
 PKGREVISION=		1
+WRKSRC=			${WRKDIR}/hw/xfree86/XF86Setup
 CATEGORIES=		x11
 MASTER_SITES=		${MASTER_SITE_LOCAL}
 EXTRACT_SUFX=		.tar.bz2
@@ -20,7 +21,6 @@ TKLIB=			${LOCALBASE}/lib/libtk83.a
 
 NO_SRC_ON_FTP=		Already in MASTER_SITE_LOCAL
 
-WRKSRC=			${WRKDIR}/hw/xfree86/XF86Setup
 USE_IMAKE=		yes
 
 .if !defined(X11_RELEASE) && !defined(CHECK_X11)
diff --git a/x11/Xaw3d/Makefile b/x11/Xaw3d/Makefile
index 9c19683e245..cf21a789dd1 100644
--- a/x11/Xaw3d/Makefile
+++ b/x11/Xaw3d/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.30 2002/11/14 10:04:46 jlam Exp $
+# $NetBSD: Makefile,v 1.31 2003/03/29 12:42:57 jmmv Exp $
 #
 
 DISTNAME=	Xaw3d-1.5
+WRKSRC=		${WRKDIR}/xc/lib/Xaw3d
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_XCONTRIB:=widgets/Xaw3d/R6.3/}
 
@@ -11,7 +12,6 @@ COMMENT=	3-D widgets based on the Athena Widget set
 CONFLICTS=	Xaw-Xpm-[0-9]*
 
 USE_IMAKE=	YES
-WRKSRC=		${WRKDIR}/xc/lib/Xaw3d
 PLIST_SRC=	${WRKDIR}/PLIST-src
 
 .include "../../mk/bsd.prefs.mk"
diff --git a/x11/Xrender/Makefile b/x11/Xrender/Makefile
index c2feb36fc47..6a45a4ef894 100644
--- a/x11/Xrender/Makefile
+++ b/x11/Xrender/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.2 2003/01/14 09:26:34 jlam Exp $
+# $NetBSD: Makefile,v 1.3 2003/03/29 12:42:58 jmmv Exp $
 
 DISTNAME=	fcpackage.2_1
 PKGNAME=	Xrender-${XRENDER_VERSION}
+WRKSRC=		${WRKDIR}/${DISTNAME}/Xrender
 CATEGORIES=	x11
 MASTER_SITES=	http://fontconfig.org/release/
 
@@ -14,7 +15,6 @@ XRENDER_VERSION=	0.7
 
 USE_BUILDLINK2=		YES
 USE_IMAKE=		YES
-WRKSRC=			${WRKDIR}/${DISTNAME}/Xrender
 EXTRACT_ELEMENTS=	${DISTNAME}/Xrender
 
 .include "../../mk/bsd.prefs.mk"
diff --git a/x11/asnap/Makefile b/x11/asnap/Makefile
index 0afc2ee84a8..e5f750b3378 100644
--- a/x11/asnap/Makefile
+++ b/x11/asnap/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.1.1.1 2002/08/07 13:45:25 he Exp $
+# $NetBSD: Makefile,v 1.2 2003/03/29 12:42:58 jmmv Exp $
 
 DISTNAME=		asnap
 PKGNAME=		${DISTNAME}-1.0
+WRKSRC=			${WRKDIR}
 CATEGORIES=		x11
 MASTER_SITES=		${MASTER_SITE_XCONTRIB:S/contrib/R5contrib/}
 
@@ -9,6 +10,5 @@ MAINTAINER=		he@netbsd.org
 COMMENT=		Takes a snapshot of a region of the screen
 
 USE_IMAKE=		yes
-WRKSRC=			${WRKDIR}
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/blt/Makefile b/x11/blt/Makefile
index 67323196223..2b502f1de27 100644
--- a/x11/blt/Makefile
+++ b/x11/blt/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.6 2002/09/23 22:39:22 jlam Exp $
+# $NetBSD: Makefile,v 1.7 2003/03/29 12:42:58 jmmv Exp $
 #
 
 DISTNAME=	BLT2.4o
 PKGNAME=	blt-2.4o
+WRKSRC=		${WRKDIR}/blt2.4o
 CATEGORIES=	x11
 MASTER_SITES=	ftp://ftp.tcltk.com/aa004735/pub/blt/
 
@@ -17,8 +18,6 @@ CONFIGURE_ARGS+=	--with-tcl=${BUILDLINK_PREFIX.tcl}/lib
 CONFIGURE_ARGS+=	--with-tk=${BUILDLINK_PREFIX.tk}/lib
 CONFIGURE_ENV+=		X11BASE=${X11BASE}
 
-WRKSRC=		${WRKDIR}/blt2.4o
-
 .include "../../lang/tcl/buildlink2.mk"
 .include "../../x11/tk/buildlink2.mk"
 
diff --git a/x11/dfm/Makefile.common b/x11/dfm/Makefile.common
index 38ceb908585..25848b33760 100644
--- a/x11/dfm/Makefile.common
+++ b/x11/dfm/Makefile.common
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile.common,v 1.4 2002/08/25 21:52:32 jlam Exp $
+# $NetBSD: Makefile.common,v 1.5 2003/03/29 12:42:58 jmmv Exp $
 #
 
 DISTNAME=	dfm-0.99.9
 PKGREVISION=	1
+WRKSRC=		${WRKDIR}/dfm
 MASTER_SITES=	http://www.kaisersite.de/dfm/
 
-WRKSRC=		${WRKDIR}/dfm
 USE_BUILDLINK2=	yes
 USE_X11=	yes
 GNU_CONFIGURE=	yes
diff --git a/x11/egtk/Makefile b/x11/egtk/Makefile
index 783e48998ba..0d506f4128c 100644
--- a/x11/egtk/Makefile
+++ b/x11/egtk/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.8 2001/09/27 23:18:59 jlam Exp $
+# $NetBSD: Makefile,v 1.9 2003/03/29 12:42:58 jmmv Exp $
 #
 
 DISTNAME=	eGTK_0.3.4
 PKGNAME=	egtk-0.3.4
+WRKSRC=		${WRKDIR}/eGTK
 CATEGORIES=	x11
 MASTER_SITES=	http://www.netlabs.net/hp/richieb/downloads/
 
@@ -15,8 +16,6 @@ DEPENDS+=	smalleiffel-[0-9]*:../../lang/smalleiffel
 
 USE_X11=	yes
 
-WRKSRC=		${WRKDIR}/eGTK
-
 post-extract:
 	${FIND} ${WRKSRC} -type d -name "CVS" -print | ${XARGS} ${RM} -rf
 	${FIND} ${WRKSRC} -type d -name "ise" -print | ${XARGS} ${RM} -rf
diff --git a/x11/kde3-i18n-af/Makefile b/x11/kde3-i18n-af/Makefile
index 334e4e16025..2b00f7b59d8 100644
--- a/x11/kde3-i18n-af/Makefile
+++ b/x11/kde3-i18n-af/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.1.1.1 2003/03/12 10:46:21 markd Exp $
+# $NetBSD: Makefile,v 1.2 2003/03/29 12:42:59 jmmv Exp $
 
 DISTNAME=	kde-i18n-af-${_KDE_VERSION}
+WRKSRC=		${WRKDIR}/kde-i18n-af
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITES_KDE:=kde-i18n/}
 
@@ -10,8 +11,6 @@ COMMENT=	Language bindings for the KDE desktop
 
 USE_BUILDLINK2=		YES
 
-WRKSRC=		${WRKDIR}/kde-i18n-af
-
 .include "../../x11/kde3/buildlink2.mk"
 .include "../../x11/kdebase3/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/kde3-i18n-ar/Makefile b/x11/kde3-i18n-ar/Makefile
index 636476ab9d3..ab03dd62883 100644
--- a/x11/kde3-i18n-ar/Makefile
+++ b/x11/kde3-i18n-ar/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.1.1.1 2003/03/12 10:51:25 markd Exp $
+# $NetBSD: Makefile,v 1.2 2003/03/29 12:42:59 jmmv Exp $
 
 DISTNAME=	kde-i18n-ar-${_KDE_VERSION}
+WRKSRC=		${WRKDIR}/kde-i18n-ar
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITES_KDE:=kde-i18n/}
 
@@ -10,8 +11,6 @@ COMMENT=	Language bindings for the KDE desktop
 
 USE_BUILDLINK2=		YES
 
-WRKSRC=		${WRKDIR}/kde-i18n-ar
-
 .include "../../x11/kde3/buildlink2.mk"
 .include "../../x11/kdebase3/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/kde3-i18n-bg/Makefile b/x11/kde3-i18n-bg/Makefile
index 4c0b7c6261e..a3a326fa70c 100644
--- a/x11/kde3-i18n-bg/Makefile
+++ b/x11/kde3-i18n-bg/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.1.1.1 2003/03/12 10:52:19 markd Exp $
+# $NetBSD: Makefile,v 1.2 2003/03/29 12:42:59 jmmv Exp $
 
 DISTNAME=	kde-i18n-bg-${_KDE_VERSION}
+WRKSRC=		${WRKDIR}/kde-i18n-bg
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITES_KDE:=kde-i18n/}
 
@@ -10,8 +11,6 @@ COMMENT=	Language bindings for the KDE desktop
 
 USE_BUILDLINK2=		YES
 
-WRKSRC=		${WRKDIR}/kde-i18n-bg
-
 .include "../../x11/kde3/buildlink2.mk"
 .include "../../x11/kdebase3/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/kde3-i18n-bs/Makefile b/x11/kde3-i18n-bs/Makefile
index fdb8d337ab1..9b875c9ec7e 100644
--- a/x11/kde3-i18n-bs/Makefile
+++ b/x11/kde3-i18n-bs/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.1.1.1 2003/03/12 10:53:16 markd Exp $
+# $NetBSD: Makefile,v 1.2 2003/03/29 12:42:59 jmmv Exp $
 
 DISTNAME=	kde-i18n-bs-${_KDE_VERSION}
+WRKSRC=		${WRKDIR}/kde-i18n-bs
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITES_KDE:=kde-i18n/}
 
@@ -10,8 +11,6 @@ COMMENT=	Language bindings for the KDE desktop
 
 USE_BUILDLINK2=		YES
 
-WRKSRC=		${WRKDIR}/kde-i18n-bs
-
 .include "../../x11/kde3/buildlink2.mk"
 .include "../../x11/kdebase3/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/kde3-i18n-ca/Makefile b/x11/kde3-i18n-ca/Makefile
index 453ee55364a..2a6bd53053b 100644
--- a/x11/kde3-i18n-ca/Makefile
+++ b/x11/kde3-i18n-ca/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.1.1.1 2003/03/12 10:53:55 markd Exp $
+# $NetBSD: Makefile,v 1.2 2003/03/29 12:42:59 jmmv Exp $
 
 DISTNAME=	kde-i18n-ca-${_KDE_VERSION}
+WRKSRC=		${WRKDIR}/kde-i18n-ca
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITES_KDE:=kde-i18n/}
 
@@ -10,8 +11,6 @@ COMMENT=	Language bindings for the KDE desktop
 
 USE_BUILDLINK2=		YES
 
-WRKSRC=		${WRKDIR}/kde-i18n-ca
-
 .include "../../x11/kde3/buildlink2.mk"
 .include "../../x11/kdebase3/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/kde3-i18n-cs/Makefile b/x11/kde3-i18n-cs/Makefile
index 6e81188f321..f6b27ec2e1d 100644
--- a/x11/kde3-i18n-cs/Makefile
+++ b/x11/kde3-i18n-cs/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.1.1.1 2003/03/12 10:54:36 markd Exp $
+# $NetBSD: Makefile,v 1.2 2003/03/29 12:42:59 jmmv Exp $
 
 DISTNAME=	kde-i18n-cs-${_KDE_VERSION}
+WRKSRC=		${WRKDIR}/kde-i18n-cs
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITES_KDE:=kde-i18n/}
 
@@ -10,8 +11,6 @@ COMMENT=	Language bindings for the KDE desktop
 
 USE_BUILDLINK2=		YES
 
-WRKSRC=		${WRKDIR}/kde-i18n-cs
-
 .include "../../x11/kde3/buildlink2.mk"
 .include "../../x11/kdebase3/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/kde3-i18n-da/Makefile b/x11/kde3-i18n-da/Makefile
index fab47e03eca..82a0fb8f70f 100644
--- a/x11/kde3-i18n-da/Makefile
+++ b/x11/kde3-i18n-da/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.1.1.1 2003/03/12 10:55:22 markd Exp $
+# $NetBSD: Makefile,v 1.2 2003/03/29 12:43:00 jmmv Exp $
 
 DISTNAME=	kde-i18n-da-${_KDE_VERSION}
+WRKSRC=		${WRKDIR}/kde-i18n-da
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITES_KDE:=kde-i18n/}
 
@@ -10,8 +11,6 @@ COMMENT=	Language bindings for the KDE desktop
 
 USE_BUILDLINK2=		YES
 
-WRKSRC=		${WRKDIR}/kde-i18n-da
-
 .include "../../x11/kde3/buildlink2.mk"
 .include "../../x11/kdebase3/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/kde3-i18n-de/Makefile b/x11/kde3-i18n-de/Makefile
index 9fa4c005ed7..413f5f70a29 100644
--- a/x11/kde3-i18n-de/Makefile
+++ b/x11/kde3-i18n-de/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.1.1.1 2003/03/12 10:55:59 markd Exp $
+# $NetBSD: Makefile,v 1.2 2003/03/29 12:43:00 jmmv Exp $
 
 DISTNAME=	kde-i18n-de-${_KDE_VERSION}
+WRKSRC=		${WRKDIR}/kde-i18n-de
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITES_KDE:=kde-i18n/}
 
@@ -10,8 +11,6 @@ COMMENT=	Language bindings for the KDE desktop
 
 USE_BUILDLINK2=		YES
 
-WRKSRC=		${WRKDIR}/kde-i18n-de
-
 .include "../../x11/kde3/buildlink2.mk"
 .include "../../x11/kdebase3/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/kde3-i18n-el/Makefile b/x11/kde3-i18n-el/Makefile
index f27f0e64b36..c200a6a9040 100644
--- a/x11/kde3-i18n-el/Makefile
+++ b/x11/kde3-i18n-el/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.1.1.1 2003/03/12 10:56:34 markd Exp $
+# $NetBSD: Makefile,v 1.2 2003/03/29 12:43:00 jmmv Exp $
 
 DISTNAME=	kde-i18n-el-${_KDE_VERSION}
+WRKSRC=		${WRKDIR}/kde-i18n-el
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITES_KDE:=kde-i18n/}
 
@@ -10,8 +11,6 @@ COMMENT=	Language bindings for the KDE desktop
 
 USE_BUILDLINK2=		YES
 
-WRKSRC=		${WRKDIR}/kde-i18n-el
-
 .include "../../x11/kde3/buildlink2.mk"
 .include "../../x11/kdebase3/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/kde3-i18n-en_GB/Makefile b/x11/kde3-i18n-en_GB/Makefile
index 13c7a1dfbd4..44b75681f5d 100644
--- a/x11/kde3-i18n-en_GB/Makefile
+++ b/x11/kde3-i18n-en_GB/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.1.1.1 2003/03/12 10:57:26 markd Exp $
+# $NetBSD: Makefile,v 1.2 2003/03/29 12:43:00 jmmv Exp $
 
 DISTNAME=	kde-i18n-en_GB-${_KDE_VERSION}
+WRKSRC=		${WRKDIR}/kde-i18n-en_GB
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITES_KDE:=kde-i18n/}
 
@@ -10,8 +11,6 @@ COMMENT=	Language bindings for the KDE desktop
 
 USE_BUILDLINK2=		YES
 
-WRKSRC=		${WRKDIR}/kde-i18n-en_GB
-
 .include "../../x11/kde3/buildlink2.mk"
 .include "../../x11/kdebase3/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/kde3-i18n-eo/Makefile b/x11/kde3-i18n-eo/Makefile
index b40376f2fc6..dd4cf0f41cd 100644
--- a/x11/kde3-i18n-eo/Makefile
+++ b/x11/kde3-i18n-eo/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.1.1.1 2003/03/12 10:58:00 markd Exp $
+# $NetBSD: Makefile,v 1.2 2003/03/29 12:43:00 jmmv Exp $
 
 DISTNAME=	kde-i18n-eo-${_KDE_VERSION}
+WRKSRC=		${WRKDIR}/kde-i18n-eo
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITES_KDE:=kde-i18n/}
 
@@ -10,8 +11,6 @@ COMMENT=	Language bindings for the KDE desktop
 
 USE_BUILDLINK2=		YES
 
-WRKSRC=		${WRKDIR}/kde-i18n-eo
-
 .include "../../x11/kde3/buildlink2.mk"
 .include "../../x11/kdebase3/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/kde3-i18n-es/Makefile b/x11/kde3-i18n-es/Makefile
index a1f5769205f..b9ad58c4b19 100644
--- a/x11/kde3-i18n-es/Makefile
+++ b/x11/kde3-i18n-es/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.1.1.1 2003/03/12 10:59:00 markd Exp $
+# $NetBSD: Makefile,v 1.2 2003/03/29 12:43:01 jmmv Exp $
 
 DISTNAME=	kde-i18n-es-${_KDE_VERSION}
+WRKSRC=		${WRKDIR}/kde-i18n-es
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITES_KDE:=kde-i18n/}
 
@@ -10,8 +11,6 @@ COMMENT=	Language bindings for the KDE desktop
 
 USE_BUILDLINK2=		YES
 
-WRKSRC=		${WRKDIR}/kde-i18n-es
-
 .include "../../x11/kde3/buildlink2.mk"
 .include "../../x11/kdebase3/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/kde3-i18n-et/Makefile b/x11/kde3-i18n-et/Makefile
index 0b8d861efa1..8582da8a885 100644
--- a/x11/kde3-i18n-et/Makefile
+++ b/x11/kde3-i18n-et/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.1.1.1 2003/03/12 10:59:35 markd Exp $
+# $NetBSD: Makefile,v 1.2 2003/03/29 12:43:01 jmmv Exp $
 
 DISTNAME=	kde-i18n-et-${_KDE_VERSION}
+WRKSRC=		${WRKDIR}/kde-i18n-et
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITES_KDE:=kde-i18n/}
 
@@ -10,8 +11,6 @@ COMMENT=	Language bindings for the KDE desktop
 
 USE_BUILDLINK2=		YES
 
-WRKSRC=		${WRKDIR}/kde-i18n-et
-
 .include "../../x11/kde3/buildlink2.mk"
 .include "../../x11/kdebase3/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/kde3-i18n-eu/Makefile b/x11/kde3-i18n-eu/Makefile
index acf08f4db1c..90912d2026b 100644
--- a/x11/kde3-i18n-eu/Makefile
+++ b/x11/kde3-i18n-eu/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.1.1.1 2003/03/12 11:00:17 markd Exp $
+# $NetBSD: Makefile,v 1.2 2003/03/29 12:43:01 jmmv Exp $
 
 DISTNAME=	kde-i18n-eu-${_KDE_VERSION}
+WRKSRC=		${WRKDIR}/kde-i18n-eu
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITES_KDE:=kde-i18n/}
 
@@ -10,8 +11,6 @@ COMMENT=	Language bindings for the KDE desktop
 
 USE_BUILDLINK2=		YES
 
-WRKSRC=		${WRKDIR}/kde-i18n-eu
-
 .include "../../x11/kde3/buildlink2.mk"
 .include "../../x11/kdebase3/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/kde3-i18n-fa/Makefile b/x11/kde3-i18n-fa/Makefile
index a48cdcbb458..1215782fa38 100644
--- a/x11/kde3-i18n-fa/Makefile
+++ b/x11/kde3-i18n-fa/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.1.1.1 2003/03/12 11:00:52 markd Exp $
+# $NetBSD: Makefile,v 1.2 2003/03/29 12:43:01 jmmv Exp $
 
 DISTNAME=	kde-i18n-fa-${_KDE_VERSION}
+WRKSRC=		${WRKDIR}/kde-i18n-fa
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITES_KDE:=kde-i18n/}
 
@@ -10,8 +11,6 @@ COMMENT=	Language bindings for the KDE desktop
 
 USE_BUILDLINK2=		YES
 
-WRKSRC=		${WRKDIR}/kde-i18n-fa
-
 .include "../../x11/kde3/buildlink2.mk"
 .include "../../x11/kdebase3/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/kde3-i18n-fi/Makefile b/x11/kde3-i18n-fi/Makefile
index 0bdb1e4f93d..f34a1028276 100644
--- a/x11/kde3-i18n-fi/Makefile
+++ b/x11/kde3-i18n-fi/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.1.1.1 2003/03/12 11:01:21 markd Exp $
+# $NetBSD: Makefile,v 1.2 2003/03/29 12:43:01 jmmv Exp $
 
 DISTNAME=	kde-i18n-fi-${_KDE_VERSION}
+WRKSRC=		${WRKDIR}/kde-i18n-fi
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITES_KDE:=kde-i18n/}
 
@@ -10,8 +11,6 @@ COMMENT=	Language bindings for the KDE desktop
 
 USE_BUILDLINK2=		YES
 
-WRKSRC=		${WRKDIR}/kde-i18n-fi
-
 .include "../../x11/kde3/buildlink2.mk"
 .include "../../x11/kdebase3/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/kde3-i18n-fr/Makefile b/x11/kde3-i18n-fr/Makefile
index 6af2178ef01..c15775fd34b 100644
--- a/x11/kde3-i18n-fr/Makefile
+++ b/x11/kde3-i18n-fr/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.1.1.1 2003/03/12 11:02:17 markd Exp $
+# $NetBSD: Makefile,v 1.2 2003/03/29 12:43:01 jmmv Exp $
 
 DISTNAME=	kde-i18n-fr-${_KDE_VERSION}
+WRKSRC=		${WRKDIR}/kde-i18n-fr
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITES_KDE:=kde-i18n/}
 
@@ -10,8 +11,6 @@ COMMENT=	Language bindings for the KDE desktop
 
 USE_BUILDLINK2=		YES
 
-WRKSRC=		${WRKDIR}/kde-i18n-fr
-
 .include "../../x11/kde3/buildlink2.mk"
 .include "../../x11/kdebase3/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/kde3-i18n-he/Makefile b/x11/kde3-i18n-he/Makefile
index a4908a735a3..0d8c15a1062 100644
--- a/x11/kde3-i18n-he/Makefile
+++ b/x11/kde3-i18n-he/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.1.1.1 2003/03/12 11:02:51 markd Exp $
+# $NetBSD: Makefile,v 1.2 2003/03/29 12:43:02 jmmv Exp $
 
 DISTNAME=	kde-i18n-he-${_KDE_VERSION}
+WRKSRC=		${WRKDIR}/kde-i18n-he
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITES_KDE:=kde-i18n/}
 
@@ -10,8 +11,6 @@ COMMENT=	Language bindings for the KDE desktop
 
 USE_BUILDLINK2=		YES
 
-WRKSRC=		${WRKDIR}/kde-i18n-he
-
 .include "../../x11/kde3/buildlink2.mk"
 .include "../../x11/kdebase3/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/kde3-i18n-hu/Makefile b/x11/kde3-i18n-hu/Makefile
index 73b1bff6792..29814b5479b 100644
--- a/x11/kde3-i18n-hu/Makefile
+++ b/x11/kde3-i18n-hu/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.1.1.1 2003/03/12 11:03:24 markd Exp $
+# $NetBSD: Makefile,v 1.2 2003/03/29 12:43:02 jmmv Exp $
 
 DISTNAME=	kde-i18n-hu-${_KDE_VERSION}
+WRKSRC=		${WRKDIR}/kde-i18n-hu
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITES_KDE:=kde-i18n/}
 
@@ -10,8 +11,6 @@ COMMENT=	Language bindings for the KDE desktop
 
 USE_BUILDLINK2=		YES
 
-WRKSRC=		${WRKDIR}/kde-i18n-hu
-
 .include "../../x11/kde3/buildlink2.mk"
 .include "../../x11/kdebase3/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/kde3-i18n-it/Makefile b/x11/kde3-i18n-it/Makefile
index 51bf38ec8a5..97a64ecde5f 100644
--- a/x11/kde3-i18n-it/Makefile
+++ b/x11/kde3-i18n-it/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.1.1.1 2003/03/12 11:04:01 markd Exp $
+# $NetBSD: Makefile,v 1.2 2003/03/29 12:43:02 jmmv Exp $
 
 DISTNAME=	kde-i18n-it-${_KDE_VERSION}
+WRKSRC=		${WRKDIR}/kde-i18n-it
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITES_KDE:=kde-i18n/}
 
@@ -10,8 +11,6 @@ COMMENT=	Language bindings for the KDE desktop
 
 USE_BUILDLINK2=		YES
 
-WRKSRC=		${WRKDIR}/kde-i18n-it
-
 .include "../../x11/kde3/buildlink2.mk"
 .include "../../x11/kdebase3/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/kde3-i18n-ja/Makefile b/x11/kde3-i18n-ja/Makefile
index ce38a0f9b2c..4c695ae6ffd 100644
--- a/x11/kde3-i18n-ja/Makefile
+++ b/x11/kde3-i18n-ja/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.1.1.1 2003/03/12 11:04:31 markd Exp $
+# $NetBSD: Makefile,v 1.2 2003/03/29 12:43:02 jmmv Exp $
 
 DISTNAME=	kde-i18n-ja-${_KDE_VERSION}
+WRKSRC=		${WRKDIR}/kde-i18n-ja
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITES_KDE:=kde-i18n/}
 
@@ -10,8 +11,6 @@ COMMENT=	Language bindings for the KDE desktop
 
 USE_BUILDLINK2=		YES
 
-WRKSRC=		${WRKDIR}/kde-i18n-ja
-
 .include "../../x11/kde3/buildlink2.mk"
 .include "../../x11/kdebase3/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/kde3-i18n-lt/Makefile b/x11/kde3-i18n-lt/Makefile
index d17e026474a..5ff38d8e0d0 100644
--- a/x11/kde3-i18n-lt/Makefile
+++ b/x11/kde3-i18n-lt/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.1.1.1 2003/03/12 11:05:10 markd Exp $
+# $NetBSD: Makefile,v 1.2 2003/03/29 12:43:03 jmmv Exp $
 
 DISTNAME=	kde-i18n-lt-${_KDE_VERSION}
+WRKSRC=		${WRKDIR}/kde-i18n-lt
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITES_KDE:=kde-i18n/}
 
@@ -10,8 +11,6 @@ COMMENT=	Language bindings for the KDE desktop
 
 USE_BUILDLINK2=		YES
 
-WRKSRC=		${WRKDIR}/kde-i18n-lt
-
 .include "../../x11/kde3/buildlink2.mk"
 .include "../../x11/kdebase3/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/kde3-i18n-mt/Makefile b/x11/kde3-i18n-mt/Makefile
index 4f3ebe2cf57..d64a3a7b610 100644
--- a/x11/kde3-i18n-mt/Makefile
+++ b/x11/kde3-i18n-mt/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.1.1.1 2003/03/12 11:05:39 markd Exp $
+# $NetBSD: Makefile,v 1.2 2003/03/29 12:43:03 jmmv Exp $
 
 DISTNAME=	kde-i18n-mt-${_KDE_VERSION}
+WRKSRC=		${WRKDIR}/kde-i18n-mt
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITES_KDE:=kde-i18n/}
 
@@ -10,8 +11,6 @@ COMMENT=	Language bindings for the KDE desktop
 
 USE_BUILDLINK2=		YES
 
-WRKSRC=		${WRKDIR}/kde-i18n-mt
-
 .include "../../x11/kde3/buildlink2.mk"
 .include "../../x11/kdebase3/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/kde3-i18n-nb/Makefile b/x11/kde3-i18n-nb/Makefile
index fd3ebc63fd2..ef96a68e536 100644
--- a/x11/kde3-i18n-nb/Makefile
+++ b/x11/kde3-i18n-nb/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.1.1.1 2003/03/12 11:06:21 markd Exp $
+# $NetBSD: Makefile,v 1.2 2003/03/29 12:43:03 jmmv Exp $
 
 DISTNAME=	kde-i18n-nb-${_KDE_VERSION}
+WRKSRC=		${WRKDIR}/kde-i18n-nb
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITES_KDE:=kde-i18n/}
 
@@ -10,8 +11,6 @@ COMMENT=	Language bindings for the KDE desktop
 
 USE_BUILDLINK2=		YES
 
-WRKSRC=		${WRKDIR}/kde-i18n-nb
-
 .include "../../x11/kde3/buildlink2.mk"
 .include "../../x11/kdebase3/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/kde3-i18n-nl/Makefile b/x11/kde3-i18n-nl/Makefile
index 4cba88321da..b7759851fa3 100644
--- a/x11/kde3-i18n-nl/Makefile
+++ b/x11/kde3-i18n-nl/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.1.1.1 2003/03/12 11:06:51 markd Exp $
+# $NetBSD: Makefile,v 1.2 2003/03/29 12:43:03 jmmv Exp $
 
 DISTNAME=	kde-i18n-nl-${_KDE_VERSION}
+WRKSRC=		${WRKDIR}/kde-i18n-nl
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITES_KDE:=kde-i18n/}
 
@@ -10,8 +11,6 @@ COMMENT=	Language bindings for the KDE desktop
 
 USE_BUILDLINK2=		YES
 
-WRKSRC=		${WRKDIR}/kde-i18n-nl
-
 .include "../../x11/kde3/buildlink2.mk"
 .include "../../x11/kdebase3/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/kde3-i18n-nn/Makefile b/x11/kde3-i18n-nn/Makefile
index c1fc9b8dd45..4edb624e27a 100644
--- a/x11/kde3-i18n-nn/Makefile
+++ b/x11/kde3-i18n-nn/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.1.1.1 2003/03/12 11:07:21 markd Exp $
+# $NetBSD: Makefile,v 1.2 2003/03/29 12:43:04 jmmv Exp $
 
 DISTNAME=	kde-i18n-nn-${_KDE_VERSION}
+WRKSRC=		${WRKDIR}/kde-i18n-nn
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITES_KDE:=kde-i18n/}
 
@@ -10,8 +11,6 @@ COMMENT=	Language bindings for the KDE desktop
 
 USE_BUILDLINK2=		YES
 
-WRKSRC=		${WRKDIR}/kde-i18n-nn
-
 .include "../../x11/kde3/buildlink2.mk"
 .include "../../x11/kdebase3/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/kde3-i18n-nso/Makefile b/x11/kde3-i18n-nso/Makefile
index 0c34583352b..20605c306fc 100644
--- a/x11/kde3-i18n-nso/Makefile
+++ b/x11/kde3-i18n-nso/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.1.1.1 2003/03/12 11:07:56 markd Exp $
+# $NetBSD: Makefile,v 1.2 2003/03/29 12:43:04 jmmv Exp $
 
 DISTNAME=	kde-i18n-nso-${_KDE_VERSION}
+WRKSRC=		${WRKDIR}/kde-i18n-nso
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITES_KDE:=kde-i18n/}
 
@@ -10,8 +11,6 @@ COMMENT=	Language bindings for the KDE desktop
 
 USE_BUILDLINK2=		YES
 
-WRKSRC=		${WRKDIR}/kde-i18n-nso
-
 .include "../../x11/kde3/buildlink2.mk"
 .include "../../x11/kdebase3/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/kde3-i18n-pl/Makefile b/x11/kde3-i18n-pl/Makefile
index 097184d1353..37ed01effe1 100644
--- a/x11/kde3-i18n-pl/Makefile
+++ b/x11/kde3-i18n-pl/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.1.1.1 2003/03/12 11:08:25 markd Exp $
+# $NetBSD: Makefile,v 1.2 2003/03/29 12:43:04 jmmv Exp $
 
 DISTNAME=	kde-i18n-pl-${_KDE_VERSION}
+WRKSRC=		${WRKDIR}/kde-i18n-pl
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITES_KDE:=kde-i18n/}
 
@@ -10,8 +11,6 @@ COMMENT=	Language bindings for the KDE desktop
 
 USE_BUILDLINK2=		YES
 
-WRKSRC=		${WRKDIR}/kde-i18n-pl
-
 .include "../../x11/kde3/buildlink2.mk"
 .include "../../x11/kdebase3/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/kde3-i18n-pt/Makefile b/x11/kde3-i18n-pt/Makefile
index 9a2a4b64ec5..e0cd2564179 100644
--- a/x11/kde3-i18n-pt/Makefile
+++ b/x11/kde3-i18n-pt/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.1.1.1 2003/03/12 11:08:53 markd Exp $
+# $NetBSD: Makefile,v 1.2 2003/03/29 12:43:04 jmmv Exp $
 
 DISTNAME=	kde-i18n-pt-${_KDE_VERSION}
+WRKSRC=		${WRKDIR}/kde-i18n-pt
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITES_KDE:=kde-i18n/}
 
@@ -10,8 +11,6 @@ COMMENT=	Language bindings for the KDE desktop
 
 USE_BUILDLINK2=		YES
 
-WRKSRC=		${WRKDIR}/kde-i18n-pt
-
 .include "../../x11/kde3/buildlink2.mk"
 .include "../../x11/kdebase3/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/kde3-i18n-pt_BR/Makefile b/x11/kde3-i18n-pt_BR/Makefile
index de29db77199..f800cef7c84 100644
--- a/x11/kde3-i18n-pt_BR/Makefile
+++ b/x11/kde3-i18n-pt_BR/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.1.1.1 2003/03/12 11:09:37 markd Exp $
+# $NetBSD: Makefile,v 1.2 2003/03/29 12:43:04 jmmv Exp $
 
 DISTNAME=	kde-i18n-pt_BR-${_KDE_VERSION}
+WRKSRC=		${WRKDIR}/kde-i18n-pt_BR
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITES_KDE:=kde-i18n/}
 
@@ -10,8 +11,6 @@ COMMENT=	Language bindings for the KDE desktop
 
 USE_BUILDLINK2=		YES
 
-WRKSRC=		${WRKDIR}/kde-i18n-pt_BR
-
 .include "../../x11/kde3/buildlink2.mk"
 .include "../../x11/kdebase3/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/kde3-i18n-ro/Makefile b/x11/kde3-i18n-ro/Makefile
index 36da10ad2cb..b4884e40176 100644
--- a/x11/kde3-i18n-ro/Makefile
+++ b/x11/kde3-i18n-ro/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.1.1.1 2003/03/12 11:10:11 markd Exp $
+# $NetBSD: Makefile,v 1.2 2003/03/29 12:43:04 jmmv Exp $
 
 DISTNAME=	kde-i18n-ro-${_KDE_VERSION}
+WRKSRC=		${WRKDIR}/kde-i18n-ro
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITES_KDE:=kde-i18n/}
 
@@ -10,8 +11,6 @@ COMMENT=	Language bindings for the KDE desktop
 
 USE_BUILDLINK2=		YES
 
-WRKSRC=		${WRKDIR}/kde-i18n-ro
-
 .include "../../x11/kde3/buildlink2.mk"
 .include "../../x11/kdebase3/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/kde3-i18n-ru/Makefile b/x11/kde3-i18n-ru/Makefile
index cb47ae54e46..3e683f5871e 100644
--- a/x11/kde3-i18n-ru/Makefile
+++ b/x11/kde3-i18n-ru/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.1.1.1 2003/03/12 11:10:47 markd Exp $
+# $NetBSD: Makefile,v 1.2 2003/03/29 12:43:05 jmmv Exp $
 
 DISTNAME=	kde-i18n-ru-${_KDE_VERSION}
+WRKSRC=		${WRKDIR}/kde-i18n-ru
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITES_KDE:=kde-i18n/}
 
@@ -10,8 +11,6 @@ COMMENT=	Language bindings for the KDE desktop
 
 USE_BUILDLINK2=		YES
 
-WRKSRC=		${WRKDIR}/kde-i18n-ru
-
 .include "../../x11/kde3/buildlink2.mk"
 .include "../../x11/kdebase3/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/kde3-i18n-sk/Makefile b/x11/kde3-i18n-sk/Makefile
index f9930f63ce3..fa5ffe7a9a5 100644
--- a/x11/kde3-i18n-sk/Makefile
+++ b/x11/kde3-i18n-sk/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.1.1.1 2003/03/12 11:11:23 markd Exp $
+# $NetBSD: Makefile,v 1.2 2003/03/29 12:43:05 jmmv Exp $
 
 DISTNAME=	kde-i18n-sk-${_KDE_VERSION}
+WRKSRC=		${WRKDIR}/kde-i18n-sk
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITES_KDE:=kde-i18n/}
 
@@ -10,8 +11,6 @@ COMMENT=	Language bindings for the KDE desktop
 
 USE_BUILDLINK2=		YES
 
-WRKSRC=		${WRKDIR}/kde-i18n-sk
-
 .include "../../x11/kde3/buildlink2.mk"
 .include "../../x11/kdebase3/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/kde3-i18n-sl/Makefile b/x11/kde3-i18n-sl/Makefile
index ceb14dea8d2..92c29aa541d 100644
--- a/x11/kde3-i18n-sl/Makefile
+++ b/x11/kde3-i18n-sl/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.1.1.1 2003/03/12 11:12:02 markd Exp $
+# $NetBSD: Makefile,v 1.2 2003/03/29 12:43:05 jmmv Exp $
 
 DISTNAME=	kde-i18n-sl-${_KDE_VERSION}
+WRKSRC=		${WRKDIR}/kde-i18n-sl
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITES_KDE:=kde-i18n/}
 
@@ -10,8 +11,6 @@ COMMENT=	Language bindings for the KDE desktop
 
 USE_BUILDLINK2=		YES
 
-WRKSRC=		${WRKDIR}/kde-i18n-sl
-
 .include "../../x11/kde3/buildlink2.mk"
 .include "../../x11/kdebase3/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/kde3-i18n-sr/Makefile b/x11/kde3-i18n-sr/Makefile
index d7362bb6a55..5ffaf2cd989 100644
--- a/x11/kde3-i18n-sr/Makefile
+++ b/x11/kde3-i18n-sr/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.1.1.1 2003/03/12 11:12:48 markd Exp $
+# $NetBSD: Makefile,v 1.2 2003/03/29 12:43:05 jmmv Exp $
 
 DISTNAME=	kde-i18n-sr-${_KDE_VERSION}
+WRKSRC=		${WRKDIR}/kde-i18n-sr
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITES_KDE:=kde-i18n/}
 
@@ -10,8 +11,6 @@ COMMENT=	Language bindings for the KDE desktop
 
 USE_BUILDLINK2=		YES
 
-WRKSRC=		${WRKDIR}/kde-i18n-sr
-
 .include "../../x11/kde3/buildlink2.mk"
 .include "../../x11/kdebase3/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/kde3-i18n-sv/Makefile b/x11/kde3-i18n-sv/Makefile
index 3fba9fb377a..4fdd5a683d7 100644
--- a/x11/kde3-i18n-sv/Makefile
+++ b/x11/kde3-i18n-sv/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.1.1.1 2003/03/12 11:13:25 markd Exp $
+# $NetBSD: Makefile,v 1.2 2003/03/29 12:43:05 jmmv Exp $
 
 DISTNAME=	kde-i18n-sv-${_KDE_VERSION}
+WRKSRC=		${WRKDIR}/kde-i18n-sv
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITES_KDE:=kde-i18n/}
 
@@ -10,8 +11,6 @@ COMMENT=	Language bindings for the KDE desktop
 
 USE_BUILDLINK2=		YES
 
-WRKSRC=		${WRKDIR}/kde-i18n-sv
-
 .include "../../x11/kde3/buildlink2.mk"
 .include "../../x11/kdebase3/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/kde3-i18n-ta/Makefile b/x11/kde3-i18n-ta/Makefile
index ef6ba3db4b0..c38ed8a20d2 100644
--- a/x11/kde3-i18n-ta/Makefile
+++ b/x11/kde3-i18n-ta/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.1.1.1 2003/03/12 11:13:53 markd Exp $
+# $NetBSD: Makefile,v 1.2 2003/03/29 12:43:06 jmmv Exp $
 
 DISTNAME=	kde-i18n-ta-${_KDE_VERSION}
+WRKSRC=		${WRKDIR}/kde-i18n-ta
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITES_KDE:=kde-i18n/}
 
@@ -10,8 +11,6 @@ COMMENT=	Language bindings for the KDE desktop
 
 USE_BUILDLINK2=		YES
 
-WRKSRC=		${WRKDIR}/kde-i18n-ta
-
 .include "../../x11/kde3/buildlink2.mk"
 .include "../../x11/kdebase3/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/kde3-i18n-th/Makefile b/x11/kde3-i18n-th/Makefile
index 9e1608983d6..1a857d31af8 100644
--- a/x11/kde3-i18n-th/Makefile
+++ b/x11/kde3-i18n-th/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.1.1.1 2003/03/12 11:14:19 markd Exp $
+# $NetBSD: Makefile,v 1.2 2003/03/29 12:43:06 jmmv Exp $
 
 DISTNAME=	kde-i18n-th-${_KDE_VERSION}
+WRKSRC=		${WRKDIR}/kde-i18n-th
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITES_KDE:=kde-i18n/}
 
@@ -10,8 +11,6 @@ COMMENT=	Language bindings for the KDE desktop
 
 USE_BUILDLINK2=		YES
 
-WRKSRC=		${WRKDIR}/kde-i18n-th
-
 .include "../../x11/kde3/buildlink2.mk"
 .include "../../x11/kdebase3/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/kde3-i18n-tr/Makefile b/x11/kde3-i18n-tr/Makefile
index 4d0051aed65..6a6bbd0de5d 100644
--- a/x11/kde3-i18n-tr/Makefile
+++ b/x11/kde3-i18n-tr/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.1.1.1 2003/03/12 11:14:55 markd Exp $
+# $NetBSD: Makefile,v 1.2 2003/03/29 12:43:06 jmmv Exp $
 
 DISTNAME=	kde-i18n-tr-${_KDE_VERSION}
+WRKSRC=		${WRKDIR}/kde-i18n-tr
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITES_KDE:=kde-i18n/}
 
@@ -10,8 +11,6 @@ COMMENT=	Language bindings for the KDE desktop
 
 USE_BUILDLINK2=		YES
 
-WRKSRC=		${WRKDIR}/kde-i18n-tr
-
 .include "../../x11/kde3/buildlink2.mk"
 .include "../../x11/kdebase3/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/kde3-i18n-uk/Makefile b/x11/kde3-i18n-uk/Makefile
index 7dda51fca35..c5c4f8bd255 100644
--- a/x11/kde3-i18n-uk/Makefile
+++ b/x11/kde3-i18n-uk/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.1.1.1 2003/03/12 11:15:33 markd Exp $
+# $NetBSD: Makefile,v 1.2 2003/03/29 12:43:06 jmmv Exp $
 
 DISTNAME=	kde-i18n-uk-${_KDE_VERSION}
+WRKSRC=		${WRKDIR}/kde-i18n-uk
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITES_KDE:=kde-i18n/}
 
@@ -10,8 +11,6 @@ COMMENT=	Language bindings for the KDE desktop
 
 USE_BUILDLINK2=		YES
 
-WRKSRC=		${WRKDIR}/kde-i18n-uk
-
 .include "../../x11/kde3/buildlink2.mk"
 .include "../../x11/kdebase3/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/kde3-i18n-ven/Makefile b/x11/kde3-i18n-ven/Makefile
index 72a4c80d2f2..95de854ed73 100644
--- a/x11/kde3-i18n-ven/Makefile
+++ b/x11/kde3-i18n-ven/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.1.1.1 2003/03/12 11:16:08 markd Exp $
+# $NetBSD: Makefile,v 1.2 2003/03/29 12:43:06 jmmv Exp $
 
 DISTNAME=	kde-i18n-ven-${_KDE_VERSION}
+WRKSRC=		${WRKDIR}/kde-i18n-ven
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITES_KDE:=kde-i18n/}
 
@@ -10,8 +11,6 @@ COMMENT=	Language bindings for the KDE desktop
 
 USE_BUILDLINK2=		YES
 
-WRKSRC=		${WRKDIR}/kde-i18n-ven
-
 .include "../../x11/kde3/buildlink2.mk"
 .include "../../x11/kdebase3/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/kde3-i18n-vi/Makefile b/x11/kde3-i18n-vi/Makefile
index 4a19cefb346..cbfdf6a9327 100644
--- a/x11/kde3-i18n-vi/Makefile
+++ b/x11/kde3-i18n-vi/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.1.1.1 2003/03/12 11:16:33 markd Exp $
+# $NetBSD: Makefile,v 1.2 2003/03/29 12:43:06 jmmv Exp $
 
 DISTNAME=	kde-i18n-vi-${_KDE_VERSION}
+WRKSRC=		${WRKDIR}/kde-i18n-vi
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITES_KDE:=kde-i18n/}
 
@@ -10,8 +11,6 @@ COMMENT=	Language bindings for the KDE desktop
 
 USE_BUILDLINK2=		YES
 
-WRKSRC=		${WRKDIR}/kde-i18n-vi
-
 .include "../../x11/kde3/buildlink2.mk"
 .include "../../x11/kdebase3/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/kde3-i18n-xh/Makefile b/x11/kde3-i18n-xh/Makefile
index fa813433917..dbc77a325eb 100644
--- a/x11/kde3-i18n-xh/Makefile
+++ b/x11/kde3-i18n-xh/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.1.1.1 2003/03/12 11:17:05 markd Exp $
+# $NetBSD: Makefile,v 1.2 2003/03/29 12:43:07 jmmv Exp $
 
 DISTNAME=	kde-i18n-xh-${_KDE_VERSION}
+WRKSRC=		${WRKDIR}/kde-i18n-xh
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITES_KDE:=kde-i18n/}
 
@@ -10,8 +11,6 @@ COMMENT=	Language bindings for the KDE desktop
 
 USE_BUILDLINK2=		YES
 
-WRKSRC=		${WRKDIR}/kde-i18n-xh
-
 .include "../../x11/kde3/buildlink2.mk"
 .include "../../x11/kdebase3/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/kde3-i18n-zh_CN/Makefile b/x11/kde3-i18n-zh_CN/Makefile
index bf24d147366..40af201b359 100644
--- a/x11/kde3-i18n-zh_CN/Makefile
+++ b/x11/kde3-i18n-zh_CN/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.1.1.1 2003/03/12 11:18:06 markd Exp $
+# $NetBSD: Makefile,v 1.2 2003/03/29 12:43:07 jmmv Exp $
 
 DISTNAME=	kde-i18n-zh_CN-${_KDE_VERSION}
+WRKSRC=		${WRKDIR}/kde-i18n-zh_CN
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITES_KDE:=kde-i18n/}
 
@@ -10,8 +11,6 @@ COMMENT=	Language bindings for the KDE desktop
 
 USE_BUILDLINK2=		YES
 
-WRKSRC=		${WRKDIR}/kde-i18n-zh_CN
-
 .include "../../x11/kde3/buildlink2.mk"
 .include "../../x11/kdebase3/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/kde3-i18n-zh_TW/Makefile b/x11/kde3-i18n-zh_TW/Makefile
index fe3e6a30ac0..3f71a4be320 100644
--- a/x11/kde3-i18n-zh_TW/Makefile
+++ b/x11/kde3-i18n-zh_TW/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.1.1.1 2003/03/12 11:18:36 markd Exp $
+# $NetBSD: Makefile,v 1.2 2003/03/29 12:43:07 jmmv Exp $
 
 DISTNAME=	kde-i18n-zh_TW-${_KDE_VERSION}
+WRKSRC=		${WRKDIR}/kde-i18n-zh_TW
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITES_KDE:=kde-i18n/}
 
@@ -10,8 +11,6 @@ COMMENT=	Language bindings for the KDE desktop
 
 USE_BUILDLINK2=		YES
 
-WRKSRC=		${WRKDIR}/kde-i18n-zh_TW
-
 .include "../../x11/kde3/buildlink2.mk"
 .include "../../x11/kdebase3/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/kde3-i18n-zu/Makefile b/x11/kde3-i18n-zu/Makefile
index d41af2ce34a..0d9e57b4247 100644
--- a/x11/kde3-i18n-zu/Makefile
+++ b/x11/kde3-i18n-zu/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.1.1.1 2003/03/12 11:19:07 markd Exp $
+# $NetBSD: Makefile,v 1.2 2003/03/29 12:43:07 jmmv Exp $
 
 DISTNAME=	kde-i18n-zu-${_KDE_VERSION}
+WRKSRC=		${WRKDIR}/kde-i18n-zu
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITES_KDE:=kde-i18n/}
 
@@ -10,8 +11,6 @@ COMMENT=	Language bindings for the KDE desktop
 
 USE_BUILDLINK2=		YES
 
-WRKSRC=		${WRKDIR}/kde-i18n-zu
-
 .include "../../x11/kde3/buildlink2.mk"
 .include "../../x11/kdebase3/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/keylaunch/Makefile b/x11/keylaunch/Makefile
index 55031899ce3..9915df3bd5e 100644
--- a/x11/keylaunch/Makefile
+++ b/x11/keylaunch/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.2 2002/09/23 22:38:06 jlam Exp $
+# $NetBSD: Makefile,v 1.3 2003/03/29 12:43:07 jmmv Exp $
 #
 
 DISTNAME=	keylaunch-1.3.0
+WRKSRC=		${WRKDIR}/keylaunch
 CATEGORIES=	x11
 MASTER_SITES=	http://www.kensden.pwp.blueyonder.co.uk/Oroborus/files/
 
@@ -9,8 +10,6 @@ MAINTAINER=	packages@netbsd.org
 HOMEPAGE=	http://www.kensden.pwp.blueyonder.co.uk/Oroborus/download.htm
 COMMENT=	X utility for binding commands to a hot key
 
-WRKSRC=		${WRKDIR}/keylaunch
-
 USE_BUILDLINK2=	YES
 USE_X11BASE=	YES
 USE_GMAKE=	YES
diff --git a/x11/khostchooser/Makefile b/x11/khostchooser/Makefile
index 74282ebad0e..b9a901b3141 100644
--- a/x11/khostchooser/Makefile
+++ b/x11/khostchooser/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.19 2003/03/14 19:38:06 jlam Exp $
+# $NetBSD: Makefile,v 1.20 2003/03/29 12:43:08 jmmv Exp $
 #
 
 DISTNAME=	khostchooser-0.3
 PKGREVISION=	1
+WRKSRC=		${WRKDIR}/khostchooser
 CATEGORIES=	x11 kde
 MASTER_SITES=	ftp://ftp.kde.org/pub/kde/stable/1.1.2/apps/network/
 EXTRACT_SUFX=	.tgz
@@ -12,8 +13,6 @@ COMMENT=	KDE Chooser replacement for X
 
 BUILD_USES_MSGFMT=	yes
 
-WRKSRC=		${WRKDIR}/khostchooser
-
 USE_BUILDLINK2=	YES
 USE_X11BASE=	YES
 USE_GMAKE=	YES
diff --git a/x11/modeline/Makefile b/x11/modeline/Makefile
index bba1ca622c5..e0a40b59186 100644
--- a/x11/modeline/Makefile
+++ b/x11/modeline/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.5 2002/02/06 16:58:16 jlam Exp $
+# $NetBSD: Makefile,v 1.6 2003/03/29 12:43:08 jmmv Exp $
 
 DISTNAME=		modeline_vfr.c
 PKGNAME=		modeline-20001121
+WRKSRC=			${WRKDIR}/modeline
 CATEGORIES=		x11
 MASTER_SITES=		${MASTER_SITE_LOCAL}
 EXTRACT_SUFX=		# empty
@@ -10,8 +11,6 @@ MAINTAINER=		packages@netbsd.org
 HOMEPAGE=		http://www.dkfz-heidelberg.de/spec/linux/modeline/
 COMMENT=		calculates XF86 Modelines to configure your monitor for X11R6
 
-WRKSRC=			${WRKDIR}/modeline
-
 do-extract:
 	${MKDIR} ${WRKSRC}
 	${CP} ${DISTDIR}/${DISTNAME} ${WRKSRC}
diff --git a/x11/oneko/Makefile b/x11/oneko/Makefile
index 2e0a39dfad1..8336de17b3b 100644
--- a/x11/oneko/Makefile
+++ b/x11/oneko/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.4 2003/03/03 04:17:44 jschauma Exp $
+# $NetBSD: Makefile,v 1.5 2003/03/29 12:43:08 jmmv Exp $
 
 DISTNAME=		oneko-1.1b
 PKGNAME=		oneko-1.2
 PKGREVISION=		1
+WRKSRC=			${WRKDIR}/oneko
 CATEGORIES=		x11 games
 MASTER_SITES=		${MASTER_SITE_XCONTRIB:S/contrib/R5contrib/}
 
@@ -14,6 +15,5 @@ MAINTAINER=		johnam@mail.kemper.org
 COMMENT=		Like xneko except on the desktop and with other animals
 
 USE_IMAKE=		yes
-WRKSRC=			${WRKDIR}/oneko
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/openmotif/Makefile b/x11/openmotif/Makefile
index eb8fdfccdd6..7fa53880962 100644
--- a/x11/openmotif/Makefile
+++ b/x11/openmotif/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2003/02/23 13:11:24 jmmv Exp $
+# $NetBSD: Makefile,v 1.15 2003/03/29 12:43:08 jmmv Exp $
 # FreeBSD: /c/ncvs/ports/x11-toolkits/open-motif/Makefile,v 1.18 2000/10/09 01:40:02 asami Exp 
 # OpenBSD: Makefile,v 1.5 2000/10/23 16:08:12 espie Exp 
 
@@ -6,6 +6,7 @@ PKGVER=		2.1.30
 DISTNAME=	openmotif${PKGVER}
 PKGNAME=	openmotif-${PKGVER}
 PKGREVISION=	2
+WRKSRC=		${WRKDIR}/motif
 CATEGORIES=	x11
 MOTIF_SITES=	ftp://openmotif.opengroup.org/pub/openmotif/R${PKGVER}/ \
 		ftp://ftp.opengroup.org/pub/openmotif/R${PKGVER}/ \
@@ -23,7 +24,6 @@ COMMENT=		Open Motif
 CONFLICTS+=		lesstif-[0-9]*
 
 DIST_SUBDIR=		openmotif
-WRKSRC=			${WRKDIR}/motif
 USE_X11BASE=		yes
 USE_BUILDLINK2=		yes
 USE_PKGINSTALL=		yes
diff --git a/x11/p5-Tk/Makefile b/x11/p5-Tk/Makefile
index a09a9f4d3ea..e59dcb6dad2 100644
--- a/x11/p5-Tk/Makefile
+++ b/x11/p5-Tk/Makefile
@@ -1,10 +1,11 @@
-# $NetBSD: Makefile,v 1.32 2002/10/27 19:27:34 seb Exp $
+# $NetBSD: Makefile,v 1.33 2003/03/29 12:43:08 jmmv Exp $
 # FreeBSD Id: Makefile,v 1.14 1997/09/14 04:00:00 jfitz Exp
 #
 
 DISTNAME=	Tk-800.024
 PKGNAME=	p5-Tk-800.024
 SVR4_PKGNAME=	p5tk
+WRKSRC=		${WRKDIR}/Tk800.024
 CATEGORIES=	x11 tk perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=Tk/}
 
@@ -19,7 +20,6 @@ USE_X11=		YES
 PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/Tk/.packlist
 
 MAKE_PARAMS=	X11=${X11BASE}
-WRKSRC=		${WRKDIR}/Tk800.024
 
 .include "../../lang/perl5/module.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/py-Pmw/Makefile b/x11/py-Pmw/Makefile
index a3b7dc6a1ce..2bcb286798d 100644
--- a/x11/py-Pmw/Makefile
+++ b/x11/py-Pmw/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.6 2002/12/08 02:13:30 salo Exp $
+# $NetBSD: Makefile,v 1.7 2003/03/29 12:43:08 jmmv Exp $
 #
 
 DISTNAME=	Pmw.0.8.5
 PKGNAME=	${PYPKGPREFIX}-Pmw-0.8.5
+WRKSRC=		${WRKDIR}/Pmw
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=pmw/}
 
@@ -11,7 +12,6 @@ HOMEPAGE=	http://pmw.sourceforge.net/
 COMMENT=	python meta widgets
 
 PLIST_SRC=      ${WRKDIR}/.PLIST_SRC
-WRKSRC=		${WRKDIR}/Pmw
 
 USE_BUILDLINK2=	YES
 
diff --git a/x11/qwspritefield/Makefile b/x11/qwspritefield/Makefile
index aaf7e6e6a08..1d61ff22351 100644
--- a/x11/qwspritefield/Makefile
+++ b/x11/qwspritefield/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.14 2001/03/11 08:32:38 tron Exp $
+# $NetBSD: Makefile,v 1.15 2003/03/29 12:43:09 jmmv Exp $
 
 DISTNAME=	QwSpriteField1.6
 PKGNAME=	qwspritefield-1.6
+WRKSRC=		${WRKDIR}/QwSpriteField
 CATEGORIES=	x11 graphics
 MASTER_SITES=	ftp://ftp.troll.no/contrib/
 
@@ -15,7 +16,6 @@ CONFLICTS=	kdesupport-1.0
 USE_X11BASE=	yes
 USE_GMAKE=	yes
 USE_LIBTOOL=	yes
-WRKSRC=		${WRKDIR}/QwSpriteField
 
 QW_INCLUDES=	Pix.h QwCluster.h QwPublicList.h QwSpriteField.h
 
diff --git a/x11/ruby-fox/Makefile b/x11/ruby-fox/Makefile
index dedf0029ed7..61132104c03 100644
--- a/x11/ruby-fox/Makefile
+++ b/x11/ruby-fox/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.7 2003/01/10 17:57:13 wiz Exp $
+# $NetBSD: Makefile,v 1.8 2003/03/29 12:43:09 jmmv Exp $
 
 DISTNAME=	FXRuby-0.99.174
 PKGNAME=	${RUBY_PKGNAMEPREFIX}fox-0.99.174
 PKGREVISION=	1
+WRKSRC=		${WRKDIST}/ext/fox
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=fxruby/}
 
@@ -16,7 +17,6 @@ DEPENDS+=	ruby-opengl-[0-9]*:../../graphics/ruby-opengl
 BUILDLINK_DEPENDS.fox=fox-0.99.174nb1
 
 WRKDIST=	${WRKDIR}/${DISTNAME}
-WRKSRC=		${WRKDIST}/ext/fox
 
 USE_BUILDLINK2=	yes
 DIST_SUBDIR=	ruby
diff --git a/x11/ruby-gtk/Makefile b/x11/ruby-gtk/Makefile
index 35dc93a9009..7ee53dab3d2 100644
--- a/x11/ruby-gtk/Makefile
+++ b/x11/ruby-gtk/Makefile
@@ -1,9 +1,10 @@
-# $NetBSD: Makefile,v 1.16 2002/03/21 04:37:43 fredb Exp $
+# $NetBSD: Makefile,v 1.17 2003/03/29 12:43:09 jmmv Exp $
 # FreeBSD: ports/x11-toolkits/ruby-gtk/Makefile,v 1.16 2000/10/15 15:45:59 knu Exp
 
 DISTNAME=	ruby-gtk-0.25
 PKGNAME=	${RUBY_PKGNAMEPREFIX}gtk-0.25
 PKGREVISION=	2
+WRKSRC=		${WRKDIR}/${DISTNAME:S/ruby-//}
 CATEGORIES=	x11
 MASTER_SITES=	http://www.ruby-lang.org/gtk/download/
 
@@ -13,8 +14,6 @@ COMMENT=	Ruby interface to Gtk+ toolkits
 
 DEPENDS+=	ruby-base>=1.6.7nb1:../../lang/ruby-base
 
-WRKSRC=		${WRKDIR}/${DISTNAME:S/ruby-//}
-
 DIST_SUBDIR=	ruby
 USE_RUBY_EXTCONF= yes
 
diff --git a/x11/ruby-tcltklib/Makefile b/x11/ruby-tcltklib/Makefile
index 69b6ae36e6b..ee0848c95d8 100644
--- a/x11/ruby-tcltklib/Makefile
+++ b/x11/ruby-tcltklib/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.2 2001/12/30 16:24:58 taca Exp $
+# $NetBSD: Makefile,v 1.3 2003/03/29 12:43:09 jmmv Exp $
 # FreeBSD: ports/lang/ruby-tcltklib/Makefile,v 1.21 2000/10/20 19:56:04 knu Exp
 
 DISTNAME=	${RUBY_DISTNAME}
 PKGNAME=	${RUBY_PKGNAMEPREFIX}tcltklib-${RUBY_VERSION}
+WRKSRC=		${RUBY_WRKSRC}/ext/tcltklib
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_RUBY}
 
@@ -15,7 +16,6 @@ DEPENDS+=	tk>=8.3:../../x11/tk
 
 DIST_SUBDIR=	ruby
 DISTINFO_FILE=	${RUBY_DISTINFO}
-WRKSRC=		${RUBY_WRKSRC}/ext/tcltklib
 
 EXTRACT_ELEMENTS= ${RUBY_DISTNAME}/ext/tcltklib
 USE_RUBY_EXTCONF= yes
diff --git a/x11/ruby-tk/Makefile b/x11/ruby-tk/Makefile
index d0135ee9906..1d1abc5ff37 100644
--- a/x11/ruby-tk/Makefile
+++ b/x11/ruby-tk/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.2 2001/12/30 16:25:34 taca Exp $
+# $NetBSD: Makefile,v 1.3 2003/03/29 12:43:09 jmmv Exp $
 # FreeBSD: ports/x11-toolkits/ruby-tk/Makefile,v 1.21 2000/10/20 19:56:04 knu Exp
 
 DISTNAME=	${RUBY_DISTNAME}
 PKGNAME=	${RUBY_PKGNAMEPREFIX}tk-${RUBY_VERSION}
+WRKSRC=		${RUBY_WRKSRC}/ext/tk
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_RUBY}
 
@@ -13,7 +14,6 @@ COMMENT=	Ruby interface to the Tk widget set
 DEPENDS+=	${RUBY_PKGNAMEPREFIX}tcltklib>=${RUBY_VERSION}:../../x11/ruby-tcltklib
 
 DIST_SUBDIR=	ruby
-WRKSRC=		${RUBY_WRKSRC}/ext/tk
 
 EXTRACT_ELEMENTS= ${RUBY_DISTNAME}/ext/tk
 USE_RUBY_EXTCONF= yes
diff --git a/x11/tk/Makefile b/x11/tk/Makefile
index 989020f2979..8def681d0d2 100644
--- a/x11/tk/Makefile
+++ b/x11/tk/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.20 2003/02/17 15:28:04 dillo Exp $
+# $NetBSD: Makefile,v 1.21 2003/03/29 12:43:10 jmmv Exp $
 
 DISTNAME=	tk8.3.4
 PKGNAME=	tk-8.3.4
+WRKSRC=		${WRKDIR}/${DISTNAME}/unix
 CATEGORIES=	x11
 MASTER_SITES=	ftp://ftp.scriptics.com/pub/tcl/tcl8_3/ \
 		ftp://ftp.informatik.uni-hamburg.de/pub/soft/lang/tcl/tcl8_3/
@@ -10,7 +11,6 @@ MAINTAINER=	jwise@netbsd.org
 HOMEPAGE=	http://www.tcltk.com/
 COMMENT=	Graphical toolkit for TCL
 
-WRKSRC=			${WRKDIR}/${DISTNAME}/unix
 GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--with-tcl=${BUILDLINK_PREFIX.tcl}/lib
 MAKE_ENV+=		TOUCH="${TOUCH}"
diff --git a/x11/tkman/Makefile b/x11/tkman/Makefile
index ace45cb2df4..a114424419c 100644
--- a/x11/tkman/Makefile
+++ b/x11/tkman/Makefile
@@ -1,9 +1,10 @@
-# $NetBSD: Makefile,v 1.30 2001/12/03 18:05:25 wiz Exp $
+# $NetBSD: Makefile,v 1.31 2003/03/29 12:43:10 jmmv Exp $
 # FreeBSD Id: Makefile,v 1.28 1997/12/08 15:51:20 tg Exp
 #
 
 DISTNAME=		tkman
 PKGNAME=		tkman-2.1
+WRKSRC=			${WRKDIR}/${PKGNAME}
 CATEGORIES=		x11
 MASTER_SITES=		ftp://tkman.sourceforge.net/pub/tkman/ \
 			http://tkman.sourceforge.net/
@@ -18,8 +19,6 @@ DEPENDS+=		tk>=8.3.2:../../x11/tk
 USE_RMAN=		yes
 USE_X11=		yes
 
-WRKSRC=			${WRKDIR}/${PKGNAME}
-
 post-install:
 	${SED} -e 's|@@LOCALBASE@@|${LOCALBASE}|' \
 		-e 's|@@PREFIX@@|${PREFIX}|' \
diff --git a/x11/unclutter/Makefile b/x11/unclutter/Makefile
index 0e7534a8a43..e28c437e39b 100644
--- a/x11/unclutter/Makefile
+++ b/x11/unclutter/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.10 2001/02/17 17:06:52 wiz Exp $
+# $NetBSD: Makefile,v 1.11 2003/03/29 12:43:10 jmmv Exp $
 #
 
 DISTNAME=	unclutter-8
+WRKSRC=		${WRKDIR}/unclutter
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_XCONTRIB:=utilities/}
 EXTRACT_SUFX=	.tar.Z
@@ -9,7 +10,6 @@ EXTRACT_SUFX=	.tar.Z
 MAINTAINER=	mycroft@netbsd.org
 COMMENT=	Remove idle cursor image from screen
 
-WRKSRC=		${WRKDIR}/unclutter
 USE_IMAKE=	yes
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/wmfstatus/Makefile b/x11/wmfstatus/Makefile
index aecc78cc56a..8b7ac7fd208 100644
--- a/x11/wmfstatus/Makefile
+++ b/x11/wmfstatus/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.6 2002/10/21 13:34:47 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2003/03/29 12:43:10 jmmv Exp $
 
 DISTNAME=	wmfstatus-0.4
+WRKSRC=		${WRKDIR}/${DISTNAME}/wmfstatus
 CATEGORIES=	x11
 MASTER_SITES=	http://www.finik.net/files/
 
@@ -11,8 +12,6 @@ COMMENT=	general purpose 8x5 LCD screen for WindowMaker
 USE_BUILDLINK2=	YES
 USE_X11=	YES
 
-WRKSRC=		${WRKDIR}/${DISTNAME}/wmfstatus
-
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/wmfstatus ${PREFIX}/bin
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/wmfstatus
diff --git a/x11/wx1Motif/Makefile b/x11/wx1Motif/Makefile
index 8b573fc191e..7a698dcc72f 100644
--- a/x11/wx1Motif/Makefile
+++ b/x11/wx1Motif/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.4 2002/12/24 18:55:43 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2003/03/29 12:43:11 jmmv Exp $
 #
 
 DISTNAME=		wx1Motif-1.68e
+WRKSRC=			${WRKDIR}
 CATEGORIES=		x11
 MASTER_SITES=		ftp://oracle.fastpicsystems.com/pub/wxwin/1.68E/unix/
 DISTFILES=		wx168_1.tgz wx168_2.tgz
@@ -10,7 +11,6 @@ MAINTAINER=		collver1@attbi.com
 HOMEPAGE=		http://www.wxwindows.org
 COMMENT=		Motif-based implementation of wxWindows 1
 
-WRKSRC=			${WRKDIR}
 USE_BUILDLINK2=		# defined
 USE_X11=		# defined
 
diff --git a/x11/x3270/Makefile b/x11/x3270/Makefile
index ef5ef7935b4..e62078478e2 100644
--- a/x11/x3270/Makefile
+++ b/x11/x3270/Makefile
@@ -1,10 +1,11 @@
-# $NetBSD: Makefile,v 1.10 2003/03/03 04:17:42 jschauma Exp $
+# $NetBSD: Makefile,v 1.11 2003/03/29 12:43:11 jmmv Exp $
 # FreeBSD Id: Makefile,v 1.10 1997/10/15 20:23:40 max Exp
 #
 
 DISTNAME=	x3270-3213
 PKGNAME=	x3270-3.2.13
 PKGREVISION=	1
+WRKSRC=		${WRKDIR}/x3270-3.2
 CATEGORIES=	x11
 MASTER_SITES=	http://www.geocities.com/SiliconValley/Peaks/7814/
 EXTRACT_SUFX=	.tgz
@@ -13,7 +14,6 @@ MAINTAINER=     volf@oasis.IAEhv.nl
 HOMEPAGE=	http://www.geocities.com/SiliconValley/Peaks/7814/
 COMMENT=	3270 Terminal emulator
 
-WRKSRC=		${WRKDIR}/x3270-3.2
 USE_IMAKE=	yes
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/xclip/Makefile b/x11/xclip/Makefile
index bdfd9da9324..65073467e5f 100644
--- a/x11/xclip/Makefile
+++ b/x11/xclip/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.2 2003/03/03 04:17:40 jschauma Exp $
+# $NetBSD: Makefile,v 1.3 2003/03/29 12:43:11 jmmv Exp $
 #
 
 DISTNAME=	xclip-0.08
 PKGREVISION=	1
+WRKSRC=		${WRKDIR}/xclip
 CATEGORIES=	x11
 MASTER_SITES=	http://people.debian.org/~kims/xclip/
 
@@ -10,7 +11,6 @@ MAINTAINER=	packages@netbsd.org
 HOMEPAGE=	http://people.debian.org/~kims/xclip/
 COMMENT=	Command line interface to the X windows clipboard
 
-WRKSRC=		${WRKDIR}/xclip
 USE_IMAKE=	YES
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/xcolors/Makefile b/x11/xcolors/Makefile
index f9fc190c922..1ce252572fe 100644
--- a/x11/xcolors/Makefile
+++ b/x11/xcolors/Makefile
@@ -1,17 +1,17 @@
-# $NetBSD: Makefile,v 1.8 2003/03/03 04:17:40 jschauma Exp $
+# $NetBSD: Makefile,v 1.9 2003/03/29 12:43:11 jmmv Exp $
 # FreeBSD: Makefile,v 1.9 1998/01/22 00:41:36 fenner Exp
 #
 
 DISTNAME=	xcolors
 PKGNAME=	xcolors-1.3
 PKGREVISION=	1
+WRKSRC=		${WRKDIR}/xcolors
 CATEGORIES=	x11
 MASTER_SITES=	ftp://ftp.tut.ac.jp/X11/X11R6/contrib/programs/
 
 MAINTAINER=	packages@netbsd.org
 COMMENT=	Display all (ok, most of) the colors in the universe
 
-WRKSRC=		${WRKDIR}/xcolors
 USE_IMAKE=	yes
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/xcolorsel/Makefile b/x11/xcolorsel/Makefile
index 3eb2f0385a5..9a7ca82b95d 100644
--- a/x11/xcolorsel/Makefile
+++ b/x11/xcolorsel/Makefile
@@ -1,17 +1,16 @@
-# $NetBSD: Makefile,v 1.10 2003/03/03 04:17:39 jschauma Exp $
+# $NetBSD: Makefile,v 1.11 2003/03/29 12:43:11 jmmv Exp $
 #
 
 DISTNAME=	xcolorsel-1.1a-src
 PKGNAME=	xcolorsel-1.1a
 PKGREVISION=	1
+WRKSRC=		${WRKDIR}/xcolorsel
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_XCONTRIB:=utilities/}
 
 MAINTAINER=	perry@netbsd.org
 COMMENT=	Browse and select named X colors from rgb.txt
 
-WRKSRC=		${WRKDIR}/xcolorsel
-
 USE_BUILDLINK2=	yes
 USE_IMAKE=	yes
 XAW_TYPE?=	3d
diff --git a/x11/xcursorgen/Makefile b/x11/xcursorgen/Makefile
index b6f9fe6b886..734c9d3d981 100644
--- a/x11/xcursorgen/Makefile
+++ b/x11/xcursorgen/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.1.1.1 2003/03/08 08:25:30 tron Exp $
+# $NetBSD: Makefile,v 1.2 2003/03/29 12:43:12 jmmv Exp $
 
 DISTNAME=	xcursorgen-4.3.0
+WRKSRC=		${WRKDIR}/${DISTNAME:C/-.*//}
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_LOCAL}
 EXTRACT_SUFX=	.tar.bz2
@@ -12,8 +13,6 @@ COMMENT=	Create an X cursor file from a collection of PNG images
 USE_BUILDLINK=	YES
 USE_IMAKE=	YES
 
-WRKSRC=		${WRKDIR}/${DISTNAME:C/-.*//}
-
 .include "../../mk/bsd.prefs.mk"
 
 .if !exists(${X11BASE}/bin/xcursor-config)
diff --git a/x11/xdaemon/Makefile b/x11/xdaemon/Makefile
index 5406cefe9a4..41cfd7c2c49 100644
--- a/x11/xdaemon/Makefile
+++ b/x11/xdaemon/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.9 2003/03/28 21:14:41 wiz Exp $
+# $NetBSD: Makefile,v 1.10 2003/03/29 12:43:12 jmmv Exp $
 
 DISTNAME=	xdaemon-1.0
+WRKSRC=		${WRKDIR}
 CATEGORIES=	games x11
 MASTER_SITES=	${MASTER_SITE_LOCAL}
 DISTFILES=	${PIX} Daemon.README
@@ -18,7 +19,6 @@ PIX=	xdaemon_bw.xbm		xdaemon2_bw.xbm \
 	xdaemon_color.xpm	xdaemon2_color.xpm \
 	xdaemon_icon.xbm	xdaemon2_icon.xbm \
 	xdaemon_mask.xbm	xdaemon2_mask.xbm
-WRKSRC=		${WRKDIR}
 NO_CONFIGURE=	yes
 NO_BUILD=	yes
 NO_MTREE=	yes
diff --git a/x11/xdaemon2/Makefile b/x11/xdaemon2/Makefile
index 5655d42b2ac..42e090ae7df 100644
--- a/x11/xdaemon2/Makefile
+++ b/x11/xdaemon2/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.6 2003/03/28 21:14:42 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2003/03/29 12:43:12 jmmv Exp $
 
 DISTNAME=	xdaemon-2.0
 PKGREVISION=	1
+#WRKSRC=	${WRKDIR}
 CATEGORIES=	games x11
 MASTER_SITES=	${MASTER_SITE_LOCAL}
 DISTFILES=	${PIX} Daemon.README
@@ -16,7 +17,6 @@ CONFLICT+=	xdaemon-1.*
 
 DIST_SUBDIR=xdaemon
 PIX=		xdaemon.png xdaemon2.png
-#WRKSRC=	${WRKDIR}
 NO_CONFIGURE=	yes
 NO_BUILD=	yes
 NO_MTREE=	yes
diff --git a/x11/xdm3d/Makefile b/x11/xdm3d/Makefile
index 3e9466d158c..91f49e0b947 100644
--- a/x11/xdm3d/Makefile
+++ b/x11/xdm3d/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.7 2001/02/25 04:18:28 hubertf Exp $
+# $NetBSD: Makefile,v 1.8 2003/03/29 12:43:12 jmmv Exp $
 
 DISTNAME=		xdm3d-1.0
+WRKSRC=			${WRKDIR}/xdm
 CATEGORIES=		x11
 MASTER_SITES=		${MASTER_SITE_LOCAL}
 
@@ -8,7 +9,6 @@ MAINTAINER=		root@garbled.net
 HOMEPAGE=		http://www.spade.com/linux/XBanner/
 COMMENT=		Replacement for xdm with 3D effects
 
-WRKSRC=			${WRKDIR}/xdm
 NO_INSTALL_MANPAGES=	yes
 USE_IMAKE=		yes
 
diff --git a/x11/xephem/Makefile b/x11/xephem/Makefile
index d3fa73000e9..22abd96f068 100644
--- a/x11/xephem/Makefile
+++ b/x11/xephem/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.15 2003/03/03 04:17:38 jschauma Exp $
+# $NetBSD: Makefile,v 1.16 2003/03/29 12:43:12 jmmv Exp $
 
 DISTNAME=	xephem-3.5.2
 PKGREVISION=	1
+WRKSRC=		${WRKDIR}/${DISTNAME}/GUI/xephem
 CATEGORIES=	x11
 MASTER_SITES=	http://www.clearskyinstitute.com/xephem/ \
 		ftp://iphcip1.physik.uni-mainz.de/pub/xephem/
@@ -16,7 +17,6 @@ USE_BUILDLINK2=	yes
 USE_IMAKE=	yes
 PERL_SCRIPTS=	astorb2edb.pl mpcorb2edb.pl
 
-WRKSRC=		${WRKDIR}/${DISTNAME}/GUI/xephem
 LIBSRC1=	${WRKDIR}/${DISTNAME}/libastro
 LIBSRC2=	${WRKDIR}/${DISTNAME}/libip
 ALL_TARGET=	# empty
diff --git a/x11/xfishtank/Makefile b/x11/xfishtank/Makefile
index 6ad7f67d360..4b97dc02f37 100644
--- a/x11/xfishtank/Makefile
+++ b/x11/xfishtank/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.6 2001/02/17 17:07:07 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2003/03/29 12:43:13 jmmv Exp $
 # FreeBSD Id: Makefile,v 1.2 1997/06/17 07:45:12 asami Exp
 #
 
 DISTNAME=		xfishtank-2.2
+WRKSRC=			${WRKDIR}/xfishtank2.0
 CATEGORIES=		x11
 MASTER_SITES=		ftp://ftp.uni-koeln.de/windows/xcontrib/
 
@@ -10,7 +11,6 @@ MAINTAINER=		packages@netbsd.org
 COMMENT=		Make fish swim in the background of your screen
 
 USE_IMAKE=		yes
-WRKSRC=			${WRKDIR}/xfishtank2.0
 NO_INSTALL_MANPAGES=	yes
 
 post-patch:
diff --git a/x11/xjman/Makefile b/x11/xjman/Makefile
index 1a5a078c0f0..a73a6acd867 100644
--- a/x11/xjman/Makefile
+++ b/x11/xjman/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.1.1.1 2002/05/31 13:01:36 seb Exp $
+# $NetBSD: Makefile,v 1.2 2003/03/29 12:43:13 jmmv Exp $
 # FreeBSD Id: ports/japanese/xjman/Makefile,v 1.10 1999/10/30 15:34:24 sada Exp
 
 DISTNAME=	xjman-0.5
+WRKSRC=		${WRKDIR}/man/ja_JP.eucJP
 CATEGORIES=	japanese x11
 MASTER_SITES=	http://xjman.dsl.gr.jp/
 EXTRACT_SUFX=	.tar.bz2
@@ -14,7 +15,6 @@ DEPENDS+=	ja-man-[0-9]*:../../misc/ja-man
 
 USE_X11BASE=	yes
 PLIST_SRC=	${WRKDIR}/PLIST
-WRKSRC=		${WRKDIR}/man/ja_JP.eucJP
 XJMANDIR=	man/ja_JP.EUC
 MAKE_ENV+=	XJMANDIR=${XJMANDIR}
 
diff --git a/x11/xmindpath/Makefile b/x11/xmindpath/Makefile
index 15f3b29817c..bcc13a2b984 100644
--- a/x11/xmindpath/Makefile
+++ b/x11/xmindpath/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.6 2001/09/30 05:11:58 itojun Exp $
+# $NetBSD: Makefile,v 1.7 2003/03/29 12:43:13 jmmv Exp $
 
 DISTNAME=	magicpoint-1.09a
 PKGNAME=	xmindpath-1.09a
+WRKSRC=		${WRKDIR}/${DISTNAME}/contrib/xmindpath
 CATEGORIES=	x11
 MASTER_SITES=	ftp://ftp.mew.org/pub/MagicPoint/
 
@@ -11,6 +12,4 @@ COMMENT=	MindPath PocketPoint user-level driver for X11
 GNU_CONFIGURE=	yes
 USE_X11=	yes
 
-WRKSRC=		${WRKDIR}/${DISTNAME}/contrib/xmindpath
-
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/xmountains/Makefile b/x11/xmountains/Makefile
index 6891ff08f4f..c72f9dc2281 100644
--- a/x11/xmountains/Makefile
+++ b/x11/xmountains/Makefile
@@ -1,9 +1,10 @@
-# $NetBSD: Makefile,v 1.7 2003/03/03 04:17:32 jschauma Exp $
+# $NetBSD: Makefile,v 1.8 2003/03/29 12:43:13 jmmv Exp $
 #
 
 DISTNAME=	xmountains_2.6
 PKGNAME=	${DISTNAME:C/_/-/}
 PKGREVISION=	1
+WRKSRC=		${WRKDIR}
 CATEGORIES=	x11
 MASTER_SITES=	http://www.epcc.ed.ac.uk/~spb/xmountains/
 
@@ -14,6 +15,4 @@ COMMENT=	Fractal terrain generator for X11
 USE_IMAKE=	YES
 USE_X11BASE=	YES
 
-WRKSRC=		${WRKDIR}
-
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/xmove/Makefile b/x11/xmove/Makefile
index 41294c22d9f..8530911db1c 100644
--- a/x11/xmove/Makefile
+++ b/x11/xmove/Makefile
@@ -1,15 +1,15 @@
-# $NetBSD: Makefile,v 1.7 2001/02/25 04:18:29 hubertf Exp $
+# $NetBSD: Makefile,v 1.8 2003/03/29 12:43:13 jmmv Exp $
 #
 
 DISTNAME=	xmove.2.0beta2
 PKGNAME=	xmove-2.0b2
+WRKSRC=		${WRKDIR}/xmove
 CATEGORIES=	x11
 MASTER_SITES=	ftp://ftp.cs.columbia.edu/pub/xmove/
 
 MAINTAINER=	packages@netbsd.org
 COMMENT=	Move an X11 display between screens and displays
 
-WRKSRC=		${WRKDIR}/xmove
 USE_IMAKE=	yes
 XMOVEDOCDIR=	${X11PREFIX}/share/doc/xmove
 
diff --git a/x11/xneko/Makefile b/x11/xneko/Makefile
index baa21f6f9c6..76434754dc5 100644
--- a/x11/xneko/Makefile
+++ b/x11/xneko/Makefile
@@ -1,9 +1,10 @@
-# $NetBSD: Makefile,v 1.11 2001/05/21 22:01:50 wiz Exp $
+# $NetBSD: Makefile,v 1.12 2003/03/29 12:43:14 jmmv Exp $
 # FreeBSD Id: Makefile,v 1.6 1997/03/12 08:21:35 asami Exp
 #
 
 DISTNAME=	xneko
 PKGNAME=	xneko-4.4
+WRKSRC=		${WRKDIR}/pub/bsd-sources/4.4BSD-Lite/usr/src/games/xneko
 CATEGORIES=	x11 games
 MASTER_SITES=	ftp://ftp.cdrom.com/pub/bsd-sources/4.4BSD-Lite/usr/src/games/
 
@@ -11,7 +12,6 @@ MAINTAINER=	packages@netbsd.org
 COMMENT=	Classic BSD4.4 cat-and-mouse
 
 USE_X11BASE=	yes
-WRKSRC=		${WRKDIR}/pub/bsd-sources/4.4BSD-Lite/usr/src/games/xneko
 MANCOMPRESSED_IF_MANZ=	yes
 
 PLIST_SRC=	${WRKDIR}/PLIST
diff --git a/x11/xpaste/Makefile b/x11/xpaste/Makefile
index 2c67708dcfc..d1b0163cb90 100644
--- a/x11/xpaste/Makefile
+++ b/x11/xpaste/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.3 2003/03/03 04:17:30 jschauma Exp $
+# $NetBSD: Makefile,v 1.4 2003/03/29 12:43:14 jmmv Exp $
 #
 
 DISTNAME=	xpaste-1.1
 PKGREVISION=	1
+WRKSRC=		${WRKDIR}
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_XCONTRIB:=utilities/}
 EXTRACT_SUFX=	.shar.gz
@@ -11,6 +12,5 @@ MAINTAINER=	seb@pbox.org
 COMMENT=	Display the content of the X11 paste buffer in a window
 
 USE_IMAKE=	yes
-WRKSRC=		${WRKDIR}
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/xphoon/Makefile b/x11/xphoon/Makefile
index 83dc6dfb696..7efc0797341 100644
--- a/x11/xphoon/Makefile
+++ b/x11/xphoon/Makefile
@@ -1,9 +1,10 @@
-# $NetBSD: Makefile,v 1.5 2003/03/03 04:17:30 jschauma Exp $
+# $NetBSD: Makefile,v 1.6 2003/03/29 12:43:14 jmmv Exp $
 #
 
 DISTNAME=	xphoon.tar
 PKGNAME=	xphoon-19910918
 PKGREVISION=	1
+WRKSRC=		${WRKDIR}/xphoon
 CATEGORIES=	x11
 MASTER_SITES=	ftp://ftp.x.org/R5contrib/ \
 		ftp://ftp.gwdg.de/pub/x11/x.org/contrib/ \
@@ -13,8 +14,6 @@ EXTRACT_SUFX=	.Z
 MAINTAINER=	seb@pbox.org
 COMMENT=	Set the root window to the moon in its current phase
 
-WRKSRC=		${WRKDIR}/xphoon
-
 USE_BUILDLINK2=	yes
 USE_IMAKE=      yes
 
diff --git a/x11/xpmicons/Makefile b/x11/xpmicons/Makefile
index 8f89574f9d1..cf0c5af5938 100644
--- a/x11/xpmicons/Makefile
+++ b/x11/xpmicons/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.5 2003/02/10 11:53:16 grant Exp $
+# $NetBSD: Makefile,v 1.6 2003/03/29 12:43:14 jmmv Exp $
 
 DISTNAME=	xpmicons-1.0
+WRKSRC=		${WRKDIR}
 CATEGORIES=	x11
 MASTER_SITES=	http://www.plig.org/xwinman/ \
 		ftp://ftp.cit.gu.edu.au/pub/AIcons/ \
@@ -17,7 +18,6 @@ MAINTAINER=	root@garbled.net
 COMMENT=	huge collection of icons for any windowmanager
 
 DIST_SUBDIR=	icons
-WRKSRC=		${WRKDIR}
 USE_X11BASE=	yes
 NO_BUILD=	yes
 
diff --git a/x11/xpns/Makefile b/x11/xpns/Makefile
index 9e6f2f8e25f..4cb7b623336 100644
--- a/x11/xpns/Makefile
+++ b/x11/xpns/Makefile
@@ -1,9 +1,10 @@
-# $NetBSD: Makefile,v 1.11 2001/09/09 20:36:55 agc Exp $
+# $NetBSD: Makefile,v 1.12 2003/03/29 12:43:14 jmmv Exp $
 # FreeBSD Id: Makefile,v 1.2 1997/06/29 09:38:20 obrien Exp
 #
 
 DISTNAME=	pns_source
 PKGNAME=	xpns-1.0
+WRKSRC=		${WRKDIR}
 CATEGORIES=	x11 cad
 MASTER_SITES=	ftp://ftp.informatik.uni-stuttgart.de/pub/petri-nets/
 EXTRACT_SUFX=	.tar.Z
@@ -13,7 +14,6 @@ HOMEPAGE=	http://www.informatik.uni-stuttgart.de/ipvr/bv/pns/pns.html
 COMMENT=	Petri-Net Simulator for Xwindows
 
 USE_X11BASE=	yes
-WRKSRC=		${WRKDIR}
 MAKEFILE=	makefile
 ALL_TARGET=	pns
 
diff --git a/x11/xpostit/Makefile b/x11/xpostit/Makefile
index b7f566c58f3..a91a40b2e83 100644
--- a/x11/xpostit/Makefile
+++ b/x11/xpostit/Makefile
@@ -1,9 +1,10 @@
-# $NetBSD: Makefile,v 1.2 2003/03/03 04:17:29 jschauma Exp $
+# $NetBSD: Makefile,v 1.3 2003/03/29 12:43:15 jmmv Exp $
 #
 
 DISTNAME=	xpostit3.3.1
 PKGNAME=	xpostit-3.3.1
 PKGREVISION=	1
+WRKSRC=		${WRKDIR}/xpostit
 CATEGORIES=	x11
 MASTER_SITES=	ftp://ftp.x.org/R5contrib/ \
 		ftp://ftp.freesoftware.com/pub/X11/R5contrib/
@@ -13,7 +14,6 @@ MAINTAINER=	packages@netbsd.org
 COMMENT=	Post notes to yourself on the screen
 #HOMEPAGE=
 
-WRKSRC=		${WRKDIR}/xpostit
 USE_IMAKE=	yes
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/xview-clients/Makefile b/x11/xview-clients/Makefile
index 642021cb7a1..5863366ce55 100644
--- a/x11/xview-clients/Makefile
+++ b/x11/xview-clients/Makefile
@@ -1,10 +1,11 @@
-# $NetBSD: Makefile,v 1.19 2003/03/03 04:17:27 jschauma Exp $
+# $NetBSD: Makefile,v 1.20 2003/03/29 12:43:15 jmmv Exp $
 # $FreeBSD Id: Makefile,v 1.11 1996/11/16 10:49:52 asami Exp
 #
 
 DISTNAME=		xview3.2p1-X11R6
 PKGNAME=		xview-clients-3.2.1
 PKGREVISION=		1
+WRKSRC=			${WRKDIR}/${DISTNAME}/clients
 CATEGORIES=		x11
 MASTER_SITES=		${MASTER_SITE_LOCAL}
 
@@ -16,7 +17,6 @@ NOT_FOR_PLATFORM=       *-*-alpha       # it builds but everything segfaults...
 NO_SRC_ON_FTP=		Already in MASTER_SITE_LOCAL
 
 EXTRACT_ELEMENTS=	${DISTNAME}/clients ${DISTNAME}/images
-WRKSRC=			${WRKDIR}/${DISTNAME}/clients
 
 USE_BUILDLINK2=		# defined
 USE_IMAKE=		# defined
diff --git a/x11/xview-config/Makefile b/x11/xview-config/Makefile
index 34227a1770c..bbc29193818 100644
--- a/x11/xview-config/Makefile
+++ b/x11/xview-config/Makefile
@@ -1,10 +1,11 @@
-# $NetBSD: Makefile,v 1.14 2002/08/25 18:40:50 jlam Exp $
+# $NetBSD: Makefile,v 1.15 2003/03/29 12:43:15 jmmv Exp $
 # $FreeBSD Id: Makefile,v 1.9 1998/05/04 03:34:50 steve Exp
 #
 
 DISTNAME=		xview3.2p1-X11R6
 PKGNAME=		xview-config-3.2.1
 PKGREVISION=		2
+WRKSRC=      		${WRKDIR}/${EXTRACT_ELEMENTS}
 CATEGORIES=		x11
 MASTER_SITES=		${MASTER_SITE_LOCAL}
 
@@ -14,7 +15,6 @@ COMMENT=		OpenLook Toolkit config files
 NO_SRC_ON_FTP=		Already in MASTER_SITE_LOCAL
 
 EXTRACT_ELEMENTS=	${DISTNAME}/config
-WRKSRC=      		${WRKDIR}/${EXTRACT_ELEMENTS}
 
 USE_BUILDLINK2=		# defined
 USE_IMAKE=		# defined