From 95b3e3e2360a18f5efbc61ef85a063b7481be09f Mon Sep 17 00:00:00 2001
From: jmmv <jmmv>
Date: Sat, 29 Mar 2003 12:40:00 +0000
Subject: Place WRKSRC where it belongs, to make pkglint happy; ok'ed by wiz.

---
 net/6to4/Makefile                    | 4 ++--
 net/6tunnel/Makefile                 | 5 ++---
 net/IglooFTP/Makefile                | 5 ++---
 net/LaBrea/Makefile                  | 5 ++---
 net/archie/Makefile                  | 5 ++---
 net/batchftp/Makefile                | 5 ++---
 net/bind4/Makefile                   | 5 ++---
 net/bounce/Makefile                  | 5 ++---
 net/bpalogin/Makefile                | 5 ++---
 net/bridged/Makefile                 | 4 ++--
 net/cidr/Makefile                    | 5 ++---
 net/citrix_ica/Makefile              | 4 ++--
 net/cmu-dhcpd/Makefile               | 4 ++--
 net/dgd/Makefile                     | 5 ++---
 net/dnstop/Makefile                  | 4 ++--
 net/dynipclient/Makefile             | 5 ++---
 net/edonkey2k/Makefile               | 4 ++--
 net/firewalk-gtk/Makefile            | 5 ++---
 net/firewalk/Makefile                | 5 ++---
 net/flan/Makefile                    | 5 ++---
 net/host/Makefile                    | 4 ++--
 net/ip6_int/Makefile                 | 4 ++--
 net/ipcalc/Makefile                  | 4 ++--
 net/ipcheck/Makefile                 | 4 ++--
 net/iperf/Makefile                   | 4 ++--
 net/ipw/Makefile                     | 5 ++---
 net/irrd/Makefile                    | 5 ++---
 net/lambdamoo-core/Makefile          | 4 ++--
 net/lambdamoo-doc/Makefile           | 4 ++--
 net/lambdamoo/Makefile               | 4 ++--
 net/md-whois/Makefile                | 5 ++---
 net/mirror/Makefile                  | 4 ++--
 net/mouse-pppoe/Makefile             | 5 ++---
 net/mrt/Makefile                     | 4 ++--
 net/nam/Makefile                     | 5 ++---
 net/ncftp3/Makefile                  | 4 ++--
 net/netsaint-plugin-cluster/Makefile | 4 ++--
 net/ngrep/Makefile                   | 4 ++--
 net/nprobe/Makefile                  | 4 ++--
 net/ns/Makefile                      | 5 ++---
 net/ntop2/Makefile                   | 5 ++---
 net/openh323/Makefile                | 5 ++---
 net/pfnet/Makefile                   | 5 ++---
 net/pim6dd/Makefile                  | 5 ++---
 net/pim6sd/Makefile                  | 5 ++---
 net/polsms/Makefile                  | 5 ++---
 net/py-google/Makefile               | 4 ++--
 net/py-soaplib/Makefile              | 4 ++--
 net/py-xmlrpclib/Makefile            | 4 ++--
 net/ra-pna-proxy/Makefile            | 4 ++--
 net/ra-rtsp-proxy/Makefile           | 5 ++---
 net/ripe-whois-tools/Makefile        | 5 ++---
 net/ripe-whois/Makefile              | 4 ++--
 net/rp-pppoe/Makefile                | 5 ++---
 net/smb2www/Makefile                 | 5 ++---
 net/spread/Makefile                  | 4 ++--
 net/tcl-scotty/Makefile              | 5 ++---
 net/tcpdmerge/Makefile               | 5 ++---
 net/tcpdpriv/Makefile                | 5 ++---
 net/tcpdstat/Makefile                | 5 ++---
 net/tcptrace/Makefile                | 4 ++--
 net/tightvnc/Makefile                | 5 ++---
 net/tightvncviewer/Makefile          | 4 ++--
 net/tkined/Makefile                  | 5 ++---
 net/traceroute-as/Makefile           | 5 ++---
 net/unison/Makefile                  | 4 ++--
 net/userppp/Makefile                 | 4 ++--
 net/vnc/Makefile                     | 5 ++---
 net/vncviewer/Makefile               | 5 ++---
 net/vtun/Makefile                    | 4 ++--
 net/wistumbler/Makefile              | 5 ++---
 net/xmftp/Makefile                   | 5 ++---
 net/xrmftp/Makefile                  | 4 ++--
 net/yale-tftpd/Makefile              | 5 ++---
 74 files changed, 148 insertions(+), 190 deletions(-)

(limited to 'net')

diff --git a/net/6to4/Makefile b/net/6to4/Makefile
index b79d5fe6417..88c8694934a 100644
--- a/net/6to4/Makefile
+++ b/net/6to4/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.10 2003/03/28 21:14:25 wiz Exp $
+# $NetBSD: Makefile,v 1.11 2003/03/29 12:41:52 jmmv Exp $
 #
 
 DISTNAME=		6to4-1.3
+WRKSRC=			${WRKDIR}
 CATEGORIES=		net
 MASTER_SITES=		# empty
 DISTFILES=		# empty
@@ -14,7 +15,6 @@ USE_PERL5=		YES
 
 # This pkg doesn't regard USE_INET6 (leave this comment for README-IPv6.html!)
 EXTRACT_ONLY=	# empty
-WRKSRC=		${WRKDIR}
 NO_CHECKSUM=	yes
 NO_CONFIGURE=	yes
 
diff --git a/net/6tunnel/Makefile b/net/6tunnel/Makefile
index f213d318172..183c41225f6 100644
--- a/net/6tunnel/Makefile
+++ b/net/6tunnel/Makefile
@@ -1,15 +1,14 @@
-# $NetBSD: Makefile,v 1.2 2001/10/23 20:23:09 zuntum Exp $
+# $NetBSD: Makefile,v 1.3 2003/03/29 12:41:53 jmmv Exp $
 #
 
 DISTNAME=	6tunnel-0.09
+WRKSRC=		${WRKDIR}/6tunnel
 CATEGORIES=	net
 MASTER_SITES=	ftp://amba.bydg.pdi.net/pub/wojtekka/
 
 MAINTAINER=	zuntum@netbsd.org
 COMMENT=	v4/v6 protocol translation
 
-WRKSRC=		${WRKDIR}/6tunnel
-
 do-build:
 	${CC} ${CFLAGS} -o ${WRKSRC}/6tunnel ${WRKSRC}/6tunnel.c
 
diff --git a/net/IglooFTP/Makefile b/net/IglooFTP/Makefile
index d6c80ce94c8..80034001626 100644
--- a/net/IglooFTP/Makefile
+++ b/net/IglooFTP/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.2 2002/10/13 11:50:09 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2003/03/29 12:41:53 jmmv Exp $
 
 DISTNAME=	IglooFTP-0.6.1
+WRKSRC=		${WRKDIR}/${DISTNAME}/src
 CATEGORIES=	net
 MASTER_SITES=	${MASTER_SITE_SUNSITE:=system/network/file-transfer/} \
 		ftp://littleigloo.org/pub/iglooftp/
@@ -10,8 +11,6 @@ MAINTAINER=	rxg@netbsd.org
 HOMEPAGE=	http://www.littleigloo.org/iglooftp.php3
 COMMENT=	Easy to use FTP client for X Window System
 
-WRKSRC=		${WRKDIR}/${DISTNAME}/src
-
 USE_BUILDLINK2=	yes
 USE_X11BASE=	yes
 
diff --git a/net/LaBrea/Makefile b/net/LaBrea/Makefile
index 7cc9e3bae69..3aa99997ff3 100644
--- a/net/LaBrea/Makefile
+++ b/net/LaBrea/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.5 2002/11/05 06:20:27 itojun Exp $
+# $NetBSD: Makefile,v 1.6 2003/03/29 12:41:53 jmmv Exp $
 #
 
 DISTNAME=	LaBrea2_3
 PKGNAME=	LaBrea-2.3
+WRKSRC=		${WRKDIR}/LaBrea
 CATEGORIES=	net security
 MASTER_SITES=	http://www.hackbusters.net/LaBrea/
 EXTRACT_SUFX=	.tgz
@@ -13,8 +14,6 @@ COMMENT=	builds tarpits/honeypots for scanners
 
 USE_BUILDLINK2=	YES
 
-WRKSRC=		${WRKDIR}/LaBrea
-
 post-extract:
 	cd ${WRKSRC};							\
 		${MV} LaBrea.c LaBrea.c.in &&				\
diff --git a/net/archie/Makefile b/net/archie/Makefile
index 48cd2cd06d7..6fe8d096c49 100644
--- a/net/archie/Makefile
+++ b/net/archie/Makefile
@@ -1,9 +1,10 @@
-# $NetBSD: Makefile,v 1.7 2001/02/17 18:18:32 wiz Exp $
+# $NetBSD: Makefile,v 1.8 2003/03/29 12:41:53 jmmv Exp $
 # FreeBSD Id: Makefile,v 1.7 1997/07/21 00:04:13 fenner Exp
 #
 
 DISTNAME=	c-archie-1.4.1-FIXED
 PKGNAME=	archie-1.4.1
+WRKSRC=		${WRKDIR}/archie-1.4.1-FIX
 CATEGORIES=	net
 MASTER_SITES=	ftp://ftp.uni-stuttgart.de/pub/unix/comm/infosystems/archie/
 EXTRACT_SUFX=	.tar.Z
@@ -12,6 +13,4 @@ MAINTAINER=	packages@netbsd.org
 HOMEPAGE=	http://www.bunyip.com/products/archie/
 COMMENT=	Prospero client for the archie service
 
-WRKSRC=		${WRKDIR}/archie-1.4.1-FIX
-
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/batchftp/Makefile b/net/batchftp/Makefile
index 3363ebd6c0b..06b97fc3176 100644
--- a/net/batchftp/Makefile
+++ b/net/batchftp/Makefile
@@ -1,15 +1,14 @@
-# $NetBSD: Makefile,v 1.4 2001/02/25 04:18:04 hubertf Exp $
+# $NetBSD: Makefile,v 1.5 2003/03/29 12:41:53 jmmv Exp $
 
 DISTNAME=	batchftp102
 PKGNAME=	batchftp-1.02
+WRKSRC=		${WRKDIR}
 CATEGORIES=	net
 MASTER_SITES=	ftp://ftp.fu-berlin.de/unix/network/batchftp/
 
 MAINTAINER=	packages@netbsd.org
 COMMENT=	Automatically download files via the FTP protocol
 
-WRKSRC=		${WRKDIR}
-
 post-extract:
 	${LN} -fs ${FILESDIR}/Makefile ${WRKSRC}
 
diff --git a/net/bind4/Makefile b/net/bind4/Makefile
index bb1941e28b3..631f8a642da 100644
--- a/net/bind4/Makefile
+++ b/net/bind4/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.12 2002/12/07 02:39:00 schmonz Exp $
+# $NetBSD: Makefile,v 1.13 2003/03/29 12:41:54 jmmv Exp $
 #
 
 DISTNAME=	bind-4.9.11-REL
 PKGNAME=	bind-4.9.11
+WRKSRC=		${WRKDIR}
 CATEGORIES=	net
 MASTER_SITES=	ftp://ftp.isc.org/isc/bind/src/4.9.11/
 
@@ -10,8 +11,6 @@ MAINTAINER=	packages@netbsd.org
 HOMEPAGE=	http://www.isc.org/
 COMMENT=	The BIND name server, version 4, as an alternative to BIND 8
 
-WRKSRC=		${WRKDIR}
-
 .if !exists(/usr/sbin/named-bootconf)
 PKG_FAIL_REASON= "${PKGNAME} is intended for NetBSD 1.4 or higher"
 .endif
diff --git a/net/bounce/Makefile b/net/bounce/Makefile
index 840fe3f12a4..b57a2ac375b 100644
--- a/net/bounce/Makefile
+++ b/net/bounce/Makefile
@@ -1,15 +1,14 @@
-# $NetBSD: Makefile,v 1.2 2001/02/17 18:18:38 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2003/03/29 12:41:54 jmmv Exp $
 #
 
 DISTNAME=		bounce-0.0
+WRKSRC=			${WRKDIR}/bounce
 CATEGORIES=		net
 MASTER_SITES=		${MASTER_SITE_LOCAL}
 
 MAINTAINER=		p99dreyf@criens.u-psud.fr
 COMMENT=		tool to forward TCP connection from one IP to another
 
-WRKSRC=			${WRKDIR}/bounce
-
 HAS_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--prefix=${PREFIX}
 
diff --git a/net/bpalogin/Makefile b/net/bpalogin/Makefile
index 70da9482d72..b905e4f31e3 100644
--- a/net/bpalogin/Makefile
+++ b/net/bpalogin/Makefile
@@ -1,9 +1,10 @@
-# $NetBSD: Makefile,v 1.3 2003/01/28 22:03:49 jlam Exp $
+# $NetBSD: Makefile,v 1.4 2003/03/29 12:41:54 jmmv Exp $
 #
 
 DISTNAME=	bpalogin-2.0.1-src
 PKGNAME=	${DISTNAME:S/-src//}
 PKGREVISION=	1
+WRKSRC=		${WRKDIR}/${PKGNAME_NOREV}
 CATEGORIES=	net
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=bpalogin/}
 
@@ -11,8 +12,6 @@ MAINTAINER=	packages@netbsd.org
 HOMEPAGE=	http://bpalogin.sourceforge.net/
 COMMENT=	BigPond Advance login client
 
-WRKSRC=		${WRKDIR}/${PKGNAME_NOREV}
-
 ALL_TARGET=	bpalogin
 
 USE_PKGINSTALL=	yes
diff --git a/net/bridged/Makefile b/net/bridged/Makefile
index 4eff3fa49fa..4a7351d6691 100644
--- a/net/bridged/Makefile
+++ b/net/bridged/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.1.1.1 2001/07/01 16:43:59 itojun Exp $
+# $NetBSD: Makefile,v 1.2 2003/03/29 12:41:54 jmmv Exp $
 
 DISTNAME=	bridged-20010701
+WRKSRC=		${WRKDIR}/bridged
 CATEGORIES=	net
 MASTER_SITES=	ftp://ftp.kame.net/pub/kame/misc/
 
@@ -8,7 +9,6 @@ MAINTAINER=	packages@netbsd.org
 COMMENT=	userland ethernet bridge daemon
 
 GNU_CONFIGURE=	yes
-WRKSRC=		${WRKDIR}/bridged/
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/bridge ${PREFIX}/sbin/bridged
diff --git a/net/cidr/Makefile b/net/cidr/Makefile
index 98577c35d75..7d5e295492e 100644
--- a/net/cidr/Makefile
+++ b/net/cidr/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.2 2001/08/29 12:40:40 rh Exp $
+# $NetBSD: Makefile,v 1.3 2003/03/29 12:41:54 jmmv Exp $
 #
 
 DISTNAME=	cidr-current
 PKGNAME=	cidr-2.3.1
+WRKSRC=		${WRKDIR}/cidr-2.3
 CATEGORIES=	net
 MASTER_SITES=	http://home.netcom.com/~naym/cidr/
 
@@ -10,6 +11,4 @@ MAINTAINER=	seb@pbox.org
 HOMEPAGE=	http://home.netcom.com/~naym/cidr.html
 COMMENT=	RFC 1878 subnet calculator / helper
 
-WRKSRC=		${WRKDIR}/cidr-2.3
-
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/citrix_ica/Makefile b/net/citrix_ica/Makefile
index e46cfdfadae..0bcca825448 100644
--- a/net/citrix_ica/Makefile
+++ b/net/citrix_ica/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2003/03/26 04:05:42 jschauma Exp $
+# $NetBSD: Makefile,v 1.16 2003/03/29 12:41:55 jmmv Exp $
 #
 
 # A default so lintpkgsrc is happy
@@ -13,6 +13,7 @@ DISTNAME=       solaris
 PKGNAME=        citrix_ica-6.30.1061
 EXTRACT_SUFX=   .tar.Z
 .endif
+WRKSRC=         ${WRKDIR}
 CATEGORIES=	net
 MASTER_SITES=	http://download2.citrix.com/files/en/products/client/ica/current/
 
@@ -39,7 +40,6 @@ PLIST_SRC=	${PKGDIR}/PLIST.pre \
 		${PKGDIR}/PLIST.post
 
 DIST_SUBDIR=    ${PKGNAME}
-WRKSRC=         ${WRKDIR}
 
 CDIR=           ${PREFIX}/lib/ICAClient
 BINDIR=         ${PREFIX}/bin
diff --git a/net/cmu-dhcpd/Makefile b/net/cmu-dhcpd/Makefile
index 7dc12dc17f6..eb13b615e3a 100644
--- a/net/cmu-dhcpd/Makefile
+++ b/net/cmu-dhcpd/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.2 2002/10/18 22:08:42 abs Exp $
+# $NetBSD: Makefile,v 1.3 2003/03/29 12:41:55 jmmv Exp $
 #
 
 DISTNAME=	CMU-dhcp-3.3.7+PU-9
 PKGNAME=	cmu-dhcpd-3.3.7.9
+WRKSRC=		${WRKDIR}/CMU-dhcp-3.3.7+PU-9
 CATEGORIES=	net
 MASTER_SITES=	http://heymon.princeton.edu/software/dhcpd/
 EXTRACT_SUFX=	.tar.Z
@@ -11,7 +12,6 @@ MAINTAINER=	packages@netbsd.org
 HOMEPAGE=	http://heymon.princeton.edu/software/dhcpd/
 COMMENT=	CMU BootP and DHCP server, plus Princeton patches
 
-WRKSRC=		${WRKDIR}/CMU-dhcp-3.3.7+PU-9
 GNU_CONFIGURE=	YES
 
 do-install:
diff --git a/net/dgd/Makefile b/net/dgd/Makefile
index 97de5d01b58..a345a3d094f 100644
--- a/net/dgd/Makefile
+++ b/net/dgd/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.2 2002/09/11 20:02:26 tron Exp $
+# $NetBSD: Makefile,v 1.3 2003/03/29 12:41:55 jmmv Exp $
 
 DISTNAME=	dgd-1.2p2
 PKGNAME=	dgd-1.2.0.2
+WRKSRC=		${WRKDIR}/dgd/src
 CATEGORIES=	net games
 MASTER_SITES=	ftp://ftp.dworkin.nl/pub/dgd/
 
@@ -11,8 +12,6 @@ COMMENT=	Object-oriented programmable server
 
 LICENSE=	no-commercial-use
 
-WRKSRC=		${WRKDIR}/dgd/src
-
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/a.out ${PREFIX}/libexec/dgd
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/dgd
diff --git a/net/dnstop/Makefile b/net/dnstop/Makefile
index af93bc3aef8..7268a561223 100644
--- a/net/dnstop/Makefile
+++ b/net/dnstop/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.3 2003/01/01 14:26:36 cjep Exp $
+# $NetBSD: Makefile,v 1.4 2003/03/29 12:41:55 jmmv Exp $
 #
 
 DISTNAME=	dnstop-20021224
+WRKSRC=		${WRKDIR}
 CATEGORIES=	net
 MASTER_SITES=	http://dnstop.measurement-factory.com/src/
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} dnstop.8
@@ -11,7 +12,6 @@ HOMEPAGE=	http://dnstop.measurement-factory.com/src/
 COMMENT=	Diagnose tcpdump trace for DNS queries/replies
 
 EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
-WRKSRC=		${WRKDIR}
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/dnstop ${PREFIX}/bin
diff --git a/net/dynipclient/Makefile b/net/dynipclient/Makefile
index 24f67430330..5508bba6b9d 100644
--- a/net/dynipclient/Makefile
+++ b/net/dynipclient/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.3 2002/02/27 01:36:09 tv Exp $
+# $NetBSD: Makefile,v 1.4 2003/03/29 12:41:55 jmmv Exp $
 #
 
 DISTNAME=	dynip_3.00
 PKGNAME=	dynipclient-3.00
+WRKSRC=		${WRKDIR}
 CATEGORIES=	net
 MASTER_SITES=	ftp://ftp.dynip.com/software/unix/
 
@@ -10,8 +11,6 @@ MAINTAINER=	packages@netbsd.org
 HOMEPAGE=	http://www.dynip.com/
 COMMENT=	Client for the dynip.com dynamic DNS service
 
-WRKSRC=		${WRKDIR}
-
 do-build:
 	cd ${WRKSRC} && ./Configure freebsd ${PREFIX}/bin /etc ${PREFIX}/man
 
diff --git a/net/edonkey2k/Makefile b/net/edonkey2k/Makefile
index 577b602c3ec..697a35942f8 100644
--- a/net/edonkey2k/Makefile
+++ b/net/edonkey2k/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.6 2003/03/28 21:14:25 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2003/03/29 12:41:56 jmmv Exp $
 #
 
 DISTNAME=	donkey
 PKGNAME=	edonkey2k-16.16.59
+WRKSRC=		${WRKDIR}
 CATEGORIES=	net
 MASTER_SITES=	http://www.edonkey2000.com/files/
 EXTRACT_SUFX=	.gz
@@ -20,7 +21,6 @@ DEPENDS+=	suse_base>=6.1:../../emulators/${SUSE_DIR_PREFIX}_base
 DEPENDS+=	suse_compat>=6.1:../../emulators/${SUSE_DIR_PREFIX}_compat
 .endif
 
-WRKSRC=		${WRKDIR}
 NO_BUILD=	YES
 NO_CONFIGURE=	YES
 CHECK_SHLIBS=	NO
diff --git a/net/firewalk-gtk/Makefile b/net/firewalk-gtk/Makefile
index f2c13cfbe86..e15922ce331 100644
--- a/net/firewalk-gtk/Makefile
+++ b/net/firewalk-gtk/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.3 2002/10/09 12:52:22 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2003/03/29 12:41:56 jmmv Exp $
 
 DISTNAME=	firewalk-1.0
 PKGNAME=	firewalk-gtk-1.0
+WRKSRC=         ${WRKDIR}/${DISTNAME:C/f/F/}
 CATEGORIES=	net security
 MASTER_SITES=	http://www.packetfactory.net/Projects/firewalk/
 
@@ -9,8 +10,6 @@ MAINTAINER=	xs@nitric.net
 HOMEPAGE=	http://www.packetfactory.net/Projects/firewalk/
 COMMENT=	Firewalk determines the filter rules on a packet forwarding device
 
-WRKSRC=         ${WRKDIR}/${DISTNAME:C/f/F/}
-
 USE_BUILDLINK2=	# defined
 GNU_CONFIGURE=	# defined
 CONFIGURE_ENV+=	CFLAGS="-I${BUILDLINK_PREFIX.libnet}/include `gtk-config --cflags`"
diff --git a/net/firewalk/Makefile b/net/firewalk/Makefile
index 3af9cb4e30c..a7951ee49b9 100644
--- a/net/firewalk/Makefile
+++ b/net/firewalk/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.2 2002/10/09 12:49:12 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2003/03/29 12:41:56 jmmv Exp $
 
 DISTNAME=	firewalk-1.0
+WRKSRC=         ${WRKDIR}/${DISTNAME:C/f/F/}
 CATEGORIES=	net security
 MASTER_SITES=	http://www.packetfactory.net/Projects/firewalk/
 
@@ -8,8 +9,6 @@ MAINTAINER=	xs@nitric.net
 HOMEPAGE=	http://www.packetfactory.net/Projects/firewalk/
 COMMENT=	Firewalk determines the filter rules on a packet forwarding device
 
-WRKSRC=         ${WRKDIR}/${DISTNAME:C/f/F/}
-
 USE_BUILDLINK2=	# defined
 GNU_CONFIGURE=	# defined
 CONFIGURE_ENV+=	CFLAGS=-I${LOCALBASE}/include
diff --git a/net/flan/Makefile b/net/flan/Makefile
index 7ac2eddc9c0..e0e70eaa843 100644
--- a/net/flan/Makefile
+++ b/net/flan/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.5 2002/12/31 15:33:42 jlam Exp $
+# $NetBSD: Makefile,v 1.6 2003/03/29 12:41:56 jmmv Exp $
 #
 
 DISTNAME=	Flan
 PKGNAME=	flan-1.1rc1
+WRKSRC=		${WRKDIR}/src
 CATEGORIES=	net
 MASTER_SITES=	http://picolibre.enst-bretagne.fr/projects/flan/
 
@@ -13,8 +14,6 @@ COMMENT=	Simulator for IP networks writen in Java
 PKG_JVM=	sun-jdk13
 USE_GMAKE=	yes
 
-WRKSRC=		${WRKDIR}/src
-
 post-build:
 	cd ${WRKSRC} ; ${PKG_JAVA_HOME}/bin/jar cf flan.jar flan/ graphic/
 	${SED} -e 's,@JAVA_HOME@,${PKG_JAVA_HOME},g'			\
diff --git a/net/host/Makefile b/net/host/Makefile
index 6e4cc2e2f1a..3817fce9b5c 100644
--- a/net/host/Makefile
+++ b/net/host/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.2 2001/09/09 20:36:38 agc Exp $
+# $NetBSD: Makefile,v 1.3 2003/03/29 12:41:56 jmmv Exp $
 
 DISTNAME=	host_991529
 PKGNAME=	host-991529
+WRKSRC=		${WRKDIR}
 CATEGORIES=	net
 MASTER_SITES=	ftp://ftp.nikhef.nl/pub/network/
 EXTRACT_SUFX=	.tar.Z
@@ -19,7 +20,6 @@ MAKE_ENV+=	ALLOW_HOSTALIASES=-DALLOW_HOSTALIASES
 .endif
 
 NO_CONFIGURE=	yes
-WRKSRC=		${WRKDIR}
 
 # MAKE_ENV will have the right effect...
 MAKEFLAGS+=	-e
diff --git a/net/ip6_int/Makefile b/net/ip6_int/Makefile
index e02e7c1682f..f97be231430 100644
--- a/net/ip6_int/Makefile
+++ b/net/ip6_int/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.2 2002/12/14 03:43:19 schmonz Exp $
+# $NetBSD: Makefile,v 1.3 2003/03/29 12:41:57 jmmv Exp $
 #
 
 DISTNAME=	ip6_int
 PKGNAME=	${DISTNAME}-1.0
+WRKSRC=		${WRKDIR}
 CATEGORIES=	net
 MASTER_SITES=	http://www.bieringer.de/linux/IPv6/tools/
 EXTRACT_SUFX=	#
@@ -11,7 +12,6 @@ MAINTAINER=	packages@netbsd.org
 COMMENT=	Convert an IPv4/IPv6 address to an in-addr.arpa/ip6.int PTR value
 
 EXTRACT_CMD=	${CP} ${DOWNLOADED_DISTFILE} ${WRKSRC}
-WRKSRC=		${WRKDIR}
 
 USE_PERL5=	yes
 REPLACE_PERL=	ip6_int
diff --git a/net/ipcalc/Makefile b/net/ipcalc/Makefile
index 114f48bb2da..2a000718d05 100644
--- a/net/ipcalc/Makefile
+++ b/net/ipcalc/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.7 2002/12/14 03:43:19 schmonz Exp $
+# $NetBSD: Makefile,v 1.8 2003/03/29 12:41:57 jmmv Exp $
 
 DISTNAME=	ipcalc
 PKGNAME=	${DISTNAME}-0.35
 DIST_SUBDIR=	${PKGNAME}
+WRKSRC=         ${WRKDIR}
 CATEGORIES=	net
 MASTER_SITES=	http://jodies.de/
 EXTRACT_SUFX=	.pl
@@ -12,7 +13,6 @@ HOMEPAGE=	http://jodies.de/ipcalc/
 COMMENT=	IP Calculator
 
 EXTRACT_CMD=    ${CP} ${DOWNLOADED_DISTFILE} ${WRKSRC}
-WRKSRC=         ${WRKDIR}
 
 USE_PERL5=	YES
 REPLACE_PERL=	ipcalc.pl
diff --git a/net/ipcheck/Makefile b/net/ipcheck/Makefile
index 65437126a54..1331ad3fe54 100644
--- a/net/ipcheck/Makefile
+++ b/net/ipcheck/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.2 2002/09/21 23:46:54 jlam Exp $
+# $NetBSD: Makefile,v 1.3 2003/03/29 12:41:57 jmmv Exp $
 #
 
 DISTNAME=	ipcheck.py
 PKGNAME=	ipcheck-0.151
+WRKSRC=		${WRKDIR}
 CATEGORIES=	net
 MASTER_SITES=	http://ipcheck.sourceforge.net/
 DIST_SUBDIR=	${PKGNAME}
@@ -13,7 +14,6 @@ COMMENT=	python client for the dyndns service
 
 EXTRACT_SUFX=	#none
 EXTRACT_CMD=	${CP} ${DOWNLOADED_DISTFILE} ${WRKSRC}
-WRKSRC=		${WRKDIR}
 NO_BUILD=	yes
 
 PYTHON_PATCH_SCRIPTS=	ipcheck.py
diff --git a/net/iperf/Makefile b/net/iperf/Makefile
index 1594399ba05..11ac97e4c02 100644
--- a/net/iperf/Makefile
+++ b/net/iperf/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.1.1.1 2003/01/27 13:13:55 seb Exp $
+# $NetBSD: Makefile,v 1.2 2003/03/29 12:41:57 jmmv Exp $
 #
 
 DISTNAME=	iperf-1.6.5-source
 PKGNAME=	${DISTNAME:C/-source//}
+WRKSRC=		${WRKDIR}/${PKGNAME}
 CATEGORIES=	net
 MASTER_SITES=	http://dast.nlanr.net/Projects/Iperf/
 
@@ -12,7 +13,6 @@ COMMENT=	TCP and UDP bandwidth performance measurement tool
 
 NOT_FOR_PLATFORM=	*-*-sparc64	# internal g++ error
 
-WRKSRC=		${WRKDIR}/${PKGNAME}
 USE_BUILDLINK2=	YES
 CONFIGURE_DIRS=	${WRKSRC}/cfg
 INSTALL_DIRS=	${WRKSRC}/src
diff --git a/net/ipw/Makefile b/net/ipw/Makefile
index 2aa8ddc2bbb..97949afbb07 100644
--- a/net/ipw/Makefile
+++ b/net/ipw/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.2 2001/06/13 14:37:32 zuntum Exp $
+# $NetBSD: Makefile,v 1.3 2003/03/29 12:41:57 jmmv Exp $
 #
 
 DISTNAME=	ipw-3.3a
+WRKSRC=		${WRKDIR}
 CATEGORIES=	net
 MASTER_SITES=	${MASTER_SITE_LOCAL}
 
@@ -9,8 +10,6 @@ MAINTAINER= 	mipam@ibb.net,zuntum@netbsd.org
 HOMEPAGE=	http://mjhb.marina-del-rey.ca.us/ipw/
 COMMENT= 	"whois" replacement that automatically queries several databases
 
-WRKSRC=		${WRKDIR}
-
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/ipw ${PREFIX}/bin
 	${INSTALL_DATA} ${FILESDIR}/README ${PREFIX}/share/doc/ipw.README
diff --git a/net/irrd/Makefile b/net/irrd/Makefile
index 76b01fd0bba..a041bd0efe7 100644
--- a/net/irrd/Makefile
+++ b/net/irrd/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.18 2002/09/01 15:30:11 kim Exp $
+# $NetBSD: Makefile,v 1.19 2003/03/29 12:41:58 jmmv Exp $
 
 DISTNAME=	irrd2.1.4
 PKGNAME=	irrd-2.1.4
+WRKSRC=		${WRKDIR}/${DISTNAME}/src
 CATEGORIES=	net
 MASTER_SITES=	http://www.irrd.net/ \
 		ftp://ftp.merit.edu/radb/irrd/ \
@@ -16,8 +17,6 @@ DEPENDS+=	wget-[0-9]*:../../net/wget
 
 USE_PERL5=	# defined
 
-WRKSRC=		${WRKDIR}/${DISTNAME}/src
-
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=--with-gdbm
 CONFIGURE_ARGS+=--disable-thread
diff --git a/net/lambdamoo-core/Makefile b/net/lambdamoo-core/Makefile
index 4082c824008..6d49b9141db 100644
--- a/net/lambdamoo-core/Makefile
+++ b/net/lambdamoo-core/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.1.1.1 2002/05/26 00:19:42 rh Exp $
+# $NetBSD: Makefile,v 1.2 2003/03/29 12:41:58 jmmv Exp $
 
 DISTNAME=	LambdaCore-12Apr99.db
 PKGNAME=	lambdamoo-core-990412
+WRKSRC=		${WRKDIR}
 CATEGORIES=	net
 MASTER_SITES=	ftp://ftp.lambda.moo.mud.org/pub/MOO/ \
 		ftp://ftp.kanga.nu/pub/mirrors/ftp.lambda.moo.mud.org/pub/MOO/
@@ -11,7 +12,6 @@ MAINTAINER=	packages@netbsd.org
 HOMEPAGE=	http://www.ccs.neu.edu/home/eostrom/muds/lambdamoo.html
 COMMENT=	generic core classes for lambdamoo
 
-WRKSRC=		${WRKDIR}
 EXTRACT_CMD=	:
 
 post-extract:
diff --git a/net/lambdamoo-doc/Makefile b/net/lambdamoo-doc/Makefile
index 36e6aea56eb..a84562ec110 100644
--- a/net/lambdamoo-doc/Makefile
+++ b/net/lambdamoo-doc/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.1.1.1 2002/05/26 00:17:59 rh Exp $
+# $NetBSD: Makefile,v 1.2 2003/03/29 12:41:58 jmmv Exp $
 
 DISTNAME=	lambdamoo-doc-1.8.0p6
+WRKSRC=		${WRKDIR}
 CATEGORIES=	net
 MASTER_SITES=	ftp://ftp.lambda.moo.mud.org/pub/MOO/ \
 		ftp://ftp.kanga.nu/pub/mirrors/ftp.lambda.moo.mud.org/pub/MOO/
@@ -11,7 +12,6 @@ MAINTAINER=	packages@netbsd.org
 HOMEPAGE=	http://www.ccs.neu.edu/home/eostrom/muds/lambdamoo.html
 COMMENT=	documentation for lambdamoo
 
-WRKSRC=		${WRKDIR}
 EXTRACT_CMD=	:
 
 post-extract:
diff --git a/net/lambdamoo/Makefile b/net/lambdamoo/Makefile
index 28c4da2f4e9..6163a5c7190 100644
--- a/net/lambdamoo/Makefile
+++ b/net/lambdamoo/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.4 2003/01/28 22:03:52 jlam Exp $
+# $NetBSD: Makefile,v 1.5 2003/03/29 12:41:58 jmmv Exp $
 
 DISTNAME=		LambdaMOO-1.8.1
 PKGNAME=		lambdamoo-1.8.1
+WRKSRC=			${WRKDIR}/MOO-1.8.1
 CATEGORIES=		net
 MASTER_SITES=		ftp://ftp.place.org/pub/moo/ \
 			${MASTER_SITE_SOURCEFORGE:=lambdamoo/} \
@@ -27,7 +28,6 @@ DEINSTALL_EXTRA_TMPL=   ${WRKDIR}/DEINSTALL.out
 
 ALL_TARGET=
 GNU_CONFIGURE=		yes
-WRKSRC=			${WRKDIR}/MOO-1.8.1
 
 pre-build:
 	${MV} ${WRKSRC}/restart.sh ${WRKSRC}/restart.sh.in
diff --git a/net/md-whois/Makefile b/net/md-whois/Makefile
index 5af0a39d5b8..33b74de030a 100644
--- a/net/md-whois/Makefile
+++ b/net/md-whois/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2003/03/22 02:31:49 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2003/03/29 12:41:58 jmmv Exp $
 #
 # todo: set location of [md-]whois.conf and fix in man page too
 # todo: build and install the po/ files and add to PLIST
@@ -8,6 +8,7 @@
 VERSION=	4.6.3
 DISTNAME=	whois_${VERSION}
 PKGNAME=	md-whois-${VERSION}
+WRKSRC=		${WRKDIR}/whois-${VERSION}
 CATEGORIES=	net
 MASTER_SITES=	http://www.linux.it/~md/software/
 
@@ -17,8 +18,6 @@ COMMENT=	Improved whois client
 
 USE_PERL5=	build
 
-WRKSRC=		${WRKDIR}/whois-${VERSION}
-
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/whois ${PREFIX}/bin/md-whois
 	${INSTALL_MAN} ${WRKSRC}/whois.1 ${PREFIX}/man/man1/md-whois.1
diff --git a/net/mirror/Makefile b/net/mirror/Makefile
index 4ae8d4956cc..444b39360c3 100644
--- a/net/mirror/Makefile
+++ b/net/mirror/Makefile
@@ -1,9 +1,10 @@
-# $NetBSD: Makefile,v 1.17 2002/10/30 08:47:39 seb Exp $
+# $NetBSD: Makefile,v 1.18 2003/03/29 12:41:59 jmmv Exp $
 # FreeBSD Id: Makefile,v 1.6 1996/12/01 01:22:54 obrien Exp 
 #
 
 DISTNAME=	mirror-2.9
 PKGREVISION=	1
+WRKSRC=		${WRKDIR}
 CATEGORIES=	net
 MASTER_SITES=	ftp://src.doc.ic.ac.uk/computing/archiving/mirror/
 
@@ -13,7 +14,6 @@ COMMENT=	Mirror packages on remote sites
 
 USE_PERL5=	# defined
 
-WRKSRC=		${WRKDIR}
 MAKEFILE=	makefile
 SCRIPTS_ENV+=	PERL5=${PERL5}
 
diff --git a/net/mouse-pppoe/Makefile b/net/mouse-pppoe/Makefile
index d4449008046..ae4ba6a79a4 100644
--- a/net/mouse-pppoe/Makefile
+++ b/net/mouse-pppoe/Makefile
@@ -1,16 +1,15 @@
-# $NetBSD: Makefile,v 1.9 2001/11/29 01:12:42 hubertf Exp $
+# $NetBSD: Makefile,v 1.10 2003/03/29 12:41:59 jmmv Exp $
 
 DISTNAME=		pppoe.20000912
 PKGNAME=		mouse-${DISTNAME:S/./-/}
 PKGREVISION=		1
+WRKSRC=			${WRKDIR}
 CATEGORIES=		net
 MASTER_SITES=		ftp://ftp.netbsd.org/pub/NetBSD/misc/mouse/pppoe/
 
 MAINTAINER=		mouse@netbsd.org
 COMMENT=		derMouse's PPP over Ethernet program
 
-WRKSRC=			${WRKDIR}
-
 do-build:
 	(cd ${WRKSRC} ; ${CC} ${CFLAGS} -o pppoe pppoe.c)
 
diff --git a/net/mrt/Makefile b/net/mrt/Makefile
index a5bae503122..892bc85c764 100644
--- a/net/mrt/Makefile
+++ b/net/mrt/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.3 2001/02/25 04:18:06 hubertf Exp $
+# $NetBSD: Makefile,v 1.4 2003/03/29 12:41:59 jmmv Exp $
 #
 
 DISTNAME=	mrt-2.2.2a-Aug11
 PKGNAME=	mrt-2.2.2a.20000811
+WRKSRC=		${WRKDIR}/mrt/src
 CATEGORIES=	net
 MASTER_SITES=	ftp://ftp.merit.edu/net-research/mrt/
 
@@ -10,7 +11,6 @@ MAINTAINER=	packages@netbsd.org
 HOMEPAGE=	http://www.mrtd.net/
 COMMENT=	Multi-threaded Routing Toolkit
 
-WRKSRC=		${WRKDIR}/mrt/src
 GNU_CONFIGURE=	yes
 
 PLIST_SRC=	${WRKSRC}/.PLIST_SRC
diff --git a/net/nam/Makefile b/net/nam/Makefile
index 31bebc88bf5..3a1f6c0e128 100644
--- a/net/nam/Makefile
+++ b/net/nam/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.2 2002/08/28 10:10:55 seb Exp $
+# $NetBSD: Makefile,v 1.3 2003/03/29 12:41:59 jmmv Exp $
 
 DISTNAME=	nam-src-1.0a11a
 PKGNAME=	${DISTNAME:S/0a/0rc/:S/-src//}
+WRKSRC=		${WRKDIR}/${DISTNAME:S/-src//}
 CATEGORIES=	net
 MASTER_SITES=	http://www.isi.edu/nsnam/dist/
 
@@ -9,8 +10,6 @@ MAINTAINER=	packages@netbsd.org
 HOMEPAGE=	http://www.isi.edu/nsnam/nam/
 COMMENT=	The UCB/LBNL Network Animator
 
-WRKSRC=		${WRKDIR}/${DISTNAME:S/-src//}
-
 .include "../../mk/bsd.prefs.mk"
 
 GNU_CONFIGURE=	yes
diff --git a/net/ncftp3/Makefile b/net/ncftp3/Makefile
index ae0f6e223d2..051610dd49f 100644
--- a/net/ncftp3/Makefile
+++ b/net/ncftp3/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.7 2002/08/25 21:50:04 jlam Exp $
+# $NetBSD: Makefile,v 1.8 2003/03/29 12:41:59 jmmv Exp $
 
 DISTNAME=	ncftp-3.0.3-src
 PKGNAME=	ncftp3-3.0.3
+WRKSRC=		${WRKDIR}/${DISTNAME:S/-src//}
 CATEGORIES=	net
 MASTER_SITES=	ftp://ftp.ncftp.com/ncftp/
 
@@ -9,7 +10,6 @@ MAINTAINER=	zuntum@netbsd.org
 HOMEPAGE=	http://www.ncftp.com/
 COMMENT=	FTP replacement with advanced user interface
 
-WRKSRC=		${WRKDIR}/${DISTNAME:S/-src//}
 GNU_CONFIGURE=	yes
 USE_BUILDLINK2=	yes
 
diff --git a/net/netsaint-plugin-cluster/Makefile b/net/netsaint-plugin-cluster/Makefile
index d2429ff621b..c944f7377fb 100644
--- a/net/netsaint-plugin-cluster/Makefile
+++ b/net/netsaint-plugin-cluster/Makefile
@@ -1,9 +1,10 @@
-# $NetBSD: Makefile,v 1.4 2002/03/13 17:37:32 fredb Exp $
+# $NetBSD: Makefile,v 1.5 2003/03/29 12:42:00 jmmv Exp $
 #
 
 DISTNAME=	check_cluster
 PKGNAME=	netsaint-plugin-cluster-20001207
 PKGREVISION=	1
+WRKSRC=		${WRKDIR}
 CATEGORIES=	net
 MASTER_SITES=	http://netsaint.sourceforge.net/download/alpha/
 EXTRACT_SUFX=	.c
@@ -15,7 +16,6 @@ COMMENT=	host and service cluster plugin for NetSaint
 DEPENDS+=	netsaint-base-[0-9]*:../../net/netsaint-base
 
 EXTRACT_CMD=	${CP} ${DISTDIR}/${DISTNAME}${EXTRACT_SUFX} ${WRKSRC}
-WRKSRC=		${WRKDIR}
 
 do-build:
 	cd ${WRKSRC} &&							\
diff --git a/net/ngrep/Makefile b/net/ngrep/Makefile
index c2396c9a469..23c852f7514 100644
--- a/net/ngrep/Makefile
+++ b/net/ngrep/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.9 2002/10/10 13:29:37 wiz Exp $
+# $NetBSD: Makefile,v 1.10 2003/03/29 12:42:00 jmmv Exp $
 #
 
 DISTNAME=	ngrep-1.39
+WRKSRC=		${WRKDIR}/ngrep
 CATEGORIES=	net
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=ngrep/}
 
@@ -14,7 +15,6 @@ GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=--with-pcre
 # ngrep's configure use --includedir/$includedir in a weird way!
 CONFIGURE_ARGS+=--includedir=${BUILDLINK_PREFIX.libpcap}/include
-WRKSRC=		${WRKDIR}/ngrep
 ALL_TARGET=	ngrep
 
 .include "../../mk/bsd.prefs.mk"
diff --git a/net/nprobe/Makefile b/net/nprobe/Makefile
index a8d12769a78..8701c809be4 100644
--- a/net/nprobe/Makefile
+++ b/net/nprobe/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.5 2002/10/13 12:24:03 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2003/03/29 12:42:00 jmmv Exp $
 
 DISTNAME=	nProbe-source-1.3.1
 PKGNAME=	nprobe-1.3.1
+WRKSRC=		${WRKDIR}/nProbe
 CATEGORIES=	net
 MASTER_SITES=	http://luca.ntop.org/nprobeDownload/
 EXTRACT_SUFX=	.tgz
@@ -10,7 +11,6 @@ MAINTAINER=	cjs@netbsd.org
 HOMEPAGE=	http://www.ntop.org/nProbe.html
 COMMENT=	Monitor a network interface and generate NetFlow data
 
-WRKSRC=		${WRKDIR}/nProbe
 GNU_CONFIGURE=	YES
 USE_BUILDLINK2=	YES
 USE_GMAKE=	YES
diff --git a/net/ns/Makefile b/net/ns/Makefile
index 162e75b786f..2ff8c0b324f 100644
--- a/net/ns/Makefile
+++ b/net/ns/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.3 2002/08/28 11:32:52 seb Exp $
+# $NetBSD: Makefile,v 1.4 2003/03/29 12:42:00 jmmv Exp $
 
 DISTNAME=	ns-src-2.1b9a
 PKGNAME=	${DISTNAME:S/b/rc/:S/-src//}
+WRKSRC=		${WRKDIR}/${DISTNAME:S/-src//}
 CATEGORIES=	net
 MASTER_SITES=	http://www.isi.edu/nsnam/dist/
 
@@ -9,8 +10,6 @@ MAINTAINER=	packages@netbsd.org
 HOMEPAGE=	http://www.isi.edu/nsnam/ns/
 COMMENT=	The UCB/LBNL Network Simulator Version 2
 
-WRKSRC=		${WRKDIR}/${DISTNAME:S/-src//}
-
 .include "../../mk/bsd.prefs.mk"
 
 GNU_CONFIGURE=	yes
diff --git a/net/ntop2/Makefile b/net/ntop2/Makefile
index 3e314dbd795..1ed6dbafc3f 100644
--- a/net/ntop2/Makefile
+++ b/net/ntop2/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.12 2003/01/24 12:47:46 jlam Exp $
+# $NetBSD: Makefile,v 1.13 2003/03/29 12:42:01 jmmv Exp $
 
 DISTNAME=		ntop-2.1.54
 PKGNAME=		ntop2-2.1.54
 PKGREVISION=		1
+WRKSRC=                 ${WRKDIR}/${DISTNAME}/ntop
 CATEGORIES=		net
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=ntop/}
 EXTRACT_SUFX=		.tgz
@@ -13,8 +14,6 @@ COMMENT=		shows network usage (similar to "top" for processes)
 
 CONFLICTS=		ntop-[0-9]*
 
-WRKSRC=                 ${WRKDIR}/${DISTNAME}/ntop
-
 USE_BUILDLINK2=		yes
 USE_GMAKE=		yes
 GNU_CONFIGURE=          yes
diff --git a/net/openh323/Makefile b/net/openh323/Makefile
index c7614b8d950..90551d86ebd 100644
--- a/net/openh323/Makefile
+++ b/net/openh323/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.13 2003/01/28 22:03:54 jlam Exp $
+# $NetBSD: Makefile,v 1.14 2003/03/29 12:42:01 jmmv Exp $
 #
 
 DISTNAME=	openh323_1.10.4
 PKGNAME=	openh323-1.10.4
+WRKSRC=		${WRKDIR}/openh323
 CATEGORIES=	net
 MASTER_SITES=	http://www.openh323.org/bin/ \
 		http://www.us1.openh323.org/bin/ \
@@ -15,8 +16,6 @@ MAINTAINER=	packages@netbsd.org
 HOMEPAGE=	http://www.openh323.org/
 COMMENT=	Open H.323 library
 
-WRKSRC=		${WRKDIR}/openh323
-
 MAKE_ENV+=	PWLIBDIR=${PREFIX} OPENH323DIR=${WRKSRC}
 
 USE_BUILDLINK2=	yes
diff --git a/net/pfnet/Makefile b/net/pfnet/Makefile
index 0aefaea9840..85acf1f1496 100644
--- a/net/pfnet/Makefile
+++ b/net/pfnet/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.3 2001/02/17 18:19:26 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2003/03/29 12:42:01 jmmv Exp $
 #
 
 DISTNAME=	fnet.pl-1.4
 PKGNAME=	pfnet-1.4
+WRKSRC=		${WRKDIR}/fnet-1.4
 CATEGORIES=	net
 MASTER_SITES=	ftp://ftp.abattoir.com/pub/
 
@@ -12,8 +13,6 @@ COMMENT=	Minimal FNET-like ICB client written in Perl
 
 USE_PERL5=	# defined
 
-WRKSRC=		${WRKDIR}/fnet-1.4
-
 do-build:
 	${SED} -e 's,/usr/local,${PREFIX},g' ${WRKSRC}/fnet.pl >${WRKSRC}/pfnet
 
diff --git a/net/pim6dd/Makefile b/net/pim6dd/Makefile
index 677a16e9a4b..7816003f077 100644
--- a/net/pim6dd/Makefile
+++ b/net/pim6dd/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.3 2002/04/03 05:38:43 itojun Exp $
+# $NetBSD: Makefile,v 1.4 2003/03/29 12:42:02 jmmv Exp $
 
 DISTNAME=	pim6dd-20020403a
+WRKSRC=		${WRKDIR}/${DISTNAME}/pim6dd/
 CATEGORIES=	net
 MASTER_SITES=	ftp://ftp.kame.net/pub/kame/misc/
 
@@ -10,6 +11,4 @@ COMMENT=	IPv6 PIM dense mode daemon
 # does it seem right?
 LICENSE=	no-commercial-use
 
-WRKSRC=		${WRKDIR}/${DISTNAME}/pim6dd/
-
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/pim6sd/Makefile b/net/pim6sd/Makefile
index 1a4cf4e3751..e1a834fb6d1 100644
--- a/net/pim6sd/Makefile
+++ b/net/pim6sd/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.3 2002/04/03 05:37:00 itojun Exp $
+# $NetBSD: Makefile,v 1.4 2003/03/29 12:42:02 jmmv Exp $
 
 DISTNAME=	pim6sd-20020403a
+WRKSRC=		${WRKDIR}/${DISTNAME}/pim6sd/
 CATEGORIES=	net
 MASTER_SITES=	ftp://ftp.kame.net/pub/kame/misc/
 
@@ -10,8 +11,6 @@ COMMENT=	IPv6 PIM sparse mode daemon
 # does it seem right?
 LICENSE=	no-commercial-use
 
-WRKSRC=		${WRKDIR}/${DISTNAME}/pim6sd/
-
 post-install:
 	${INSTALL_MAN} ${WRKSRC}/pim6stat.1 ${PREFIX}/man/man1
 
diff --git a/net/polsms/Makefile b/net/polsms/Makefile
index c2a8f8517ae..2774546d9c4 100644
--- a/net/polsms/Makefile
+++ b/net/polsms/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.10 2003/03/27 08:43:29 zuntum Exp $
+# $NetBSD: Makefile,v 1.11 2003/03/29 12:42:02 jmmv Exp $
 #
 
 DISTNAME=	sms-1.9.1h
 PKGNAME=	pol${DISTNAME}
+WRKSRC=		${WRKDIR}/sms
 CATEGORIES=	net
 MASTER_SITES=	http://www.ceti.pl/~miki/komputery/download/sms/
 
@@ -13,8 +14,6 @@ COMMENT=	send SMS to cellular phones in Poland (Plus, Idea, Era)
 USE_BUILDLINK2=	YES
 USE_GMAKE=	YES
 
-WRKSRC=		${WRKDIR}/sms
-
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/sms ${PREFIX}/bin
 	${LN} -sf ${PREFIX}/bin/sms ${PREFIX}/bin/smsaddr
diff --git a/net/py-google/Makefile b/net/py-google/Makefile
index 829ff516bbd..97e9a5b2082 100644
--- a/net/py-google/Makefile
+++ b/net/py-google/Makefile
@@ -1,9 +1,10 @@
-# $NetBSD: Makefile,v 1.4 2003/03/19 11:55:10 drochner Exp $
+# $NetBSD: Makefile,v 1.5 2003/03/29 12:42:02 jmmv Exp $
 #
 
 DISTNAME=	pygoogle-0.5.2
 PKGNAME=	${PYPKGPREFIX}-google-0.5.2
 PKGREVISION=	1
+WRKSRC=		${WRKDIR}/pygoogle
 CATEGORIES=	net
 MASTER_SITES=	http://diveintomark.org/projects/pygoogle/
 EXTRACT_SUFX=	.zip
@@ -12,7 +13,6 @@ MAINTAINER=	drochner@netbsd.org
 HOMEPAGE=	http://diveintomark.org/projects/pygoogle/
 COMMENT=	call the Google web API from Python
 
-WRKSRC=		${WRKDIR}/pygoogle
 PYDISTUTILSPKG=	yes
 USE_BUILDLINK2=	yes
 
diff --git a/net/py-soaplib/Makefile b/net/py-soaplib/Makefile
index fe2079d4274..56e20ac2d6b 100644
--- a/net/py-soaplib/Makefile
+++ b/net/py-soaplib/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.5 2002/09/21 23:46:54 jlam Exp $
+# $NetBSD: Makefile,v 1.6 2003/03/29 12:42:02 jmmv Exp $
 #
 
 DISTNAME=	soaplib-0.8-20000621
 PKGNAME=	${PYPKGPREFIX}-soaplib-0.8
+WRKSRC=		${WRKDIR}
 CATEGORIES=	net
 MASTER_SITES=	http://www.pythonware.com/downloads/
 EXTRACT_SUFX=	.zip
@@ -11,7 +12,6 @@ MAINTAINER=	drochner@netbsd.org
 HOMEPAGE=	http://www.pythonware.com/products/soap/index.htm
 COMMENT=	implementation of the SOAP 1.1 protocol
 
-WRKSRC=		${WRKDIR}
 NO_BUILD=	yes
 
 PY_PATCHPLIST=	yes
diff --git a/net/py-xmlrpclib/Makefile b/net/py-xmlrpclib/Makefile
index 0e0da47e89e..7a75e4eaeeb 100644
--- a/net/py-xmlrpclib/Makefile
+++ b/net/py-xmlrpclib/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.5 2002/09/21 23:46:55 jlam Exp $
+# $NetBSD: Makefile,v 1.6 2003/03/29 12:42:02 jmmv Exp $
 #
 
 DISTNAME=	xmlrpc-0.9.8-990621
 PKGNAME=	${PYPKGPREFIX}-xmlrpc-0.9.8
+WRKSRC=		${WRKDIR}
 CATEGORIES=	net
 MASTER_SITES=	http://www.pythonware.com/downloads/
 EXTRACT_SUFX=	.zip
@@ -11,7 +12,6 @@ MAINTAINER=	drochner@netbsd.org
 HOMEPAGE=	http://www.pythonware.com/products/xmlrpc/
 COMMENT=	implementation of the XML-RPC protocol for Python
 
-WRKSRC=		${WRKDIR}
 NO_BUILD=	yes
 
 PY_PATCHPLIST=	yes
diff --git a/net/ra-pna-proxy/Makefile b/net/ra-pna-proxy/Makefile
index f03c979d87d..c4b224e7506 100644
--- a/net/ra-pna-proxy/Makefile
+++ b/net/ra-pna-proxy/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.9 2001/05/12 11:52:54 tron Exp $
+# $NetBSD: Makefile,v 1.10 2003/03/29 12:42:03 jmmv Exp $
 
 DISTNAME=	raproxy3.0b1
 PKGNAME=	ra-pna-proxy-3.0b1
+WRKSRC=		${WRKDIR}/raproxy
 CATEGORIES=	net
 MASTER_SITES=	http://docs.real.com/proxykit/
 
@@ -18,7 +19,6 @@ NO_BIN_ON_CDROM=	${RESTRICTED}
 
 ALL_TARGET=	raproxy
 PROGNAME=	${PKGNAME:C/-[1-9].*//}
-WRKSRC=		${WRKDIR}/raproxy
 
 post-build:
 	cd ${WRKSRC}; \
diff --git a/net/ra-rtsp-proxy/Makefile b/net/ra-rtsp-proxy/Makefile
index 329d40f39c4..4a18f1cfed9 100644
--- a/net/ra-rtsp-proxy/Makefile
+++ b/net/ra-rtsp-proxy/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.16 2001/11/29 01:12:44 hubertf Exp $
+# $NetBSD: Makefile,v 1.17 2003/03/29 12:42:03 jmmv Exp $
 
 DISTNAME=	rtspd-src-1.0.0.0
 PKGNAME=	ra-rtsp-proxy-1.0.0.0
 PKGREVISION=	1
+WRKSRC=		${WRKDIR}/rtspd-1.0.0.0a
 CATEGORIES=	net
 MASTER_SITES=	http://docs.real.com/docs/proxykit/
 
@@ -19,8 +20,6 @@ NO_BIN_ON_CDROM=	${RESTRICTED}
 
 DOWNLOAD=	http://proforma.real.com/rn/misc/rtspproxy/index.html
 
-WRKSRC=		${WRKDIR}/rtspd-1.0.0.0a
-
 .include "../../mk/bsd.prefs.mk"
 
 .if ${OPSYS} == "SunOS"
diff --git a/net/ripe-whois-tools/Makefile b/net/ripe-whois-tools/Makefile
index 224178522a3..d8d6b54d2eb 100644
--- a/net/ripe-whois-tools/Makefile
+++ b/net/ripe-whois-tools/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.2 2001/05/18 11:56:00 rh Exp $
+# $NetBSD: Makefile,v 1.3 2003/03/29 12:42:03 jmmv Exp $
 #
 
 DISTNAME=	ripe-whois-tools-2.4
+WRKSRC=		${WRKDIR}
 CATEGORIES=	net
 MASTER_SITES=	ftp://ftp.ripe.net/tools/
 
@@ -9,8 +10,6 @@ MAINTAINER=	seb@pbox.org
 HOMEPAGE=	http://www.ripe.net/ripencc/pub-services/db/
 COMMENT=	RIPE WHOIS client and tools
 
-WRKSRC=		${WRKDIR}
-
 .include "../../mk/bsd.prefs.mk"
 
 .if ${OPSYS} == "NetBSD"
diff --git a/net/ripe-whois/Makefile b/net/ripe-whois/Makefile
index 31dcba3cbf4..5aeba31eaf6 100644
--- a/net/ripe-whois/Makefile
+++ b/net/ripe-whois/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.3 2003/03/03 20:20:05 seb Exp $
+# $NetBSD: Makefile,v 1.4 2003/03/29 12:42:03 jmmv Exp $
 #
 
 DISTNAME=	ripe-whois-3.1.1v6
 CATEGORIES=	net
+WRKSRC=		${WRKDIR}/whois-3.1.1v6
 MASTER_SITES=	ftp://ftp.ripe.net/tools/
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} ${ASCII_DOC} ${PS_DOC}
 
@@ -10,7 +11,6 @@ MAINTAINER=	seb@netbsd.org
 HOMEPAGE=	http://www.ripe.net/ripencc/pub-services/db/
 COMMENT=	RIPE very simple and generic whois client
 
-WRKSRC=		${WRKDIR}/whois-3.1.1v6
 GNU_CONFIGURE=	YES
 USE_PERL5=	build
 MAKE_ENV+=	PERL5=${PERL5}
diff --git a/net/rp-pppoe/Makefile b/net/rp-pppoe/Makefile
index 9be73d9ff5f..7a9f93ed29b 100644
--- a/net/rp-pppoe/Makefile
+++ b/net/rp-pppoe/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.21 2003/01/28 22:03:55 jlam Exp $
+# $NetBSD: Makefile,v 1.22 2003/03/29 12:42:03 jmmv Exp $
 
 DISTNAME=	rp-pppoe-3.5
+WRKSRC=		${WRKDIR}/${DISTNAME}/src
 CATEGORIES=	net
 MASTER_SITES=	${HOMEPAGE} \
 		http://roaringpenguin.luky.org/pppoe/
@@ -15,8 +16,6 @@ USE_PKGINSTALL=	YES
 GNU_CONFIGURE=	YES
 CONFIGURE_ENV+=	PPPD=${PPPD}
 
-WRKSRC=		${WRKDIR}/${DISTNAME}/src
-
 RCD_SCRIPTS=	pppoe
 
 post-install:
diff --git a/net/smb2www/Makefile b/net/smb2www/Makefile
index 38c64b8333f..75c4d02ce42 100644
--- a/net/smb2www/Makefile
+++ b/net/smb2www/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.4 2001/11/21 17:25:13 jlam Exp $
+# $NetBSD: Makefile,v 1.5 2003/03/29 12:42:04 jmmv Exp $
 #
 
 DISTNAME=	smb2www-980804
+WRKSRC=		${WRKDIR}
 CATEGORIES=	net
 MASTER_SITES=	http://us1.samba.org/samba/smb2www/ \
 		http://www.samba.org/samba/smb2www/
@@ -14,8 +15,6 @@ DEPENDS+=	p5-MIME-Base64-[0-9]*:../../converters/p5-MIME-Base64
 DEPENDS+=	samba<2.2.0:../../net/samba
 DEPENDS+=	apache{,6}-[0-9]*:../../www/apache
 
-WRKSRC=		${WRKDIR}
-
 SMB2WWW_MASTER_BROWSER_SERVER?=		# set for non-empty
 APACHE_USER?=	nobody
 DESCR_SRC=	${WRKSRC}/.DESCRX
diff --git a/net/spread/Makefile b/net/spread/Makefile
index 6fa6ed7ed17..14812be0e3e 100644
--- a/net/spread/Makefile
+++ b/net/spread/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.2 2003/02/22 23:37:13 mjl Exp $
+# $NetBSD: Makefile,v 1.3 2003/03/29 12:42:04 jmmv Exp $
 #
 
 DISTNAME=	${BASENAME}-src-${VER}
 PKGNAME=	${BASENAME}-${VER}
+WRKSRC=		${WRKDIR}/${DISTNAME}
 CATEGORIES=	net
 MASTER_SITES=
 
@@ -20,7 +21,6 @@ _FETCH_MESSAGE= \
 
 BASENAME=	spread
 VER=		3.17.0
-WRKSRC=		${WRKDIR}/${DISTNAME}
 USE_BUILDLINK2=	YES
 GNU_CONFIGURE=	YES
 
diff --git a/net/tcl-scotty/Makefile b/net/tcl-scotty/Makefile
index 5867ca0369f..25086cc3d53 100644
--- a/net/tcl-scotty/Makefile
+++ b/net/tcl-scotty/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.4 2002/11/25 17:53:20 jwise Exp $
+# $NetBSD: Makefile,v 1.5 2003/03/29 12:42:04 jmmv Exp $
 #
 
 DISTNAME=	scotty-2.1.11
 PKGNAME=	tcl-scotty-2.1.11
+WRKSRC=		${WRKDIR}/${DISTNAME}/unix
 CATEGORIES=	net tcl tk
 MASTER_SITES=	ftp://ftp.ibr.cs.tu-bs.de/pub/local/tkined/
 
@@ -19,8 +20,6 @@ CONFIGURE_ENV+=	TARGET=scotty
 
 USE_LIBTOOL=	yes
 
-WRKSRC=		${WRKDIR}/${DISTNAME}/unix
-
 post-extract:
 	@${RM} -f ${WRKSRC}/../doc/http.n
 	@${RM} -f ${WRKSRC}/../doc/tkined.1
diff --git a/net/tcpdmerge/Makefile b/net/tcpdmerge/Makefile
index bddf8ce5b26..eece57c78d4 100644
--- a/net/tcpdmerge/Makefile
+++ b/net/tcpdmerge/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.1.1.1 2001/03/06 02:58:39 itojun Exp $
+# $NetBSD: Makefile,v 1.2 2003/03/29 12:42:04 jmmv Exp $
 
 DISTNAME=	tcpdmerge-1.0
+WRKSRC=		${WRKDIR}
 CATEGORIES=	net
 MASTER_SITES=	http://phantom.nemoto.ecei.tohoku.ac.jp/~akiraka/tcpdmerge/
 DISTFILES=	tcpdmerge.c 00README.TXT
@@ -9,8 +10,6 @@ MAINTAINER=	packages@netbsd.org
 HOMEPAGE=	http://phantom.nemoto.ecei.tohoku.ac.jp/~akiraka/tcpdmerge/
 COMMENT=	merge two tcpdump output files
 
-WRKSRC=	${WRKDIR}
-
 do-extract:
 	${MKDIR} ${WRKSRC}
 	for i in ${DISTFILES}; do \
diff --git a/net/tcpdpriv/Makefile b/net/tcpdpriv/Makefile
index 7f13aa6bcc9..ec225a02dcd 100644
--- a/net/tcpdpriv/Makefile
+++ b/net/tcpdpriv/Makefile
@@ -1,15 +1,14 @@
-# $NetBSD: Makefile,v 1.1.1.1 2001/03/06 03:43:16 itojun Exp $
+# $NetBSD: Makefile,v 1.2 2003/03/29 12:42:04 jmmv Exp $
 
 DISTNAME=	tcpd-tools-0.8
 PKGNAME=	tcpdpriv-0.8
+WRKSRC=		${WRKDIR}/${DISTNAME}/wide-tcpdpriv
 CATEGORIES=	net
 MASTER_SITES=	ftp://tracer.csl.sony.co.jp/pub/mawi/tools/
 
 MAINTAINER=	packages@netbsd.org
 COMMENT=	anonymize tcpdump traces
 
-WRKSRC=		${WRKDIR}/${DISTNAME}/wide-tcpdpriv
-
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/tcpdpriv ${PREFIX}/bin
 	${INSTALL_MAN} ${WRKSRC}/tcpdpriv.1 ${PREFIX}/man/man1
diff --git a/net/tcpdstat/Makefile b/net/tcpdstat/Makefile
index 83cecc74d67..cc12ca2242e 100644
--- a/net/tcpdstat/Makefile
+++ b/net/tcpdstat/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.1.1.1 2001/03/06 03:37:50 itojun Exp $
+# $NetBSD: Makefile,v 1.2 2003/03/29 12:42:05 jmmv Exp $
 
 DISTNAME=	tcpd-tools-0.8
 PKGNAME=	tcpdstat-0.8
+WRKSRC=		${WRKDIR}/${DISTNAME}/tcpdstat
 CATEGORIES=	net
 MASTER_SITES=	ftp://tracer.csl.sony.co.jp/pub/mawi/tools/
 
@@ -10,6 +11,4 @@ COMMENT=	analyze tcpdump output
 
 MAKE_ENV=	BINDIR=${PREFIX}/bin
 
-WRKSRC=		${WRKDIR}/${DISTNAME}/tcpdstat
-
 .include <../../mk/bsd.pkg.mk>
diff --git a/net/tcptrace/Makefile b/net/tcptrace/Makefile
index 9b06c98c13c..5212bfba2f5 100644
--- a/net/tcptrace/Makefile
+++ b/net/tcptrace/Makefile
@@ -1,9 +1,10 @@
-# $NetBSD: Makefile,v 1.14 2001/02/25 04:18:08 hubertf Exp $
+# $NetBSD: Makefile,v 1.15 2003/03/29 12:42:05 jmmv Exp $
 # FreeBSD Id: Makefile,v 1.3 1997/07/19 19:43:36 fenner Exp
 #
 
 DISTNAME=	tcptrace.5.2.1
 PKGNAME=	tcptrace-5.2.1
+WRKSRC=         ${WRKDIR}/tcptrace_5.2.1
 CATEGORIES=	net
 MASTER_SITES=	http://jarok.cs.ohiou.edu/software/tcptrace/files/5.2.1/
 
@@ -11,7 +12,6 @@ MAINTAINER=	packages@netbsd.org
 HOMEPAGE=	http://jarok.cs.ohiou.edu/software/tcptrace/tcptrace.html
 COMMENT=	TCP dump file analysis tool
 
-WRKSRC=         ${WRKDIR}/tcptrace_5.2.1
 GNU_CONFIGURE=	yes
 
 ALL_TARGET=	tcptrace
diff --git a/net/tightvnc/Makefile b/net/tightvnc/Makefile
index b95b8bf0ec3..0ee1f7d9940 100644
--- a/net/tightvnc/Makefile
+++ b/net/tightvnc/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.6 2002/10/20 14:33:53 lukem Exp $
+# $NetBSD: Makefile,v 1.7 2003/03/29 12:42:05 jmmv Exp $
 #
 
 DISTNAME=		tightvnc-1.2.6
+WRKSRC=			${WRKDIR}/vnc_unixsrc
 CATEGORIES=		net x11
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=vnc-tight/} \
 			ftp://ftp.uk.research.att.com/pub/vnc/dist/
@@ -20,8 +21,6 @@ USE_IMAKE=		yes
 NO_INSTALL_MANPAGES=	yes
 USE_PERL5=		yes
 
-WRKSRC=			${WRKDIR}/vnc_unixsrc
-
 ALL_TARGET=		World
 
 # We have to frob a few things, and we want our own permissions, so it's easier
diff --git a/net/tightvncviewer/Makefile b/net/tightvncviewer/Makefile
index f20b994b8bd..83df24ed737 100644
--- a/net/tightvncviewer/Makefile
+++ b/net/tightvncviewer/Makefile
@@ -1,10 +1,11 @@
-# $NetBSD: Makefile,v 1.9 2003/03/03 02:45:51 jschauma Exp $
+# $NetBSD: Makefile,v 1.10 2003/03/29 12:42:05 jmmv Exp $
 # FreeBSD Id: Makefile,v 1.2 1998/03/19 01:54:59 msmith Exp
 #
 
 DISTNAME=		tightvnc-1.2.8
 PKGNAME=		tightvncviewer-1.2.8
 PKGREVISION=		1
+WRKSRC=			${WRKDIR}/vnc_unixsrc
 CATEGORIES=		net x11
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=vnc-tight/}
 DISTFILES=		${DISTNAME}_unixsrc.tar.bz2
@@ -19,7 +20,6 @@ CRYPTO=			yes
 USE_BUILDLINK2=		yes
 USE_IMAKE=		yes
 
-WRKSRC=			${WRKDIR}/vnc_unixsrc
 CONFIGURE_DIRS=		${WRKSRC}/libvncauth
 CONFIGURE_DIRS+=	${WRKSRC}/vncviewer
 BUILD_DIRS=		${CONFIGURE_DIRS}
diff --git a/net/tkined/Makefile b/net/tkined/Makefile
index 57bd020c099..24ca39a30df 100644
--- a/net/tkined/Makefile
+++ b/net/tkined/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.4 2002/11/25 17:53:23 jwise Exp $
+# $NetBSD: Makefile,v 1.5 2003/03/29 12:42:05 jmmv Exp $
 #
 
 DISTNAME=	scotty-2.1.11
 PKGNAME=	tkined-1.4.11
+WRKSRC=		${WRKDIR}/${DISTNAME}/unix
 CATEGORIES=	net tcl tk
 MASTER_SITES=	ftp://ftp.ibr.cs.tu-bs.de/pub/local/tkined/
 
@@ -20,8 +21,6 @@ CONFIGURE_ENV+=	TARGET=tkined
 
 USE_LIBTOOL=	yes
 
-WRKSRC=		${WRKDIR}/${DISTNAME}/unix
-
 FILESDIR=	${.CURDIR}/../../net/tcl-scotty/files
 PATCHDIR=	${.CURDIR}/../../net/tcl-scotty/patches
 
diff --git a/net/traceroute-as/Makefile b/net/traceroute-as/Makefile
index f7e5542aaa6..9cdc164cec0 100644
--- a/net/traceroute-as/Makefile
+++ b/net/traceroute-as/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.2 2002/04/18 16:14:45 yyamano Exp $
+# $NetBSD: Makefile,v 1.3 2003/03/29 12:42:06 jmmv Exp $
 #
 
 DISTNAME=	traceroute_991603.tar
 PKGNAME=	traceroute-as-991603
+WRKSRC=		${WRKDIR}
 CATEGORIES=	net
 MASTER_SITES=	ftp://ftp.nikhef.nl/pub/network/
 EXTRACT_SUFX=	.Z
@@ -10,8 +11,6 @@ EXTRACT_SUFX=	.Z
 MAINTAINER=	seb@netbsd.org
 COMMENT=	Traceroute capable of reporting the AS number of hops
 
-WRKSRC=		${WRKDIR}
-
 .include "../../mk/bsd.prefs.mk"
 
 .if ${OPSYS} == "SunOS"
diff --git a/net/unison/Makefile b/net/unison/Makefile
index 48654325f07..90c20a7bcb8 100644
--- a/net/unison/Makefile
+++ b/net/unison/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.10 2002/09/16 14:38:33 uebayasi Exp $
+# $NetBSD: Makefile,v 1.11 2003/03/29 12:42:06 jmmv Exp $
 #
 
 DISTNAME=	src
 PKGNAME=	unison-2.9.1
+WRKSRC=		${WRKDIR}/${PKGNAME}
 CATEGORIES=	net
 MASTER_SITES=	http://www.cis.upenn.edu/~bcpierce/unison/download/stable/latest/
 
@@ -16,7 +17,6 @@ BUILD_DEPENDS+=	bash>=2.05:../../shells/bash2
 DIST_SUBDIR=	${PKGNAME}
 
 # docs: unison-manual.pdf/html/ps/dvi
-WRKSRC=		${WRKDIR}/${PKGNAME}
 USE_GMAKE=	yes
 MAKE_FLAGS+=	CFLAGS="" UISTYLE=text
 MAKE_ENV+=	HOME=${WRKDIR}
diff --git a/net/userppp/Makefile b/net/userppp/Makefile
index 1fd09784e6b..a226dda86a8 100644
--- a/net/userppp/Makefile
+++ b/net/userppp/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.10 2003/01/28 22:03:57 jlam Exp $
+# $NetBSD: Makefile,v 1.11 2003/03/29 12:42:06 jmmv Exp $
 
 DISTNAME=		ppp-001107.src
 PKGNAME=		userppp-001107
+WRKSRC=			${WRKDIR}/${DISTNAME:S/.src//}
 CATEGORIES=		net
 MASTER_SITES=		http://www.netbsd.org/~ad/
 
@@ -12,7 +13,6 @@ COMMENT=		User-PPP package as found in FreeBSD and OpenBSD
 ONLY_FOR_PLATFORM=	NetBSD-*-*
 
 MANCOMPRESSED_IF_MANZ=	YES
-WRKSRC=			${WRKDIR}/${DISTNAME:S/.src//}
 
 post-patch:
 	(cd ${WRKSRC};							\
diff --git a/net/vnc/Makefile b/net/vnc/Makefile
index 9903bb67b25..39e27febbff 100644
--- a/net/vnc/Makefile
+++ b/net/vnc/Makefile
@@ -1,10 +1,11 @@
-# $NetBSD: Makefile,v 1.27 2003/01/31 12:16:47 abs Exp $
+# $NetBSD: Makefile,v 1.28 2003/03/29 12:42:06 jmmv Exp $
 # FreeBSD Id: Makefile,v 1.2 1998/03/19 01:54:59 msmith Exp
 #
 
 DISTNAME=		vnc-3.3.3r2
 PKGNAME=		vnc-3.3.3.2
 PKGREVISION=		1
+WRKSRC=			${WRKDIR}/vnc_unixsrc
 CATEGORIES=		net x11
 MASTER_SITES=		ftp://ftp.uk.research.att.com/pub/vnc/dist/
 DISTFILES=		vnc-3.3.3r2_unixsrc.tgz \
@@ -26,8 +27,6 @@ USE_IMAKE=		yes
 USE_PERL5=		yes
 BUILD_DEFS+=		USE_INET6
 
-WRKSRC=			${WRKDIR}/vnc_unixsrc
-
 ALL_TARGET=		World
 
 MAKE_ENV+= CC=${CC:Q}	#for make imake in Xvnc/config/imake
diff --git a/net/vncviewer/Makefile b/net/vncviewer/Makefile
index 63cf9579244..555e3aaf50c 100644
--- a/net/vncviewer/Makefile
+++ b/net/vncviewer/Makefile
@@ -1,10 +1,11 @@
-# $NetBSD: Makefile,v 1.7 2002/08/21 02:12:16 grant Exp $
+# $NetBSD: Makefile,v 1.8 2003/03/29 12:42:06 jmmv Exp $
 # FreeBSD Id: Makefile,v 1.2 1998/03/19 01:54:59 msmith Exp
 #
 
 DISTNAME=       	vnc-3.3.3r2_unixsrc
 PKGNAME=		vncviewer-3.3.3.2
 PKGREVISION=		1
+WRKSRC=			${WRKDIR}/vnc_unixsrc
 CATEGORIES=		net x11
 MASTER_SITES=   	http://www.uk.research.att.com/vnc/dist/
 EXTRACT_SUFX=		.tgz
@@ -22,8 +23,6 @@ NO_INSTALL_MANPAGES=	yes
 USE_IMAKE=		yes
 BUILD_DEFS+=		USE_INET6
 
-WRKSRC=			${WRKDIR}/vnc_unixsrc
-
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/vncviewer/vncviewer ${PREFIX}/bin/vncviewer
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/vncviewer
diff --git a/net/vtun/Makefile b/net/vtun/Makefile
index e0adacf2388..2f7ac9159af 100644
--- a/net/vtun/Makefile
+++ b/net/vtun/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.17 2003/01/28 22:03:57 jlam Exp $
+# $NetBSD: Makefile,v 1.18 2003/03/29 12:42:07 jmmv Exp $
 
 DISTNAME=	vtun-2.5
+WRKSRC=		${WRKDIR}/vtun
 CATEGORIES=	net
 MASTER_SITES=	http://vtun.sourceforge.net/
 
@@ -19,7 +20,6 @@ CONFIGURE_ARGS+=	--with-lzo-headers=${BUILDLINK_PREFIX.liblzo}/include
 CONFIGURE_ARGS+=	--with-lzo-lib=${BUILDLINK_PREFIX.liblzo}/lib
 ALL_TARGET=		vtund
 
-WRKSRC=			${WRKDIR}/vtun
 DOCDIR=			${PREFIX}/share/doc/vtun
 EGDIR=			${PREFIX}/share/examples/vtun
 LOCKDIR=		/var/run/vtund
diff --git a/net/wistumbler/Makefile b/net/wistumbler/Makefile
index adf22ed8e8f..c5243caa0de 100644
--- a/net/wistumbler/Makefile
+++ b/net/wistumbler/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.6 2002/09/09 18:09:57 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2003/03/29 12:42:07 jmmv Exp $
 
 DISTNAME=	wistumbler-20020811-2
 PKGNAME=	wistumbler-20020811.2
+WRKSRC=		${WRKDIR}/wistumbler
 CATEGORIES=	net
 MASTER_SITES=	http://gongon.com/persons/iseki/wistumbler/
 
@@ -12,8 +13,6 @@ COMMENT=	Network stumbler for WaveLAN/IEEE wireless networking
 USE_BUILDLINK2=	YES
 USE_X11=	YES
 
-WRKSRC=		${WRKDIR}/wistumbler
-
 NOT_FOR_PLATFORM=	NetBSD-0.*-* NetBSD-1.[01234]*-* NetBSD-1.5-*
 NOT_FOR_PLATFORM+=	NetBSD-1.5.*-* NetBSD-1.5[A-V]-*
 
diff --git a/net/xmftp/Makefile b/net/xmftp/Makefile
index 4ac3f99b52a..51517285f27 100644
--- a/net/xmftp/Makefile
+++ b/net/xmftp/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.2 2002/09/23 23:55:25 jlam Exp $
+# $NetBSD: Makefile,v 1.3 2003/03/29 12:42:07 jmmv Exp $
 #
 
 DISTNAME=	xmftp-1.0.4
+WRKSRC=		${WRKDIR}/xmftp/source
 CATEGORIES=	net
 MASTER_SITES=	http://www.cse.fau.edu/~valankar/old/xmftp/
 
@@ -13,8 +14,6 @@ USE_BUILDLINK2=	yes
 USE_X11BASE=	yes
 USE_GMAKE=	yes
 
-WRKSRC=		${WRKDIR}/xmftp/source
-
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/xmftp ${PREFIX}/bin
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/xmftp
diff --git a/net/xrmftp/Makefile b/net/xrmftp/Makefile
index 9ea3e126d0d..34cb345cacd 100644
--- a/net/xrmftp/Makefile
+++ b/net/xrmftp/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.3 2002/12/28 21:22:55 jschauma Exp $
+# $NetBSD: Makefile,v 1.4 2003/03/29 12:42:07 jmmv Exp $
 
 DISTNAME=	xrmftp-1.2.4
 PKGREVISION=	1
+WRKSRC=		${WRKDIR}/${DISTNAME}.src
 CATEGORIES=	net
 MASTER_SITES=	http://www.mat.uni.torun.pl/~rafmet/xrmftp/
 EXTRACT_SUFX=	.src.tgz
@@ -12,7 +13,6 @@ COMMENT=	FTP client for X Window System
 
 USE_BUILDLINK2=	yes
 USE_X11BASE=	yes
-WRKSRC=		${WRKDIR}/${DISTNAME}.src
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/xrmftp ${PREFIX}/bin
diff --git a/net/yale-tftpd/Makefile b/net/yale-tftpd/Makefile
index 96fc4bfd4ee..2a5ee0bf5fe 100644
--- a/net/yale-tftpd/Makefile
+++ b/net/yale-tftpd/Makefile
@@ -1,16 +1,15 @@
-# $NetBSD: Makefile,v 1.3 2002/04/23 15:27:15 seb Exp $
+# $NetBSD: Makefile,v 1.4 2003/03/29 12:42:08 jmmv Exp $
 # FreeBSD Id: ports/ftp/yale-tftpd/Makefile,v 1.14 2000/04/12 05:31:29 mharo Exp
 
 DISTNAME=	yale-tftpd-3.0
 PKGREVISION=	1
+WRKSRC=		${WRKDIR}
 CATEGORIES=	ftp
 MASTER_SITES=	ftp://ftp.cert.dfn.de/pub/tools/net/yale-tftpd/
 
 MAINTAINER=	packages@netbsd.org
 COMMENT=	Enhanced tftpd(8) from Yale University and cisco Systems
 
-WRKSRC=		${WRKDIR}
-
 post-configure:
 	${MV} ${WRKSRC}/tftpd.8 ${WRKSRC}/tftpd.8.in
 	${SED} -e "s|@ETCDIR@|${PKG_SYSCONFDIR}|g"	\
-- 
cgit v1.2.3