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

5 files changed, 12 insertions, 11 deletions

diff --git a/shells/ast-ksh/Makefile.common b/shells/ast-ksh/Makefile.common
index 90c7041119f..4745b36fcf1 100644
--- a/shells/ast-ksh/Makefile.common
+++ b/shells/ast-ksh/Makefile.common
@@ -1,9 +1,8 @@
 # $OpenBSD: Makefile,v 1.5 2001/11/21 01:17:43 naddy Exp $
-# $NetBSD: Makefile.common,v 1.7 2003/12/09 01:04:23 reed Exp $
+# $NetBSD: Makefile.common,v 1.8 2004/01/20 12:25:54 agc Exp $
 
 DISTNAME=	ast-ksh-${ASTKSH_VERSION}
 PKGNAME=	ast-ksh-${ASTKSH_VERSION:S/-//g}
-WRKSRC=		${WRKDIR}
 CATEGORIES=	shells
 MASTER_SITES=	http://www.research.att.com/~gsf/download/tgz/ \
 		http://ftp.ntua.gr/pub/linux/openpkg/sources/DST/ksh/
@@ -27,6 +26,7 @@ ONLY_FOR_PLATFORM=	NetBSD-*
 
 ASTKSH_VERSION=	2003-07-24
 
+WRKSRC=		${WRKDIR}
 USE_BUILDLINK2=	YES
 USE_PKGINSTALL=	YES
 MAKE_FLAGS=	CC="${CC}" CCFLAGS="${CFLAGS}"
diff --git a/shells/bash2-doc/Makefile b/shells/bash2-doc/Makefile
index 196797ad656..7b6cfb1621e 100644
--- a/shells/bash2-doc/Makefile
+++ b/shells/bash2-doc/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.7 2003/07/21 17:20:55 martti Exp $
+# $NetBSD: Makefile,v 1.8 2004/01/20 12:25:54 agc Exp $
 
 DISTNAME=	bash-doc-2.05b
 PKGNAME=	bash-doc-2.05.2
-WRKSRC=		${WRKDIR}/doc
 CATEGORIES=	shells
 MASTER_SITES=	${MASTER_SITE_GNU:=bash/} \
 		ftp://ftp.cwru.edu/pub/bash/
@@ -13,6 +12,7 @@ COMMENT=	Documentation for the GNU Bourne Again Shell
 
 CONFLICTS=	bash<=2.05nb1
 
+WRKSRC=		${WRKDIR}/doc
 USE_BUILDLINK2=	# defined
 NO_CONFIGURE=	# defined
 NO_BUILD=	# defined
diff --git a/shells/esh/Makefile b/shells/esh/Makefile
index 8bfb776ec0a..d080d9ad0f0 100644
--- a/shells/esh/Makefile
+++ b/shells/esh/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.17 2003/08/09 11:23:00 seb Exp $
+# $NetBSD: Makefile,v 1.18 2004/01/20 12:25:54 agc Exp $
 
 DISTNAME=		esh-0.8
-WRKSRC=			${WRKDIR}/esh
 CATEGORIES=		shells
 MASTER_SITES=		${MASTER_SITE_BACKUP}
 
@@ -10,6 +9,7 @@ COMMENT=		Unix shell with Lisp-like syntax
 
 INFO_FILES=		esh.info
 
+WRKSRC=			${WRKDIR}/esh
 USE_PKGINSTALL=		yes
 PKG_SHELL=		${PREFIX}/bin/esh
 
diff --git a/shells/mudsh/Makefile b/shells/mudsh/Makefile
index 6442cf7ac52..4697e437eef 100644
--- a/shells/mudsh/Makefile
+++ b/shells/mudsh/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.4 2003/07/17 22:53:23 grant Exp $
+# $NetBSD: Makefile,v 1.5 2004/01/20 12:25:54 agc Exp $
 #
 
 DISTNAME=	mudsh
 PKGNAME=	mudsh-20010311
-WRKSRC=		${WRKDIR}
 CATEGORIES=	shells
 MASTER_SITES=	http://www.xirium.com/tech/mud-shell/download/
 EXTRACT_SUFX=	# empty
@@ -12,7 +11,8 @@ MAINTAINER=	tech-pkg@NetBSD.org
 HOMEPAGE=	http://www.xirium.com/tech/mud-shell/index.html
 COMMENT=	M.U.D. game-like shell
 
-USE_BUILDLINK2=YES
+WRKSRC=		${WRKDIR}
+USE_BUILDLINK2=	YES
 EXTRACT_CMD=	${CP} ${DOWNLOADED_DISTFILE} ${WRKSRC}
 
 do-build:
diff --git a/shells/standalone-tcsh/Makefile b/shells/standalone-tcsh/Makefile
index bd3bd4f67c1..3e7729f8879 100644
--- a/shells/standalone-tcsh/Makefile
+++ b/shells/standalone-tcsh/Makefile
@@ -1,13 +1,14 @@
-# $NetBSD: Makefile,v 1.12 2004/01/11 23:06:54 grant Exp $
+# $NetBSD: Makefile,v 1.13 2004/01/20 12:25:54 agc Exp $
 #
 
 NO_MTREE=		YES
 
 PKGNAME=		standalone-${DISTNAME}
-WRKSRC=			${WRKDIR}/${DISTNAME}
 
 PKG_SHELL=		/bin/tcsh
 
+WRKSRC=			${WRKDIR}/${DISTNAME}
+
 .include "../../shells/tcsh/Makefile"
 
 COMMENT:=		Standalone version of the Extended C-shell