Move WRKSRC definition away from the first paragraph in a Makefile.

58 files changed, 121 insertions, 119 deletions

diff --git a/x11/9term/Makefile b/x11/9term/Makefile
index 0a24c02c5ec..51b245c7c1b 100644
--- a/x11/9term/Makefile
+++ b/x11/9term/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.13 2003/07/17 22:56:19 grant Exp $
+# $NetBSD: Makefile,v 1.14 2004/01/20 12:28:26 agc 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/
 
@@ -16,6 +15,7 @@ BUILDLINK_DEPMETHOD.sam=	full
 
 NOT_FOR_PLATFORM=	*-*-alpha	#LP64 Problems
 
+WRKSRC=			${WRKDIR}
 USE_BUILDLINK2=		yes
 USE_X11=		yes
 
diff --git a/x11/XF86Setup/Makefile b/x11/XF86Setup/Makefile
index 55600c70540..a388f87244b 100644
--- a/x11/XF86Setup/Makefile
+++ b/x11/XF86Setup/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.28 2003/07/17 22:56:19 grant Exp $
+# $NetBSD: Makefile,v 1.29 2004/01/20 12:28:26 agc Exp $
 
 DISTNAME=		XF86Setup-3.3.6
 PKGREVISION=		1
-WRKSRC=			${WRKDIR}/hw/xfree86/XF86Setup
 CATEGORIES=		x11
 MASTER_SITES=		${MASTER_SITE_LOCAL}
 EXTRACT_SUFX=		.tar.bz2
@@ -16,6 +15,7 @@ BUILD_DEPENDS+=		tk>=8.3.2:../../x11/tk
 
 ONLY_FOR_PLATFORM=	*-*-i386
 
+WRKSRC=			${WRKDIR}/hw/xfree86/XF86Setup
 TCLLIB=			${LOCALBASE}/lib/libtcl83.a
 TKLIB=			${LOCALBASE}/lib/libtk83.a
 
diff --git a/x11/Xaw-Xpm/Makefile b/x11/Xaw-Xpm/Makefile
index 965cdecca98..0a229f022bb 100644
--- a/x11/Xaw-Xpm/Makefile
+++ b/x11/Xaw-Xpm/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.16 2002/10/10 12:58:44 wiz Exp $
+# $NetBSD: Makefile,v 1.17 2004/01/20 12:28:26 agc Exp $
 #
 
 DISTNAME=		Xaw-XPM-1.1
 PKGNAME=		Xaw-Xpm-1.1
-WRKSRC=			${WRKDIR}/XawXpm
 CATEGORIES=		x11
 MASTER_SITES=		${MASTER_SITE_SUNSITE:=libs/X/}
 
@@ -13,6 +12,7 @@ COMMENT=		Enhanced 3-D widgets based on the Athena Widget set and Xaw3d
 
 CONFLICTS=		Xaw3d-[0-9]*
 
+WRKSRC=			${WRKDIR}/XawXpm
 USE_BUILDLINK2=		YES
 USE_IMAKE=		YES
 PLIST_SRC=		${WRKDIR}/.PLIST_SRC
diff --git a/x11/Xaw3d/Makefile b/x11/Xaw3d/Makefile
index 2b3254620de..9fdc70dfd54 100644
--- a/x11/Xaw3d/Makefile
+++ b/x11/Xaw3d/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.35 2003/08/15 22:25:30 salo Exp $
+# $NetBSD: Makefile,v 1.36 2004/01/20 12:28:26 agc Exp $
 #
 
 DISTNAME=	Xaw3d-1.5
-WRKSRC=		${WRKDIR}/xc/lib/Xaw3d
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_XCONTRIB:=widgets/Xaw3d/R6.3/}
 
@@ -11,6 +10,7 @@ COMMENT=	3-D widgets based on the Athena Widget set
 
 CONFLICTS=	Xaw-Xpm-[0-9]*
 
+WRKSRC=		${WRKDIR}/xc/lib/Xaw3d
 USE_BUILDLINK2=	YES
 USE_IMAKE=	YES
 PLIST_SRC=	${WRKDIR}/PLIST-src
diff --git a/x11/asnap/Makefile b/x11/asnap/Makefile
index 7468a48d5a8..ff0a494977e 100644
--- a/x11/asnap/Makefile
+++ b/x11/asnap/Makefile
@@ -1,14 +1,14 @@
-# $NetBSD: Makefile,v 1.3 2003/07/17 22:56:21 grant Exp $
+# $NetBSD: Makefile,v 1.4 2004/01/20 12:28:26 agc Exp $
 
 DISTNAME=		asnap
 PKGNAME=		${DISTNAME}-1.0
-WRKSRC=			${WRKDIR}
 CATEGORIES=		x11
 MASTER_SITES=		${MASTER_SITE_XCONTRIB:S/contrib/R5contrib/}
 
 MAINTAINER=		he@NetBSD.org
 COMMENT=		Takes a snapshot of a region of the screen
 
+WRKSRC=			${WRKDIR}
 USE_IMAKE=		yes
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/blt/Makefile b/x11/blt/Makefile
index c5f97cdba8c..61ed947db77 100644
--- a/x11/blt/Makefile
+++ b/x11/blt/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.8 2003/07/21 17:38:26 martti Exp $
+# $NetBSD: Makefile,v 1.9 2004/01/20 12:28:26 agc Exp $
 #
 
 DISTNAME=	BLT2.4o
 PKGNAME=	blt-2.4o
-WRKSRC=		${WRKDIR}/blt2.4o
 CATEGORIES=	x11
 MASTER_SITES=	ftp://ftp.tcltk.com/aa004735/pub/blt/
 
@@ -11,6 +10,7 @@ MAINTAINER=	brook@nmsu.edu
 HOMEPAGE=	http://www.tcltk.com/blt/index.html
 COMMENT=	Extension to Tcl/Tk
 
+WRKSRC=			${WRKDIR}/blt2.4o
 USE_BUILDLINK2=		YES
 USE_X11=		YES
 GNU_CONFIGURE=		YES
diff --git a/x11/dfm/Makefile.common b/x11/dfm/Makefile.common
index d6c37f2fa70..6d9b502a7a2 100644
--- a/x11/dfm/Makefile.common
+++ b/x11/dfm/Makefile.common
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile.common,v 1.7 2003/05/02 11:56:57 wiz Exp $
+# $NetBSD: Makefile.common,v 1.8 2004/01/20 12:28:26 agc Exp $
 #
 
 DISTNAME=	dfm-0.99.9
 PKGREVISION=	2
-WRKSRC=		${WRKDIR}/dfm
 MASTER_SITES=	http://www.kaisersite.de/dfm/
 
+WRKSRC=			${WRKDIR}/dfm
 USE_BUILDLINK2=		yes
 USE_X11=		yes
 USE_PKGLOCALEDIR=	yes
diff --git a/x11/ebuilder/Makefile b/x11/ebuilder/Makefile
index 185ac1f8d10..a7d95ff403f 100644
--- a/x11/ebuilder/Makefile
+++ b/x11/ebuilder/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.18 2003/07/17 22:56:23 grant Exp $
+# $NetBSD: Makefile,v 1.19 2004/01/20 12:28:26 agc Exp $
 #
 
 DISTNAME=	ebuilder-0.56d
 PKGREVISION=	1
-WRKSRC=		${WRKDIR}/${DISTNAME}
 CATEGORIES=	x11 devel
 MASTER_SITES=	http://web.inter.nl.net/users/eavdmeer/src/
 
@@ -11,6 +10,7 @@ MAINTAINER=	drochner@NetBSD.org
 HOMEPAGE=	http://web.inter.nl.net/users/eavdmeer/index.html
 COMMENT=	GUI builder for the Qt library
 
+WRKSRC=		${WRKDIR}/${DISTNAME}
 USE_BUILDLINK2=	yes
 USE_X11=	yes
 USE_GMAKE=	yes
diff --git a/x11/egtk/Makefile b/x11/egtk/Makefile
index ab8676edf64..9253a75ada1 100644
--- a/x11/egtk/Makefile
+++ b/x11/egtk/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.15 2003/07/17 22:56:23 grant Exp $
+# $NetBSD: Makefile,v 1.16 2004/01/20 12:28:26 agc Exp $
 #
 
 DISTNAME=	eGTK_0.3.4
 PKGNAME=	egtk-0.3.4
 PKGREVISION=	2
-WRKSRC=		${WRKDIR}/eGTK
 CATEGORIES=	x11
 MASTER_SITES=	http://www.netlabs.net/hp/richieb/downloads/
 
@@ -14,6 +13,7 @@ COMMENT=	Eiffel/GTK+ interface for SmallEiffel
 
 DEPENDS+=	smalleiffel-[0-9]*:../../lang/smalleiffel
 
+WRKSRC=		${WRKDIR}/eGTK
 USE_BUILDLINK2=	yes
 
 post-extract:
diff --git a/x11/fltk/Makefile b/x11/fltk/Makefile
index cf5f3dab8ec..9ad02930b6d 100644
--- a/x11/fltk/Makefile
+++ b/x11/fltk/Makefile
@@ -1,11 +1,10 @@
-# $NetBSD: Makefile,v 1.32 2003/11/30 22:58:40 jschauma Exp $
+# $NetBSD: Makefile,v 1.33 2004/01/20 12:28:26 agc Exp $
 #
 
 DISTNAME=	fltk-1.0.11-source
 PKGNAME=	${DISTNAME:S/-source//}
 PKGREVISION=	3
 VERS=		${DISTNAME:S/fltk-//:S/-source//}
-WRKSRC=		${WRKDIR}/${DISTNAME:S/-source//}
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=fltk/} \
 		ftp://ftp.fltk.org/pub/fltk/${VERS}/ \
@@ -19,6 +18,7 @@ MAINTAINER=	jlam@NetBSD.org
 HOMEPAGE=	http://www.fltk.org/
 COMMENT=	Fast Light Tool Kit for graphical user interfaces
 
+WRKSRC=			${WRKDIR}/${DISTNAME:S/-source//}
 USE_BUILDLINK2=		# defined
 USE_GCC_SHLIB=		# defined
 USE_GNU_TOOLS+=		make
diff --git a/x11/keylaunch/Makefile b/x11/keylaunch/Makefile
index 7ad333ff1a3..a12400c70ee 100644
--- a/x11/keylaunch/Makefile
+++ b/x11/keylaunch/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.5 2003/07/17 22:56:35 grant Exp $
+# $NetBSD: Makefile,v 1.6 2004/01/20 12:28:26 agc Exp $
 #
 
 DISTNAME=	keylaunch-1.3.0
-WRKSRC=		${WRKDIR}/keylaunch
 CATEGORIES=	x11
 MASTER_SITES=	http://www.kensden.pwp.blueyonder.co.uk/Oroborus/files/
 
@@ -10,6 +9,7 @@ MAINTAINER=	tech-pkg@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/modeline/Makefile b/x11/modeline/Makefile
index 2abc804441b..24305c2475d 100644
--- a/x11/modeline/Makefile
+++ b/x11/modeline/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.9 2003/07/21 17:38:29 martti Exp $
+# $NetBSD: Makefile,v 1.10 2004/01/20 12:28:26 agc Exp $
 
 DISTNAME=		modeline_vfr.c
 PKGNAME=		modeline-20001121
-WRKSRC=			${WRKDIR}/modeline
 CATEGORIES=		x11
 MASTER_SITES=		${MASTER_SITE_LOCAL}
 EXTRACT_SUFX=		# empty
@@ -11,6 +10,8 @@ MAINTAINER=		tech-pkg@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 8336de17b3b..36fb8f77645 100644
--- a/x11/oneko/Makefile
+++ b/x11/oneko/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.5 2003/03/29 12:43:08 jmmv Exp $
+# $NetBSD: Makefile,v 1.6 2004/01/20 12:28:26 agc 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 +13,7 @@ PATCH_DIST_STRIP=	-p1
 MAINTAINER=		johnam@mail.kemper.org
 COMMENT=		Like xneko except on the desktop and with other animals
 
+WRKSRC=			${WRKDIR}/oneko
 USE_IMAKE=		yes
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/openmotif/Makefile b/x11/openmotif/Makefile
index 5c1ffb3c30a..ea711adabc2 100644
--- a/x11/openmotif/Makefile
+++ b/x11/openmotif/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2003/11/20 11:13:51 heinz Exp $
+# $NetBSD: Makefile,v 1.24 2004/01/20 12:28:26 agc 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,7 +6,6 @@ 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,6 +22,7 @@ COMMENT=		The Open Group Motif toolkit for the X Window System
 
 CONFLICTS+=		lesstif-[0-9]*
 
+WRKSRC=			${WRKDIR}/motif
 DIST_SUBDIR=		openmotif
 USE_X11BASE=		yes
 USE_BUILDLINK2=		yes
diff --git a/x11/p5-Tk/Makefile b/x11/p5-Tk/Makefile
index 7dc95e8ecea..356e4d44374 100644
--- a/x11/p5-Tk/Makefile
+++ b/x11/p5-Tk/Makefile
@@ -1,11 +1,10 @@
-# $NetBSD: Makefile,v 1.34 2003/07/17 22:56:38 grant Exp $
+# $NetBSD: Makefile,v 1.35 2004/01/20 12:28:26 agc 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/}
 
@@ -15,6 +14,7 @@ COMMENT=	Perl5 interface to Tk
 
 BUILD_DEPENDS= 	p5-HTML-Parser>=3.19:../../www/p5-HTML-Parser
 
+WRKSRC=			${WRKDIR}/Tk800.024
 USE_BUILDLINK2=		YES
 USE_X11=		YES
 PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/Tk/.packlist
diff --git a/x11/p5-gtk/Makefile b/x11/p5-gtk/Makefile
index 7b9f52dbe21..29bbcf8e10b 100644
--- a/x11/p5-gtk/Makefile
+++ b/x11/p5-gtk/Makefile
@@ -1,15 +1,15 @@
-# $NetBSD: Makefile,v 1.25 2003/11/25 12:08:00 salo Exp $
+# $NetBSD: Makefile,v 1.26 2004/01/20 12:28:27 agc Exp $
 #
 
 .include "Makefile.common"
 
 PKGNAME=		p5-gtk-${GTKPERL_VERSION}
 SVR4_PKGNAME=		p5gtk
-WRKSRC=			${WRKDIR}/${DISTNAME}/Gtk
 
 MAINTAINER=		root@garbled.net
 COMMENT=		Perl bindings for GTK+
 
+WRKSRC=			${WRKDIR}/${DISTNAME}/Gtk
 MAKE_PARAMS=		INSTALLMAN3DIR=${PREFIX}/man/man3
 PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/Gtk/.packlist
 
diff --git a/x11/p5-gtk/Makefile.subpackage b/x11/p5-gtk/Makefile.subpackage
index ca0c6847535..acba727021e 100644
--- a/x11/p5-gtk/Makefile.subpackage
+++ b/x11/p5-gtk/Makefile.subpackage
@@ -1,16 +1,17 @@
-# $NetBSD: Makefile.subpackage,v 1.4 2003/11/25 12:08:00 salo Exp $
+# $NetBSD: Makefile.subpackage,v 1.5 2004/01/20 12:28:27 agc Exp $
 #
 # makefile fragment for p5-gtk sub-packages.  you need to
 # set SUBPACKAGE before including this.
 
 GTKDIR=		${WRKDIR}/${DISTNAME}/Gtk
-WRKSRC=		${WRKDIR}/${DISTNAME}/${SUBPACKAGE}
 
 DISTINFO_FILE=	${.CURDIR}/../../x11/p5-gtk/distinfo
 PATCHDIR=	${.CURDIR}/../../x11/p5-gtk/patches
 
 DEPENDS+=	p5-gtk-[0-9]*:../../x11/p5-gtk
 
+WRKSRC=		${WRKDIR}/${DISTNAME}/${SUBPACKAGE}
+
 .include "../../lang/perl5/buildlink2.mk"
 
 pre-configure:
diff --git a/x11/py-Pmw/Makefile b/x11/py-Pmw/Makefile
index c9563997759..5a021ff0364 100644
--- a/x11/py-Pmw/Makefile
+++ b/x11/py-Pmw/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.9 2003/07/21 17:38:31 martti Exp $
+# $NetBSD: Makefile,v 1.10 2004/01/20 12:28:27 agc Exp $
 #
 
 DISTNAME=	Pmw.0.8.5
 PKGNAME=	${PYPKGPREFIX}-Pmw-0.8.5
-WRKSRC=		${WRKDIR}/Pmw
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=pmw/}
 
@@ -13,6 +12,7 @@ COMMENT=	Python meta widgets
 
 PLIST_SRC=      ${WRKDIR}/.PLIST_SRC
 
+WRKSRC=		${WRKDIR}/Pmw
 USE_BUILDLINK2=	YES
 
 do-build:
diff --git a/x11/py-qt2/Makefile b/x11/py-qt2/Makefile
index 95a3000b51c..9c40b443022 100644
--- a/x11/py-qt2/Makefile
+++ b/x11/py-qt2/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.3 2003/07/17 22:56:40 grant Exp $
+# $NetBSD: Makefile,v 1.4 2004/01/20 12:28:27 agc Exp $
 #
 
 DISTNAME=	PyQt-3.1-Qt-2.3.1
 PKGNAME=	${PYPKGPREFIX}-qt2-3.1
-WRKSRC=		${WRKDIR}/PyQt-3.1
 CATEGORIES=	x11
 MASTER_SITES=	http://www.riverbankcomputing.co.uk/download/PyQt/
 
@@ -11,6 +10,7 @@ MAINTAINER=	drochner@NetBSD.org
 HOMEPAGE=	http://www.riverbankcomputing.co.uk/pyqt/index.php
 COMMENT=	Python bindings for the Qt tooltit
 
+WRKSRC=			${WRKDIR}/PyQt-3.1
 USE_BUILDLINK2=		# defined
 USE_X11=		# defined
 USE_LIBTOOL=		# defined
diff --git a/x11/py-wxWindows/Makefile b/x11/py-wxWindows/Makefile
index 93c1b898561..46f5439da65 100644
--- a/x11/py-wxWindows/Makefile
+++ b/x11/py-wxWindows/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.24 2004/01/10 20:56:32 recht Exp $
+# $NetBSD: Makefile,v 1.25 2004/01/20 12:28:27 agc Exp $
 #
 
 DISTNAME=	wxPythonSrc-2.4.2.4
 PKGNAME=	${PYPKGPREFIX}-wxWindows-2.4.2.4
 PKGREVISION=	3
-WRKSRC=		${WRKDIR}/wxPythonSrc-2.4.2.4/wxPython
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=wxpython/}
 
@@ -12,6 +11,7 @@ MAINTAINER=	tsarna@NetBSD.org
 HOMEPAGE=	http://wxpython.org/
 COMMENT=	wxPython: Python bindings for wxWindows
 
+WRKSRC=		${WRKDIR}/wxPythonSrc-2.4.2.4/wxPython
 USE_BUILDLINK2=	yes
 USE_GMAKE=	yes
 
diff --git a/x11/qt2-libs/Makefile.common b/x11/qt2-libs/Makefile.common
index 31d02bcad6e..a2b9de505bd 100644
--- a/x11/qt2-libs/Makefile.common
+++ b/x11/qt2-libs/Makefile.common
@@ -1,14 +1,14 @@
-# $NetBSD: Makefile.common,v 1.19 2002/10/25 10:56:05 bouyer Exp $
+# $NetBSD: Makefile.common,v 1.20 2004/01/20 12:28:27 agc Exp $
 #
 
 DISTNAME=	qt-x11-${QTVERSION}
-WRKSRC=		${WRKDIR}/qt-${QTVERSION}
 CATEGORIES=	x11
 MASTER_SITES=	ftp://ftp.trolltech.com/qt/source/ \
 		ftp://ftp.fu-berlin.de/unix/X11/gui/Qt/source/
 
 .include "../qt2/Makefile.common"
 
+WRKSRC=			${WRKDIR}/qt-${QTVERSION}
 HAS_CONFIGURE=		yes
 USE_X11BASE=		yes
 USE_GMAKE=		yes
diff --git a/x11/qtarch/Makefile b/x11/qtarch/Makefile
index 02e56265aba..5f9b96f3226 100644
--- a/x11/qtarch/Makefile
+++ b/x11/qtarch/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.19 2003/07/17 22:56:43 grant Exp $
+# $NetBSD: Makefile,v 1.20 2004/01/20 12:28:27 agc Exp $
 #
 
 DISTNAME=	qtarch-2.1-1
 PKGNAME=	qtarch-2.1
 PKGREVISION=	1
-WRKSRC=		${WRKDIR}/${PKGNAME_NOREV}
 CATEGORIES=	x11 devel
 MASTER_SITES=	ftp://qtarch.sourceforge.net/pub/qtarch/
 
@@ -12,6 +11,7 @@ MAINTAINER=	tech-pkg@NetBSD.org
 HOMEPAGE=	http://qtarch.sourceforge.net/
 COMMENT=	Graphical dialog editor for the Qt widget set
 
+WRKSRC=		${WRKDIR}/${PKGNAME_NOREV}
 USE_BUILDLINK2=	yes
 USE_X11=	yes
 USE_GMAKE=	yes
diff --git a/x11/qwspritefield/Makefile b/x11/qwspritefield/Makefile
index 1a82a15f7e1..2cf247e8cfc 100644
--- a/x11/qwspritefield/Makefile
+++ b/x11/qwspritefield/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.17 2003/07/17 22:56:43 grant Exp $
+# $NetBSD: Makefile,v 1.18 2004/01/20 12:28:27 agc Exp $
 
 DISTNAME=	QwSpriteField1.6
 PKGNAME=	qwspritefield-1.6
-WRKSRC=		${WRKDIR}/QwSpriteField
 CATEGORIES=	x11 graphics
 MASTER_SITES=	ftp://ftp.troll.no/contrib/
 
@@ -13,6 +12,7 @@ DEPENDS+=	qt1-1.44:../../x11/qt1
 
 CONFLICTS=	kdesupport-1.0
 
+WRKSRC=		${WRKDIR}/QwSpriteField
 USE_X11BASE=	yes
 USE_GMAKE=	yes
 USE_LIBTOOL=	yes
diff --git a/x11/ruby-fox/Makefile b/x11/ruby-fox/Makefile
index c3f7cdd560d..35a60f85463 100644
--- a/x11/ruby-fox/Makefile
+++ b/x11/ruby-fox/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.13 2004/01/03 18:50:00 reed Exp $
+# $NetBSD: Makefile,v 1.14 2004/01/20 12:28:27 agc Exp $
 
 DISTNAME=	FXRuby-1.0.25
 PKGNAME=	${RUBY_PKGNAMEPREFIX}fox-1.0.25
 PKGREVISION=			1
-WRKSRC=		${WRKDIST}/ext/fox
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=fxruby/}
 
@@ -14,6 +13,7 @@ COMMENT=	Ruby interface to FOX GUI library
 DEPENDS+=	ruby-opengl-[0-9]*:../../graphics/ruby-opengl
 WRKDIST=	${WRKDIR}/${DISTNAME}
 
+WRKSRC=		${WRKDIST}/ext/fox
 USE_BUILDLINK2=	yes
 DIST_SUBDIR=	ruby
 USE_RUBY_EXTCONF= # defined
diff --git a/x11/ruby-gtk/Makefile b/x11/ruby-gtk/Makefile
index 044c033cc64..dc65e23da34 100644
--- a/x11/ruby-gtk/Makefile
+++ b/x11/ruby-gtk/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.22 2004/01/03 18:50:00 reed Exp $
+# $NetBSD: Makefile,v 1.23 2004/01/20 12:28:27 agc 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=	5
-WRKSRC=		${WRKDIR}/${DISTNAME:S/ruby-//}
 CATEGORIES=	x11
 MASTER_SITES=	http://www.ruby-lang.org/gtk/download/
 
@@ -12,6 +11,7 @@ MAINTAINER=	taca@NetBSD.org
 HOMEPAGE=	http://www.ruby-lang.org/gtk/en/
 COMMENT=	Ruby interface to Gtk+ toolkits
 
+WRKSRC=		${WRKDIR}/${DISTNAME:S/ruby-//}
 USE_BUILDLINK2=	yes
 
 DIST_SUBDIR=	ruby
diff --git a/x11/ruby-tcltklib/Makefile b/x11/ruby-tcltklib/Makefile
index eecc6fe1bac..adc4d436a8b 100644
--- a/x11/ruby-tcltklib/Makefile
+++ b/x11/ruby-tcltklib/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.5 2003/12/19 12:04:20 sketch Exp $
+# $NetBSD: Makefile,v 1.6 2004/01/20 12:28:27 agc 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}
 PKGREVISION=	1
-WRKSRC=		${RUBY_WRKSRC}/ext/tcltklib
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_RUBY}
 
@@ -15,6 +14,7 @@ COMMENT=	Ruby interface to Tcl/Tk libraries
 DEPENDS+=	tcl>=8.3:../../lang/tcl
 DEPENDS+=	tk>=8.3:../../x11/tk
 
+WRKSRC=		${RUBY_WRKSRC}/ext/tcltklib
 DIST_SUBDIR=	ruby
 DISTINFO_FILE=	${RUBY_DISTINFO}
 
diff --git a/x11/ruby-tk/Makefile b/x11/ruby-tk/Makefile
index f57d546ac44..5c4d425fc34 100644
--- a/x11/ruby-tk/Makefile
+++ b/x11/ruby-tk/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.5 2003/12/19 12:04:20 sketch Exp $
+# $NetBSD: Makefile,v 1.6 2004/01/20 12:28:27 agc 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}
 PKGREVISION=	1
-WRKSRC=		${RUBY_WRKSRC}/ext/tk
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_RUBY}
 
@@ -14,6 +13,7 @@ COMMENT=	Ruby interface to the Tk widget set
 
 DEPENDS+=	${RUBY_PKGNAMEPREFIX}tcltklib>=${RUBY_VERSION}:../../x11/ruby-tcltklib
 
+WRKSRC=		${RUBY_WRKSRC}/ext/tk
 DIST_SUBDIR=	ruby
 
 EXTRACT_ELEMENTS= ${RUBY_DISTNAME}/ext/tk
diff --git a/x11/swing/Makefile b/x11/swing/Makefile
index ab2ddc5a480..ee760cd6bdf 100644
--- a/x11/swing/Makefile
+++ b/x11/swing/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.23 2003/08/23 15:27:00 jschauma Exp $
+# $NetBSD: Makefile,v 1.24 2004/01/20 12:28:27 agc Exp $
 
 DISTNAME=	swing1_1_1
 PKGNAME=	swing-1.1.1
 PKGREVISION=	1
-WRKSRC=		${WRKDIR}/swing-1.1.1fcs
 CATEGORIES=	devel x11 java
 MASTER_SITES=	# empty
 EXTRACT_SUFX=	.zip
@@ -21,6 +20,7 @@ NO_BIN_ON_CDROM=	${RESTRICTED}
 
 LICENSE=	sun-swing-license
 
+WRKSRC=		${WRKDIR}/swing-1.1.1fcs
 USE_JAVA=	run
 NO_CONFIGURE=	yes
 NO_BUILD=	yes
diff --git a/x11/tk-Tix/Makefile b/x11/tk-Tix/Makefile
index 436bc3324e6..8c929bdaaf2 100644
--- a/x11/tk-Tix/Makefile
+++ b/x11/tk-Tix/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.5 2003/07/17 22:56:47 grant Exp $
+# $NetBSD: Makefile,v 1.6 2004/01/20 12:28:27 agc Exp $
 #
 
 DISTNAME=	tix8.2.0b1
 PKGNAME=	tk-Tix-8.2.0b1
-WRKSRC=		${WRKDIR}/tix8.2.0/unix
 CATEGORIES=	x11 tcl tk
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=tixlibrary/}
 
@@ -11,6 +10,7 @@ MAINTAINER=	he@NetBSD.org
 HOMEPAGE=	http://tixlibrary.sourceforge.net/
 COMMENT=	Powerful widget library for Tcl/Tk
 
+WRKSRC=			${WRKDIR}/tix8.2.0/unix
 USE_BUILDLINK2=		yes
 USE_X11=		yes
 GNU_CONFIGURE=		yes
diff --git a/x11/tk/Makefile b/x11/tk/Makefile
index 65521e60939..539b8a0d5bf 100644
--- a/x11/tk/Makefile
+++ b/x11/tk/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.24 2004/01/05 11:24:18 jlam Exp $
+# $NetBSD: Makefile,v 1.25 2004/01/20 12:28:27 agc 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/
@@ -13,6 +12,7 @@ COMMENT=	Graphical toolkit for TCL
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
+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 e3c758b8c53..562a0e23b88 100644
--- a/x11/tkman/Makefile
+++ b/x11/tkman/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.34 2003/07/17 22:56:47 grant Exp $
+# $NetBSD: Makefile,v 1.35 2004/01/20 12:28: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_NOREV}
 CATEGORIES=		x11
 MASTER_SITES=		ftp://tkman.sourceforge.net/pub/tkman/ \
 			http://tkman.sourceforge.net/
@@ -16,6 +15,7 @@ COMMENT=		Tcl/Tk based manual browser
 DEPENDS+=		glimpse>=4.1:../../textproc/glimpse
 DEPENDS+=		tk>=8.3.2:../../x11/tk
 
+WRKSRC=			${WRKDIR}/${PKGNAME_NOREV}
 USE_RMAN=		yes
 USE_X11=		yes
 
diff --git a/x11/unclutter/Makefile b/x11/unclutter/Makefile
index 811eeb576f1..510e06e6b06 100644
--- a/x11/unclutter/Makefile
+++ b/x11/unclutter/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.12 2003/07/17 22:56:47 grant Exp $
+# $NetBSD: Makefile,v 1.13 2004/01/20 12:28:27 agc Exp $
 #
 
 DISTNAME=	unclutter-8
-WRKSRC=		${WRKDIR}/unclutter
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_XCONTRIB:=utilities/}
 EXTRACT_SUFX=	.tar.Z
@@ -10,6 +9,7 @@ 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 43eab3f2b72..9163ab6a11f 100644
--- a/x11/wmfstatus/Makefile
+++ b/x11/wmfstatus/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.9 2003/07/21 17:38:32 martti Exp $
+# $NetBSD: Makefile,v 1.10 2004/01/20 12:28:28 agc Exp $
 
 DISTNAME=	wmfstatus-0.4
-WRKSRC=		${WRKDIR}/${DISTNAME}/wmfstatus
 CATEGORIES=	x11
 MASTER_SITES=	http://www.finik.net/files/
 
@@ -9,6 +8,7 @@ MAINTAINER=	sakamoto@NetBSD.org
 HOMEPAGE=	http://www.finik.net/software.html
 COMMENT=	General purpose 8x5 LCD screen for WindowMaker
 
+WRKSRC=		${WRKDIR}/${DISTNAME}/wmfstatus
 USE_BUILDLINK2=	YES
 USE_X11=	YES
 
diff --git a/x11/wmweather/Makefile b/x11/wmweather/Makefile
index 317185c6689..440ab2ed37b 100644
--- a/x11/wmweather/Makefile
+++ b/x11/wmweather/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.13 2003/11/08 06:21:14 xtraeme Exp $
+# $NetBSD: Makefile,v 1.14 2004/01/20 12:28:28 agc Exp $
 #
 
 DISTNAME=	wmweather-2.4.2
-WRKSRC=		${WRKDIR}/${DISTNAME}/src
 CATEGORIES=	x11
 MASTER_SITES=	http://www.godisch.de/debian/wmweather/
 
@@ -10,6 +9,7 @@ MAINTAINER=	rh@NetBSD.org
 HOMEPAGE=	http://www.godisch.de/debian/wmweather/
 COMMENT=	WindowMaker DockApp showing local weather conditions
 
+WRKSRC=			${WRKDIR}/${DISTNAME}/src
 USE_BUILDLINK2=		# defined
 USE_X11=		yes
 
diff --git a/x11/wxWindows-docs/Makefile b/x11/wxWindows-docs/Makefile
index ca7b0098944..60f12230827 100644
--- a/x11/wxWindows-docs/Makefile
+++ b/x11/wxWindows-docs/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.4 2003/07/17 22:56:50 grant Exp $
+# $NetBSD: Makefile,v 1.5 2004/01/20 12:28:28 agc Exp $
 
 DISTNAME=		wxHTML22
 PKGNAME=		wxWindows-docs-2.2
-WRKSRC=			${WRKDIR}/wxHTML
 CATEGORIES=		x11
 MASTER_SITES=		ftp://wesley.informatik.uni-freiburg.de/pub/linux/wxxt/docs/
 EXTRACT_SUFX=		.tgz
@@ -11,6 +10,7 @@ MAINTAINER=		jlam@NetBSD.org
 HOMEPAGE=		http://www.freiburg.linux.de/~wxxt/docs.html
 COMMENT=		HTML documentation for wxWindows
 
+WRKSRC=			${WRKDIR}/wxHTML
 NO_CONFIGURE=		# defined
 NO_BUILD=		# defined
 
diff --git a/x11/x3270/Makefile b/x11/x3270/Makefile
index e62078478e2..df1d351ab7f 100644
--- a/x11/x3270/Makefile
+++ b/x11/x3270/Makefile
@@ -1,11 +1,10 @@
-# $NetBSD: Makefile,v 1.11 2003/03/29 12:43:11 jmmv Exp $
+# $NetBSD: Makefile,v 1.12 2004/01/20 12:28:28 agc 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
@@ -14,6 +13,7 @@ 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 ff60c16173c..563b5921c60 100644
--- a/x11/xclip/Makefile
+++ b/x11/xclip/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.5 2003/07/17 22:56:52 grant Exp $
+# $NetBSD: Makefile,v 1.6 2004/01/20 12:28:28 agc Exp $
 #
 
 DISTNAME=	xclip-0.08
 PKGREVISION=	1
-WRKSRC=		${WRKDIR}/xclip
 CATEGORIES=	x11
 MASTER_SITES=	http://people.debian.org/~kims/xclip/
 
@@ -11,6 +10,7 @@ MAINTAINER=	tech-pkg@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 ef17f8ba3eb..f30aa957c67 100644
--- a/x11/xcolors/Makefile
+++ b/x11/xcolors/Makefile
@@ -1,17 +1,17 @@
-# $NetBSD: Makefile,v 1.11 2003/07/17 22:56:52 grant Exp $
+# $NetBSD: Makefile,v 1.12 2004/01/20 12:28:28 agc 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=	tech-pkg@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 e927b108d73..1725c4ccfa6 100644
--- a/x11/xcolorsel/Makefile
+++ b/x11/xcolorsel/Makefile
@@ -1,16 +1,16 @@
-# $NetBSD: Makefile,v 1.13 2003/08/31 16:40:51 kei Exp $
+# $NetBSD: Makefile,v 1.14 2004/01/20 12:28:28 agc 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 402adfa0354..c0a70b0feea 100644
--- a/x11/xcursorgen/Makefile
+++ b/x11/xcursorgen/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.8 2003/08/15 02:02:45 jmc Exp $
+# $NetBSD: Makefile,v 1.9 2004/01/20 12:28:28 agc Exp $
 
 DISTNAME=	xcursorgen-4.3.0
-WRKSRC=		${WRKDIR}/${DISTNAME:C/-.*//}
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_LOCAL}
 EXTRACT_SUFX=	.tar.bz2
@@ -10,6 +9,7 @@ MAINTAINER=	xsrc-manager@NetBSD.org
 HOMEPAGE=	http://www.xfree86.org/
 COMMENT=	Create an X cursor file from a collection of PNG images
 
+WRKSRC=		${WRKDIR}/${DISTNAME:C/-.*//}
 USE_BUILDLINK2=	YES
 USE_IMAKE=	YES
 
diff --git a/x11/xdaemon/Makefile b/x11/xdaemon/Makefile
index 8800e762b04..8185ab9779b 100644
--- a/x11/xdaemon/Makefile
+++ b/x11/xdaemon/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.11 2003/07/17 22:56:53 grant Exp $
+# $NetBSD: Makefile,v 1.12 2004/01/20 12:28:28 agc Exp $
 
 DISTNAME=	xdaemon-1.0
-WRKSRC=		${WRKDIR}
 CATEGORIES=	games x11
 MASTER_SITES=	${MASTER_SITE_LOCAL}
 DISTFILES=	${PIX} Daemon.README
@@ -14,7 +13,8 @@ DEPENDS+=	xteddy-1.*:../xteddy
 
 CONFLICT+=	xdaemon-2.*
 
-DIST_SUBDIR=xdaemon
+WRKSRC=		${WRKDIR}
+DIST_SUBDIR=	xdaemon
 PIX=	xdaemon_bw.xbm		xdaemon2_bw.xbm \
 	xdaemon_color.xpm	xdaemon2_color.xpm \
 	xdaemon_icon.xbm	xdaemon2_icon.xbm \
diff --git a/x11/xdaemon2/Makefile b/x11/xdaemon2/Makefile
index 7492949f497..1cce2cc31c6 100644
--- a/x11/xdaemon2/Makefile
+++ b/x11/xdaemon2/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.8 2003/07/17 22:56:53 grant Exp $
+# $NetBSD: Makefile,v 1.9 2004/01/20 12:28:28 agc Exp $
 
 DISTNAME=	xdaemon-2.0
 PKGREVISION=	1
-#WRKSRC=	${WRKDIR}
 CATEGORIES=	games x11
 MASTER_SITES=	${MASTER_SITE_LOCAL}
 DISTFILES=	${PIX} Daemon.README
@@ -15,7 +14,8 @@ DEPENDS+=	xteddy-2.*:../xteddy2
 
 CONFLICT+=	xdaemon-1.*
 
-DIST_SUBDIR=xdaemon
+#WRKSRC=	${WRKDIR}
+DIST_SUBDIR=	xdaemon
 PIX=		xdaemon.png xdaemon2.png
 NO_CONFIGURE=	yes
 NO_BUILD=	yes
diff --git a/x11/xdm3d/Makefile b/x11/xdm3d/Makefile
index 91f49e0b947..c3f4cd42b65 100644
--- a/x11/xdm3d/Makefile
+++ b/x11/xdm3d/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.8 2003/03/29 12:43:12 jmmv Exp $
+# $NetBSD: Makefile,v 1.9 2004/01/20 12:28:28 agc Exp $
 
 DISTNAME=		xdm3d-1.0
-WRKSRC=			${WRKDIR}/xdm
 CATEGORIES=		x11
 MASTER_SITES=		${MASTER_SITE_LOCAL}
 
@@ -9,6 +8,7 @@ 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 5b9b230ce39..3d4fc9ea2c5 100644
--- a/x11/xephem/Makefile
+++ b/x11/xephem/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.22 2003/09/17 19:41:24 grant Exp $
+# $NetBSD: Makefile,v 1.23 2004/01/20 12:28:28 agc 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/
@@ -13,6 +12,7 @@ COMMENT=	Interactive astronomical ephemeris program
 
 LICENSE=	no-commercial-use
 
+WRKSRC=		${WRKDIR}/${DISTNAME}/GUI/xephem
 USE_BUILDLINK2=	yes
 USE_IMAKE=	yes
 PERL_SCRIPTS=	astorb2edb.pl mpcorb2edb.pl
diff --git a/x11/xfishtank/Makefile b/x11/xfishtank/Makefile
index 9d60f49466d..796aa656975 100644
--- a/x11/xfishtank/Makefile
+++ b/x11/xfishtank/Makefile
@@ -1,15 +1,15 @@
-# $NetBSD: Makefile,v 1.9 2003/07/17 22:56:55 grant Exp $
+# $NetBSD: Makefile,v 1.10 2004/01/20 12:28:28 agc 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/
 
 MAINTAINER=		tech-pkg@NetBSD.org
 COMMENT=		Make fish swim in the background of your screen
 
+WRKSRC=			${WRKDIR}/xfishtank2.0
 USE_IMAKE=		yes
 NO_INSTALL_MANPAGES=	yes
 
diff --git a/x11/xjman/Makefile b/x11/xjman/Makefile
index bcb83e21885..95debbd30a8 100644
--- a/x11/xjman/Makefile
+++ b/x11/xjman/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.3 2003/07/17 22:56:58 grant Exp $
+# $NetBSD: Makefile,v 1.4 2004/01/20 12:28:28 agc 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
@@ -13,6 +12,7 @@ COMMENT=	Japanized X manual from "The X Japanese Documentation Project"
 
 DEPENDS+=	ja-man-[0-9]*:../../misc/ja-man
 
+WRKSRC=		${WRKDIR}/man/ja_JP.eucJP
 USE_X11BASE=	yes
 PLIST_SRC=	${WRKDIR}/PLIST
 XJMANDIR=	man/ja_JP.EUC
diff --git a/x11/xmindpath/Makefile b/x11/xmindpath/Makefile
index bcc13a2b984..53a540be241 100644
--- a/x11/xmindpath/Makefile
+++ b/x11/xmindpath/Makefile
@@ -1,14 +1,14 @@
-# $NetBSD: Makefile,v 1.7 2003/03/29 12:43:13 jmmv Exp $
+# $NetBSD: Makefile,v 1.8 2004/01/20 12:28:28 agc Exp $
 
 DISTNAME=	magicpoint-1.09a
 PKGNAME=	xmindpath-1.09a
-WRKSRC=		${WRKDIR}/${DISTNAME}/contrib/xmindpath
 CATEGORIES=	x11
 MASTER_SITES=	ftp://ftp.mew.org/pub/MagicPoint/
 
 MAINTAINER=	itojun@itojun.org
 COMMENT=	MindPath PocketPoint user-level driver for X11
 
+WRKSRC=		${WRKDIR}/${DISTNAME}/contrib/xmindpath
 GNU_CONFIGURE=	yes
 USE_X11=	yes
 
diff --git a/x11/xmountains/Makefile b/x11/xmountains/Makefile
index ea3c1fb478e..e0a2794a8b2 100644
--- a/x11/xmountains/Makefile
+++ b/x11/xmountains/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.9 2003/07/17 22:57:00 grant Exp $
+# $NetBSD: Makefile,v 1.10 2004/01/20 12:28:28 agc Exp $
 #
 
 DISTNAME=	xmountains_2.6
 PKGNAME=	${DISTNAME:C/_/-/}
 PKGREVISION=	1
-WRKSRC=		${WRKDIR}
 CATEGORIES=	x11
 MASTER_SITES=	http://www.epcc.ed.ac.uk/~spb/xmountains/
 
@@ -12,6 +11,7 @@ MAINTAINER=	fredb@NetBSD.org
 HOMEPAGE=	http://www.epcc.ed.ac.uk/~spb/xmountains/
 COMMENT=	Fractal terrain generator for X11
 
+WRKSRC=		${WRKDIR}
 USE_IMAKE=	YES
 USE_X11BASE=	YES
 
diff --git a/x11/xmove/Makefile b/x11/xmove/Makefile
index c128fce6983..2c4ef94435f 100644
--- a/x11/xmove/Makefile
+++ b/x11/xmove/Makefile
@@ -1,15 +1,15 @@
-# $NetBSD: Makefile,v 1.10 2003/07/17 22:57:00 grant Exp $
+# $NetBSD: Makefile,v 1.11 2004/01/20 12:28:28 agc Exp $
 #
 
 DISTNAME=	xmove.2.0beta2
 PKGNAME=	xmove-2.0b2
-WRKSRC=		${WRKDIR}/xmove
 CATEGORIES=	x11
 MASTER_SITES=	ftp://ftp.cs.columbia.edu/pub/xmove/
 
 MAINTAINER=	tech-pkg@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 1dda9521f6c..eb242291ab5 100644
--- a/x11/xneko/Makefile
+++ b/x11/xneko/Makefile
@@ -1,17 +1,17 @@
-# $NetBSD: Makefile,v 1.16 2003/11/26 13:58:31 jlam Exp $
+# $NetBSD: Makefile,v 1.17 2004/01/20 12:28:28 agc Exp $
 # FreeBSD Id: Makefile,v 1.6 1997/03/12 08:21:35 asami Exp
 #
 
 DISTNAME=	xneko
 PKGNAME=	xneko-4.4
 PKGREVISION=	1
-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/
 
 MAINTAINER=	tech-pkg@NetBSD.org
 COMMENT=	Classic BSD4.4 cat-and-mouse
 
+WRKSRC=		${WRKDIR}/pub/bsd-sources/4.4BSD-Lite/usr/src/games/xneko
 USE_X11=	yes
 MANCOMPRESSED_IF_MANZ=	yes
 
diff --git a/x11/xpaste/Makefile b/x11/xpaste/Makefile
index 787ec19bcdd..267637b2348 100644
--- a/x11/xpaste/Makefile
+++ b/x11/xpaste/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.7 2004/01/06 07:17:13 jlam Exp $
+# $NetBSD: Makefile,v 1.8 2004/01/20 12:28:28 agc Exp $
 #
 
 DISTNAME=	xpaste-1.1
 PKGREVISION=	2
-WRKSRC=		${WRKDIR}
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_XCONTRIB:=utilities/}
 EXTRACT_SUFX=	.shar.gz
@@ -13,6 +12,7 @@ COMMENT=	Display the content of the X11 paste buffer in a window
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
+WRKSRC=		${WRKDIR}
 USE_BUILDLINK3=	yes
 USE_IMAKE=	yes
 
diff --git a/x11/xphoon/Makefile b/x11/xphoon/Makefile
index 646f8909779..d5daf2b1b14 100644
--- a/x11/xphoon/Makefile
+++ b/x11/xphoon/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.10 2003/09/17 19:41:27 grant Exp $
+# $NetBSD: Makefile,v 1.11 2004/01/20 12:28:28 agc 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/ \
@@ -14,6 +13,7 @@ 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 aa53bddfabd..a1634426536 100644
--- a/x11/xpmicons/Makefile
+++ b/x11/xpmicons/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.7 2003/07/21 17:38:35 martti Exp $
+# $NetBSD: Makefile,v 1.8 2004/01/20 12:28:29 agc 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,6 +16,7 @@ DISTFILES=	icons.tar.gz KDEicons.tgz \
 MAINTAINER=	root@garbled.net
 COMMENT=	Huge collection of icons for any windowmanager
 
+WRKSRC=		${WRKDIR}
 DIST_SUBDIR=	icons
 USE_X11BASE=	yes
 NO_BUILD=	yes
diff --git a/x11/xpns/Makefile b/x11/xpns/Makefile
index 4cb7b623336..2c1e91d613b 100644
--- a/x11/xpns/Makefile
+++ b/x11/xpns/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.12 2003/03/29 12:43:14 jmmv Exp $
+# $NetBSD: Makefile,v 1.13 2004/01/20 12:28:29 agc 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,6 +12,7 @@ MAINTAINER=	pgiffuni@fps.biblos.unal.edu.co
 HOMEPAGE=	http://www.informatik.uni-stuttgart.de/ipvr/bv/pns/pns.html
 COMMENT=	Petri-Net Simulator for Xwindows
 
+WRKSRC=		${WRKDIR}
 USE_X11BASE=	yes
 MAKEFILE=	makefile
 ALL_TARGET=	pns
diff --git a/x11/xpostit/Makefile b/x11/xpostit/Makefile
index 0f2289a6ffe..1838abd3936 100644
--- a/x11/xpostit/Makefile
+++ b/x11/xpostit/Makefile
@@ -1,19 +1,19 @@
-# $NetBSD: Makefile,v 1.5 2003/07/17 22:57:02 grant Exp $
+# $NetBSD: Makefile,v 1.6 2004/01/20 12:28:29 agc 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/
 EXTRACT_SUFX=	.tar.Z
 
 MAINTAINER=	tech-pkg@NetBSD.org
-COMMENT=	Post notes to yourself on the screen
 #HOMEPAGE=
+COMMENT=	Post notes to yourself on the screen
 
+WRKSRC=		${WRKDIR}/xpostit
 USE_IMAKE=	yes
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/xscript/Makefile b/x11/xscript/Makefile
index 63ef655651c..d852260ef0a 100644
--- a/x11/xscript/Makefile
+++ b/x11/xscript/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.6 2003/07/17 22:57:03 grant Exp $
+# $NetBSD: Makefile,v 1.7 2004/01/20 12:28:29 agc Exp $
 #
 
 DISTNAME=	xscript.tar
 PKGNAME=	xscript-19930228
 PKGREVISION=	1
-WRKSRC=		${WRKDIR}/test-distrib/src
 CATEGORIES=	x11
 MASTER_SITES=	ftp://ftp.x.org/R5contrib/ \
 		ftp://ftp.gwdg.de/pub/x11/x.org/R5contrib/ \
@@ -17,6 +16,7 @@ MAINTAINER=	tech-pkg@NetBSD.org
 HOMEPAGE=	http://www.ee.ryerson.ca/~elf/xapps/Q-XVIII.html
 COMMENT=	X Window system script recording and playback
 
+WRKSRC=		${WRKDIR}/test-distrib/src
 USE_BUILDLINK2=	YES
 USE_X11BASE=	YES
 USE_IMAKE=	YES
diff --git a/x11/xview-clients/Makefile b/x11/xview-clients/Makefile
index 1000a6b3ead..2a41786d012 100644
--- a/x11/xview-clients/Makefile
+++ b/x11/xview-clients/Makefile
@@ -1,11 +1,10 @@
-# $NetBSD: Makefile,v 1.21 2003/07/17 22:57:05 grant Exp $
+# $NetBSD: Makefile,v 1.22 2004/01/20 12:28:29 agc 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}
 
@@ -18,6 +17,7 @@ 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 cc787da6284..9f1a0ac3947 100644
--- a/x11/xview-config/Makefile
+++ b/x11/xview-config/Makefile
@@ -1,11 +1,10 @@
-# $NetBSD: Makefile,v 1.16 2003/07/17 22:57:05 grant Exp $
+# $NetBSD: Makefile,v 1.17 2004/01/20 12:28:29 agc 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}
 
@@ -16,6 +15,7 @@ NO_SRC_ON_FTP=		Already in MASTER_SITE_LOCAL
 
 EXTRACT_ELEMENTS=	${DISTNAME}/config
 
+WRKSRC=      		${WRKDIR}/${EXTRACT_ELEMENTS}
 USE_BUILDLINK2=		# defined
 USE_IMAKE=		# defined