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

---
 databases/db/Makefile             | 5 ++---
 databases/db3/Makefile            | 5 ++---
 databases/db4/Makefile            | 5 ++---
 databases/gdbm_primitive/Makefile | 4 ++--
 databases/java-db3/Makefile       | 5 ++---
 databases/metakit-lib/Makefile    | 4 ++--
 databases/p5-gdbm/Makefile        | 4 ++--
 databases/phpmyadmin/Makefile     | 4 ++--
 databases/phppgadmin/Makefile     | 4 ++--
 databases/py-ldap/Makefile        | 4 ++--
 databases/py-metakit/Makefile     | 4 ++--
 databases/rdb/Makefile            | 4 ++--
 databases/ruby-gdbm/Makefile      | 4 ++--
 databases/sdbm/Makefile           | 5 ++---
 databases/sqlite/Makefile         | 5 ++---
 databases/tcl-fbsql/Makefile      | 5 ++---
 databases/zope-mysql/Makefile     | 4 ++--
 17 files changed, 34 insertions(+), 41 deletions(-)

(limited to 'databases')

diff --git a/databases/db/Makefile b/databases/db/Makefile
index 55c297fc678..5889da3f628 100644
--- a/databases/db/Makefile
+++ b/databases/db/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.13 2003/01/09 13:11:10 schmonz Exp $
+# $NetBSD: Makefile,v 1.14 2003/03/29 12:40:25 jmmv Exp $
 
 DISTNAME=	db-2.7.7
 PKGREVISION=	1
+WRKSRC=		${WRKDIR}/${DISTNAME}/build_unix
 CATEGORIES=	databases
 MASTER_SITES=	http://www.sleepycat.com/update/snapshot/ \
 		ftp://ftp.cdrom.com/pub/perl/CPAN/src/misc/ \
@@ -11,8 +12,6 @@ MAINTAINER=	tron@netbsd.org
 HOMEPAGE=	http://www.sleepycat.com/
 COMMENT=	Sleepycat Software's Berkeley DB version 2
 
-WRKSRC=		${WRKDIR}/${DISTNAME}/build_unix
-
 NO_PKGTOOLS_REQD_CHECK=	# defined (needed for pkgtools/pkg_install)
 
 USE_BUILDLINK2=		yes
diff --git a/databases/db3/Makefile b/databases/db3/Makefile
index 858f4b4906a..90916feb527 100644
--- a/databases/db3/Makefile
+++ b/databases/db3/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.14 2002/08/28 16:10:28 jlam Exp $
+# $NetBSD: Makefile,v 1.15 2003/03/29 12:40:25 jmmv Exp $
 
 DISTNAME=	db-3.3.11
 PKGNAME=	db3-3.11.2
+WRKSRC=		${WRKDIR}/${DISTNAME}/build_unix
 CATEGORIES=	databases
 MASTER_SITES=	http://www.sleepycat.com/update/snapshot/
 
@@ -24,8 +25,6 @@ CONFIGURE_ARGS+=	--includedir=${PREFIX}/include/db3
 CONFIGURE_ARGS+=	--enable-cxx
 CONFIGURE_ARGS+=	--enable-shared
 
-WRKSRC=			${WRKDIR}/${DISTNAME}/build_unix
-
 post-install:
 	${CHOWN} -R ${BINOWN}:${BINGRP} ${PREFIX}/share/doc/db3
 
diff --git a/databases/db4/Makefile b/databases/db4/Makefile
index 05422798ebc..c4b2d5f571c 100644
--- a/databases/db4/Makefile
+++ b/databases/db4/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.4 2002/12/31 15:44:28 jlam Exp $
+# $NetBSD: Makefile,v 1.5 2003/03/29 12:40:25 jmmv Exp $
 
 DISTNAME=	db-4.0.14
 PKGNAME=	db4-4.0.14
+WRKSRC=		${WRKDIR}/${DISTNAME}/build_unix
 CATEGORIES=	databases
 MASTER_SITES=	http://www.sleepycat.com/update/snapshot/
 
@@ -27,8 +28,6 @@ CONFIGURE_ARGS+=	--enable-java
 .  include "../../mk/java-vm.mk"
 .endif
 
-WRKSRC=			${WRKDIR}/${DISTNAME}/build_unix
-
 post-install:
 	${CHOWN} -R ${BINOWN}:${BINGRP} ${PREFIX}/share/doc/db4
 
diff --git a/databases/gdbm_primitive/Makefile b/databases/gdbm_primitive/Makefile
index b25fddf00a7..0eb8fb0f5d2 100644
--- a/databases/gdbm_primitive/Makefile
+++ b/databases/gdbm_primitive/Makefile
@@ -1,9 +1,10 @@
-# $NetBSD: Makefile,v 1.5 2002/12/18 19:41:16 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2003/03/29 12:40:25 jmmv Exp $
 #
 
 DISTNAME=	gdbm-prim-1.15
 PKGNAME=	${DISTNAME:S/-prim/_primitive/}
 PKGREVISION=	1
+WRKSRC=		${WRKDIR}/${PKGNAME_NOREV}
 CATEGORIES=	databases
 MASTER_SITES=	http://homepage.mac.com/leffert/.cv/leffert/Public/
 EXTRACT_SUFX=	.tar.gz-link.gz
@@ -13,7 +14,6 @@ HOMEPAGE=	http://homepage.mac.com/leffert/FileSharing.html
 COMMENT=	Shell primitives for working with GDBMs
 
 EXTRACT_CMD=		${_DFLT_EXTRACT_CMD}
-WRKSRC=			${WRKDIR}/${PKGNAME_NOREV}
 USE_BUILDLINK2=		YES
 
 .include "../../databases/gdbm/buildlink2.mk"
diff --git a/databases/java-db3/Makefile b/databases/java-db3/Makefile
index dddfce17bcc..0e1d4d497fa 100644
--- a/databases/java-db3/Makefile
+++ b/databases/java-db3/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.8 2002/12/26 20:52:10 jlam Exp $
+# $NetBSD: Makefile,v 1.9 2003/03/29 12:40:25 jmmv Exp $
 
 DISTNAME=	db-3.3.11
 PKGNAME=	java-db3-3.11.2
+WRKSRC=		${WRKDIR}/${DISTNAME}/build_unix
 CATEGORIES=	databases
 MASTER_SITES=	http://www.sleepycat.com/update/3.3.11/
 
@@ -39,8 +40,6 @@ CPPFLAGS+=		${BUILDLINK_CPPFLAGS.${PKG_JVM}}
 ALL_TARGET=		libdb3_java.la java
 INSTALL_TARGET=		install_java
 
-WRKSRC=			${WRKDIR}/${DISTNAME}/build_unix
-
 .include "../../databases/db3/buildlink2.mk"
 .include "../../mk/java-vm.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/databases/metakit-lib/Makefile b/databases/metakit-lib/Makefile
index 93e68d5197e..d22de2a3fb4 100644
--- a/databases/metakit-lib/Makefile
+++ b/databases/metakit-lib/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.1.1.1 2002/12/04 18:47:15 drochner Exp $
+# $NetBSD: Makefile,v 1.2 2003/03/29 12:40:26 jmmv Exp $
 #
 
 DISTNAME=	metakit-2.4.8-38
 PKGNAME=	metakit-lib-2.4.8
+WRKSRC=		${WRKDIR}/metakit-2.4.8/builds
 CATEGORIES=	databases
 MASTER_SITES=	http://www.equi4.com/pub/mk/
 
@@ -10,7 +11,6 @@ MAINTAINER=	packages@netbsd.org
 HOMEPAGE=	http://www.equi4.com/metakit/
 COMMENT=	embedded database library
 
-WRKSRC=		${WRKDIR}/metakit-2.4.8/builds
 GNU_CONFIGURE=	yes
 CONFIGURE_SCRIPT= ../unix/configure
 CONFIGURE_ARGS+=	--with-tcl=
diff --git a/databases/p5-gdbm/Makefile b/databases/p5-gdbm/Makefile
index 2f68b62e1d4..7b26e65e8fb 100644
--- a/databases/p5-gdbm/Makefile
+++ b/databases/p5-gdbm/Makefile
@@ -1,10 +1,11 @@
-# $NetBSD: Makefile,v 1.15 2002/11/01 16:34:36 wiz Exp $
+# $NetBSD: Makefile,v 1.16 2003/03/29 12:40:26 jmmv Exp $
 
 .include "../../lang/perl5/Makefile.common"
 
 PKGNAME=		p5-gdbm-1.05
 PKGREVISION=		1
 SVR4_PKGNAME=		p5gdm
+WRKSRC=			${WRKDIR}/${EXTRACT_ELEMENTS}
 CATEGORIES+=		perl5
 
 MAINTAINER=		packages@netbsd.org
@@ -14,7 +15,6 @@ USE_BUILDLINK2=		YES
 PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/GDBM_File/.packlist
 
 EXTRACT_ELEMENTS=	${DISTNAME}/ext/GDBM_File
-WRKSRC=			${WRKDIR}/${EXTRACT_ELEMENTS}
 
 .include "../../databases/gdbm/buildlink2.mk"
 .include "../../lang/perl5/module.mk"
diff --git a/databases/phpmyadmin/Makefile b/databases/phpmyadmin/Makefile
index 97770113eec..ad84f26e435 100644
--- a/databases/phpmyadmin/Makefile
+++ b/databases/phpmyadmin/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.9 2003/01/12 14:04:57 tron Exp $
+# $NetBSD: Makefile,v 1.10 2003/03/29 12:40:26 jmmv Exp $
 
 DISTNAME=	phpMyAdmin-${DIST_VERSION}-php
 PKGNAME=	phpmyadmin-2.3.3.1
 PKGREVISION=	1
+WRKSRC=		${WRKDIR}/${DISTNAME:S/-php//}
 CATEGORIES=	databases www
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=phpmyadmin/}
 EXTRACT_SUFX=	.tar.bz2
@@ -18,7 +19,6 @@ PLIST_SUBST+=	CP="${CP}" DIST_VERSION=${DIST_VERSION} \
 		PMCONFFILE=${PMCONFFILE} TEST="${TEST}"
 MESSAGE_SUBST+=	PKG_SYSCONFDIR=${PKG_SYSCONFDIR} PMCONFFILE=${PMCONFFILE} \
 		PMDIR=${PMDIR} EXDIR=${EXDIR}
-WRKSRC=		${WRKDIR}/${DISTNAME:S/-php//}
 
 CONF_INC_PHP=	${PREFIX}/share/phpmyadmin/config.inc.php
 DIST_VERSION=	2.3.3pl1
diff --git a/databases/phppgadmin/Makefile b/databases/phppgadmin/Makefile
index 3d9e500d5c4..d71e0542110 100644
--- a/databases/phppgadmin/Makefile
+++ b/databases/phppgadmin/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.1.1.1 2002/07/23 12:13:35 agc Exp $
+# $NetBSD: Makefile,v 1.2 2003/03/29 12:40:26 jmmv Exp $
 
 DISTNAME=	phpPgAdmin_2-4-2
 PKGNAME=	phppgadmin-2.4.2
+WRKSRC=		${WRKDIR}/${DISTNAME:S/_2-4-2//}
 CATEGORIES=	databases www
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=phppgadmin/}
 EXTRACT_SUFX=	.tar.bz2
@@ -14,7 +15,6 @@ DEPENDS+=	php-pgsql>=4.1.2:../../databases/php4-pgsql
 DEPENDS+=	php-pcre>=4.1.2:../../devel/php4-pcre
 
 NO_BUILD=	YES
-WRKSRC=		${WRKDIR}/${DISTNAME:S/_2-4-2//}
 
 DOC_FILES=	BUGS ChangeLog Documentation.html \
 		INSTALL README TODO
diff --git a/databases/py-ldap/Makefile b/databases/py-ldap/Makefile
index a61517bb031..de9653858cd 100644
--- a/databases/py-ldap/Makefile
+++ b/databases/py-ldap/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.10 2003/01/04 18:16:22 cjep Exp $
+# $NetBSD: Makefile,v 1.11 2003/03/29 12:40:26 jmmv Exp $
 
 DISTNAME=	python-ldap-1.10alpha3-src
 PKGNAME=	${PYPKGPREFIX}-ldap-1.10a3
+WRKSRC=		${WRKDIR}/python-ldap-1.10alpha3
 CATEGORIES=	databases
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=python-ldap/}
 
@@ -9,7 +10,6 @@ MAINTAINER=	tsarna@netbsd.org
 HOMEPAGE=	http://sourceforge.net/projects/python-ldap/
 COMMENT=	LDAP client API for Python
 
-WRKSRC=		${WRKDIR}/python-ldap-1.10alpha3
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=--with-ldap=${LOCALBASE}
 CONFIGURE_ARGS+=--with-python=${PYTHONBIN}
diff --git a/databases/py-metakit/Makefile b/databases/py-metakit/Makefile
index 014b09022f6..6a422580d59 100644
--- a/databases/py-metakit/Makefile
+++ b/databases/py-metakit/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.1.1.1 2002/12/04 18:48:09 drochner Exp $
+# $NetBSD: Makefile,v 1.2 2003/03/29 12:40:27 jmmv Exp $
 #
 
 DISTNAME=	metakit-2.4.8-38
 PKGNAME=	${PYPKGPREFIX}-metakit-2.4.8
+WRKSRC=		${WRKDIR}/metakit-2.4.8/builds
 CATEGORIES=	databases
 MASTER_SITES=	http://www.equi4.com/pub/mk/
 
@@ -10,7 +11,6 @@ MAINTAINER=	packages@netbsd.org
 HOMEPAGE=	http://www.equi4.com/metakit/
 COMMENT=	embedded database library
 
-WRKSRC=		${WRKDIR}/metakit-2.4.8/builds
 GNU_CONFIGURE=	yes
 CONFIGURE_SCRIPT= ../unix/configure
 CONFIGURE_ARGS+=	--with-tcl= --enable-python
diff --git a/databases/rdb/Makefile b/databases/rdb/Makefile
index d0cbca2fcab..7dd17e8564e 100644
--- a/databases/rdb/Makefile
+++ b/databases/rdb/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.3 2002/11/15 00:39:53 jlam Exp $
+# $NetBSD: Makefile,v 1.4 2003/03/29 12:40:27 jmmv Exp $
 
 DISTNAME=	RDB-2.6d
 PKGNAME=	rdb-2.6.4
+WRKSRC=		${WRKDIR}/rdb
 CATEGORIES=	databases
 MASTER_SITES=	ftp://ftp.rand.org/pub/RDB-hobbs/
 
@@ -9,7 +10,6 @@ MAINTAINER=	njohnston@globaltetrahedron.com
 HOMEPAGE=	ftp://ftp.rand.org/pub/RDB-hobbs/
 COMMENT=	relational database system that uses standard filters via pipes
 
-WRKSRC=		${WRKDIR}/rdb
 NO_BUILD=	yes
 USE_BUILDLINK2=	yes
 
diff --git a/databases/ruby-gdbm/Makefile b/databases/ruby-gdbm/Makefile
index 940e3790849..4c887ce8403 100644
--- a/databases/ruby-gdbm/Makefile
+++ b/databases/ruby-gdbm/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.3 2003/03/24 14:56:00 taca Exp $
+# $NetBSD: Makefile,v 1.4 2003/03/29 12:40:27 jmmv Exp $
 #
 
 DISTNAME=	${RUBY_DISTNAME}
 PKGNAME=	${RUBY_PKGNAMEPREFIX}gdbm-${RUBY_VERSION}
+WRKSRC=		${RUBY_WRKSRC}/ext/gdbm
 CATEGORIES=	databases
 MASTER_SITES=	${MASTER_SITE_RUBY}
 
@@ -14,7 +15,6 @@ DEPENDS+=	gdbm>=1.8.3:../../databases/gdbm
 
 DIST_SUBDIR=	ruby
 DISTINFO_FILE=	${RUBY_DISTINFO}
-WRKSRC=		${RUBY_WRKSRC}/ext/gdbm
 EXTRACT_ELEMENTS= ${RUBY_DISTNAME}/ext/gdbm
 USE_RUBY_EXTCONF= yes
 
diff --git a/databases/sdbm/Makefile b/databases/sdbm/Makefile
index 542a60e62e3..87eb43e3d23 100644
--- a/databases/sdbm/Makefile
+++ b/databases/sdbm/Makefile
@@ -1,10 +1,11 @@
-# $NetBSD: Makefile,v 1.5 2001/09/09 20:36:18 agc Exp $
+# $NetBSD: Makefile,v 1.6 2003/03/29 12:40:27 jmmv Exp $
 #
 
 DISTNAME=		sdbm
 # this is the Dec. 1990 release with some race condition fixes from an
 # unknown outside source:
 PKGNAME=		sdbm-90.12.1
+WRKSRC=			${WRKDIR}
 CATEGORIES=		databases
 MASTER_SITES=		ftp://tsx-11.mit.edu/pub/linux/sources/libs/
 EXTRACT_SUFX=		.tar.Z
@@ -14,8 +15,6 @@ COMMENT=		Substitute DBM, an implementation of the `real' ndbm library
 
 MAKE_ENV+=		LIBDIR=${PREFIX}/lib NOLINT=1
 
-WRKSRC=			${WRKDIR}
-
 post-extract:
 	@cd ${WRKDIR} && ${SH} sdbm.shar >/dev/null
 
diff --git a/databases/sqlite/Makefile b/databases/sqlite/Makefile
index 4c0c0884293..ac8104eea18 100644
--- a/databases/sqlite/Makefile
+++ b/databases/sqlite/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.14 2003/02/17 16:23:08 taca Exp $
+# $NetBSD: Makefile,v 1.15 2003/03/29 12:40:28 jmmv Exp $
 
 DISTNAME=		sqlite-2.8.0
+WRKSRC=			${WRKDIR}/sqlite-build
 CATEGORIES=		databases
 MASTER_SITES=		http://www.hwaci.com/sw/sqlite/ \
 			http://www.sqlite.org/
@@ -9,8 +10,6 @@ MAINTAINER=		jlam@netbsd.org
 HOMEPAGE=		http://www.hwaci.com/sw/sqlite/
 COMMENT=		SQL Database Engine In A C Library
 
-WRKSRC=			${WRKDIR}/sqlite-build
-
 USE_BUILDLINK2=		YES
 USE_LIBTOOL=		YES
 LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
diff --git a/databases/tcl-fbsql/Makefile b/databases/tcl-fbsql/Makefile
index 338c7a3ab7e..c5047afbdfb 100644
--- a/databases/tcl-fbsql/Makefile
+++ b/databases/tcl-fbsql/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.1.1.1 2003/03/07 16:17:49 bouyer Exp $
+# $NetBSD: Makefile,v 1.2 2003/03/29 12:40:28 jmmv Exp $
 
 DISTNAME=		fbsql.c
 PKGNAME=		tcl-fbsql-1.05
+WRKSRC=			${WRKDIR}/src
 CATEGORIES=		database
 MASTER_SITES=		http://www.fastbase.co.nz/fbsql/
 EXTRACT_SUFX=
@@ -13,8 +14,6 @@ COMMENT=		Tcl interface to MySQL
 USE_BUILDLINK2=		YES
 USE_LIBTOOL=		YES
 
-WRKSRC=			${WRKDIR}/src
-
 do-extract:
 	${MKDIR} ${WRKSRC}
 	${CP} ${FILESDIR}/Makefile ${WRKSRC}/
diff --git a/databases/zope-mysql/Makefile b/databases/zope-mysql/Makefile
index 39ae13ac0ca..afc916ed873 100644
--- a/databases/zope-mysql/Makefile
+++ b/databases/zope-mysql/Makefile
@@ -1,9 +1,10 @@
-# $NetBSD: Makefile,v 1.15 2002/10/10 12:31:08 wiz Exp $
+# $NetBSD: Makefile,v 1.16 2003/03/29 12:40:28 jmmv Exp $
 #
 
 DISTNAME=	ZMySQLDA-1.1.3-nonbin
 PKGNAME=	zope-mysql-1.1.3
 PKGREVISION=	2
+WRKSRC=		${WRKDIR}/lib
 CATEGORIES=	databases www
 MASTER_SITES=   http://www.zope.org/Members/MikeP/ZMySQLDA/
 
@@ -15,7 +16,6 @@ DEPENDS+=	zope-2.*:../../www/zope
 
 USE_BUILDLINK2=	YES
 
-WRKSRC=		${WRKDIR}/lib
 PLIST_SRC=	${WRKDIR}/.PLIST_SRC
 
 ZOPEDIR=	${PREFIX}/lib/zope
-- 
cgit v1.2.3