Use "MASTER_SITE_GNOME" instead of individual "MASTER_SITE" lists.

16 files changed, 32 insertions, 95 deletions

diff --git a/audio/esound/Makefile b/audio/esound/Makefile
index c5e3cc6b634..f382ee535e3 100644
--- a/audio/esound/Makefile
+++ b/audio/esound/Makefile
@@ -1,10 +1,8 @@
-# $NetBSD: Makefile,v 1.6 1999/06/19 15:19:11 tron Exp $
+# $NetBSD: Makefile,v 1.7 1999/08/22 22:02:32 tron Exp $
 
 DISTNAME=	esound-0.2.8
 CATEGORIES=	audio
-MASTER_SITES=	ftp://ftp.gnome.org/pub/GNOME/gnome-1.0/sources/ \
-		ftp://ftp.sunet.se/pub/X11/GNOME/gnome-1.0/sources/ \
-		ftp://ftp.informatik.uni-bonn.de/pub/os/unix/gnome/gnome-1.0/sources/
+MASTER_SITES=	${MASTER_SITE_GNOME:=gnome-1.0/sources/}
 
 MAINTAINER=	root@garbled.net
 HOMEPAGE=	http://pw1.netcom.com/~ericmit/EsounD.html
diff --git a/audio/libaudiofile/Makefile b/audio/libaudiofile/Makefile
index 701b90c74bd..0559123e874 100644
--- a/audio/libaudiofile/Makefile
+++ b/audio/libaudiofile/Makefile
@@ -1,13 +1,11 @@
-# $NetBSD: Makefile,v 1.5 1999/06/19 15:19:11 tron Exp $
+# $NetBSD: Makefile,v 1.6 1999/08/22 22:02:32 tron Exp $
 # FreeBSD Id: Makefile,v 1.2 1999/01/27 08:31:48 fenner Exp
 #
 
 DISTNAME=	audiofile-0.1.6
 PKGNAME=	libaudiofile-0.1.6
 CATEGORIES=	audio
-MASTER_SITES=	ftp://ftp.gnome.org/pub/GNOME/gnome-1.0/sources/ \
-		ftp://ftp.sunet.se/pub/X11/GNOME/gnome-1.0/sources/ \
-		ftp://ftp.informatik.uni-bonn.de/pub/os/unix/gnome/gnome-1.0/sources/
+MASTER_SITES=	${MASTER_SITE_GNOME:=gnome-1.0/sources/}
 
 MAINTAINER=	tron@netbsd.org
 
diff --git a/corba/ORBit/Makefile b/corba/ORBit/Makefile
index 2370d68ee89..3cd7bccf82c 100644
--- a/corba/ORBit/Makefile
+++ b/corba/ORBit/Makefile
@@ -1,11 +1,9 @@
-# $NetBSD: Makefile,v 1.21 1999/08/20 07:22:38 tron Exp $
+# $NetBSD: Makefile,v 1.22 1999/08/22 22:02:32 tron Exp $
 #
 
 DISTNAME=	ORBit-0.4.3
 CATEGORIES=	corba
-MASTER_SITES=	ftp://ftp.gnome.org/pub/GNOME/gnome-1.0/sources/ \
-		ftp://ftp.sunet.se/pub/X11/GNOME/gnome-1.0/sources/ \
-		ftp://ftp.informatik.uni-bonn.de/pub/os/unix/gnome/gnome-1.0/sources/
+MASTER_SITES=	${MASTER_SITE_GNOME:=gnome-1.0/sources/}
 
 MAINTAINER=	packages@netbsd.org
 HOMEPAGE=	http://www.gnome.org/
diff --git a/devel/libgtop/Makefile b/devel/libgtop/Makefile
index a7a10e042b0..17a0b2e0b63 100644
--- a/devel/libgtop/Makefile
+++ b/devel/libgtop/Makefile
@@ -1,11 +1,9 @@
-# $NetBSD: Makefile,v 1.19 1999/06/19 15:19:12 tron Exp $
+# $NetBSD: Makefile,v 1.20 1999/08/22 22:02:32 tron Exp $
 #
 
 DISTNAME=		libgtop-1.0.1
 CATEGORIES=		devel gnome
-MASTER_SITES=		ftp://ftp.gnome.org/pub/GNOME/gnome-1.0/sources/ \
-			ftp://ftp.sunet.se/pub/X11/GNOME/gnome-1.0/sources/ \
-			ftp://ftp.informatik.uni-bonn.de/pub/os/unix/gnome/gnome-1.0/sources/
+MASTER_SITES=		${MASTER_SITE_GNOME:=gnome-1.0/sources/}
 
 MAINTAINER=		packages@netbsd.org
 HOMEPAGE=		http://www.gnome.org/
diff --git a/graphics/ee/Makefile b/graphics/ee/Makefile
index 04cd8991371..b7fa676fa25 100644
--- a/graphics/ee/Makefile
+++ b/graphics/ee/Makefile
@@ -1,12 +1,9 @@
-# $NetBSD: Makefile,v 1.6 1999/07/14 23:12:06 tron Exp $
+# $NetBSD: Makefile,v 1.7 1999/08/22 22:02:33 tron Exp $
 #
 
 DISTNAME=		ee-0.3.8
 CATEGORIES=		x11 gnome
-MASTER_SITES=		ftp://ftp.gnome.org/pub/GNOME/gnome-1.0/sources/ee/ \
-			ftp://ftp.circ.us.eu.org/mirrors/ftp.gnome.org/sources/ee/ \
-			ftp://ftp.sunet.se/pub/X11/GNOME/gnome-1.0/sources/ee/ \
-			ftp://ftp.informatik.uni-bonn.de/pub/os/unix/gnome/gnome-1.0/sources/ee/
+MASTER_SITES=		${MASTER_SITE_GNOME:=gnome-1.0/sources/ee/}
 
 MAINTAINER=		root@garbled.net
 HOMEPAGE=		http://www.gnome.org/
diff --git a/graphics/imlib/Makefile b/graphics/imlib/Makefile
index 00aa66277d7..2d0b7413d36 100644
--- a/graphics/imlib/Makefile
+++ b/graphics/imlib/Makefile
@@ -1,11 +1,9 @@
-# $NetBSD: Makefile,v 1.21 1999/06/19 15:19:12 tron Exp $
+# $NetBSD: Makefile,v 1.22 1999/08/22 22:02:32 tron Exp $
 #
 
 DISTNAME=	imlib-1.9.4
 CATEGORIES=	graphics
-MASTER_SITES=   ftp://ftp.gnome.org/pub/GNOME/gnome-1.0/sources/ \
-		ftp://ftp.sunet.se/pub/X11/GNOME/gnome-1.0/sources/ \
-		ftp://ftp.informatik.uni-bonn.de/pub/os/unix/gnome/gnome-1.0/sources/
+MASTER_SITES=	${MASTER_SITE_GNOME:=gnome-1.0/sources/}
 
 MAINTAINER=	packages@netbsd.org
 HOMEPAGE=	http://www.labs.redhat.com/imlib/
diff --git a/math/gnumeric/Makefile b/math/gnumeric/Makefile
index 1e737d23179..ca55292bdf8 100644
--- a/math/gnumeric/Makefile
+++ b/math/gnumeric/Makefile
@@ -1,14 +1,9 @@
-# $NetBSD: Makefile,v 1.2 1999/08/01 19:07:14 tron Exp $
+# $NetBSD: Makefile,v 1.3 1999/08/22 22:02:33 tron Exp $
 #
 
 DISTNAME=	gnumeric-0.31
 CATEGORIES=	math
-MASTER_SITES=	ftp://ftp.gnome.org/pub/GNOME/sources/gnumeric/ \
-		ftp://ftp.tuwien.ac.at/hci/GNOME/sources/gnumeric/ \
-		http://gd.tuwien.ac.at/hci/GNOME/sources/gnumeric/ \
-		ftp://gnomeftp.wgn.net/pub/gnome/sources/gnumeric/ \
-		ftp://ftp.geo.net/pub/gnome/sources/gnumeric/ \
-		ftp://ftp.informatik.uni-bonn.de/pub/os/unix/gnome/sources/gnumeric/
+MASTER_SITES=	${MASTER_SITE_GNOME:=sources/gnumeric/}
 
 MAINTAINER=	packages@netbsd.org
 HOMEPAGE=	http://www.gnome.org/gnumeric/
diff --git a/misc/gnome-pim/Makefile b/misc/gnome-pim/Makefile
index 70383e3a69d..3d99081f2da 100644
--- a/misc/gnome-pim/Makefile
+++ b/misc/gnome-pim/Makefile
@@ -1,20 +1,9 @@
-# $NetBSD: Makefile,v 1.8 1999/07/24 08:41:39 rh Exp $
+# $NetBSD: Makefile,v 1.9 1999/08/22 22:02:33 tron Exp $
 #
 
 DISTNAME=	gnome-pim-1.0.8
 CATEGORIES=	misc x11 gnome
-MASTER_SITES=	ftp://ftp.gnome.org/pub/GNOME/gnome-1.0/sources/ \
-		ftp://ftp.tuwien.ac.at/hci/GNOME/gnome-1.0/sources/ \
-		ftp://gnomeftp.wgn.net/pub/gnome/ \
-		ftp://ftp.informatik.uni-bonn.de/pub/os/unix/gnome/ \
-		ftp://unix.hensa.ac.uk/mirrors/ftp.gnome.org/pub/GNOME/ \
-		ftp://ftp.sunet.se/pub/X11/GNOME/ \
-		ftp://ftp.dataplus.se/pub/linux/gnome/ \
-		ftp://ftp.net.lut.ac.uk/gnome/ \
-		ftp://mirror.aarnet.edu.au/pub/gnome/ \
-		ftp://ftp.fr.gnome.org/pub/gnome/ \
-		ftp://ftp.dti.ad.jp/pub/X/GNOME/ \
-		http://gd.tuwien.ac.at/hci/GNOME/gnome-1.0/sources/
+MASTER_SITES=	${MASTER_SITE_GNOME:=gnome-1.0/sources/}
 
 MAINTAINER=	rh@netbsd.org
 HOMEPAGE=	http://www.gnome.org/
diff --git a/misc/gnome-utils/Makefile b/misc/gnome-utils/Makefile
index 2767e8a76bc..a5ae24b190d 100644
--- a/misc/gnome-utils/Makefile
+++ b/misc/gnome-utils/Makefile
@@ -1,20 +1,9 @@
-# $NetBSD: Makefile,v 1.7 1999/07/23 09:17:04 tron Exp $
+# $NetBSD: Makefile,v 1.8 1999/08/22 22:02:33 tron Exp $
 #
 
 DISTNAME=	gnome-utils-1.0.1
 CATEGORIES=	misc x11 gnome
-MASTER_SITES=	ftp://ftp.gnome.org/pub/GNOME/gnome-1.0/sources/ \
-		ftp://ftp.tuwien.ac.at/hci/GNOME/gnome-1.0/sources/ \
-		ftp://gnomeftp.wgn.net/pub/gnome/ \
-		ftp://ftp.informatik.uni-bonn.de/pub/os/unix/gnome/ \
-		ftp://unix.hensa.ac.uk/mirrors/ftp.gnome.org/pub/GNOME/ \
-		ftp://ftp.sunet.se/pub/X11/GNOME/ \
-		ftp://ftp.dataplus.se/pub/linux/gnome/ \
-		ftp://ftp.net.lut.ac.uk/gnome/ \
-		ftp://mirror.aarnet.edu.au/pub/gnome/ \
-		ftp://ftp.fr.gnome.org/pub/gnome/ \
-		ftp://ftp.dti.ad.jp/pub/X/GNOME/ \
-		http://gd.tuwien.ac.at/hci/GNOME/gnome-1.0/sources/
+MASTER_SITES=	${MASTER_SITE_GNOME:=gnome-1.0/sources/}
 
 MAINTAINER=	rh@netbsd.org
 HOMEPAGE=	http://www.gnome.org/
diff --git a/net/ORBit/Makefile b/net/ORBit/Makefile
index 2370d68ee89..3cd7bccf82c 100644
--- a/net/ORBit/Makefile
+++ b/net/ORBit/Makefile
@@ -1,11 +1,9 @@
-# $NetBSD: Makefile,v 1.21 1999/08/20 07:22:38 tron Exp $
+# $NetBSD: Makefile,v 1.22 1999/08/22 22:02:32 tron Exp $
 #
 
 DISTNAME=	ORBit-0.4.3
 CATEGORIES=	corba
-MASTER_SITES=	ftp://ftp.gnome.org/pub/GNOME/gnome-1.0/sources/ \
-		ftp://ftp.sunet.se/pub/X11/GNOME/gnome-1.0/sources/ \
-		ftp://ftp.informatik.uni-bonn.de/pub/os/unix/gnome/gnome-1.0/sources/
+MASTER_SITES=	${MASTER_SITE_GNOME:=gnome-1.0/sources/}
 
 MAINTAINER=	packages@netbsd.org
 HOMEPAGE=	http://www.gnome.org/
diff --git a/print/ggv/Makefile b/print/ggv/Makefile
index d2bd0160c9a..fce0cfb86e0 100644
--- a/print/ggv/Makefile
+++ b/print/ggv/Makefile
@@ -1,14 +1,9 @@
-# $NetBSD: Makefile,v 1.1.1.1 1999/08/22 20:27:24 rh Exp $
+# $NetBSD: Makefile,v 1.2 1999/08/22 22:02:33 tron Exp $
 #
 
 DISTNAME=	ggv-0.50
 CATEGORIES=	print
-MASTER_SITES=	ftp://ftp.gnome.org/pub/GNOME/sources/ggv/ \
-		ftp://ftp.tuwien.ac.at/hci/gnome.org/GNOME/sources/ggv/ \
-		http://gd.tuwien.ac.at/hci/gnome.org/GNOME/sources/ggv/ \
-		ftp://ftp.circ.us.eu.org/mirrors/ftp.gnome.org/sources/ggv/  \
-		ftp://ftp.jimpick.com/pub/mirrors/gnome/sources/ggv/ \
-		ftp://ftp.informatik.uni-bonn.de/pub/os/unix/gnome/sources/ggv/
+MASTER_SITES=	${MASTER_SITE_GNOME:=sources/ggv/}
 
 MAINTAINER=	rh@netbsd.org
 HOMEPAGE=	http://www.gnome.org/
diff --git a/sysutils/gmc/Makefile b/sysutils/gmc/Makefile
index a6e93c30aca..e42500bebb4 100644
--- a/sysutils/gmc/Makefile
+++ b/sysutils/gmc/Makefile
@@ -1,12 +1,9 @@
-# $NetBSD: Makefile,v 1.13 1999/08/17 19:24:39 tron Exp $
+# $NetBSD: Makefile,v 1.14 1999/08/22 22:02:34 tron Exp $
 
 DISTNAME=	mc-4.5.37
 PKGNAME=	gmc-4.5.37
 CATEGORIES=	sysutils gnome
-MASTER_SITES=	ftp://ftp.gnome.org/pub/GNOME/sources/mc/ \
-		ftp://ftp.sunet.se/pub/X11/GNOME/sources/mc/ \
-		ftp://ftp.informatik.uni-bonn.de/pub/os/unix/gnome/sources/mc/ \
-		ftp://ftp.tuwien.ac.at/hci/gnome.org/GNOME/sources/mc/
+MASTER_SITES=	${MASTER_SITE_GNOME:=sources/mc/}
 
 MAINTAINER=	tron@netbsd.org
 HOMEPAGE=	http://www.gnome.org/mc/
diff --git a/sysutils/mc/Makefile b/sysutils/mc/Makefile
index 9f1e3ac36f3..8f8e58baa56 100644
--- a/sysutils/mc/Makefile
+++ b/sysutils/mc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 1999/08/17 19:24:39 tron Exp $
+# $NetBSD: Makefile,v 1.27 1999/08/22 22:02:34 tron Exp $
 # FreeBSD Id: Makefile,v 1.16 1997/11/30 19:37:48 vanilla Exp
 #
 
@@ -7,10 +7,7 @@ CATEGORIES=	sysutils
 
 MAINTAINER=	tron@netbsd.org
 HOMEPAGE=	http://www.gnome.org/mc/
-MASTER_SITES=	ftp://ftp.gnome.org/pub/GNOME/sources/mc/ \
-		ftp://ftp.sunet.se/pub/X11/GNOME/sources/mc/ \
-		ftp://ftp.informatik.uni-bonn.de/pub/os/unix/gnome/sources/mc/ \
-		ftp://ftp.tuwien.ac.at/hci/gnome.org/GNOME/sources/mc/
+MASTER_SITES=	${MASTER_SITE_GNOME:=sources/mc/}
 
 DEPENDS+=	libslang-1.3.8:../../devel/libslang
 
diff --git a/x11/controlcenter/Makefile b/x11/controlcenter/Makefile
index 9b0002535c7..f88a83ac732 100644
--- a/x11/controlcenter/Makefile
+++ b/x11/controlcenter/Makefile
@@ -1,15 +1,9 @@
-# $NetBSD: Makefile,v 1.10 1999/08/22 10:59:02 frueauf Exp $
+# $NetBSD: Makefile,v 1.11 1999/08/22 22:02:34 tron Exp $
 #
 
 DISTNAME=		control-center-1.0.6
 CATEGORIES=		x11 gnome
-MASTER_SITES=		ftp://ftp.gnome.org/pub/GNOME/sources/ \
-			ftp://ftp.circ.us.eu.org/mirrors/ftp.gnome.org/sources/ \
-			ftp://ftp.jimpick.com/pub/mirrors/gnome/sources/control-center/ \
-			ftp://ftp.informatik.uni-bonn.de/pub/os/unix/gnome/gnome-1.0/sources/ \
-			ftp://ftp.tuwien.ac.at/hci/gnome.org/GNOME/sources/control-center/ \
-			http://gd.tuwien.ac.at/hci/gnome.org/GNOME/sources/control-center/
-
+MASTER_SITES=		${MASTER_SITE_GNOME:=sources/control-center/}
 MAINTAINER=		root@garbled.net
 HOMEPAGE=		http://www.gnome.org/
 
diff --git a/x11/gnome-core/Makefile b/x11/gnome-core/Makefile
index e3e6f6c3082..6a2c4c3e7cd 100644
--- a/x11/gnome-core/Makefile
+++ b/x11/gnome-core/Makefile
@@ -1,11 +1,9 @@
-# $NetBSD: Makefile,v 1.22 1999/08/15 14:58:59 tron Exp $
+# $NetBSD: Makefile,v 1.23 1999/08/22 22:02:34 tron Exp $
 #
 
 DISTNAME=		gnome-core-1.0.7
 CATEGORIES=		x11 gnome
-MASTER_SITES=		ftp://ftp.gnome.org/pub/GNOME/gnome-1.0/sources/ \
-			ftp://ftp.sunet.se/pub/X11/GNOME/gnome-1.0/sources/ \
-			ftp://ftp.informatik.uni-bonn.de/pub/os/unix/gnome/gnome-1.0/sources/
+MASTER_SITES=		${MASTER_SITE_GNOME:=gnome-1.0/sources/}
 
 MAINTAINER=		tron@netbsd.org
 HOMEPAGE=		http://www.gnome.org/
diff --git a/x11/gnome-libs/Makefile b/x11/gnome-libs/Makefile
index 9f6e16d363a..f6bc0996b48 100644
--- a/x11/gnome-libs/Makefile
+++ b/x11/gnome-libs/Makefile
@@ -1,11 +1,9 @@
-# $NetBSD: Makefile,v 1.28 1999/07/14 20:45:27 tron Exp $
+# $NetBSD: Makefile,v 1.29 1999/08/22 22:02:34 tron Exp $
 #
 
 DISTNAME=		gnome-libs-1.0.10
 CATEGORIES=		x11 gnome
-MASTER_SITES=		ftp://ftp.gnome.org/pub/GNOME/gnome-1.0/sources/ \
-			ftp://ftp.sunet.se/pub/X11/GNOME/gnome-1.0/sources/ \
-			ftp://ftp.informatik.uni-bonn.de/pub/os/unix/gnome/gnome-1.0/sources/
+MASTER_SITES=		${MASTER_SITE_GNOME:=gnome-1.0/sources/}
 
 MAINTAINER=		tron@netbsd.org
 HOMEPAGE=		http://www.gnome.org/