20 files changed, 68 insertions, 79 deletions

diff --git a/audio/playmidi/Makefile b/audio/playmidi/Makefile
index e5930316fb30..56e4a8b8075d 100644
--- a/audio/playmidi/Makefile
+++ b/audio/playmidi/Makefile
@@ -3,12 +3,13 @@
 # Date created:         27 Feb 1995
 # Whom:                 ache
 #
-# $Id: Makefile,v 1.5 1996/11/15 06:53:52 ache Exp $
+# $Id: Makefile,v 1.6 1996/11/15 10:52:00 asami Exp $
 #
 
 DISTNAME=       playmidi-2.3
 CATEGORIES=     audio
-MASTER_SITES=   ftp://sunsite.unc.edu/pub/Linux/apps/sound/players/
+MASTER_SITES=   ${MASTER_SITE_SUNSITE}
+MASTER_SITE_SUBDIR=	apps/sound/players
 
 MAINTAINER=     ache@FreeBSD.ORG
 
diff --git a/audio/s3mod/Makefile b/audio/s3mod/Makefile
index d414d543944e..1b28bc8f5f3b 100644
--- a/audio/s3mod/Makefile
+++ b/audio/s3mod/Makefile
@@ -3,13 +3,14 @@
 # Date created:         9 March 1995
 # Whom:                 ugen
 #
-# $Id: Makefile,v 1.3 1995/04/11 19:46:50 asami Exp $
+# $Id: Makefile,v 1.4 1996/11/15 23:14:19 obrien Exp $
 #
 
 DISTNAME=       s3mod-v1.08A
 PKGNAME=	s3mod-1.08a
 CATEGORIES=	audio
-MASTER_SITES=   ftp://sunsite.unc.edu/pub/Linux/apps/sound/players/
+MASTER_SITES=   ${MASTER_SITE_SUNSITE}
+MASTER_SITE_SUBDIR=	apps/sound/players
 DISTFILES=      s3mod-v1.08A.tar.gz
 
 MAINTAINER=	ugen@FreeBSD.org
diff --git a/audio/xmix/Makefile b/audio/xmix/Makefile
index deb8ab8cb045..c7b247c38b56 100644
--- a/audio/xmix/Makefile
+++ b/audio/xmix/Makefile
@@ -6,11 +6,10 @@
 
 DISTNAME=	xmix-2.1
 CATEGORIES=	audio
-MASTER_SITES=	ftp://sunsite.unc.edu/pub/Linux/apps/sound/mixers/ \
-		ftp://ftp.icm.edu.pl/pub2/linux/apps/sound/mixers/
+MASTER_SITES=	${MASTER_SITE_SUNSITE}
+MASTER_SITE_SUBDIR=	apps/sound/mixers
 
-PATCH_SITES=	ftp://sunsite.unc.edu/pub/Linux/apps/sound/mixers/ \
-		ftp://ftp.icm.edu.pl/pub2/linux/apps/sound/mixers/
+PATCH_SITES=	${MASTER_SITES}
 PATCHFILES=	xmix-2.1.mixers.patch
 
 MAINTAINER=	janek@gaja.ipan.lublin.pl
diff --git a/cad/spice/Makefile b/cad/spice/Makefile
index cb56993d841b..e55d152586a0 100644
--- a/cad/spice/Makefile
+++ b/cad/spice/Makefile
@@ -3,13 +3,14 @@
 # Date created:         26 Mar 96
 # Whom:                 Julian Jenkins <kaveman@magna.com.au>
 #
-# $Id: Makefile,v 1.3 1996/05/27 03:11:48 asami Exp $
+# $Id: Makefile,v 1.4 1996/11/15 23:31:01 obrien Exp $
 #
 
 DISTNAME=       spice3f4
 PKGNAME=	spice-3f4
 CATEGORIES=	cad
-MASTER_SITES=	ftp://sunsite.unc.edu/pub/Linux/apps/circuits/
+MASTER_SITES=	${MASTER_SITE_SUNSITE}
+MASTER_SITE_SUBDIR=	apps/circuits
 
 #PATCH_SITES=	ftp://ic.eecs.berkeley.edu/pub/Spice3/3f4patches
 #PATCHFILES=	grid.patch newcoms.patch spsmp.patch
diff --git a/comms/minicom/Makefile b/comms/minicom/Makefile
index d24eb5e88629..72381e67df05 100644
--- a/comms/minicom/Makefile
+++ b/comms/minicom/Makefile
@@ -3,13 +3,13 @@
 # Date created:         Fri Dec 01, 1995
 # Whom:                 obrien@cs.ucdavis.edu
 #
-# $Id: Makefile,v 1.4 1996/11/13 12:40:52 asami Exp $
+# $Id: Makefile,v 1.5 1996/11/17 03:01:06 obrien Exp $
 #
 
 DISTNAME=	minicom-1.75
 CATEGORIES=	comms
-MASTER_SITES=	ftp://sunsite.unc.edu/pub/Linux/apps/comm/ \
-		ftp://ftp.yggdrasil.com/mirrors/sunsite/apps/comm/
+MASTER_SITES=	${MASTER_SITE_SUNSITE}
+MASTER_SITE_SUBDIR=	apps/comm
 
 MAINTAINER=     obrien@cs.ucdavis.edu
 
diff --git a/deskutils/cal/Makefile b/deskutils/cal/Makefile
index 8ada80b856a8..6848522ce28a 100644
--- a/deskutils/cal/Makefile
+++ b/deskutils/cal/Makefile
@@ -3,12 +3,13 @@
 # Date created:				6 July 1996
 # Whom: Andrey Zakhvatov <andy@cgu.chel.su>
 #
-# $Id: Makefile,v 1.2 1996/11/11 05:49:17 obrien Exp $
+# $Id: Makefile,v 1.3 1996/11/17 09:05:25 obrien Exp $
 #
 
 DISTNAME=	cal-3.4
 CATEGORIES=	misc
-MASTER_SITES=	ftp://sunsite.unc.edu/pub/Linux/utils/shell/
+MASTER_SITES=	${MASTER_SITE_SUNSITE}
+MASTER_SITE_SUBDIR=	utils/shell
 
 MAINTAINER=	andy@cgu.chel.su
 
diff --git a/devel/cflow/Makefile b/devel/cflow/Makefile
index 742f32623a26..f0e212dd261a 100644
--- a/devel/cflow/Makefile
+++ b/devel/cflow/Makefile
@@ -3,13 +3,13 @@
 # Date created:		28 Sept 1995
 # Whom:			dchapes@zeus.leitch.com
 #
-# $Id: Makefile,v 1.1.1.1 1995/10/03 09:24:22 asami Exp $
+# $Id: Makefile,v 1.2 1995/11/26 11:28:56 asami Exp $
 #
 
 DISTNAME=	cflow-2.0
-CATEGORIES+=	devel
-MASTER_SITES=	ftp://sunsite.unc.edu/pub/Linux/devel/lang/c/ \\
-		ftp://info2.rus.uni-stuttgart.de/pub/systems/linux/MIRROR.sunsite/devel/lang/c/
+CATEGORIES=	devel
+MASTER_SITES=	${MASTER_SITE_SUNSITE}
+MASTER_SITE_SUBDIR=	devel/lang/c
 
 MAINTAINER=	dchapes@zeus.leitch.com
 
diff --git a/emulators/cpmemu/Makefile b/emulators/cpmemu/Makefile
index 13cd8cb7a817..596f53c10a6c 100644
--- a/emulators/cpmemu/Makefile
+++ b/emulators/cpmemu/Makefile
@@ -2,14 +2,14 @@
 # Version required:	0.2
 # Date created:		28 June 1995
 # Whom:			janek@gaja.ipan.lublin.pl
-# $Id$
+# $Id: Makefile,v 1.5 1996/11/12 02:16:40 obrien Exp $
 #
 
 DISTNAME=	cpm-0.2
 PKGNAME=	cpmemu-0.2
 CATEGORIES=	emulators
-MASTER_SITES=	ftp://sunsite.unc.edu/pub/Linux/distributions/slackware/source/extra-stuff/CPM-80-emulator/ \
-		ftp://ftp.icm.edu.pl/pub2/linux/distributions/slackware/source/extra-stuff/CPM-80-emulator/
+MASTER_SITES=	${MASTER_SITE_SUNSITE}
+MASTER_SITE_SUBDIR=	distributions/slackware/source/extra-stuff/CPM-80-emulator/
 
 MAINTAINER=	ports@FreeBSD.org
 
diff --git a/emulators/wine-devel/Makefile b/emulators/wine-devel/Makefile
index 8e9c26f92a8b..4b8bd6dad52d 100644
--- a/emulators/wine-devel/Makefile
+++ b/emulators/wine-devel/Makefile
@@ -3,18 +3,15 @@
 # Date created:         Sa   9 Nov 1996 00:52:22 MET
 # Whom:			se
 #
-# $Id: Makefile,v 1.34 1996/11/12 02:17:06 obrien Exp $
+# $Id: Makefile,v 1.35 1996/11/17 05:48:49 obrien Exp $
 #
 
 DATE=		961102
 DISTNAME=	Wine-${DATE}
 PKGNAME=	wine-96.11.02
 CATEGORIES=	emulators x11
-MASTER_SITES=	ftp://sunsite.unc.edu/pub/Linux/ALPHA/wine/development/ \
-		ftp://tsx-11.mit.edu/pub/linux/ALPHA/Wine/development/ \
-		ftp://ftp.dfv.rwth-aachen.de/pub/linux/sunsite/ALPHA/wine/development/ \
-		ftp://ftp.infomagic.com/pub/mirrors/linux/wine/development/ \
-		ftp://aris.com/pub/linux/ALPHA/Wine/development/
+MASTER_SITES=	${MASTER_SITE_SUNSITE}
+MASTER_SITE_SUBDIR=	ALPHA/wine/development
 
 MAINTAINER=	se@FreeBSD.ORG
 
diff --git a/emulators/wine/Makefile b/emulators/wine/Makefile
index 8e9c26f92a8b..4b8bd6dad52d 100644
--- a/emulators/wine/Makefile
+++ b/emulators/wine/Makefile
@@ -3,18 +3,15 @@
 # Date created:         Sa   9 Nov 1996 00:52:22 MET
 # Whom:			se
 #
-# $Id: Makefile,v 1.34 1996/11/12 02:17:06 obrien Exp $
+# $Id: Makefile,v 1.35 1996/11/17 05:48:49 obrien Exp $
 #
 
 DATE=		961102
 DISTNAME=	Wine-${DATE}
 PKGNAME=	wine-96.11.02
 CATEGORIES=	emulators x11
-MASTER_SITES=	ftp://sunsite.unc.edu/pub/Linux/ALPHA/wine/development/ \
-		ftp://tsx-11.mit.edu/pub/linux/ALPHA/Wine/development/ \
-		ftp://ftp.dfv.rwth-aachen.de/pub/linux/sunsite/ALPHA/wine/development/ \
-		ftp://ftp.infomagic.com/pub/mirrors/linux/wine/development/ \
-		ftp://aris.com/pub/linux/ALPHA/Wine/development/
+MASTER_SITES=	${MASTER_SITE_SUNSITE}
+MASTER_SITE_SUBDIR=	ALPHA/wine/development
 
 MAINTAINER=	se@FreeBSD.ORG
 
diff --git a/emulators/x48/Makefile b/emulators/x48/Makefile
index 94724dab1a23..8179c37e0877 100644
--- a/emulators/x48/Makefile
+++ b/emulators/x48/Makefile
@@ -3,12 +3,13 @@
 # Date created:         Thu Oct 24 13:10:59 CDT 1996
 # Whom:                 erich@FreeBSD.org
 #
-# $Id: Makefile,v 1.1.1.1 1996/10/24 20:41:37 erich Exp $
+# $Id: Makefile,v 1.2 1996/11/12 02:17:07 obrien Exp $
 #
 
 DISTNAME=	x48-0.4.0
 CATEGORIES=	emulators
-MASTER_SITES=	ftp://sunsite.unc.edu/pub/Linux/system/Emulators/
+MASTER_SITES=	${MASTER_SITE_SUNSITE}
+MASTER_SITE_SUBDIR=	system/Emulators
 
 MAINTAINER=	erich@FreeBSD.org
 
diff --git a/games/flying/Makefile b/games/flying/Makefile
index 44151b4367bd..5a183260c475 100644
--- a/games/flying/Makefile
+++ b/games/flying/Makefile
@@ -3,18 +3,13 @@
 # Date created:				12 Jul 1996
 # Whom:					searle
 #
-# $Id$
+# $Id: Makefile,v 1.1.1.1 1996/08/09 21:25:54 chuckr Exp $
 #
 
 DISTNAME=	flying-6.20
-CATEGORIES+=	games
-MASTER_SITES=	ftp://fsuj01.rz.uni-jena.de/pub/linux/MIRROR.sunsite/games/x11/ \
-		ftp://dei.unipd.it/linux/sunsite/games/x11/ \
-		ftp://pippen.bl.physik.tu-muenchen.de/pub/comp/os/linux/sunsite/games/x11/ \
-		ftp://nic.switch.ch/mirror/linux/sunsite.games/x11/ \
-		ftp://unix.hensa.ac.uk/mirrors/sunsite/pub/Linux/games/x11/ \
-		ftp://sunsite.rediris.es/software/linux/sunsite/games/x11/ \
-		ftp://fvkma.tu-graz.ac.at/.2/x11/R6contrib/games/multiplayer/
+CATEGORIES=	games
+MASTER_SITES=	${MASTER_SITE_SUNSITE}
+MASTER_SITE_SUBDIR=	games/x11
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	searle@longacre.demon.co.uk
diff --git a/games/xinvaders/Makefile b/games/xinvaders/Makefile
index 89711f71ce02..4f19af2e4299 100644
--- a/games/xinvaders/Makefile
+++ b/games/xinvaders/Makefile
@@ -3,13 +3,14 @@
 # Date created:         3 Jan 1995
 # Whom:                 swallace
 #
-# $Id: Makefile,v 1.6 1995/10/11 00:11:25 asami Exp $
+# $Id: Makefile,v 1.7 1996/06/14 03:15:20 asami Exp $
 #
 
 DISTNAME=       xinvaders
 PKGNAME=	xinvaders-1.1
-CATEGORIES+=	games
-MASTER_SITES=	ftp://sunsite.unc.edu/pub/Linux/games/x11/video/
+CATEGORIES=	games
+MASTER_SITES=	${MASTER_SITE_SUNSITE}
+MASTER_SITE_SUBDIR=	games/x11/video
 
 USE_IMAKE=	yes
 
diff --git a/math/xspread/Makefile b/math/xspread/Makefile
index ab09d9851331..12b099976ecb 100644
--- a/math/xspread/Makefile
+++ b/math/xspread/Makefile
@@ -6,9 +6,9 @@
 
 DISTNAME=	xspread2.1
 PKGNAME=	xspread-2.1
-CATEGORIES+=	math
-MASTER_SITES=	ftp://sunsite.unc.edu/pub/Linux/distributions/slackware/source/xap/xspread/ \
-	ftp://ftp.icm.edu.pl/pub2/linux/distributions/slackware/source/xap/xspread/
+CATEGORIES=	math
+MASTER_SITES=	${MASTER_SITE_SUNSITE}
+MASTER_SITE_SUBDIR=	distributions/slackware/source/xap/xspread
 
 USE_IMAKE=	yes
 USE_GMAKE=	yes
diff --git a/misc/splitvt/Makefile b/misc/splitvt/Makefile
index 6f5268657603..ff182516009d 100644
--- a/misc/splitvt/Makefile
+++ b/misc/splitvt/Makefile
@@ -3,15 +3,13 @@
 # Date created:         Fri Oct 4, 1996
 # Whom:                 David O'Brien (obrien@cs.ucdavis.edu)
 #
-# $Id: Makefile,v 1.2 1996/11/11 05:50:11 obrien Exp $
+# $Id: Makefile,v 1.3 1996/11/13 12:41:23 asami Exp $
 #
 
 DISTNAME=	splitvt-1.6.1
 CATEGORIES=	misc
-MASTER_SITES=	ftp://ftp.cc.gatech.edu/pub/linux/utils/console/  \
-		ftp://sunsite.unc.edu/pub/Linux/utils/console/  \
-		ftp://ftp.funet.fi/pub/Linux/sunsite/utils/console/  \
-		ftp://ftp.cs.cuhk.hk/pub/Linux/utils/console/
+MASTER_SITES=	${MASTER_SITE_SUNSITE}
+MASTER_SITE_SUBDIR=	utils/console
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=     obrien@cs.ucdavis.edu
diff --git a/news/knews/Makefile b/news/knews/Makefile
index 3dbaa892761f..24d0e2bd7e4c 100644
--- a/news/knews/Makefile
+++ b/news/knews/Makefile
@@ -3,16 +3,14 @@
 # Date created:         Sun Apr 14 09:23:59 MET DST 1996
 # Whom:                 Andreas Klemm <andreas@klemm.gtn.com>
 #
-# $Id: Makefile,v 1.6 1996/09/19 03:01:13 andreas Exp $
+# $Id: Makefile,v 1.7 1996/10/19 09:14:59 andreas Exp $
 #
 
 DISTNAME=	knews-0.9.8
-CATEGORIES+=	x11 news
+CATEGORIES=	x11 news
 MASTER_SITES=	ftp://ftp.nada.kth.se/home/su95-kjo/knews/ \
-	ftp://sunsite.unc.edu/pub/Linux/X11/xapps/networked/ \
-	ftp://ftp.cc.gatech.edu/ac88/linux/X11/xapps/networked/ \
-	ftp://ftp.germany.eu.net/pub/os/Linux/Mirror.SunSITE/X11/xapps/networked/ \
-	ftp://ftp.funet.fi/pub/mirrors/sunsite.unc.edu/pub/Linux/X11/xapps/networked/
+		${MASTER_SITE_SUNSITE}
+MASTER_SITE_SUBDIR=	X11/xapps/networked
 
 MAINTAINER=	andreas@klemm.gtn.com
 
diff --git a/sysutils/afio/Makefile b/sysutils/afio/Makefile
index d65229b86d00..5b2aeba87325 100644
--- a/sysutils/afio/Makefile
+++ b/sysutils/afio/Makefile
@@ -3,17 +3,14 @@
 # Date created:         4 October 1995
 # Whom:                 Juergen Lock <nox@jelal.hb.north.de>
 #
-# $Id: Makefile,v 1.2 1995/10/05 04:57:45 asami Exp $
+# $Id: Makefile,v 1.3 1996/11/17 08:06:06 obrien Exp $
 #
 
 DISTNAME=       afio.2.4.1
 PKGNAME=        afio-2.4.1
 CATEGORIES=     sysutils
-MASTER_SITES=	ftp://sunsite.unc.edu/pub/Linux/system/Backup/ \
-	ftp://ftp.win.tue.nl/pub/linux/tbackup/ \
-	ftp://ftp.germany.eu.net/pub/os/Linux/Mirror.SunSITE/system/Backup/ \
-	ftp://nic.funet.fi/pub/Linux/util/backup/ \
-	ftp://medusa.k12.ar.us/pub/linux2/sunsite/system/Backup/
+MASTER_SITES=	${MASTER_SITE_SUNSITE}
+MASTER_SITE_SUBDIR=	system/Backup
 EXTRACT_SUFX=   .tgz
 
 MAINTAINER=	nox@jelal.hb.north.de
diff --git a/x11-fm/filerunner/Makefile b/x11-fm/filerunner/Makefile
index cd3a71c3dfbe..31b09641d5ea 100644
--- a/x11-fm/filerunner/Makefile
+++ b/x11-fm/filerunner/Makefile
@@ -3,18 +3,19 @@
 # Date created:		3 August 1996
 # Whom:			lukin
 #
-# $Id: Makefile,v 1.1.1.1 1996/11/03 20:50:27 jfitz Exp $
+# $Id: Makefile,v 1.2 1996/11/05 17:53:16 jfitz Exp $
 #
 
 DISTNAME=	FileRunner_2.0
 PKGNAME=	filerunner-2.0
-CATEGORIES+=	x11
-MASTER_SITES=	ftp://sunsite.unc.edu/pub/Linux/X11/xutils/managers/
+CATEGORIES=	x11
+MASTER_SITES=	${MASTER_SITE_SUNSITE}
+MASTER_SITE_SUBDIR=	X11/xutils/managers
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	lukin@okbmei.msk.su
 
-LIB_DEPENDS=	tk41\\.:${PORTSDIR}/x11/tk41
+LIB_DEPENDS=	tk41\\.1:${PORTSDIR}/x11/tk41
 
 MAKEFILE=	Makefile.freebsd
 MAKE_ENV+=	X11BASE=${X11BASE}
diff --git a/x11-wm/fvwm/Makefile b/x11-wm/fvwm/Makefile
index ce4d3c2c3d1e..36375bfd8eaf 100644
--- a/x11-wm/fvwm/Makefile
+++ b/x11-wm/fvwm/Makefile
@@ -3,12 +3,13 @@
 # Date created:		12 May 1995
 # Whom:			me
 #
-# $Id: Makefile,v 1.19 1995/08/08 10:35:06 asami Exp $
+# $Id: Makefile,v 1.20 1996/05/27 12:33:48 peter Exp $
 #
 
 DISTNAME=	fvwm-1.24r
-MASTER_SITES=	ftp://sunsite.unc.edu/pub/Linux/X11/window-managers/
-CATEGORIES+=	x11
+CATEGORIES=	x11
+MASTER_SITES=	${MASTER_SITE_SUNSITE}
+MASTER_SITE_SUBDIR=	X11/window-managers
 
 MAINTAINER=	me@FreeBSD.org
 
diff --git a/x11/xtacy/Makefile b/x11/xtacy/Makefile
index ab83e72fee9a..e1a5404abbdb 100644
--- a/x11/xtacy/Makefile
+++ b/x11/xtacy/Makefile
@@ -3,15 +3,15 @@
 # Date created:         25 July 1996
 # Whom:                 matt@bdd.net
 #
-# $Id$
+# $Id: Makefile,v 1.1.1.1 1996/07/25 19:02:58 asami Exp $
 #
 
 DISTNAME=	Xtacy113
 PKGNAME=	xtacy-1.13
-CATEGORIES+=	x11
+CATEGORIES=	x11
 MASTER_SITES=	ftp://sidehack.gweep.net/pub/gweep_progs/ \
-		ftp://sunsite.unc.edu/pub/Linux/X11/toys/ \
-		ftp://ftp.infomagic.com/pub/mirrors/linux/sunsite/X11/toys/
+		${MASTER_SITE_SUNSITE}
+MASTER_SITE_SUBDIR=	X11/toys
 
 MAINTAINER=	matt@bdd.net