Update MASTER_SITES and/or HOMEPAGE, from Sergey Svishchev.

30 files changed, 66 insertions, 67 deletions

diff --git a/www/SpeedyCGI/Makefile b/www/SpeedyCGI/Makefile
index f0eaff48a81..8aa195c8620 100644
--- a/www/SpeedyCGI/Makefile
+++ b/www/SpeedyCGI/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2005/08/06 06:19:35 jlam Exp $
+# $NetBSD: Makefile,v 1.6 2006/10/04 22:04:09 wiz Exp $
 
 DISTNAME=	CGI-SpeedyCGI-2.22
 PKGNAME=	SpeedyCGI-2.22
@@ -7,7 +7,7 @@ CATEGORIES=	www
 MASTER_SITES=	http://daemoninc.com/SpeedyCGI/
 
 MAINTAINER=	adrianp@stindustries.net
-HOMEPAGE=	http://daemoninc.com/speedycgi/
+HOMEPAGE=	http://daemoninc.com/SpeedyCGI/
 COMMENT=	Speed up perl scripts by running them persistently
 
 PERL5_PACKLIST= auto/CGI/SpeedyCGI/.packlist
diff --git a/www/ap-layout/Makefile b/www/ap-layout/Makefile
index 97708d914ba..0685ef781da 100644
--- a/www/ap-layout/Makefile
+++ b/www/ap-layout/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2006/06/02 18:27:59 joerg Exp $
+# $NetBSD: Makefile,v 1.15 2006/10/04 22:04:09 wiz Exp $
 #
 
 DISTNAME=	mod_layout-3.2
@@ -8,7 +8,7 @@ MASTER_SITES=	ftp://ftp.tangent.org/pub/apache/ \
 		http://software.tangent.org/download/
 
 MAINTAINER=	grant@NetBSD.org
-HOMEPAGE=	http://software.tangent.org/
+HOMEPAGE=	http://tangent.org/
 COMMENT=	Apache module to wrap static or dynamic content
 
 CONFLICTS=	ap-layout-[0-9]*
diff --git a/www/ap-mp3/Makefile b/www/ap-mp3/Makefile
index 0b26878595c..fcc4cf380c0 100644
--- a/www/ap-mp3/Makefile
+++ b/www/ap-mp3/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2006/06/02 18:27:59 joerg Exp $
+# $NetBSD: Makefile,v 1.13 2006/10/04 22:04:09 wiz Exp $
 #
 
 DISTNAME=	mod_mp3-0.35
@@ -8,7 +8,7 @@ MASTER_SITES=	ftp://ftp.tangent.org/pub/apache/ \
 		http://software.tangent.org/download/
 
 MAINTAINER=	grant@NetBSD.org
-HOMEPAGE=	http://software.tangent.org/media/
+HOMEPAGE=	http://tangent.org/media/
 COMMENT=	Apache module for streaming mp3 files
 
 CONFLICTS=	ap-mp3-[0-9]*
diff --git a/www/ap-xslt/Makefile b/www/ap-xslt/Makefile
index ed9caf071b2..211bc4d2e7b 100644
--- a/www/ap-xslt/Makefile
+++ b/www/ap-xslt/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.31 2006/06/02 18:27:59 joerg Exp $
+# $NetBSD: Makefile,v 1.32 2006/10/04 22:04:09 wiz Exp $
 
 DISTNAME=	modxslt-1.1
 PKGNAME=	ap13-xslt-1.1
@@ -6,7 +6,7 @@ CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=modxslt/}
 
 MAINTAINER=	jwise@NetBSD.org
-HOMEPAGE=	http://modxslt.sourceforge.net/
+HOMEPAGE=	http://www.mod-xslt2.com/
 COMMENT=	Simple, fast XSLT transformations for apache
 
 CONFLICTS=	ap-xslt-[0-9]*
diff --git a/www/ap2-auth-mysql/Makefile b/www/ap2-auth-mysql/Makefile
index 6ed2364113b..b485e45bd82 100644
--- a/www/ap2-auth-mysql/Makefile
+++ b/www/ap2-auth-mysql/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2006/02/05 23:11:18 joerg Exp $
+# $NetBSD: Makefile,v 1.14 2006/10/04 22:04:09 wiz Exp $
 #
 
 DISTNAME=		mod_auth_mysql.c
@@ -9,7 +9,7 @@ MASTER_SITES=		ftp://ftp.kcilink.com/pub/
 DISTFILES=		${DISTNAME}.gz mysql-group-auth.txt
 
 MAINTAINER=		cube@NetBSD.org
-HOMEPAGE=		ftp://ftp.redhat.com/pub/redhat/linux/9/en/os/i386/SRPMS/
+HOMEPAGE=		ftp://ftp.kcilink.com/pub/
 COMMENT=		Module to allow Apache 2 authentication against a MySQL database
 
 CONFLICTS+=		ap-auth-mysql-*
diff --git a/www/cocoon/Makefile b/www/cocoon/Makefile
index 9b6b4b3d6a5..abdf8f792d5 100644
--- a/www/cocoon/Makefile
+++ b/www/cocoon/Makefile
@@ -1,13 +1,13 @@
-# $NetBSD: Makefile,v 1.28 2006/05/18 20:30:01 wiz Exp $
+# $NetBSD: Makefile,v 1.29 2006/10/04 22:04:09 wiz Exp $
 
 DISTNAME=	Cocoon-1.8.2
 PKGNAME=	cocoon-1.8.2
 PKGREVISION=	1
 CATEGORIES=	www
-MASTER_SITES=	http://xml.apache.org/dist/cocoon/cocoon1/
+MASTER_SITES=	http://cocoon.apache.org/dist/cocoon/cocoon1/
 
 MAINTAINER=	jwise@NetBSD.org
-HOMEPAGE=	http://xml.apache.org/cocoon/
+HOMEPAGE=	http://cocoon.apache.org/
 COMMENT=	The Apache Project's XML/XSL based web publishing system
 
 BROKEN_IN=		pkgsrc-2006Q1
diff --git a/www/cronolog/Makefile b/www/cronolog/Makefile
index 17636566a85..7081cf9c3b2 100644
--- a/www/cronolog/Makefile
+++ b/www/cronolog/Makefile
@@ -1,13 +1,13 @@
-# $NetBSD: Makefile,v 1.12 2006/10/02 23:26:43 rillig Exp $
+# $NetBSD: Makefile,v 1.13 2006/10/04 22:04:09 wiz Exp $
 #
 
 DISTNAME=	cronolog-1.6.2
 PKGREVISION=	1
 CATEGORIES=	www
-MASTER_SITES=	http://www.cronolog.org/download/
+MASTER_SITES=	http://cronolog.org/download/
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
-HOMEPAGE=	http://www.cronolog.org/
+HOMEPAGE=	http://cronolog.org/
 COMMENT=	Web log rotation utility that provides datestamp filenames
 
 GNU_CONFIGURE=	YES
diff --git a/www/galway/Makefile b/www/galway/Makefile
index 8c969941983..91c41d04879 100644
--- a/www/galway/Makefile
+++ b/www/galway/Makefile
@@ -1,14 +1,13 @@
-# $NetBSD: Makefile,v 1.15 2006/02/05 23:11:23 joerg Exp $
+# $NetBSD: Makefile,v 1.16 2006/10/04 22:04:09 wiz Exp $
 #
 
 DISTNAME=	galway-0.33
 PKGREVISION=	8
 CATEGORIES=	www x11 gnome
-MASTER_SITES=	http://erin.netpedia.net/download/
+MASTER_SITES=	${MASTER_SITE_LOCAL}
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	rh@NetBSD.org
-HOMEPAGE=	http://erin.netpedia.net/galway.html
 COMMENT=	Web editor programmed in Scheme
 
 DEPENDS+=	guile-gtk-0.19*:../../devel/guile14-gtk
diff --git a/www/instiki/Makefile b/www/instiki/Makefile
index af67fe54ca9..1995967be9e 100644
--- a/www/instiki/Makefile
+++ b/www/instiki/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2006/04/22 09:22:16 rillig Exp $
+# $NetBSD: Makefile,v 1.15 2006/10/04 22:04:09 wiz Exp $
 
 DISTNAME=	instiki-0.9.2
 PKGREVISION=	4
@@ -7,7 +7,7 @@ MASTER_SITES=	http://rubyforge.org/frs/download.php/2515/
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	minskim@NetBSD.org
-HOMEPAGE=	http://instiki.org/
+HOMEPAGE=	http://instiki.org/show/HomePage
 COMMENT=	Wiki clone that focuses on simple installation and running
 
 NO_BUILD=	yes
diff --git a/www/jakarta-tomcat4/Makefile b/www/jakarta-tomcat4/Makefile
index 774208b1913..21e7f02911d 100644
--- a/www/jakarta-tomcat4/Makefile
+++ b/www/jakarta-tomcat4/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2006/07/27 15:16:44 jlam Exp $
+# $NetBSD: Makefile,v 1.11 2006/10/04 22:04:09 wiz Exp $
 
 PKGNAME=        jakarta-tomcat4-${TOMCAT_VERSION}
 DISTNAME=       jakarta-tomcat-${TOMCAT_VERSION}
@@ -9,7 +9,7 @@ CATEGORIES=	www java
 # The getsite.sh script parses the HTML and extracts the urls.
 
 MAINTAINER=	erh@NetBSD.org
-HOMEPAGE=	http://jakarta.apache.org/tomcat/
+HOMEPAGE=	http://tomcat.apache.org/
 COMMENT=	The Apache Project's Java Servlet 2.3 and JSP 1.2 server
 
 TOMCAT_VERSION=	4.1.30
diff --git a/www/jakarta-tomcat5/Makefile b/www/jakarta-tomcat5/Makefile
index b9fcfb9ce67..4d317c2ecb7 100644
--- a/www/jakarta-tomcat5/Makefile
+++ b/www/jakarta-tomcat5/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2006/07/27 15:16:44 jlam Exp $
+# $NetBSD: Makefile,v 1.14 2006/10/04 22:04:09 wiz Exp $
 
 PKGNAME=	jakarta-tomcat5-${TOMCAT_VERSION}
 DISTNAME=	jakarta-tomcat-${TOMCAT_VERSION}
@@ -8,7 +8,7 @@ CATEGORIES=	www java
 # The getsite.sh script parses the HTML and extracts the urls.
 
 MAINTAINER=	erh@NetBSD.org
-HOMEPAGE=	http://jakarta.apache.org/tomcat/
+HOMEPAGE=	http://tomcat.apache.org/
 COMMENT=	The Apache Project's Java Servlet 2.4 and JSP 2.0 server
 
 TOMCAT_VERSION= 5.0.30
diff --git a/www/jsdk20/Makefile b/www/jsdk20/Makefile
index 991baa8668f..4843e6dcd17 100644
--- a/www/jsdk20/Makefile
+++ b/www/jsdk20/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.30 2006/07/18 23:27:14 jlam Exp $
+# $NetBSD: Makefile,v 1.31 2006/10/04 22:04:10 wiz 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.
@@ -13,7 +13,7 @@ MASTER_SITES=	# none
 EXTRACT_SUFX=	.tar.Z
 
 MAINTAINER=	jwise@NetBSD.org
-HOMEPAGE=	http://java.sun.com/products/servlet/index.html
+HOMEPAGE=	http://java.sun.com/products/servlet/index.jsp
 COMMENT=	Sun's Java Servlet Development Kit, version 2.0
 
 ARCHIVE=	http://java.sun.com/products/servlet/archive.html
diff --git a/www/links/Makefile.common b/www/links/Makefile.common
index 0c2fb7fd967..78132ef68a2 100644
--- a/www/links/Makefile.common
+++ b/www/links/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.31 2006/09/03 20:35:36 wiz Exp $
+# $NetBSD: Makefile.common,v 1.32 2006/10/04 22:04:10 wiz Exp $
 
 DISTNAME=	links-2.1pre23
 CATEGORIES=	www
@@ -6,7 +6,7 @@ MASTER_SITES=	http://links.twibright.com/download/
 EXTRACT_SUFX=  .tar.bz2
 
 MAINTAINER=	jschauma@NetBSD.org
-HOMEPAGE=	http://atrey.karlin.mff.cuni.cz/~clock/twibright/links/
+HOMEPAGE=	http://links.twibright.com/
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
diff --git a/www/navigator/Makefile.common b/www/navigator/Makefile.common
index 68245e6b242..f960e528648 100644
--- a/www/navigator/Makefile.common
+++ b/www/navigator/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.83 2006/06/01 15:31:27 joerg Exp $
+# $NetBSD: Makefile.common,v 1.84 2006/10/04 22:04:10 wiz Exp $
 #
 # Common include file for communicator and navigator packages
 
@@ -129,7 +129,7 @@ WRKSRC=		${WRKDIR}
 # was: ftp://ftp.linuxppc.org/linuxppc-halloween/software/
 MASTER_SITES=	http://www.gmd.de/ftp/mirrors3/ftp.linuxppc.org/linuxppc-halloween/software/
 EXTRACT_SUFX=	.rpm
-HOMEPAGE=	http://linuxppc.org/software/index/linuxppc_stable/software/netscape-4.7-3.ppc.html
+HOMEPAGE=	http://lwn.net/2000/0629/a/netscape-ppc.php3
 BUILD_DEPENDS+=	rpm2pkg>=1.2:../../pkgtools/rpm2pkg
 DESCR_SRC=	${WRKDIR}/DESCR.linux-powerpc
 PLIST_SRC=	${WRKDIR}/PLIST_DYNAMIC
@@ -142,7 +142,7 @@ PLIST_ARCH=
 .endif
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
-HOMEPAGE?=	http://home.netscape.com/browsers/index.html
+HOMEPAGE?=	http://www.netscape.com/browsers/index.html
 RESTRICTED=	No re-distribution without agreement from Netscape
 NO_SRC_ON_CDROM=	${RESTRICTED}
 NO_BIN_ON_CDROM=	${RESTRICTED}
diff --git a/www/ns-remote/Makefile b/www/ns-remote/Makefile
index 7aa927833c2..9f90213afbe 100644
--- a/www/ns-remote/Makefile
+++ b/www/ns-remote/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.29 2006/02/05 23:11:26 joerg Exp $
+# $NetBSD: Makefile,v 1.30 2006/10/04 22:04:10 wiz Exp $
 
 DISTNAME=	ns-remote
 PKGNAME=	ns-remote-1.11
@@ -8,7 +8,7 @@ MASTER_SITES=	http://home.netscape.com/newsref/std/
 DISTFILES=	remote.c vroot.h
 
 MAINTAINER=	norm@mono.org
-HOMEPAGE=	http://home.netscape.com/newsref/std/x-remote.html
+HOMEPAGE=	http://www.netscape.com/newsref/std/x-remote.html
 COMMENT=	Remote-control of Netscape and Mozilla-based browsers
 
 DIST_SUBDIR=	netscape
diff --git a/www/p5-CGI/Makefile b/www/p5-CGI/Makefile
index 770ea3f30e7..6cf4ff604ad 100644
--- a/www/p5-CGI/Makefile
+++ b/www/p5-CGI/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.38 2006/07/12 17:03:43 heinz Exp $
+# $NetBSD: Makefile,v 1.39 2006/10/04 22:04:10 wiz Exp $
 #
 
 VERS=			3.20
@@ -9,7 +9,7 @@ CATEGORIES=		www perl5
 MASTER_SITES+=		${MASTER_SITE_PERL_CPAN:=CGI/}
 
 MAINTAINER=		pkgsrc-users@NetBSD.org
-HOMEPAGE=		http://stein.cshl.org/WWW/software/CGI/
+HOMEPAGE=		http://search.cpan.org/dist/CGI.pm/
 COMMENT=		Perl5 module for writing forms-based CGI programs
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
diff --git a/www/p5-VRML/Makefile b/www/p5-VRML/Makefile
index 493d0965429..ea51749a77a 100644
--- a/www/p5-VRML/Makefile
+++ b/www/p5-VRML/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2006/03/04 21:31:03 jlam Exp $
+# $NetBSD: Makefile,v 1.16 2006/10/04 22:04:10 wiz Exp $
 #
 
 DISTNAME=	VRML-1.04
@@ -9,7 +9,7 @@ CATEGORIES=	www net perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=VRML/}
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
-HOMEPAGE=	http://www.gfz-potsdam.de/~palm/software/VRML/doc/VRML.pm.html
+HOMEPAGE=	http://dc.gfz-potsdam.de/~palm/software/VRML/doc/VRML.pm.html
 COMMENT=	Set of VRML classes for Perl
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
diff --git a/www/py-curl/Makefile b/www/py-curl/Makefile
index 4eabb3d0581..c7aff8004cf 100644
--- a/www/py-curl/Makefile
+++ b/www/py-curl/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.27 2006/04/06 06:22:55 reed Exp $
+# $NetBSD: Makefile,v 1.28 2006/10/04 22:04:10 wiz Exp $
 
 DISTNAME=	pycurl-7.13.2
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME:S/py//}
@@ -7,7 +7,7 @@ CATEGORIES=	www python
 MASTER_SITES=	http://pycurl.sourceforge.net/download/
 
 MAINTAINER=	shell@NetBSD.org
-HOMEPAGE=	http://pycurl.sf.net/
+HOMEPAGE=	http://pycurl.sourceforge.net/
 COMMENT=	Python module interface to the cURL library
 
 PYDISTUTILSPKG=	# defined
diff --git a/www/py-nevow/Makefile b/www/py-nevow/Makefile
index 352637f5226..326b8199dc1 100644
--- a/www/py-nevow/Makefile
+++ b/www/py-nevow/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2006/06/07 12:55:52 joerg Exp $
+# $NetBSD: Makefile,v 1.6 2006/10/04 22:04:10 wiz Exp $
 #
 
 DISTNAME=		nevow-0.3
@@ -8,7 +8,7 @@ CATEGORIES=		www python
 MASTER_SITES=		http://www.divmod.org/users/release/divmod/
 
 MAINTAINER=		sifu@0xx0.net
-HOMEPAGE=		http://nevow.com/
+HOMEPAGE=		http://divmod.org/trac/wiki/DivmodNevow
 COMMENT=		Next-generation web application templating system
 
 DEPENDS+=		${PYPKGPREFIX}-twisted>=1.3.0:../../net/py-twisted
diff --git a/www/seamonkey-bin/Makefile b/www/seamonkey-bin/Makefile
index c90f366884f..c2c848dd8ee 100644
--- a/www/seamonkey-bin/Makefile
+++ b/www/seamonkey-bin/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.7 2006/09/24 16:35:39 salo Exp $
+# $NetBSD: Makefile,v 1.8 2006/10/04 22:04:10 wiz Exp $
 
 MOZILLA=		seamonkey
 MOZ_VER=		1.0.5
 MOZ_DISTVER=		${MOZ_VER}
 
-HOMEPAGE=		http://www.mozilla.org/projects/seamonkey
+HOMEPAGE=		http://www.mozilla.org/projects/seamonkey/
 COMMENT=		Full featured gecko-based browser (binary package)
 
 DIST_SUBDIR=		${MOZILLA}/${MOZ_DISTDIR}
diff --git a/www/swiggle/Makefile b/www/swiggle/Makefile
index 184dd8ca73e..19dfa4d1084 100644
--- a/www/swiggle/Makefile
+++ b/www/swiggle/Makefile
@@ -1,12 +1,12 @@
-# $NetBSD: Makefile,v 1.7 2006/02/05 23:11:29 joerg Exp $
+# $NetBSD: Makefile,v 1.8 2006/10/04 22:04:10 wiz Exp $
 
 DISTNAME=	swiggle-0.3.3
 PKGREVISION=	1
 CATEGORIES=	www graphics
-MASTER_SITES=	http://mailbox.univie.ac.at/~le/swiggle/files/
+MASTER_SITES=	http://homepage.univie.ac.at/l.ertl/swiggle/files/
 
 MAINTAINER=	snj@NetBSD.org
-HOMEPAGE=	http://mailbox.univie.ac.at/~le/swiggle/
+HOMEPAGE=	http://homepage.univie.ac.at/l.ertl/swiggle/
 COMMENT=	Lightweight image gallery generator
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
diff --git a/www/w3/Makefile b/www/w3/Makefile
index fcd300e178b..95dbf3db85d 100644
--- a/www/w3/Makefile
+++ b/www/w3/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2006/04/28 19:04:56 joerg Exp $
+# $NetBSD: Makefile,v 1.23 2006/10/04 22:04:10 wiz Exp $
 
 DISTNAME=	w3-4.0pre.47
 PKGNAME=	${EMACS_PKGNAME_PREFIX}w3-4.0b47
@@ -7,7 +7,7 @@ CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_XEMACS:=emacs-w3/}
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
-HOMEPAGE=	http://www.cs.indiana.edu/elisp/w3/docs.html
+HOMEPAGE=	http://www.gnu.org/software/w3/
 COMMENT=	World Wide Web browser for Emacs
 
 # included in xemacs-packages
diff --git a/www/w3c-httpd/Makefile b/www/w3c-httpd/Makefile
index cf2f0b677b3..91ee252f0cc 100644
--- a/www/w3c-httpd/Makefile
+++ b/www/w3c-httpd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2006/06/20 22:32:57 minskim Exp $
+# $NetBSD: Makefile,v 1.21 2006/10/04 22:04:10 wiz Exp $
 
 DISTNAME=	w3c-httpd-3.0A
 PKGREVISION=	1
@@ -7,7 +7,7 @@ MASTER_SITES=	ftp://ftp.w3.org/pub/httpd/ \
 		ftp://ftp-eu.w3.org/pub/httpd/
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
-HOMEPAGE=	http://www.w3.org/pub/WWW/Daemon/
+HOMEPAGE=	http://www.w3.org/Daemon/
 COMMENT=	WWW server from the W3 Consortium (W3C)
 
 WRKSRC=		${WRKDIR}
diff --git a/www/webnew/Makefile b/www/webnew/Makefile
index 3d6a702b19d..2c2c0360d17 100644
--- a/www/webnew/Makefile
+++ b/www/webnew/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2005/07/16 01:19:26 jlam Exp $
+# $NetBSD: Makefile,v 1.7 2006/10/04 22:04:10 wiz Exp $
 #
 
 DISTNAME=		webnew-1.3
@@ -6,7 +6,7 @@ CATEGORIES=		www
 MASTER_SITES=		ftp://ftp.gw.com/pub/people/kim/
 
 MAINTAINER=		kim@tac.nyc.ny.us
-HOMEPAGE=		http://www.tac.nyc.ny.us/kim/webnew/
+HOMEPAGE=		http://kimmo.suominen.com/webnew/
 COMMENT=		Retrieve modification times of web documents
 
 USE_TOOLS+=		perl:run
diff --git a/www/zope25-CMF/Makefile b/www/zope25-CMF/Makefile
index 83563eefef7..0745bae0d52 100644
--- a/www/zope25-CMF/Makefile
+++ b/www/zope25-CMF/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2006/03/04 21:31:04 jlam Exp $
+# $NetBSD: Makefile,v 1.10 2006/10/04 22:04:10 wiz Exp $
 
 DISTNAME=	CMF-1.3.1
 PKGREVISION=	1
@@ -7,7 +7,7 @@ CATEGORIES=	www
 MASTER_SITES=	http://cmf.zope.org/download/CMF-1.3.1/
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
-HOMEPAGE=	http://cmf.zope.org/
+HOMEPAGE=	http://www.zope.org/Products/CMF/
 COMMENT=	Content Management Framework for Zope
 
 WRKSRC=		${WRKDIR}/CMF-1.3.1
diff --git a/www/zope25-CMFPlone/Makefile b/www/zope25-CMFPlone/Makefile
index dd5d5a0915c..066f5377970 100644
--- a/www/zope25-CMFPlone/Makefile
+++ b/www/zope25-CMFPlone/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2006/04/06 06:22:56 reed Exp $
+# $NetBSD: Makefile,v 1.16 2006/10/04 22:04:10 wiz Exp $
 
 DISTNAME=	CMFPlone1.0.3
 PKGNAME=	zope25-CMFPlone-1.0.3
@@ -6,7 +6,7 @@ CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=/plone/}
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
-HOMEPAGE=	http://www.plone.org/
+HOMEPAGE=	http://plone.org/
 COMMENT=	Content Management System
 
 BUILDLINK_API_DEPENDS.zope+=	zope-2.6.*
diff --git a/www/zope25-JPicture/Makefile b/www/zope25-JPicture/Makefile
index bcd15998c45..4e1dcf504c3 100644
--- a/www/zope25-JPicture/Makefile
+++ b/www/zope25-JPicture/Makefile
@@ -1,16 +1,16 @@
-# $NetBSD: Makefile,v 1.13 2006/04/06 06:22:56 reed Exp $
+# $NetBSD: Makefile,v 1.14 2006/10/04 22:04:11 wiz Exp $
 
 DISTNAME=	JPicture-2_0
 PKGREVISION=	3
 PKGNAME=	zope25-JPicture-2.0
 CATEGORIES=	www
-MASTER_SITES=	http://www.dataflake.org/software/jpicture/
+MASTER_SITES=	http://www.dataflake.org/old_stuff/jpicture/jpicture_2.0
 EXTRACT_SUFX=	.tgz
 
 BUILDLINK_API_DEPENDS.pyimaging+=	${PYPKGPREFIX}-imaging>=1.1.3
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
-HOMEPAGE=	http://www.dataflake.org/software/jpicture/
+HOMEPAGE=	http://www.dataflake.org/old_stuff/jpicture/
 COMMENT=	Present your photos quickly in zope
 
 ZOPE_COPYPRODUCT= zope-std-copyproduct-short
diff --git a/www/zope25-MailManager/Makefile b/www/zope25-MailManager/Makefile
index cef68f07236..73cae5d79e7 100644
--- a/www/zope25-MailManager/Makefile
+++ b/www/zope25-MailManager/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2006/03/04 21:31:05 jlam Exp $
+# $NetBSD: Makefile,v 1.6 2006/10/04 22:04:11 wiz Exp $
 
 DISTNAME=	MailManager-0.94
 PKGNAME=	zope25-MailManager-0.94
@@ -7,7 +7,7 @@ CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=mailmanager/}
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
-HOMEPAGE=	http://mailmanager.sourceforge.net/
+HOMEPAGE=	http://www.logicalware.org/
 COMMENT=	Mail management and issue tracking
 
 DEPENDS+=	${PYPKGPREFIX}-mimelib-[0-9]*:../../net/py-mimelib
diff --git a/www/zope25-MetaPublisher/Makefile b/www/zope25-MetaPublisher/Makefile
index 90f7c60d9ea..5becf3b3368 100644
--- a/www/zope25-MetaPublisher/Makefile
+++ b/www/zope25-MetaPublisher/Makefile
@@ -1,14 +1,14 @@
-# $NetBSD: Makefile,v 1.7 2006/03/04 21:31:05 jlam Exp $
+# $NetBSD: Makefile,v 1.8 2006/10/04 22:04:11 wiz Exp $
 
 DISTNAME=	MetaPublisher128
 PKGREVISION=	2
 PKGNAME=	zope25-MetaPublisher-1.2.8
 CATEGORIES=	www
-MASTER_SITES=	http://www.beehive.de/downloads/
+MASTER_SITES=	${MASTER_SITE_LOCAL}
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
-HOMEPAGE=	http://www.beehive.de/zope/freeware/metapublisher.html
+HOMEPAGE=	# AWOL since 2003
 COMMENT=	Data table and access form tool
 
 ZOPE_COPYPRODUCT=	zope-std-copyproduct-long-nogarbage
diff --git a/www/zope25-ZPsycopgDA/Makefile b/www/zope25-ZPsycopgDA/Makefile
index b6cda25deae..5e1bd158863 100644
--- a/www/zope25-ZPsycopgDA/Makefile
+++ b/www/zope25-ZPsycopgDA/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2006/03/04 21:31:06 jlam Exp $
+# $NetBSD: Makefile,v 1.17 2006/10/04 22:04:11 wiz Exp $
 #
 
 DISTNAME=	psycopg-1.1.21
@@ -8,7 +8,7 @@ CATEGORIES=	www
 MASTER_SITES=	http://initd.org/pub/software/psycopg/
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
-HOMEPAGE=	http://initd.org/software/psycopg
+HOMEPAGE=	http://initd.org/software/psycopg1
 COMMENT=	PostgreSQL database adapter for Zope
 
 WRKSRC=		${WRKDIR}/${DISTNAME}