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

12 files changed, 25 insertions, 24 deletions

diff --git a/comms/binkd/Makefile b/comms/binkd/Makefile
index 92b7222c1d1..68db3fdc9a1 100644
--- a/comms/binkd/Makefile
+++ b/comms/binkd/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.15 2002/12/24 18:53:18 jmmv Exp $
+# $NetBSD: Makefile,v 1.16 2004/01/20 12:10:01 agc Exp $
 #
 
 DISTNAME=		binkd094
 PKGNAME=		binkd-0.9.4
 PKGREVISION=		1
-WRKSRC=			${WRKDIR}/${PKGNAME_NOREV}
 CATEGORIES=		comms
 MASTER_SITES=		http://www.corbina.net/~maloff/binkd/ \
 			ftp://happy.kiev.ua/pub/fidosoft/mailer/binkd/
@@ -14,6 +13,7 @@ MAINTAINER=		tv@pobox.com
 HOMEPAGE=		http://www.corbina.net/~maloff/binkd/
 COMMENT=		FidoNet-over-IP transport program utilizing BINKP protocol
 
+WRKSRC=			${WRKDIR}/${PKGNAME_NOREV}
 USE_BUILDLINK2=		# defined
 GNU_CONFIGURE=		# defined
 
diff --git a/comms/dl-ezkit/Makefile b/comms/dl-ezkit/Makefile
index 3a339b94d47..5d1d67cfe31 100644
--- a/comms/dl-ezkit/Makefile
+++ b/comms/dl-ezkit/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.9 2003/07/21 16:35:12 martti Exp $
+# $NetBSD: Makefile,v 1.10 2004/01/20 12:10:01 agc Exp $
 
 DISTNAME=	dl-ezkit-0.8.1-bsd
 PKGNAME=        dl-ezkit-0.8.1
-WRKSRC=		${WRKDIR}/dl-ezkit
 CATEGORIES=	comms
 MASTER_SITES=	http://www.ww.tu-freiberg.de/~pberg/download/Unix-sources/
 
@@ -12,6 +11,7 @@ COMMENT=	Coff file downloader for the EZ-KIT Lite using the RS232
 
 MAKEFILE=	Makefile.bsd
 
+WRKSRC=		${WRKDIR}/dl-ezkit
 USE_BUILDLINK2=	# defined
 
 do-install:
diff --git a/comms/efax-gtk/Makefile b/comms/efax-gtk/Makefile
index 24f15ec7ee9..3e9c4b18451 100644
--- a/comms/efax-gtk/Makefile
+++ b/comms/efax-gtk/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.11 2003/07/17 21:26:39 grant Exp $
+# $NetBSD: Makefile,v 1.12 2004/01/20 12:10:01 agc Exp $
 
 DISTNAME=		efax-gtk-1.0.1b.src
 PKGNAME=		efax-gtk-1.0.1b
 PKGREVISION=		5
-WRKSRC=			${WRKDIR}/efax-gtk
 CATEGORIES=		comms
 MASTER_SITES=		http://www.cvine.freeserve.co.uk/efax-gtk/
 EXTRACT_SUFX=		.tgz
@@ -14,6 +13,7 @@ COMMENT=		GTK frontend for efax
 
 DEPENDS+=		efax>=0.9:../../comms/efax
 
+WRKSRC=			${WRKDIR}/efax-gtk
 GNU_CONFIGURE=		YES
 USE_BUILDLINK2= 	YES
 USE_PKGINSTALL=		YES
diff --git a/comms/estic/Makefile b/comms/estic/Makefile
index 7215c2974d5..4db7facf0d2 100644
--- a/comms/estic/Makefile
+++ b/comms/estic/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.9 2003/12/28 21:54:31 tron Exp $
+# $NetBSD: Makefile,v 1.10 2004/01/20 12:10:01 agc Exp $
 
 DISTNAME=	estic-1.61
-WRKSRC=		${WRKDIR}/${PKGNAME_NOREV:C/-.*//}
 CATEGORIES=	comms
 MASTER_SITES=	ftp://ftp.gwdg.de/pub/misc/isdn/linux/estic/
 EXTRACT_SUFX=	.zip
@@ -17,6 +16,7 @@ RESTRICTED=	"Only free distribution permitted"
 NO_SRC_ON_CDROM=${RESTRICTED}
 NO_BIN_ON_CDROM=${RESTRICTED}
 
+WRKSRC=		${WRKDIR}/${PKGNAME_NOREV:C/-.*//}
 USE_BUILDLINK2=	# defined
 USE_X11=	# defined
 
diff --git a/comms/gkermit/Makefile b/comms/gkermit/Makefile
index 62746f91caf..95cad797ec6 100644
--- a/comms/gkermit/Makefile
+++ b/comms/gkermit/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.13 2003/07/26 12:54:55 cjep Exp $
+# $NetBSD: Makefile,v 1.14 2004/01/20 12:10:01 agc Exp $
 #
 
 DISTNAME=	gkermit
 PKGNAME=	gkermit-1.00
 PKGREVISION=	1
-WRKSRC=		${WRKDIR}
 CATEGORIES=	comms
 MASTER_SITES=	ftp://kermit.columbia.edu/kermit/archives/
 
@@ -14,6 +13,7 @@ COMMENT=	Minimal implementation of the ``kermit'' protocol (GPL'd)
 
 DIST_SUBDIR=	gkermit-1.00
 
+WRKSRC=		${WRKDIR}
 USE_BUILDLINK2=	# defined
 ALL_TARGET=	posix
 MAKEFILE=	makefile
diff --git a/comms/kermit/Makefile b/comms/kermit/Makefile
index 8a46cb3edce..6641efbc646 100644
--- a/comms/kermit/Makefile
+++ b/comms/kermit/Makefile
@@ -1,11 +1,10 @@
-# $NetBSD: Makefile,v 1.49 2003/11/16 12:21:33 agc Exp $
+# $NetBSD: Makefile,v 1.50 2004/01/20 12:10:01 agc Exp $
 # $FreeBSD Id: Makefile,v 1.17 1997/11/26 23:16:51 jseger Exp
 #
 
 DISTNAME=	cku209
 PKGNAME=	kermit-8.0.209
 PKGREVISION=	2
-WRKSRC=		${WRKDIR}
 CATEGORIES=	comms
 MASTER_SITES=	ftp://kermit.columbia.edu/kermit/archives/
 
@@ -17,6 +16,7 @@ LICENSE=	kermit-license
 
 .include "../../mk/bsd.prefs.mk"
 
+WRKSRC=		${WRKDIR}
 USE_BUILDLINK2=	YES
 BUILD_DEFS+=	KERMIT_SUID_UUCP KFLAGS LIBS MANINSTALL
 MAKE_ENV+=	KFLAGS="${KFLAGS}" LIBS="${LIBS}"
diff --git a/comms/malsync/Makefile b/comms/malsync/Makefile
index 84907330e58..fd34f7850d8 100644
--- a/comms/malsync/Makefile
+++ b/comms/malsync/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.10 2003/07/21 16:35:14 martti Exp $
+# $NetBSD: Makefile,v 1.11 2004/01/20 12:10:01 agc Exp $
 #
 
 DISTNAME=	${PKGNAME_NOREV:S/-/_/}.src
 PKGNAME=	malsync-2.1.1
 PKGREVISION=			1
-WRKSRC=		${WRKDIR}/malsync
 CATEGORIES=	comms
 MASTER_SITES=	http://www.tomw.org/malsync/
 
@@ -12,6 +11,7 @@ MAINTAINER=	rh@NetBSD.org
 HOMEPAGE=	http://www.tomw.org/malsync/
 COMMENT=	Utility to synchronize Palm Pilots to the AvantGo.com service
 
+WRKSRC=		${WRKDIR}/malsync
 USE_BUILDLINK2=		YES
 USE_GMAKE=		YES
 MAKE_ENV+=		PILOT_LINK_DIR=${BUILDLINK_PREFIX.pilot-link-libs}
diff --git a/comms/mgetty+sendfax/Makefile b/comms/mgetty+sendfax/Makefile
index d4c850299fe..4cf893211a4 100644
--- a/comms/mgetty+sendfax/Makefile
+++ b/comms/mgetty+sendfax/Makefile
@@ -1,11 +1,10 @@
-# $NetBSD: Makefile,v 1.38 2004/01/03 18:49:36 reed Exp $
+# $NetBSD: Makefile,v 1.39 2004/01/20 12:10:01 agc Exp $
 # FreeBSD Id: Makefile,v 1.25 1998/07/16 06:44:37 vanilla Exp
 #
 
 DISTNAME=	mgetty1.1.30-Dec16
 PKGNAME=	mgetty-1.1.30
 PKGREVISION=	2
-WRKSRC=		${WRKDIR}/${PKGNAME_NOREV}
 CATEGORIES=	comms
 MASTER_SITES=	ftp://ftp.leo.org/pub/comp/os/unix/networking/mgetty/ \
 		ftp://alpha.greenie.net/pub/mgetty/source/1.1/
@@ -18,6 +17,7 @@ BUILD_DEPENDS+=	texi2roff-[0-9]*:../../textproc/texi2roff
 
 CONFLICTS=	hylafax-[0-9]*
 
+WRKSRC=			${WRKDIR}/${PKGNAME_NOREV}
 USE_BUILDLINK2=		yes
 
 USE_PKGINSTALL=		yes
diff --git a/comms/minicom/Makefile b/comms/minicom/Makefile
index 9629caab14f..97a21356f6d 100644
--- a/comms/minicom/Makefile
+++ b/comms/minicom/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.36 2003/07/17 21:26:52 grant Exp $
+# $NetBSD: Makefile,v 1.37 2004/01/20 12:10:01 agc Exp $
 
 DISTNAME=	minicom-1.83.1.src
 PKGNAME=	${DISTNAME:S/.src//}
 PKGREVISION=	1
-WRKSRC=		${WRKDIR}/${PKGNAME_NOREV}/src
 CATEGORIES=	comms
 MASTER_SITES=	${MASTER_SITE_BACKUP}
 #MASTER_SITES=	${MASTER_SITE_SUNSITE:=apps/serialcomm/dialout/} \
@@ -17,6 +16,7 @@ BUILD_USES_MSGFMT=	yes
 DEPENDS+=	gkermit-[0-9]*:../../comms/gkermit
 DEPENDS+=	lrzsz-[0-9]*:../../comms/lrzsz
 
+WRKSRC=			${WRKDIR}/${PKGNAME_NOREV}/src
 USE_BUILDLINK2=		yes
 USE_PKGINSTALL=		yes
 USE_PKGLOCALEDIR=	yes
diff --git a/comms/pilotmgr/Makefile b/comms/pilotmgr/Makefile
index 28eac235c6f..b183714ed87 100644
--- a/comms/pilotmgr/Makefile
+++ b/comms/pilotmgr/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.24 2003/07/21 16:35:16 martti Exp $
+# $NetBSD: Makefile,v 1.25 2004/01/20 12:10:01 agc Exp $
 
 DISTNAME=	pilotmgr-1.107p2
 PKGNAME=	pilotmgr-1.107.2
 PKGREVISION=	1
-WRKSRC=		${WRKDIR}/${DISTNAME:C/-.*$//}
 CATEGORIES=	comms
 MASTER_SITES=	${MASTER_SITE_LOCAL}
 EXTRACT_SUFX=	.tar.bz2
@@ -17,6 +16,7 @@ DEPENDS+=	p5-Digest-MD5-[0-9]*:../../security/p5-Digest-MD5
 DEPENDS+=	p5-Tk-[0-9]*:../../x11/p5-Tk
 DEPENDS+=	p5-pilot-link-[0-9]*:../p5-pilot-link
 
+WRKSRC=			${WRKDIR}/${DISTNAME:C/-.*$//}
 USE_BUILDLINK2=		YES
 USE_X11=		YES
 HAS_CONFIGURE=		YES
diff --git a/comms/snooper/Makefile b/comms/snooper/Makefile
index 5bc37999ce9..6cb0bcca03a 100644
--- a/comms/snooper/Makefile
+++ b/comms/snooper/Makefile
@@ -1,14 +1,14 @@
-# $NetBSD: Makefile,v 1.12 2003/07/21 16:35:16 martti Exp $
+# $NetBSD: Makefile,v 1.13 2004/01/20 12:10:01 agc Exp $
 # FreeBSD Id: Makefile,v 1.3 1998/08/13 09:20:41 itojun Exp $
 
 DISTNAME=	snooper-19991202
-WRKSRC=		${WRKDIR}/snooper/build
 CATEGORIES=	comms
 MASTER_SITES=   ftp://ftp.foretune.co.jp/pub/tools/snooper/
 
 MAINTAINER=	itojun@itojun.org
 COMMENT=	Serial line protocol analyzer (need two serial interfaces)
 
+WRKSRC=		${WRKDIR}/snooper/build
 GNU_CONFIGURE=	yes
 USE_BUILDLINK2=	yes
 
diff --git a/comms/tkhylafax/Makefile b/comms/tkhylafax/Makefile
index 0399e3dee51..ecdb5bc3958 100644
--- a/comms/tkhylafax/Makefile
+++ b/comms/tkhylafax/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.22 2003/07/17 21:27:02 grant Exp $
+# $NetBSD: Makefile,v 1.23 2004/01/20 12:10:01 agc Exp $
 # FreeBSD Id: Makefile,v 1.6 1998/08/07 23:56:12 asami Exp
 #
 
 DISTNAME=	tkhylafax-3.1
 PKGREVISION=	3
-WRKSRC=		${WRKDIR}/tkhylafax
 CATEGORIES=	comms
 MASTER_SITES=	ftp://ftp.sgi.com/sgi/fax/contrib/tkhylafax/ \
 		ftp://ftp.tuwien.ac.at/infosys/fax/hylafax/contrib/tkhylafax/ \
@@ -18,4 +17,6 @@ DEPENDS+=	gv>=3.5.8nb1:../../print/gv
 DEPENDS+=	hylafax>=4.1:../../comms/hylafax
 DEPENDS+=	tk>=8.3.2:../../x11/tk
 
+WRKSRC=		${WRKDIR}/tkhylafax
+
 .include "../../mk/bsd.pkg.mk"