Place WRKSRC where it belongs, to make pkglint happy; ok'ed by wiz.

15 files changed, 30 insertions, 38 deletions

diff --git a/security/audit-packages/Makefile b/security/audit-packages/Makefile
index c827a69f0be..35c912b4eba 100644
--- a/security/audit-packages/Makefile
+++ b/security/audit-packages/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.17 2002/07/04 23:51:26 wiz Exp $
+# $NetBSD: Makefile,v 1.18 2003/03/29 12:42:22 jmmv Exp $
 
 DISTNAME=	audit-packages-1.14
+WRKSRC=		${WRKDIR}
 CATEGORIES=	security pkgtools
 MASTER_SITES=	# empty
 DISTFILES=	# empty
@@ -8,7 +9,6 @@ DISTFILES=	# empty
 MAINTAINER=	agc@netbsd.org
 COMMENT=	tools to show vulnerabilities in installed packages
 
-WRKSRC=		${WRKDIR}
 NO_CHECKSUM=    yes
 NO_BUILD=	yes
 NO_MTREE=	yes
diff --git a/security/crack/Makefile b/security/crack/Makefile
index 91774e005a9..2618e62d6f0 100644
--- a/security/crack/Makefile
+++ b/security/crack/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.12 2002/08/09 13:03:19 wiz Exp $
+# $NetBSD: Makefile,v 1.13 2003/03/29 12:42:22 jmmv 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/ \
@@ -12,8 +13,6 @@ 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/isakmpd/Makefile b/security/isakmpd/Makefile
index 1dcbeec7ae7..17128c6243a 100644
--- a/security/isakmpd/Makefile
+++ b/security/isakmpd/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.25 2003/01/28 22:04:05 jlam Exp $
+# $NetBSD: Makefile,v 1.26 2003/03/29 12:42:22 jmmv Exp $
 #
 
 DISTNAME=		isakmpd-20021118
+WRKSRC=			${WRKDIR}/isakmpd
 CATEGORIES=		security net
 MASTER_SITES=		ftp://ftp.netbsd.org/pub/NetBSD/packages/distfiles/LOCAL_PORTS/
 
@@ -17,8 +18,6 @@ ALL_TARGET=		depend all
 USE_BUILDLINK2=		YES
 USE_PKGINSTALL=		YES
 
-WRKSRC=			${WRKDIR}/isakmpd
-
 MAKE_ENV+=		BINDIR=${PREFIX}/sbin MANDIR=${PREFIX}/man
 
 post-patch:
diff --git a/security/john/Makefile b/security/john/Makefile
index 61c248db662..b003564a9b2 100644
--- a/security/john/Makefile
+++ b/security/john/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.1.1.1 2001/03/26 12:40:45 hubertf Exp $
+# $NetBSD: Makefile,v 1.2 2003/03/29 12:42:23 jmmv Exp $
 #
 
 DISTNAME=	john-1.6
+WRKSRC=		${WRKDIR}/${DISTNAME}/src
 CATEGORIES=	security textproc
 MASTER_SITES=	http://www.openwall.com/john/
 
@@ -9,7 +10,6 @@ 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/libdes/Makefile b/security/libdes/Makefile
index b728e7e695b..07defaf0393 100644
--- a/security/libdes/Makefile
+++ b/security/libdes/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.3 2003/01/19 09:04:02 salo Exp $
+# $NetBSD: Makefile,v 1.4 2003/03/29 12:42:23 jmmv Exp $
 
 DISTNAME=	libdes-4.04b
+WRKSRC=         ${WRKDIR}/des
 CATEGORIES=	security
 MASTER_SITES=   ftp://ftp.psy.uq.oz.au/pub/Crypto/DES/
 
@@ -9,6 +10,4 @@ COMMENT=	Small DES (Data Encryption Standard) lib & standalone program
 
 CRYPTO=		YES
 
-WRKSRC=         ${WRKDIR}/des
-
 .include "../../mk/bsd.pkg.mk"
diff --git a/security/libnasl/Makefile b/security/libnasl/Makefile
index aafe58b4ed3..2352b53dccc 100644
--- a/security/libnasl/Makefile
+++ b/security/libnasl/Makefile
@@ -1,15 +1,14 @@
-# $NetBSD: Makefile,v 1.2 2001/02/17 17:49:51 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2003/03/29 12:42:23 jmmv Exp $
 #
 
 DISTNAME=	libnasl-${VERS}
+WRKSRC=		${WRKDIR}/libnasl
 .include	"../nessus/Makefile.common"
 
 COMMENT=	Nessus Attack Scripting Language library
 
 DEPENDS+=       nessus-libraries-${VERS}:../nessus-libraries
 
-WRKSRC=		${WRKDIR}/libnasl
-
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV+=	CPP=${CPP}
 
diff --git a/security/nessus-core/Makefile b/security/nessus-core/Makefile
index c7899f88066..f9856b34195 100644
--- a/security/nessus-core/Makefile
+++ b/security/nessus-core/Makefile
@@ -1,13 +1,12 @@
-# $NetBSD: Makefile,v 1.3 2002/10/25 12:04:07 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2003/03/29 12:42:23 jmmv 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_X11=	yes
 GNU_CONFIGURE=	yes
diff --git a/security/nessus-libraries/Makefile b/security/nessus-libraries/Makefile
index 7d954f56eed..42ef94f116a 100644
--- a/security/nessus-libraries/Makefile
+++ b/security/nessus-libraries/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.9 2002/12/02 21:16:39 tron Exp $
+# $NetBSD: Makefile,v 1.10 2003/03/29 12:42:24 jmmv Exp $
 #
 
 DISTNAME=	nessus-libraries-${VERS}
+WRKSRC=		${WRKDIR}/nessus-libraries
 .include 	"../nessus/Makefile.common"
 
 COMMENT=	Libs required by the Nessus Network security scanner
@@ -12,8 +13,6 @@ LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
 
 BUILD_DEPENDS+=	bison-[0-9]*:../../devel/bison
 
-WRKSRC=		${WRKDIR}/nessus-libraries
-
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV+=	CPP=${CPP}
 CONFIGURE_ARGS+=--enable-zlib=${BUILDLINK_PREFIX.zlib}/lib \
diff --git a/security/nessus-plugins/Makefile b/security/nessus-plugins/Makefile
index a07e495c66e..acdf9cba6f8 100644
--- a/security/nessus-plugins/Makefile
+++ b/security/nessus-plugins/Makefile
@@ -1,15 +1,14 @@
-# $NetBSD: Makefile,v 1.4 2002/10/25 12:32:10 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2003/03/29 12:42:24 jmmv 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/rc5des/Makefile b/security/rc5des/Makefile
index dc19473afb6..5ea9dd57197 100644
--- a/security/rc5des/Makefile
+++ b/security/rc5des/Makefile
@@ -1,9 +1,10 @@
-# $NetBSD: Makefile,v 1.10 2002/04/12 15:17:22 mrauch Exp $
+# $NetBSD: Makefile,v 1.11 2003/03/29 12:42:24 jmmv Exp $
 #
 
 DISTNAME=		rc5-mlg-004
 PKGNAME=		rc5des-0.4
 PKGREVISION=		1
+WRKSRC=			${WRKDIR}/RC5
 CATEGORIES=		security
 MASTER_SITES=		http://www.flame.org/netbsd-rc5/
 
@@ -30,8 +31,6 @@ ONLY_FOR_PLATFORM=	NetBSD-*-alpha NetBSD-*-arm32 NetBSD-*-i386
 CRYPTO=			yes
 NO_CONFIGURE=		yes
 
-WRKSRC=			${WRKDIR}/RC5
-
 # agc - this is commented out until I can test that it works.
 #post-patch:
 #	@(hostname=`/bin/hostname`;					\
diff --git a/security/ruby-digest/Makefile b/security/ruby-digest/Makefile
index 9609eb50d8f..a616ed56ade 100644
--- a/security/ruby-digest/Makefile
+++ b/security/ruby-digest/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.2 2002/01/15 16:43:50 taca Exp $
+# $NetBSD: Makefile,v 1.3 2003/03/29 12:42:24 jmmv Exp $
 #
 
 DISTNAME=	${RUBY_DISTNAME}
 PKGNAME=	${RUBY_PKGNAMEPREFIX}digest-${RUBY_VERSION}
+WRKSRC=		${RUBY_WRKSRC}/ext/digest
 CATEGORIES=	security
 MASTER_SITES=	${MASTER_SITE_RUBY}
 
@@ -13,7 +14,6 @@ COMMENT=	Ruby extension to message digest library
 CONFLICTS=	${RUBY_PKGNAMEPREFIX}md5-[0-9]*
 
 DISTINFO_FILE=	${RUBY_DISTINFO}
-WRKSRC=		${RUBY_WRKSRC}/ext/digest
 
 DIST_SUBDIR=	ruby
 RUBY_REQD=	1.6.6
diff --git a/security/ruby-tcpwrap/Makefile b/security/ruby-tcpwrap/Makefile
index 4543b6d9c6b..bdd006342cd 100644
--- a/security/ruby-tcpwrap/Makefile
+++ b/security/ruby-tcpwrap/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.1.1.1 2001/07/01 13:44:18 taca Exp $
+# $NetBSD: Makefile,v 1.2 2003/03/29 12:42:24 jmmv Exp $
 # FreeBSD: ports/security/ruby-tcpwrap/Makefile,v 1.6 2000/09/26 08:02:10 knu Exp
 
 DISTNAME=	ruby-tcpwrap-0.3
 PKGNAME=	${RUBY_PKGNAMEPREFIX}tcpwrap-0.3
+WRKSRC=		${WRKDIR}/ruby-tcpwrap
 CATEGORIES=	security
 MASTER_SITES=	http://www.shugo.net/archive/ruby-tcpwrap/
 
@@ -19,7 +20,6 @@ DEPENDS+=	tcp_wrappers>=7.6:../../security/tcp_wrapper
 
 DIST_SUBDIR=	ruby
 USE_RUBY_EXTCONF= yes
-WRKSRC=		${WRKDIR}/ruby-tcpwrap
 
 .if ${OPSYS} == "NetBSD"
 CONFIGURE_ARGS+= --with-libwrap-dir="/usr"
diff --git a/security/scanssh/Makefile b/security/scanssh/Makefile
index 809cb4c89d5..0c8e8e868ae 100644
--- a/security/scanssh/Makefile
+++ b/security/scanssh/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.6 2002/09/05 00:13:40 itojun Exp $
+# $NetBSD: Makefile,v 1.7 2003/03/29 12:42:24 jmmv 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 +11,5 @@ HOMEPAGE=	http://monkey.org/~provos/scanssh/
 COMMENT=	ssh remote version scanner
 
 GNU_CONFIGURE=	yes
-WRKSRC=		${WRKDIR}/scanssh
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/security/smimemsg/Makefile b/security/smimemsg/Makefile
index 4d59c3bf9dc..ca2eefce1a1 100644
--- a/security/smimemsg/Makefile
+++ b/security/smimemsg/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.2 2001/08/17 05:58:07 jun Exp $
+# $NetBSD: Makefile,v 1.3 2003/03/29 12:42:25 jmmv Exp $
 #
 
 DISTNAME=	smimemsg141
 PKGNAME=	smimemsg-1.4.1
+WRKSRC=		${WRKDIR}/smimemsg
 CATEGORIES=	security
 MASTER_SITES=	http://mars.elcom.nitech.ac.jp/security/
 
@@ -10,7 +11,6 @@ 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 7243977a8df..8c5628cb6a0 100644
--- a/security/uvscan/Makefile
+++ b/security/uvscan/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.17 2003/03/26 04:05:41 jschauma Exp $
+# $NetBSD: Makefile,v 1.18 2003/03/29 12:42:25 jmmv Exp $
 
 DISTNAME=		vlnx416e
 PKGNAME=		uvscan-4.16.0
 PKGREVISION=		1
+WRKSRC=			${WRKDIR}
 CATEGORIES=		security
 MASTER_SITES=		http://download.nai.com/products/evaluation/virusscan/english/cmdline/linux/version_4.16/
 EXTRACT_SUFX=		.tar.Z
@@ -25,7 +26,6 @@ NO_BIN_ON_CDROM=	${RESTRICTED}
 NO_SRC_ON_FTP=		${RESTRICTED}
 NO_SRC_ON_CDROM=	${RESTRICTED}
 
-WRKSRC=			${WRKDIR}
 DOCDIR=			${PREFIX}/share/doc/uvscan
 DATDIR=			${PREFIX}/share/uvscan
 UVSCANDIR=		${PREFIX}/libexec/uvscan