Use ${MASTER_SITE_AFTERSTEP} or ${MASTER_SITE_WINDOWMAKER}

This unbreaks the fetching of several of these ports.

5 files changed, 16 insertions, 19 deletions

diff --git a/x11-wm/afterstep-i18n/Makefile b/x11-wm/afterstep-i18n/Makefile
index 4a9f85bc28a0..41c89b7403a6 100644
--- a/x11-wm/afterstep-i18n/Makefile
+++ b/x11-wm/afterstep-i18n/Makefile
@@ -3,16 +3,17 @@
 # Date created:		23 October 1998
 # Whom:			issei@jp.FreeBSD.ORG
 #
-# $Id: Makefile,v 1.4 1999/01/10 14:54:28 simokawa Exp $
+# $Id: Makefile,v 1.5 1999/01/18 06:38:08 asami Exp $
 #
 
 DISTNAME=	AfterStep-1.0
 PKGNAME=	afterstep-i18n-1.0
 CATEGORIES=	x11-wm afterstep
-MASTER_SITES=	ftp://ftp.afterstep.org/archives/ \
+MASTER_SITES=	${MASTER_SITE_AFTERSTEP} \
 		http://www.freebsd.org/~kuriyama/distfiles/ \
 		http://www.itlb.te.noda.sut.ac.jp/~manome/afterstep/archive/ \
 		http://www.itlb.te.noda.sut.ac.jp/~manome/afterstep/archive/icons/
+MASTER_SITE_SUBDIR=	stable/archives
 DISTFILES=      ${DISTNAME}.tar.gz \
 		unofficial-I18N.98Feb27.tar.gz \
 		kterm.xpm kterm2.xpm KTerm-AS.xpm netscape4.xpm
diff --git a/x11-wm/afterstep-stable/Makefile b/x11-wm/afterstep-stable/Makefile
index 590f93e89d02..9e39de71f2ce 100644
--- a/x11-wm/afterstep-stable/Makefile
+++ b/x11-wm/afterstep-stable/Makefile
@@ -3,16 +3,14 @@
 # Date created:		1 May 1998
 # Whom:			Brett Taylor
 #
-# $Id: Makefile,v 1.31 1999/01/18 03:38:24 billf Exp $
+# $Id: Makefile,v 1.32 1999/01/23 07:05:19 vanilla Exp $
 #
 
 DISTNAME=	AfterStep-1.6.6
 PKGNAME=	afterstep-1.6.6
 CATEGORIES=     x11-wm afterstep
-MASTER_SITES=   ftp://ftp.afterstep.org/stable/ \
-		ftp://ftp.starshadow.com/pub/afterstep/stable/ \
-		ftp://ftp.digex.net/pub/os/wm/AfterStep/stable/ \
-		ftp://ftp.alpha1.net/pub/mirrors/ftp.afterstep.org/
+MASTER_SITES=   ${MASTER_SITE_AFTERSTEP}
+MASTER_SITE_SUBDIR=	stable/archives
 
 MAINTAINER=	dima@chg.ru
 
diff --git a/x11-wm/afterstep/Makefile b/x11-wm/afterstep/Makefile
index 520a5a700c13..da36a21157f8 100644
--- a/x11-wm/afterstep/Makefile
+++ b/x11-wm/afterstep/Makefile
@@ -3,17 +3,15 @@
 # Date created:		October 29th 1996
 # Whom:			jfitz@FreeBSD.ORG
 #
-# $Id: Makefile,v 1.26 1999/01/17 03:03:38 billf Exp $
+# $Id: Makefile,v 1.27 1999/01/18 03:38:24 billf Exp $
 #
 
 DISTNAME=	AfterStep-1.0
 PKGNAME=	afterstep-1.0
 CATEGORIES=	x11-wm afterstep
-MASTER_SITES=	ftp://ftp.afterstep.org/stable/archives/ \
-		ftp://ftp.digex.net/pub/os/wm/AfterStep/stable/archives/ \
-		ftp://ftp.alpha1.net/pub/mirrors/ftp.afterstep.org/stable/archives/ \
-		ftp://ftp.starshadow.com/pub/afterstep/stable/archives/ \
+MASTER_SITES=	${MASTER_SITE_AFTERSTEP} \
 		ftp://ftp.cs.tu-berlin.de/pub/X/afterstep/
+MASTER_SITE_SUBDIR=	stable/archives
 
 MAINTAINER=	jfitz@FreeBSD.ORG
 
diff --git a/x11-wm/windowmaker-i18n/Makefile b/x11-wm/windowmaker-i18n/Makefile
index f5a522de4b59..2d8743555eac 100644
--- a/x11-wm/windowmaker-i18n/Makefile
+++ b/x11-wm/windowmaker-i18n/Makefile
@@ -3,16 +3,16 @@
 # Date created:		24 Nov 1998
 # Whom:			mac@jp.freebsd.org
 #
-# $Id: Makefile,v 1.50 1999/02/11 07:23:10 kuriyama Exp $
+# $Id: Makefile,v 1.51 1999/02/12 17:00:00 flathill Exp $
 
 DISTNAME=	WindowMaker-0.51.0
 PKGNAME=	windowmaker-i18n-0.51.0
 CATEGORIES=	x11-wm windowmaker
-MASTER_SITES=	ftp://ftp.windowmaker.org/pub/beta/srcs/ \
-		ftp://muse.brain.riken.go.jp:/pub/ja.po/ \
-		ftp://ftp.io.com/pub/mirror/windowmaker/beta/srcs/ \
+MASTER_SITES=	${MASTER_SITE_WINDOWMAKER} \
+		ftp://muse.brain.riken.go.jp/pub/ja.po/ \
 		http://jgo.local.net/cool_downloads/wm/ \
 		ftp://muse.brain.riken.go.jp/pub/rpm/contrib/
+MASTER_SITE_SUBDIR=	beta/srcs
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} ${DATAFILES} \
 		WindowMaker-0.51.0ja1.tar.gz
 
diff --git a/x11-wm/windowmaker/Makefile b/x11-wm/windowmaker/Makefile
index 9675c223ee5d..9a801bbea344 100644
--- a/x11-wm/windowmaker/Makefile
+++ b/x11-wm/windowmaker/Makefile
@@ -3,14 +3,14 @@
 # Date created:		August 13, 1997
 # Whom:			handy@physics.montana.edu
 #
-# $Id: Makefile,v 1.45 1999/01/23 07:05:30 vanilla Exp $
+# $Id: Makefile,v 1.46 1999/02/10 21:29:28 fenner Exp $
 
 DISTNAME=	WindowMaker-0.51.0
 PKGNAME=	windowmaker-0.51.0
 CATEGORIES=	x11-wm windowmaker
-MASTER_SITES=	ftp://ftp.windowmaker.org/pub/beta/srcs/ \
-		ftp://ftp.io.com/pub/mirror/windowmaker/beta/srcs/ \
+MASTER_SITES=	${MASTER_SITE_WINDOWMAKER} \
 		http://jgo.local.net/cool_downloads/wm/
+MASTER_SITE_SUBDIR=	beta/srcs
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} ${DATAFILES}
 
 MAINTAINER=	handy@physics.montana.edu