summaryrefslogtreecommitdiff
path: root/www
diff options
context:
space:
mode:
authoragc <agc@pkgsrc.org>2004-01-20 12:18:15 +0000
committeragc <agc@pkgsrc.org>2004-01-20 12:18:15 +0000
commit61769bf56e2f71617516434864edec5b0165f3d4 (patch)
tree7e51ed5182afc31c5b55e269ef05eb2f01cb97f2 /www
parent3a111113dcf15a2b040e07ba3513ace1fed6fea6 (diff)
downloadpkgsrc-61769bf56e2f71617516434864edec5b0165f3d4.tar.gz
Move WRKSRC definition away from the first paragraph in a Makefile.
Diffstat (limited to 'www')
-rw-r--r--www/Mosaic/Makefile4
-rw-r--r--www/MozillaFirebird-bin-acroread/Makefile.common4
-rw-r--r--www/MozillaFirebird-bin-java/Makefile4
-rw-r--r--www/MozillaFirebird-bin-realplayer/Makefile4
-rw-r--r--www/adzap/Makefile4
-rw-r--r--www/amaya/Makefile4
-rw-r--r--www/analog/Makefile4
-rw-r--r--www/ap-auth-cookie/Makefile4
-rw-r--r--www/ap-bandwidth/Makefile4
-rw-r--r--www/ap-dtcl/Makefile4
-rw-r--r--www/ap-iasp/Makefile4
-rw-r--r--www/ap-jk/Makefile4
-rw-r--r--www/ap-throttle/Makefile4
-rw-r--r--www/ap-xslt/Makefile4
-rw-r--r--www/ap2-auth-mysql/Makefile4
-rw-r--r--www/arena/Makefile4
-rw-r--r--www/asWedit/Makefile4
-rw-r--r--www/cocoon/Makefile5
-rw-r--r--www/hiawatha/Makefile4
-rw-r--r--www/htmldoc/Makefile.common4
-rw-r--r--www/htmllint/Makefile4
-rw-r--r--www/iasp/Makefile4
-rw-r--r--www/jakarta-servletapi/Makefile4
-rw-r--r--www/jakarta-tomcat/Makefile4
-rw-r--r--www/jsdk20/Makefile4
-rw-r--r--www/jssi/Makefile5
-rw-r--r--www/lhs/Makefile4
-rw-r--r--www/lynx-current/Makefile4
-rw-r--r--www/lynx/Makefile4
-rw-r--r--www/mMosaic/Makefile4
-rw-r--r--www/micro_httpd/Makefile4
-rw-r--r--www/moz-bin-plugger/Makefile4
-rw-r--r--www/mozilla-bin/Makefile.common4
-rw-r--r--www/mozilla/Makefile.common4
-rw-r--r--www/navigator3/Makefile4
-rw-r--r--www/netscape7/Makefile4
-rw-r--r--www/ns-plugger-common/Makefile4
-rw-r--r--www/p5-Apache-ePerl/Makefile4
-rw-r--r--www/php-FastTemplate/Makefile4
-rw-r--r--www/php4-apc/Makefile4
-rw-r--r--www/privoxy/Makefile4
-rw-r--r--www/py-pcgi/Makefile4
-rw-r--r--www/py-zpublisher/Makefile4
-rw-r--r--www/quanta-docs/Makefile4
-rw-r--r--www/quanta/Makefile4
-rw-r--r--www/ruby-htmlsplit/Makefile4
-rw-r--r--www/ruby-tag/Makefile4
-rw-r--r--www/ruby-webunit/Makefile4
-rw-r--r--www/spfc/Makefile4
-rw-r--r--www/squid/Makefile4
-rw-r--r--www/swill/Makefile4
-rw-r--r--www/swish-e/Makefile5
-rw-r--r--www/tcl-cgi/Makefile4
-rw-r--r--www/tidy/Makefile4
-rw-r--r--www/w3c-httpd/Makefile5
-rw-r--r--www/w3m/Makefile.common4
-rw-r--r--www/wdg-validate/Makefile4
-rw-r--r--www/webalizer/Makefile4
-rw-r--r--www/zope-confera/Makefile4
-rw-r--r--www/zope25-CMF/Makefile4
-rw-r--r--www/zope25-CMFPlone/Makefile5
-rw-r--r--www/zope25-ZPsycopgDA/Makefile4
62 files changed, 129 insertions, 124 deletions
diff --git a/www/Mosaic/Makefile b/www/Mosaic/Makefile
index b54ac38c05d..6ca8993172c 100644
--- a/www/Mosaic/Makefile
+++ b/www/Mosaic/Makefile
@@ -1,11 +1,10 @@
-# $NetBSD: Makefile,v 1.38 2003/07/17 22:55:19 grant Exp $
+# $NetBSD: Makefile,v 1.39 2004/01/20 12:27:57 agc Exp $
# FreeBSD Id: Makefile,v 1.15 1998/05/27 08:44:56 dburr Exp
#
DISTNAME= Mosaic-src-2.7b5
PKGNAME= mosaic-2.7b5
PKGREVISION= 1
-WRKSRC= ${WRKDIR}/Mosaic-src
CATEGORIES= www
MASTER_SITES= ftp://ftp.ncsa.uiuc.edu/Web/Mosaic/Unix/source/
@@ -17,6 +16,7 @@ LICENSE= mosaic-license
NOT_FOR_PLATFORM= *-*-alpha #LP64 problems
+WRKSRC= ${WRKDIR}/Mosaic-src
USE_BUILDLINK2= YES
USE_X11BASE= YES
USE_MOTIF12= YES
diff --git a/www/MozillaFirebird-bin-acroread/Makefile.common b/www/MozillaFirebird-bin-acroread/Makefile.common
index 20c3e6ef34e..977b8499b77 100644
--- a/www/MozillaFirebird-bin-acroread/Makefile.common
+++ b/www/MozillaFirebird-bin-acroread/Makefile.common
@@ -1,6 +1,5 @@
-# $NetBSD: Makefile.common,v 1.1 2003/09/27 14:13:08 grant Exp $
+# $NetBSD: Makefile.common,v 1.2 2004/01/20 12:27:57 agc Exp $
-WRKSRC= ${WRKDIR}
CATEGORIES= www print
MASTER_SITES= # empty
DISTFILES= # empty
@@ -10,6 +9,7 @@ DEPENDS+= MozillaFirebird-bin>=0.6.1:../../www/MozillaFirebird-bin
ONLY_FOR_PLATFORM= NetBSD-*-i386
PLATFORM= intellinux
+WRKSRC= ${WRKDIR}
NO_CHECKSUM= YES
NO_CONFIGURE= YES
NO_BUILD= YES
diff --git a/www/MozillaFirebird-bin-java/Makefile b/www/MozillaFirebird-bin-java/Makefile
index eb98115643f..2e16b4c701e 100644
--- a/www/MozillaFirebird-bin-java/Makefile
+++ b/www/MozillaFirebird-bin-java/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.1 2003/09/27 14:13:08 grant Exp $
+# $NetBSD: Makefile,v 1.2 2004/01/20 12:27:57 agc Exp $
DISTNAME= MozillaFirebird-bin-java-1.0
-WRKSRC= ${WRKDIR}
CATEGORIES= www lang
MASTER_SITES= # empty
DISTFILES= # empty
@@ -14,6 +13,7 @@ DEPENDS+= MozillaFirebird-bin>=0.6.1:../../www/MozillaFirebird-bin
ONLY_FOR_PLATFORM= NetBSD-1.[6-9]*-i386
+WRKSRC= ${WRKDIR}
NO_CHECKSUM= YES
NO_BUILDLINK= YES
NO_EXTRACT= YES
diff --git a/www/MozillaFirebird-bin-realplayer/Makefile b/www/MozillaFirebird-bin-realplayer/Makefile
index b000c111a28..b53613d0302 100644
--- a/www/MozillaFirebird-bin-realplayer/Makefile
+++ b/www/MozillaFirebird-bin-realplayer/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.3 2003/10/29 22:24:09 xtraeme Exp $
+# $NetBSD: Makefile,v 1.4 2004/01/20 12:27:57 agc Exp $
DISTNAME= MozillaFirebird-bin-realplayer-1.0
-WRKSRC= ${WRKDIR}
PKGREVISION= 1
CATEGORIES= www audio graphics
MASTER_SITES= # empty
@@ -18,6 +17,7 @@ CONFLICTS+= phoenix-bin-realplayer-[0-9]*
ONLY_FOR_PLATFORM= NetBSD-*-i386
+WRKSRC= ${WRKDIR}
NO_CHECKSUM= YES
NO_CONFIGURE= YES
NO_BUILD= YES
diff --git a/www/adzap/Makefile b/www/adzap/Makefile
index 317b863d41e..1494ce6bd80 100644
--- a/www/adzap/Makefile
+++ b/www/adzap/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.41 2003/12/24 07:24:22 simonb Exp $
+# $NetBSD: Makefile,v 1.42 2004/01/20 12:27:57 agc Exp $
#
DISTNAME= adzap-20031105
-WRKSRC= ${WRKDIR}/adzap
CATEGORIES= www perl5
# XXX: should use the following one day:
#MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=adzapper/}
@@ -12,6 +11,7 @@ MAINTAINER= tech-pkg@NetBSD.org
HOMEPAGE= http://adzapper.sourceforge.net/
COMMENT= Filter out animated ad banners from web pages
+WRKSRC= ${WRKDIR}/adzap
NO_BUILD= # defined
USE_PERL5= # defined
diff --git a/www/amaya/Makefile b/www/amaya/Makefile
index 98dc275e1fe..a7f1410f586 100644
--- a/www/amaya/Makefile
+++ b/www/amaya/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.30 2004/01/03 18:49:55 reed Exp $
+# $NetBSD: Makefile,v 1.31 2004/01/20 12:27:57 agc Exp $
#
DISTNAME= amaya-src-8.2
PKGNAME= ${DISTNAME:S/-src//}
PKGREVISION= 1
-WRKSRC= ${WRKDIR}/Amaya/work
CATEGORIES= www
MASTER_SITES= http://www.w3.org/Amaya/Distribution/ \
ftp://ftp.w3.org/pub/amaya/ \
@@ -17,6 +16,7 @@ COMMENT= Web browser/editor from the World Wide Web Consortium (W3C)
EXTRACT_ELEMENTS= Amaya libwww
+WRKSRC= ${WRKDIR}/Amaya/work
USE_BUILDLINK2= YES
USE_X11= YES
USE_GMAKE= YES
diff --git a/www/analog/Makefile b/www/analog/Makefile
index 8e34495193a..7ecc9050288 100644
--- a/www/analog/Makefile
+++ b/www/analog/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.41 2003/07/17 22:55:20 grant Exp $
+# $NetBSD: Makefile,v 1.42 2004/01/20 12:27:57 agc Exp $
DISTNAME= analog-5.32
-WRKSRC= ${WRKDISTDIR}/src
CATEGORIES= www
MASTER_SITES= ${HOMEPAGE} \
http://www.web42.com/analog/ \
@@ -12,6 +11,7 @@ MAINTAINER= tron@NetBSD.org
HOMEPAGE= http://www.analog.cx/
COMMENT= Extremely fast program for analysing WWW logfiles
+WRKSRC= ${WRKDISTDIR}/src
ALL_TARGET= analog
MAKE_ENV+= PREFIX=${PREFIX} SYSCONFDIR=${PKG_SYSCONFDIR}
WRKDISTDIR= ${WRKDIR}/${DISTNAME}
diff --git a/www/ap-auth-cookie/Makefile b/www/ap-auth-cookie/Makefile
index 717acbd59fe..19564baa226 100644
--- a/www/ap-auth-cookie/Makefile
+++ b/www/ap-auth-cookie/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.30 2003/07/17 22:55:22 grant Exp $
+# $NetBSD: Makefile,v 1.31 2004/01/20 12:27:58 agc Exp $
#
# There are a few more mod_auth_cookie's out there doing slightly
# different things. This one pkg would be a good place to dump them all in
@@ -6,7 +6,6 @@
DISTNAME= mod_auth_cookie.c
PKGNAME= ap-auth-cookie-1.9
-WRKSRC= ${WRKDIR}
CATEGORIES= www
MASTER_SITES= ftp://ftp.kciLink.com/pub/
EXTRACT_SUFX= .gz
@@ -15,6 +14,7 @@ MAINTAINER= tech-pkg@NetBSD.org
HOMEPAGE= ftp://ftp.kciLink.com/pub/mod_auth_cookie.txt
COMMENT= Cookie-based authentication for Apache
+WRKSRC= ${WRKDIR}
USE_BUILDLINK2= YES
EXTRACT_CMD= ${DO_NADA}
diff --git a/www/ap-bandwidth/Makefile b/www/ap-bandwidth/Makefile
index 73e253f52c8..46708dc2e4b 100644
--- a/www/ap-bandwidth/Makefile
+++ b/www/ap-bandwidth/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.4 2003/07/17 22:55:23 grant Exp $
+# $NetBSD: Makefile,v 1.5 2004/01/20 12:27:58 agc Exp $
#
DISTNAME= mod_bandwidth.c
PKGNAME= ap-bandwidth-2.0.5
-WRKSRC= ${WRKDIR}
CATEGORIES= www
MASTER_SITES= ftp://ftp.cohprog.com/pub/apache/module/
EXTRACT_SUFX= # empty
@@ -12,6 +11,7 @@ MAINTAINER= tech-pkg@NetBSD.org
HOMEPAGE= http://cohprog.com/v3/bandwidth/intro-en.html
COMMENT= Apache module for bandwidth management
+WRKSRC= ${WRKDIR}
USE_BUILDLINK2= YES
APACHE_MODULE_NAME= mod_bandwidth.so
diff --git a/www/ap-dtcl/Makefile b/www/ap-dtcl/Makefile
index dab6a5f24e3..40dbb41f304 100644
--- a/www/ap-dtcl/Makefile
+++ b/www/ap-dtcl/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.18 2003/07/17 22:55:24 grant Exp $
+# $NetBSD: Makefile,v 1.19 2004/01/20 12:27:58 agc Exp $
DISTNAME= mod_dtcl-0.11.6
PKGNAME= ap-dtcl-0.11.2
-WRKSRC= ${WRKDIR}/mod_dtcl
CATEGORIES= www
MASTER_SITES= http://tcl.apache.org/mod_dtcl/download/
@@ -13,6 +12,7 @@ COMMENT= Simple, fast Tcl server side scripting for apache
DEPENDS+= apache{,6}-1.3.*:../../www/apache
DEPENDS+= tcl>=8.3.2nb2:../../lang/tcl
+WRKSRC= ${WRKDIR}/mod_dtcl
TCLSH= ${LOCALBASE}/bin/tclsh
CPPFLAGS+= -I${PREFIX}/include/httpd -DEAPI
diff --git a/www/ap-iasp/Makefile b/www/ap-iasp/Makefile
index 0f0842a378b..05d18587542 100644
--- a/www/ap-iasp/Makefile
+++ b/www/ap-iasp/Makefile
@@ -1,15 +1,15 @@
-# $NetBSD: Makefile,v 1.2 2003/03/29 12:42:47 jmmv Exp $
+# $NetBSD: Makefile,v 1.3 2004/01/20 12:27:58 agc Exp $
.include "../iasp/Makefile.common"
PKGNAME= ap-iasp-${IASP_VERSION}
-WRKSRC= ${WRKDIR}/${IASP_SRCDIR}
COMMENT= Apache connector for accessing a iASP proxy server
DEPENDS+= {iasp-${IASP_VERSION},iasp-${IASP_VERSION}nb*}:../../www/iasp
IASP_SRCDIR= ${IASP_DIR}/bin/apache/source/1.3
+WRKSRC= ${WRKDIR}/${IASP_SRCDIR}
USE_BUILDLINK2= # defined
APACHE_MODULE= # defined
MESSAGE_SUBST+= IASP_DESTDIR=${IASP_DESTDIR}
diff --git a/www/ap-jk/Makefile b/www/ap-jk/Makefile
index 65bc985bb9f..e48f6f6c778 100644
--- a/www/ap-jk/Makefile
+++ b/www/ap-jk/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.20 2004/01/12 09:46:04 cjep Exp $
+# $NetBSD: Makefile,v 1.21 2004/01/20 12:27:58 agc Exp $
DISTNAME= jakarta-tomcat-${TOMCAT_VERSION}-src
PKGNAME= ap-jk-${TOMCAT_VERSION}
TOMCAT_VERSION= 3.2.4
-WRKSRC= ${WRKDIR}/${DISTNAME}/src/native/apache1.3
CATEGORIES= www java
MASTER_SITES= http://jakarta.apache.org/builds/tomcat/release/v${TOMCAT_VERSION}/src/
@@ -17,6 +16,7 @@ COMMENT= Apache connector for accessing Jakarta Tomcat or Apache JServ
BUILD_DEPENDS+= gtar-base:../../archivers/gtar-base
GTAR= ${LOCALBASE}/bin/gtar
+WRKSRC= ${WRKDIR}/${DISTNAME}/src/native/apache1.3
USE_BUILDLINK2= # defined
EXTRACT_ELEMENTS= ${DISTNAME}/src/native
diff --git a/www/ap-throttle/Makefile b/www/ap-throttle/Makefile
index 7a150a84bfd..9445528a62f 100644
--- a/www/ap-throttle/Makefile
+++ b/www/ap-throttle/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.7 2003/06/10 20:37:56 wiz Exp $
+# $NetBSD: Makefile,v 1.8 2004/01/20 12:27:58 agc Exp $
DISTNAME= mod_throttle312
PKGNAME= ap-throttle-3.1.2
PKGREVISION= 1
-WRKSRC= ${WRKDIR}/${PKGNAME_NOREV:S/ap-/mod_/}
CATEGORIES= www
MASTER_SITES= http://www.snert.com/Software/mod_throttle/
EXTRACT_SUFX= .tgz
@@ -12,6 +11,7 @@ MAINTAINER= eric@cirr.com
HOMEPAGE= ${MASTER_SITES}
COMMENT= Apache module for limiting bandwidth usage
+WRKSRC= ${WRKDIR}/${PKGNAME_NOREV:S/ap-/mod_/}
USE_BUILDLINK2= YES
APACHE_MODULE_NAME= mod_throttle.so
diff --git a/www/ap-xslt/Makefile b/www/ap-xslt/Makefile
index c8b61480dd4..47df2b5802f 100644
--- a/www/ap-xslt/Makefile
+++ b/www/ap-xslt/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.23 2003/08/29 15:50:07 xtraeme Exp $
+# $NetBSD: Makefile,v 1.24 2004/01/20 12:27:58 agc Exp $
DISTNAME= modxslt-1.1
PKGNAME= ap-xslt-1.1
PKGREVISION= 7
-WRKSRC= ${WRKDIR}/modxslt
CATEGORIES= www
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=modxslt/}
@@ -11,6 +10,7 @@ MAINTAINER= jwise@NetBSD.org
HOMEPAGE= http://modxslt.sourceforge.net/
COMMENT= Simple, fast XSLT transformations for apache
+WRKSRC= ${WRKDIR}/modxslt
USE_BUILDLINK2= YES
APACHE_MODULE_NAME= mod_xslt.so
diff --git a/www/ap2-auth-mysql/Makefile b/www/ap2-auth-mysql/Makefile
index d2520c4f32b..dd64d7581a6 100644
--- a/www/ap2-auth-mysql/Makefile
+++ b/www/ap2-auth-mysql/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.1.1.1 2003/12/31 13:03:01 cube Exp $
+# $NetBSD: Makefile,v 1.2 2004/01/20 12:27:58 agc Exp $
#
DISTNAME= mod_auth_mysql.c
PKGNAME= ap2-auth-mysql-1.11.12
-WRKSRC= ${WRKDIR}/${PKGNAME}
CATEGORIES= www databases
MASTER_SITES= ftp://ftp.kcilink.com/pub/
DISTFILES= ${DISTNAME}.gz mysql-group-auth.txt
@@ -17,6 +16,7 @@ CONFLICTS+= ap-auth-mysql-*
DIST_SUBDIR= ap2-auth-mysql
EXTRACT_ONLY= ${DISTNAME}.gz
+WRKSRC= ${WRKDIR}/${PKGNAME}
USE_BUILDLINK2= yes
NO_CONFIGURE= yes
diff --git a/www/arena/Makefile b/www/arena/Makefile
index 9e5e1b36dcc..c21aa5a7de6 100644
--- a/www/arena/Makefile
+++ b/www/arena/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.50 2003/07/17 22:55:29 grant Exp $
+# $NetBSD: Makefile,v 1.51 2004/01/20 12:27:58 agc Exp $
DISTNAME= arena-0.3.62
PKGREVISION= 3
-WRKSRC= ${WRKDIR}/Arena-0.3.62
CATEGORIES= www
MASTER_SITES= ftp://ftp.yggdrasil.com/pub/dist/web/arena/
@@ -10,6 +9,7 @@ MAINTAINER= tech-pkg@NetBSD.org
HOMEPAGE= http://www.yggdrasil.com/Products/Arena/
COMMENT= Experimental HTML 3 browser, supports math and style sheets
+WRKSRC= ${WRKDIR}/Arena-0.3.62
BUILD_USES_MSGFMT= YES
GNU_CONFIGURE= YES
USE_BUILDLINK2= YES
diff --git a/www/asWedit/Makefile b/www/asWedit/Makefile
index 31e3021a4e0..e471460594d 100644
--- a/www/asWedit/Makefile
+++ b/www/asWedit/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.12 2003/07/17 22:55:29 grant Exp $
+# $NetBSD: Makefile,v 1.13 2004/01/20 12:27:58 agc Exp $
DISTNAME= ${PKGNAME}-i386.linux
PKGNAME= asWedit-4.0.1
-WRKSRC= ${WRKDIR}/${PKGNAME_NOREV}
CATEGORIES= www
MASTER_SITES= http://www.advasoft.com/asWedit/ \
http://gd.tuwien.ac.at/infosys/editors/asWedit/ \
@@ -24,6 +23,7 @@ NO_SRC_ON_CDROM= ${RESTRICTED}
NO_BIN_ON_FTP= ${RESTRICTED}
NO_BIN_ON_CDROM= ${RESTRICTED}
+WRKSRC= ${WRKDIR}/${PKGNAME_NOREV}
NO_BUILD= yes
CHECK_SHLIBS= no
diff --git a/www/cocoon/Makefile b/www/cocoon/Makefile
index dd9267141ec..2fe382227a6 100644
--- a/www/cocoon/Makefile
+++ b/www/cocoon/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.23 2003/07/22 04:14:21 martti Exp $
+# $NetBSD: Makefile,v 1.24 2004/01/20 12:27:58 agc Exp $
DISTNAME= Cocoon-1.8.2
PKGNAME= cocoon-1.8.2
-WRKSRC= ${WRKDIR}/${PKGNAME_NOREV}
CATEGORIES= www
MASTER_SITES= http://xml.apache.org/dist/cocoon/cocoon1/
@@ -32,6 +31,8 @@ DEPENDS+= jakarta-servletapi-[0-9]*:../../www/jakarta-servletapi
NO_CONFIGURE=
+WRKSRC= ${WRKDIR}/${PKGNAME_NOREV}
+
post-extract:
${RM} ${WRKSRC}/lib/fop_0_15_0.jar ${WRKSRC}/lib/servlet_2_2.jar \
${WRKSRC}/lib/xalan_1_2_D02.jar ${WRKSRC}/lib/xerces_1_2.jar \
diff --git a/www/hiawatha/Makefile b/www/hiawatha/Makefile
index 226302c85d2..ef8e489d483 100644
--- a/www/hiawatha/Makefile
+++ b/www/hiawatha/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.12 2003/08/04 11:00:31 jmmv Exp $
+# $NetBSD: Makefile,v 1.13 2004/01/20 12:27:58 agc Exp $
#
DISTNAME= hiawatha
PKGNAME= hiawatha-0.1
PKGREVISION= 1
-WRKSRC= ${WRKDIR}
CATEGORIES= textproc www
MASTER_SITES= ${HOMEPAGE} ${MASTER_SITE_BACKUP}
EXTRACT_SUFX= .zip
@@ -20,6 +19,7 @@ DEPENDS+= saxon-[0-9]*:../../textproc/saxon
NO_CONFIGURE=
NO_BUILD=
+WRKSRC= ${WRKDIR}
USE_BUILDLINK2= yes
USE_JAVA= run
USE_PKGINSTALL= yes
diff --git a/www/htmldoc/Makefile.common b/www/htmldoc/Makefile.common
index a2970dd0713..e22771d36f5 100644
--- a/www/htmldoc/Makefile.common
+++ b/www/htmldoc/Makefile.common
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile.common,v 1.7 2003/07/17 22:55:36 grant Exp $
+# $NetBSD: Makefile.common,v 1.8 2004/01/20 12:27:58 agc Exp $
#
HTMLDOC_VERSION= 1.8.23
DISTNAME= htmldoc-${HTMLDOC_VERSION}-source
-WRKSRC= ${WRKDIR}/htmldoc-${HTMLDOC_VERSION}
CATEGORIES= www
MASTER_SITES= ftp://ftp.easysw.com/pub/htmldoc/${HTMLDOC_VERSION}/
EXTRACT_SUFX= .tar.bz2
@@ -17,6 +16,7 @@ DISTINFO_FILE= ${.CURDIR}/../htmldoc/distinfo
PATCHDIR= ${.CURDIR}/../htmldoc/patches
PLIST_SRC= ${.CURDIR}/../htmldoc/PLIST
+WRKSRC= ${WRKDIR}/htmldoc-${HTMLDOC_VERSION}
USE_BUILDLINK2= YES
GNU_CONFIGURE= YES
diff --git a/www/htmllint/Makefile b/www/htmllint/Makefile
index 1c4106dacc5..d4571cd2b7c 100644
--- a/www/htmllint/Makefile
+++ b/www/htmllint/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.12 2003/07/17 22:55:37 grant Exp $
+# $NetBSD: Makefile,v 1.13 2004/01/20 12:27:58 agc Exp $
#
DISTNAME= htmllint
PKGNAME= htmllint-20030518
-WRKSRC= ${WRKDIR}
CATEGORIES= www japanese
MASTER_SITES= http://openlab.ring.gr.jp/k16/htmllint/archives/
EXTRACT_SUFX= .zip
@@ -14,6 +13,7 @@ COMMENT= Another HTML-Lint program
DEPENDS+= p5-Jcode>=0.68:../../converters/p5-Jcode
+WRKSRC= ${WRKDIR}
DIST_SUBDIR= ${PKGNAME}
REPLACE_PERL= htmllint.cgi htmllint parsedtd.pl tagslist.cgi
diff --git a/www/iasp/Makefile b/www/iasp/Makefile
index 02a9cd324fb..8fa5e56881e 100644
--- a/www/iasp/Makefile
+++ b/www/iasp/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.4 2003/03/29 12:42:49 jmmv Exp $
+# $NetBSD: Makefile,v 1.5 2004/01/20 12:27:59 agc Exp $
.include "../iasp/Makefile.common"
PKGNAME= iasp-${IASP_VERSION}
PKGREVISION= 1
-WRKSRC= ${WRKDIR}/${IASP_DIR}
COMMENT= Instant ASP: Java implementation of Active Server Pages
SCRIPTS_ENV+= CAT=${CAT:Q}
@@ -25,6 +24,7 @@ FILES_SUBST+= IASP_GROUP=${IASP_GROUP}
PKG_USERS= ${IASP_USER}:${IASP_GROUP}
PKG_GROUPS= ${IASP_GROUP}
+WRKSRC= ${WRKDIR}/${IASP_DIR}
USE_PKGINSTALL= yes
OWN_DIRS= ${IASP_DESTDIR}
OWN_DIRS_PERMS= ${IASP_DESTDIR}/logs ${IASP_USER} ${IASP_GROUP} 0750
diff --git a/www/jakarta-servletapi/Makefile b/www/jakarta-servletapi/Makefile
index 89cd8a23421..3a16f9a9bae 100644
--- a/www/jakarta-servletapi/Makefile
+++ b/www/jakarta-servletapi/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.16 2003/08/23 15:26:27 jschauma Exp $
+# $NetBSD: Makefile,v 1.17 2004/01/20 12:27:59 agc Exp $
DISTNAME= jakarta-servletapi-${TOMCAT_VERSION}-src
PKGNAME= ${DISTNAME:S/-src$//}
TOMCAT_VERSION= 3.2.4
-WRKSRC= ${WRKDIR}/${DISTNAME}
CATEGORIES= www java
MASTER_SITES= http://jakarta.apache.org/builds/jakarta-tomcat/release/v${TOMCAT_VERSION}/src/
@@ -13,6 +12,7 @@ COMMENT= The Apache project's implementation of the JSP and Java Servlet APIs
BUILD_DEPENDS+= apache-ant>=1.4.1:../../devel/apache-ant
+WRKSRC= ${WRKDIR}/${DISTNAME}
USE_BUILDLINK2= # defined
MAKEFILE= build.xml
PLIST_SRC= ${PKGDIR}/PLIST ${WRKDIR}/PLIST.javadoc
diff --git a/www/jakarta-tomcat/Makefile b/www/jakarta-tomcat/Makefile
index 86b96948c58..658665db04b 100644
--- a/www/jakarta-tomcat/Makefile
+++ b/www/jakarta-tomcat/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.40 2003/08/23 15:26:27 jschauma Exp $
+# $NetBSD: Makefile,v 1.41 2004/01/20 12:27:59 agc Exp $
DISTNAME= jakarta-tomcat-${TOMCAT_VERSION}-src
PKGNAME= ${DISTNAME:S/-src$//}
TOMCAT_VERSION= 3.2.4
PKGREVISION= 1
-WRKSRC= ${WRKDIR}/${DISTNAME}
CATEGORIES= www java
MASTER_SITES= http://jakarta.apache.org/builds/jakarta-tomcat/release/v${TOMCAT_VERSION}/src/
@@ -15,6 +14,7 @@ COMMENT= The Apache Project's Java Servlet 2.2 and JSP 1.1 server
DEPENDS+= jakarta-servletapi-[0-9]*:../../www/jakarta-servletapi
DEPENDS+= apache-ant>=1.4.1:../../devel/apache-ant
+WRKSRC= ${WRKDIR}/${DISTNAME}
USE_BUILDLINK2= yes
MAKEFILE= build.xml
ALL_TARGET= main
diff --git a/www/jsdk20/Makefile b/www/jsdk20/Makefile
index c910e42a5ff..31564f50ed8 100644
--- a/www/jsdk20/Makefile
+++ b/www/jsdk20/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2003/08/23 15:26:23 jschauma Exp $
+# $NetBSD: Makefile,v 1.23 2004/01/20 12:27:59 agc Exp $
# STOP! Don't update this to a later version of this software.
# The JSDK and Apache Jakarta projects have merged, making the
# jakarta-tomcat package the current version of this software.
@@ -7,7 +7,6 @@
DISTNAME= jsdk20-solaris2-sparc
PKGNAME= jsdk-2.0
-WRKSRC= ${WRKDIR}/JSDK2.0
CATEGORIES= www java
MASTER_SITES= # none
EXTRACT_SUFX= .tar.Z
@@ -21,6 +20,7 @@ BUILD_DEPENDS+= urlget>=1.3:../../www/urlget
LICENSE= sun-jsdk20-license
USE_JAVA= run
+WRKSRC= ${WRKDIR}/JSDK2.0
BUILD_DEFS+= JSDK_HOME
NO_CONFIGURE=
NO_BUILD=
diff --git a/www/jssi/Makefile b/www/jssi/Makefile
index 0c8bb01dd4d..51efcd94d8e 100644
--- a/www/jssi/Makefile
+++ b/www/jssi/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.17 2003/08/23 15:26:28 jschauma Exp $
+# $NetBSD: Makefile,v 1.18 2004/01/20 12:27:59 agc Exp $
DISTNAME= ApacheJSSI-1.1.2
PKGNAME= jssi-1.1.2
-WRKSRC= ${WRKDIR}/ApacheJSSI-1.1.2/src/java
CATEGORIES= www java
MASTER_SITES= http://java.apache.org/jservssi/dist/
@@ -13,6 +12,8 @@ COMMENT= Java Server-Side Include engine as a JSDK-2.0 servlet
# yes, this needs _exactly_ version 2.0
DEPENDS+= jsdk-2.0:../../www/jsdk20
+WRKSRC= ${WRKDIR}/ApacheJSSI-1.1.2/src/java
+
.include "../../mk/bsd.prefs.mk"
USE_GMAKE=
diff --git a/www/lhs/Makefile b/www/lhs/Makefile
index ebd2698772d..cdc01e1606a 100644
--- a/www/lhs/Makefile
+++ b/www/lhs/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.4 2003/11/12 03:39:44 jschauma Exp $
+# $NetBSD: Makefile,v 1.5 2004/01/20 12:27:59 agc Exp $
#
DISTNAME= lhs-0.1
PKGREVISION= 1
-WRKSRC= ${WRKDIR}/lhs
CATEGORIES= www
MASTER_SITES= ftp://dev.null.pl/pub/
@@ -11,6 +10,7 @@ MAINTAINER= dawszy@arhea.net
HOMEPAGE= http://dev.null.pl/
COMMENT= Lightweight HTTP Server, IPv6-aware and SSL-enabled
+WRKSRC= ${WRKDIR}/lhs
USE_BUILDLINK2= yes
GNU_CONFIGURE= yes
diff --git a/www/lynx-current/Makefile b/www/lynx-current/Makefile
index 801c9cdc35b..16a68f5d343 100644
--- a/www/lynx-current/Makefile
+++ b/www/lynx-current/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.49 2004/01/06 06:10:51 jlam Exp $
+# $NetBSD: Makefile,v 1.50 2004/01/20 12:27:59 agc Exp $
#
DISTNAME= lynx2.8.5dev.7
PKGNAME= lynx-2.8.5.0.7
PKGREVISION= 3
-WRKSRC= ${WRKDIR}/lynx2-8-5
CATEGORIES= www
MASTER_SITES= http://lynx.isc.org/current/ \
ftp://ftp.nl.uu.net/pub/unix/www/lynx/current/ \
@@ -20,6 +19,7 @@ PKG_INSTALLATION_TYPES= overwrite pkgviews
BUILD_USES_MSGFMT= yes
+WRKSRC= ${WRKDIR}/lynx2-8-5
USE_BUILDLINK3= yes
USE_PKGLOCALEDIR= yes
GNU_CONFIGURE= yes
diff --git a/www/lynx/Makefile b/www/lynx/Makefile
index 07c7f7446c0..b652eaf9acb 100644
--- a/www/lynx/Makefile
+++ b/www/lynx/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.63 2004/01/05 23:46:42 jlam Exp $
+# $NetBSD: Makefile,v 1.64 2004/01/20 12:27:59 agc Exp $
#
DISTNAME= lynx2.8.4rel.1
PKGNAME= lynx-2.8.4.1.4
PKGREVISION= 2
-WRKSRC= ${WRKDIR}/lynx2-8-4
CATEGORIES= www
MASTER_SITES= http://lynx.isc.org/lynx2.8.4/ \
ftp://lynx.isc.org/lynx2.8.4/ \
@@ -28,6 +27,7 @@ PKG_INSTALLATION_TYPES= overwrite pkgviews
BUILD_USES_MSGFMT= yes
+WRKSRC= ${WRKDIR}/lynx2-8-4
USE_BUILDLINK3= yes
USE_PKGLOCALEDIR= yes
GNU_CONFIGURE= yes
diff --git a/www/mMosaic/Makefile b/www/mMosaic/Makefile
index 119783437b6..5648c85354d 100644
--- a/www/mMosaic/Makefile
+++ b/www/mMosaic/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.4 2003/07/17 22:55:41 grant Exp $
+# $NetBSD: Makefile,v 1.5 2004/01/20 12:27:59 agc Exp $
#
DISTNAME= mMosaic-3.7.2
-WRKSRC= ${WRKDIR}/mMosaic-src-3.7.2
CATEGORIES= www
MASTER_SITES= ftp://ftp.enst.fr/pub/mbone/mMosaic/
@@ -10,6 +9,7 @@ MAINTAINER= fredb@NetBSD.org
HOMEPAGE= http://perso.enst.fr/~dauphin/mMosaic/
COMMENT= Modern derivative of NCSA XMosaic
+WRKSRC= ${WRKDIR}/mMosaic-src-3.7.2
USE_BUILDLINK2= YES
USE_X11= YES
diff --git a/www/micro_httpd/Makefile b/www/micro_httpd/Makefile
index 67207278345..99377397eed 100644
--- a/www/micro_httpd/Makefile
+++ b/www/micro_httpd/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.1.1.1 2004/01/09 09:44:55 jmmv Exp $
+# $NetBSD: Makefile,v 1.2 2004/01/20 12:27:59 agc Exp $
DISTNAME= micro_httpd_14dec2001
PKGNAME= micro_httpd-20011214
-WRKSRC= ${WRKDIR}/micro_httpd
CATEGORIES= www
MASTER_SITES= http://www.acme.com/software/micro_httpd/
@@ -12,6 +11,7 @@ COMMENT= Really small HTTP server than runs from inetd(8)
PKG_INSTALLATION_TYPES= overwrite pkgviews
+WRKSRC= ${WRKDIR}/micro_httpd
USE_BUILDLINK3= yes
NO_CONFIGURE= yes
diff --git a/www/moz-bin-plugger/Makefile b/www/moz-bin-plugger/Makefile
index 4b4bb55f0b3..511f1f10642 100644
--- a/www/moz-bin-plugger/Makefile
+++ b/www/moz-bin-plugger/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.4 2003/07/22 04:14:24 martti Exp $
+# $NetBSD: Makefile,v 1.5 2004/01/20 12:27:59 agc Exp $
#
DISTNAME= ${PLUGGER}-linux-x86-glibc
PKGNAME= moz-bin-${PLUGGER}
-WRKSRC= ${WRKDIR}/${PLUGGER}
CATEGORIES= www
MASTER_SITES= http://fredrik.hubbe.net/plugger/
@@ -15,6 +14,7 @@ DEPENDS+= mozilla-bin-[0-9]*:../../www/mozilla-bin
CONFLICTS+= moz-linux-plugger-[0-9]*
+WRKSRC= ${WRKDIR}/${PLUGGER}
USE_BUILDLINK2= YES
NO_CONFIGURE= YES
NO_BUILD= YES
diff --git a/www/mozilla-bin/Makefile.common b/www/mozilla-bin/Makefile.common
index bf48ffc0db3..5014bd0b30b 100644
--- a/www/mozilla-bin/Makefile.common
+++ b/www/mozilla-bin/Makefile.common
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile.common,v 1.4 2004/01/11 20:55:01 jschauma Exp $
+# $NetBSD: Makefile.common,v 1.5 2004/01/20 12:27:59 agc Exp $
#
DISTNAME= # see Makefile.${OPSYS}.${ARCH}
PKGNAME= ${MOZILLA}${MOZ_EXTRA}-bin-${MOZ_VER}
-WRKSRC= ${WRKDIR}/${MOZILLA}
CATEGORIES= www
.if ${MOZILLA} == "MozillaFirebird"
@@ -22,6 +21,7 @@ MASTER_SITES?= http://ftp.mozilla.org/pub/mozilla.org/${MOZILLA_SHORT}/releases
MAINTAINER= grant@NetBSD.org
HOMEPAGE?= http://www.mozilla.org/
+WRKSRC= ${WRKDIR}/${MOZILLA}
NO_CONFIGURE= # defined
FILESDIR= ${.CURDIR}/../../www/mozilla-bin/files
diff --git a/www/mozilla/Makefile.common b/www/mozilla/Makefile.common
index aa0472edf22..7ac19eedbed 100644
--- a/www/mozilla/Makefile.common
+++ b/www/mozilla/Makefile.common
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile.common,v 1.26 2004/01/17 00:04:49 taya Exp $
+# $NetBSD: Makefile.common,v 1.27 2004/01/20 12:27:59 agc Exp $
MOZ_DIST_VER?= ${MOZ_VER}
DISTNAME?= mozilla-source-${MOZ_DIST_VER}
PKGNAME= ${MOZILLA}-${MOZ_VER}
-WRKSRC= ${WRKDIR}/mozilla
MASTER_SITES?= ${MASTER_SITE_MOZILLA:=mozilla${MOZ_DIST_VER}/src/}
CATEGORIES= www
@@ -14,6 +13,7 @@ FILESDIR= "../../www/mozilla/files"
BUILD_DEPENDS+= zip>=2.3:../../archivers/zip
+WRKSRC= ${WRKDIR}/mozilla
USE_BUILDLINK2= yes
USE_GCC_SHLIB= yes
USE_PERL5= build
diff --git a/www/navigator3/Makefile b/www/navigator3/Makefile
index e4e471a8440..fd6703bbced 100644
--- a/www/navigator3/Makefile
+++ b/www/navigator3/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.12 2003/12/30 17:28:38 cjep Exp $
+# $NetBSD: Makefile,v 1.13 2004/01/20 12:27:59 agc Exp $
DISTNAME= netscape-v304-export.x86-unknown-bsd
PKGNAME= navigator3-3.04
-WRKSRC= ${WRKDIR}
CATEGORIES= www
MASTER_SITES= ftp://archive.netscape.com/archive/navigator/3.04/shipping/english/unix/bsdi11/navigator_complete/
@@ -18,6 +17,7 @@ NO_SRC_ON_CDROM= ${RESTRICTED}
NO_BIN_ON_FTP= ${RESTRICTED}
NO_BIN_ON_CDROM= ${RESTRICTED}
+WRKSRC= ${WRKDIR}
USE_X11BASE= YES
SCRIPTS_ENV+= MACHINE_ARCH=${MACHINE_ARCH}
NO_BUILD= YES
diff --git a/www/netscape7/Makefile b/www/netscape7/Makefile
index 6dc8fb90877..a9cf3d72ff1 100644
--- a/www/netscape7/Makefile
+++ b/www/netscape7/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.22 2003/09/19 13:21:11 wiz Exp $
+# $NetBSD: Makefile,v 1.23 2004/01/20 12:27:59 agc Exp $
#
DISTNAME= netscape-i686-pc-linux-gnu-sea
PKGNAME= netscape${VERS_MAJ}-${VERS_MAJ}.${VERS_MIN}
PKGREVISION= 2
-WRKSRC= ${WRKDIR}/netscape-installer
CATEGORIES= www
MASTER_SITES= ftp://ftp.netscape.com/pub/netscape7/${SUB}/ \
ftp://sunsite.utk.edu/pub/netscape/netscape7/${SUB}/ \
@@ -25,6 +24,7 @@ NO_BIN_ON_FTP= ${RESTRICTED}
ONLY_FOR_PLATFORM= Linux-*-i[3-6]86 NetBSD-*-i386
INTERACTIVE_STAGE= build
+WRKSRC= ${WRKDIR}/netscape-installer
PKG_LANG?= english
VERS_MAJ= 7
VERS_MIN= 1
diff --git a/www/ns-plugger-common/Makefile b/www/ns-plugger-common/Makefile
index 707dfe4bb68..815f57dc953 100644
--- a/www/ns-plugger-common/Makefile
+++ b/www/ns-plugger-common/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.14 2003/07/22 04:14:25 martti Exp $
+# $NetBSD: Makefile,v 1.15 2004/01/20 12:27:59 agc Exp $
DISTNAME= plugger-4.0-linux-x86-glibc
PKGNAME= ns-${PLUGGERNAME}-${BINNAME}-${PLUGGERVERS}
-WRKSRC= ${WRKDIR}/${PLUGGERFULL}
CATEGORIES= www
MASTER_SITES= http://fredrik.hubbe.net/plugger/
@@ -24,6 +23,7 @@ CONFLICTS+= plugger-[0-9]* # obsolete all-in-one plugger package
ONLY_FOR_PLATFORM= NetBSD-*-i386
+WRKSRC= ${WRKDIR}/${PLUGGERFULL}
NO_CONFIGURE= YES
NO_BUILD= YES
diff --git a/www/p5-Apache-ePerl/Makefile b/www/p5-Apache-ePerl/Makefile
index 5bdd13991cb..a43e65a6fdb 100644
--- a/www/p5-Apache-ePerl/Makefile
+++ b/www/p5-Apache-ePerl/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.11 2003/07/22 04:14:28 martti Exp $
+# $NetBSD: Makefile,v 1.12 2004/01/20 12:27:59 agc Exp $
#
DISTNAME= eperl-2.2.14
PKGNAME= p5-Apache-ePerl-2.2.14
SVR4_PKGNAME= p5aep
-WRKSRC= ${WRKDIR}/${DISTNAME}/mod/Apache
CATEGORIES= perl5 textproc www
MASTER_SITES= http://www.engelschall.com/sw/eperl/distrib/
@@ -14,6 +13,7 @@ COMMENT= Perl5/Apache module of an ePerl text parser
DEPENDS+= eperl-2.2.14:../../textproc/eperl
+WRKSRC= ${WRKDIR}/${DISTNAME}/mod/Apache
USE_BUILDLINK2= YES
PERL5_PACKLIST= ${PERL5_SITEARCH}/auto/Apache/ePerl/.packlist
diff --git a/www/php-FastTemplate/Makefile b/www/php-FastTemplate/Makefile
index bacdba571cd..fcee432ccc2 100644
--- a/www/php-FastTemplate/Makefile
+++ b/www/php-FastTemplate/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.3 2003/07/17 22:55:57 grant Exp $
+# $NetBSD: Makefile,v 1.4 2004/01/20 12:27:59 agc Exp $
DISTNAME= FastTemplate-1_1_0
PKGNAME= php-FastTemplate-1.1.0
-WRKSRC= ${WRKDIR}/FastTemplate
CATEGORIES= www php4
MASTER_SITES= http://www.thewebmasters.net/php/
@@ -15,6 +14,7 @@ COMMENT= PHP extension for managing templates and variable interpolation
DEPENDS+= php>=3.0.18:../../www/php4
+WRKSRC= ${WRKDIR}/FastTemplate
DIST_SUBDIR= ${PKGBASE}
NO_BUILD= YES
diff --git a/www/php4-apc/Makefile b/www/php4-apc/Makefile
index e9f4c01161f..a142444c3d2 100644
--- a/www/php4-apc/Makefile
+++ b/www/php4-apc/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.9 2003/11/16 19:06:46 cube Exp $
+# $NetBSD: Makefile,v 1.10 2004/01/20 12:27:59 agc Exp $
DISTNAME= apc-1.1.0pl1
PKGNAME= php-apc-1.1.0.1
MODNAME= ${DISTNAME:C/-[^-]*$//}
-WRKSRC= ${WRKDIR}/${DISTNAME}
CATEGORIES+= www
MASTER_SITES= http://apc.communityconnect.com/sources/
EXTRACT_SUFX= .tar.gz
@@ -14,6 +13,7 @@ COMMENT= Alternative PHP Cache for PHP4
EXTRACT_ELEMENTS= # empty
+WRKSRC= ${WRKDIR}/${DISTNAME}
USE_BUILDLINK2= YES
DISTINFO_FILE= ${.CURDIR}/distinfo
diff --git a/www/privoxy/Makefile b/www/privoxy/Makefile
index d6f5e311ee6..78009c41ca6 100644
--- a/www/privoxy/Makefile
+++ b/www/privoxy/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.5 2003/07/22 04:14:35 martti Exp $
+# $NetBSD: Makefile,v 1.6 2004/01/20 12:27:59 agc Exp $
#
DISTNAME= ${PKGNAME_NOREV}-stable-src
PKGNAME= privoxy-3.0.2
PKGREVISION= 2
-WRKSRC= ${WRKDIR}/${PKGNAME_NOREV}-stable
CATEGORIES= www
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=ijbswa/}
@@ -30,6 +29,7 @@ EGDIR= ${PREFIX}/share/examples/privoxy
AUTOCONF_REQD= 2.13
CPPFLAGS+= -Dunix
+WRKSRC= ${WRKDIR}/${PKGNAME_NOREV}-stable
USE_BUILDLINK2= YES
USE_GMAKE= YES
diff --git a/www/py-pcgi/Makefile b/www/py-pcgi/Makefile
index e8185849426..c62220a8edd 100644
--- a/www/py-pcgi/Makefile
+++ b/www/py-pcgi/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.8 2003/07/17 22:56:00 grant Exp $
+# $NetBSD: Makefile,v 1.9 2004/01/20 12:27:59 agc Exp $
#
DISTNAME= Zope-2.2.2-src
PKGNAME= py-pcgi-2.2.2
-WRKSRC= ${WRKDIR}/${DISTNAME}/pcgi
CATEGORIES= www
MASTER_SITES= http://www.zope.org/Products/Zope/2.2.2/
EXTRACT_SUFX= .tgz
@@ -12,6 +11,7 @@ MAINTAINER= tsarna@NetBSD.org
HOMEPAGE= http://starship.python.net/crew/jbauer/persistcgi/
COMMENT= Persistent CGI system for Zope and other ZPublisher applications
+WRKSRC= ${WRKDIR}/${DISTNAME}/pcgi
HAS_CONFIGURE= yes
EXTRACT_ELEMENTS= ${DISTNAME}/pcgi
diff --git a/www/py-zpublisher/Makefile b/www/py-zpublisher/Makefile
index cba132daa36..090f212625e 100644
--- a/www/py-zpublisher/Makefile
+++ b/www/py-zpublisher/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.9 2003/07/17 22:56:01 grant Exp $
+# $NetBSD: Makefile,v 1.10 2004/01/20 12:27:59 agc Exp $
#
DISTNAME= Zope-2.2.2-src
PKGNAME= py-zpublisher-2.2.2
-WRKSRC= ${WRKDIR}/${DISTNAME}/lib/python
CATEGORIES= www
MASTER_SITES= http://www.zope.org/Products/Zope/2.2.2/
EXTRACT_SUFX= .tgz
@@ -14,6 +13,7 @@ COMMENT= Publishes a collection of Python objects as Web resources
DEPENDS+= py-extclass>=2.2.2:../../lang/py-extclass
+WRKSRC= ${WRKDIR}/${DISTNAME}/lib/python
PLIST_SRC= ${WRKDIR}/.PLIST_SRC
EXTRACT_ELEMENTS= ${DISTNAME}/lib/python/ZPublisher
diff --git a/www/quanta-docs/Makefile b/www/quanta-docs/Makefile
index 7b8cf9f7cae..0e16f51733a 100644
--- a/www/quanta-docs/Makefile
+++ b/www/quanta-docs/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.11 2004/01/03 18:49:55 reed Exp $
+# $NetBSD: Makefile,v 1.12 2004/01/20 12:27:59 agc Exp $
DISTNAME= quanta-docs-1.0
PKGREVISION= 4
-WRKSRC= ${WRKDIR}
CATEGORIES= www
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=quanta/}
EXTRACT_SUFX= .tar.bz2
@@ -19,6 +18,7 @@ COMMENT= Documentation collection for Quanta, the KDE web editor
DEPENDS+= quanta>=1.9.9.2:../../www/quanta
+WRKSRC= ${WRKDIR}
BUILD_USES_MSGFMT= YES
USE_BUILDLINK2= YES
diff --git a/www/quanta/Makefile b/www/quanta/Makefile
index 47da0b5796b..3769bce2a1e 100644
--- a/www/quanta/Makefile
+++ b/www/quanta/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.16 2004/01/03 18:49:55 reed Exp $
+# $NetBSD: Makefile,v 1.17 2004/01/20 12:27:59 agc Exp $
DISTNAME= quanta-2.0-pr2
PKGNAME= quanta-1.9.9.2
PKGREVISION= 4
-WRKSRC= ${WRKDIR}/quanta
CATEGORIES= www
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=quanta/}
EXTRACT_SUFX= .tar.bz2
@@ -14,6 +13,7 @@ COMMENT= HTML editor suitable for experienced web developers
BUILD_DEPENDS+= qt2-designer-kde>=2.3.1nb2:../../x11/qt2-designer-kde
+WRKSRC= ${WRKDIR}/quanta
AUTOMAKE_REQD= 1.4
BUILD_USES_MSGFMT= YES
USE_BUILDLINK2= YES
diff --git a/www/ruby-htmlsplit/Makefile b/www/ruby-htmlsplit/Makefile
index 4b413b3f3d1..d6b8b06f59d 100644
--- a/www/ruby-htmlsplit/Makefile
+++ b/www/ruby-htmlsplit/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.6 2003/10/14 08:26:34 taca Exp $
+# $NetBSD: Makefile,v 1.7 2004/01/20 12:27:59 agc Exp $
DISTNAME= htmlsplit102
PKGNAME= ${RUBY_PKGNAMEPREFIX}htmlsplit-1.0.2
PKGREVISION= 1
-WRKSRC= ${WRKDIR}
CATEGORIES= www
MASTER_SITES= http://www.moonwolf.com/ruby/archive/
EXTRACT_SUFX= .zip
@@ -12,6 +11,7 @@ MAINTAINER= taca@NetBSD.org
HOMEPAGE= http://www.moonwolf.com/ruby/htmlsplit.html
COMMENT= Ruby HTML split/join library
+WRKSRC= ${WRKDIR}
DIST_SUBDIR= ruby
USE_RUBY= # defined
NO_CONFIGURE= # defined
diff --git a/www/ruby-tag/Makefile b/www/ruby-tag/Makefile
index ab9239fc50c..15daa9c6bdf 100644
--- a/www/ruby-tag/Makefile
+++ b/www/ruby-tag/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.4 2003/12/24 06:39:33 taca Exp $
+# $NetBSD: Makefile,v 1.5 2004/01/20 12:28:00 agc Exp $
DISTNAME= tag104
PKGNAME= ${RUBY_PKGNAMEPREFIX}tag-1.0.4
-WRKSRC= ${WRKDIR}
CATEGORIES= www
MASTER_SITES= http://www.moonwolf.com/ruby/archive/
EXTRACT_SUFX= .tar.bz2
@@ -13,6 +12,7 @@ COMMENT= Ruby Simple HTML Tag library for CGI
EXTRACT_USING_PAX= # defined
+WRKSRC= ${WRKDIR}
DIST_SUBDIR= ruby
USE_RUBY_RD= # defined
NO_CONFIGURE= # defined
diff --git a/www/ruby-webunit/Makefile b/www/ruby-webunit/Makefile
index 80aeb174cca..419c0ecfb68 100644
--- a/www/ruby-webunit/Makefile
+++ b/www/ruby-webunit/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.1.1.1 2003/12/17 14:37:49 taca Exp $
+# $NetBSD: Makefile,v 1.2 2004/01/20 12:28:00 agc Exp $
DISTNAME= webunit-${VERSION}
PKGNAME= ${RUBY_PKGNAMEPREFIX}${DISTNAME}
-WRKSRC= ${WRKDIR}/webunit
CATEGORIES= www textproc
MASTER_SITES= http://www.xpenguin.biz/download/webunit/
@@ -10,6 +9,7 @@ MAINTAINER= rasputin@idoru.mine.nu
HOMEPAGE= http://www.xpenguin.biz/download/webunit/index-en.html
COMMENT= HTTP unit testing framework for Ruby
+WRKSRC= ${WRKDIR}/webunit
VERSION= 20030121
DIST_SUBDIR= ruby
USE_RUBY_SETUP= yes
diff --git a/www/spfc/Makefile b/www/spfc/Makefile
index fddf73d38b7..d654c592e18 100644
--- a/www/spfc/Makefile
+++ b/www/spfc/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.12 2003/08/23 15:26:24 jschauma Exp $
+# $NetBSD: Makefile,v 1.13 2004/01/20 12:28:00 agc Exp $
DISTNAME= spfc-0.2.0
-WRKSRC= ${WRKDIR}/spfc-0.2.0/src/
CATEGORIES= www java
MASTER_SITES= http://java.apache.org/spfc/dist/
@@ -14,6 +13,7 @@ DEPENDS+= jsdk-2.0:../../www/jsdk20
.include "../../mk/bsd.prefs.mk"
+WRKSRC= ${WRKDIR}/spfc-0.2.0/src/
USE_GMAKE=
NO_CONFIGURE=
MAKE_ENV+= CLASSPATH=${CLASSPATH}:${PREFIX}/lib/jsdk.jar
diff --git a/www/squid/Makefile b/www/squid/Makefile
index 9415b583024..c5f24f14a62 100644
--- a/www/squid/Makefile
+++ b/www/squid/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.100 2004/01/18 14:30:37 taca Exp $
+# $NetBSD: Makefile,v 1.101 2004/01/20 12:28:00 agc Exp $
DISTNAME= squid-2.5.STABLE4
PKGNAME= squid-2.5.4
PKGREVISION= 7
-WRKSRC= ${WRKDIR}/${DISTNAME:S/-src//}
CATEGORIES= www
MASTER_SITES= http://www.squid-cache.org/Versions/v2/2.5/ \
ftp://ftp.leo.org/pub/comp/general/infosys/www/daemons/squid/squid-2/STABLE/ \
@@ -52,6 +51,7 @@ MAINTAINER= taca@NetBSD.org
HOMEPAGE= http://www.squid-cache.org/
COMMENT= Post-Harvest_cached WWW proxy cache and accelerator
+WRKSRC= ${WRKDIR}/${DISTNAME:S/-src//}
USE_PERL5= build
DIST_SUBDIR= squid-2.5.4
DOCDIR= ${PREFIX}/share/doc/squid
diff --git a/www/swill/Makefile b/www/swill/Makefile
index 854736a97fd..f17cc9b20e2 100644
--- a/www/swill/Makefile
+++ b/www/swill/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.3 2003/07/17 22:56:04 grant Exp $
+# $NetBSD: Makefile,v 1.4 2004/01/20 12:28:00 agc Exp $
DISTNAME= swill-0.1
-WRKSRC= ${WRKDIR}/SWILL-0.1
CATEGORIES= www devel
MASTER_SITES= http://systems.cs.uchicago.edu/swill/
@@ -9,6 +8,7 @@ MAINTAINER= thorpej@NetBSD.org
HOMEPAGE= http://systems.cs.uchicago.edu/swill/
COMMENT= The Simple Web Interface Link Library
+WRKSRC= ${WRKDIR}/SWILL-0.1
GNU_CONFIGURE= yes
.include "../../mk/bsd.pkg.mk"
diff --git a/www/swish-e/Makefile b/www/swish-e/Makefile
index 7830b1b9016..18ff733977b 100644
--- a/www/swish-e/Makefile
+++ b/www/swish-e/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.9 2003/07/17 22:56:05 grant Exp $
+# $NetBSD: Makefile,v 1.10 2004/01/20 12:28:00 agc Exp $
# FreeBSD Id: ports/www/swish-e/Makefile,v 1.3 1999/08/31 02:43:18 peter Exp
DISTNAME= swish-efiles.1.3.2
PKGNAME= swish-e-1.3.2
-WRKSRC= ${WRKDIR}/src
CATEGORIES= www textproc
MASTER_SITES= ftp://sunsite.berkeley.edu/pub/swish-e/
@@ -11,6 +10,8 @@ MAINTAINER= bouyer@NetBSD.org
HOMEPAGE= http://sunsite.berkeley.edu/SWISH-E/
COMMENT= Simple web indexing for humans - enhanced
+WRKSRC= ${WRKDIR}/src
+
do-install:
${INSTALL_PROGRAM} ${WRKSRC}/swish-e ${PREFIX}/bin
${INSTALL_DATA_DIR} ${PREFIX}/share/examples/swish-e
diff --git a/www/tcl-cgi/Makefile b/www/tcl-cgi/Makefile
index 997cad7eae0..a5bbf493a37 100644
--- a/www/tcl-cgi/Makefile
+++ b/www/tcl-cgi/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.9 2003/07/17 22:56:05 grant Exp $
+# $NetBSD: Makefile,v 1.10 2004/01/20 12:28:00 agc Exp $
#
DISTNAME= cgi.tcl
PKGNAME= tcl-cgi-1.3.0
-WRKSRC= ${WRKDIR}/cgi.tcl-1.3
CATEGORIES= www
MASTER_SITES= ${MASTER_SITE_BACKUP}
@@ -13,6 +12,7 @@ COMMENT= Library of Tcl procedures to assist in writing CGI scripts
DEPENDS+= tcl>=8.3.2:../../lang/tcl
+WRKSRC= ${WRKDIR}/cgi.tcl-1.3
DIST_SUBDIR= ${PKGNAME}
GNU_CONFIGURE= yes
diff --git a/www/tidy/Makefile b/www/tidy/Makefile
index b087dc2fd12..7ad6ef50962 100644
--- a/www/tidy/Makefile
+++ b/www/tidy/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.12 2003/10/28 12:33:48 cube Exp $
+# $NetBSD: Makefile,v 1.13 2004/01/20 12:28:00 agc Exp $
#
DISTNAME= tidy_src_031002
PKGNAME= tidy-20031002
-WRKSRC= ${WRKDIR}/tidy
CATEGORIES= www
MASTER_SITES= http://tidy.sourceforge.net/src/ \
http://tidy.sourceforge.net/docs/ \
@@ -15,6 +14,7 @@ MAINTAINER= tech-pkg@NetBSD.org
HOMEPAGE= http://tidy.sourceforge.net/
COMMENT= Fixes and tidies up HTML files
+WRKSRC= ${WRKDIR}/tidy
USE_BUILDLINK2= yes
NO_CONFIGURE= yes
USE_GMAKE= yes
diff --git a/www/w3c-httpd/Makefile b/www/w3c-httpd/Makefile
index 100e90cfe62..2c6434387e8 100644
--- a/www/w3c-httpd/Makefile
+++ b/www/w3c-httpd/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.10 2003/07/17 22:56:05 grant Exp $
+# $NetBSD: Makefile,v 1.11 2004/01/20 12:28:00 agc Exp $
# FreeBSD Id: Makefile,v 1.19 1999/01/08 19:59:26 fenner Exp
DISTNAME= w3c-httpd-3.0A
-WRKSRC= ${WRKDIR}
CATEGORIES= www
MASTER_SITES= ftp://ftp.w3.org/pub/httpd/ \
ftp://ftp-eu.w3.org/pub/httpd/
@@ -11,6 +10,8 @@ MAINTAINER= package@NetBSD.org
HOMEPAGE= http://www.w3.org/pub/WWW/Daemon/
COMMENT= WWW server from the W3 Consortium (W3C)
+WRKSRC= ${WRKDIR}
+
pre-configure:
.if !defined(MD5_PW)
@${ECHO} ""
diff --git a/www/w3m/Makefile.common b/www/w3m/Makefile.common
index 00b1cf01d60..fd5d4f62f39 100644
--- a/www/w3m/Makefile.common
+++ b/www/w3m/Makefile.common
@@ -1,14 +1,14 @@
-# $NetBSD: Makefile.common,v 1.21 2003/07/17 22:56:06 grant Exp $
+# $NetBSD: Makefile.common,v 1.22 2004/01/20 12:28:00 agc Exp $
#
DISTNAME= w3m-${W3M_VERS}
-WRKSRC= ${WRKDIR}/w3m-${W3M_VERS}
CATEGORIES= www
MASTER_SITES= http://www2u.biglobe.ne.jp/~hsaka/w3m/patch/
MAINTAINER= kei@NetBSD.org
HOMEPAGE= http://www2u.biglobe.ne.jp/~hsaka/w3m/
+WRKSRC= ${WRKDIR}/w3m-${W3M_VERS}
USE_BUILDLINK2= yes
W3M_VERS= ${W3M_BASE_VERS}-m17n-${W3M_M17N_VERS}
diff --git a/www/wdg-validate/Makefile b/www/wdg-validate/Makefile
index b3a8b28f03a..50c512d5032 100644
--- a/www/wdg-validate/Makefile
+++ b/www/wdg-validate/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.10 2003/11/12 10:43:18 wiz Exp $
+# $NetBSD: Makefile,v 1.11 2004/01/20 12:28:00 agc Exp $
#
DISTNAME= validate-1.2
PKGNAME= wdg-${DISTNAME}
-WRKSRC= ${WRKDIR}
CATEGORIES= www
MASTER_SITES= http://www.htmlhelp.com/tools/validator/offline/
DISTFILES= ${DISTNAME} wdg-sgml-lib-1.1.3.tar.gz README
@@ -14,6 +13,7 @@ COMMENT= HTML validator from the Web Design Group
DEPENDS+= lq-sp>=1.3.4.5:../../textproc/lq-sp
+WRKSRC= ${WRKDIR}
DIST_SUBDIR= validate
EXTRACT_ONLY= wdg-sgml-lib-1.1.3.tar.gz
SITES_wdg-sgml-lib-1.1.3.tar.gz= http://www.htmlhelp.com/tools/validator/src/
diff --git a/www/webalizer/Makefile b/www/webalizer/Makefile
index e3e674afc4b..8169c33c0e6 100644
--- a/www/webalizer/Makefile
+++ b/www/webalizer/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.28 2003/07/17 22:56:07 grant Exp $
+# $NetBSD: Makefile,v 1.29 2004/01/20 12:28:00 agc Exp $
#
DISTNAME= webalizer-2.01-10-src
PKGNAME= webalizer-2.1.10
PKGREVISION= 1
-WRKSRC= ${WRKDIR}/${DISTNAME:S/-src//}
CATEGORIES= www
MASTER_SITES= ftp://ftp.mrunix.net/pub/webalizer/ \
ftp://webalizer.dexa.org/pub/webalizer/ \
@@ -15,6 +14,7 @@ MAINTAINER= tech-pkg@NetBSD.org
HOMEPAGE= http://www.mrunix.net/webalizer/
COMMENT= Web server log file analysis program
+WRKSRC= ${WRKDIR}/${DISTNAME:S/-src//}
USE_BUILDLINK2= YES
USE_PKGINSTALL= YES
USE_X11= YES
diff --git a/www/zope-confera/Makefile b/www/zope-confera/Makefile
index 23458a73b75..577da2806cc 100644
--- a/www/zope-confera/Makefile
+++ b/www/zope-confera/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.9 2003/07/17 22:56:09 grant Exp $
+# $NetBSD: Makefile,v 1.10 2004/01/20 12:28:00 agc Exp $
#
DISTNAME= Confera-1.2.0-nonbin
PKGNAME= zope-confera-1.2.0
-WRKSRC= ${WRKDIR}/lib
CATEGORIES= www
MASTER_SITES= http://www.zope.org/Download/Prereleases/Confera/
EXTRACT_SUFX= .tgz
@@ -14,6 +13,7 @@ COMMENT= Confera: Threaded discussion groups for Zope
DEPENDS+= zope>=2.1.4:../../www/zope
+WRKSRC= ${WRKDIR}/lib
NO_BUILD= yes
PLIST_SRC= ${WRKDIR}/.PLIST_SRC
diff --git a/www/zope25-CMF/Makefile b/www/zope25-CMF/Makefile
index 4338fae2263..5ca78456432 100644
--- a/www/zope25-CMF/Makefile
+++ b/www/zope25-CMF/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.7 2003/07/17 22:56:10 grant Exp $
+# $NetBSD: Makefile,v 1.8 2004/01/20 12:28:00 agc Exp $
DISTNAME= CMF-1.3.1
PKGREVISION= 1
PKGNAME= zope25-CMF-1.3.1
-WRKSRC= ${WRKDIR}/CMF-1.3.1
CATEGORIES= www
MASTER_SITES= http://cmf.zope.org/download/CMF-1.3.1/
@@ -11,6 +10,7 @@ MAINTAINER= tech-pkg@NetBSD.org
HOMEPAGE= http://cmf.zope.org/
COMMENT= Content Management Framework for Zope
+WRKSRC= ${WRKDIR}/CMF-1.3.1
PRODNAMES= CMFCalendar CMFCore CMFDefault CMFTopic
ZOPE_COPYPRODUCT= zope-std-copyproduct-short
diff --git a/www/zope25-CMFPlone/Makefile b/www/zope25-CMFPlone/Makefile
index 9830f83de45..6423a10c143 100644
--- a/www/zope25-CMFPlone/Makefile
+++ b/www/zope25-CMFPlone/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.10 2003/07/17 22:56:10 grant Exp $
+# $NetBSD: Makefile,v 1.11 2004/01/20 12:28:00 agc Exp $
DISTNAME= CMFPlone1.0.3
PKGNAME= zope25-CMFPlone-1.0.3
CATEGORIES= www
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=/plone/}
-WRKSRC= ${WRKDIR}/CMFPlone-1.0.3
MAINTAINER= tech-pkg@NetBSD.org
HOMEPAGE= http://www.plone.org/
@@ -14,6 +13,8 @@ BUILDLINK_DEPENDS.zope= zope-2.6.*
DEPENDS+= zope25-CMF-[0-9]*:../../www/zope25-CMF
DEPENDS+= zope25-Formulator-[0-9]*:../../www/zope25-Formulator
+WRKSRC= ${WRKDIR}/CMFPlone-1.0.3
+
# no ActivePak with Zope 2.6.x!
PRODNAMES= CMFPlone DCWorkflow
diff --git a/www/zope25-ZPsycopgDA/Makefile b/www/zope25-ZPsycopgDA/Makefile
index 26892cc4f8d..1f5b47f0880 100644
--- a/www/zope25-ZPsycopgDA/Makefile
+++ b/www/zope25-ZPsycopgDA/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.7 2003/07/17 22:56:17 grant Exp $
+# $NetBSD: Makefile,v 1.8 2004/01/20 12:28:00 agc Exp $
#
DISTNAME= psycopg-1.0.14
PKGNAME= zope25-ZPsycopgDA-1.0.14
PKGREVISION= 1
-WRKSRC= ${WRKDIR}/${DISTNAME}
CATEGORIES= www
MASTER_SITES= http://initd.org/pub/software/psycopg/
@@ -12,6 +11,7 @@ MAINTAINER= tech-pkg@NetBSD.org
HOMEPAGE= http://initd.org/software/psycopg
COMMENT= PostgreSQL database adapter for Zope
+WRKSRC= ${WRKDIR}/${DISTNAME}
USE_BUILDLINK2= yes
ZOPE_COPYPRODUCT= zope-std-copyproduct-short