Remove ftp.freesoftware.com from MASTER_SITES of ports since it no longer exists.

PR:		30497
Submitted by:	Dan Larsson
Approved by:	will

52 files changed, 33 insertions, 85 deletions

diff --git a/archivers/freeze/Makefile b/archivers/freeze/Makefile
index 1df7111a06c9..40696826834f 100644
--- a/archivers/freeze/Makefile
+++ b/archivers/freeze/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	freeze
 PORTVERSION=	2.5
 PORTREVISION=	1
 CATEGORIES=	archivers
-MASTER_SITES=	ftp://ftp.freesoftware.com/pub/unixfreeware/archive/ \
-		ftp://ftp.warwick.ac.uk/pub/compression/
+MASTER_SITES=	ftp://ftp.warwick.ac.uk/pub/compression/
 
 MAINTAINER=	lukin@okbmei.msk.su
 
diff --git a/astro/xphoon/Makefile b/astro/xphoon/Makefile
index 8144e16af1ab..c19d29f1f245 100644
--- a/astro/xphoon/Makefile
+++ b/astro/xphoon/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	xphoon
 PORTVERSION=	1991.9.18
 CATEGORIES=	astro x11
-MASTER_SITES=	ftp://ftp.x.org/R5contrib/ \
-		ftp://ftp.freesoftware.com/pub/X11/R5contrib/
+MASTER_SITES=	ftp://ftp.x.org/R5contrib/
 DISTNAME=	xphoon
 EXTRACT_SUFX=	.tar.Z
 
diff --git a/audio/xcdplayer/Makefile b/audio/xcdplayer/Makefile
index 8fa8da23b0eb..463f1658a3f7 100644
--- a/audio/xcdplayer/Makefile
+++ b/audio/xcdplayer/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	xcdplayer
 PORTVERSION=	2.2
 CATEGORIES=	audio
-MASTER_SITES=	ftp://ftp.x.org/R5contrib/ \
-		ftp://ftp.freesoftware.com/pub/X11/R5contrib/
+MASTER_SITES=	ftp://ftp.x.org/R5contrib/
 EXTRACT_SUFX=	.tar.Z
 
 MAINTAINER=	ports@FreeBSD.org
diff --git a/devel/SN/Makefile b/devel/SN/Makefile
index 93d38e3131d5..fe05269297cd 100644
--- a/devel/SN/Makefile
+++ b/devel/SN/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	SN
 PORTVERSION=	4.5.2
 CATEGORIES=	devel
-MASTER_SITES=	ftp://ftp.freesoftware.com/pub/sourceware/%SUBDIR% \
-	ftp://ftp.unina.it/pub/Unix/cygnus/%SUBDIR% \
+MASTER_SITES=	ftp://ftp.unina.it/pub/Unix/cygnus/%SUBDIR% \
 	ftp://unix.hensa.ac.uk/mirrors/sourceware.cygnus.com/pub/%SUBDIR% \
 	ftp://ftp.funet.fi/pub/mirrors/sourceware.cygnus.com/pub/%SUBDIR% \
 	ftp://gd.tuwien.ac.at/gnu/sourceware/%SUBDIR% \
diff --git a/devel/imake/Makefile b/devel/imake/Makefile
index a8bc12a3f618..a1cd2065aed9 100644
--- a/devel/imake/Makefile
+++ b/devel/imake/Makefile
@@ -9,7 +9,6 @@ PORTNAME=	imake
 PORTVERSION=	1.0
 CATEGORIES=	devel
 MASTER_SITES=	ftp://ftp.xfree86.org/pub/XFree86/3.3.6/source/ \
-		ftp://ftp.freesoftware.com/pub/XFree86/3.3.6/source/ \
 		ftp://ftp.lip6.fr/pub/X11/XFree86/XFree86-3.3.6/source/ \
 		ftp://ftp.cs.tu-berlin.de/pub/X/XFree86/3.3.6/source/ \
 		ftp://sunsite.doc.ic.ac.uk/packages/XFree86/3.3.6/source/
diff --git a/devel/linux_devtools-6/Makefile b/devel/linux_devtools-6/Makefile
index cf6b50111ff8..739c3bf3c489 100644
--- a/devel/linux_devtools-6/Makefile
+++ b/devel/linux_devtools-6/Makefile
@@ -38,7 +38,6 @@ NO_MTREE=		yes
 PLIST=			${PKGDIR}/pkg-plist.${MACHINE_ARCH}
 
 RPM_MIRRORS=		\
-	ftp://ftp.freesoftware.com/pub/linux/redhat/__DIR__/ \
 	ftp://ftp.redhat.com/redhat/__DIR__/ \
 	ftp://ftp.infomagic.com/pub/mirrors/linux/RedHat/__DIR__/ \
 	ftp://ftp.crc.ca/mirrors/by-site/ftp.redhat.com/redhat/__DIR__/ \
diff --git a/devel/linux_devtools-7/Makefile b/devel/linux_devtools-7/Makefile
index cf6b50111ff8..739c3bf3c489 100644
--- a/devel/linux_devtools-7/Makefile
+++ b/devel/linux_devtools-7/Makefile
@@ -38,7 +38,6 @@ NO_MTREE=		yes
 PLIST=			${PKGDIR}/pkg-plist.${MACHINE_ARCH}
 
 RPM_MIRRORS=		\
-	ftp://ftp.freesoftware.com/pub/linux/redhat/__DIR__/ \
 	ftp://ftp.redhat.com/redhat/__DIR__/ \
 	ftp://ftp.infomagic.com/pub/mirrors/linux/RedHat/__DIR__/ \
 	ftp://ftp.crc.ca/mirrors/by-site/ftp.redhat.com/redhat/__DIR__/ \
diff --git a/devel/linux_devtools/Makefile b/devel/linux_devtools/Makefile
index cf6b50111ff8..739c3bf3c489 100644
--- a/devel/linux_devtools/Makefile
+++ b/devel/linux_devtools/Makefile
@@ -38,7 +38,6 @@ NO_MTREE=		yes
 PLIST=			${PKGDIR}/pkg-plist.${MACHINE_ARCH}
 
 RPM_MIRRORS=		\
-	ftp://ftp.freesoftware.com/pub/linux/redhat/__DIR__/ \
 	ftp://ftp.redhat.com/redhat/__DIR__/ \
 	ftp://ftp.infomagic.com/pub/mirrors/linux/RedHat/__DIR__/ \
 	ftp://ftp.crc.ca/mirrors/by-site/ftp.redhat.com/redhat/__DIR__/ \
diff --git a/devel/newt/Makefile b/devel/newt/Makefile
index 9d49cc5c9c10..aa7ffd6cb47c 100644
--- a/devel/newt/Makefile
+++ b/devel/newt/Makefile
@@ -9,7 +9,6 @@ PORTNAME=	newt
 PORTVERSION=	0.50.8.2
 CATEGORIES=	devel
 MASTER_SITES=	\
-	ftp://ftp.freesoftware.com/pub/linux/redhat/redhat-6.2/SRPMS/SRPMS/ \
 	ftp://ftp.redhat.com/pub/redhat/redhat-6.2/SRPMS/SRPMS/ \
 	ftp://ftp.infomagic.com/pub/mirrors/linux/RedHat/redhat-6.2/SRPMS/SRPMS/
 DISTNAME=	${PORTNAME}-0.50.8-2
diff --git a/devel/sourcenav/Makefile b/devel/sourcenav/Makefile
index 93d38e3131d5..fe05269297cd 100644
--- a/devel/sourcenav/Makefile
+++ b/devel/sourcenav/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	SN
 PORTVERSION=	4.5.2
 CATEGORIES=	devel
-MASTER_SITES=	ftp://ftp.freesoftware.com/pub/sourceware/%SUBDIR% \
-	ftp://ftp.unina.it/pub/Unix/cygnus/%SUBDIR% \
+MASTER_SITES=	ftp://ftp.unina.it/pub/Unix/cygnus/%SUBDIR% \
 	ftp://unix.hensa.ac.uk/mirrors/sourceware.cygnus.com/pub/%SUBDIR% \
 	ftp://ftp.funet.fi/pub/mirrors/sourceware.cygnus.com/pub/%SUBDIR% \
 	ftp://gd.tuwien.ac.at/gnu/sourceware/%SUBDIR% \
diff --git a/devel/spin/Makefile b/devel/spin/Makefile
index 0189a7f4be47..2e12aae523e9 100644
--- a/devel/spin/Makefile
+++ b/devel/spin/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	spin
 PORTVERSION=	3.4.8
 CATEGORIES=	math
 MASTER_SITES=	ftp://netlib.bell-labs.com/netlib/spin/ \
-		ftp://www.netlib.org/spin/ \
-		ftp://ftp.freesoftware.com/pub/netlib/spin/
+		ftp://www.netlib.org/spin/
 DISTFILES=	spin348.tar.gz html.tar.gz
 
 MAINTAINER=	jhanna@home.com
diff --git a/emulators/linux_base-6/Makefile b/emulators/linux_base-6/Makefile
index f47f7423d0e4..d9c19fb7169c 100644
--- a/emulators/linux_base-6/Makefile
+++ b/emulators/linux_base-6/Makefile
@@ -30,7 +30,6 @@ PLIST=			${PKGDIR}/pkg-plist.${MACHINE_ARCH}
 MD5_FILE=		${MASTERDIR}/distinfo.${MACHINE_ARCH}
 
 RPM_MIRRORS=		\
-	ftp://ftp.freesoftware.com/pub/linux/redhat/__DIR__/ \
 	ftp://ftp.redhat.com/pub/redhat/__DIR__/ \
 	ftp://ftp.infomagic.com/pub/mirrors/linux/RedHat/__DIR__/ \
 	ftp://ftp.crc.ca/mirrors/by-site/ftp.redhat.com/redhat/__DIR__/ \
diff --git a/emulators/linux_base-62/Makefile b/emulators/linux_base-62/Makefile
index f47f7423d0e4..d9c19fb7169c 100644
--- a/emulators/linux_base-62/Makefile
+++ b/emulators/linux_base-62/Makefile
@@ -30,7 +30,6 @@ PLIST=			${PKGDIR}/pkg-plist.${MACHINE_ARCH}
 MD5_FILE=		${MASTERDIR}/distinfo.${MACHINE_ARCH}
 
 RPM_MIRRORS=		\
-	ftp://ftp.freesoftware.com/pub/linux/redhat/__DIR__/ \
 	ftp://ftp.redhat.com/pub/redhat/__DIR__/ \
 	ftp://ftp.infomagic.com/pub/mirrors/linux/RedHat/__DIR__/ \
 	ftp://ftp.crc.ca/mirrors/by-site/ftp.redhat.com/redhat/__DIR__/ \
diff --git a/emulators/linux_base-8/Makefile b/emulators/linux_base-8/Makefile
index f47f7423d0e4..d9c19fb7169c 100644
--- a/emulators/linux_base-8/Makefile
+++ b/emulators/linux_base-8/Makefile
@@ -30,7 +30,6 @@ PLIST=			${PKGDIR}/pkg-plist.${MACHINE_ARCH}
 MD5_FILE=		${MASTERDIR}/distinfo.${MACHINE_ARCH}
 
 RPM_MIRRORS=		\
-	ftp://ftp.freesoftware.com/pub/linux/redhat/__DIR__/ \
 	ftp://ftp.redhat.com/pub/redhat/__DIR__/ \
 	ftp://ftp.infomagic.com/pub/mirrors/linux/RedHat/__DIR__/ \
 	ftp://ftp.crc.ca/mirrors/by-site/ftp.redhat.com/redhat/__DIR__/ \
diff --git a/emulators/linux_base-rh-9/Makefile b/emulators/linux_base-rh-9/Makefile
index f47f7423d0e4..d9c19fb7169c 100644
--- a/emulators/linux_base-rh-9/Makefile
+++ b/emulators/linux_base-rh-9/Makefile
@@ -30,7 +30,6 @@ PLIST=			${PKGDIR}/pkg-plist.${MACHINE_ARCH}
 MD5_FILE=		${MASTERDIR}/distinfo.${MACHINE_ARCH}
 
 RPM_MIRRORS=		\
-	ftp://ftp.freesoftware.com/pub/linux/redhat/__DIR__/ \
 	ftp://ftp.redhat.com/pub/redhat/__DIR__/ \
 	ftp://ftp.infomagic.com/pub/mirrors/linux/RedHat/__DIR__/ \
 	ftp://ftp.crc.ca/mirrors/by-site/ftp.redhat.com/redhat/__DIR__/ \
diff --git a/emulators/linux_base-suse-9.1/Makefile b/emulators/linux_base-suse-9.1/Makefile
index f47f7423d0e4..d9c19fb7169c 100644
--- a/emulators/linux_base-suse-9.1/Makefile
+++ b/emulators/linux_base-suse-9.1/Makefile
@@ -30,7 +30,6 @@ PLIST=			${PKGDIR}/pkg-plist.${MACHINE_ARCH}
 MD5_FILE=		${MASTERDIR}/distinfo.${MACHINE_ARCH}
 
 RPM_MIRRORS=		\
-	ftp://ftp.freesoftware.com/pub/linux/redhat/__DIR__/ \
 	ftp://ftp.redhat.com/pub/redhat/__DIR__/ \
 	ftp://ftp.infomagic.com/pub/mirrors/linux/RedHat/__DIR__/ \
 	ftp://ftp.crc.ca/mirrors/by-site/ftp.redhat.com/redhat/__DIR__/ \
diff --git a/emulators/linux_base-suse-9.2/Makefile b/emulators/linux_base-suse-9.2/Makefile
index f47f7423d0e4..d9c19fb7169c 100644
--- a/emulators/linux_base-suse-9.2/Makefile
+++ b/emulators/linux_base-suse-9.2/Makefile
@@ -30,7 +30,6 @@ PLIST=			${PKGDIR}/pkg-plist.${MACHINE_ARCH}
 MD5_FILE=		${MASTERDIR}/distinfo.${MACHINE_ARCH}
 
 RPM_MIRRORS=		\
-	ftp://ftp.freesoftware.com/pub/linux/redhat/__DIR__/ \
 	ftp://ftp.redhat.com/pub/redhat/__DIR__/ \
 	ftp://ftp.infomagic.com/pub/mirrors/linux/RedHat/__DIR__/ \
 	ftp://ftp.crc.ca/mirrors/by-site/ftp.redhat.com/redhat/__DIR__/ \
diff --git a/emulators/linux_base-suse-9.3/Makefile b/emulators/linux_base-suse-9.3/Makefile
index f47f7423d0e4..d9c19fb7169c 100644
--- a/emulators/linux_base-suse-9.3/Makefile
+++ b/emulators/linux_base-suse-9.3/Makefile
@@ -30,7 +30,6 @@ PLIST=			${PKGDIR}/pkg-plist.${MACHINE_ARCH}
 MD5_FILE=		${MASTERDIR}/distinfo.${MACHINE_ARCH}
 
 RPM_MIRRORS=		\
-	ftp://ftp.freesoftware.com/pub/linux/redhat/__DIR__/ \
 	ftp://ftp.redhat.com/pub/redhat/__DIR__/ \
 	ftp://ftp.infomagic.com/pub/mirrors/linux/RedHat/__DIR__/ \
 	ftp://ftp.crc.ca/mirrors/by-site/ftp.redhat.com/redhat/__DIR__/ \
diff --git a/emulators/linux_base/Makefile b/emulators/linux_base/Makefile
index f47f7423d0e4..d9c19fb7169c 100644
--- a/emulators/linux_base/Makefile
+++ b/emulators/linux_base/Makefile
@@ -30,7 +30,6 @@ PLIST=			${PKGDIR}/pkg-plist.${MACHINE_ARCH}
 MD5_FILE=		${MASTERDIR}/distinfo.${MACHINE_ARCH}
 
 RPM_MIRRORS=		\
-	ftp://ftp.freesoftware.com/pub/linux/redhat/__DIR__/ \
 	ftp://ftp.redhat.com/pub/redhat/__DIR__/ \
 	ftp://ftp.infomagic.com/pub/mirrors/linux/RedHat/__DIR__/ \
 	ftp://ftp.crc.ca/mirrors/by-site/ftp.redhat.com/redhat/__DIR__/ \
diff --git a/games/xasteroids/Makefile b/games/xasteroids/Makefile
index 6265f20df3ae..ba1ae6839829 100644
--- a/games/xasteroids/Makefile
+++ b/games/xasteroids/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	xasteroids
 PORTVERSION=	5.0
 CATEGORIES=	games
-MASTER_SITES=	ftp://ftp.freesoftware.com/pub/X11/R5contrib/ \
-		ftp://ftp.x.org/pub/R5contrib/
+MASTER_SITES=	ftp://ftp.x.org/pub/R5contrib/
 DISTFILES=	xasteroids.sh.Z
 
 MAINTAINER=	ports@FreeBSD.org
diff --git a/games/xataxx/Makefile b/games/xataxx/Makefile
index e1900b3aef17..68426fda5b18 100644
--- a/games/xataxx/Makefile
+++ b/games/xataxx/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	xataxx
 PORTVERSION=	1.0
 CATEGORIES=	games
-MASTER_SITES=	ftp://ftp.x.org/R5contrib/ \
-		ftp://ftp.freesoftware.com/pub/X11/R5contrib/
+MASTER_SITES=	ftp://ftp.x.org/R5contrib/
 DISTNAME=	${PORTNAME}
 EXTRACT_SUFX=	.tar.Z
 
diff --git a/games/xchomp/Makefile b/games/xchomp/Makefile
index 5b9a57efd4f9..1d3f428e149f 100644
--- a/games/xchomp/Makefile
+++ b/games/xchomp/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	xchomp
 PORTVERSION=	pl1
 CATEGORIES=	games
-MASTER_SITES=	ftp://ftp.x.org/R5contrib/ \
-		ftp://ftp.freesoftware.com/pub/X11/R5contrib/
+MASTER_SITES=	ftp://ftp.x.org/R5contrib/
 
 MAINTAINER=		ports@FreeBSD.org
 
diff --git a/games/xconq/Makefile b/games/xconq/Makefile
index f34375dfe63f..4875fa0d1d1b 100644
--- a/games/xconq/Makefile
+++ b/games/xconq/Makefile
@@ -9,7 +9,6 @@ PORTNAME=	xconq
 PORTVERSION=	7.4.1
 CATEGORIES=	games
 MASTER_SITES=	ftp://sources.redhat.com/pub/xconq/ \
-		ftp://ftp.freesoftware.com/pub/sourceware/xconq/ \
 		ftp://unix.hensa.ac.uk/mirrors/sourceware.cygnus.com/pub/xconq/
 
 MAINTAINER=	ports@freebsd.org
diff --git a/games/xjewel/Makefile b/games/xjewel/Makefile
index fec63077d9db..0c8d6590bb4f 100644
--- a/games/xjewel/Makefile
+++ b/games/xjewel/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	xjewel
 PORTVERSION=	1.6
 CATEGORIES=	games
 MASTER_SITES=	ftp://ftp.warwick.ac.uk/pub/x11/ \
-		ftp://ftp.x.org/R5contrib/ \
-		ftp://ftp.freesoftware.com/pub/X11/R5contrib/
+		ftp://ftp.x.org/R5contrib/
 EXTRACT_SUFX=	.tar.z
 
 MAINTAINER=	jmz@FreeBSD.org
diff --git a/games/xjump/Makefile b/games/xjump/Makefile
index 689409c97a5c..4dcb44e2f38f 100644
--- a/games/xjump/Makefile
+++ b/games/xjump/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	xjump
 PORTVERSION=	2.7.3
 PORTREVISION=	1
 CATEGORIES=	games
-MASTER_SITES=	ftp://ftp.freesoftware.com/pub/linux/debian/%SUBDIR%/ \
-		ftp://ftp.jp.debian.org/debian/%SUBDIR%/ \
+MASTER_SITES=	ftp://ftp.jp.debian.org/debian/%SUBDIR%/ \
 		ftp://ftp-linux.cc.gatech.edu/pub/linux/distributions/debian/%SUBDIR%/ \
 		ftp://ftp.de.debian.org/debian/%SUBDIR%/ \
 		ftp://ftp.debian.org/debian/%SUBDIR%/
diff --git a/games/xlife/Makefile b/games/xlife/Makefile
index aa358fe600e1..17e6869bd54e 100644
--- a/games/xlife/Makefile
+++ b/games/xlife/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	xlife
 PORTVERSION=	3.0
 CATEGORIES=	games
-MASTER_SITES=	ftp://ftp.x.org/R5contrib/ \
-		ftp://ftp.freesoftware.com/pub/X11/R5contrib/
+MASTER_SITES=	ftp://ftp.x.org/R5contrib/
 DISTNAME=	xlife
 EXTRACT_SUFX=	.tar.Z
 
diff --git a/games/xsok/Makefile b/games/xsok/Makefile
index 0be868afc816..a2923f4fd5b0 100644
--- a/games/xsok/Makefile
+++ b/games/xsok/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	xsok
 PORTVERSION=	1.02
 CATEGORIES=	games
 MASTER_SITES=	ftp://tsx-11.mit.edu/pub/linux/sources/usr.bin.X11/ \
-		ftp://sunsite.cnlab-switch.ch/mirror/linux/tsx-11/sources/usr.bin.X11/ \
-		ftp://ftp.freesoftware.com/pub/linux/tsx-11/sources/usr.bin.X11/
+		ftp://sunsite.cnlab-switch.ch/mirror/linux/tsx-11/sources/usr.bin.X11/
 EXTRACT_SUFX=	-src.tar.gz
 
 MAINTAINER=	ports@FreeBSD.org
diff --git a/games/xvmahjongg/Makefile b/games/xvmahjongg/Makefile
index 8002f4c4d4cd..4bbe5ad8f975 100644
--- a/games/xvmahjongg/Makefile
+++ b/games/xvmahjongg/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	xvmahjongg
 PORTVERSION=	2.1
 CATEGORIES=	games
-MASTER_SITES=	ftp://ftp.x.org/R5contrib/ \
-		ftp://ftp.freesoftware.com/pub/X11/R5contrib/
+MASTER_SITES=	ftp://ftp.x.org/R5contrib/
 DISTFILES=	${PORTNAME}${PORTVERSION}.tar.Z
 
 MAINTAINER=	ports@FreeBSD.org
diff --git a/games/xvmines/Makefile b/games/xvmines/Makefile
index c055b87a4b36..422f7e7c1aed 100644
--- a/games/xvmines/Makefile
+++ b/games/xvmines/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	xvmines
 PORTVERSION=	1.0
 CATEGORIES=	games
 MASTER_SITES=	ftp://ftp.csd.uch.gr/pub/X11/games/ \
-		ftp://ftp.x.org/R5contrib/ \
-		ftp://ftp.freesoftware.com/pub/X11/R5contrib/
+		ftp://ftp.x.org/R5contrib/
 EXTRACT_SUFX=	.tar.Z
 
 MAINTAINER=	ports@FreeBSD.org
diff --git a/graphics/hobbes-icons-xpm/Makefile b/graphics/hobbes-icons-xpm/Makefile
index fbe970dc3577..ad4784c0b5b1 100644
--- a/graphics/hobbes-icons-xpm/Makefile
+++ b/graphics/hobbes-icons-xpm/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	hobbes-icons-xpm3
 PORTVERSION=	1.0
 CATEGORIES=	graphics
-MASTER_SITES=	ftp://ftp.x.org/R5contrib/ \
-		ftp://ftp.freesoftware.com/pub/X11/R5contrib/
+MASTER_SITES=	ftp://ftp.x.org/R5contrib/
 DISTNAME=	${PORTNAME}
 
 MAINTAINER=	ports@FreeBSD.org
diff --git a/graphics/linux_mesa3/Makefile b/graphics/linux_mesa3/Makefile
index d1d43e5f9bac..ba17ff6d14dc 100644
--- a/graphics/linux_mesa3/Makefile
+++ b/graphics/linux_mesa3/Makefile
@@ -30,7 +30,6 @@ NO_FILTER_SHLIBS=	yes
 NO_MTREE=		yes
 
 RPM_MIRRORS=		\
-	ftp://ftp.freesoftware.com/pub/linux/redhat/__DIR__/ \
 	ftp://ftp.redhat.com/pub/redhat/__DIR__/ \
 	ftp://ftp.infomagic.com/pub/mirrors/linux/redhat/__DIR__/ \
 	ftp://ftp.crc.ca/pub/systems/linux/redhat/ftp.redhat.com/__DIR__/ \
diff --git a/graphics/txtmerge/Makefile b/graphics/txtmerge/Makefile
index e5994c42c97b..f7fd56d77a15 100644
--- a/graphics/txtmerge/Makefile
+++ b/graphics/txtmerge/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	txtmerge
 PORTVERSION=	1.01
 CATEGORIES=	graphics
-MASTER_SITES=	ftp://ftp.freesoftware.com/pub/unixfreeware/graphics/ \
-		ftp://ftp.math.bme.hu/pub/utils/xanim/ \
+MASTER_SITES=	ftp://ftp.math.bme.hu/pub/utils/xanim/ \
 		ftp://ftp.kddlabs.co.jp/pub/graphics/gifanim/
 DISTNAME=	txtmerge101
 EXTRACT_SUFX=	.tar.Z
diff --git a/graphics/xgrasp/Makefile b/graphics/xgrasp/Makefile
index 0ac6e2c1aa5f..70658143166a 100644
--- a/graphics/xgrasp/Makefile
+++ b/graphics/xgrasp/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	xgrasp
 PORTVERSION=	1.7d
 CATEGORIES=	graphics
-MASTER_SITES=	ftp://ftp.x.org/R5contrib/ \
-		ftp://ftp.freesoftware.com/pub/X11/R5contrib/
+MASTER_SITES=	ftp://ftp.x.org/R5contrib/
 DISTNAME=	${PORTNAME}.${PORTVERSION}
 EXTRACT_SUFX=	.tar.Z
 
diff --git a/lang/lua/Makefile b/lang/lua/Makefile
index 2933dd739c85..be114a6760ec 100644
--- a/lang/lua/Makefile
+++ b/lang/lua/Makefile
@@ -11,7 +11,6 @@ PORTREVISION=	1
 CATEGORIES=	lang
 MASTER_SITES=	ftp://ftp.tecgraf.puc-rio.br/pub/lua/ \
 		ftp://csg.uwaterloo.ca/pub/lhf/lua/ \
-		ftp://ftp.freesoftware.com/pub/languages/lua/ \
 		ftp://ftp.ntua.gr/pub/lang/lua/ \
 		ftp://ftp.uni-trier.de/pub/languages/lua/ \
 		ftp://ftp.gwdg.de/pub/languages/lua/
diff --git a/lang/lua4/Makefile b/lang/lua4/Makefile
index 2933dd739c85..be114a6760ec 100644
--- a/lang/lua4/Makefile
+++ b/lang/lua4/Makefile
@@ -11,7 +11,6 @@ PORTREVISION=	1
 CATEGORIES=	lang
 MASTER_SITES=	ftp://ftp.tecgraf.puc-rio.br/pub/lua/ \
 		ftp://csg.uwaterloo.ca/pub/lhf/lua/ \
-		ftp://ftp.freesoftware.com/pub/languages/lua/ \
 		ftp://ftp.ntua.gr/pub/lang/lua/ \
 		ftp://ftp.uni-trier.de/pub/languages/lua/ \
 		ftp://ftp.gwdg.de/pub/languages/lua/
diff --git a/lang/lua50/Makefile b/lang/lua50/Makefile
index 2933dd739c85..be114a6760ec 100644
--- a/lang/lua50/Makefile
+++ b/lang/lua50/Makefile
@@ -11,7 +11,6 @@ PORTREVISION=	1
 CATEGORIES=	lang
 MASTER_SITES=	ftp://ftp.tecgraf.puc-rio.br/pub/lua/ \
 		ftp://csg.uwaterloo.ca/pub/lhf/lua/ \
-		ftp://ftp.freesoftware.com/pub/languages/lua/ \
 		ftp://ftp.ntua.gr/pub/lang/lua/ \
 		ftp://ftp.uni-trier.de/pub/languages/lua/ \
 		ftp://ftp.gwdg.de/pub/languages/lua/
diff --git a/mail/xlbiff/Makefile b/mail/xlbiff/Makefile
index 83616822e0eb..8b8f1289bf70 100644
--- a/mail/xlbiff/Makefile
+++ b/mail/xlbiff/Makefile
@@ -9,8 +9,7 @@
 PORTNAME=	xlbiff
 PORTVERSION=	3.0
 CATEGORIES=	mail
-MASTER_SITES=	ftp://ftp.x.org/R5contrib/  \
-		ftp://ftp.freesoftware.com/pub/X11/R5contrib/
+MASTER_SITES=	ftp://ftp.x.org/R5contrib/
 EXTRACT_SUFX=	.tar.Z
 
 MAINTAINER=	obrien@FreeBSD.org
diff --git a/math/spin/Makefile b/math/spin/Makefile
index 0189a7f4be47..2e12aae523e9 100644
--- a/math/spin/Makefile
+++ b/math/spin/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	spin
 PORTVERSION=	3.4.8
 CATEGORIES=	math
 MASTER_SITES=	ftp://netlib.bell-labs.com/netlib/spin/ \
-		ftp://www.netlib.org/spin/ \
-		ftp://ftp.freesoftware.com/pub/netlib/spin/
+		ftp://www.netlib.org/spin/
 DISTFILES=	spin348.tar.gz html.tar.gz
 
 MAINTAINER=	jhanna@home.com
diff --git a/math/ss/Makefile b/math/ss/Makefile
index c5306a7fe600..c5c098cdd8ff 100644
--- a/math/ss/Makefile
+++ b/math/ss/Makefile
@@ -9,7 +9,6 @@ PORTNAME=	ss
 PORTVERSION=	1.3.3
 CATEGORIES=	math
 MASTER_SITES=	http://www.irus.rri.on.ca/~amulder/ss/ \
-		ftp://ftp.freesoftware.com/pub/unixfreeware/math/ \
 		ftp://ftp.u-aizu.ac.jp/pub/misc/tools/spreadsheet/ualberta/
 DISTNAME=	${PORTNAME}_${PORTVERSION}
 
diff --git a/news/aub/Makefile b/news/aub/Makefile
index 912cb2258909..893b49dd0a6e 100644
--- a/news/aub/Makefile
+++ b/news/aub/Makefile
@@ -9,8 +9,7 @@
 PORTNAME=	aub
 PORTVERSION=	2.0.5
 CATEGORIES=	news
-MASTER_SITES=	ftp://ftp.freesoftware.com/pub/perl/CPAN/scripts/news/nntpstuff/aub/ \
-		ftp://ftp.digital.com/pub/plan/perl/CPAN/scripts/news/nntpstuff/aub/ \
+MASTER_SITES=	ftp://ftp.digital.com/pub/plan/perl/CPAN/scripts/news/nntpstuff/aub/ \
 		ftp://ftp.perl.org/pub/CPAN/scripts/news/nntpstuff/aub/
 DISTFILES=	aub aub.1 BUG_FIXES
 
diff --git a/print/tex/Makefile b/print/tex/Makefile
index ab35364cc8d0..2c78bffebbb3 100644
--- a/print/tex/Makefile
+++ b/print/tex/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	tex
 PORTVERSION=	3.14159
 CATEGORIES=	print
-MASTER_SITES=   ftp://ftp.freesoftware.com/pub/tex/package/  \
-		${MASTER_SITE_TEX_CTAN}
+MASTER_SITES=   ${MASTER_SITE_TEX_CTAN}
 MASTER_SITE_SUBDIR=	systems/web2c
 DISTNAME=	web2c-7.2
 DISTFILES=	web2c-7.2b.tar.gz web-7.2a.tar.gz tex_base.tar.gz cm_tfm.tar.gz \
diff --git a/sysutils/logrotate/Makefile b/sysutils/logrotate/Makefile
index 447878cbbff1..62dd6bfc1e10 100644
--- a/sysutils/logrotate/Makefile
+++ b/sysutils/logrotate/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	logrotate
 PORTVERSION=	3.5.2
 CATEGORIES=	sysutils
-MASTER_SITES=	ftp://ftp.redhat.com/redhat/linux/7.0/en/os/i386/SRPMS/ \
-		ftp://ftp.freesoftware.com/pub/linux/redhat/current/SRPMS/i386/SRPMS/
+MASTER_SITES=	ftp://ftp.redhat.com/redhat/linux/7.0/en/os/i386/SRPMS/
 
 EXTRACT_SUFX=	-1.src.rpm
 
diff --git a/sysutils/psmisc/Makefile b/sysutils/psmisc/Makefile
index cc0e4725f4b9..974f46b286fe 100644
--- a/sysutils/psmisc/Makefile
+++ b/sysutils/psmisc/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	psmisc
 PORTVERSION=	17
 CATEGORIES=	sysutils
-MASTER_SITES=	ftp://ftp.freesoftware.com/pub/linux/slackware/slackware-3.6/source/a/procps/ \
-		ftp://ftp.bitcon.no/pub/linux/slackware/source/a/procps/
+MASTER_SITES=	ftp://ftp.bitcon.no/pub/linux/slackware/source/a/procps/
 
 MAINTAINER=	rantapaa@uswest.net
 
diff --git a/textproc/dsssl-docbook-cygnus/Makefile b/textproc/dsssl-docbook-cygnus/Makefile
index 3f59207dac4d..9e6a345aba25 100644
--- a/textproc/dsssl-docbook-cygnus/Makefile
+++ b/textproc/dsssl-docbook-cygnus/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	dsssl-docbook-cygnus
 PORTVERSION=	1.44
 CATEGORIES=	textproc
-MASTER_SITES=	ftp://sourceware.cygnus.com/pub/docbook-tools/docware/SOURCES/\
-		ftp://ftp.freesoftware.com/pub/sourceware/docbook-tools/docware/SOURCES/
+MASTER_SITES=	ftp://sourceware.cygnus.com/pub/docbook-tools/docware/SOURCES/
 DISTNAME=	stylesheets
 EXTRACT_SUFX=	.tgz
 
diff --git a/x11-fonts/tkfont/Makefile b/x11-fonts/tkfont/Makefile
index e74f96c9ea54..c7884e820b3d 100644
--- a/x11-fonts/tkfont/Makefile
+++ b/x11-fonts/tkfont/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	tkfont
 PORTVERSION=	1.1
 CATEGORIES=	x11-fonts tk82
-MASTER_SITES=	ftp://ftp.freesoftware.com/pub/linux/tsx-11/sources/usr.bin.X11/ \
-		${MASTER_SITE_LOCAL}
+MASTER_SITES=	${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=	billf
 
 MAINTAINER=	brett@peloton.runet.edu
diff --git a/x11-toolkits/linux-f10-gtk/Makefile b/x11-toolkits/linux-f10-gtk/Makefile
index 29dceb4fa417..acc31e5f19b5 100644
--- a/x11-toolkits/linux-f10-gtk/Makefile
+++ b/x11-toolkits/linux-f10-gtk/Makefile
@@ -28,8 +28,7 @@ NO_FILTER_SHLIBS=	yes
 PLIST=		${PKGDIR}/pkg-plist.${MACHINE_ARCH}
 MD5_FILE=	${MASTERDIR}/distinfo.${MACHINE_ARCH}
 
-RPM_MIRRORS=	ftp://ftp.freesoftware.com/pub/linux/redhat/old-releases/__DIR__/ \
-		ftp://ftp.freesoftware.com/pub/linux/redhat/__DIR__/
+RPM_MIRRORS=	${MASTER_SITE_BACKUP}
 STDDIR=		redhat-6.1/${MACHINE_ARCH}/RedHat/RPMS
 UPDDIR=		updates/6.1/${MACHINE_ARCH}
 .if (${MACHINE_ARCH} == "i386")
diff --git a/x11-toolkits/linux-f8-gtk/Makefile b/x11-toolkits/linux-f8-gtk/Makefile
index 29dceb4fa417..acc31e5f19b5 100644
--- a/x11-toolkits/linux-f8-gtk/Makefile
+++ b/x11-toolkits/linux-f8-gtk/Makefile
@@ -28,8 +28,7 @@ NO_FILTER_SHLIBS=	yes
 PLIST=		${PKGDIR}/pkg-plist.${MACHINE_ARCH}
 MD5_FILE=	${MASTERDIR}/distinfo.${MACHINE_ARCH}
 
-RPM_MIRRORS=	ftp://ftp.freesoftware.com/pub/linux/redhat/old-releases/__DIR__/ \
-		ftp://ftp.freesoftware.com/pub/linux/redhat/__DIR__/
+RPM_MIRRORS=	${MASTER_SITE_BACKUP}
 STDDIR=		redhat-6.1/${MACHINE_ARCH}/RedHat/RPMS
 UPDDIR=		updates/6.1/${MACHINE_ARCH}
 .if (${MACHINE_ARCH} == "i386")
diff --git a/x11-toolkits/linux-gtk/Makefile b/x11-toolkits/linux-gtk/Makefile
index 29dceb4fa417..acc31e5f19b5 100644
--- a/x11-toolkits/linux-gtk/Makefile
+++ b/x11-toolkits/linux-gtk/Makefile
@@ -28,8 +28,7 @@ NO_FILTER_SHLIBS=	yes
 PLIST=		${PKGDIR}/pkg-plist.${MACHINE_ARCH}
 MD5_FILE=	${MASTERDIR}/distinfo.${MACHINE_ARCH}
 
-RPM_MIRRORS=	ftp://ftp.freesoftware.com/pub/linux/redhat/old-releases/__DIR__/ \
-		ftp://ftp.freesoftware.com/pub/linux/redhat/__DIR__/
+RPM_MIRRORS=	${MASTER_SITE_BACKUP}
 STDDIR=		redhat-6.1/${MACHINE_ARCH}/RedHat/RPMS
 UPDDIR=		updates/6.1/${MACHINE_ARCH}
 .if (${MACHINE_ARCH} == "i386")
diff --git a/x11-toolkits/slingshot/Makefile b/x11-toolkits/slingshot/Makefile
index e2542e18d9cc..1a65ac550e23 100644
--- a/x11-toolkits/slingshot/Makefile
+++ b/x11-toolkits/slingshot/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	slingshot
 PORTVERSION=	2.1
 CATEGORIES=	x11-toolkits
-MASTER_SITES=	ftp://ftp.x.org/R5contrib/ \
-		ftp://ftp.freesoftware.com/pub/X11/R5contrib/
+MASTER_SITES=	ftp://ftp.x.org/R5contrib/
 DISTNAME=	SlingShot${PORTVERSION}
 EXTRACT_SUFX=	.tar.Z
 
diff --git a/x11/bricons/Makefile b/x11/bricons/Makefile
index af0fb11f9117..5d67d3b0c9df 100644
--- a/x11/bricons/Makefile
+++ b/x11/bricons/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	bricons
 PORTVERSION=	3.0
 CATEGORIES=	x11
-MASTER_SITES=	ftp://ftp.x.org/R5contrib/ \
-		ftp://ftp.freesoftware.com/pub/X11/R5contrib/
+MASTER_SITES=	ftp://ftp.x.org/R5contrib/
 DISTNAME=	${PORTNAME}
 EXTRACT_SUFX=	-athena-3.0.tar.Z
 
diff --git a/x11/xcoloredit/Makefile b/x11/xcoloredit/Makefile
index 1ec55168cf38..698e9429382e 100644
--- a/x11/xcoloredit/Makefile
+++ b/x11/xcoloredit/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	xcoloredit
 PORTVERSION=	1.2
 CATEGORIES=	x11
-MASTER_SITES=	ftp://ftp.freesoftware.com/pub/X11/R5contrib/ \
-		ftp://ftp.x.org/R5contrib/
+MASTER_SITES=	ftp://ftp.x.org/R5contrib/
 DISTNAME=	${PORTNAME}
 EXTRACT_SUFX=	.tar.Z
 
diff --git a/x11/xloadimage/Makefile b/x11/xloadimage/Makefile
index 6554a966198f..f5603c2fc701 100644
--- a/x11/xloadimage/Makefile
+++ b/x11/xloadimage/Makefile
@@ -12,8 +12,7 @@ PORTREVISION=	0
 PORTNAME=	xloadimage
 PORTVERSION=	${VERSION}.${REVISION}
 CATEGORIES=	x11 graphics
-MASTER_SITES=	ftp://ftp.x.org/R5contrib/ \
-		ftp://ftp.freesoftware.com/pub/X11/R5contrib/
+MASTER_SITES=	ftp://ftp.x.org/R5contrib/
 DISTNAME=	${PORTNAME}.${VERSION}
 PATCH_SITES=	ftp://ftp.debian.org/debian/pool/main/x/xloadimage/ \
 		ftp://ftp.de.debian.org/debian/pool/main/x/xloadimage/