Update MASTER_SITES and HOMEPAGE, from Sergey Svishchev.

47 files changed, 113 insertions, 109 deletions

diff --git a/audio/arts/Makefile b/audio/arts/Makefile
index dc955dc8d2a..e31ea25e525 100644
--- a/audio/arts/Makefile
+++ b/audio/arts/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.58 2006/08/02 13:39:00 markd Exp $
+# $NetBSD: Makefile,v 1.59 2006/10/04 20:44:18 wiz Exp $
 
 DISTNAME=	arts-1.5.4
 CATEGORIES=	audio
-HOMEPAGE=	http://www.kde.org/areas/multimedia/
+HOMEPAGE=	http://multimedia.kde.org/
 COMMENT=	Analog Real-Time Synthesizer
 
 .include "../../meta-pkgs/kde3/Makefile.kde3"
diff --git a/audio/cddbd/Makefile b/audio/cddbd/Makefile
index 74136b423c9..fec8b388a9f 100644
--- a/audio/cddbd/Makefile
+++ b/audio/cddbd/Makefile
@@ -1,17 +1,16 @@
-# $NetBSD: Makefile,v 1.9 2006/09/09 02:41:54 obache Exp $
+# $NetBSD: Makefile,v 1.10 2006/10/04 20:44:18 wiz Exp $
 #
 
 DISTNAME=	cddbd-1.3.1
 PKGNAME=	cddbd-1.3.1p1
 CATEGORIES=	audio net
-MASTER_SITES=	ftp://ftp.moonsoft.com/pub/cddbd-1.3.1/ \
-		http://www.moonsoft.com/ftp/cddbd-1.3.1/
+MASTER_SITES=	${MASTER_SITE_XCONTRIB:=applications/}
 
 PATCH_SITES=	${MASTER_SITES}
 PATCHFILES=	cddbd-1.3.1.patch1.gz
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
-HOMEPAGE=	http://www.moonsoft.com/software.html
+HOMEPAGE=	http://www.freedb.org/src/latest/
 COMMENT=	Internet CD Database Server
 
 INTERACTIVE_STAGE=	configure install
diff --git a/audio/eawpatches/Makefile b/audio/eawpatches/Makefile
index 26dc826f9ad..1b982d40a0f 100644
--- a/audio/eawpatches/Makefile
+++ b/audio/eawpatches/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2005/12/05 20:49:47 rillig Exp $
+# $NetBSD: Makefile,v 1.16 2006/10/04 20:44:18 wiz Exp $
 #
 
 DISTNAME=	eawpats12_full
@@ -6,10 +6,12 @@ PKGNAME=	eawpatches-12
 PKGREVISION=	1
 CATEGORIES=	audio
 MASTER_SITES=	http://www.stardate.bc.ca/eawpatches/
+# http://www.george.ca/interests/eawpats12_full.tar.gz
 EXTRACT_SUFX=	.rar
 
 MAINTAINER=	adam@NetBSD.org
 HOMEPAGE=	http://www.stardate.bc.ca/eawpatches/html/
+# AWOL, ask http://www.sysbio.wustl.edu/pakrasi/people/ericw.php
 COMMENT=	Eric A. Welsh' patches (audio samples) for TiMidity
 
 BUILD_DEPENDS+=	unrar-[0-9]*:../../archivers/unrar
diff --git a/audio/festival-doc/Makefile b/audio/festival-doc/Makefile
index 1f4b5e064ff..cd6528a4c3e 100644
--- a/audio/festival-doc/Makefile
+++ b/audio/festival-doc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2006/03/30 03:44:41 jlam Exp $
+# $NetBSD: Makefile,v 1.4 2006/10/04 20:44:18 wiz Exp $
 
 DISTNAME=	festdoc-1.4.0.1
 PKGNAME=	festival-doc-1.4.0.1
@@ -8,7 +8,7 @@ MASTER_SITES=	ftp://ftp.cstr.ed.ac.uk/pub/festival/1.4.1/ \
 		http://www.speech.cs.cmu.edu/festival/cstr/festival/1.4.1/
 
 MAINTAINER=	proff@iq.org
-HOMEPAGE=	http://www.cstr.ed.ac.uk/projects/festival.html
+HOMEPAGE=	http://www.cstr.ed.ac.uk/projects/festival/
 COMMENT=	Festival documentation, in (tex)info, html, dvi and ps formats
 
 NO_BUILD=	yes
diff --git a/audio/festlex-cmu/Makefile b/audio/festlex-cmu/Makefile
index fdabea0df3b..d03ba0fe746 100644
--- a/audio/festlex-cmu/Makefile
+++ b/audio/festlex-cmu/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2006/05/19 16:18:52 rillig Exp $
+# $NetBSD: Makefile,v 1.18 2006/10/04 20:44:18 wiz Exp $
 
 DISTNAME=	festlex_CMU
 PKGNAME=	festlex-cmu-1.4.0
@@ -8,7 +8,7 @@ MASTER_SITES=	ftp://ftp.cstr.ed.ac.uk/pub/festival/1.4.1/ \
 		http://www.speech.cs.cmu.edu/festival/cstr/festival/1.4.1/
 
 MAINTAINER=	proff@iq.org
-HOMEPAGE=	http://www.cstr.ed.ac.uk/projects/festival.html
+HOMEPAGE=	http://www.cstr.ed.ac.uk/projects/festival/
 COMMENT=	CMU American English pronunciation dictionary for Festival
 
 DEPENDS+=	festival>=1.4.0:../../audio/festival
diff --git a/audio/festlex-oald/Makefile b/audio/festlex-oald/Makefile
index 6c147e9e288..148c1be278f 100644
--- a/audio/festlex-oald/Makefile
+++ b/audio/festlex-oald/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2006/05/19 16:18:52 rillig Exp $
+# $NetBSD: Makefile,v 1.18 2006/10/04 20:44:18 wiz Exp $
 
 DISTNAME=	festlex_OALD
 PKGNAME=	festlex-oald-1.4.0
@@ -8,7 +8,7 @@ MASTER_SITES=	ftp://ftp.cstr.ed.ac.uk/pub/festival/1.4.1/ \
 		http://www.speech.cs.cmu.edu/festival/cstr/festival/1.4.1/
 
 MAINTAINER=	proff@iq.org
-HOMEPAGE=	http://www.cstr.ed.ac.uk/projects/festival.html
+HOMEPAGE=	http://www.cstr.ed.ac.uk/projects/festival/
 COMMENT=	Oxford Advanced Learner's pronunciation dictionary for Festival
 
 DEPENDS+=	festival>=1.4.0:../../audio/festival
diff --git a/audio/festlex-poslex/Makefile b/audio/festlex-poslex/Makefile
index c6c5fc694df..ee457678383 100644
--- a/audio/festlex-poslex/Makefile
+++ b/audio/festlex-poslex/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2006/05/19 16:18:52 rillig Exp $
+# $NetBSD: Makefile,v 1.17 2006/10/04 20:44:18 wiz Exp $
 
 DISTNAME=	festlex_POSLEX
 PKGNAME=	festlex-poslex-1.4.0
@@ -8,7 +8,7 @@ MASTER_SITES=	ftp://ftp.cstr.ed.ac.uk/pub/festival/1.4.1/ \
 		http://www.speech.cs.cmu.edu/festival/cstr/festival/1.4.1/
 
 MAINTAINER=	proff@iq.org
-HOMEPAGE=	http://www.cstr.ed.ac.uk/projects/festival.html
+HOMEPAGE=	http://www.cstr.ed.ac.uk/projects/festival/
 COMMENT=	English lexicon suitable for use with Festival
 
 DEPENDS+=	festival>=1.4.0:../../audio/festival
diff --git a/audio/festvox-don/Makefile b/audio/festvox-don/Makefile
index cef2cdcf150..d7c23361556 100644
--- a/audio/festvox-don/Makefile
+++ b/audio/festvox-don/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2006/05/19 16:18:52 rillig Exp $
+# $NetBSD: Makefile,v 1.20 2006/10/04 20:44:18 wiz Exp $
 
 DISTNAME=	festvox_don
 PKGNAME=	festvox-don-1.4.0
@@ -8,7 +8,7 @@ MASTER_SITES=	ftp://ftp.cstr.ed.ac.uk/pub/festival/1.4.1/ \
 		http://www.speech.cs.cmu.edu/festival/cstr/festival/1.4.1/
 
 MAINTAINER=	proff@iq.org
-HOMEPAGE=	http://www.cstr.ed.ac.uk/projects/festival.html
+HOMEPAGE=	http://www.cstr.ed.ac.uk/projects/festival/
 COMMENT=	British English male voice for the festival speech synthesis system
 
 DEPENDS+=	festival>=1.4.0:../../audio/festival
diff --git a/audio/festvox-el11/Makefile b/audio/festvox-el11/Makefile
index d2e1e21fd04..8592fc20cda 100644
--- a/audio/festvox-el11/Makefile
+++ b/audio/festvox-el11/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2006/05/19 16:18:52 rillig Exp $
+# $NetBSD: Makefile,v 1.17 2006/10/04 20:44:18 wiz Exp $
 
 DISTNAME=	festvox_ellpc11k
 PKGNAME=	festvox-el11-1.4.0
@@ -8,7 +8,7 @@ MASTER_SITES=	ftp://ftp.cstr.ed.ac.uk/pub/festival/1.4.1/ \
 		http://www.speech.cs.cmu.edu/festival/cstr/festival/1.4.1/
 
 MAINTAINER=	proff@iq.org
-HOMEPAGE=	http://www.cstr.ed.ac.uk/projects/festival.html
+HOMEPAGE=	http://www.cstr.ed.ac.uk/projects/festival/
 COMMENT=	Castilian Spanish male voice for the festival speech synthesis system
 
 DEPENDS+=	festival>=1.4.1:../../audio/festival
diff --git a/audio/festvox-en1/Makefile b/audio/festvox-en1/Makefile
index 1a7a71d1ed4..7773db4eb66 100644
--- a/audio/festvox-en1/Makefile
+++ b/audio/festvox-en1/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2006/05/19 16:18:52 rillig Exp $
+# $NetBSD: Makefile,v 1.20 2006/10/04 20:44:18 wiz Exp $
 
 DISTNAME=	festvox_en1
 PKGNAME=	festvox-en1-1.4.0
@@ -8,7 +8,7 @@ MASTER_SITES=	ftp://ftp.cstr.ed.ac.uk/pub/festival/1.4.1/ \
 		http://www.speech.cs.cmu.edu/festival/cstr/festival/1.4.1/
 
 MAINTAINER=	proff@iq.org
-HOMEPAGE=	http://www.cstr.ed.ac.uk/projects/festival.html
+HOMEPAGE=	http://www.cstr.ed.ac.uk/projects/festival/
 COMMENT=	MBROLA based British English male voice for festival
 
 DEPENDS+=	festival>=1.4.0:../../audio/festival
diff --git a/audio/festvox-kal16/Makefile b/audio/festvox-kal16/Makefile
index 1a1e89fc0dc..e4d43f1e871 100644
--- a/audio/festvox-kal16/Makefile
+++ b/audio/festvox-kal16/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2006/05/19 16:18:52 rillig Exp $
+# $NetBSD: Makefile,v 1.20 2006/10/04 20:44:18 wiz Exp $
 
 DISTNAME=	festvox_kallpc16k
 PKGNAME=	festvox-kal16-1.4.0
@@ -8,7 +8,7 @@ MASTER_SITES=	ftp://ftp.cstr.ed.ac.uk/pub/festival/1.4.1/ \
 		http://www.speech.cs.cmu.edu/festival/cstr/festival/1.4.1/
 
 MAINTAINER=	proff@iq.org
-HOMEPAGE=	http://www.cstr.ed.ac.uk/projects/festival.html
+HOMEPAGE=	http://www.cstr.ed.ac.uk/projects/festival/
 COMMENT=	16khz American English male voice for festival
 
 DEPENDS+=	festival>=1.4.0:../../audio/festival
diff --git a/audio/festvox-kal8/Makefile b/audio/festvox-kal8/Makefile
index bac313ae6ee..6ca9731eea8 100644
--- a/audio/festvox-kal8/Makefile
+++ b/audio/festvox-kal8/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2006/05/19 16:18:52 rillig Exp $
+# $NetBSD: Makefile,v 1.22 2006/10/04 20:44:18 wiz Exp $
 
 DISTNAME=	festvox_kallpc8k
 PKGNAME=	festvox-kal8-1.4.0
@@ -8,7 +8,7 @@ MASTER_SITES=	ftp://ftp.cstr.ed.ac.uk/pub/festival/1.4.1/ \
 		http://www.speech.cs.cmu.edu/festival/cstr/festival/1.4.1/
 
 MAINTAINER=	proff@iq.org
-HOMEPAGE=	http://www.cstr.ed.ac.uk/projects/festival.html
+HOMEPAGE=	http://www.cstr.ed.ac.uk/projects/festival/
 COMMENT=	8khz American English male voice for festival
 
 DEPENDS+=	festival>=1.4.0:../../audio/festival
diff --git a/audio/festvox-ked16/Makefile b/audio/festvox-ked16/Makefile
index eefa08d24ef..86a601caf7d 100644
--- a/audio/festvox-ked16/Makefile
+++ b/audio/festvox-ked16/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2006/05/19 16:18:52 rillig Exp $
+# $NetBSD: Makefile,v 1.20 2006/10/04 20:44:18 wiz Exp $
 
 DISTNAME=	festvox_kedlpc16k
 PKGNAME=	festvox-ked16-1.4.0
@@ -8,7 +8,7 @@ MASTER_SITES=	ftp://ftp.cstr.ed.ac.uk/pub/festival/1.4.1/ \
 		http://www.speech.cs.cmu.edu/festival/cstr/festival/1.4.1/
 
 MAINTAINER=	proff@iq.org
-HOMEPAGE=	http://www.cstr.ed.ac.uk/projects/festival.html
+HOMEPAGE=	http://www.cstr.ed.ac.uk/projects/festival/
 COMMENT=	16khz American English male voice for festival
 
 DEPENDS+=	festival>=1.4.0:../../audio/festival
diff --git a/audio/festvox-ked8/Makefile b/audio/festvox-ked8/Makefile
index ad5156cc9c6..c70ab2db431 100644
--- a/audio/festvox-ked8/Makefile
+++ b/audio/festvox-ked8/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2006/02/05 23:08:07 joerg Exp $
+# $NetBSD: Makefile,v 1.22 2006/10/04 20:44:18 wiz Exp $
 
 DISTNAME=	festvox_kedlpc8k
 PKGNAME=	festvox-ked8-1.4.0
@@ -8,7 +8,7 @@ MASTER_SITES=	ftp://ftp.cstr.ed.ac.uk/pub/festival/1.4.1/ \
 		http://www.speech.cs.cmu.edu/festival/cstr/festival/1.4.1/
 
 MAINTAINER=	proff@iq.org
-HOMEPAGE=	http://www.cstr.ed.ac.uk/projects/festival.html
+HOMEPAGE=	http://www.cstr.ed.ac.uk/projects/festival/
 COMMENT=	8khz American English male voice for festival
 
 DEPENDS+=	festival>=1.4.0:../../audio/festival
diff --git a/audio/festvox-rab16/Makefile b/audio/festvox-rab16/Makefile
index 35f4f680516..44cc9229a8e 100644
--- a/audio/festvox-rab16/Makefile
+++ b/audio/festvox-rab16/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2006/05/19 16:18:52 rillig Exp $
+# $NetBSD: Makefile,v 1.20 2006/10/04 20:44:18 wiz Exp $
 
 DISTNAME=	festvox_rablpc16k
 PKGNAME=	festvox-rab16-1.4.0
@@ -8,7 +8,7 @@ MASTER_SITES=	ftp://ftp.cstr.ed.ac.uk/pub/festival/1.4.1/ \
 		http://www.speech.cs.cmu.edu/festival/cstr/festival/1.4.1/
 
 MAINTAINER=	proff@iq.org
-HOMEPAGE=	http://www.cstr.ed.ac.uk/projects/festival.html
+HOMEPAGE=	http://www.cstr.ed.ac.uk/projects/festival/
 COMMENT=	16khz British English male voice for festival
 
 DEPENDS+=	festival>=1.4.0:../../audio/festival
diff --git a/audio/festvox-rab8/Makefile b/audio/festvox-rab8/Makefile
index 67b82b96058..a7fdab8f801 100644
--- a/audio/festvox-rab8/Makefile
+++ b/audio/festvox-rab8/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2006/02/05 23:08:07 joerg Exp $
+# $NetBSD: Makefile,v 1.22 2006/10/04 20:44:18 wiz Exp $
 
 DISTNAME=	festvox_rablpc8k
 PKGNAME=	festvox-rab8-1.4.0
@@ -8,7 +8,7 @@ MASTER_SITES=	ftp://ftp.cstr.ed.ac.uk/pub/festival/1.4.1/ \
 		http://www.speech.cs.cmu.edu/festival/cstr/festival/1.4.1/
 
 MAINTAINER=	proff@iq.org
-HOMEPAGE=	http://www.cstr.ed.ac.uk/projects/festival.html
+HOMEPAGE=	http://www.cstr.ed.ac.uk/projects/festival/
 COMMENT=	6khz British English male voice for the festival
 
 DEPENDS+=	festival>=1.4.0:../../audio/festival
diff --git a/audio/festvox-us1/Makefile b/audio/festvox-us1/Makefile
index 388c6eacf1e..8881ecc3fc9 100644
--- a/audio/festvox-us1/Makefile
+++ b/audio/festvox-us1/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2006/05/19 16:18:52 rillig Exp $
+# $NetBSD: Makefile,v 1.15 2006/10/04 20:44:18 wiz Exp $
 
 DISTNAME=	festvox_us1
 PKGNAME=	festvox-us1-1.4.0
@@ -8,7 +8,7 @@ MASTER_SITES=	ftp://ftp.cstr.ed.ac.uk/pub/festival/1.4.1/ \
 		http://www.speech.cs.cmu.edu/festival/cstr/festival/1.4.1/
 
 MAINTAINER=	proff@iq.org
-HOMEPAGE=	http://www.cstr.ed.ac.uk/projects/festival.html
+HOMEPAGE=	http://www.cstr.ed.ac.uk/projects/festival/
 COMMENT=	MBROLA based American English female voice for festival
 
 DEPENDS+=	festival>=1.4.0:../../audio/festival
diff --git a/audio/festvox-us2/Makefile b/audio/festvox-us2/Makefile
index 9859964de1f..289fe3736a0 100644
--- a/audio/festvox-us2/Makefile
+++ b/audio/festvox-us2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2006/05/19 16:18:52 rillig Exp $
+# $NetBSD: Makefile,v 1.15 2006/10/04 20:44:19 wiz Exp $
 
 DISTNAME=	festvox_us2
 PKGNAME=	festvox-us2-1.4.0
@@ -8,7 +8,7 @@ MASTER_SITES=	ftp://ftp.cstr.ed.ac.uk/pub/festival/1.4.1/ \
 		http://www.speech.cs.cmu.edu/festival/cstr/festival/1.4.1/
 
 MAINTAINER=	proff@iq.org
-HOMEPAGE=	http://www.cstr.ed.ac.uk/projects/festival.html
+HOMEPAGE=	http://www.cstr.ed.ac.uk/projects/festival/
 COMMENT=	MBROLA based Americal English male voice for festival
 
 DEPENDS+=	festival>=1.4.0:../../audio/festival
diff --git a/audio/festvox-us3/Makefile b/audio/festvox-us3/Makefile
index c1d7d6115a9..21914c36d0e 100644
--- a/audio/festvox-us3/Makefile
+++ b/audio/festvox-us3/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2006/05/19 16:18:52 rillig Exp $
+# $NetBSD: Makefile,v 1.15 2006/10/04 20:44:19 wiz Exp $
 
 DISTNAME=	festvox_us3
 PKGNAME=	festvox-us3-1.4.0
@@ -8,7 +8,7 @@ MASTER_SITES=	ftp://ftp.cstr.ed.ac.uk/pub/festival/1.4.1/ \
 		http://www.speech.cs.cmu.edu/festival/cstr/festival/1.4.1/
 
 MAINTAINER=	proff@iq.org
-HOMEPAGE=	http://www.cstr.ed.ac.uk/projects/festival.html
+HOMEPAGE=	http://www.cstr.ed.ac.uk/projects/festival/
 COMMENT=	MBROLA based American English male voice for festival
 
 DEPENDS+=	festival>=1.4.0:../../audio/festival
diff --git a/audio/jack/Makefile b/audio/jack/Makefile
index dd15bcb1481..8cbe3300e4d 100644
--- a/audio/jack/Makefile
+++ b/audio/jack/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2006/07/26 18:25:43 rillig Exp $
+# $NetBSD: Makefile,v 1.7 2006/10/04 20:44:19 wiz Exp $
 #
 
 DISTNAME=		jack-audio-connection-kit-0.100.0
@@ -8,7 +8,7 @@ CATEGORIES=		audio
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=jackit/}
 
 MAINTAINER=		chriswareham@chriswareham.demon.co.uk
-HOMEPAGE=		http://jackit.sourceforge.net/
+HOMEPAGE=		http://jackaudio.org/
 COMMENT=		Low-latency audio server
 
 USE_LIBTOOL=		yes
diff --git a/audio/libac3/Makefile b/audio/libac3/Makefile
index f9a816fabd9..418c5107a12 100644
--- a/audio/libac3/Makefile
+++ b/audio/libac3/Makefile
@@ -1,13 +1,14 @@
-# $NetBSD: Makefile,v 1.7 2005/06/16 06:57:39 jlam Exp $
+# $NetBSD: Makefile,v 1.8 2006/10/04 20:44:19 wiz Exp $
 #
 
 DISTNAME=	ac3dec-0.6.1
 PKGNAME=	${DISTNAME:S/ac3dec/libac3/}
 CATEGORIES=	audio
-MASTER_SITES=	http://gusnet.cx/aaron/codecs/tarballs/
+MASTER_SITES=	http://liba52.sourceforge.net/files/
 
 MAINTAINER=	rh@NetBSD.org
-HOMEPAGE=	http://ess.engr.uvic.ca/~aholtzma/ac3/
+HOMEPAGE=	http://liba52.sourceforge.net/
+# obsolete -- remove in favor of liba52?
 COMMENT=	AC3 audio (as used on DVDs) decoding library
 
 GNU_CONFIGURE=  yes
diff --git a/audio/libshout/Makefile b/audio/libshout/Makefile
index f92bd90d587..92e8892a6a3 100644
--- a/audio/libshout/Makefile
+++ b/audio/libshout/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2005/04/11 21:44:54 tv Exp $
+# $NetBSD: Makefile,v 1.7 2006/10/04 20:44:19 wiz Exp $
 #
 
 DISTNAME=	libshout-2.1
@@ -6,7 +6,7 @@ CATEGORIES=	audio
 MASTER_SITES=	http://downloads.xiph.org/releases/libshout/
 
 MAINTAINER=	kim@tac.nyc.ny.us
-HOMEPAGE=	http://www.gnu.org/directory/audio/ogg/libshout.html
+HOMEPAGE=	http://directory.fsf.org/audio/ogg/libshout.html
 COMMENT=	Connects and sends data to icecast servers
 
 USE_LIBTOOL=		YES
diff --git a/audio/libvorbis/Makefile b/audio/libvorbis/Makefile
index d1bad7abfba..eb056347124 100644
--- a/audio/libvorbis/Makefile
+++ b/audio/libvorbis/Makefile
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.43 2006/06/15 13:38:51 wiz Exp $
+# $NetBSD: Makefile,v 1.44 2006/10/04 20:44:19 wiz Exp $
 
 DISTNAME=	libvorbis-1.1.2
 CATEGORIES=	devel audio
 MASTER_SITES=	http://downloads.xiph.org/releases/vorbis/
 
 MAINTAINER=	wiz@NetBSD.org
-HOMEPAGE=	http://www.xiph.org/ogg/vorbis/
+HOMEPAGE=	http://www.xiph.org/vorbis/
 COMMENT=	Library for the Ogg Vorbis audio encoding format
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
diff --git a/audio/mp32ogg/Makefile b/audio/mp32ogg/Makefile
index b15118b5c64..d127deb8ea8 100644
--- a/audio/mp32ogg/Makefile
+++ b/audio/mp32ogg/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2006/02/05 23:08:12 joerg Exp $
+# $NetBSD: Makefile,v 1.11 2006/10/04 20:44:19 wiz Exp $
 
 DISTNAME=	mp32ogg-0.11
 PKGREVISION=	3
@@ -7,7 +7,7 @@ MASTER_SITES=	${MASTER_SITE_LOCAL}
 EXTRACT_SUFX=	# empty
 
 MAINTAINER=	rxg@NetBSD.org
-HOMEPAGE=	http://faceprint.com/software.phtml
+HOMEPAGE=	http://faceprint.com/code/
 COMMENT=	Convert MP3 files to Ogg Vorbis files
 
 DEPENDS+=	mpg123>=0.59.18:../../audio/mpg123
diff --git a/audio/mp3blaster/Makefile b/audio/mp3blaster/Makefile
index b3b50117b0b..dacc18cb328 100644
--- a/audio/mp3blaster/Makefile
+++ b/audio/mp3blaster/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2006/05/16 17:14:10 wiz Exp $
+# $NetBSD: Makefile,v 1.26 2006/10/04 20:44:19 wiz Exp $
 
 DISTNAME=	mp3blaster-3.2.0
 PKGREVISION=	3
@@ -6,7 +6,7 @@ CATEGORIES=	audio
 MASTER_SITES=	http://www.stack.nl/~brama/mp3blaster/src/
 
 MAINTAINER=	rxg@NetBSD.org
-HOMEPAGE=	http://www.stack.nl/~brama/mp3blaster.html
+HOMEPAGE=	http://mp3blaster.sourceforge.net/
 COMMENT=	MP3 console curses-based player
 
 PTHREAD_OPTS+=	require
diff --git a/audio/musicbox/Makefile b/audio/musicbox/Makefile
index c284625b726..559224d6cae 100644
--- a/audio/musicbox/Makefile
+++ b/audio/musicbox/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.25 2006/05/13 12:59:26 joerg Exp $
+# $NetBSD: Makefile,v 1.26 2006/10/04 20:44:19 wiz Exp $
 
 DISTNAME=	musicbox-1.01p2
 PKGREVISION=	1
 CATEGORIES=	audio
-MASTER_SITES=	ftp://freebsd.csie.nctu.edu.tw/Upload/
+MASTER_SITES=	${MASTER_SITE_LOCAL}
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	rxg@NetBSD.org
diff --git a/audio/oggasm/Makefile b/audio/oggasm/Makefile
index 818a0cdf48f..9be0de4c971 100644
--- a/audio/oggasm/Makefile
+++ b/audio/oggasm/Makefile
@@ -1,14 +1,15 @@
-# $NetBSD: Makefile,v 1.12 2006/02/05 23:08:13 joerg Exp $
+# $NetBSD: Makefile,v 1.13 2006/10/04 20:44:19 wiz Exp $
 #
 
 DISTNAME=	oggasm_1.4.0
 PKGNAME=	${DISTNAME:S/_/-/}
 PKGREVISION=	3
 CATEGORIES=	audio
-MASTER_SITES=	http://oggasm.sourceforge.net/
+MASTER_SITES=	${MASTER_SITE_LOCAL}
 
 MAINTAINER=	rxg@NetBSD.org
-HOMEPAGE=	http://oggasm.sourceforge.net/
+# HOMEPAGE=	http://oggasm.sourceforge.net/
+# but see http://us.geocities.com/pvachusk/programs/index.html
 COMMENT=	Perform batch conversion of mp3s into oggs
 
 DEPENDS+=	mpg123>=0.59.18:../../audio/mpg123
diff --git a/audio/py-mad/Makefile b/audio/py-mad/Makefile
index af6b4c06a46..701c8536f66 100644
--- a/audio/py-mad/Makefile
+++ b/audio/py-mad/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2006/07/24 20:25:31 drochner Exp $
+# $NetBSD: Makefile,v 1.7 2006/10/04 20:44:19 wiz Exp $
 #
 
 DISTNAME=		pymad-0.5.4
@@ -7,7 +7,7 @@ CATEGORIES=		audio python
 MASTER_SITES=		http://spacepants.org/src/pymad/download/
 
 MAINTAINER= 		froz@icix.org
-HOMEPAGE=		http://spacepants.org/src/pymad
+HOMEPAGE=		http://spacepants.org/src/pymad/
 COMMENT=		Python bindings for libmad
 
 PY_PATCHPLIST=		yes
diff --git a/audio/py-musique/Makefile b/audio/py-musique/Makefile
index 35bce6a6cfe..0dc659de97f 100644
--- a/audio/py-musique/Makefile
+++ b/audio/py-musique/Makefile
@@ -1,17 +1,17 @@
-# $NetBSD: Makefile,v 1.9 2006/09/03 00:56:28 wiz Exp $
+# $NetBSD: Makefile,v 1.10 2006/10/04 20:44:19 wiz Exp $
 #
 
 DISTNAME=	pymusique-0.5
 PKGNAME=        ${PYPKGPREFIX}-${DISTNAME:S/py//}
 PKGREVISION=	4
 CATEGORIES=	audio
-MASTER_SITES=	http://fuware.nanocrew.net/pymusique/
+MASTER_SITES=	http://www.pyronecrophilia.com/content/pymusique/
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
-HOMEPAGE=	http://fuware.nanocrew.net/pymusique/
+HOMEPAGE=	http://www.pyronecrophilia.com/content/pymusique/
 COMMENT=	Interface to the iTunes Music Store
 
-RESTRICTED=	Possible legal problems due to iTuness access
+RESTRICTED=	Possible legal problems due to iTunes access
 NO_SRC_ON_FTP=          ${RESTRICTED}
 NO_BIN_ON_FTP=          ${RESTRICTED}
 NO_SRC_ON_CDROM=        ${RESTRICTED}
diff --git a/audio/py-xmms/Makefile b/audio/py-xmms/Makefile
index cb1e1afafab..aa2dc0594fa 100644
--- a/audio/py-xmms/Makefile
+++ b/audio/py-xmms/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2006/06/14 13:35:50 joerg Exp $
+# $NetBSD: Makefile,v 1.9 2006/10/04 20:44:19 wiz Exp $
 
 DISTNAME=	pyxmms-2.02
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME:S/py//}
@@ -7,7 +7,7 @@ CATEGORIES=	audio python
 MASTER_SITES=	http://people.via.ecp.fr/~flo/2002/PyXMMS/dist/
 
 MAINTAINER=	minskim@NetBSD.org
-HOMEPAGE=	http://www.via.ecp.fr/~flo/index.en.xhtml\#PyXMMS_and_PyXMMS-remote
+HOMEPAGE=	http://people.via.ecp.fr/~flo/index.en.xhtml\#PyXMMS_and_PyXMMS-remote
 COMMENT=	Python interface to XMMS
 
 PYDISTUTILSPKG=	yes
diff --git a/audio/sweep/Makefile b/audio/sweep/Makefile
index c878f0afe2f..5459514c9f9 100644
--- a/audio/sweep/Makefile
+++ b/audio/sweep/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.34 2006/04/13 18:23:29 jlam Exp $
+# $NetBSD: Makefile,v 1.35 2006/10/04 20:44:19 wiz Exp $
 #
 
 DISTNAME=	sweep-0.8.3
@@ -7,7 +7,7 @@ CATEGORIES=	audio
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=sweep/}
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
-HOMEPAGE=	http://sweep.sourceforge.net/
+HOMEPAGE=	http://www.metadecks.org/software/sweep/
 COMMENT=	Full-featured digital sound editor
 
 USE_DIRS+=		gnome1-1.5
diff --git a/audio/tcd/Makefile b/audio/tcd/Makefile
index 8ab7194fd67..738fa48f0ac 100644
--- a/audio/tcd/Makefile
+++ b/audio/tcd/Makefile
@@ -1,14 +1,14 @@
-# $NetBSD: Makefile,v 1.4 2006/06/12 16:28:05 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2006/10/04 20:44:19 wiz Exp $
 #
 
 DISTNAME=		tcd-2.2.0
 PKGREVISION=		3
 CATEGORIES=		audio
-MASTER_SITES=		http://savannah.gnu.org/download/tcd/
+MASTER_SITES=		http://download.savannah.gnu.org/releases/tcd/
 EXTRACT_SUFX=		.tar.bz2
 
 MAINTAINER=		roland.illig@gmx.de
-HOMEPAGE=		http://savannah.gnu.org/download/tcd/
+HOMEPAGE=		http://www.nongnu.org/tcd/
 COMMENT=		Audio CD player using ncurses and SDL
 
 USE_PKGLOCALEDIR=	yes
diff --git a/audio/tosha/Makefile b/audio/tosha/Makefile
index de38d09c648..b94fd09fab4 100644
--- a/audio/tosha/Makefile
+++ b/audio/tosha/Makefile
@@ -1,12 +1,12 @@
-# $NetBSD: Makefile,v 1.15 2006/06/26 18:16:31 wiz Exp $
+# $NetBSD: Makefile,v 1.16 2006/10/04 20:44:19 wiz Exp $
 
 DISTNAME=	tosha-0.05
 PKGREVISION=	1
 CATEGORIES=	audio
-MASTER_SITES=	ftp://ftp.tu-clausthal.de/pub/unix/audio/
+MASTER_SITES=	${MASTER_SITE_LOCAL}
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
-HOMEPAGE=	http://www.heim3.tu-clausthal.de/~olli/tosha/
+# author's homepage is at http://www.secnetix.de/~olli/, but tosha isn't mentioned
 COMMENT=	Read CD digital audio data through the SCSI bus
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
diff --git a/audio/tremor/Makefile b/audio/tremor/Makefile
index e653c03e848..5a8d6c78d02 100644
--- a/audio/tremor/Makefile
+++ b/audio/tremor/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2006/02/05 23:08:14 joerg Exp $
+# $NetBSD: Makefile,v 1.18 2006/10/04 20:44:19 wiz Exp $
 
 DISTNAME=	tremor_snapshot_030406
 PKGNAME=	tremor-1.0.2
@@ -8,7 +8,7 @@ MASTER_SITES=	http://www.xiph.org/ogg/vorbis/download/
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	chris@NetBSD.org
-HOMEPAGE=	http://www.xiph.org/ogg/vorbis/
+HOMEPAGE=	http://www.xiph.org/vorbis/
 COMMENT=	Fixed point decoding library for the Ogg Vorbis audio encoding format
 
 WRKSRC=         ${WRKDIR}/Tremor
diff --git a/audio/wmmp3/Makefile b/audio/wmmp3/Makefile
index 99f946bcbfc..c28a75a8f9d 100644
--- a/audio/wmmp3/Makefile
+++ b/audio/wmmp3/Makefile
@@ -1,9 +1,10 @@
-# $NetBSD: Makefile,v 1.9 2006/02/05 23:08:15 joerg Exp $
+# $NetBSD: Makefile,v 1.10 2006/10/04 20:44:20 wiz Exp $
 
 DISTNAME=	wmmp3-0.12
 PKGREVISION=	2
 CATEGORIES=	audio
 MASTER_SITES= 	http://www.dotfiles.com/software/wmmp3/
+# dotfiles is alive, but /software is gone
 
 MAINTAINER=	rxg@NetBSD.org
 HOMEPAGE=	http://www.dotfiles.com/software/wmmp3/
diff --git a/audio/wmsmixer/Makefile b/audio/wmsmixer/Makefile
index d245381b5dd..9a38ae67ef2 100644
--- a/audio/wmsmixer/Makefile
+++ b/audio/wmsmixer/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2006/03/09 21:04:42 jlam Exp $
+# $NetBSD: Makefile,v 1.13 2006/10/04 20:44:20 wiz Exp $
 #
 
 DISTNAME=	wmsmixer-0.5.1
@@ -7,7 +7,7 @@ CATEGORIES=	audio
 MASTER_SITES=	http://www.hibernaculum.net/download/
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
-HOMEPAGE=	http://www.hibernaculum.net/wmsmixer.html
+HOMEPAGE=	http://www.hibernaculum.net/wmsmixer/
 COMMENT=	Another mixer designed for WindowMaker (dockapp)
 
 NOT_FOR_PLATFORM=	Interix-*-*
diff --git a/audio/xamp/Makefile b/audio/xamp/Makefile
index 2c35e4a8c3d..b42612f9ec9 100644
--- a/audio/xamp/Makefile
+++ b/audio/xamp/Makefile
@@ -1,16 +1,15 @@
-# $NetBSD: Makefile,v 1.24 2006/02/05 23:08:15 joerg Exp $
+# $NetBSD: Makefile,v 1.25 2006/10/04 20:44:20 wiz Exp $
 
 DISTNAME=	xamp-0.8-10
 PKGNAME=	xamp-0.8.10
 PKGREVISION=	2
 CATEGORIES=	audio
-MASTER_SITES=	http://andrej.co.ru/~andrej/programs/xamp/ \
-		http://andrej.co.ru/~andrej/programs/xamp/backs/
+MASTER_SITES=	${MASTER_SITE_BACKUP}
 EXTRACT_SUFX=	.tgz
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} ${SKIN_DATA}
 
 MAINTAINER=	rxg@NetBSD.org
-HOMEPAGE=	http://andrej.co.ru/~andrej/programs/xamp/
+HOMEPAGE=	# http://andrej.co.ru/~andrej/programs/xamp/
 COMMENT=	Version of amp (stands for `Audio Mpeg Player') plus a Qt GUI
 
 WRKSRC=		${WRKDIR}/xamp-0.8/xamp-0.8g
diff --git a/audio/xmcd/Makefile b/audio/xmcd/Makefile
index 0ffb0c03bb8..908879ab4a6 100644
--- a/audio/xmcd/Makefile
+++ b/audio/xmcd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.61 2006/03/14 01:14:26 jlam Exp $
+# $NetBSD: Makefile,v 1.62 2006/10/04 20:44:20 wiz Exp $
 
 DISTNAME=	xmcd-3.0.2
 PKGREVISION=    9
@@ -6,7 +6,7 @@ CATEGORIES=	audio
 MASTER_SITES=	http://www.ibiblio.org/tkan/download/xmcd/src/
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
-HOMEPAGE=	http://www.ibiblio.org/tkan/xmcd/
+HOMEPAGE=	http://www.amb.org/xmcd/
 COMMENT=	Motif CD player
 
 PATCH_SITES=		${HOMEPAGE}
diff --git a/audio/xmms-bump-scope/Makefile b/audio/xmms-bump-scope/Makefile
index 3a94d5097dd..2421ebc2936 100644
--- a/audio/xmms-bump-scope/Makefile
+++ b/audio/xmms-bump-scope/Makefile
@@ -1,14 +1,14 @@
-# $NetBSD: Makefile,v 1.14 2006/03/04 21:28:59 jlam Exp $
+# $NetBSD: Makefile,v 1.15 2006/10/04 20:44:20 wiz Exp $
 #
 
 DISTNAME=	bump_scope-0.0.3
 PKGNAME=	xmms-bump-scope-0.0.3
 PKGREVISION=	5
 CATEGORIES=	xmms audio
-MASTER_SITES=	http://staff.xmms.org/zinx/xmms/
+MASTER_SITES=	http://zinx.xmms.org/xmms/
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
-HOMEPAGE=	http://staff.xmms.org/zinx/xmms/
+HOMEPAGE=	http://zinx.xmms.org/xmms/
 COMMENT=	Moving light embossing oscilloscope
 
 USE_LIBTOOL=	YES
diff --git a/audio/xmms-crossfade/Makefile b/audio/xmms-crossfade/Makefile
index 39d39093ad3..3f2b238576f 100644
--- a/audio/xmms-crossfade/Makefile
+++ b/audio/xmms-crossfade/Makefile
@@ -1,14 +1,14 @@
-# $NetBSD: Makefile,v 1.27 2006/03/09 21:04:42 jlam Exp $
+# $NetBSD: Makefile,v 1.28 2006/10/04 20:44:20 wiz Exp $
 #
 
 DISTNAME=		xmms-crossfade-0.2.9
 PKGREVISION=		6
 CATEGORIES=		audio
-MASTER_SITES=		http://www.netcologne.de/~nc-eisenlpe2/xmms-crossfade/ \
+MASTER_SITES=		http://www.mynetcologne.de/~nc-eisenlpe2/xmms-crossfade/ \
 			ftp://ftp.falsehope.com/pub/xmms-crossfade/
 
 MAINTAINER=		pkgsrc-users@NetBSD.org
-HOMEPAGE=		http://www.netcologne.de/~nc-eisenlpe2/xmms-crossfade/
+HOMEPAGE=		http://www.mynetcologne.de/~nc-eisenlpe2/xmms-crossfade/
 COMMENT=		Crossfading/Gapless Plugin for XMMS
 
 GNU_CONFIGURE=		YES
diff --git a/audio/xmms-dflowers/Makefile b/audio/xmms-dflowers/Makefile
index d2eab63c478..acd343cc151 100644
--- a/audio/xmms-dflowers/Makefile
+++ b/audio/xmms-dflowers/Makefile
@@ -1,14 +1,15 @@
-# $NetBSD: Makefile,v 1.24 2006/03/04 21:28:59 jlam Exp $
+# $NetBSD: Makefile,v 1.25 2006/10/04 20:44:20 wiz Exp $
 #
 
 DISTNAME=	dflowers-1.2
 PKGNAME=	xmms-${DISTNAME}
 PKGREVISION=	4
 CATEGORIES=	audio
-MASTER_SITES=	http://www.shell.linux.se/bm/f/
+MASTER_SITES=	${MASTER_SITE_LOCAL}
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
-HOMEPAGE=	http://www.shell.linux.se/bm/index.php?page=xmmsplugin
+# HOMEPAGE=	http://www.shell.linux.se/bm/index.php?page=xmmsplugin
+# AWOL
 COMMENT=	XMMS plugin for dual flower scope
 
 USE_LIBTOOL=		YES
diff --git a/audio/xmms-dspectogram/Makefile b/audio/xmms-dspectogram/Makefile
index b1178dcce0a..aedb20798a8 100644
--- a/audio/xmms-dspectogram/Makefile
+++ b/audio/xmms-dspectogram/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2006/03/04 21:28:59 jlam Exp $
+# $NetBSD: Makefile,v 1.23 2006/10/04 20:44:20 wiz Exp $
 #
 
 DISTNAME=	dspectogram-1.2
@@ -8,7 +8,7 @@ CATEGORIES=	audio
 MASTER_SITES=	http://hem.passagen.se/joakime/
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
-HOMEPAGE=	http://www.shell.linux.se/bm/index.php?page=xmmsplugin
+HOMEPAGE=	http://hem.passagen.se/joakime/
 COMMENT=	XMMS plugin for dual spectogram
 
 USE_LIBTOOL=		YES
diff --git a/audio/xmms-jakdaw/Makefile b/audio/xmms-jakdaw/Makefile
index cb74e9b3c43..9f5df41dcfd 100644
--- a/audio/xmms-jakdaw/Makefile
+++ b/audio/xmms-jakdaw/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2006/03/04 21:29:00 jlam Exp $
+# $NetBSD: Makefile,v 1.13 2006/10/04 20:44:20 wiz Exp $
 
 DISTNAME=	jakdaw-0.0.4
 PKGNAME=	xmms-${DISTNAME}
@@ -7,7 +7,7 @@ CATEGORIES=	audio xmms
 MASTER_SITES=	http://www.jakdaw.ucam.org/xmms/
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
-HOMEPAGE=	http://www.jakdaw.ucam.org/xmms
+HOMEPAGE=	http://www.jakdaw.ucam.org/xmms/
 COMMENT=	Very customizable XMMS plugin with nice effects
 
 GNU_CONFIGURE=	yes
diff --git a/audio/xmms-neato/Makefile b/audio/xmms-neato/Makefile
index 5b1a1ea9f68..2ddc5bf7d74 100644
--- a/audio/xmms-neato/Makefile
+++ b/audio/xmms-neato/Makefile
@@ -1,14 +1,14 @@
-# $NetBSD: Makefile,v 1.20 2006/03/04 21:29:00 jlam Exp $
+# $NetBSD: Makefile,v 1.21 2006/10/04 20:44:20 wiz Exp $
 #
 
 DISTNAME=	neato
 PKGNAME=	xmms-neato-20010818
 PKGREVISION=	5
 CATEGORIES=	audio
-MASTER_SITES=	http://www.rpi.edu/~mullr/xmms/
+MASTER_SITES=	${MASTER_SITE_LOCAL}
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
-HOMEPAGE=	http://www.rpi.edu/~mullr/xmms/
+HOMEPAGE=	http://web.archive.org/web/20021209022733/http://www.rpi.edu/~mullr/xmms/
 COMMENT=	Circle effect XMMS plugin
 
 GNU_CONFIGURE=	yes
diff --git a/audio/xmms-synaesthesia/Makefile b/audio/xmms-synaesthesia/Makefile
index ca61c9bca0f..42290061f70 100644
--- a/audio/xmms-synaesthesia/Makefile
+++ b/audio/xmms-synaesthesia/Makefile
@@ -1,14 +1,14 @@
-# $NetBSD: Makefile,v 1.13 2006/03/04 21:29:00 jlam Exp $
+# $NetBSD: Makefile,v 1.14 2006/10/04 20:44:20 wiz Exp $
 #
 
 DISTNAME=	synaesthesia-xmms-0.0.3-rc3
 PKGNAME=	xmms-synaesthesia-0.0.3rc3
 PKGREVISION=	4
 CATEGORIES=	audio xmms
-MASTER_SITES=	http://staff.xmms.org/zinx/xmms/
+MASTER_SITES=	http://zinx.xmms.org/xmms/
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
-HOMEPAGE=	http://staff.xmms.org/zinx/xmms/
+HOMEPAGE=	http://zinx.xmms.org/xmms/
 COMMENT=	Port of Synaesthesia to an XMMS plugin
 
 GNU_CONFIGURE=	yes
diff --git a/audio/xmms-tv-scope/Makefile b/audio/xmms-tv-scope/Makefile
index 2102915e72f..12160002ed7 100644
--- a/audio/xmms-tv-scope/Makefile
+++ b/audio/xmms-tv-scope/Makefile
@@ -1,14 +1,14 @@
-# $NetBSD: Makefile,v 1.21 2006/06/12 16:28:05 wiz Exp $
+# $NetBSD: Makefile,v 1.22 2006/10/04 20:44:20 wiz Exp $
 #
 
 DISTNAME=	tv_scope-0.0.2
 PKGNAME=	xmms-tv-scope-0.0.2
 PKGREVISION=	8
 CATEGORIES=	xmms audio
-MASTER_SITES=	http://staff.xmms.org/zinx/xmms/
+MASTER_SITES=	http://zinx.xmms.org/xmms/
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
-HOMEPAGE=	http://staff.xmms.org/zinx/xmms/
+HOMEPAGE=	http://zinx.xmms.org/xmms/
 COMMENT=	3D Representation of a waveform
 
 USE_LIBTOOL=	YES
diff --git a/audio/xmmsctrl/Makefile b/audio/xmmsctrl/Makefile
index c13532e94bc..2e5974dc48b 100644
--- a/audio/xmmsctrl/Makefile
+++ b/audio/xmmsctrl/Makefile
@@ -1,13 +1,13 @@
-# $NetBSD: Makefile,v 1.10 2006/03/04 21:29:00 jlam Exp $
+# $NetBSD: Makefile,v 1.11 2006/10/04 20:44:20 wiz Exp $
 #
 
 DISTNAME=		xmmsctrl-1.6
 PKGREVISION=	2
 CATEGORIES=		audio
-MASTER_SITES=		http://www.docs.uu.se/~adavid/utils/
+MASTER_SITES=		http://user.it.uu.se/~adavid/utils/
 
 MAINTAINER=		pkgsrc-users@NetBSD.org
-HOMEPAGE=		http://www.docs.uu.se/~adavid/utils/
+HOMEPAGE=		http://user.it.uu.se/~adavid/utils/
 COMMENT=		Small utility to control xmms from the command line
 
 USE_TOOLS+=		gmake