Update MASTER_SITES and/or HOMEPAGE, from Sergey Svishchev.

46 files changed, 105 insertions, 108 deletions

diff --git a/devel/acr/Makefile b/devel/acr/Makefile
index c8b5aa520dc..71157152bdf 100644
--- a/devel/acr/Makefile
+++ b/devel/acr/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2005/09/26 23:33:45 xtraeme Exp $
+# $NetBSD: Makefile,v 1.2 2006/10/04 21:35:58 wiz Exp $
 #
 
 DISTNAME=		acr-0.4
@@ -7,7 +7,7 @@ MASTER_SITES=		http://cvs.nopcode.org/ftp/acr/ \
 			ftp://ftp.nopcode.org/prj/acr/
 
 MAINTAINER=		pancake@phreaker.net
-HOMEPAGE=		http://www.nopcode.org/pancake/acr.html
+HOMEPAGE=		http://news.nopcode.org/pancake/acr.html
 COMMENT=		Autoconf replacement
 
 GNU_CONFIGURE=		yes
diff --git a/devel/argtable/Makefile b/devel/argtable/Makefile
index 651a795c745..95552e0522f 100644
--- a/devel/argtable/Makefile
+++ b/devel/argtable/Makefile
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.11 2006/06/02 15:34:12 joerg Exp $
+# $NetBSD: Makefile,v 1.12 2006/10/04 21:35:58 wiz Exp $
 
 DISTNAME=	argtable-1.2
 CATEGORIES=	devel
-MASTER_SITES=	http://metalab.unc.edu/pub/Linux/devel/
+MASTER_SITES=	http://www.ibiblio.org/pub/Linux/devel/
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
-HOMEPAGE=	http://metalab.unc.edu/pub/Linux/devel/argtable.html
+HOMEPAGE=	http://www.ibiblio.org/pub/Linux/devel/argtable.html
 COMMENT=	Library for parsing command line arguments of a C/C++ program
 
 GNU_CONFIGURE=		YES
diff --git a/devel/avl/Makefile b/devel/avl/Makefile
index 6dfa87ec60e..d4e204a50b7 100644
--- a/devel/avl/Makefile
+++ b/devel/avl/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2006/03/30 03:44:42 jlam Exp $
+# $NetBSD: Makefile,v 1.4 2006/10/04 21:35:58 wiz Exp $
 #
 
 DISTNAME=	avl-1.4.0
@@ -7,7 +7,7 @@ MASTER_SITES=	${MASTER_SITE_GNU:=avl/}
 #MASTER_SITES=	ftp://ftp.gnu.org/pub/gnu/avl/
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
-HOMEPAGE=	http://www.msu.edu/user/pfaffben/avl/
+HOMEPAGE=	http://www.stanford.edu/~blp/avl/
 COMMENT=	Library for manipulation of balanced binary trees
 
 GNU_CONFIGURE=	YES
diff --git a/devel/binutils/Makefile b/devel/binutils/Makefile
index b8de4b6f295..352d89baacf 100644
--- a/devel/binutils/Makefile
+++ b/devel/binutils/Makefile
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.31 2006/03/30 03:44:42 jlam Exp $
+# $NetBSD: Makefile,v 1.32 2006/10/04 21:35:58 wiz Exp $
 
 DISTNAME=	binutils-2.16.1
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_GNU:=binutils/}
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
-HOMEPAGE=	http://www.gnu.org/directory/binutils.html
+HOMEPAGE=	http://directory.fsf.org/binutils.html
 COMMENT=	GNU binary utilities
 
 CONFLICTS=	avr-binutils<2.13.2.1nb1
diff --git a/devel/cdk/Makefile b/devel/cdk/Makefile
index ec61dc14fa1..177d41d71e4 100644
--- a/devel/cdk/Makefile
+++ b/devel/cdk/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.28 2005/06/01 20:08:00 jlam Exp $
+# $NetBSD: Makefile,v 1.29 2006/10/04 21:35:58 wiz Exp $
 #
 
 DISTNAME=		latestCDK
@@ -9,7 +9,7 @@ MASTER_SITES=		http://www.vexus.ca/release/
 EXTRACT_SUFX=		.tgz
 
 MAINTAINER=		root@garbled.net
-HOMEPAGE=		http://www.vexus.ca/CDK.html
+HOMEPAGE=		http://www.vexus.ca/products/CDK/
 COMMENT=		Curses Development Kit
 
 WRKSRC=			${WRKDIR}/${PKGNAME_NOREV}
diff --git a/devel/cvsup-gui-bin/Makefile b/devel/cvsup-gui-bin/Makefile
index 102c2314a8f..81be7e4aac8 100644
--- a/devel/cvsup-gui-bin/Makefile
+++ b/devel/cvsup-gui-bin/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2005/06/16 06:57:45 jlam Exp $
+# $NetBSD: Makefile,v 1.10 2006/10/04 21:35:58 wiz Exp $
 
 DISTNAME=	cvsup-gui-static-16.1.h
 PKGNAME=	${DISTNAME:C/static/bin/}
@@ -7,7 +7,7 @@ MASTER_SITES=	http://motoyuki.bsdclub.org/data/NetBSD/CVSup/i386/
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	motoyuki@bsdclub.org
-HOMEPAGE=	http://www.polstra.com/projects/freeware/CVSup/
+HOMEPAGE=	http://www.cvsup.org/
 COMMENT=	cvsup GUI client
 
 DEPENDS+=	cvsup-bin-[0-9]*:../../devel/cvsup-bin
diff --git a/devel/cvsup/Makefile.common b/devel/cvsup/Makefile.common
index 55821600984..554b710a315 100644
--- a/devel/cvsup/Makefile.common
+++ b/devel/cvsup/Makefile.common
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile.common,v 1.8 2006/01/12 18:01:15 rillig Exp $
+# $NetBSD: Makefile.common,v 1.9 2006/10/04 21:35:58 wiz Exp $
 
 DISTNAME=	cvsup-snap-16.1h
 CATEGORIES=	devel net
 MASTER_SITES=	ftp://ftp.freebsd.org/pub/FreeBSD/development/CVSup/snapshots/
 
 MAINTAINER=	motoyuki@bsdclub.org
-HOMEPAGE=	http://www.polstra.com/projects/freeware/CVSup/
+HOMEPAGE=	http://www.cvsup.org/
 COMMENT=	cvsup daemon and client
 
 ONLY_FOR_PLATFORM=	DragonFly-*-i386 FreeBSD-*-i386 Linux-*-i386 \
diff --git a/devel/devhelp/Makefile b/devel/devhelp/Makefile
index dbe71bae5e5..6ab55f7b46b 100644
--- a/devel/devhelp/Makefile
+++ b/devel/devhelp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.37 2006/09/24 16:24:34 salo Exp $
+# $NetBSD: Makefile,v 1.38 2006/10/04 21:35:58 wiz Exp $
 
 DISTNAME=		devhelp-0.12
 CATEGORIES=		devel x11
@@ -6,7 +6,7 @@ MASTER_SITES=		${MASTER_SITE_GNOME:=sources/devhelp/0.12/}
 EXTRACT_SUFX=		.tar.bz2
 
 MAINTAINER=		pkgsrc-users@NetBSD.org
-HOMEPAGE=		http://www.imendio.com/projects/devhelp/
+HOMEPAGE=		http://developer.imendio.com/projects/devhelp
 COMMENT=		Documentation viewer based on GNOME2
 
 USE_DIRS+=		gnome2-1.5
diff --git a/devel/device-driver-doc-de/Makefile b/devel/device-driver-doc-de/Makefile
index d3de1a5ca7d..5a284a9b74f 100644
--- a/devel/device-driver-doc-de/Makefile
+++ b/devel/device-driver-doc-de/Makefile
@@ -1,12 +1,12 @@
-# $NetBSD: Makefile,v 1.4 2006/03/04 21:29:14 jlam Exp $
+# $NetBSD: Makefile,v 1.5 2006/10/04 21:35:58 wiz Exp $
 
 DISTNAME=	NetBSD-treiber_schreiben
 PKGNAME=	device-driver-doc-de-20030729
 CATEGORIES=	devel
-MASTER_SITES=	http://www.unixag-kl.fh-kl.de/~jkunz/
+MASTER_SITES=	https://www.unixag-kl.fh-kl.de/~jkunz/
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
-HOMEPAGE=	http://www.unixag-kl.fh-kl.de/~jkunz/
+HOMEPAGE=	https://www.unixag-kl.fh-kl.de/~jkunz/
 COMMENT=	Device driver documentation in German
 
 NO_BUILD=	yes
diff --git a/devel/dmalloc/Makefile b/devel/dmalloc/Makefile
index 3d026a6f135..8527c66d798 100644
--- a/devel/dmalloc/Makefile
+++ b/devel/dmalloc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2006/03/20 18:15:38 jlam Exp $
+# $NetBSD: Makefile,v 1.18 2006/10/04 21:35:58 wiz Exp $
 
 DISTNAME=		dmalloc-5.4.2
 CATEGORIES=		devel
@@ -6,7 +6,7 @@ MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=dmalloc/}
 EXTRACT_SUFX=		.tgz
 
 MAINTAINER=		pkgsrc-users@NetBSD.org
-HOMEPAGE=		http://www.dmalloc.com/
+HOMEPAGE=		http://dmalloc.com/
 COMMENT=		Run-time configurable debugging malloc library
 
 USE_LANGUAGES=		c c++
diff --git a/devel/edcommon/Makefile b/devel/edcommon/Makefile
index d748bd9ee09..3ac227f926f 100644
--- a/devel/edcommon/Makefile
+++ b/devel/edcommon/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2006/07/22 05:10:54 rillig Exp $
+# $NetBSD: Makefile,v 1.12 2006/10/04 21:35:58 wiz Exp $
 #
 
 DISTNAME=	edcommon-32-s
@@ -8,7 +8,7 @@ CATEGORIES=	devel gnustep
 MASTER_SITES=	http://www.mulle-kybernetik.com/software/EDFrameworks/Downloads/
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
-HOMEPAGE=	http://www.mulle-kybernetik.com/software/EDFrameworks/Downloads/
+HOMEPAGE=	http://www.mulle-kybernetik.com/software/EDFrameworks/
 COMMENT=	Foundation and AppKit extensions
 
 USE_LANGUAGES=	objc
diff --git a/devel/eet/Makefile b/devel/eet/Makefile
index 823d0428303..9d281f06df1 100644
--- a/devel/eet/Makefile
+++ b/devel/eet/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2005/08/10 20:56:14 jlam Exp $
+# $NetBSD: Makefile,v 1.7 2006/10/04 21:35:58 wiz Exp $
 #
 
 DISTNAME=	eet-0.9.9
@@ -6,7 +6,7 @@ CATEGORIES=	devel archivers
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=enlightenment/}
 
 MAINTAINER=	Peter.Bex@student.kun.nl
-HOMEPAGE=	http://www.enlightenment.org/pages/eet.html
+HOMEPAGE=	http://www.enlightenment.org/Libraries/Eet/
 COMMENT=	Library for speedy storage, retrieval, and compression
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
diff --git a/devel/florist/Makefile b/devel/florist/Makefile
index 632fe6caa84..2959d380d9a 100644
--- a/devel/florist/Makefile
+++ b/devel/florist/Makefile
@@ -1,15 +1,15 @@
-# $NetBSD: Makefile,v 1.10 2006/02/05 23:08:42 joerg Exp $
+# $NetBSD: Makefile,v 1.11 2006/10/04 21:35:58 wiz Exp $
 #
 
 DISTNAME=		florist-3.15p-src
 PKGNAME=		florist-3.15p
 PKGREVISION=	2
 CATEGORIES=		devel
-MASTER_SITES=		ftp://ftp.cs.nyu.edu/pub/gnat/3.15p/
+MASTER_SITES=		http://www.cs.fsu.edu/~baker/ftp/
 EXTRACT_SUFX=		.tgz
 
 MAINTAINER=		shannonjr@NetBSD.org
-HOMEPAGE=		ftp://ftp.cs.nyu.edu/pub/gnat/3.15p/
+HOMEPAGE=		http://www.cs.fsu.edu/~baker/florist.html
 COMMENT=		FSU implementation of POSIX.5 (Ada binding)
 
 USE_PKGLOCALEDIR=	yes
diff --git a/devel/gdbada/Makefile b/devel/gdbada/Makefile
index e231158546b..707469b657d 100644
--- a/devel/gdbada/Makefile
+++ b/devel/gdbada/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2006/07/07 15:49:31 jlam Exp $
+# $NetBSD: Makefile,v 1.15 2006/10/04 21:35:58 wiz Exp $
 
 DISTNAME=	gdbada-6.3
 PKGREVISION=	2
@@ -7,7 +7,7 @@ MASTER_SITES=	http://www.johnrshannon.com/download/
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	john@johnrshannon.com
-HOMEPAGE=	http://libre.act-europe.fr/GDB/
+HOMEPAGE=	https://libre2.adacore.com/GDB/
 COMMENT=	GNAT GDB : An Ada 95 Debugger
 
 # Not yet ported to AMD 64-bit machines or Darwin
diff --git a/devel/gentle/Makefile b/devel/gentle/Makefile
index 6e0158a5c2c..990b52e1676 100644
--- a/devel/gentle/Makefile
+++ b/devel/gentle/Makefile
@@ -1,12 +1,12 @@
-# $NetBSD: Makefile,v 1.4 2005/10/23 14:11:10 rillig Exp $
+# $NetBSD: Makefile,v 1.5 2006/10/04 21:35:58 wiz Exp $
 #
 
 DISTNAME=		gentle-97
 CATEGORIES=		devel
-MASTER_SITES=		ftp://ftp.cs.cuhk.hk/pub/Linux/devel/compiler-tools/
+MASTER_SITES=		http://gentle.compilertools.net/
 
 MAINTAINER=		MarkoSchuetz@web.de
-HOMEPAGE=		http://gentle.compilertools.net/distribution.html
+HOMEPAGE=		http://gentle.compilertools.net/
 COMMENT=		Gentle Compiler Construction System
 
 USE_LIBTOOL=		yes
diff --git a/devel/giblib/Makefile b/devel/giblib/Makefile
index eaf85c9425b..6ff553d4d86 100644
--- a/devel/giblib/Makefile
+++ b/devel/giblib/Makefile
@@ -1,12 +1,12 @@
-# $NetBSD: Makefile,v 1.19 2006/04/17 13:46:03 wiz Exp $
+# $NetBSD: Makefile,v 1.20 2006/10/04 21:35:59 wiz Exp $
 
 DISTNAME=		giblib-1.2.4
 PKGREVISION=		4
 CATEGORIES=		devel
-MASTER_SITES=		http://www.linuxbrit.co.uk/downloads/
+MASTER_SITES=		http://linuxbrit.co.uk/downloads/
 
 MAINTAINER=		snj@NetBSD.org
-HOMEPAGE=		http://www.linuxbrit.co.uk/giblib/
+HOMEPAGE=		http://linuxbrit.co.uk/giblib/
 COMMENT=		Programming utility library
 
 GNU_CONFIGURE=		YES
diff --git a/devel/gtl/Makefile b/devel/gtl/Makefile
index 91d798ad8fb..4ef46463122 100644
--- a/devel/gtl/Makefile
+++ b/devel/gtl/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2006/07/18 23:27:14 jlam Exp $
+# $NetBSD: Makefile,v 1.25 2006/10/04 21:35:59 wiz Exp $
 
 DISTNAME=		GTL-1.2.1
 PKGNAME=		gtl-1.2.1
@@ -7,7 +7,7 @@ MASTER_SITES=		http://infosun.fmi.uni-passau.de/GTL/download/
 EXTRACT_SUFX=		.tar.bz2
 
 MAINTAINER=		pkgsrc-users@NetBSD.org
-HOMEPAGE=		http://www.fmi.uni-passau.de/Graphlet/GTL/
+HOMEPAGE=		http://www.infosun.fmi.uni-passau.de/GTL/
 COMMENT=		C++ graph data structure library based on the STL
 
 USE_LIBTOOL=		yes
diff --git a/devel/guile-fcgi/Makefile b/devel/guile-fcgi/Makefile
index 0d571f5ba98..5cebca9daf1 100644
--- a/devel/guile-fcgi/Makefile
+++ b/devel/guile-fcgi/Makefile
@@ -1,12 +1,12 @@
-# $NetBSD: Makefile,v 1.15 2006/09/09 02:41:57 obache Exp $
+# $NetBSD: Makefile,v 1.16 2006/10/04 21:35:59 wiz Exp $
 
 DISTNAME=	guile-fcgi-0.1
 PKGREVISION=	6
 CATEGORIES=	devel www
-MASTER_SITES=	http://www.bgu.ru/%7Edsa/
+MASTER_SITES=	${MASTER_SITE_LOCAL}
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
-HOMEPAGE=	http://www.bgu.ru/%7Edsa/guilefcgi.html
+HOMEPAGE=	# AWOL since 2003
 COMMENT=	Guile interface to FastCGI
 
 GNU_CONFIGURE=	YES
diff --git a/devel/guile14-gtk/Makefile b/devel/guile14-gtk/Makefile
index 59aa97fe38b..356b15bb5a3 100644
--- a/devel/guile14-gtk/Makefile
+++ b/devel/guile14-gtk/Makefile
@@ -1,16 +1,13 @@
-# $NetBSD: Makefile,v 1.7 2006/02/05 23:08:43 joerg Exp $
+# $NetBSD: Makefile,v 1.8 2006/10/04 21:35:59 wiz Exp $
 #
 
 DISTNAME=		guile-gtk-0.19
 PKGREVISION=		7
 CATEGORIES=		devel x11
-MASTER_SITES=		http://www.ping.de/sites/zagadka/guile-gtk/download/ \
-			http://erin.netpedia.net/download/ \
-			http://erin.linuxbox.com/guile-gtk/download/ \
-			http://linux.cem.itesm.mx/~jarios/guile-gtk/download/
+MASTER_SITES=		http://gnuwin.epfl.ch/sources/geda/
 
 MAINTAINER=		rh@NetBSD.org
-HOMEPAGE=		http://www.ping.de/sites/zagadka/guile-gtk/
+HOMEPAGE=		http://www.gnu.org/software/guile-gtk/
 COMMENT=		Library to make GTK accessible from guile 1.4
 
 USE_LIBTOOL=		yes
diff --git a/devel/libebml/Makefile b/devel/libebml/Makefile
index 0ce11ac09d5..13b1e07450e 100644
--- a/devel/libebml/Makefile
+++ b/devel/libebml/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2006/02/05 23:08:44 joerg Exp $
+# $NetBSD: Makefile,v 1.24 2006/10/04 21:35:59 wiz Exp $
 #
 
 DISTNAME=	libebml-0.7.6
@@ -8,7 +8,7 @@ MASTER_SITES=	http://dl.matroska.org/downloads/libebml/
 EXTRACT_SUFX=	.tar.bz2
 
 MAINTAINER=	salo@NetBSD.org
-HOMEPAGE=	http://www.sourceforge.net/projects/ebml/
+HOMEPAGE=	http://sourceforge.net/projects/ebml/
 COMMENT=	Extensible Binary Meta Language support library
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
diff --git a/devel/libglade/Makefile b/devel/libglade/Makefile
index d0b077a3fc4..2bcbeb8b1f0 100644
--- a/devel/libglade/Makefile
+++ b/devel/libglade/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.60 2006/04/17 13:46:04 wiz Exp $
+# $NetBSD: Makefile,v 1.61 2006/10/04 21:35:59 wiz Exp $
 
 DISTNAME=		libglade-0.17
 PKGREVISION=		9
@@ -6,7 +6,7 @@ CATEGORIES=		devel gnome
 MASTER_SITES=		${MASTER_SITE_GNOME:=sources/libglade/0.17/}
 
 MAINTAINER=		rh@NetBSD.org
-HOMEPAGE=		http://www.daa.com.au/~james/gnome/
+HOMEPAGE=		http://www.jamesh.id.au/software/libglade/
 COMMENT=		Runtime interpreter for GLADE GUI files
 
 USE_TOOLS+=		msgfmt
diff --git a/devel/libglade2/Makefile b/devel/libglade2/Makefile
index 9040036eae9..b09f880f9cb 100644
--- a/devel/libglade2/Makefile
+++ b/devel/libglade2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.48 2006/08/10 14:11:04 drochner Exp $
+# $NetBSD: Makefile,v 1.49 2006/10/04 21:35:59 wiz Exp $
 #
 
 DISTNAME=		libglade-2.6.0
@@ -9,7 +9,7 @@ MASTER_SITES=		${MASTER_SITE_GNOME:=sources/libglade/2.6/}
 EXTRACT_SUFX=		.tar.bz2
 
 MAINTAINER=		jmmv@NetBSD.org
-HOMEPAGE=		http://www.daa.com.au/~james/gnome/
+HOMEPAGE=		http://www.jamesh.id.au/software/libglade/
 COMMENT=		Runtime interpreter for GLADE GUI files (v2)
 
 USE_TOOLS+=		gmake msgfmt pkg-config
diff --git a/devel/ltsa/Makefile b/devel/ltsa/Makefile
index 371beb89493..0050418513b 100644
--- a/devel/ltsa/Makefile
+++ b/devel/ltsa/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2006/03/04 21:29:18 jlam Exp $
+# $NetBSD: Makefile,v 1.6 2006/10/04 21:35:59 wiz Exp $
 #
 
 DISTNAME=	ltsa2.2
@@ -10,6 +10,7 @@ EXTRACT_SUFX=	.zip
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.doc.ic.ac.uk/~jnm/book/ltsa-v2/
+# ~jnm exists, /book/ does not
 COMMENT=	Labelled Transition System Analyser
 
 NO_CONFIGURE=		YES
diff --git a/devel/m4/Makefile b/devel/m4/Makefile
index e04c8aabb7b..be92479d476 100644
--- a/devel/m4/Makefile
+++ b/devel/m4/Makefile
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.42 2006/10/02 18:08:47 wiz Exp $
+# $NetBSD: Makefile,v 1.43 2006/10/04 21:35:59 wiz Exp $
 
 DISTNAME=	m4-1.4.7
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_GNU:=m4/}
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
-HOMEPAGE=	http://www.gnu.org/directory/gnum4.html
+HOMEPAGE=	http://directory.fsf.org/gnum4.html
 COMMENT=	GNU version of UNIX m4 macro language processor
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
diff --git a/devel/nana/Makefile b/devel/nana/Makefile
index 0c5cb580930..1e4e57bfc6d 100644
--- a/devel/nana/Makefile
+++ b/devel/nana/Makefile
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.12 2006/03/31 05:37:09 jlam Exp $
+# $NetBSD: Makefile,v 1.13 2006/10/04 21:35:59 wiz Exp $
 
 DISTNAME=	nana-2.4
 CATEGORIES=	devel
 MASTER_SITES=	ftp://ftp.cs.ntu.edu.au/pub/nana/
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
-HOMEPAGE=	http://www.cs.ntu.edu.au/homepages/pjm/nana-home/
+HOMEPAGE=	http://www.gnu.org/software/nana/
 COMMENT=	Improved support for assertions and logging in C and C++
 
 USE_LANGUAGES=	c c++
diff --git a/devel/netcdf/Makefile b/devel/netcdf/Makefile
index b2c284c76af..2a87b318d2c 100644
--- a/devel/netcdf/Makefile
+++ b/devel/netcdf/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2006/03/04 21:29:18 jlam Exp $
+# $NetBSD: Makefile,v 1.25 2006/10/04 21:35:59 wiz Exp $
 
 DISTNAME=	netcdf-3.6.0-p1
 PKGNAME=	netcdf-3.6.0p1
@@ -6,7 +6,7 @@ CATEGORIES=	devel
 MASTER_SITES=	ftp://www.gfd-dennou.org/arch/netcdf/unidata-mirror/
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
-HOMEPAGE=	http://www.unidata.ucar.edu/packages/netcdf/index.html
+HOMEPAGE=	http://www.unidata.ucar.edu/software/netcdf/index.html
 COMMENT=	Library for array-oriented data access
 
 WRKSRC=			${WRKDIR}/${DISTNAME}/src
diff --git a/devel/noweb/Makefile b/devel/noweb/Makefile
index 9f14d475ac5..0cd95e2b8fc 100644
--- a/devel/noweb/Makefile
+++ b/devel/noweb/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.34 2006/05/28 17:35:49 rillig Exp $
+# $NetBSD: Makefile,v 1.35 2006/10/04 21:35:59 wiz Exp $
 
 DISTNAME=		noweb-2.9a
 PKGREVISION=		3
@@ -7,7 +7,7 @@ MASTER_SITES=		ftp://ftp.cs.virginia.edu/pub/nr/
 EXTRACT_SUFX=		.tgz
 
 MAINTAINER=		pkgsrc-users@NetBSD.org
-HOMEPAGE=		http://www.cs.virginia.edu/~nr/noweb/
+HOMEPAGE=		http://www.eecs.harvard.edu/~nr/noweb/
 COMMENT=		Simple, extensible literate-programming tool
 
 DEPENDS+=		icon>=9.3:../../lang/icon
diff --git a/devel/nqc/Makefile b/devel/nqc/Makefile
index ebfa4bcfd77..4505f063902 100644
--- a/devel/nqc/Makefile
+++ b/devel/nqc/Makefile
@@ -1,13 +1,13 @@
-# $NetBSD: Makefile,v 1.6 2006/06/02 13:48:11 joerg Exp $
+# $NetBSD: Makefile,v 1.7 2006/10/04 21:35:59 wiz Exp $
 #
 
 DISTNAME=		nqc-2.3.r1
 PKGNAME=		nqc-2.3.1
 CATEGORIES=		devel
-MASTER_SITES=		http://www.enteract.com/~dbaum/nqc/release/
+MASTER_SITES=		http://bricxcc.sourceforge.net/nqc/release/
 
 MAINTAINER=		nathanw@NetBSD.org
-HOMEPAGE=		http://www.enteract.com/~dbaum/nqc/index.html
+HOMEPAGE=		http://bricxcc.sourceforge.net/nqc/
 COMMENT=		Development system for the Lego Mindstorms RCX embedded computer
 
 USE_LANGUAGES=		c++
diff --git a/devel/p5-BSD-Resource/Makefile b/devel/p5-BSD-Resource/Makefile
index cf1fc69a261..78ce49319d5 100644
--- a/devel/p5-BSD-Resource/Makefile
+++ b/devel/p5-BSD-Resource/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2006/03/04 21:29:19 jlam Exp $
+# $NetBSD: Makefile,v 1.18 2006/10/04 21:35:59 wiz Exp $
 
 DISTNAME=	BSD-Resource-1.24
 PKGNAME=	p5-${DISTNAME}
@@ -8,7 +8,7 @@ CATEGORIES=	devel perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=BSD/}
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
-HOMEPAGE=	http://iki.fi/jhi/
+HOMEPAGE=	http://www.hut.fi/~jhi/
 COMMENT=	Perl interface to BSD process resources library
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
diff --git a/devel/p5-Date-Calc/Makefile b/devel/p5-Date-Calc/Makefile
index d7ec9bad3f8..acae000e18c 100644
--- a/devel/p5-Date-Calc/Makefile
+++ b/devel/p5-Date-Calc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2006/03/04 21:29:20 jlam Exp $
+# $NetBSD: Makefile,v 1.20 2006/10/04 21:35:59 wiz Exp $
 #
 
 DISTNAME=     	Date-Calc-5.4
@@ -9,7 +9,7 @@ CATEGORIES=	devel perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=Date/}
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
-HOMEPAGE=	http://www.engelschall.com/u/sb/download/
+HOMEPAGE=	http://engelschall.com/u/sb/download/
 COMMENT=	Perl5 module for Gregorian calendar date calculations
 
 DEPENDS+=	p5-Bit-Vector-[0-9]*:../../devel/p5-Bit-Vector
diff --git a/devel/p5-Proc-Daemon/Makefile b/devel/p5-Proc-Daemon/Makefile
index 5f431685c4e..e211ac5d95a 100644
--- a/devel/p5-Proc-Daemon/Makefile
+++ b/devel/p5-Proc-Daemon/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2005/08/06 06:19:13 jlam Exp $
+# $NetBSD: Makefile,v 1.9 2006/10/04 21:35:59 wiz Exp $
 #
 
 DISTNAME=	Proc-Daemon-0.03
@@ -9,7 +9,7 @@ CATEGORIES=	devel perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=Proc/}
 
 MAINTAINER=	sketch@NetBSD.org
-HOMEPAGE=	http://www.nacs.uci.edu/indiv/ehood/earlsperls.html
+HOMEPAGE=	http://www.earlhood.com/earlsperls.html
 COMMENT=	Provide capability for a Perl program to run as a daemon
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
diff --git a/devel/p5-perl-headers/Makefile b/devel/p5-perl-headers/Makefile
index 0524b8b4cd1..eacc015b0b8 100644
--- a/devel/p5-perl-headers/Makefile
+++ b/devel/p5-perl-headers/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.28 2006/06/17 20:52:07 rillig Exp $
+# $NetBSD: Makefile,v 1.29 2006/10/04 21:35:59 wiz Exp $
 
 DISTNAME=		p5-perl-headers
 PKGNAME=		${DISTNAME}-${OS_VERSION}
@@ -9,7 +9,7 @@ MASTER_SITES=		# empty
 DISTFILES=		# empty
 
 MAINTAINER=		jlam@pkgsrc.org
-HOMEPAGE=		http://language.perl.com/index.html
+HOMEPAGE=		http://www.perl.com/language/index.html
 COMMENT=		Perl header files
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
diff --git a/devel/papaya/Makefile b/devel/papaya/Makefile
index 93dd89f27ee..9d84a656117 100644
--- a/devel/papaya/Makefile
+++ b/devel/papaya/Makefile
@@ -1,14 +1,13 @@
-# $NetBSD: Makefile,v 1.19 2006/07/22 04:46:15 rillig Exp $
+# $NetBSD: Makefile,v 1.20 2006/10/04 21:36:00 wiz Exp $
 #
 
 DISTNAME=	papaya-0.1.7
 PKGREVISION=	4
 CATEGORIES=	devel
-MASTER_SITES=	http://www.asahi-net.or.jp/~em7t-hmd/papaya/		\
-		${MASTER_SITE_SOURCEFORGE:=papaya-utils/}
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=papaya-utils/}
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
-HOMEPAGE=	http://www.asahi-net.or.jp/~em7t-hmd/papaya/index.html
+HOMEPAGE=	http://sourceforge.net/projects/papaya-utils/
 COMMENT=	Simple scripts for software development
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
diff --git a/devel/py-TPG/Makefile b/devel/py-TPG/Makefile
index f8dadfbfc92..956226ebce9 100644
--- a/devel/py-TPG/Makefile
+++ b/devel/py-TPG/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2006/03/04 21:29:27 jlam Exp $
+# $NetBSD: Makefile,v 1.10 2006/10/04 21:36:00 wiz Exp $
 #
 
 DISTNAME=		TPG-2.1.6
@@ -7,7 +7,7 @@ CATEGORIES=		devel python
 MASTER_SITES=		http://christophe.delord.free.fr/soft/tpg/
 
 MAINTAINER=		pkgsrc-users@NetBSD.org
-HOMEPAGE=		http://christophe.delord.free.fr/soft/tpg/
+HOMEPAGE=		http://christophe.delord.free.fr/en/tpg/
 COMMENT=		ToyParserGenerator for Python
 
 PYTHON_VERSIONS_ACCEPTED=	23 22
diff --git a/devel/py-expect/Makefile b/devel/py-expect/Makefile
index 1837bfe80f4..f10df48ee50 100644
--- a/devel/py-expect/Makefile
+++ b/devel/py-expect/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2006/02/08 19:47:08 joerg Exp $
+# $NetBSD: Makefile,v 1.13 2006/10/04 21:36:00 wiz Exp $
 #
 
 DISTNAME=	ExpectPy-1.9b1
@@ -8,7 +8,7 @@ CATEGORIES=	devel python
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=pub/sourceforge/expectpy/}
 
 MAINTAINER=	jwise@NetBSD.org
-HOMEPAGE=	http://www.sourceforge.net/projects/expectpy/
+HOMEPAGE=	http://sourceforge.net/projects/expectpy/
 COMMENT=	Expect module for Python
 
 USE_LIBTOOL=	yes
diff --git a/devel/py-readline/Makefile b/devel/py-readline/Makefile
index a3c6c45b6ab..8d31d4257a5 100644
--- a/devel/py-readline/Makefile
+++ b/devel/py-readline/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2006/02/05 23:08:51 joerg Exp $
+# $NetBSD: Makefile,v 1.13 2006/10/04 21:36:00 wiz Exp $
 #
 
 PKGNAME=	${PYPKGPREFIX}-readline-0
@@ -6,7 +6,7 @@ PKGREVISION=	2
 CATEGORIES=	devel misc python
 
 MAINTAINER=	tsarna@NetBSD.org
-HOMEPAGE=	http://www.python.org/doc/tut/interacting.html
+HOMEPAGE=	http://www.python.org/doc/current/tut/node15.html
 COMMENT=	Line editing support for Python
 
 EXTRACT_ELEMENTS=	${PYSUBDIR}/Modules/readline.c
diff --git a/devel/python-mode/Makefile b/devel/python-mode/Makefile
index c66bcec7f64..09f776adfbb 100644
--- a/devel/python-mode/Makefile
+++ b/devel/python-mode/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2006/03/04 21:29:29 jlam Exp $
+# $NetBSD: Makefile,v 1.16 2006/10/04 21:36:00 wiz Exp $
 #
 
 DISTNAME=	python-mode-4.54
@@ -9,7 +9,7 @@ MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=python-mode/}
 DISTFILES=	python-mode.el
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
-HOMEPAGE=	http://www.sourceforge.net/project/python-mode/
+HOMEPAGE=	http://sourceforge.net/project/python-mode/
 COMMENT=	Emacs mode for editing python files
 
 # Note that XEmacs >=21.4.4 includes a python-mode in the prog-modes
diff --git a/devel/rdp/Makefile b/devel/rdp/Makefile
index e78b28ef207..4be15ba5f34 100644
--- a/devel/rdp/Makefile
+++ b/devel/rdp/Makefile
@@ -1,14 +1,14 @@
-# $NetBSD: Makefile,v 1.21 2006/09/09 02:41:58 obache Exp $
+# $NetBSD: Makefile,v 1.22 2006/10/04 21:36:00 wiz Exp $
 
 DISTNAME=		rdp1_5
 PKGNAME=		rdp-1.5
 PKGREVISION=		1
 CATEGORIES=		devel
-MASTER_SITES=		ftp://ftp.dcs.rhbnc.ac.uk/pub/rdp/
+MASTER_SITES=		ftp://ftp.cs.rhul.ac.uk/pub/rdp/
 EXTRACT_SUFX=		.zip
 
 MAINTAINER=		pkgsrc-users@NetBSD.org
-HOMEPAGE=		http://www.dcs.rhbnc.ac.uk/research/languages/rdp.shtml
+HOMEPAGE=		http://www.cs.rhul.ac.uk/research/languages/projects/rdp.shtml
 COMMENT=		Compiles attributed LL(1) grammars into recursive descent compilers
 
 WRKSRC=			${WRKDIR}/rdp
diff --git a/devel/roundup/Makefile b/devel/roundup/Makefile
index a91a20bdc58..189c2155a66 100644
--- a/devel/roundup/Makefile
+++ b/devel/roundup/Makefile
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.28 2006/07/15 11:39:17 recht Exp $
+# $NetBSD: Makefile,v 1.29 2006/10/04 21:36:00 wiz Exp $
 
 DISTNAME=	roundup-1.1.2
 CATEGORIES=	devel
 MASTER_SITES=	http://cheeseshop.python.org/packages/source/r/roundup/
 
 MAINTAINER=	recht@NetBSD.org
-HOMEPAGE=	http://roundup.sf.net/
+HOMEPAGE=	http://roundup.sourceforge.net/
 COMMENT=	Issue tracking system with command-line, web and email clients
 
 PYDISTUTILSPKG=	yes
diff --git a/devel/rt-mysql/Makefile.common b/devel/rt-mysql/Makefile.common
index 74082f6172b..0a5864fa327 100644
--- a/devel/rt-mysql/Makefile.common
+++ b/devel/rt-mysql/Makefile.common
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile.common,v 1.12 2006/07/20 19:05:24 wiz Exp $
+# $NetBSD: Makefile.common,v 1.13 2006/10/04 21:36:00 wiz Exp $
 
 DISTNAME=      	rt-2-0-15
 CATEGORIES=	devel
-MASTER_SITES=	http://www.fsck.com/pub/rt/release/
+MASTER_SITES=	http://www.bestpractical.com/rt/release/
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
-HOMEPAGE=	http://www.fsck.com/projects/rt/
+HOMEPAGE=	http://www.bestpractical.com/rt/
 COMMENT=	Industrial-grade ticketing system
 CONFLICTS=	rt-*
 
diff --git a/devel/ruby-amstd/Makefile b/devel/ruby-amstd/Makefile
index b0082eac84e..15b19c8d060 100644
--- a/devel/ruby-amstd/Makefile
+++ b/devel/ruby-amstd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2005/03/24 21:12:53 wiz Exp $
+# $NetBSD: Makefile,v 1.10 2006/10/04 21:36:00 wiz Exp $
 
 DISTNAME=	amstd-2.0.0
 PKGNAME=	${RUBY_PKGPREFIX}-${DISTNAME}
@@ -7,7 +7,7 @@ CATEGORIES=	devel ruby
 MASTER_SITES=	http://www.loveruby.net/archive/amstd/
 
 MAINTAINER=	taca@NetBSD.org
-HOMEPAGE=	http://www.loveruby.net/en/amstd.html
+HOMEPAGE=	http://i.loveruby.net/en/prog/amstd.html
 COMMENT=	Collection of miscellaneous Ruby modules
 
 USE_RUBY_SETUP=	yes
diff --git a/devel/ruby-bsearch/Makefile b/devel/ruby-bsearch/Makefile
index c2811e43a75..7b748b31b59 100644
--- a/devel/ruby-bsearch/Makefile
+++ b/devel/ruby-bsearch/Makefile
@@ -1,13 +1,13 @@
-# $NetBSD: Makefile,v 1.14 2005/11/03 07:19:03 taca Exp $
+# $NetBSD: Makefile,v 1.15 2006/10/04 21:36:00 wiz Exp $
 
 DISTNAME=	ruby-bsearch-${VERSION}
 PKGNAME=	${RUBY_PKGPREFIX}-bsearch-${VERSION}
 PKGREVISION=	1
 CATEGORIES=	devel ruby
-MASTER_SITES=	http://namazu.org/~satoru/ruby-bsearch/
+MASTER_SITES=	http://0xcc.net/ruby-bsearch/
 
 MAINTAINER=	taca@NetBSD.org
-HOMEPAGE=	http://namazu.org/~satoru/ruby-bsearch/
+HOMEPAGE=	http://0xcc.net/ruby-bsearch/
 COMMENT=	Binary search library for Ruby
 
 VERSION=	1.5
diff --git a/devel/sablecc/Makefile b/devel/sablecc/Makefile
index 43a6f405df2..a9604a3c2c4 100644
--- a/devel/sablecc/Makefile
+++ b/devel/sablecc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2006/02/05 23:08:53 joerg Exp $
+# $NetBSD: Makefile,v 1.10 2006/10/04 21:36:00 wiz Exp $
 #
 
 DISTNAME=	sablecc-2.16.2
@@ -7,7 +7,7 @@ CATEGORIES=	devel java
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=sablecc/}
 
 MAINTAINER=	hag@linnaean.org
-HOMEPAGE=	http://www.sablecc.org/
+HOMEPAGE=	http://sablecc.org/
 COMMENT=	Java based Compiler Compiler
 
 USE_JAVA=	run
diff --git a/devel/tla/Makefile b/devel/tla/Makefile
index 701235f502e..35e3e58e353 100644
--- a/devel/tla/Makefile
+++ b/devel/tla/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.27 2006/07/23 20:41:24 wiz Exp $
+# $NetBSD: Makefile,v 1.28 2006/10/04 21:36:01 wiz Exp $
 #
 
 DISTNAME=	tla-1.3.5
@@ -8,7 +8,7 @@ MASTER_SITES=	${MASTER_SITE_GNU:=gnu-arch/}		\
 		http://www.seyza.com/gnu-releases/
 
 MAINTAINER=	recht@NetBSD.org
-HOMEPAGE=	http://regexps.srparish.net/www/
+HOMEPAGE=	http://regexps.srparish.net/
 COMMENT=	Revision control system ideal for widely distributed development
 
 DEPENDS+=	patch-[0-9]*:../../devel/patch
diff --git a/devel/tmake/Makefile b/devel/tmake/Makefile
index 0faa3e61ae9..885558b58c9 100644
--- a/devel/tmake/Makefile
+++ b/devel/tmake/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2006/06/17 17:45:41 rillig Exp $
+# $NetBSD: Makefile,v 1.11 2006/10/04 21:36:01 wiz Exp $
 #
 
 DISTNAME=	tmake-1.13
@@ -6,7 +6,7 @@ CATEGORIES=	devel
 MASTER_SITES=	ftp://ftp.trolltech.com/freebies/tmake/
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
-HOMEPAGE=	http://www.trolltech.com/products/download/freebies/tmake.html
+HOMEPAGE=	http://www.trolltech.com/developer/downloads/qt/freebies/
 COMMENT=	Cross-platform Makefile Tool
 
 USE_TOOLS+=	perl:run
diff --git a/devel/trio/Makefile b/devel/trio/Makefile
index 0fdab8af86d..d559830d717 100644
--- a/devel/trio/Makefile
+++ b/devel/trio/Makefile
@@ -1,13 +1,13 @@
-# $NetBSD: Makefile,v 1.7 2006/03/15 16:44:50 joerg Exp $
+# $NetBSD: Makefile,v 1.8 2006/10/04 21:36:01 wiz Exp $
 #
 
 DISTNAME=	trio-1.3
 PKGREVISION=	1
 CATEGORIES=	devel
-MASTER_SITES=	http://www.contactor.se/~dast/stuff/
+MASTER_SITES=	http://daniel.haxx.se/projects/trio/
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
-HOMEPAGE=	http://www.contactor.se/~dast/trio/
+HOMEPAGE=	http://daniel.haxx.se/projects/trio/
 COMMENT=	Fully matured and stable set of printf and string functions
 
 USE_LIBTOOL=	yes