summaryrefslogtreecommitdiff
path: root/www
diff options
context:
space:
mode:
authorjmmv <jmmv@pkgsrc.org>2003-03-29 12:40:00 +0000
committerjmmv <jmmv@pkgsrc.org>2003-03-29 12:40:00 +0000
commit0916498c1b6dd1e6312100e3813722d9ec0a3ae4 (patch)
treefaa47d38b96f7c3d479f826963ddfdc99b66acc3 /www
parent027ce626821d991bc282a370598c738be6c3e12e (diff)
downloadpkgsrc-0916498c1b6dd1e6312100e3813722d9ec0a3ae4.tar.gz
Place WRKSRC where it belongs, to make pkglint happy; ok'ed by wiz.
Diffstat (limited to 'www')
-rw-r--r--www/adzap/Makefile5
-rw-r--r--www/analog/Makefile4
-rw-r--r--www/ap-auth-cookie/Makefile4
-rw-r--r--www/ap-bandwidth/Makefile5
-rw-r--r--www/ap-iasp/Makefile4
-rw-r--r--www/ap-jk/Makefile4
-rw-r--r--www/ap-throttle/Makefile5
-rw-r--r--www/cocoon/Makefile4
-rw-r--r--www/hiawatha/Makefile4
-rw-r--r--www/htmllint/Makefile4
-rw-r--r--www/iasp/Makefile5
-rw-r--r--www/jakarta-servletapi/Makefile4
-rw-r--r--www/jakarta-tomcat/Makefile5
-rw-r--r--www/jsdk20/Makefile4
-rw-r--r--www/jssi/Makefile4
-rw-r--r--www/lhs/Makefile5
-rw-r--r--www/lynx-current/Makefile5
-rw-r--r--www/lynx/Makefile5
-rw-r--r--www/mMosaic/Makefile5
-rw-r--r--www/mozilla-linux/Makefile4
-rw-r--r--www/mozilla/Makefile.common4
-rw-r--r--www/navigator3/Makefile4
-rw-r--r--www/netscape7/Makefile4
-rw-r--r--www/p5-Apache-ePerl/Makefile5
-rw-r--r--www/phoenix-linux-nightly/Makefile4
-rw-r--r--www/phoenix-linux/Makefile4
-rw-r--r--www/php-FastTemplate/Makefile4
-rw-r--r--www/php4-apc/Makefile4
-rw-r--r--www/py-pcgi/Makefile5
-rw-r--r--www/py-zpublisher/Makefile5
-rw-r--r--www/quanta-docs/Makefile4
-rw-r--r--www/quanta/Makefile5
-rw-r--r--www/ruby-htmlsplit/Makefile4
-rw-r--r--www/ruby-tag/Makefile4
-rw-r--r--www/spfc/Makefile4
-rw-r--r--www/squid/Makefile4
-rw-r--r--www/swill/Makefile5
-rw-r--r--www/swish-e/Makefile5
-rw-r--r--www/tidy/Makefile4
-rw-r--r--www/w3c-httpd/Makefile5
-rw-r--r--www/w3m/Makefile.common4
-rw-r--r--www/webalizer/Makefile5
-rw-r--r--www/zope-confera/Makefile5
-rw-r--r--www/zope25-CMF/Makefile4
-rw-r--r--www/zope25-CMFPlone/Makefile4
-rw-r--r--www/zope25-ZPsycopgDA/Makefile4
-rw-r--r--www/zopeedit/Makefile4
47 files changed, 94 insertions, 112 deletions
diff --git a/www/adzap/Makefile b/www/adzap/Makefile
index f60db050c11..c90a330c2eb 100644
--- a/www/adzap/Makefile
+++ b/www/adzap/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.33 2003/01/25 23:36:40 rh Exp $
+# $NetBSD: Makefile,v 1.34 2003/03/29 12:42:47 jmmv Exp $
#
DISTNAME= adzap-20030125
+WRKSRC= ${WRKDIR}/adzap
CATEGORIES= www perl5
# XXX: should use the following one day:
#MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=adzapper/}
@@ -11,8 +12,6 @@ MAINTAINER= packages@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/analog/Makefile b/www/analog/Makefile
index d723f353d42..198ddccd24a 100644
--- a/www/analog/Makefile
+++ b/www/analog/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.39 2003/03/23 21:47:57 tron Exp $
+# $NetBSD: Makefile,v 1.40 2003/03/29 12:42:47 jmmv Exp $
DISTNAME= analog-5.32
+WRKSRC= ${WRKDISTDIR}/src
CATEGORIES= www
MASTER_SITES= ${HOMEPAGE} \
http://www.web42.com/analog/ \
@@ -14,7 +15,6 @@ COMMENT= Extremely fast program for analysing WWW logfiles
ALL_TARGET= analog
MAKE_ENV+= PREFIX=${PREFIX} SYSCONFDIR=${PKG_SYSCONFDIR}
WRKDISTDIR= ${WRKDIR}/${DISTNAME}
-WRKSRC= ${WRKDISTDIR}/src
USE_PKGINSTALL= yes
EGDIR= ${PREFIX}/share/examples
diff --git a/www/ap-auth-cookie/Makefile b/www/ap-auth-cookie/Makefile
index f26c930aff1..23c4ecd8015 100644
--- a/www/ap-auth-cookie/Makefile
+++ b/www/ap-auth-cookie/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2003/03/24 23:15:34 jmc Exp $
+# $NetBSD: Makefile,v 1.27 2003/03/29 12:42:47 jmmv 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,6 +6,7 @@
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
@@ -17,7 +18,6 @@ COMMENT= Cookie-based authentication for Apache
USE_BUILDLINK2= YES
EXTRACT_CMD= ${DO_NADA}
-WRKSRC= ${WRKDIR}
APACHE_MODULE_NAME= mod_auth_cookie.so
diff --git a/www/ap-bandwidth/Makefile b/www/ap-bandwidth/Makefile
index 963b65089a0..c84f25353df 100644
--- a/www/ap-bandwidth/Makefile
+++ b/www/ap-bandwidth/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.1.1.1 2003/02/17 23:32:34 grant Exp $
+# $NetBSD: Makefile,v 1.2 2003/03/29 12:42:47 jmmv 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
@@ -13,8 +14,6 @@ COMMENT= Apache module for bandwidth management
USE_BUILDLINK2= YES
-WRKSRC= ${WRKDIR}
-
APACHE_MODULE_NAME= mod_bandwidth.so
DIST_SUBDIR= ${PKGNAME}
diff --git a/www/ap-iasp/Makefile b/www/ap-iasp/Makefile
index 4c6ae8af25a..0f0842a378b 100644
--- a/www/ap-iasp/Makefile
+++ b/www/ap-iasp/Makefile
@@ -1,14 +1,14 @@
-# $NetBSD: Makefile,v 1.1.1.1 2003/01/01 07:04:28 jlam Exp $
+# $NetBSD: Makefile,v 1.2 2003/03/29 12:42:47 jmmv 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
diff --git a/www/ap-jk/Makefile b/www/ap-jk/Makefile
index 15f89b0e1a2..ced6b7fd609 100644
--- a/www/ap-jk/Makefile
+++ b/www/ap-jk/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.16 2003/02/17 23:05:48 grant Exp $
+# $NetBSD: Makefile,v 1.17 2003/03/29 12:42:48 jmmv 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
MASTER_SITES= http://jakarta.apache.org/builds/tomcat/release/v${TOMCAT_VERSION}/src/
@@ -19,7 +20,6 @@ GTAR= ${LOCALBASE}/bin/gtar
USE_BUILDLINK2= # defined
EXTRACT_ELEMENTS= ${DISTNAME}/src/native
-WRKSRC= ${WRKDIR}/${DISTNAME}/src/native/apache1.3
APACHE_MODULE_NAME= mod_jk.so
APACHE_MODULE_SRC= *.c ../jk/*.c
diff --git a/www/ap-throttle/Makefile b/www/ap-throttle/Makefile
index 5823205eb8c..e558b12aed3 100644
--- a/www/ap-throttle/Makefile
+++ b/www/ap-throttle/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.3 2003/02/17 17:50:12 grant Exp $
+# $NetBSD: Makefile,v 1.4 2003/03/29 12:42:48 jmmv Exp $
DISTNAME= mod_throttle312
PKGNAME= ap-throttle-3.1.2
+WRKSRC= ${WRKDIR}/${PKGNAME:S/ap-/mod_/}
CATEGORIES= www
MASTER_SITES= http://www.snert.com/Software/mod_throttle/
EXTRACT_SUFX= .tgz
@@ -12,8 +13,6 @@ COMMENT= Apache module for limiting bandwidth usage
USE_BUILDLINK2= YES
-WRKSRC= ${WRKDIR}/${PKGNAME:S/ap-/mod_/}
-
APACHE_MODULE_NAME= mod_throttle.so
APACHE_MODULE_SRC= mod_throttle.c
diff --git a/www/cocoon/Makefile b/www/cocoon/Makefile
index 1ec4ceff30c..6e264b84423 100644
--- a/www/cocoon/Makefile
+++ b/www/cocoon/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.18 2002/12/31 15:44:30 jlam Exp $
+# $NetBSD: Makefile,v 1.19 2003/03/29 12:42:48 jmmv Exp $
DISTNAME= Cocoon-1.8.2
PKGNAME= cocoon-1.8.2
+WRKSRC= ${WRKDIR}/${PKGNAME}
CATEGORIES= www
MASTER_SITES= http://xml.apache.org/dist/cocoon/cocoon1/
@@ -29,7 +30,6 @@ DEPENDS+= jakarta-servletapi-[0-9]*:../../www/jakarta-servletapi
# org.apache.cocoon.processor.dcp.DCPProcessor ===>
# FESI 1.21+ (http://home.worldcom.ch/jmlugrin/fesi/download.html)
-WRKSRC= ${WRKDIR}/${PKGNAME}
NO_CONFIGURE=
post-extract:
diff --git a/www/hiawatha/Makefile b/www/hiawatha/Makefile
index bc96b9381f4..7044d93662f 100644
--- a/www/hiawatha/Makefile
+++ b/www/hiawatha/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.6 2003/03/28 21:14:38 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2003/03/29 12:42:48 jmmv Exp $
#
DISTNAME= hiawatha
PKGNAME= hiawatha-0.1
+WRKSRC= ${WRKDIR}
CATEGORIES= textproc www
MASTER_SITES= ${HOMEPAGE} ${MASTER_SITE_BACKUP}
EXTRACT_SUFX= .zip
@@ -17,7 +18,6 @@ DEPENDS+= saxon-[0-9]*:../../textproc/saxon
NO_CONFIGURE=
NO_BUILD=
-WRKSRC= ${WRKDIR}
USE_JAVA= run
DIST_SUBDIR= ${PKGNAME}
diff --git a/www/htmllint/Makefile b/www/htmllint/Makefile
index a0f6635cfe3..243489f7417 100644
--- a/www/htmllint/Makefile
+++ b/www/htmllint/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.9 2003/03/05 10:03:45 wiz Exp $
+# $NetBSD: Makefile,v 1.10 2003/03/29 12:42:48 jmmv Exp $
#
DISTNAME= htmllint
PKGNAME= htmllint-20030225
+WRKSRC= ${WRKDIR}
CATEGORIES= www japanese
MASTER_SITES= http://openlab.ring.gr.jp/k16/htmllint/archives/
EXTRACT_SUFX= .zip
@@ -17,7 +18,6 @@ DIST_SUBDIR= ${PKGNAME}
REPLACE_PERL= htmllint.cgi htmllint parsedtd.pl tagslist.cgi
USE_PERL5= # defined
-WRKSRC= ${WRKDIR}
NO_BUILD= # defined
CGIDIR= ${LOCALBASE}/libexec/cgi-bin
diff --git a/www/iasp/Makefile b/www/iasp/Makefile
index 2dbf3920c05..02a9cd324fb 100644
--- a/www/iasp/Makefile
+++ b/www/iasp/Makefile
@@ -1,12 +1,11 @@
-# $NetBSD: Makefile,v 1.3 2003/01/28 22:04:29 jlam Exp $
+# $NetBSD: Makefile,v 1.4 2003/03/29 12:42:49 jmmv Exp $
.include "../iasp/Makefile.common"
PKGNAME= iasp-${IASP_VERSION}
PKGREVISION= 1
-COMMENT= Instant ASP: Java implementation of Active Server Pages
-
WRKSRC= ${WRKDIR}/${IASP_DIR}
+COMMENT= Instant ASP: Java implementation of Active Server Pages
SCRIPTS_ENV+= CAT=${CAT:Q}
SCRIPTS_ENV+= CHMOD=${CHMOD:Q}
diff --git a/www/jakarta-servletapi/Makefile b/www/jakarta-servletapi/Makefile
index 3969cf2bf48..85c1ccbd34e 100644
--- a/www/jakarta-servletapi/Makefile
+++ b/www/jakarta-servletapi/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.10 2002/12/26 22:42:31 jlam Exp $
+# $NetBSD: Makefile,v 1.11 2003/03/29 12:42:49 jmmv Exp $
DISTNAME= jakarta-servletapi-${TOMCAT_VERSION}-src
PKGNAME= ${DISTNAME:S/-src$//}
TOMCAT_VERSION= 3.2.4
+WRKSRC= ${WRKDIR}/${DISTNAME}
CATEGORIES= www
MASTER_SITES= http://jakarta.apache.org/builds/jakarta-tomcat/release/v${TOMCAT_VERSION}/src/
@@ -16,7 +17,6 @@ USE_BUILDLINK2= # defined
MAKEFILE= build.xml
PLIST_SRC= ${PKGDIR}/PLIST ${WRKDIR}/PLIST.javadoc
-WRKSRC= ${WRKDIR}/${DISTNAME}
DOCDIR= share/doc/java/jakarta-servletapi
post-build:
diff --git a/www/jakarta-tomcat/Makefile b/www/jakarta-tomcat/Makefile
index 92cca949548..a5aebdc1755 100644
--- a/www/jakarta-tomcat/Makefile
+++ b/www/jakarta-tomcat/Makefile
@@ -1,9 +1,10 @@
-# $NetBSD: Makefile,v 1.34 2003/01/28 22:04:29 jlam Exp $
+# $NetBSD: Makefile,v 1.35 2003/03/29 12:42:49 jmmv Exp $
DISTNAME= jakarta-tomcat-${TOMCAT_VERSION}-src
PKGNAME= ${DISTNAME:S/-src$//}
TOMCAT_VERSION= 3.2.4
PKGREVISION= 1
+WRKSRC= ${WRKDIR}/${DISTNAME}
CATEGORIES= www
MASTER_SITES= http://jakarta.apache.org/builds/jakarta-tomcat/release/v${TOMCAT_VERSION}/src/
@@ -14,8 +15,6 @@ COMMENT= the Apache Project's Java Servlet 2.2 and JSP 1.1 server
DEPENDS+= jakarta-servletapi-[0-9]*:../../www/jakarta-servletapi
DEPENDS+= jakarta-ant>=1.4.1:../../devel/jakarta-ant
-WRKSRC= ${WRKDIR}/${DISTNAME}
-
USE_BUILDLINK2= yes
MAKEFILE= build.xml
ALL_TARGET= main
diff --git a/www/jsdk20/Makefile b/www/jsdk20/Makefile
index 7450c752229..227e439b535 100644
--- a/www/jsdk20/Makefile
+++ b/www/jsdk20/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2003/03/28 21:14:38 wiz Exp $
+# $NetBSD: Makefile,v 1.20 2003/03/29 12:42:49 jmmv 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,6 +7,7 @@
DISTNAME= jsdk20-solaris2-sparc
PKGNAME= jsdk-2.0
+WRKSRC= ${WRKDIR}/JSDK2.0
CATEGORIES= www
MASTER_SITES= # none
EXTRACT_SUFX= .tar.Z
@@ -20,7 +21,6 @@ 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 19707ac7a15..e020e304d39 100644
--- a/www/jssi/Makefile
+++ b/www/jssi/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.13 2002/12/31 15:44:30 jlam Exp $
+# $NetBSD: Makefile,v 1.14 2003/03/29 12:42:50 jmmv Exp $
DISTNAME= ApacheJSSI-1.1.2
PKGNAME= jssi-1.1.2
+WRKSRC= ${WRKDIR}/ApacheJSSI-1.1.2/src/java
CATEGORIES= www
MASTER_SITES= http://java.apache.org/jservssi/dist/
@@ -16,7 +17,6 @@ DEPENDS+= jsdk-2.0:../../www/jsdk20
USE_GMAKE=
NO_CONFIGURE=
-WRKSRC= ${WRKDIR}/ApacheJSSI-1.1.2/src/java
MAKE_ENV+= CLASSPATH=${CLASSPATH}
post-build:
diff --git a/www/lhs/Makefile b/www/lhs/Makefile
index ec2496e30f7..4ef09850b82 100644
--- a/www/lhs/Makefile
+++ b/www/lhs/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.2 2002/10/25 09:29:38 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2003/03/29 12:42:50 jmmv Exp $
#
DISTNAME= lhs-0.1
+WRKSRC= ${WRKDIR}/lhs
CATEGORIES= www
MASTER_SITES= ftp://dev.null.pl/pub/
@@ -9,8 +10,6 @@ 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 f6ad7444624..2fb2e202fec 100644
--- a/www/lynx-current/Makefile
+++ b/www/lynx-current/Makefile
@@ -1,9 +1,10 @@
-# $NetBSD: Makefile,v 1.41 2003/03/22 00:08:20 wiz Exp $
+# $NetBSD: Makefile,v 1.42 2003/03/29 12:42:50 jmmv Exp $
#
DISTNAME= lynx2.8.5dev.7
PKGNAME= lynx-2.8.5.0.7
PKGREVISION= 1
+WRKSRC= ${WRKDIR}/lynx2-8-5
CATEGORIES= www
MASTER_SITES= http://lynx.isc.org/current/ \
ftp://ftp.nl.uu.net/pub/unix/www/lynx/current/ \
@@ -17,8 +18,6 @@ COMMENT= Alphanumeric display oriented World-Wide Web Client
BUILD_USES_MSGFMT= yes
-WRKSRC= ${WRKDIR}/lynx2-8-5
-
USE_BUILDLINK2= yes
GNU_CONFIGURE= yes
USE_GMAKE= yes
diff --git a/www/lynx/Makefile b/www/lynx/Makefile
index bf94e37a4e5..8cffea5ff15 100644
--- a/www/lynx/Makefile
+++ b/www/lynx/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.52 2002/11/25 08:48:11 itojun Exp $
+# $NetBSD: Makefile,v 1.53 2003/03/29 12:42:51 jmmv Exp $
#
DISTNAME= lynx2.8.4rel.1
PKGNAME= lynx-2.8.4.1.4
+WRKSRC= ${WRKDIR}/lynx2-8-4
CATEGORIES= www
MASTER_SITES= http://lynx.isc.org/lynx2.8.4/ \
ftp://lynx.isc.org/lynx2.8.4/ \
@@ -24,8 +25,6 @@ COMMENT= Alphanumeric display oriented World-Wide Web Client
BUILD_USES_MSGFMT= yes
-WRKSRC= ${WRKDIR}/lynx2-8-4
-
USE_BUILDLINK2= yes
GNU_CONFIGURE= yes
INSTALL_TARGET= install-bin install-cfg install-help install-lss
diff --git a/www/mMosaic/Makefile b/www/mMosaic/Makefile
index aca1a820428..265bd6b1a81 100644
--- a/www/mMosaic/Makefile
+++ b/www/mMosaic/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.2 2002/10/08 12:43:24 jlam Exp $
+# $NetBSD: Makefile,v 1.3 2003/03/29 12:42:51 jmmv Exp $
#
DISTNAME= mMosaic-3.7.2
+WRKSRC= ${WRKDIR}/mMosaic-src-3.7.2
CATEGORIES= www
MASTER_SITES= ftp://ftp.enst.fr/pub/mbone/mMosaic/
@@ -9,8 +10,6 @@ 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/mozilla-linux/Makefile b/www/mozilla-linux/Makefile
index 72c40232524..90f02993f13 100644
--- a/www/mozilla-linux/Makefile
+++ b/www/mozilla-linux/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.7 2003/03/26 18:12:02 jlam Exp $
+# $NetBSD: Makefile,v 1.8 2003/03/29 12:42:51 jmmv Exp $
#
DISTNAME= mozilla-i686-pc-linux-gnu-1.3
PKGNAME= mozilla-linux-1.3
+WRKSRC= ${WRKDIR}/mozilla
CATEGORIES= www
MASTER_SITES= ${MASTER_SITE_MOZILLA:=mozilla1.3/}
@@ -12,7 +13,6 @@ COMMENT= Open-source version of the Netscape browser (binary pkg)
ONLY_FOR_PLATFORM= Linux-*-i[3-6]86 NetBSD-*-i386
-WRKSRC= ${WRKDIR}/mozilla
NO_CONFIGURE= # defined
PLIST_SRC= ${WRKDIR}/PLIST_DYNAMIC
diff --git a/www/mozilla/Makefile.common b/www/mozilla/Makefile.common
index 794ad78dff3..d801f281a4e 100644
--- a/www/mozilla/Makefile.common
+++ b/www/mozilla/Makefile.common
@@ -1,15 +1,15 @@
-# $NetBSD: Makefile.common,v 1.12 2003/03/17 16:07:32 taya Exp $
+# $NetBSD: Makefile.common,v 1.13 2003/03/29 12:42:51 jmmv 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
MAINTAINER= taya@netbsd.org
HOMEPAGE?= http://www.mozilla.org/
-WRKSRC= ${WRKDIR}/mozilla
FILESDIR= "../../www/mozilla/files"
BUILD_DEPENDS+= zip>=2.3:../../archivers/zip
diff --git a/www/navigator3/Makefile b/www/navigator3/Makefile
index 3bf2ef7c39d..341dbaaaa16 100644
--- a/www/navigator3/Makefile
+++ b/www/navigator3/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.8 2002/04/06 15:48:55 grant Exp $
+# $NetBSD: Makefile,v 1.9 2003/03/29 12:42:52 jmmv 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/
@@ -17,7 +18,6 @@ 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 d79c88ab292..0a984fa117a 100644
--- a/www/netscape7/Makefile
+++ b/www/netscape7/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.13 2003/03/26 04:05:39 jschauma Exp $
+# $NetBSD: Makefile,v 1.14 2003/03/29 12:42:52 jmmv Exp $
#
DISTNAME= netscape-i686-pc-linux-gnu-sea
PKGNAME= netscape${VERS_MAJ}-${VERS_MIN}
+WRKSRC= ${WRKDIR}/netscape-installer
CATEGORIES= www
MASTER_SITES= ftp://ftp.netscape.com/pub/netscape7/${SUB}/ \
ftp://sunsite.utk.edu/pub/netscape/netscape7/${SUB}/ \
@@ -28,7 +29,6 @@ VERS_MAJ= 7
VERS_MIN= 01
SUB= ${PKG_LANG}/${VERS_MAJ}.${VERS_MIN}/unix/${DIST_DIR_NAME}/sea
DIST_SUBDIR= netscape/${VERS_MAJ}.${VERS_MIN}/${PKG_LANG}
-WRKSRC= ${WRKDIR}/netscape-installer
.if ${PKG_LANG} != english
DISTINFO_FILE= ${PKGDIR}/distinfo.${PKG_LANG}
diff --git a/www/p5-Apache-ePerl/Makefile b/www/p5-Apache-ePerl/Makefile
index d725d8b984b..e3f1668b81e 100644
--- a/www/p5-Apache-ePerl/Makefile
+++ b/www/p5-Apache-ePerl/Makefile
@@ -1,9 +1,10 @@
-# $NetBSD: Makefile,v 1.7 2002/10/27 20:49:00 seb Exp $
+# $NetBSD: Makefile,v 1.8 2003/03/29 12:42:52 jmmv 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/
@@ -16,8 +17,6 @@ DEPENDS+= eperl-2.2.14:../../textproc/eperl
USE_BUILDLINK2= YES
PERL5_PACKLIST= ${PERL5_SITEARCH}/auto/Apache/ePerl/.packlist
-WRKSRC= ${WRKDIR}/${DISTNAME}/mod/Apache
-
.include "../../www/ap-perl/buildlink2.mk"
.include "../../lang/perl5/module.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/www/phoenix-linux-nightly/Makefile b/www/phoenix-linux-nightly/Makefile
index ac59c647aa3..c5be4ca549f 100644
--- a/www/phoenix-linux-nightly/Makefile
+++ b/www/phoenix-linux-nightly/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.1.1.1 2003/03/26 12:55:04 grant Exp $
+# $NetBSD: Makefile,v 1.2 2003/03/29 12:42:53 jmmv Exp $
#
DISTNAME= phoenix-i686-pc-linux-gnu
PKGNAME= phoenix-linux-${PKGVER}
+WRKSRC= ${WRKDIR}/phoenix
CATEGORIES= www
MASTER_SITES= http://komodo.mozilla.org/pub/phoenix/nightly/latest-trunk/
@@ -14,7 +15,6 @@ ONLY_FOR_PLATFORM= Linux-*-i[3-6]86 NetBSD-*-i386
PKGVER!= date +%Y%m%d
DIST_SUBDIR= ${PKGNAME}
-WRKSRC= ${WRKDIR}/phoenix
NO_CHECKSUM= # defined
NO_CONFIGURE= # defined
diff --git a/www/phoenix-linux/Makefile b/www/phoenix-linux/Makefile
index 8cbdef59b07..846c5d7da51 100644
--- a/www/phoenix-linux/Makefile
+++ b/www/phoenix-linux/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.8 2003/03/26 04:05:37 jschauma Exp $
+# $NetBSD: Makefile,v 1.9 2003/03/29 12:42:53 jmmv Exp $
#
DISTNAME= phoenix-0.5-i686-pc-linux-gnu
PKGNAME= phoenix-linux-0.5
+WRKSRC= ${WRKDIR}/phoenix
CATEGORIES= www
MASTER_SITES= http://ftp.mozilla.org/pub/phoenix/releases/0.5/
@@ -12,7 +13,6 @@ COMMENT= A redesign of the Mozilla browser component (binary pkg)
ONLY_FOR_PLATFORM= Linux-*-i[3-6]86 NetBSD-*-i386
-WRKSRC= ${WRKDIR}/phoenix
NO_CONFIGURE= # defined
PLIST_SRC= ${WRKDIR}/PLIST_DYNAMIC
diff --git a/www/php-FastTemplate/Makefile b/www/php-FastTemplate/Makefile
index fb8d9c5c494..877aee1b8f8 100644
--- a/www/php-FastTemplate/Makefile
+++ b/www/php-FastTemplate/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.1.1.1 2001/10/28 03:36:16 jlam Exp $
+# $NetBSD: Makefile,v 1.2 2003/03/29 12:42:53 jmmv 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,7 +16,6 @@ COMMENT= PHP extension for managing templates and variable interpolation
DEPENDS+= php>=3.0.18:../../www/php4
DIST_SUBDIR= ${PKGBASE}
-WRKSRC= ${WRKDIR}/FastTemplate
NO_BUILD= YES
diff --git a/www/php4-apc/Makefile b/www/php4-apc/Makefile
index 22820f64e25..25bf628f084 100644
--- a/www/php4-apc/Makefile
+++ b/www/php4-apc/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.4 2002/10/25 16:57:30 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2003/03/29 12:42:53 jmmv 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/
@@ -11,7 +12,6 @@ HOMEPAGE= http://apc.communityconnect.com/
COMMENT= Alternative PHP Cache for PHP4
EXTRACT_ELEMENTS= # empty
-WRKSRC= ${WRKDIR}/${DISTNAME}
USE_BUILDLINK2= YES
diff --git a/www/py-pcgi/Makefile b/www/py-pcgi/Makefile
index e3714606d63..3ed3e99d70e 100644
--- a/www/py-pcgi/Makefile
+++ b/www/py-pcgi/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.6 2002/01/29 17:02:32 drochner Exp $
+# $NetBSD: Makefile,v 1.7 2003/03/29 12:42:53 jmmv 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
@@ -16,8 +17,6 @@ EXTRACT_ELEMENTS= ${DISTNAME}/pcgi
ALL_TARGET= all
-WRKSRC= ${WRKDIR}/${DISTNAME}/pcgi
-
post-build:
(cd ${WRKSRC}; ${PY_PROG} ${PY_LIBDIR}/compileall.py .)
(cd ${WRKSRC}; ${PY_PROG} -O ${PY_LIBDIR}/compileall.py .)
diff --git a/www/py-zpublisher/Makefile b/www/py-zpublisher/Makefile
index f44355249d6..93d2e5e4468 100644
--- a/www/py-zpublisher/Makefile
+++ b/www/py-zpublisher/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.5 2002/01/29 17:02:32 drochner Exp $
+# $NetBSD: Makefile,v 1.6 2003/03/29 12:42:53 jmmv 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
@@ -16,8 +17,6 @@ DEPENDS+= py-extclass>=2.2.2:../../lang/py-extclass
PLIST_SRC= ${WRKDIR}/.PLIST_SRC
EXTRACT_ELEMENTS= ${DISTNAME}/lib/python/ZPublisher
-WRKSRC= ${WRKDIR}/${DISTNAME}/lib/python
-
do-build:
(cd ${WRKSRC}/..; ${PY_PROG} ${PY_LIBDIR}/compileall.py .)
(cd ${WRKSRC}/..; ${PY_PROG} -O ${PY_LIBDIR}/compileall.py .)
diff --git a/www/quanta-docs/Makefile b/www/quanta-docs/Makefile
index f24a3a694ac..15c7d52365f 100644
--- a/www/quanta-docs/Makefile
+++ b/www/quanta-docs/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.4 2002/09/20 12:04:53 jlam Exp $
+# $NetBSD: Makefile,v 1.5 2003/03/29 12:42:54 jmmv Exp $
DISTNAME= quanta-docs-1.0
PKGREVISION= 1
+WRKSRC= ${WRKDIR}
CATEGORIES= www
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=quanta/}
EXTRACT_SUFX= .tar.bz2
@@ -22,7 +23,6 @@ BUILD_USES_MSGFMT= YES
USE_BUILDLINK2= YES
DIST_SUBDIR= ${PKGBASE}
-WRKSRC= ${WRKDIR}
NO_BUILD= YES
DOCDIR= ${PREFIX}/share/kde/apps/quanta/doc
diff --git a/www/quanta/Makefile b/www/quanta/Makefile
index 5c98d04ea96..f817893c29b 100644
--- a/www/quanta/Makefile
+++ b/www/quanta/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.12 2002/10/02 22:28:09 wiz Exp $
+# $NetBSD: Makefile,v 1.13 2003/03/29 12:42:54 jmmv Exp $
DISTNAME= quanta-2.0-pr2
PKGNAME= quanta-1.9.9.2
PKGREVISION= 1
+WRKSRC= ${WRKDIR}/quanta
CATEGORIES= www
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=quanta/}
EXTRACT_SUFX= .tar.bz2
@@ -23,8 +24,6 @@ GNU_CONFIGURE= YES
USE_LIBTOOL= YES
LTCONFIG_OVERRIDE= ${WRKSRC}/admin/ltconfig
-WRKSRC= ${WRKDIR}/quanta
-
pre-configure:
cd ${WRKSRC}; \
${ACLOCAL}; \
diff --git a/www/ruby-htmlsplit/Makefile b/www/ruby-htmlsplit/Makefile
index 7001b494224..8afe654cb0c 100644
--- a/www/ruby-htmlsplit/Makefile
+++ b/www/ruby-htmlsplit/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.2 2001/07/04 16:02:36 taca Exp $
+# $NetBSD: Makefile,v 1.3 2003/03/29 12:42:54 jmmv Exp $
DISTNAME= htmlsplit102
PKGNAME= ${RUBY_PKGNAMEPREFIX}htmlsplit-1.0.2
+WRKSRC= ${WRKDIR}
CATEGORIES= www
MASTER_SITES= http://www.moonwolf.com/ruby/archive/
EXTRACT_SUFX= .zip
@@ -11,7 +12,6 @@ HOMEPAGE= http://www.moonwolf.com/ruby/htmlsplit.html
COMMENT= Ruby HTML split/join library
DIST_SUBDIR= ruby
-WRKSRC= ${WRKDIR}
USE_RUBY_RD= # defined
NO_CONFIGURE= # defined
diff --git a/www/ruby-tag/Makefile b/www/ruby-tag/Makefile
index c7bc0a43ff9..9da72d4530d 100644
--- a/www/ruby-tag/Makefile
+++ b/www/ruby-tag/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.1.1.1 2001/07/01 14:17:14 taca Exp $
+# $NetBSD: Makefile,v 1.2 2003/03/29 12:42:54 jmmv 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
@@ -11,7 +12,6 @@ HOMEPAGE= http://www.moonwolf.com/ruby/tag.html
COMMENT= Ruby Simple HTML Tag library for CGI
DIST_SUBDIR= ruby
-WRKSRC= ${WRKDIR}
USE_RUBY_RD= # defined
NO_CONFIGURE= # defined
diff --git a/www/spfc/Makefile b/www/spfc/Makefile
index 0e62029f58e..b092807932a 100644
--- a/www/spfc/Makefile
+++ b/www/spfc/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.8 2002/12/31 15:44:31 jlam Exp $
+# $NetBSD: Makefile,v 1.9 2003/03/29 12:42:54 jmmv Exp $
DISTNAME= spfc-0.2.0
+WRKSRC= ${WRKDIR}/spfc-0.2.0/src/
CATEGORIES= www
MASTER_SITES= http://java.apache.org/spfc/dist/
@@ -16,7 +17,6 @@ DEPENDS+= jsdk-2.0:../../www/jsdk20
USE_GMAKE=
NO_CONFIGURE=
MAKE_ENV+= CLASSPATH=${CLASSPATH}:${PREFIX}/lib/jsdk.jar
-WRKSRC= ${WRKDIR}/spfc-0.2.0/src/
do-install:
${INSTALL_DATA} ${WRKSRC}/../bin/spfc.jar ${PREFIX}/lib/java
diff --git a/www/squid/Makefile b/www/squid/Makefile
index a98c8ca4d70..f127c63e1a0 100644
--- a/www/squid/Makefile
+++ b/www/squid/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.79 2003/03/25 17:44:22 taca Exp $
+# $NetBSD: Makefile,v 1.80 2003/03/29 12:42:55 jmmv Exp $
DISTNAME= squid-2.5.STABLE2
PKGNAME= squid-2.5.2
+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/ \
@@ -41,7 +42,6 @@ BUILD_DEFS+= SQUID_CONFIGURE_ARGS
MAKE_ENV+= INSTALL_SCRIPT="${INSTALL_SCRIPT}"
MAKE_ENV+= PKG_PREFIX="${PREFIX}"
PLIST_SRC= ${WRKDIR}/PLIST
-WRKSRC= ${WRKDIR}/${DISTNAME:S/-src//}
RCD_SCRIPTS= squid
CONF_FILES+= ${EXAMPLESDIR}/mime.conf ${PKG_SYSCONFDIR}/mime.conf
diff --git a/www/swill/Makefile b/www/swill/Makefile
index 0bf8a23fb51..a7467ce6384 100644
--- a/www/swill/Makefile
+++ b/www/swill/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.1.1.1 2002/06/18 06:37:37 thorpej Exp $
+# $NetBSD: Makefile,v 1.2 2003/03/29 12:42:55 jmmv Exp $
DISTNAME= swill-0.1
+WRKSRC= ${WRKDIR}/SWILL-0.1
CATEGORIES= www devel
MASTER_SITES= http://systems.cs.uchicago.edu/swill/
@@ -10,6 +11,4 @@ COMMENT= The Simple Web Interface Link Library
GNU_CONFIGURE= yes
-WRKSRC= ${WRKDIR}/SWILL-0.1
-
.include "../../mk/bsd.pkg.mk"
diff --git a/www/swish-e/Makefile b/www/swish-e/Makefile
index 491c93037f0..4c70e3da92b 100644
--- a/www/swish-e/Makefile
+++ b/www/swish-e/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.7 2001/03/13 15:36:50 zuntum Exp $
+# $NetBSD: Makefile,v 1.8 2003/03/29 12:42:55 jmmv 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/
@@ -10,8 +11,6 @@ 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/tidy/Makefile b/www/tidy/Makefile
index 0cf6c7d41d8..7ce4ffaf4f7 100644
--- a/www/tidy/Makefile
+++ b/www/tidy/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.8 2002/11/22 16:37:05 jschauma Exp $
+# $NetBSD: Makefile,v 1.9 2003/03/29 12:42:55 jmmv Exp $
#
DISTNAME= tidy_src_021108
PKGNAME= tidy-20021108
+WRKSRC= ${WRKDIR}/tidy
CATEGORIES= www
MASTER_SITES= http://tidy.sourceforge.net/src/ \
http://tidy.sourceforge.net/docs/ \
@@ -14,7 +15,6 @@ MAINTAINER= packages@netbsd.org
HOMEPAGE= http://tidy.sourceforge.net/
COMMENT= Fixes and tidies up HTML files
-WRKSRC= ${WRKDIR}/tidy
ALL_TARGET= tidy
CFLAGS+= -DPRESERVE_FILE_TIMES=0
diff --git a/www/w3c-httpd/Makefile b/www/w3c-httpd/Makefile
index e4ae1d7247a..5670f1b88fd 100644
--- a/www/w3c-httpd/Makefile
+++ b/www/w3c-httpd/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.8 2001/09/09 20:36:54 agc Exp $
+# $NetBSD: Makefile,v 1.9 2003/03/29 12:42:55 jmmv 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/
@@ -10,8 +11,6 @@ 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 7fd3c919d6c..aa090a529b4 100644
--- a/www/w3m/Makefile.common
+++ b/www/w3m/Makefile.common
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile.common,v 1.17 2003/03/28 20:29:27 wiz Exp $
+# $NetBSD: Makefile.common,v 1.18 2003/03/29 12:42:56 jmmv Exp $
#
DISTNAME= w3m-${W3M_VERS}
+WRKSRC= ${WRKDIR}/w3m-${W3M_VERS}
CATEGORIES= www
MASTER_SITES= http://www2u.biglobe.ne.jp/~hsaka/w3m/patch/
@@ -16,7 +17,6 @@ W3M_M17N_VERS= 20030224
# w3m source with m17n patch applied.
W3M_SRC= ${DISTNAME}${EXTRACT_SUFX}
-WRKSRC= ${WRKDIR}/w3m-${W3M_VERS}
DISTFILES+= ${W3M_SRC}
EXTRACT_ONLY= ${W3M_SRC}
diff --git a/www/webalizer/Makefile b/www/webalizer/Makefile
index 40cbb7c8efd..0ad5e83db28 100644
--- a/www/webalizer/Makefile
+++ b/www/webalizer/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.23 2003/03/22 03:11:29 wiz Exp $
+# $NetBSD: Makefile,v 1.24 2003/03/29 12:42:56 jmmv Exp $
#
DISTNAME= webalizer-2.01-10-src
PKGNAME= webalizer-2.1.10
+WRKSRC= ${WRKDIR}/${DISTNAME:S/-src//}
CATEGORIES= www
MASTER_SITES= ftp://ftp.mrunix.net/pub/webalizer/ \
ftp://webalizer.dexa.org/pub/webalizer/ \
@@ -13,8 +14,6 @@ MAINTAINER= packages@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 7203c3a3202..d1ac1b4353e 100644
--- a/www/zope-confera/Makefile
+++ b/www/zope-confera/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.6 2001/02/17 17:22:49 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2003/03/29 12:42:56 jmmv 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
@@ -15,8 +16,6 @@ DEPENDS+= zope>=2.1.4:../../www/zope
NO_BUILD= yes
-WRKSRC= ${WRKDIR}/lib
-
PLIST_SRC= ${WRKDIR}/.PLIST_SRC
ZOPEDIR= ${PREFIX}/lib/zope
diff --git a/www/zope25-CMF/Makefile b/www/zope25-CMF/Makefile
index 3862383e5a3..f13598f194c 100644
--- a/www/zope25-CMF/Makefile
+++ b/www/zope25-CMF/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.2 2002/09/12 11:09:48 drochner Exp $
+# $NetBSD: Makefile,v 1.3 2003/03/29 12:42:56 jmmv Exp $
DISTNAME= CMF-1.3
PKGNAME= zope25-CMF-1.3
+WRKSRC= ${WRKDIR}/CMF-1.3
CATEGORIES= www
MASTER_SITES= http://cmf.zope.org/download/CMF-1.3/
@@ -9,7 +10,6 @@ MAINTAINER= packages@netbsd.org
HOMEPAGE= http://cmf.zope.org/
COMMENT= Content Management Framework for Zope
-WRKSRC= ${WRKDIR}/CMF-1.3
PRODNAMES= CMFCalendar CMFCore CMFDefault CMFTopic
ZOPE_COPYPRODUCT= zope-std-copyproduct-short
diff --git a/www/zope25-CMFPlone/Makefile b/www/zope25-CMFPlone/Makefile
index c501a8e7bde..f01d0eb1bc0 100644
--- a/www/zope25-CMFPlone/Makefile
+++ b/www/zope25-CMFPlone/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.2 2002/12/02 15:17:58 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2003/03/29 12:42:56 jmmv Exp $
DISTNAME= CMFPlone1.0beta3
PKGNAME= zope25-CMFPlone-1.0beta3
+WRKSRC= ${WRKDIR}/CMFPlone-1.0beta3
CATEGORIES= www
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=/plone/}
@@ -12,7 +13,6 @@ COMMENT= Content Management System
DEPENDS+= zope25-CMF-[0-9]*:../../www/zope25-CMF
DEPENDS+= zope25-Formulator-[0-9]*:../../www/zope25-Formulator
-WRKSRC= ${WRKDIR}/CMFPlone-1.0beta3
PRODNAMES= ActivePak CMFPlone DCWorkflow
ZOPE_COPYPRODUCT= zope-std-copyproduct-short
diff --git a/www/zope25-ZPsycopgDA/Makefile b/www/zope25-ZPsycopgDA/Makefile
index 73cab10c01b..f1c54e43684 100644
--- a/www/zope25-ZPsycopgDA/Makefile
+++ b/www/zope25-ZPsycopgDA/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.2 2003/01/21 19:38:23 drochner Exp $
+# $NetBSD: Makefile,v 1.3 2003/03/29 12:42:57 jmmv Exp $
#
DISTNAME= psycopg-1.0.14
PKGNAME= zope25-ZPsycopgDA-1.0.14
+WRKSRC= ${WRKDIR}/${DISTNAME}
CATEGORIES= www
MASTER_SITES= http://initd.org/pub/software/psycopg/
@@ -12,7 +13,6 @@ COMMENT= PostgreSQL database adapter for Zope
USE_BUILDLINK2= yes
ZOPE_COPYPRODUCT= zope-std-copyproduct-short
-WRKSRC= ${WRKDIR}/${DISTNAME}
.include "../../www/zope25/product.mk"
.include "../../databases/py-psycopg/buildlink2.mk"
diff --git a/www/zopeedit/Makefile b/www/zopeedit/Makefile
index 68077964a10..27e0140fbe3 100644
--- a/www/zopeedit/Makefile
+++ b/www/zopeedit/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.1.1.1 2002/11/14 18:36:21 drochner Exp $
+# $NetBSD: Makefile,v 1.2 2003/03/29 12:42:57 jmmv Exp $
#
DISTNAME= zopeedit-src-0.6
PKGNAME= zopeedit-0.6
+WRKSRC= ${WRKDIR}/zopeedit
CATEGORIES= www
MASTER_SITES= http://www.zope.org/Members/Caseman/ExternalEditor/
EXTRACT_SUFX= .tgz
@@ -11,7 +12,6 @@ MAINTAINER= packages@netbsd.org
HOMEPAGE= http://www.zope.org/Members/Caseman/ExternalEditor
COMMENT= helper client application for Zope's ExternalEditor
-WRKSRC= ${WRKDIR}/zopeedit
USE_BUILDLINK2= YES
PYTHON_VERSIONS_ACCEPTED= 22
PYTHON_PATCH_SCRIPTS= zopeedit.py