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

16 files changed, 34 insertions, 32 deletions

diff --git a/time/asclock-gtk/Makefile b/time/asclock-gtk/Makefile
index 626cc70e832..7a1705b0cf5 100644
--- a/time/asclock-gtk/Makefile
+++ b/time/asclock-gtk/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.15 2003/07/21 17:28:38 martti Exp $
+# $NetBSD: Makefile,v 1.16 2004/01/20 12:27:15 agc Exp $
 #
 
 DISTNAME=	asclock-gtk-2.1.10beta
 PKGNAME=	asclock-gtk-2.1.10
 PKGREVISION=	2
-WRKSRC=		${WRKDIR}/asclock-gtk
 CATEGORIES=	x11 time
 MASTER_SITES=	${MASTER_SITE_LOCAL}	# www.asclock.org is no more
 
@@ -13,6 +12,7 @@ COMMENT=	Dockable clock and calendar with themes for GTK+
 
 NO_SRC_ON_FTP=	Already in MASTER_SITE_LOCAL
 
+WRKSRC=		${WRKDIR}/asclock-gtk
 USE_BUILDLINK2=	# defined
 USE_X11BASE=	# defined
 
diff --git a/time/asclock-xlib/Makefile b/time/asclock-xlib/Makefile
index 34178ff5d30..a469b4969bf 100644
--- a/time/asclock-xlib/Makefile
+++ b/time/asclock-xlib/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.10 2003/07/21 17:28:38 martti Exp $
+# $NetBSD: Makefile,v 1.11 2004/01/20 12:27:16 agc Exp $
 #
 
 DISTNAME=	asclock-xlib-2.0.11
 PKGNAME=	asclock-xlib-2.0b11
-WRKSRC=		${WRKDIR}/asclock-xlib
 CATEGORIES=	x11 time
 MASTER_SITES=	${MASTER_SITE_LOCAL}	# www.asclock.org is no more
 
@@ -12,6 +11,7 @@ COMMENT=	Dockable clock and calendar with themes for X11
 
 NO_SRC_ON_FTP=	Already in MASTER_SITE_LOCAL
 
+WRKSRC=		${WRKDIR}/asclock-xlib
 USE_BUILDLINK2=	YES
 USE_IMAKE=	YES
 USE_X11BASE=	YES
diff --git a/time/asclock/Makefile b/time/asclock/Makefile
index 53aa19dcbae..5666e26c8aa 100644
--- a/time/asclock/Makefile
+++ b/time/asclock/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.13 2003/09/17 19:41:10 grant Exp $
+# $NetBSD: Makefile,v 1.14 2004/01/20 12:27:15 agc Exp $
 
 DISTNAME=	asclock-classic-1.0
 PKGNAME=	asclock-1.0
-WRKSRC=		${WRKDIR}/asclock1.0
 CATEGORIES=	x11 time
 MASTER_SITES=	${MASTER_SITE_LOCAL}	# www.asclock.org is no more
 
@@ -11,6 +10,7 @@ COMMENT=	NeXTstep-like clock and calendar
 
 NO_SRC_ON_FTP=	Already in MASTER_SITE_LOCAL
 
+WRKSRC=		${WRKDIR}/asclock1.0
 USE_IMAKE=	YES
 USE_X11BASE=	YES
 USE_BUILDLINK2=	YES
diff --git a/time/cal/Makefile b/time/cal/Makefile
index ada64b68791..3487c880443 100644
--- a/time/cal/Makefile
+++ b/time/cal/Makefile
@@ -1,16 +1,16 @@
-# $NetBSD: Makefile,v 1.7 2003/07/17 22:54:58 grant Exp $
+# $NetBSD: Makefile,v 1.8 2004/01/20 12:27:16 agc Exp $
 # FreeBSD Id: Makefile,v 1.5 1997/05/12 06:33:23 max Exp
 #
 
 DISTNAME=		cal-3.5
 PKGREVISION=		1
-WRKSRC=			${WRKDIR}/cal-3.5/source
 CATEGORIES=		time
 MASTER_SITES=		${MASTER_SITE_SUNSITE:=utils/shell/}
 
 MAINTAINER=		tech-pkg@NetBSD.org
 COMMENT=		Enhanced color version of standard calendar utility
 
+WRKSRC=			${WRKDIR}/cal-3.5/source
 MAKEFILE=		makefile.unx
 ALL_TARGET=		cal
 
diff --git a/time/dclock/Makefile b/time/dclock/Makefile
index d26ee463746..61736fdd57d 100644
--- a/time/dclock/Makefile
+++ b/time/dclock/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.8 2003/07/17 22:54:59 grant Exp $
+# $NetBSD: Makefile,v 1.9 2004/01/20 12:27:16 agc Exp $
 #
 
 DISTNAME=	dclock
 PKGNAME=	dclock-4
-WRKSRC=		${WRKDIR}
 CATEGORIES=	x11 time
 MASTER_SITES=	${MASTER_SITE_XCONTRIB:S/contrib/R5contrib/}
 EXTRACT_SUFX=	.shar.Z
@@ -13,6 +12,7 @@ COMMENT=	Digital clock for X
 
 CONFLICTS+=	ivtools-*
 
+WRKSRC=		${WRKDIR}
 USE_X11BASE=	yes
 
 MAKE_ENV+=	CC="${CC}"
diff --git a/time/globe/Makefile b/time/globe/Makefile
index 96e492b798f..6e0fb65491c 100644
--- a/time/globe/Makefile
+++ b/time/globe/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.4 2003/07/21 17:28:40 martti Exp $
+# $NetBSD: Makefile,v 1.5 2004/01/20 12:27:16 agc Exp $
 #
 
 DISTNAME=	globe_26mar94
 PKGNAME=	globe-19940326
-WRKSRC=		${WRKDIR}/globe
 CATEGORIES=	time
 MASTER_SITES=	http://www.acme.com/software/globe/
 
@@ -11,4 +10,6 @@ MAINTAINER=	is@NetBSD.org
 HOMEPAGE=	http://www.acme.com/software/globe/
 COMMENT=	Display the currently-lighted face of Earth in ASCII
 
+WRKSRC=		${WRKDIR}/globe
+
 .include "../../mk/bsd.pkg.mk"
diff --git a/time/gnyaclock/Makefile b/time/gnyaclock/Makefile
index 7fbe0ecbc80..66b63b088f4 100644
--- a/time/gnyaclock/Makefile
+++ b/time/gnyaclock/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.5 2003/07/17 22:55:00 grant Exp $
+# $NetBSD: Makefile,v 1.6 2004/01/20 12:27:16 agc Exp $
 #
 
 DISTNAME=	gnya
 PKGNAME=	gnyaclock-20001218
-WRKSRC=		${WRKDIR}/gnyaclock
 CATEGORIES=	time x11
 MASTER_SITES=	http://www2.is.titech.ac.jp/~sadayosi/lab/h-takasi/
 EXTRACT_SUFX=	.shar
@@ -12,6 +11,7 @@ MAINTAINER=	kei@NetBSD.org
 HOMEPAGE=	http://www2.is.titech.ac.jp/~sadayosi/lab/h-takasi/h.html
 COMMENT=	Accessory with Bezier curve
 
+WRKSRC=		${WRKDIR}/gnyaclock
 USE_BUILDLINK2=	YES
 USE_IMAKE=	YES
 
diff --git a/time/pclock/Makefile b/time/pclock/Makefile
index 84013a84e58..6a0f6964625 100644
--- a/time/pclock/Makefile
+++ b/time/pclock/Makefile
@@ -1,16 +1,16 @@
-# $NetBSD: Makefile,v 1.5 2004/01/01 16:22:22 salo Exp $
+# $NetBSD: Makefile,v 1.6 2004/01/20 12:27:16 agc Exp $
 #
 
 DISTNAME=	pclock_0.13.1.orig
 PKGNAME=	${DISTNAME:S/_/-/:S/.orig//}
 PKGREVISION=	1
-WRKSRC=		${WRKDIR}/${PKGNAME_NOREV}.orig
 CATEGORIES=	time x11
 MASTER_SITES=	${MASTER_SITE_DEBIAN:=pool/main/p/pclock/}
 
 MAINTAINER=	salo@NetBSD.org
 COMMENT=	Simple analog clock designed for Window Maker
 
+WRKSRC=		${WRKDIR}/${PKGNAME_NOREV}.orig
 USE_BUILDLINK2=	YES
 USE_X11=	YES
 
diff --git a/time/phoon/Makefile b/time/phoon/Makefile
index 64dc81f6787..c2d7e7ceddf 100644
--- a/time/phoon/Makefile
+++ b/time/phoon/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.5 2003/07/21 17:28:44 martti Exp $
+# $NetBSD: Makefile,v 1.6 2004/01/20 12:27:16 agc Exp $
 #
 
 DISTNAME=	phoon_01apr1995
 PKGNAME=        phoon-19950401
-WRKSRC=		${WRKDIR}/phoon
 CATEGORIES=	time
 MASTER_SITES=	http://www.acme.com/software/phoon/
 
@@ -11,4 +10,6 @@ MAINTAINER=	is@NetBSD.org
 HOMEPAGE=	http://www.acme.com/software/phoon/
 COMMENT=	Show phase of the moon on ASCII terminal
 
+WRKSRC=		${WRKDIR}/phoon
+
 .include "../../mk/bsd.pkg.mk"
diff --git a/time/plan/Makefile b/time/plan/Makefile
index fa4ac52f32c..e3fa182cb27 100644
--- a/time/plan/Makefile
+++ b/time/plan/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.14 2003/11/13 21:13:49 tron Exp $
+# $NetBSD: Makefile,v 1.15 2004/01/20 12:27:16 agc Exp $
 
 DISTNAME=	plan-1.8.4
-WRKSRC=		${WRKDIR}/${DISTNAME}/src
 CATEGORIES=	x11 time
 MASTER_SITES=	ftp://ftp.fu-berlin.de/unix/graphics/plan/
 
@@ -9,6 +8,7 @@ MAINTAINER=	tech-pkg@NetBSD.org
 HOMEPAGE=	http://www.in-berlin.de/User/bitrot/plan.html
 COMMENT=	Schedule planner based on X/Motif
 
+WRKSRC=		${WRKDIR}/${DISTNAME}/src
 USE_BUILDLINK2=	YES
 USE_X11BASE=	YES
 ALL_TARGET=	netbsd
diff --git a/time/projclock/Makefile b/time/projclock/Makefile
index 9c1bda5267a..c0ca04d3aca 100644
--- a/time/projclock/Makefile
+++ b/time/projclock/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.5 2003/07/17 22:55:05 grant Exp $
+# $NetBSD: Makefile,v 1.6 2004/01/20 12:27:16 agc Exp $
 #
 
 DISTNAME=       pclock0.7
 PKGNAME=	projclock-0.7
-WRKSRC=		${WRKDIR}/projclock
 CATEGORIES=	time
 MASTER_SITES=   http://members.optushome.com.au/starters/pclock/
 EXTRACT_SUFX=	.tgz
@@ -12,6 +11,7 @@ MAINTAINER=	tech-pkg@NetBSD.org
 HOMEPAGE=	http://members.optushome.com.au/starters/pclock/
 COMMENT=	Time management software
 
+WRKSRC=		${WRKDIR}/projclock
 USE_BUILDLINK2=	# defined
 NO_BUILD=	# defined
 
diff --git a/time/wmcalclock/Makefile b/time/wmcalclock/Makefile
index ba7ad4c24b0..92d0aa1ff2c 100644
--- a/time/wmcalclock/Makefile
+++ b/time/wmcalclock/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.7 2003/07/21 17:28:45 martti Exp $
+# $NetBSD: Makefile,v 1.8 2004/01/20 12:27:16 agc Exp $
 #
 
 DISTNAME=	wmCalClock-1.25
-WRKSRC=		${WRKDIR}/${DISTNAME}/Src
 CATEGORIES=	x11 time
 MASTER_SITES=	http://nis-www.lanl.gov/~mgh/WindowMaker/
 
@@ -10,6 +9,7 @@ MAINTAINER=	wiz@NetBSD.org
 HOMEPAGE=	http://nis-www.lanl.gov/~mgh/WindowMaker/DockApps.shtml
 COMMENT=	Another WindowMaker calendar/clock dockapp
 
+WRKSRC=		${WRKDIR}/${DISTNAME}/Src
 USE_BUILDLINK2=	YES
 USE_X11BASE=	YES
 USE_GMAKE=	YES
diff --git a/time/wmmoonclock/Makefile b/time/wmmoonclock/Makefile
index 5e457992b14..597c905f052 100644
--- a/time/wmmoonclock/Makefile
+++ b/time/wmmoonclock/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.6 2003/07/17 22:55:07 grant Exp $
+# $NetBSD: Makefile,v 1.7 2004/01/20 12:27:16 agc Exp $
 #
 
 DISTNAME=	wmMoonClock-1.27
-WRKSRC=         ${WRKDIR}/${DISTNAME}/Src
 CATEGORIES=	x11 time
 MASTER_SITES=	http://nis-www.lanl.gov/~mgh/WindowMaker/
 
@@ -10,6 +9,7 @@ MAINTAINER=	tron@NetBSD.org
 HOMEPAGE=	http://nis-www.lanl.gov/~mgh/WindowMaker/DockApps.shtml
 COMMENT=	Shows lunar ephemeris to fairly high accuracy
 
+WRKSRC=         ${WRKDIR}/${DISTNAME}/Src
 USE_BUILDLINK2=	YES
 USE_GMAKE=	YES
 USE_X11BASE=	YES
diff --git a/time/wmtime/Makefile b/time/wmtime/Makefile
index 5db06d9c153..3a1cb6002bc 100644
--- a/time/wmtime/Makefile
+++ b/time/wmtime/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.6 2003/07/17 22:55:07 grant Exp $
+# $NetBSD: Makefile,v 1.7 2004/01/20 12:27:16 agc Exp $
 #
 
 DISTNAME=	wmtime-1.0b2
-WRKSRC=		${WRKDIR}/wmtime.app/wmtime
 CATEGORIES=	x11 time
 MASTER_SITES=	ftp://ftp.alpha.alt.ru/pub/UNIX/X11/WMaker/ \
 		http://www.NetBSD.org/~ad/distfiles/
@@ -10,6 +9,7 @@ MASTER_SITES=	ftp://ftp.alpha.alt.ru/pub/UNIX/X11/WMaker/ \
 MAINTAINER=	ad@NetBSD.org
 COMMENT=	Time/Date applet for WindowMaker
 
+WRKSRC=		${WRKDIR}/wmtime.app/wmtime
 USE_BUILDLINK2=	YES
 USE_IMAKE=	YES
 
diff --git a/time/xalarm/Makefile b/time/xalarm/Makefile
index 96fc89f8ede..adad2296460 100644
--- a/time/xalarm/Makefile
+++ b/time/xalarm/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.5 2003/09/29 09:54:28 seb Exp $
+# $NetBSD: Makefile,v 1.6 2004/01/20 12:27:16 agc Exp $
 
 DISTNAME=	xalarm-3.03
 PKGNAME=	xalarm-3.05
 PKGREVISION=	1
-WRKSRC=		${WRKDIR}/xalarm
 CATEGORIES=	time
 MASTER_SITES=	${MASTER_SITE_XCONTRIB:=R5contrib-fixes/xalarm/}
 EXTRACT_SUFX=	.tar.Z
@@ -17,6 +16,7 @@ COMMENT=	X11 interactive alarm clock
 
 DEPENDS+=	skill>=4.0:../../sysutils/skill
 
+WRKSRC=		${WRKDIR}/xalarm
 USE_IMAKE=	yes
 
 FORTUNE=	"Sorry, xfortune is unavailable - no fortune!"
diff --git a/time/xdaliclock/Makefile b/time/xdaliclock/Makefile
index 23c4f198f20..54091f234c0 100644
--- a/time/xdaliclock/Makefile
+++ b/time/xdaliclock/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.4 2003/07/17 22:55:08 grant Exp $
+# $NetBSD: Makefile,v 1.5 2004/01/20 12:27:16 agc Exp $
 #
 
 DISTNAME=		xdaliclock-2.18
-WRKSRC=			${WRKDIR}/${DISTNAME}/X11
 CATEGORIES=		x11 time
 MASTER_SITES=		http://www.jwz.org/xdaliclock/ \
 			${MASTER_SITE_XCONTRIB:=applications/}
@@ -11,6 +10,7 @@ MAINTAINER=		nathanw@NetBSD.org
 HOMEPAGE=		http://www.jwz.org/xdaliclock/
 COMMENT=		Animated digital clock
 
+WRKSRC=			${WRKDIR}/${DISTNAME}/X11
 GNU_CONFIGURE=		yes
 USE_X11=		yes