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

27 files changed, 58 insertions, 54 deletions

diff --git a/security/AiSSLtelnet/Makefile b/security/AiSSLtelnet/Makefile
index ff822eb4d6c..ce6fbd70826 100644
--- a/security/AiSSLtelnet/Makefile
+++ b/security/AiSSLtelnet/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.4 2003/09/21 08:53:35 jmc Exp $
+# $NetBSD: Makefile,v 1.5 2004/01/20 12:25:33 agc Exp $
 #
 
 DISTNAME=	AiSSLtelnet-0.15
 PKGREVISION=	1
-WRKSRC=         ${WRKDIR}/AiSSLtelnet
 CATEGORIES=	security
 MASTER_SITES=	http://mars.elcom.nitech.ac.jp/security/
 
@@ -17,6 +16,8 @@ RESTRICTED=             "Source code redistribution is not permitted.consult oku
 NO_SRC_ON_FTP=          ${RESTRICTED}
 NO_SRC_ON_CDROM=        ${RESTRICTED}
 
+WRKSRC=         ${WRKDIR}/AiSSLtelnet
+
 pre-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/AiSSLtelnet
 	${INSTALL_DATA} ${WRKSRC}/aicrypto/COPYRIGHT ${WRKSRC}/README \
diff --git a/security/audit-packages/Makefile b/security/audit-packages/Makefile
index 9e16018bec7..6a83fe297b5 100644
--- a/security/audit-packages/Makefile
+++ b/security/audit-packages/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.41 2004/01/19 15:15:08 jlam Exp $
+# $NetBSD: Makefile,v 1.42 2004/01/20 12:25:33 agc Exp $
 
 DISTNAME=	audit-packages-1.28
-WRKSRC=		${WRKDIR}
 CATEGORIES=	security pkgtools
 MASTER_SITES=	# empty
 DISTFILES=	# empty
@@ -13,6 +12,7 @@ PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
 DEPENDS+=	digest-[0-9]*:../../pkgtools/digest
 
+WRKSRC=		${WRKDIR}
 NO_CHECKSUM=    yes
 NO_BUILDLINK=	yes
 
diff --git a/security/crack/Makefile b/security/crack/Makefile
index 3504c28d1ff..bcb38513a88 100644
--- a/security/crack/Makefile
+++ b/security/crack/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.15 2003/10/06 08:19:45 jlam Exp $
+# $NetBSD: Makefile,v 1.16 2004/01/20 12:25:33 agc Exp $
 # FreeBSD Id: ports/security/crack/Makefile,v 1.11 1999/09/04 19:24:50 obrien Exp
 
 DISTNAME=	crack5.0
 PKGNAME=	crack-5.0
-WRKSRC=		${WRKDIR}/c50a
 CATEGORIES=	security
 MASTER_SITES=	ftp://ftp.task.gda.pl/mirror/ftp.cert.org/pub/tools/crack/ \
 		ftp://ftp.cs.umn.edu/mirror00/ftp.win.tue.nl/pub/security/ \
@@ -13,6 +12,8 @@ MAINTAINER=	bouyer@NetBSD.org
 HOMEPAGE=	http://www.users.dircon.co.uk/~crypto/
 COMMENT=	The "Sensible" Unix Password Cracker
 
+WRKSRC=		${WRKDIR}/c50a
+
 pre-configure:
 	@${ECHO} "XLIB+= -lcrypt" >> ${WRKSRC}/src/util/Makefile
 
diff --git a/security/fprot-workstation-bin/Makefile b/security/fprot-workstation-bin/Makefile
index d550c983f76..801bacfdfe8 100644
--- a/security/fprot-workstation-bin/Makefile
+++ b/security/fprot-workstation-bin/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.2 2004/01/07 23:10:17 ben Exp $
+# $NetBSD: Makefile,v 1.3 2004/01/20 12:25:33 agc Exp $
 #
 
 DISTNAME=		fp-netbsd-ws-4.3.1
 PKGNAME=		fprot-workstation-bin-4.3.1
-WRKSRC=			${WRKDIR}/f-prot
 CATEGORIES=		security
 MASTER_SITES=		ftp://ftp.f-prot.com/pub/bsd/
 
@@ -23,6 +22,7 @@ NO_BIN_ON_FTP=		${RESTRICTED}
 NO_SRC_ON_FTP=		${RESTRICTED}
 LICENSE=		fprot-workstation-license
 
+WRKSRC=			${WRKDIR}/f-prot
 NO_BUILD=		yes
 USE_BUILDLINK3=		yes
 
diff --git a/security/gtk-systrace/Makefile b/security/gtk-systrace/Makefile
index a086e6883ee..f38bcdabfe4 100644
--- a/security/gtk-systrace/Makefile
+++ b/security/gtk-systrace/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.6 2003/07/17 22:52:55 grant Exp $
+# $NetBSD: Makefile,v 1.7 2004/01/20 12:25:33 agc Exp $
 #
 
 DISTNAME=	gtk-systrace-2002-12-01
 PKGNAME=	gtk-systrace-20021201
 PKGREVISION=	2
-WRKSRC=		${WRKDIR}/notification-0.1
 CATEGORIES=	security x11
 MASTER_SITES=	http://www.citi.umich.edu/u/provos/systrace/
 
@@ -14,6 +13,7 @@ COMMENT=	GTK interface to systrace(1)
 
 ONLY_FOR_PLATFORM=	NetBSD-1.6[H-Z]*-* NetBSD-1.[7-9]*-* NetBSD-[2-9]*
 
+WRKSRC=			${WRKDIR}/notification-0.1
 GNU_CONFIGURE=		YES
 USE_BUILDLINK2=		YES
 USE_LIBTOOL=		YES
diff --git a/security/hackbot/Makefile b/security/hackbot/Makefile
index 629cbf151f2..00adb2f3cce 100644
--- a/security/hackbot/Makefile
+++ b/security/hackbot/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.1.1.1 2002/11/26 13:40:17 pooka Exp $
+# $NetBSD: Makefile,v 1.2 2004/01/20 12:25:33 agc Exp $
 
 DISTNAME=		hackbot-2.15
-WRKSRC=			${WRKDIR}/hackbot
 CATEGORIES=		security net
 MASTER_SITES=		http://ws.obit.nl/hackbot/ \
 			http://www.xs4all.nl/~mvberkum/hackbot/ \
@@ -12,6 +11,7 @@ MAINTAINER=		nk@atki.net
 HOMEPAGE=		http://ws.obit.nl/hackbot/
 COMMENT=		Vulnerability scanner written in Perl
 
+WRKSRC=			${WRKDIR}/hackbot
 MANCOMPRESSED=		YES
 USE_PERL5=		YES
 REPLACE_PERL=		hackbot.pl
diff --git a/security/john/Makefile b/security/john/Makefile
index 69ea810eca0..1dc1aaf7991 100644
--- a/security/john/Makefile
+++ b/security/john/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.3 2003/11/18 14:03:14 xtraeme Exp $
+# $NetBSD: Makefile,v 1.4 2004/01/20 12:25:34 agc Exp $
 #
 
 DISTNAME=	john-1.6
-WRKSRC=		${WRKDIR}/${DISTNAME}/src
 PKGREVISION=	1
 CATEGORIES=	security textproc
 MASTER_SITES=	http://www.openwall.com/john/
@@ -11,6 +10,7 @@ MAINTAINER=	DawS@irc.pl
 HOMEPAGE=	http://www.openwall.com/john/
 COMMENT=	Unix Password Cracker
 
+WRKSRC=		${WRKDIR}/${DISTNAME}/src
 ALL_TARGET=	generic
 
 do-install:
diff --git a/security/libbf/Makefile b/security/libbf/Makefile
index e36ed0c946a..d0aeff95a90 100644
--- a/security/libbf/Makefile
+++ b/security/libbf/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.6 2003/07/21 17:20:10 martti Exp $
+# $NetBSD: Makefile,v 1.7 2004/01/20 12:25:34 agc Exp $
 #
 
 DISTNAME=	libbf-0.8.2b
-WRKSRC=		${WRKDIR}/bf
 CATEGORIES=	security
 MASTER_SITES=	ftp://ftp.psy.uq.oz.au/pub/Crypto/libeay/ \
 		ftp://ftp.funet.fi/pub/mirrors/ftp.psy.uq.oz.au/libeay/ \
@@ -13,6 +12,7 @@ MAINTAINER=	tech-pkg@NetBSD.org
 HOMEPAGE=	http://www.counterpane.com/blowfish.html
 COMMENT=	Blowfish block cipher library
 
+WRKSRC=		${WRKDIR}/bf
 CRYPTO=		YES
 
 .include "../../mk/bsd.prefs.mk"
diff --git a/security/libdes/Makefile b/security/libdes/Makefile
index 07defaf0393..3a9d4cfaf90 100644
--- a/security/libdes/Makefile
+++ b/security/libdes/Makefile
@@ -1,13 +1,13 @@
-# $NetBSD: Makefile,v 1.4 2003/03/29 12:42:23 jmmv Exp $
+# $NetBSD: Makefile,v 1.5 2004/01/20 12:25:34 agc Exp $
 
 DISTNAME=	libdes-4.04b
-WRKSRC=         ${WRKDIR}/des
 CATEGORIES=	security
 MASTER_SITES=   ftp://ftp.psy.uq.oz.au/pub/Crypto/DES/
 
 MAINTAINER=	refling@comet.lbl.gov
 COMMENT=	Small DES (Data Encryption Standard) lib & standalone program
 
+WRKSRC=         ${WRKDIR}/des
 CRYPTO=		YES
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/security/libidea/Makefile b/security/libidea/Makefile
index f99751d2731..d32c5be8092 100644
--- a/security/libidea/Makefile
+++ b/security/libidea/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.5 2003/07/17 22:52:57 grant Exp $
+# $NetBSD: Makefile,v 1.6 2004/01/20 12:25:34 agc Exp $
 #
 
 DISTNAME=	libidea-0.8.2b
-WRKSRC=		${WRKDIR}/idea
 CATEGORIES=	security
 MASTER_SITES=	ftp://ftp.psy.uq.oz.au/pub/Crypto/libeay/ \
 		ftp://ftp.funet.fi/pub/mirrors/ftp.psy.uq.oz.au/libeay/ \
@@ -13,6 +12,7 @@ MAINTAINER=	tech-pkg@NetBSD.org
 HOMEPAGE=	http://www.media-crypt.com/pages/fidea.html
 COMMENT=	IDEA block cipher library
 
+WRKSRC=		${WRKDIR}/idea
 CRYPTO=		YES
 LICENCE=	IDEA-licence
 RESTRICTED=	IDEA is a patented algorithm that requires proper licensing
diff --git a/security/libnasl/Makefile b/security/libnasl/Makefile
index fce1c9e7e20..ed33d2e2c17 100644
--- a/security/libnasl/Makefile
+++ b/security/libnasl/Makefile
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.5 2003/11/12 16:12:22 tron Exp $
+# $NetBSD: Makefile,v 1.6 2004/01/20 12:25:34 agc Exp $
 
 DISTNAME=	libnasl-${VERS}
-WRKSRC=		${WRKDIR}/libnasl
 .include	"../nessus/Makefile.common"
 
 COMMENT=	Nessus Attack Scripting Language library
 
+WRKSRC=		${WRKDIR}/libnasl
 GNU_CONFIGURE=	yes
 USE_BUILDLINK2=	yes
 
diff --git a/security/nessus-core/Makefile b/security/nessus-core/Makefile
index 1d42087eba8..1ba91e9e14f 100644
--- a/security/nessus-core/Makefile
+++ b/security/nessus-core/Makefile
@@ -1,12 +1,12 @@
-# $NetBSD: Makefile,v 1.8 2003/09/02 09:29:51 frueauf Exp $
+# $NetBSD: Makefile,v 1.9 2004/01/20 12:25:34 agc Exp $
 #
 
 DISTNAME=	nessus-core-${VERS}
-WRKSRC=		${WRKDIR}/nessus-core
 .include 	"../nessus/Makefile.common"
 
 COMMENT=	Core module of the Nessus Network Security Scanner
 
+WRKSRC=		${WRKDIR}/nessus-core
 USE_BUILDLINK2=	yes
 USE_PKGINSTALL=	yes
 USE_X11=	yes
diff --git a/security/nessus-libraries/Makefile b/security/nessus-libraries/Makefile
index 4635d505089..e4a20d102dd 100644
--- a/security/nessus-libraries/Makefile
+++ b/security/nessus-libraries/Makefile
@@ -1,13 +1,13 @@
-# $NetBSD: Makefile,v 1.11 2003/11/12 03:39:42 jschauma Exp $
+# $NetBSD: Makefile,v 1.12 2004/01/20 12:25:34 agc Exp $
 #
 
 DISTNAME=	nessus-libraries-${VERS}
 PKGREVISION=	1
-WRKSRC=		${WRKDIR}/nessus-libraries
 .include 	"../nessus/Makefile.common"
 
 COMMENT=	Libs required by the Nessus Network security scanner
 
+WRKSRC=		${WRKDIR}/nessus-libraries
 USE_BUILDLINK2=	yes
 USE_LIBTOOL=	yes
 LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
diff --git a/security/nessus-plugins/Makefile b/security/nessus-plugins/Makefile
index baed908322a..efd4bcfe80f 100644
--- a/security/nessus-plugins/Makefile
+++ b/security/nessus-plugins/Makefile
@@ -1,14 +1,14 @@
-# $NetBSD: Makefile,v 1.9 2003/09/02 09:29:53 frueauf Exp $
+# $NetBSD: Makefile,v 1.10 2004/01/20 12:25:34 agc Exp $
 #
 
 DISTNAME=	nessus-plugins-${VERS}
-WRKSRC=		${WRKDIR}/nessus-plugins
 .include	"../nessus/Makefile.common"
 
 COMMENT=	Plugins for the Nessus Network Security Scanner
 
 DEPENDS+=	nmap>=2.0:../../net/nmap
 
+WRKSRC=		${WRKDIR}/nessus-plugins
 USE_BUILDLINK2=	yes
 GNU_CONFIGURE=	yes
 
diff --git a/security/nfsbug/Makefile b/security/nfsbug/Makefile
index 4272cc5d8f9..39959adfedc 100644
--- a/security/nfsbug/Makefile
+++ b/security/nfsbug/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.7 2003/07/17 22:53:00 grant Exp $
+# $NetBSD: Makefile,v 1.8 2004/01/20 12:25:34 agc Exp $
 
 DISTNAME=	nfsshell-1.0
-WRKSRC=		${WRKDIR}/nfsbug
 CATEGORIES=	net security
 MASTER_SITES=	http://www.asmodeus.com/archive/Xnix/
 DISTFILES=	nfsBugFerret.tgz \
@@ -11,6 +10,7 @@ MAINTAINER=	tech-pkg@NetBSD.org
 COMMENT=	NFS security verification suite
 
 EXTRACT_ONLY=   nfsBugFerret.tgz
+WRKSRC=		${WRKDIR}/nfsbug
 
 # Only works on 1.5B or greater on most platforms but will work on any x86
 # since struct pmap didn't get exposed through vm.h there.
diff --git a/security/p0f/Makefile b/security/p0f/Makefile
index 2e831cd0103..ce8d523270e 100644
--- a/security/p0f/Makefile
+++ b/security/p0f/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.10 2003/11/03 11:45:28 recht Exp $
+# $NetBSD: Makefile,v 1.11 2004/01/20 12:25:34 agc Exp $
 #
 
 DISTNAME=	p0f-2.0.3
-WRKSRC=		${WRKDIR}/p0f
 CATEGORIES=	security net
 MASTER_SITES=	http://lcamtuf.coredump.cx/p0f/
 EXTRACT_SUFX=	.tgz
@@ -11,6 +10,7 @@ MAINTAINER=	dawszy@arhea.net
 HOMEPAGE=	http://lcamtuf.coredump.cx/p0f.shtml
 COMMENT=	Passive OS fingerprinting tool
 
+WRKSRC=		${WRKDIR}/p0f
 USE_BUILDLINK2=	yes
 USE_PKGINSTALL=	yes
 
diff --git a/security/pgp2/Makefile b/security/pgp2/Makefile
index 0965066a432..22354d71681 100644
--- a/security/pgp2/Makefile
+++ b/security/pgp2/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.35 2003/07/23 10:51:13 jmmv Exp $
+# $NetBSD: Makefile,v 1.36 2004/01/20 12:25:34 agc Exp $
 # FreeBSD Id: Makefile,v 1.20 1997/08/27 13:06:01 ache Exp
 #
 
 DISTNAME=	pgp263is
-WRKSRC=		${WRKDIR}/src
 CATEGORIES=	security
 MASTER_SITES=	ftp://ftp.ifi.uio.no/pub/pgp/2.x/src/ \
 		ftp://ftp.kiarchive.ru/pub/unix/crypto/pgp/
@@ -12,6 +11,7 @@ MAINTAINER=	tech-pkg@NetBSD.org
 HOMEPAGE=	http://www.pgpi.com/
 COMMENT=	Public-key encryption and digital signature utility (v2)
 
+WRKSRC=		${WRKDIR}/src
 CRYPTO=		yes
 USE_RSAREF2=	NO
 
diff --git a/security/pgp5/Makefile b/security/pgp5/Makefile
index 9665788af75..2c62e296e8f 100644
--- a/security/pgp5/Makefile
+++ b/security/pgp5/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.22 2004/01/01 23:58:34 grant Exp $
+# $NetBSD: Makefile,v 1.23 2004/01/20 12:25:34 agc Exp $
 #
 
 DISTNAME=	pgp50i-unix-src
 PKGNAME=	pgp5-5.0i
-WRKSRC=		${WRKDIR}/pgp50i/src
 CATEGORIES=	security
 MASTER_SITES=	ftp://ftp.pgpi.com/pub/pgp/5.0/unix/ \
 		ftp://ftp.at.pgpi.com/pub/pgpi/5.0/unix/ \
@@ -22,6 +21,7 @@ USE_PERL5=	build
 
 CONFLICTS=	pgraf-[0-9]*  	# Both have a `pgps' executable
 
+WRKSRC=		${WRKDIR}/pgp50i/src
 CRYPTO=		YES
 GNU_CONFIGURE=	YES
 USE_RSAREF2=	NO
diff --git a/security/racoon/Makefile b/security/racoon/Makefile
index 7369c3d1def..6fb5cc79e90 100644
--- a/security/racoon/Makefile
+++ b/security/racoon/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.62 2004/01/16 02:29:49 itojun Exp $
+# $NetBSD: Makefile,v 1.63 2004/01/20 12:25:34 agc Exp $
 #
 
 DISTNAME=	racoon-20040116a
-WRKSRC=		${WRKDIR}/${DISTNAME}/racoon
 CATEGORIES=	security net
 MASTER_SITES=	ftp://ftp.kame.net/pub/kame/misc/
 
@@ -12,6 +11,7 @@ COMMENT=	KAME racoon IKE daemon
 
 CONFLICTS+=	racoon-[0-9]*
 
+WRKSRC=		${WRKDIR}/${DISTNAME}/racoon
 USE_BUILDLINK2=	yes
 USE_PKGINSTALL=	yes
 
diff --git a/security/rc5des/Makefile b/security/rc5des/Makefile
index 5f8e2250b77..478fbea1ed1 100644
--- a/security/rc5des/Makefile
+++ b/security/rc5des/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.15 2003/07/17 22:53:12 grant Exp $
+# $NetBSD: Makefile,v 1.16 2004/01/20 12:25:34 agc Exp $
 #
 
 DISTNAME=		rc5-mlg-004
 PKGNAME=		rc5des-0.4
 PKGREVISION=		1
-WRKSRC=			${WRKDIR}/RC5
 CATEGORIES=		security
 MASTER_SITES=		http://www.flame.org/netbsd-rc5/
 
@@ -12,6 +11,8 @@ MAINTAINER=		tech-pkg@NetBSD.org
 HOMEPAGE=		http://www.distributed.net/rc5/
 COMMENT=		Binaries for taking part in the rc5des challenge
 
+WRKSRC=			${WRKDIR}/RC5
+
 # This package requires emulators/compat12,compat13 and compat14
 # but only if we aren't running the relevant release natively.
 .include "../../mk/bsd.prefs.mk"
diff --git a/security/rsaref/Makefile b/security/rsaref/Makefile
index 7261c448651..2fde49c387b 100644
--- a/security/rsaref/Makefile
+++ b/security/rsaref/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.29 2004/01/05 23:36:32 jlam Exp $
+# $NetBSD: Makefile,v 1.30 2004/01/20 12:25:34 agc Exp $
 #
 
 DISTNAME=		rsaref
 PKGNAME=		rsaref-2.0p3
-WRKSRC=			${WRKDIR}/install
 CATEGORIES=		security
 MASTER_SITES=		ftp://ftp.spinnaker.com/pub/crypt/rsaref/
 EXTRACT_SUFX=		.tar.Z
@@ -11,6 +10,7 @@ EXTRACT_SUFX=		.tar.Z
 MAINTAINER=		tech-pkg@NetBSD.org
 COMMENT=		Encryption/authentication library, RSA/MDX/DES
 
+WRKSRC=			${WRKDIR}/install
 CRYPTO=			yes
 LICENSE=		no-commercial-use
 
diff --git a/security/ruby-digest/Makefile b/security/ruby-digest/Makefile
index 1a8d663f3e2..d8c0ec10520 100644
--- a/security/ruby-digest/Makefile
+++ b/security/ruby-digest/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.5 2003/12/19 12:04:20 sketch Exp $
+# $NetBSD: Makefile,v 1.6 2004/01/20 12:25:34 agc Exp $
 #
 
 DISTNAME=	${RUBY_DISTNAME}
 PKGNAME=	${RUBY_PKGNAMEPREFIX}digest-${RUBY_VERSION}
 PKGREVISION=	1
-WRKSRC=		${RUBY_WRKSRC}/ext/digest
 CATEGORIES=	security
 MASTER_SITES=	${MASTER_SITE_RUBY}
 
@@ -16,6 +15,7 @@ CONFLICTS=	${RUBY_PKGNAMEPREFIX}md5-[0-9]*
 
 DISTINFO_FILE=	${RUBY_DISTINFO}
 
+WRKSRC=		${RUBY_WRKSRC}/ext/digest
 DIST_SUBDIR=	ruby
 RUBY_REQD=	1.6.6
 EXTRACT_ELEMENTS= ${RUBY_DISTNAME}/ext/digest
diff --git a/security/ruby-openssl/Makefile b/security/ruby-openssl/Makefile
index 1c1820c3a08..8c7baa2b207 100644
--- a/security/ruby-openssl/Makefile
+++ b/security/ruby-openssl/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.11 2003/11/12 03:39:43 jschauma Exp $
+# $NetBSD: Makefile,v 1.12 2004/01/20 12:25:34 agc Exp $
 
 DISTNAME=		ossl-0.1.4a
 PKGNAME=		${RUBY_PKGNAMEPREFIX}openssl-0.1.4.1
 PKGREVISION=		1
-WRKSRC=			${WRKDIR}/ossl
 CATEGORIES=		security
 MASTER_SITES=		http://freesoftware.fsf.org/download/rubypki/
 
@@ -11,6 +10,7 @@ MAINTAINER=		taca@NetBSD.org
 HOMEPAGE=		http://www.freesoftware.fsf.org/rubypki/
 COMMENT=		OpenSSL interface module for Ruby
 
+WRKSRC=			${WRKDIR}/ossl
 DIST_SUBDIR=		ruby
 USE_RUBY_EXTCONF=	yes
 RUBY_REQD=		1.6.4
diff --git a/security/ruby-tcpwrap/Makefile b/security/ruby-tcpwrap/Makefile
index e8311990942..8b2c764be7d 100644
--- a/security/ruby-tcpwrap/Makefile
+++ b/security/ruby-tcpwrap/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.5 2003/08/24 05:00:54 taca Exp $
+# $NetBSD: Makefile,v 1.6 2004/01/20 12:25:34 agc Exp $
 # FreeBSD: ports/security/ruby-tcpwrap/Makefile,v 1.6 2000/09/26 08:02:10 knu Exp
 
 DISTNAME=	ruby-tcpwrap-0.6
 PKGNAME=	${RUBY_PKGNAMEPREFIX}tcpwrap-0.6
-WRKSRC=		${WRKDIR}/ruby-tcpwrap
 CATEGORIES=	security
 MASTER_SITES=	http://www.shugo.net/archive/ruby-tcpwrap/
 
@@ -11,6 +10,8 @@ MAINTAINER=	taca@NetBSD.org
 HOMEPAGE=	# not available
 COMMENT=	TCP wrappers library for Ruby
 
+WRKSRC=		${WRKDIR}/ruby-tcpwrap
+
 .include "../../mk/bsd.prefs.mk"
 
 DEPENDS+=	libident>=0.22:../../security/libident
diff --git a/security/scanssh/Makefile b/security/scanssh/Makefile
index 5cf552406db..abc2b7f1fcb 100644
--- a/security/scanssh/Makefile
+++ b/security/scanssh/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.10 2003/07/21 17:20:35 martti Exp $
+# $NetBSD: Makefile,v 1.11 2004/01/20 12:25:34 agc Exp $
 
 DISTNAME=	scanssh-1.6b
-WRKSRC=		${WRKDIR}/scanssh
 CATEGORIES=	security
 MASTER_SITES=	http://monkey.org/~provos/				\
 		ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/scanssh/
@@ -10,6 +9,7 @@ MAINTAINER=	tech-pkg@NetBSD.org
 HOMEPAGE=	http://monkey.org/~provos/scanssh/
 COMMENT=	SSH remote version scanner
 
+WRKSRC=		${WRKDIR}/scanssh
 GNU_CONFIGURE=	yes
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/security/smimemsg/Makefile b/security/smimemsg/Makefile
index 6cc5ac51607..dcf22df1baf 100644
--- a/security/smimemsg/Makefile
+++ b/security/smimemsg/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.6 2003/07/21 17:20:36 martti Exp $
+# $NetBSD: Makefile,v 1.7 2004/01/20 12:25:34 agc Exp $
 #
 
 DISTNAME=	smimemsg15
 PKGNAME=	smimemsg-1.5
-WRKSRC=		${WRKDIR}/smimemsg
 CATEGORIES=	security
 MASTER_SITES=	http://mars.elcom.nitech.ac.jp/security/
 
@@ -11,6 +10,7 @@ MAINTAINER=	tech-pkg@jp.NetBSD.org
 HOMEPAGE=	http://mars.elcom.nitech.ac.jp/security/
 COMMENT=	Generate and read S/MIME messages
 
+WRKSRC=		${WRKDIR}/smimemsg
 GNU_CONFIGURE=	YES
 
 RESTRICTED=             "Source code redistribution is not permitted.consult okuno@mars.elcom.nitech.ac.jp."
diff --git a/security/uvscan/Makefile b/security/uvscan/Makefile
index f9ed5e24c06..869f92ae8a6 100644
--- a/security/uvscan/Makefile
+++ b/security/uvscan/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.23 2003/11/14 08:51:40 wiz Exp $
+# $NetBSD: Makefile,v 1.24 2004/01/20 12:25:34 agc Exp $
 
 DISTNAME=		vlnx424e
 PKGNAME=		uvscan-4.24.0
-WRKSRC=			${WRKDIR}
 CATEGORIES=		security
 MASTER_SITES=		http://download.nai.com/products/evaluation/virusscan/english/cmdline/linux/version_4.24/intel/
 EXTRACT_SUFX=		.tar.Z
@@ -18,6 +17,7 @@ DEPENDS+=		suse_compat>=6.1:../../emulators/${SUSE_DIR_PREFIX}_compat
 ONLY_FOR_PLATFORM=	NetBSD-*-i386
 CHECK_SHLIBS=		NO
 
+WRKSRC=			${WRKDIR}
 LICENSE=		shareware
 RESTRICTED=		"restrictive 30 day evaluation license"
 NO_BIN_ON_FTP=		${RESTRICTED}