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

24 files changed, 48 insertions, 58 deletions

diff --git a/audio/cd-discid/Makefile b/audio/cd-discid/Makefile
index 8acb9d746aa..2837f237e88 100644
--- a/audio/cd-discid/Makefile
+++ b/audio/cd-discid/Makefile
@@ -1,15 +1,14 @@
-# $NetBSD: Makefile,v 1.1.1.1 2001/08/16 05:31:10 lukem Exp $
+# $NetBSD: Makefile,v 1.2 2003/03/29 12:40:05 jmmv Exp $
 
 DISTNAME=	cd-discid_0.7.orig
 PKGNAME=	cd-discid-0.7
+WRKSRC=		${WRKDIR}/${PKGNAME}
 CATEGORIES=	audio
 MASTER_SITES=	http://frantica.lly.org/~rcw/cd-discid/
 
 MAINTAINER=	lukem@netbsd.org
 COMMENT=	Read CD to obtain CDDB discid information
 
-WRKSRC=		${WRKDIR}/${PKGNAME}
-
 do-build:
 	cd ${WRKSRC} && ${CC} -O -o cd-discid cd-discid.c
 
diff --git a/audio/cmp3/Makefile b/audio/cmp3/Makefile
index de5de1de3a0..0d4622e0df3 100644
--- a/audio/cmp3/Makefile
+++ b/audio/cmp3/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.8 2003/01/24 13:36:17 wiz Exp $
+# $NetBSD: Makefile,v 1.9 2003/03/29 12:40:05 jmmv Exp $
 #
 
 DISTNAME=	cmp3-2.0pre5
 PKGNAME=	cmp3-2.0.p5
+WRKSRC=		${WRKDIR}/cmp3
 CATEGORIES=	audio
 MASTER_SITES=	http://www.personal.psu.edu/users/n/k/nkk104/cmp3/
 
@@ -12,8 +13,6 @@ COMMENT=	curses based frontend to mpg123
 
 DEPENDS+=	mpg123-[0-9]*:../../audio/mpg123
 
-WRKSRC=		${WRKDIR}/cmp3
-
 USE_BUILDLINK2=		YES
 USE_GMAKE=		YES
 USE_NCURSES=		# MAX_FORM_COMMAND
diff --git a/audio/cs4235/Makefile b/audio/cs4235/Makefile
index 21f5395fe6c..0e9ec78e802 100644
--- a/audio/cs4235/Makefile
+++ b/audio/cs4235/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.3 2001/02/16 13:30:34 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2003/03/29 12:40:05 jmmv Exp $
 #
 
 DISTNAME=	cs4235-20001009
+WRKSRC=		${WRKDIR}/cs4235
 CATEGORIES=	audio sysutils
 MASTER_SITES=	http://invisible.yi.org/~jmcneill/
 
@@ -11,7 +12,6 @@ COMMENT=	Modifies the 3D mode on Crystal CS4235 sound cards
 
 ONLY_FOR_PLATFORM= NetBSD-*-i386
 
-WRKSRC=		${WRKDIR}/cs4235
 MAKE_ENV+=	BINDIR=${PREFIX}/bin
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/audio/csound-bath/Makefile b/audio/csound-bath/Makefile
index 6572e47cff5..e0a42677e5b 100644
--- a/audio/csound-bath/Makefile
+++ b/audio/csound-bath/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.7 2003/01/19 21:31:07 hubertf Exp $
+# $NetBSD: Makefile,v 1.8 2003/03/29 12:40:06 jmmv Exp $
 #
 
 DISTNAME=		Csound4.23
 PKGNAME=		csound-bath-4.23
+WRKSRC=			${WRKDIR}
 CATEGORIES=		audio
 MASTER_SITES=		ftp://ftp.cs.bath.ac.uk/pub/dream/newest/
 
@@ -15,7 +16,6 @@ RESTRICTED=		"no for-fee-redistribution"
 NO_SRC_ON_CDROM=	${RESTRICTED}
 NO_BIN_ON_CDROM=	${RESTRICTED}
 
-WRKSRC=			${WRKDIR}
 DIST_SUBDIR=		csound
 CONFLICTS=		csound-4*
 USE_GMAKE=		yes
diff --git a/audio/csound-manual/Makefile b/audio/csound-manual/Makefile
index 95f1df5b80d..410793c9790 100644
--- a/audio/csound-manual/Makefile
+++ b/audio/csound-manual/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.6 2002/12/24 18:55:34 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2003/03/29 12:40:06 jmmv Exp $
 #
 
 DISTNAME=		csound-manual-4.10
 PKGREVISION=		1
+WRKSRC=			${WRKDIR}
 CATEGORIES=		audio
 MASTER_SITES=		ftp://ftp.csounds.com/manual/current/
 EXTRACT_SUFX=		.zip
@@ -27,7 +28,6 @@ NO_BIN_ON_CDROM=	${RESTRICTED}
 DIST_SUBDIR=		csound-4.10
 
 NO_BUILD=		yes
-WRKSRC=			${WRKDIR}
 # default -a in options wreaks havoc on pdfs in the zips
 EXTRACT_CMD=		unzip -Lq ${DOWNLOADED_DISTFILE}
 
diff --git a/audio/faad2/Makefile b/audio/faad2/Makefile
index 9e7cb8d42fc..ea80ccaa416 100644
--- a/audio/faad2/Makefile
+++ b/audio/faad2/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.4 2002/11/21 05:08:52 salo Exp $
+# $NetBSD: Makefile,v 1.5 2003/03/29 12:40:06 jmmv Exp $
 #
 
 DISTNAME=	faad2-1.1
+WRKSRC=		${WRKDIR}/faad2
 CATEGORIES=	audio
 MASTER_SITES=	http://faac.sourceforge.net/files/
 
@@ -13,8 +14,6 @@ RESTRICTED=	Dolby doesn't allow binary distributions
 NO_BIN_ON_FTP=	${RESTRICTED}
 NO_BIN_ON_CD=	${RESTRICTED}
 
-WRKSRC=		${WRKDIR}/faad2
-
 USE_BUILDLINK2=		YES
 AUTOMAKE_REQD=		1.4
 USE_GMAKE=		YES
diff --git a/audio/gtkmserv/Makefile b/audio/gtkmserv/Makefile
index 83822bff47d..e0448468b2a 100644
--- a/audio/gtkmserv/Makefile
+++ b/audio/gtkmserv/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.3 2002/10/13 12:04:19 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2003/03/29 12:40:06 jmmv Exp $
 #
 
 DISTNAME=	gtkmserv-0.5.2
+WRKSRC=		${WRKDIR}/${DISTNAME}/src
 CATEGORIES=	audio
 MASTER_SITES=	http://projects.ubertechnique.com/downloads/
 
@@ -9,7 +10,6 @@ MAINTAINER=	hubertf@netbsd.org
 HOMEPAGE=	http://projects.ubertechnique.com/index.html
 COMMENT=	gtk-based GUI client for the audio/mserv package
 
-WRKSRC=			${WRKDIR}/${DISTNAME}/src
 GNU_CONFIGURE=		YES
 USE_BUILDLINK2=		YES
 
diff --git a/audio/id3/Makefile b/audio/id3/Makefile
index d0d1147ac42..59003e3dc70 100644
--- a/audio/id3/Makefile
+++ b/audio/id3/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.1.1.1 2001/10/12 09:21:15 agc Exp $
+# $NetBSD: Makefile,v 1.2 2003/03/29 12:40:06 jmmv Exp $
 
 DISTNAME=	id3_0.12.orig
 PKGNAME=	id3-0.12
+WRKSRC=		${WRKDIR}/${PKGNAME}
 CATEGORIES=	audio
 MASTER_SITES=	http://frantica.lly.org/~rcw/id3/
 
@@ -9,6 +10,4 @@ MAINTAINER=	packages@netbsd.org
 HOMEPAGE=	http://frantica.lly.org/~rcw/abcde/page/
 COMMENT=	ID3 v1.1 tag editor
 
-WRKSRC=		${WRKDIR}/${PKGNAME}
-
 .include "../../mk/bsd.pkg.mk"
diff --git a/audio/krio/Makefile b/audio/krio/Makefile
index 4f6a4022b2c..eab0c7fc260 100644
--- a/audio/krio/Makefile
+++ b/audio/krio/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.9 2002/03/13 17:36:37 fredb Exp $
+# $NetBSD: Makefile,v 1.10 2003/03/29 12:40:07 jmmv Exp $
 
 DISTNAME=	Krio-19990721
 PKGNAME=	krio-19990721
 PKGREVISION=	1
+WRKSRC=		${WRKDIR}/Krio
 CATEGORIES=	audio
 MASTER_SITES=	ftp://ftp.13th-floor.org/pub/krio/
 
@@ -22,8 +23,6 @@ DEPENDS+=	png>=1.2.1:../../graphics/png
 DEPENDS+=	qt1-1.44:../../x11/qt1
 DEPENDS+=	tiff-[0-9]*:../../graphics/tiff
 
-WRKSRC=		${WRKDIR}/Krio
-
 EVAL_PREFIX=	QT1DIR=qt1 KDEDIR=kdelibs
 MAKE_ENV+=	QT1DIR=${QT1DIR} KDEDIR=${KDEDIR}
 MAKE_ENV+=	RIODIR=${RIODIR} X11PREFIX=${X11PREFIX}
diff --git a/audio/maplay/Makefile b/audio/maplay/Makefile
index acce35aa5fd..932502ab2b8 100644
--- a/audio/maplay/Makefile
+++ b/audio/maplay/Makefile
@@ -1,9 +1,10 @@
-# $NetBSD: Makefile,v 1.8 2001/09/09 20:36:12 agc Exp $
+# $NetBSD: Makefile,v 1.9 2003/03/29 12:40:07 jmmv Exp $
 # FreeBSD Id: Makefile,v 1.6 1997/01/07 14:58:04 torstenb Exp 
 #
 
 DISTNAME=       maplay1_2
 PKGNAME=	maplay-1.2
+WRKSRC=		${WRKDIR}
 CATEGORIES=	audio
 MASTER_SITES=   http://www.iuma.com/IUMA/ftp/audio_utils/mpeg_players/Workstations/
 EXTRACT_SUFX=	.tar.Z
@@ -11,7 +12,6 @@ EXTRACT_SUFX=	.tar.Z
 MAINTAINER=	packages@netbsd.org
 COMMENT=	MPEG audio player/decoder for layer I and II MPEG audio streams
 
-WRKSRC=		${WRKDIR}
 PATCH_STRIP=	-p2
 
 pre-configure:
diff --git a/audio/mbrola/Makefile b/audio/mbrola/Makefile
index b9a96e943a2..a680be08ebe 100644
--- a/audio/mbrola/Makefile
+++ b/audio/mbrola/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.6 2002/08/13 03:18:02 jdarrow Exp $
+# $NetBSD: Makefile,v 1.7 2003/03/29 12:40:07 jmmv Exp $
 
 DISTNAME=		mbr301h
 PKGNAME=		mbrola-301h
+WRKSRC=			${WRKDIR}
 CATEGORIES=		audio
 MASTER_SITES=		http://www.festvox.org/mbrola/bin/netbsd/
 EXTRACT_SUFX=		.zip
@@ -13,7 +14,6 @@ COMMENT=		MBROLA diphone synthesizer executable
 LICENSE=		no-commercial-use
 
 DIST_SUBDIR=		mbrola-20010717
-WRKSRC=			${WRKDIR}
 NO_BUILD=
 
 ONLY_FOR_PLATFORM=	NetBSD-*-i386
diff --git a/audio/mp32ogg/Makefile b/audio/mp32ogg/Makefile
index 295b361acae..28194e45b15 100644
--- a/audio/mp32ogg/Makefile
+++ b/audio/mp32ogg/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.1.1.1 2002/03/02 02:51:02 rxg Exp $
+# $NetBSD: Makefile,v 1.2 2003/03/29 12:40:07 jmmv Exp $
 
 DISTNAME=	mp32ogg-0.11
+WRKSRC=		${WRKDIR}
 CATEGORIES=	audio perl5
 MASTER_SITES=	${MASTER_SITE_LOCAL}
 EXTRACT_SUFX=	# empty
@@ -17,7 +18,6 @@ DEPENDS+=	p5-String-ShellQuote>=1.00:../../textproc/p5-String-ShellQuote
 USE_PERL5=	yes
 
 EXTRACT_ONLY=	# empty
-WRKSRC=		${WRKDIR}
 NO_BUILD=	yes
 
 do-extract:
diff --git a/audio/mp3asm/Makefile b/audio/mp3asm/Makefile
index 84d4ecbda89..1283224b6eb 100644
--- a/audio/mp3asm/Makefile
+++ b/audio/mp3asm/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.3 2002/04/28 22:31:20 zuntum Exp $
+# $NetBSD: Makefile,v 1.4 2003/03/29 12:40:07 jmmv Exp $
 #
 
 DISTNAME=	mp3asm-0.1.3
+WRKSRC=		${WRKDIR}/mp3asm-0.1
 CATEGORIES=	audio
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=mp3asm/}
 EXTRACT_SUFX=	.tar.bz2
@@ -12,8 +13,6 @@ COMMENT=	mpeg 1/2/2.5 audio layer 1,2,3 frame level editor
 
 GNU_CONFIGURE=	yes
 
-WRKSRC=		${WRKDIR}/mp3asm-0.1
-
 post-patch:
 	${SED} "s/getprogname/_getprogname/g" ${WRKSRC}/src/mp3asm.c		\
 		> ${WRKSRC}/src/mp3asm.c.done
diff --git a/audio/musicbox/Makefile b/audio/musicbox/Makefile
index c05d7594ca6..3d9e4a48424 100644
--- a/audio/musicbox/Makefile
+++ b/audio/musicbox/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.12 2001/12/03 18:04:34 wiz Exp $
+# $NetBSD: Makefile,v 1.13 2003/03/29 12:40:08 jmmv Exp $
 
 DISTNAME=	musicbox-1.01p2
+WRKSRC=		${WRKDIR}/musicbox-1.01
 CATEGORIES=	audio
 MASTER_SITES=	ftp://freebsd.csie.nctu.edu.tw/Upload/
 EXTRACT_SUFX=	.tgz
@@ -11,8 +12,6 @@ COMMENT=	X11 front-interface for mpg123
 DEPENDS+=	mpg123>=0.59.18:../../audio/mpg123
 DEPENDS+=	qt1-1.44:../../x11/qt1
 
-WRKSRC=		${WRKDIR}/musicbox-1.01
-
 USE_X11=	yes
 CFLAGS+=	-D${OPSYS}
 EVAL_PREFIX+=	QT1DIR=qt1
diff --git a/audio/oggasm/Makefile b/audio/oggasm/Makefile
index 97bad300fb4..a0197a4c41e 100644
--- a/audio/oggasm/Makefile
+++ b/audio/oggasm/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.2 2002/12/14 03:43:18 schmonz Exp $
+# $NetBSD: Makefile,v 1.3 2003/03/29 12:40:08 jmmv Exp $
 #
 
 DISTNAME=	oggasm_1.4.0
 PKGNAME=	${DISTNAME:S/_/-/}
+WRKSRC=		${WRKDIR}/${PKGNAME}
 CATEGORIES=	audio
 MASTER_SITES=	http://oggasm.sourceforge.net/
 
@@ -18,7 +19,6 @@ USE_PERL5=	yes
 REPLACE_PERL=	oggasm
 
 NO_BUILD=	yes
-WRKSRC=		${WRKDIR}/${PKGNAME}
 
 do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/oggasm ${PREFIX}/bin
diff --git a/audio/oss/Makefile b/audio/oss/Makefile
index 6b58c734da8..2696d3a1b80 100644
--- a/audio/oss/Makefile
+++ b/audio/oss/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.16 2003/01/28 22:03:03 jlam Exp $
+# $NetBSD: Makefile,v 1.17 2003/03/29 12:40:08 jmmv Exp $
 
 DISTNAME=	oss-${OSS_VERSION}	# Overridden below
 PKGNAME=	oss-${OSS_VERSION}
+WRKSRC=		${WRKDIR}
 CATEGORIES=	audio sysutils
 MASTER_SITES=	ftp://ftp.opensound.com/pub/oss/netbsd/
 
@@ -40,7 +41,6 @@ MODSTAT=		${TRUE}
 .endif
 
 CHROOT?=		/usr/sbin/chroot
-WRKSRC=			${WRKDIR}
 OSSLIBDIR=		${PREFIX}/lib/oss
 FILES_SUBST+=		OSSLIBDIR=${OSSLIBDIR}
 FILES_SUBST+=		MODSTAT=${MODSTAT}
diff --git a/audio/rio/Makefile b/audio/rio/Makefile
index 311b1d8092d..a486e6116d5 100644
--- a/audio/rio/Makefile
+++ b/audio/rio/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.6 2002/02/06 16:58:11 jlam Exp $
+# $NetBSD: Makefile,v 1.7 2003/03/29 12:40:08 jmmv Exp $
 #
 
 DISTNAME=	rio007
 PKGNAME=	rio-1.07
+WRKSRC=		${WRKDIR}/rio107
 CATEGORIES=	audio
 MASTER_SITES=	http://www.world.co.uk/sba/
 EXTRACT_SUFX=	.tgz
@@ -13,8 +14,6 @@ COMMENT=	utility to display and manage files on the Diamond Rio PMP300
 
 ONLY_FOR_PLATFORM=	NetBSD-*-i386
 
-WRKSRC=		${WRKDIR}/rio107
-
 MAKEFILE=	makefile
 
 do-install:
diff --git a/audio/snd/Makefile b/audio/snd/Makefile
index 6206d10d1a2..746c235c166 100644
--- a/audio/snd/Makefile
+++ b/audio/snd/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.28 2002/09/21 01:02:04 jlam Exp $
+# $NetBSD: Makefile,v 1.29 2003/03/29 12:40:09 jmmv Exp $
 #
 
 DISTNAME=		snd
 PKGNAME=		snd-19980212
+WRKSRC=			${WRKDIR}
 CATEGORIES=		audio
 MASTER_SITES=		${MASTER_SITE_LOCAL}
 
@@ -15,7 +16,6 @@ NO_SRC_ON_FTP=		Already on MASTER_SITE_LOCAL
 USE_BUILDLINK2=		YES
 USE_X11BASE=		YES
 
-WRKSRC=			${WRKDIR}
 MAKEFILE=		makefile.netbsd
 ALL_TARGET=		snd
 
diff --git a/audio/tcl-snack/Makefile b/audio/tcl-snack/Makefile
index e2c0cc0f2ad..69f1cdc8d40 100644
--- a/audio/tcl-snack/Makefile
+++ b/audio/tcl-snack/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.5 2002/12/01 21:57:06 gson Exp $
+# $NetBSD: Makefile,v 1.6 2003/03/29 12:40:09 jmmv Exp $
 
 DISTNAME=	snack2.2
 PKGNAME=	tcl-snack-2.2
+WRKSRC=         ${WRKDIR}/${DISTNAME}/unix
 CATEGORIES=	audio
 MASTER_SITES=	http://www.speech.kth.se/~kare/
 EXTRACT_SUFX=	.tar.Z
@@ -13,7 +14,6 @@ COMMENT=	The Snack Sound Toolkit
 USE_BUILDLINK2=	YES
 GNU_CONFIGURE=	YES
 USE_X11=	YES
-WRKSRC=         ${WRKDIR}/${DISTNAME}/unix
 
 .include "../../x11/tk/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/audio/tracker/Makefile b/audio/tracker/Makefile
index 7f9148edd57..1139feb0747 100644
--- a/audio/tracker/Makefile
+++ b/audio/tracker/Makefile
@@ -1,9 +1,10 @@
-# $NetBSD: Makefile,v 1.21 2003/01/28 22:03:04 jlam Exp $
+# $NetBSD: Makefile,v 1.22 2003/03/29 12:40:09 jmmv Exp $
 # FreeBSD Id: Makefile,v 1.29 1996/12/20 23:46:22 ache Exp 
 #
 
 DISTNAME=		tracker-5.3
 PKGREVISION=		1
+WRKSRC=			${WRKDIR}/tracker
 CATEGORIES=		audio
 MASTER_SITES=		# empty
 EXTRACT_SUFX=		.tgz
@@ -17,7 +18,6 @@ NO_BIN_ON_CDROM=	${RESTRICTED}
 NO_SRC_ON_FTP=		${RESTRICTED}
 NO_SRC_ON_CDROM=	${RESTRICTED}
 
-WRKSRC=			${WRKDIR}/tracker
 MAKE_FLAGS=		MACHINE=netbsd CC=${CC} INSTALL="${INSTALL}" \
 		INST_BIN_OPT="-c -s -m ${BINMODE} -o ${BINOWN} -g ${BINGRP}" \
 		INST_MAN_OPT="-c -m 644 -o ${BINOWN} -g ${BINGRP}" \
diff --git a/audio/trplayer/Makefile b/audio/trplayer/Makefile
index 6cca7442047..88c0973966e 100644
--- a/audio/trplayer/Makefile
+++ b/audio/trplayer/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.5 2003/03/27 07:27:06 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2003/03/29 12:40:09 jmmv Exp $
 #
 
 DISTNAME=	trplayer-1.2.0
+WRKSRC=		${WRKDIR}
 CATEGORIES=	audio
 MASTER_SITES=	ftp://linux-speakup.org/pub/linux/goodies/trplayer/
 EXTRACT_SUFX=	-1.i386.rpm
@@ -35,7 +36,6 @@ EMULDIR=	${LOCALBASE}/emul/linux
 EXTRACT_ONLY=	# nothing
 INFO_FILES=	trplayer.info
 PLIST_SRC=	${WRKDIR}/PLIST.rpm
-WRKSRC=		${WRKDIR}
 
 do-install:
 	${CP} ${PKGDIR}/PLIST ${PLIST_SRC};				\
diff --git a/audio/wmmixer/Makefile b/audio/wmmixer/Makefile
index e6995c76197..d573487aa50 100644
--- a/audio/wmmixer/Makefile
+++ b/audio/wmmixer/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.4 2002/09/25 06:32:38 jlam Exp $
+# $NetBSD: Makefile,v 1.5 2003/03/29 12:40:09 jmmv Exp $
 #
 
 DISTNAME=	wmmixer-1.0-beta1
 PKGNAME=	wmmixer-1.0
+WRKSRC=		${WRKDIR}/wmmixer
 CATEGORIES=	audio
 MASTER_SITES=	http://www.geocities.com/SiliconValley/Vista/2471/files/
 EXTRACT_SUFX=	.tgz
@@ -11,8 +12,6 @@ MAINTAINER=	pr@alles.prima.de
 HOMEPAGE=	http://www.geocities.com/SiliconValley/Vista/2471/
 COMMENT=	mixer designed for WindowMaker (dockapp)
 
-WRKSRC=		${WRKDIR}/wmmixer
-
 USE_BUILDLINK2=		YES
 USE_IMAKE=		YES
 NO_INSTALL_MANPAGES=	YES
diff --git a/audio/xmcd/Makefile b/audio/xmcd/Makefile
index 86ca7d8dfc3..18d25537201 100644
--- a/audio/xmcd/Makefile
+++ b/audio/xmcd/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.35 2003/01/28 22:03:04 jlam Exp $
+# $NetBSD: Makefile,v 1.36 2003/03/29 12:40:10 jmmv Exp $
 
 DISTNAME=	xmcd-3.0.2
+WRKSRC=		${WRKDIR}/xmcd-3.0
 CATEGORIES=	audio
 MASTER_SITES=	http://www.ibiblio.org/tkan/download/xmcd/src/
 
@@ -12,8 +13,6 @@ PATCH_SITES=		${HOMEPAGE}
 PATCHFILES=		xmcd-3.0.2-proxyauth-patch
 PATCH_DIST_STRIP=	-p1
 
-WRKSRC=		${WRKDIR}/xmcd-3.0
-
 USE_BUILDLINK2=		yes
 USE_PKGINSTALL=		yes
 USE_NCURSES=		# cursor_normal, cursor_invisible (in ncurses in term.h)
diff --git a/audio/xmix/Makefile b/audio/xmix/Makefile
index 9d971fb136a..f2fb0653ff2 100644
--- a/audio/xmix/Makefile
+++ b/audio/xmix/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.11 2001/08/22 17:38:57 jlam Exp $
+# $NetBSD: Makefile,v 1.12 2003/03/29 12:40:10 jmmv Exp $
 # FreeBSD Id: Makefile,v 1.5 1996/11/18 13:56:53 asami Exp 
 #
 
 DISTNAME=		xmix-2.1
+WRKSRC=			${WRKDIR}/xmix
 CATEGORIES=		audio
 MASTER_SITES=		${MASTER_SITE_SUNSITE:=apps/sound/mixers/}
 
@@ -13,7 +14,6 @@ MAINTAINER=		packages@netbsd.org
 COMMENT=		Mixer for X Window System
 
 USE_IMAKE=		yes
-WRKSRC=			${WRKDIR}/xmix
 
 pre-configure:
 	${CP} ${WRKSRC}/xmix.1 ${WRKSRC}/xmix.man