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

15 files changed, 31 insertions, 30 deletions

diff --git a/converters/bbcim/Makefile b/converters/bbcim/Makefile
index f0a3f3ba290..43436c881ff 100644
--- a/converters/bbcim/Makefile
+++ b/converters/bbcim/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.7 2003/07/21 16:36:11 martti Exp $
+# $NetBSD: Makefile,v 1.8 2004/01/20 12:10:28 agc Exp $
 #
 
 DISTNAME=       bbcim095-5
 PKGNAME=        bbcim-0.95b5
-WRKSRC=		${WRKDIR}/bbcim
 CATEGORIES=	converters
 MASTER_SITES=	http://www.nvg.ntnu.no/bbc/util/
 EXTRACT_SUFX=	.zip
@@ -11,6 +10,7 @@ EXTRACT_SUFX=	.zip
 MAINTAINER=	skrll@NetBSD.org
 COMMENT=	File and diskimage conversion utility for BBC Micro software
 
+WRKSRC=		${WRKDIR}/bbcim
 MAN_PAGE=	${FILESDIR}/bbcim.1
 
 do-build:
diff --git a/converters/bib2xml/Makefile b/converters/bib2xml/Makefile
index d4d634a1e8f..80f5b5e87d7 100644
--- a/converters/bib2xml/Makefile
+++ b/converters/bib2xml/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.3 2003/07/17 21:27:09 grant Exp $
+# $NetBSD: Makefile,v 1.4 2004/01/20 12:10:29 agc Exp $
 #
 
 DISTNAME=	bib2xml-10062002
 PKGNAME=	${DISTNAME:C/-(....)(....)/-\2\1/}
-WRKSRC=		${WRKDIR}/bib2xml
 CATEGORIES=	converters textproc
 MASTER_SITES=	http://www.cs.colorado.edu/~henkel/stuff/bib2xml/
 
@@ -11,6 +10,7 @@ MAINTAINER=	tech-pkg@NetBSD.org
 HOMEPAGE=	http://www.cs.colorado.edu/~henkel/stuff/bib2xml/
 COMMENT=	BibTeX to XML converter
 
+WRKSRC=		${WRKDIR}/bib2xml
 USE_BUILDLINK2=	YES
 GNU_CONFIGURE=	YES
 BUILD_DIRS=	${WRKSRC}/progs
diff --git a/converters/cn2jp/Makefile b/converters/cn2jp/Makefile
index cbc2b16d79e..f6b28528333 100644
--- a/converters/cn2jp/Makefile
+++ b/converters/cn2jp/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.4 2003/07/21 16:36:12 martti Exp $
+# $NetBSD: Makefile,v 1.5 2004/01/20 12:10:29 agc Exp $
 
 DISTNAME=	cn2jp1.4b
 PKGNAME=	cn2jp-1.4b
-WRKSRC=		${WRKDIR}/cn2jp
 CATEGORIES=	converters
 MASTER_SITES=	http://w3.sys.es.osaka-u.ac.jp/~seke/software/cn2jp/
 
@@ -10,6 +9,7 @@ MAINTAINER=	rxg@NetBSD.org
 HOMEPAGE=	http://w3.sys.es.osaka-u.ac.jp/~seke/software/cn2jp/
 COMMENT=	Library for code translation between Chinese and Japanese
 
+WRKSRC=		${WRKDIR}/cn2jp
 USE_LIBTOOL=	yes
 USE_GMAKE=	yes
 
diff --git a/converters/macfork/Makefile b/converters/macfork/Makefile
index 1682b6de69a..7c61ac74c3e 100644
--- a/converters/macfork/Makefile
+++ b/converters/macfork/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.6 2003/07/17 21:27:19 grant Exp $
+# $NetBSD: Makefile,v 1.7 2004/01/20 12:10:29 agc Exp $
 
 DISTNAME=	macfork-1.0
-WRKSRC=		${WRKDIR}/macfork
 CATEGORIES=	converters
 MASTER_SITES=	http://www.cs.cmu.edu/~ajw/public/dist/
 
@@ -9,6 +8,7 @@ MAINTAINER=	tech-pkg@NetBSD.org
 HOMEPAGE=	http://www.cs.cmu.edu/afs/cs/user/ajw/www/software/
 COMMENT=	Tool for extracting data from Macintosh resource forks
 
+WRKSRC=		${WRKDIR}/macfork
 USE_BUILDLINK2=	# defined
 USE_GCC_SHLIB=	# defined
 USE_GMAKE=	# defined
diff --git a/converters/mpack/Makefile b/converters/mpack/Makefile
index 9438a626b21..fb8081911f0 100644
--- a/converters/mpack/Makefile
+++ b/converters/mpack/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.12 2003/07/17 21:27:20 grant Exp $
+# $NetBSD: Makefile,v 1.13 2004/01/20 12:10:29 agc Exp $
 # FreeBSD Id: Makefile,v 1.7 1997/04/26 23:55:23 asami Exp
 #
 
 DISTNAME=	mpack-1.5-src
 PKGNAME=	mpack-1.5
-WRKSRC=		${WRKDIR}/mpack
 CATEGORIES=	converters mail news
 MASTER_SITES=	ftp://ftp.andrew.cmu.edu/pub/mpack/
 EXTRACT_SUFX=	.tar.Z
@@ -12,6 +11,7 @@ EXTRACT_SUFX=	.tar.Z
 MAINTAINER=	tech-pkg@NetBSD.org
 COMMENT=	External MIME packer/unpacker
 
+WRKSRC=		${WRKDIR}/mpack
 USE_BUILDLINK2=	# defined
 
 .include "../../mk/bsd.prefs.mk"
diff --git a/converters/p5-jcode/Makefile b/converters/p5-jcode/Makefile
index 02e4bfca78d..3219901d1aa 100644
--- a/converters/p5-jcode/Makefile
+++ b/converters/p5-jcode/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.4 2003/07/17 21:27:26 grant Exp $
+# $NetBSD: Makefile,v 1.5 2004/01/20 12:10:29 agc Exp $
 # FreeBSD Id: Makefile,v 1.2 1999/01/17 10:56:40 vanilla Exp $
 
 DISTNAME=	jcode.pl-2.13
 PKGNAME=	p5-jcode-2.13
 SVR4_PKGNAME=	p5jc2
-WRKSRC=		${WRKDIR}
 CATEGORIES=	japanese converters
 MASTER_SITES=	ftp://ftp.iij.ad.jp/pub/IIJ/dist/utashiro/perl/ \
 		ftp://ftp.sra.co.jp/pub/lang/perl/sra-scripts/
@@ -14,6 +13,7 @@ MAINTAINER=	tech-pkg-ja@jp.NetBSD.org
 HOMEPAGE=	# not available
 COMMENT=	Perl library for Japanese character code conversion
 
+WRKSRC=			${WRKDIR}
 USE_BUILDLINK2=		YES
 
 NO_BUILD=		# defined
diff --git a/converters/p5-nkf/Makefile b/converters/p5-nkf/Makefile
index d64d81cc535..a45529cefc9 100644
--- a/converters/p5-nkf/Makefile
+++ b/converters/p5-nkf/Makefile
@@ -1,16 +1,16 @@
-# $NetBSD: Makefile,v 1.4 2003/07/17 21:27:28 grant Exp $
+# $NetBSD: Makefile,v 1.5 2004/01/20 12:10:29 agc Exp $
 #
 
 DISTNAME=	nkf-1.7
 PKGNAME=	p5-nkf-1.7
 SVR4_PKGNAME=	p5nkf
-WRKSRC=		${WRKDIR}/${DISTNAME}/NKF
 CATEGORIES=	japanese converters
 MASTER_SITES=	ftp://ftp.sra.co.jp/pub/cmd/nkf/
 
 MAINTAINER=	tech-pkg-ja@jp.NetBSD.org
 COMMENT=	Perl library for Network Kanji code conversion Filter
 
+WRKSRC=			${WRKDIR}/${DISTNAME}/NKF
 USE_BUILDLINK2=		YES
 PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/NKF/.packlist
 
diff --git a/converters/py-zhCodecs/Makefile b/converters/py-zhCodecs/Makefile
index 5d40c325be5..2693941b779 100644
--- a/converters/py-zhCodecs/Makefile
+++ b/converters/py-zhCodecs/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.6 2003/09/21 09:41:53 jmc Exp $
+# $NetBSD: Makefile,v 1.7 2004/01/20 12:10:29 agc Exp $
 
 DISTNAME=	ChineseCodecs1.2.0
 PKGNAME=	${PYPKGPREFIX}-zhCodecs-1.2.0
-WRKSRC=		${WRKDIR}/${DISTNAME}/Python
 CATEGORIES=	converters devel
 MASTER_SITES=	ftp://ftp.shellhung.org/pub/OpenBSD/packages/chinese/ \
 		ftp://ftp2.python.or.kr/pub/FreeBSD/ports/distfiles/
@@ -11,6 +10,7 @@ MAINTAINER=	shell@NetBSD.org
 HOMEPAGE=	http://www.sourceforge.net/python-codecs/
 COMMENT=	Python Unicode codecs for Chinese charsets
 
+WRKSRC=		${WRKDIR}/${DISTNAME}/Python
 PYDISTUTILSPKG=	# defined
 PYBINMODULE=	# defined
 USE_BUILDLINK2=	yes
diff --git a/converters/qkc/Makefile b/converters/qkc/Makefile
index b0f5e2e6663..983d50711b4 100644
--- a/converters/qkc/Makefile
+++ b/converters/qkc/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.2 2003/03/29 12:40:22 jmmv Exp $
+# $NetBSD: Makefile,v 1.3 2004/01/20 12:10:29 agc Exp $
 # FreeBSD: ports/japanese/qkc/Makefile,v 1.15 2001/05/10 11:42:23 max Exp
 
 DISTNAME=	qkcc100
 PKGNAME=	qkc-1.0
-WRKSRC=		${WRKDIR}
 CATEGORIES=	japanese converters
 MASTER_SITES=	http://hp.vector.co.jp/authors/VA000501/
 EXTRACT_SUFX=	.zip
@@ -12,6 +11,7 @@ MAINTAINER=	hiramatu@boreas.dti.ne.jp
 HOMEPAGE=	http://hp.vector.co.jp/authors/VA000501/
 COMMENT=	Quick Kanji code Converter
 
+WRKSRC=		${WRKDIR}
 ALL_TARGET=	qkc
 
 do-install:
diff --git a/converters/rpm2cpio/Makefile b/converters/rpm2cpio/Makefile
index 3f8b8cd09b3..5ee6f961756 100644
--- a/converters/rpm2cpio/Makefile
+++ b/converters/rpm2cpio/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.13 2003/07/17 21:27:33 grant Exp $
+# $NetBSD: Makefile,v 1.14 2004/01/20 12:10:29 agc Exp $
 # FreeBSD Id: ports/misc/rpm2cpio/Makefile,v 1.2 1999/08/25 07:22:29 obrien Exp
 
 DISTNAME=	rpm2cpio
 PKGNAME=	rpm2cpio-1.1
-WRKSRC=		${WRKDIR}
 CATEGORIES=	misc
 MASTER_SITES=	http://www.iagora.com/~espel/
 EXTRACT_SUFX=	# none
@@ -12,6 +11,7 @@ MAINTAINER=	tech-pkg@NetBSD.org
 HOMEPAGE=	http://www.iagora.com/~espel/index.html
 COMMENT=	Convert .rpm files for extraction with cpio, needs just perl
 
+WRKSRC=		${WRKDIR}
 USE_BUILDLINK2=	YES
 
 DIST_SUBDIR=	${PKGNAME}
diff --git a/converters/ruby-uconv/Makefile b/converters/ruby-uconv/Makefile
index f50c8d7a4a5..94cdb0f3ac1 100644
--- a/converters/ruby-uconv/Makefile
+++ b/converters/ruby-uconv/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.3 2003/07/17 21:27:37 grant Exp $
+# $NetBSD: Makefile,v 1.4 2004/01/20 12:10:29 agc Exp $
 # FreeBSD: ports/japanese/ruby-uconv/Makefile,v 1.8 2001/01/30 19:26:22 knu Exp
 
 DISTNAME=	uconv-0.4.9
 PKGNAME=	${RUBY_PKGNAMEPREFIX}${DISTNAME}
-WRKSRC=		${WRKDIR}/uconv
 CATEGORIES=	japanese converters
 MASTER_SITES=	http://www.yoshidam.net/
 
@@ -11,6 +10,7 @@ MAINTAINER=	taca@NetBSD.org
 HOMEPAGE=	http://www.yoshidam.net/Ruby.html#uconv
 COMMENT=	Unicode conversion library with Japanese codesets support
 
+WRKSRC=		${WRKDIR}/uconv
 DIST_SUBDIR=	ruby
 USE_RUBY=	yes
 USE_RUBY_EXTCONF= yes
diff --git a/converters/tex2rtf/Makefile b/converters/tex2rtf/Makefile
index e67b27f60f1..417d909a58f 100644
--- a/converters/tex2rtf/Makefile
+++ b/converters/tex2rtf/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.6 2003/12/24 09:53:48 jmmv Exp $
+# $NetBSD: Makefile,v 1.7 2004/01/20 12:10:29 agc Exp $
 
 DISTNAME=		tex2rtf164_source
 PKGNAME=		tex2rtf-164
-WRKSRC=			${WRKDIR}/src
 CATEGORIES=		converters textproc
 MASTER_SITES=		ftp://www.remstar.com/pub/wxwin/tex2rtf/	\
 			ftp://ftp.sunet.se/pub7/lang/wxwin/tex2rtf/
@@ -12,6 +11,8 @@ MAINTAINER=		ben@NetBSD.org
 HOMEPAGE=		http://web.ukonline.co.uk/julian.smart/tex2rtf/
 COMMENT=		LaTex-to-RTF translator
 
+WRKSRC=			${WRKDIR}/src
+
 do-build:
 	cd ${WRKSRC} && make -f makefile.unx nogui
 
diff --git a/converters/unix2dos/Makefile b/converters/unix2dos/Makefile
index 733cba4df5a..7da0ee10bc6 100644
--- a/converters/unix2dos/Makefile
+++ b/converters/unix2dos/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.11 2003/07/17 21:27:40 grant Exp $
+# $NetBSD: Makefile,v 1.12 2004/01/20 12:10:29 agc Exp $
 # FreeBSD Id: ports/converters/unix2dos/Makefile,v 1.5 2000/07/04 10:31:42 sobomax Exp
 
 DISTNAME=	unix2dos-1.2
-WRKSRC=		${WRKDIR}
 CATEGORIES=	converters
 MASTER_SITES=	http://www.fisicc-ufm.edu/~obonilla/files/		\
 		ftp://ftp.guug.org/pub/
@@ -10,6 +9,7 @@ MASTER_SITES=	http://www.fisicc-ufm.edu/~obonilla/files/		\
 MAINTAINER=	zuntum@NetBSD.org
 COMMENT=	Translate ASCII files to/from DOS (cr/lf) and UNIX (lf)
 
+WRKSRC=		${WRKDIR}
 USE_BUILDLINK2=	# defined
 
 do-install:
diff --git a/converters/uulib/Makefile b/converters/uulib/Makefile
index 0428b167fa1..8c4d1256a9e 100644
--- a/converters/uulib/Makefile
+++ b/converters/uulib/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.25 2003/07/17 21:27:42 grant Exp $
+# $NetBSD: Makefile,v 1.26 2004/01/20 12:10:29 agc Exp $
 #
 
 DISTNAME=       uudeview-0.5.18
 PKGNAME=        uulib-0.5.18
-WRKSRC=		${WRKDIR}/${DISTNAME}/uulib
 CATEGORIES=	converters
 MASTER_SITES=	http://www.fpx.de/fp/Software/UUDeview/download/
 
@@ -14,6 +13,7 @@ COMMENT=	Library for uu/xx/Base64/BinHex de-/encoding
 # "kdesupport-2.1b" included "uu" library.
 CONFLICTS=	kdesupport-2.1b
 
+WRKSRC=		${WRKDIR}/${DISTNAME}/uulib
 USE_BUILDLINK2=	# defined
 GNU_CONFIGURE=	# defined
 USE_LIBTOOL=	# defined
diff --git a/converters/xlhtml/Makefile b/converters/xlhtml/Makefile
index 9f0b62c8f11..67f796036e2 100644
--- a/converters/xlhtml/Makefile
+++ b/converters/xlhtml/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.3 2003/07/17 21:27:46 grant Exp $
+# $NetBSD: Makefile,v 1.4 2004/01/20 12:10:29 agc Exp $
 #
 
 DISTNAME=		xlhtml.0.5.1
 PKGNAME=		${DISTNAME:S/./-/}
-WRKSRC=			${WRKDIR}/xlhtml
 CATEGORIES=		converters
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=chicago/}
 EXTRACT_SUFX=		.tgz
@@ -12,6 +11,7 @@ MAINTAINER=		tech-pkg@NetBSD.org
 HOMEPAGE=		http://chicago.sourceforge.net/xlhtml/
 COMMENT=		Microsoft xls/ppt to HTML converter
 
+WRKSRC=			${WRKDIR}/xlhtml
 USE_BUILDLINK2=		YES
 GNU_CONFIGURE=		YES
 USE_GMAKE=      	YES