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

11 files changed, 22 insertions, 28 deletions

diff --git a/time/asclock/Makefile b/time/asclock/Makefile
index 0e24fa2772e..0bb06653c02 100644
--- a/time/asclock/Makefile
+++ b/time/asclock/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.9 2002/08/31 15:16:39 wiz Exp $
+# $NetBSD: Makefile,v 1.10 2003/03/29 12:42:43 jmmv 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
 
@@ -16,7 +17,6 @@ USE_BUILDLINK2=	YES
 
 LANGUAGES=	en de pt nl no it sv es hu br fr cs ru uk sl id da
 
-WRKSRC=		${WRKDIR}/asclock1.0
 PLIST_SRC=	${WRKDIR}/.PLIST_SRC
 
 .include "../../mk/bsd.prefs.mk"
diff --git a/time/cal/Makefile b/time/cal/Makefile
index 6fd5b04fca7..0955950ae73 100644
--- a/time/cal/Makefile
+++ b/time/cal/Makefile
@@ -1,16 +1,16 @@
-# $NetBSD: Makefile,v 1.4 2003/01/03 22:22:09 jmmv Exp $
+# $NetBSD: Makefile,v 1.5 2003/03/29 12:42:43 jmmv 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=		packages@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 f485a141221..d870514d4bb 100644
--- a/time/dclock/Makefile
+++ b/time/dclock/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.5 2002/03/22 13:26:22 tron Exp $
+# $NetBSD: Makefile,v 1.6 2003/03/29 12:42:43 jmmv Exp $
 #
 
 DISTNAME=	dclock
 PKGNAME=	dclock-4
+WRKSRC=		${WRKDIR}
 CATEGORIES=	x11 time
 MASTER_SITES=	${MASTER_SITE_XCONTRIB:S/contrib/R5contrib/}
 EXTRACT_SUFX=	.shar.Z
@@ -13,7 +14,6 @@ COMMENT=	Digital clock for X
 CONFLICTS+=	ivtools-*
 
 USE_X11BASE=	yes
-WRKSRC=		${WRKDIR}
 
 MAKE_ENV+=	CC="${CC}"
 
diff --git a/time/globe/Makefile b/time/globe/Makefile
index 399ad435192..21b09d9264b 100644
--- a/time/globe/Makefile
+++ b/time/globe/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.1 2001/11/26 20:39:14 is Exp $
+# $NetBSD: Makefile,v 1.2 2003/03/29 12:42:43 jmmv Exp $
 #
 
 DISTNAME=	globe_26mar94
 PKGNAME=	globe-19940326
+WRKSRC=		${WRKDIR}/globe
 CATEGORIES=	time
 MASTER_SITES=	http://www.acme.com/software/globe/
 
@@ -10,6 +11,4 @@ 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/phoon/Makefile b/time/phoon/Makefile
index 0f6a97784a0..62a3695d56c 100644
--- a/time/phoon/Makefile
+++ b/time/phoon/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.2 2002/02/22 12:37:51 is Exp $
+# $NetBSD: Makefile,v 1.3 2003/03/29 12:42:44 jmmv Exp $
 #
 
 DISTNAME=	phoon_01apr1995
 PKGNAME=        phoon-19950401
+WRKSRC=		${WRKDIR}/phoon
 CATEGORIES=	time
 MASTER_SITES=	http://www.acme.com/software/phoon/
 
@@ -10,6 +11,4 @@ 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/projclock/Makefile b/time/projclock/Makefile
index 6799efcd228..732d65c50cb 100644
--- a/time/projclock/Makefile
+++ b/time/projclock/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.2 2002/10/25 09:25:50 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2003/03/29 12:42:44 jmmv 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
@@ -11,8 +12,6 @@ MAINTAINER=	packages@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 027d6af0b38..32f9d2f6aba 100644
--- a/time/wmcalclock/Makefile
+++ b/time/wmcalclock/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.4 2002/08/25 21:51:26 jlam Exp $
+# $NetBSD: Makefile,v 1.5 2003/03/29 12:42:44 jmmv Exp $
 #
 
 DISTNAME=	wmCalClock-1.25
+WRKSRC=		${WRKDIR}/${DISTNAME}/Src
 CATEGORIES=	x11 time
 MASTER_SITES=	http://nis-www.lanl.gov/~mgh/WindowMaker/
 
@@ -13,8 +14,6 @@ USE_BUILDLINK2=	YES
 USE_X11BASE=	YES
 USE_GMAKE=	YES
 
-WRKSRC=		${WRKDIR}/${DISTNAME}/Src
-
 .include "../../mk/bsd.prefs.mk"
 
 .if ${OPSYS} == "SunOS"
diff --git a/time/wmmoonclock/Makefile b/time/wmmoonclock/Makefile
index b7b2789ee02..f706d62eb4e 100644
--- a/time/wmmoonclock/Makefile
+++ b/time/wmmoonclock/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.4 2002/10/27 13:40:30 bouyer Exp $
+# $NetBSD: Makefile,v 1.5 2003/03/29 12:42:44 jmmv Exp $
 #
 
 DISTNAME=	wmMoonClock-1.27
+WRKSRC=         ${WRKDIR}/${DISTNAME}/Src
 CATEGORIES=	x11 time
 MASTER_SITES=	http://nis-www.lanl.gov/~mgh/WindowMaker/
 
@@ -12,7 +13,6 @@ COMMENT=	Shows lunar ephemeris to fairly high accuracy
 USE_BUILDLINK2=	YES
 USE_GMAKE=	YES
 USE_X11BASE=	YES
-WRKSRC=         ${WRKDIR}/${DISTNAME}/Src
 
 MAKE_FLAGS+=    EXTRA_LOCAL_LIBS=${EXTRA_LOCAL_LIBS}
 
diff --git a/time/wmtime/Makefile b/time/wmtime/Makefile
index 3e1dad5137c..f31686694a5 100644
--- a/time/wmtime/Makefile
+++ b/time/wmtime/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.4 2003/03/12 03:56:30 jschauma Exp $
+# $NetBSD: Makefile,v 1.5 2003/03/29 12:42:44 jmmv 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/
@@ -12,8 +13,6 @@ COMMENT=	Time/Date applet for WindowMaker
 USE_BUILDLINK2=	YES
 USE_IMAKE=	YES
 
-WRKSRC=		${WRKDIR}/wmtime.app/wmtime
-
 post-extract:
 	${CP} ${WRKSRC}/../Imakefile ${WRKSRC}/Imakefile
 
diff --git a/time/xalarm/Makefile b/time/xalarm/Makefile
index d5976f73baf..96aaff23fae 100644
--- a/time/xalarm/Makefile
+++ b/time/xalarm/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.2 2003/03/03 03:23:26 jschauma Exp $
+# $NetBSD: Makefile,v 1.3 2003/03/29 12:42:45 jmmv 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
@@ -16,8 +17,6 @@ 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 c130a337ecd..c47ec721307 100644
--- a/time/xdaliclock/Makefile
+++ b/time/xdaliclock/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.2 2001/02/17 17:32:14 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2003/03/29 12:42:45 jmmv Exp $
 #
 
 DISTNAME=		xdaliclock-2.18
+WRKSRC=			${WRKDIR}/${DISTNAME}/X11
 CATEGORIES=		x11 time
 MASTER_SITES=		http://www.jwz.org/xdaliclock/ \
 			${MASTER_SITE_XCONTRIB:=applications/}
@@ -12,6 +13,5 @@ COMMENT=		Animated digital clock
 
 GNU_CONFIGURE=		yes
 USE_X11=		yes
-WRKSRC=			${WRKDIR}/${DISTNAME}/X11
 
 .include "../../mk/bsd.pkg.mk"