46 files changed, 94 insertions, 93 deletions

diff --git a/comms/xcept/Makefile b/comms/xcept/Makefile
index fb9d7286bc43..b3d59cf67a4e 100644
--- a/comms/xcept/Makefile
+++ b/comms/xcept/Makefile
@@ -3,12 +3,12 @@
 # Date created:         Sep 1, 1996
 # Whom:                 joerg
 #
-# $Id: Makefile,v 1.3 1996/11/06 13:34:05 asami Exp $
+# $Id: Makefile,v 1.4 1996/11/17 03:01:21 obrien Exp $
 #
 
 DISTNAME=       xcept-2.1.2
 CATEGORIES=	comms
-MASTER_SITES=   ftp://freefall.cdrom.com/pub/FreeBSD/LOCAL_PORTS/
+MASTER_SITES=   ${MASTER_SITE_LOCAL}
 
 MAINTAINER=     joerg@FreeBSD.ORG
 
diff --git a/comms/zmtx-zmrx/Makefile b/comms/zmtx-zmrx/Makefile
index 486d9b409a1b..104a0a446cff 100644
--- a/comms/zmtx-zmrx/Makefile
+++ b/comms/zmtx-zmrx/Makefile
@@ -4,14 +4,14 @@
 # Date created:         29 July 1996
 # Whom:                 David O'Brien <obrien@cs.ucdavis.edu>
 #
-# $Id: Makefile,v 1.1.1.1 1996/12/08 23:39:32 obrien Exp $
+# $Id: Makefile,v 1.2 1996/12/09 00:01:32 obrien Exp $
 #
 
 DISTNAME=	zmtx-zmrx
 PKGNAME=	zmtx-zmrx-1.02
 CATEGORIES=	comms
 MASTER_SITES=	ftp://ftp.inria.fr/network/modem/  \
-		ftp://freefall.FreeBSD.ORG/pub/FreeBSD/LOCAL_PORTS/
+		${MASTER_SITE_LOCAL}
 # see also comp.unix.sources for version 1.0
 # ftp://ftp.lth.se/pub/usenet/comp.sources.unix/volume28/zm/part01.gz
 EXTRACT_SUFX=	.shar.gz
diff --git a/converters/btoa/Makefile b/converters/btoa/Makefile
index 4e4cc6db37d5..55421a2356b6 100644
--- a/converters/btoa/Makefile
+++ b/converters/btoa/Makefile
@@ -3,13 +3,13 @@
 # Date created:                      4 Apr 1996
 # Whom:                              Brent J. Nordquist <bjn@visi.com>
 #
-# $Id: Makefile,v 1.4 1997/01/28 08:11:09 asami Exp $
+# $Id: Makefile,v 1.5 1997/04/26 23:55:23 asami Exp $
 #
 
 DISTNAME=          btoa-5.2
 PKGNAME=           btoa-5.2.1
 CATEGORIES=        converters
-MASTER_SITES=      ftp://freefall.freebsd.org/pub/FreeBSD/LOCAL_PORTS/
+MASTER_SITES=      ${MASTER_SITE_LOCAL}
 
 PATCH_SITES=       ${MASTER_SITES}
 PATCHFILES=        btoa-5.2-patch1.gz
diff --git a/devel/crossgo32/Makefile b/devel/crossgo32/Makefile
index 997d99c74c3f..82871c3231e0 100644
--- a/devel/crossgo32/Makefile
+++ b/devel/crossgo32/Makefile
@@ -3,13 +3,13 @@
 # Date created:         6 Mar 97
 # Whom:                 Pedro Giffuni <pgiffuni@fps.biblos.unal.edu.co>
 #
-# $Id: Makefile,v 1.1.1.1 1997/03/27 20:53:42 erich Exp $
+# $Id: Makefile,v 1.2 1997/03/28 02:35:44 obrien Exp $
 #
 
 DISTNAME=	crosstree-1.3
 PKGNAME=	crossgo32-1.3
 CATEGORIES=	devel
-MASTER_SITES=	ftp://freefall.FreeBSD.ORG/pub/FreeBSD/LOCAL_PORTS/
+MASTER_SITES=	${MASTER_SITE_LOCAL}
 
 MAINTAINER=	pgiffuni@fps.biblos.unal.edu.co
 
diff --git a/devel/cutils/Makefile b/devel/cutils/Makefile
index b85edd10f3c4..0639fb1b8f0d 100644
--- a/devel/cutils/Makefile
+++ b/devel/cutils/Makefile
@@ -3,12 +3,12 @@
 # Date created:			26 November 1996
 # Whom:				Sandro Sigala
 #
-# $Id: Makefile,v 1.3 1996/12/11 12:04:23 asami Exp $
+# $Id: Makefile,v 1.4 1996/12/24 11:11:43 max Exp $
 #
 
 DISTNAME=	cutils-1.3.2
 CATEGORIES=	devel
-MASTER_SITES=	ftp://freefall.FreeBSD.ORG/pub/FreeBSD/LOCAL_PORTS/
+MASTER_SITES=	${MASTER_SITE_LOCAL}
 
 MAINTAINER=	ssigala@globalnet.it
 
diff --git a/devel/linux_devtools-6/Makefile b/devel/linux_devtools-6/Makefile
index b73be79986f6..340ad16934cf 100644
--- a/devel/linux_devtools-6/Makefile
+++ b/devel/linux_devtools-6/Makefile
@@ -3,12 +3,12 @@
 # Date created:         Nov 26 1996
 # Whom:                 erich@FreeBSD.org
 #
-# $Id: Makefile,v 1.2 1996/11/27 12:02:28 asami Exp $
+# $Id: Makefile,v 1.3 1997/04/14 19:04:02 erich Exp $
 #
 
 DISTNAME=	linux_devel-0.2
 CATEGORIES=	devel
-MASTER_SITES=	ftp://freefall.freebsd.org/pub/FreeBSD/LOCAL_PORTS/
+MASTER_SITES=	${MASTER_SITE_LOCAL}
 
 MAINTAINER=	erich@FreeBSD.org
 
diff --git a/devel/linux_devtools-7/Makefile b/devel/linux_devtools-7/Makefile
index b73be79986f6..340ad16934cf 100644
--- a/devel/linux_devtools-7/Makefile
+++ b/devel/linux_devtools-7/Makefile
@@ -3,12 +3,12 @@
 # Date created:         Nov 26 1996
 # Whom:                 erich@FreeBSD.org
 #
-# $Id: Makefile,v 1.2 1996/11/27 12:02:28 asami Exp $
+# $Id: Makefile,v 1.3 1997/04/14 19:04:02 erich Exp $
 #
 
 DISTNAME=	linux_devel-0.2
 CATEGORIES=	devel
-MASTER_SITES=	ftp://freefall.freebsd.org/pub/FreeBSD/LOCAL_PORTS/
+MASTER_SITES=	${MASTER_SITE_LOCAL}
 
 MAINTAINER=	erich@FreeBSD.org
 
diff --git a/devel/linux_devtools/Makefile b/devel/linux_devtools/Makefile
index b73be79986f6..340ad16934cf 100644
--- a/devel/linux_devtools/Makefile
+++ b/devel/linux_devtools/Makefile
@@ -3,12 +3,12 @@
 # Date created:         Nov 26 1996
 # Whom:                 erich@FreeBSD.org
 #
-# $Id: Makefile,v 1.2 1996/11/27 12:02:28 asami Exp $
+# $Id: Makefile,v 1.3 1997/04/14 19:04:02 erich Exp $
 #
 
 DISTNAME=	linux_devel-0.2
 CATEGORIES=	devel
-MASTER_SITES=	ftp://freefall.freebsd.org/pub/FreeBSD/LOCAL_PORTS/
+MASTER_SITES=	${MASTER_SITE_LOCAL}
 
 MAINTAINER=	erich@FreeBSD.org
 
diff --git a/devel/tvision/Makefile b/devel/tvision/Makefile
index 83bdda6152d8..8b5f688bcb4c 100644
--- a/devel/tvision/Makefile
+++ b/devel/tvision/Makefile
@@ -3,12 +3,12 @@
 # Date created:				16 February 1997
 # Whom:					Sandro Sigala
 #
-# $Id: Makefile,v 1.1.1.1 1997/02/25 04:19:46 jkh Exp $
+# $Id: Makefile,v 1.2 1997/04/25 11:54:08 jkh Exp $
 #
 
 DISTNAME=	tvision-0.4
 CATEGORIES=	devel
-MASTER_SITES=	ftp://ftp.FreeBSD.ORG/pub/FreeBSD/distfiles/LOCAL_PORTS/
+MASTER_SITES=	${MASTER_SITE_LOCAL}
 
 MAINTAINER=	ssigala@globalnet.it
 
diff --git a/emulators/cpmtools/Makefile b/emulators/cpmtools/Makefile
index 61f54ba1fb5d..7a5d5b14a541 100644
--- a/emulators/cpmtools/Makefile
+++ b/emulators/cpmtools/Makefile
@@ -3,13 +3,14 @@
 # Date created:		25 December 1994
 # Whom:			joerg
 #
-# $Id: Makefile,v 1.14 1996/11/12 02:16:41 obrien Exp $
+# $Id: Makefile,v 1.15 1996/11/18 13:58:24 asami Exp $
 #
 
 DISTNAME=	cpm-1.1
 PKGNAME=	cpmtools-1.1
 CATEGORIES=	emulators
-MASTER_SITES=	ftp://freefall.freebsd.org/pub/FreeBSD/LOCAL_PORTS/
+MASTER_SITES=	${MASTER_SITE_LOCAL}
+
 MAINTAINER=	joerg@FreeBSD.org
 
 WRKSRC=		${WRKDIR}/cpm
diff --git a/emulators/ines/Makefile b/emulators/ines/Makefile
index f0586242b163..ea2e86438c46 100644
--- a/emulators/ines/Makefile
+++ b/emulators/ines/Makefile
@@ -3,13 +3,13 @@
 # Date created:        02 November 1996
 # Whom:                Yukihiro Nakai <Nakai@Mlab.t.u-tokyo.ac.jp>
 #
-# $Id: Makefile,v 1.1.1.1 1996/11/15 16:53:43 erich Exp $
+# $Id: Makefile,v 1.2 1996/12/05 10:59:49 asami Exp $
 #
 
 DISTNAME=	NES
 PKGNAME=        ines-0.5
 CATEGORIES=     emulators
-MASTER_SITES=   ftp://freefall.freebsd.org/pub/FreeBSD/LOCAL_PORTS/
+MASTER_SITES=	${MASTER_SITE_LOCAL}
 DISTFILES=	iNES05-FreeBSD-80x86-bin.tar.Z
 
 MAINTAINER=	Nakai@Mlab.t.u-tokyo.ac.jp
diff --git a/emulators/linux_base-6/Makefile b/emulators/linux_base-6/Makefile
index b38ce2e9d765..d285cd1e8128 100644
--- a/emulators/linux_base-6/Makefile
+++ b/emulators/linux_base-6/Makefile
@@ -3,12 +3,12 @@
 # Date created:         
 # Whom:                 erich@FreeBSD.org
 #
-# $Id: Makefile,v 1.14 1996/12/11 17:46:11 erich Exp $
+# $Id: Makefile,v 1.15 1997/04/14 19:03:08 erich Exp $
 #
 
 DISTNAME=	linux_lib-2.4
 CATEGORIES=	emulators
-MASTER_SITES=	ftp://freefall.freebsd.org/pub/FreeBSD/LOCAL_PORTS/
+MASTER_SITES=	${MASTER_SITE_LOCAL}
 
 MAINTAINER=	erich@FreeBSD.org
 
diff --git a/emulators/linux_base-62/Makefile b/emulators/linux_base-62/Makefile
index b38ce2e9d765..d285cd1e8128 100644
--- a/emulators/linux_base-62/Makefile
+++ b/emulators/linux_base-62/Makefile
@@ -3,12 +3,12 @@
 # Date created:         
 # Whom:                 erich@FreeBSD.org
 #
-# $Id: Makefile,v 1.14 1996/12/11 17:46:11 erich Exp $
+# $Id: Makefile,v 1.15 1997/04/14 19:03:08 erich Exp $
 #
 
 DISTNAME=	linux_lib-2.4
 CATEGORIES=	emulators
-MASTER_SITES=	ftp://freefall.freebsd.org/pub/FreeBSD/LOCAL_PORTS/
+MASTER_SITES=	${MASTER_SITE_LOCAL}
 
 MAINTAINER=	erich@FreeBSD.org
 
diff --git a/emulators/linux_base-8/Makefile b/emulators/linux_base-8/Makefile
index b38ce2e9d765..d285cd1e8128 100644
--- a/emulators/linux_base-8/Makefile
+++ b/emulators/linux_base-8/Makefile
@@ -3,12 +3,12 @@
 # Date created:         
 # Whom:                 erich@FreeBSD.org
 #
-# $Id: Makefile,v 1.14 1996/12/11 17:46:11 erich Exp $
+# $Id: Makefile,v 1.15 1997/04/14 19:03:08 erich Exp $
 #
 
 DISTNAME=	linux_lib-2.4
 CATEGORIES=	emulators
-MASTER_SITES=	ftp://freefall.freebsd.org/pub/FreeBSD/LOCAL_PORTS/
+MASTER_SITES=	${MASTER_SITE_LOCAL}
 
 MAINTAINER=	erich@FreeBSD.org
 
diff --git a/emulators/linux_base-rh-9/Makefile b/emulators/linux_base-rh-9/Makefile
index b38ce2e9d765..d285cd1e8128 100644
--- a/emulators/linux_base-rh-9/Makefile
+++ b/emulators/linux_base-rh-9/Makefile
@@ -3,12 +3,12 @@
 # Date created:         
 # Whom:                 erich@FreeBSD.org
 #
-# $Id: Makefile,v 1.14 1996/12/11 17:46:11 erich Exp $
+# $Id: Makefile,v 1.15 1997/04/14 19:03:08 erich Exp $
 #
 
 DISTNAME=	linux_lib-2.4
 CATEGORIES=	emulators
-MASTER_SITES=	ftp://freefall.freebsd.org/pub/FreeBSD/LOCAL_PORTS/
+MASTER_SITES=	${MASTER_SITE_LOCAL}
 
 MAINTAINER=	erich@FreeBSD.org
 
diff --git a/emulators/linux_base-suse-9.1/Makefile b/emulators/linux_base-suse-9.1/Makefile
index b38ce2e9d765..d285cd1e8128 100644
--- a/emulators/linux_base-suse-9.1/Makefile
+++ b/emulators/linux_base-suse-9.1/Makefile
@@ -3,12 +3,12 @@
 # Date created:         
 # Whom:                 erich@FreeBSD.org
 #
-# $Id: Makefile,v 1.14 1996/12/11 17:46:11 erich Exp $
+# $Id: Makefile,v 1.15 1997/04/14 19:03:08 erich Exp $
 #
 
 DISTNAME=	linux_lib-2.4
 CATEGORIES=	emulators
-MASTER_SITES=	ftp://freefall.freebsd.org/pub/FreeBSD/LOCAL_PORTS/
+MASTER_SITES=	${MASTER_SITE_LOCAL}
 
 MAINTAINER=	erich@FreeBSD.org
 
diff --git a/emulators/linux_base-suse-9.2/Makefile b/emulators/linux_base-suse-9.2/Makefile
index b38ce2e9d765..d285cd1e8128 100644
--- a/emulators/linux_base-suse-9.2/Makefile
+++ b/emulators/linux_base-suse-9.2/Makefile
@@ -3,12 +3,12 @@
 # Date created:         
 # Whom:                 erich@FreeBSD.org
 #
-# $Id: Makefile,v 1.14 1996/12/11 17:46:11 erich Exp $
+# $Id: Makefile,v 1.15 1997/04/14 19:03:08 erich Exp $
 #
 
 DISTNAME=	linux_lib-2.4
 CATEGORIES=	emulators
-MASTER_SITES=	ftp://freefall.freebsd.org/pub/FreeBSD/LOCAL_PORTS/
+MASTER_SITES=	${MASTER_SITE_LOCAL}
 
 MAINTAINER=	erich@FreeBSD.org
 
diff --git a/emulators/linux_base-suse-9.3/Makefile b/emulators/linux_base-suse-9.3/Makefile
index b38ce2e9d765..d285cd1e8128 100644
--- a/emulators/linux_base-suse-9.3/Makefile
+++ b/emulators/linux_base-suse-9.3/Makefile
@@ -3,12 +3,12 @@
 # Date created:         
 # Whom:                 erich@FreeBSD.org
 #
-# $Id: Makefile,v 1.14 1996/12/11 17:46:11 erich Exp $
+# $Id: Makefile,v 1.15 1997/04/14 19:03:08 erich Exp $
 #
 
 DISTNAME=	linux_lib-2.4
 CATEGORIES=	emulators
-MASTER_SITES=	ftp://freefall.freebsd.org/pub/FreeBSD/LOCAL_PORTS/
+MASTER_SITES=	${MASTER_SITE_LOCAL}
 
 MAINTAINER=	erich@FreeBSD.org
 
diff --git a/emulators/linux_base/Makefile b/emulators/linux_base/Makefile
index b38ce2e9d765..d285cd1e8128 100644
--- a/emulators/linux_base/Makefile
+++ b/emulators/linux_base/Makefile
@@ -3,12 +3,12 @@
 # Date created:         
 # Whom:                 erich@FreeBSD.org
 #
-# $Id: Makefile,v 1.14 1996/12/11 17:46:11 erich Exp $
+# $Id: Makefile,v 1.15 1997/04/14 19:03:08 erich Exp $
 #
 
 DISTNAME=	linux_lib-2.4
 CATEGORIES=	emulators
-MASTER_SITES=	ftp://freefall.freebsd.org/pub/FreeBSD/LOCAL_PORTS/
+MASTER_SITES=	${MASTER_SITE_LOCAL}
 
 MAINTAINER=	erich@FreeBSD.org
 
diff --git a/emulators/mastergear/Makefile b/emulators/mastergear/Makefile
index 918e1ee51bf6..e966a870eaa3 100644
--- a/emulators/mastergear/Makefile
+++ b/emulators/mastergear/Makefile
@@ -3,13 +3,13 @@
 # Date created:        02 November 1996
 # Whom:                Yukihiro Nakai <Nakai@Mlab.t.u-tokyo.ac.jp>
 #
-# $Id: Makefile,v 1.1.1.1 1996/11/15 16:42:50 erich Exp $
+# $Id: Makefile,v 1.2 1996/12/05 11:04:42 asami Exp $
 #
 
 DISTNAME=	SMS
 PKGNAME=        mastergear-0.8
 CATEGORIES=     emulators
-MASTER_SITES=   ftp://freefall.freebsd.org/pub/FreeBSD/LOCAL_PORTS/
+MASTER_SITES=	${MASTER_SITE_LOCAL}
 DISTFILES=	MG.tar.Z
 
 MAINTAINER=	Nakai@Mlab.t.u-tokyo.ac.jp
diff --git a/emulators/vgb/Makefile b/emulators/vgb/Makefile
index 1fde1e3c1f47..877f5cf4289c 100644
--- a/emulators/vgb/Makefile
+++ b/emulators/vgb/Makefile
@@ -3,13 +3,13 @@
 # Date created:        31 October 1996
 # Whom:                Yukihiro Nakai <Nakai@Mlab.t.u-tokyo.ac.jp>
 #
-# $Id: Makefile,v 1.2 1996/11/16 09:00:17 asami Exp $
+# $Id: Makefile,v 1.3 1996/11/29 19:47:00 torstenb Exp $
 #
 
 DISTNAME=	GB
 PKGNAME=        vgb-0.7
 CATEGORIES=	emulators
-MASTER_SITES=	ftp://freefall.freebsd.org/pub/FreeBSD/LOCAL_PORTS/
+MASTER_SITES=	${MASTER_SITE_LOCAL}
 DISTFILES=	VGB.tar.Z
 
 MAINTAINER=	Nakai@Mlab.t.u-tokyo.ac.jp
diff --git a/games/xmine/Makefile b/games/xmine/Makefile
index 289f9addc08f..4ca81fd7253c 100644
--- a/games/xmine/Makefile
+++ b/games/xmine/Makefile
@@ -3,13 +3,13 @@
 # Date created:		25 December 1994
 # Whom:			joerg
 #
-# $Id: Makefile,v 1.11 1996/11/18 13:59:23 asami Exp $
+# $Id: Makefile,v 1.12 1997/01/03 11:33:16 obrien Exp $
 #
 
 DISTNAME=	xmine-1.0.3-Xaw
 PKGNAME=	xmine-1.0.3
 CATEGORIES=	games
-MASTER_SITES=	ftp://freefall.freebsd.org/pub/FreeBSD/LOCAL_PORTS/
+MASTER_SITES=	${MASTER_SITE_LOCAL}
 
 MAINTAINER=	joerg@FreeBSD.org
 
diff --git a/graphics/dore/Makefile b/graphics/dore/Makefile
index ffe8833b7e10..98a5c9d41d2f 100644
--- a/graphics/dore/Makefile
+++ b/graphics/dore/Makefile
@@ -3,12 +3,12 @@
 # Date created:		10 February 1995
 # Whom:			jkh
 #
-# $Id: Makefile,v 1.4 1996/03/07 00:21:43 asami Exp $
+# $Id: Makefile,v 1.5 1996/11/18 11:27:45 asami Exp $
 #
 
 DISTNAME=	pdore-6.0
 CATEGORIES=	graphics
-MASTER_SITES=   ftp://freefall.freebsd.org/pub/FreeBSD/LOCAL_PORTS/
+MASTER_SITES=	${MASTER_SITE_LOCAL}
 EXTRACT_SUFX=	.tar.Z
 
 USE_GMAKE=	yes
diff --git a/graphics/gifmerge/Makefile b/graphics/gifmerge/Makefile
index 410ca10c902a..3609427ce204 100644
--- a/graphics/gifmerge/Makefile
+++ b/graphics/gifmerge/Makefile
@@ -3,13 +3,13 @@
 # Date created:        20 Oct 1996
 # Whom:                Yukihiro Nakai <nakai@mlab.t.u-tokyo.ac.jp>
 #
-# $Id$
+# $Id: Makefile,v 1.1.1.1 1996/11/19 12:32:02 asami Exp $
 #
 
 DISTNAME=	gifmerge
 PKGNAME=        gifmerge-1.33
 CATEGORIES=     graphics
-MASTER_SITES=	ftp://freefall.freebsd.org/pub/FreeBSD/LOCAL_PORTS/
+MASTER_SITES=	${MASTER_SITE_LOCAL}
 EXTRACT_SUFX=	.tar
 
 MAINTAINER=     nakai@mlab.t.u-tokyo.ac.jp
diff --git a/graphics/hpscan/Makefile b/graphics/hpscan/Makefile
index e1b34d5ba165..013e284476b9 100644
--- a/graphics/hpscan/Makefile
+++ b/graphics/hpscan/Makefile
@@ -3,13 +3,13 @@
 # Date created:		12 January 1996
 # Whom:			nate
 #
-# $Id: Makefile,v 1.7 1996/11/19 04:18:44 asami Exp $
+# $Id: Makefile,v 1.8 1997/02/07 15:41:08 nate Exp $
 #
 
 DISTNAME=	scanner
 PKGNAME=	hpscan-1.0
 CATEGORIES=	graphics
-MASTER_SITES=	ftp://freefall.freebsd.org/pub/FreeBSD/LOCAL_PORTS/ \
+MASTER_SITES=	${MASTER_SITE_LOCAL} \
 		ftp://ftp.cogsci.ed.ac.uk/pub/richard/
 
 MAINTAINER=	nate@FreeBSD.org
diff --git a/japanese/lipsf/Makefile b/japanese/lipsf/Makefile
index c7f54db9fbcb..a88d5aba8305 100644
--- a/japanese/lipsf/Makefile
+++ b/japanese/lipsf/Makefile
@@ -3,7 +3,7 @@
 # Date created:		6 Dec 1996
 # Whom:			Mita Yoshio <mita@jp.FreeBSD.org>
 #
-# $Id$
+# $Id: Makefile,v 1.1.1.1 1996/12/19 03:36:13 max Exp $
 #
 
 DISTNAME=	lipsf113
@@ -12,7 +12,7 @@ CATEGORIES=	japanese print
 MASTER_SITES=	ftp://ftp.eos.hokudai.ac.jp/pub/tools/
 
 PATCHFILES=	lipsf113c.patch.gz
-PATCH_SITES=	ftp://freefall.freebsd.org/pub/FreeBSD/LOCAL_PORTS/
+PATCH_SITES=	${MASTER_SITE_LOCAL}
 
 MAINTAINER=	mita@jp.FreeBSD.org
 
diff --git a/japanese/platex-common/Makefile b/japanese/platex-common/Makefile
index 1d2eb1d5c4d9..7816f35a21db 100644
--- a/japanese/platex-common/Makefile
+++ b/japanese/platex-common/Makefile
@@ -3,14 +3,14 @@
 # Date created:		5 Nov 1995
 # Whom:			Hideaki Ohmon <ohmon@sfc.keio.ac.jp>
 #
-# $Id: Makefile,v 1.13 1997/02/09 00:40:35 max Exp $
+# $Id: Makefile,v 1.14 1997/02/11 18:06:02 max Exp $
 #
 
 DISTNAME=	platex2e
 PKGNAME=	jp-platex2e-97.02.01
 CATEGORIES=	japanese print
 MASTER_SITES=	ftp://ftp.ascii.co.jp/pub/TeX/ascii-ptex/platex2e/1997-02-01/ \
-		ftp://freefall.freebsd.org/pub/FreeBSD/LOCAL_PORTS/
+		${MASTER_SITE_LOCAL}
 DISTFILES=	base-9612.tar.gz ecfonts-1.0.tar.gz
 
 MAINTAINER=	max@FreeBSD.ORG
diff --git a/japanese/vfghostscript5/Makefile b/japanese/vfghostscript5/Makefile
index 6eef6d1f4363..03697a92d1f5 100644
--- a/japanese/vfghostscript5/Makefile
+++ b/japanese/vfghostscript5/Makefile
@@ -3,7 +3,7 @@
 # Date created:		23 Nov 1996
 # Whom:			Mita Yoshio <mita@jp.FreeBSD.org>
 #
-# $Id: Makefile,v 1.5 1997/03/03 06:37:52 asami Exp $
+# $Id: Makefile,v 1.6 1997/03/05 09:20:07 asami Exp $
 #
 
 DISTNAME=	ghostscript-4.03
@@ -12,7 +12,7 @@ CATEGORIES=	japanese print
 MASTER_SITES=	ftp://ftp.cs.wisc.edu/ghost/aladdin/ \
 		ftp://i1nws2.fukui-u.ac.jp/pub/TeX/dvipr/ \
 		ftp://ftp.mei.co.jp/free/gnu/util/ghostscript/drivers/ \
-		ftp://freefall.freebsd.org/pub/FreeBSD/LOCAL_PORTS/ \
+		${MASTER_SITE_LOCAL} \
 		http://www.jp.FreeBSD.org/~mita/LOCAL_PORTS/
 DISTFILES=	${GS_SOURCES} ${GS_DRIVERS} ${GS_FONTS_STD} ${GS_FONTS_OTHER}
 
diff --git a/japanese/vfghostscript55/Makefile b/japanese/vfghostscript55/Makefile
index 6eef6d1f4363..03697a92d1f5 100644
--- a/japanese/vfghostscript55/Makefile
+++ b/japanese/vfghostscript55/Makefile
@@ -3,7 +3,7 @@
 # Date created:		23 Nov 1996
 # Whom:			Mita Yoshio <mita@jp.FreeBSD.org>
 #
-# $Id: Makefile,v 1.5 1997/03/03 06:37:52 asami Exp $
+# $Id: Makefile,v 1.6 1997/03/05 09:20:07 asami Exp $
 #
 
 DISTNAME=	ghostscript-4.03
@@ -12,7 +12,7 @@ CATEGORIES=	japanese print
 MASTER_SITES=	ftp://ftp.cs.wisc.edu/ghost/aladdin/ \
 		ftp://i1nws2.fukui-u.ac.jp/pub/TeX/dvipr/ \
 		ftp://ftp.mei.co.jp/free/gnu/util/ghostscript/drivers/ \
-		ftp://freefall.freebsd.org/pub/FreeBSD/LOCAL_PORTS/ \
+		${MASTER_SITE_LOCAL} \
 		http://www.jp.FreeBSD.org/~mita/LOCAL_PORTS/
 DISTFILES=	${GS_SOURCES} ${GS_DRIVERS} ${GS_FONTS_STD} ${GS_FONTS_OTHER}
 
diff --git a/lang/mit-scheme/Makefile b/lang/mit-scheme/Makefile
index 457d66c589c7..d2cb49f41ddc 100644
--- a/lang/mit-scheme/Makefile
+++ b/lang/mit-scheme/Makefile
@@ -7,7 +7,7 @@
 DISTNAME=       mit-scheme
 PKGNAME=	mit-scheme-7.3
 CATEGORIES=	lang
-MASTER_SITES=   ftp://freefall.freebsd.org/pub/FreeBSD/LOCAL_PORTS/
+MASTER_SITES=   ${MASTER_SITE_LOCAL}
 DISTFILES=	scheme-microcode+dist-7.3-freebsd.tgz
 
 MAINTAINER= 	jmacd@FreeBSD.ORG
diff --git a/lang/modula-3-lib/Makefile b/lang/modula-3-lib/Makefile
index 179a93921bb2..43e721b704a9 100644
--- a/lang/modula-3-lib/Makefile
+++ b/lang/modula-3-lib/Makefile
@@ -3,12 +3,12 @@
 # Date created:		28 Oct 1996
 # Whom:			John Polstra <jdp@polstra.com>
 #
-# $Id: Makefile,v 1.5 1997/02/14 22:17:03 jdp Exp $
+# $Id: Makefile,v 1.6 1997/03/28 04:38:43 jdp Exp $
 #
 
 DISTNAME=	modula-3-lib-3.6
 CATEGORIES=	lang
-MASTER_SITES=	ftp://freefall.FreeBSD.ORG/pub/FreeBSD/LOCAL_PORTS/
+MASTER_SITES=	${MASTER_SITE_LOCAL}
 DISTFILES=	m3-fbsd-src-3.6.tar.gz m3-fbsd-m3cc-3.6.tar.gz
 # Note: Depending on what is already installed on the system, the code
 # below may add some more DISTFILES.
diff --git a/lang/pbasic/Makefile b/lang/pbasic/Makefile
index 584dc5a0b6d7..3d4ee1f7c35b 100644
--- a/lang/pbasic/Makefile
+++ b/lang/pbasic/Makefile
@@ -3,13 +3,13 @@
 # Date created:		13th August 1995
 # Whom:			Julian Stacey <jhs@freebsd.org>
 #
-# $Id: Makefile,v 1.5 1996/11/17 06:12:39 obrien Exp $
+# $Id: Makefile,v 1.6 1996/11/19 01:17:45 asami Exp $
 #
 
 DISTNAME=	pbasic-2.0-950813
 PKGNAME=	pbasic-2.0
 CATEGORIES=	lang
-MASTER_SITES=	ftp://freefall.freebsd.org/pub/FreeBSD/LOCAL_PORTS/
+MASTER_SITES=	${MASTER_SITE_LOCAL}
 
 MAINTAINER=	asami@FreeBSD.ORG
 # Ask jhs@freebsd.org if you want newer sources or author's latest e-mail
diff --git a/mail/mailagent/Makefile b/mail/mailagent/Makefile
index 85a5ffb31785..196e037a7ce8 100644
--- a/mail/mailagent/Makefile
+++ b/mail/mailagent/Makefile
@@ -3,14 +3,14 @@
 # Date created:			23 Sep 1996
 # Whom:				Masafumi NAKANE <max@FreeBSD.ORG>
 #
-# $Id: Makefile,v 1.11 1997/04/18 07:59:20 max Exp $
+# $Id: Makefile,v 1.12 1997/04/20 13:52:30 wosch Exp $
 #
 
 DISTNAME=	mailagent-3.0pl56
 PKGNAME=	mailagent-3.0.56
 CATEGORIES=	mail perl5
 MASTER_SITES=	http://www.sfc.wide.ad.jp/~max/FreeBSD/ports/distfiles/ \
-		ftp://freefall.freebsd.org/pub/FreeBSD/LOCAL_PORTS/
+		${MASTER_SITE_LOCAL}
 
 MAINTAINER=	max@FreeBSD.ORG
 
diff --git a/mail/xfaces/Makefile b/mail/xfaces/Makefile
index 4efd95efca04..f0e7e443a310 100644
--- a/mail/xfaces/Makefile
+++ b/mail/xfaces/Makefile
@@ -5,7 +5,7 @@
 # With some 
 # modifications from:	Andreas Klemm <andreas@FreeBSD.ORG>
 #
-# $Id: Makefile,v 1.4 1996/12/17 05:31:12 asami Exp $
+# $Id: Makefile,v 1.5 1996/12/19 12:08:02 asami Exp $
 #
 
 DISTNAME=	xfaces-3.3
@@ -13,9 +13,9 @@ CATEGORIES=	mail
 # xfaces-sounds.tar.gz only in LOCAL_PORTS
 MASTER_SITES=	ftp://ftp.cs.indiana.edu/pub/faces/xfaces/ \
 		ftp://odie.physik2.uni-rostock.de/pub/ \
-		ftp://freefall.freebsd.org/pub/FreeBSD/LOCAL_PORTS/
+		${MASTER_SITE_LOCAL}
 DISTFILES=	${DISTNAME}.tar.Z xfaces-sounds.tar.gz
-		
+
 MAINTAINER=	Lars_Koeller@odie.physik2.uni-rostock.de
 
 BUILD_DEPENDS= 	${X11BASE}/lib/libaudio.a:${PORTSDIR}/audio/nas
diff --git a/misc/chord/Makefile b/misc/chord/Makefile
index d6cebdb6dda9..94da62ce0012 100644
--- a/misc/chord/Makefile
+++ b/misc/chord/Makefile
@@ -3,13 +3,13 @@
 # Date created:		24 April 1995
 # Whom:			Satoshi Asami
 #
-# $Id: Makefile,v 1.2 1995/11/26 10:47:29 asami Exp $
+# $Id: Makefile,v 1.3 1996/11/11 05:49:18 obrien Exp $
 #
 
 DISTNAME=	chord
 PKGNAME=	chord-3.6
 CATEGORIES=	misc
-MASTER_SITES=	ftp://freebsd.org/pub/FreeBSD/LOCAL_PORTS/
+MASTER_SITES=	${MASTER_SITE_LOCAL}
 
 MAINTAINER=	asami@FreeBSD.ORG
 
diff --git a/misc/colorls/Makefile b/misc/colorls/Makefile
index 83290fe43e80..f0f61402fe6e 100644
--- a/misc/colorls/Makefile
+++ b/misc/colorls/Makefile
@@ -3,13 +3,13 @@
 # Date created:		8 March 1995
 # Whom:			Satoshi Asami
 #
-# $Id: Makefile,v 1.11 1996/12/17 12:33:29 asami Exp $
+# $Id: Makefile,v 1.12 1997/01/02 06:29:44 asami Exp $
 #
 
 DISTNAME=	colorls
 PKGNAME=	colorls-2.2
 CATEGORIES=	misc
-MASTER_SITES=	ftp://freefall.freebsd.org/pub/FreeBSD/LOCAL_PORTS/
+MASTER_SITES=	${MASTER_SITE_LOCAL}
 DISTFILES=	ls.tar.gz
 
 MAINTAINER=	asami@FreeBSD.ORG
diff --git a/misc/team/Makefile b/misc/team/Makefile
index d7c33335b4bf..72e43cadd78a 100644
--- a/misc/team/Makefile
+++ b/misc/team/Makefile
@@ -3,12 +3,12 @@
 # Date created:		1 July 1995
 # Whom:			joerg
 #
-# $Id: Makefile,v 1.4 1996/06/03 02:17:28 asami Exp $
+# $Id: Makefile,v 1.5 1996/11/11 05:50:13 obrien Exp $
 #
 
 DISTNAME=	team-3.1
 CATEGORIES=	misc
-MASTER_SITES=	ftp://freefall.freebsd.org/pub/FreeBSD/LOCAL_PORTS/
+MASTER_SITES=	${MASTER_SITE_LOCAL}
 
 MAINTAINER=	joerg@FreeBSD.org
 
diff --git a/net/sup/Makefile b/net/sup/Makefile
index bc975c5dda82..a7d4774bcc27 100644
--- a/net/sup/Makefile
+++ b/net/sup/Makefile
@@ -3,13 +3,13 @@
 # Date created:		21 August 1994
 # Whom:			jkh
 #
-# $Id: Makefile,v 1.8 1996/11/18 11:36:32 asami Exp $
+# $Id: Makefile,v 1.9 1996/11/18 14:09:10 asami Exp $
 #
 
 DISTNAME=	sup
 PKGNAME=	sup-2.0
 CATEGORIES=	net
-MASTER_SITES=	ftp://freefall.freebsd.org/pub/FreeBSD/LOCAL_PORTS/
+MASTER_SITES=	${MASTER_SITE_LOCAL}
 
 MAINTAINER=	gibbs@FreeBSD.org
 
diff --git a/net/tcptrace/Makefile b/net/tcptrace/Makefile
index aade6f4cbe64..87cb24930392 100644
--- a/net/tcptrace/Makefile
+++ b/net/tcptrace/Makefile
@@ -3,14 +3,14 @@
 # Date created:		3 March 1997
 # Whom:			fenner
 #
-# $Id$
+# $Id: Makefile,v 1.1.1.1 1997/03/06 02:18:51 asami Exp $
 #
 
 DISTNAME=	tcptrace-3.2.5
 CATEGORIES=	net
 # this site uncompresses the file AND sends it with a .gz suffix
-MASTER_SITES=	http://jarok.cs.ohiou.edu/software/tcptrace/files/
-MASTER_SITES=	ftp://freefall.freebsd.org/pub/FreeBSD/LOCAL_PORTS/
+#MASTER_SITES=	http://jarok.cs.ohiou.edu/software/tcptrace/files/
+MASTER_SITES=	${MASTER_SITE_LOCAL}
 DISTFILES=	tcptrace_3.2.5.tar.gz
 
 MAINTAINER=	fenner@FreeBSD.ORG
diff --git a/net/telnetx/Makefile b/net/telnetx/Makefile
index 2dc82bda6f16..87f751fa549e 100644
--- a/net/telnetx/Makefile
+++ b/net/telnetx/Makefile
@@ -3,13 +3,13 @@
 # Date created:			22 Sep 1996
 # Whom:				Masafumi NAKANE <max@FreeBSD.ORG>
 #
-# $Id: Makefile,v 1.3 1996/11/13 12:41:28 asami Exp $
+# $Id: Makefile,v 1.4 1996/11/18 11:36:39 asami Exp $
 #
 
 DISTNAME=	telnetx+transit.src.940401
 PKGNAME=	telnetx-940401
 CATEGORIES=	net
-MASTER_SITES=	ftp://freefall.FreeBSD.ORG/pub/FreeBSD/LOCAL_PORTS/ \
+MASTER_SITES=	${MASTER_SITE_LOCAL} \
 		http://www.sfc.wide.ad.jp/~max/FreeBSD/ports/distfiles/
 
 MAINTAINER=	max@FreeBSD.ORG
diff --git a/print/apsfilter/Makefile b/print/apsfilter/Makefile
index 759b1d42a006..af99e9c29f89 100644
--- a/print/apsfilter/Makefile
+++ b/print/apsfilter/Makefile
@@ -3,12 +3,12 @@
 # Date created: 	Tue Nov 14 18:29:48 MET 1995
 # Whom: 		Andreas Klemm <andreas@klemm.gtn.com>
 #
-# $Id: Makefile,v 1.10 1996/12/07 11:26:54 max Exp $
+# $Id: Makefile,v 1.11 1996/12/08 01:45:13 max Exp $
 #
 
 DISTNAME=	apsfilter-4.9.3
 CATEGORIES=	print
-MASTER_SITES=	ftp://freefall.FreeBSD.org/pub/FreeBSD/LOCAL_PORTS/
+MASTER_SITES=	${MASTER_SITE_LOCAL}
 
 MAINTAINER=	andreas@klemm.gtn.com
 
diff --git a/print/apsfilter6/Makefile b/print/apsfilter6/Makefile
index 759b1d42a006..af99e9c29f89 100644
--- a/print/apsfilter6/Makefile
+++ b/print/apsfilter6/Makefile
@@ -3,12 +3,12 @@
 # Date created: 	Tue Nov 14 18:29:48 MET 1995
 # Whom: 		Andreas Klemm <andreas@klemm.gtn.com>
 #
-# $Id: Makefile,v 1.10 1996/12/07 11:26:54 max Exp $
+# $Id: Makefile,v 1.11 1996/12/08 01:45:13 max Exp $
 #
 
 DISTNAME=	apsfilter-4.9.3
 CATEGORIES=	print
-MASTER_SITES=	ftp://freefall.FreeBSD.org/pub/FreeBSD/LOCAL_PORTS/
+MASTER_SITES=	${MASTER_SITE_LOCAL}
 
 MAINTAINER=	andreas@klemm.gtn.com
 
diff --git a/sysutils/manck/Makefile b/sysutils/manck/Makefile
index 07a065bb1912..35c5806fc942 100644
--- a/sysutils/manck/Makefile
+++ b/sysutils/manck/Makefile
@@ -3,12 +3,12 @@
 # Date created:         10 September 1995
 # Whom:                 joerg
 #
-# $Id: Makefile,v 1.5 1996/10/27 15:49:04 wosch Exp $
+# $Id: Makefile,v 1.6 1996/11/17 08:06:15 obrien Exp $
 #
 
 DISTNAME=       manck-1.2
 CATEGORIES=	sysutils
-MASTER_SITES=   ftp://freefall.freebsd.org/pub/FreeBSD/LOCAL_PORTS/
+MASTER_SITES=   ${MASTER_SITE_LOCAL}
 
 MAINTAINER=     wosch@FreeBSD.org
 
diff --git a/sysutils/socket/Makefile b/sysutils/socket/Makefile
index ca5b0a677d1d..2f8e432afef3 100644
--- a/sysutils/socket/Makefile
+++ b/sysutils/socket/Makefile
@@ -3,12 +3,12 @@
 # Date created:         14 August 1996
 # Whom:                 wosch
 #
-# $Id: Makefile,v 1.3 1996/11/17 08:06:22 obrien Exp $
+# $Id: Makefile,v 1.4 1997/04/13 21:51:44 wosch Exp $
 #
 
 DISTNAME=       socket-1.1
 CATEGORIES=	sysutils net
-MASTER_SITES=   ftp://freefall.freebsd.org/pub/FreeBSD/LOCAL_PORTS/
+MASTER_SITES=   ${MASTER_SITE_LOCAL}
 
 MAINTAINER=     wosch@FreeBSD.org
 
diff --git a/sysutils/stat/Makefile b/sysutils/stat/Makefile
index 40d01cbf03b4..67153d208e03 100644
--- a/sysutils/stat/Makefile
+++ b/sysutils/stat/Makefile
@@ -3,11 +3,11 @@
 # Date created:         16 Februar 1996
 # Whom:                 wosch
 #
-# $Id: Makefile,v 1.6 1996/11/17 08:06:15 obrien Exp $
+# $Id: Makefile,v 1.1.1.1 1997/02/16 15:16:57 wosch Exp $
 
 DISTNAME=       stat-1.3
 CATEGORIES=	sysutils
-MASTER_SITES=   ftp://freefall.freebsd.org/pub/FreeBSD/LOCAL_PORTS/
+MASTER_SITES=   ${MASTER_SITE_LOCAL}
 
 MAINTAINER=     wosch@FreeBSD.org
 
diff --git a/x11/xtestpicture/Makefile b/x11/xtestpicture/Makefile
index 98f5486460f9..71dabc6d4158 100644
--- a/x11/xtestpicture/Makefile
+++ b/x11/xtestpicture/Makefile
@@ -3,12 +3,12 @@
 # Date created:         11 March 1997
 # Whom:                 joerg
 #
-# $Id$
+# $Id: Makefile,v 1.1.1.1 1997/03/11 23:36:35 joerg Exp $
 #
 
 DISTNAME=       xtestpicture-1.1
 CATEGORIES=	x11
-MASTER_SITES=   ftp://freefall.freebsd.org/pub/FreeBSD/LOCAL_PORTS/
+MASTER_SITES=   ${MASTER_SITE_LOCAL}
 
 MAINTAINER=     joerg@FreeBSD.org