60 files changed, 167 insertions, 200 deletions

diff --git a/converters/recode/Makefile b/converters/recode/Makefile
index 78b9667456f4..9cc7d748cb76 100644
--- a/converters/recode/Makefile
+++ b/converters/recode/Makefile
@@ -3,12 +3,12 @@
 # Date created:		14 Jul 1995
 # Whom:			torstenb@FreeBSD.ORG
 #
-# $Id: Makefile,v 1.1.1.1 1995/07/17 01:04:43 torstenb Exp $
+# $Id: Makefile,v 1.2 1995/11/26 10:48:13 asami Exp $
 #
 
 DISTNAME=	recode-3.4
 CATEGORIES=	misc
-MASTER_SITES=	ftp://prep.ai.mit.edu/pub/gnu/
+MASTER_SITES=	${MASTER_SITE_GNU}
 
 MAINTAINER=	torstenb@FreeBSD.ORG
 
diff --git a/databases/gdbm/Makefile b/databases/gdbm/Makefile
index 76e41d4fb6dc..593e9bc5a5ad 100644
--- a/databases/gdbm/Makefile
+++ b/databases/gdbm/Makefile
@@ -3,13 +3,12 @@
 # Date created:		8 Apr 1996
 # Whom:			Brent J. Nordquist <nordquist@platinum.com>
 #
-# $Id: Makefile,v 1.1.1.1 1996/04/12 06:44:15 asami Exp $
+# $Id: Makefile,v 1.2 1996/11/17 03:18:20 obrien Exp $
 #
 
 DISTNAME=          gdbm-1.7.3
 CATEGORIES=        databases
-MASTER_SITES=      ftp://gatekeeper.dec.com/pub/GNU/ \
-                   ftp://prep.ai.mit.edu/pub/gnu/
+MASTER_SITES=      ${MASTER_SITE_GNU}
 
 MAINTAINER=        nordquist@platinum.com
 
diff --git a/devel/autoconf/Makefile b/devel/autoconf/Makefile
index a29877aec55f..7120521a427b 100644
--- a/devel/autoconf/Makefile
+++ b/devel/autoconf/Makefile
@@ -3,12 +3,12 @@
 # Date created:		7 October 1995
 # Whom:			torstenb@FreeBSD.ORG
 #
-# $Id: Makefile,v 1.7 1996/04/01 05:09:13 asami Exp $
+# $Id: Makefile,v 1.8 1996/06/03 21:59:38 gpalmer Exp $
 #
 
 DISTNAME=       autoconf-2.10
 CATEGORIES=	devel
-MASTER_SITES=	ftp://prep.ai.mit.edu/pub/gnu/
+MASTER_SITES=	${MASTER_SITE_GNU}
 
 RUN_DEPENDS=	gm4:${PORTSDIR}/devel/m4
 
diff --git a/devel/autoconf213/Makefile b/devel/autoconf213/Makefile
index a29877aec55f..7120521a427b 100644
--- a/devel/autoconf213/Makefile
+++ b/devel/autoconf213/Makefile
@@ -3,12 +3,12 @@
 # Date created:		7 October 1995
 # Whom:			torstenb@FreeBSD.ORG
 #
-# $Id: Makefile,v 1.7 1996/04/01 05:09:13 asami Exp $
+# $Id: Makefile,v 1.8 1996/06/03 21:59:38 gpalmer Exp $
 #
 
 DISTNAME=       autoconf-2.10
 CATEGORIES=	devel
-MASTER_SITES=	ftp://prep.ai.mit.edu/pub/gnu/
+MASTER_SITES=	${MASTER_SITE_GNU}
 
 RUN_DEPENDS=	gm4:${PORTSDIR}/devel/m4
 
diff --git a/devel/autoconf253/Makefile b/devel/autoconf253/Makefile
index a29877aec55f..7120521a427b 100644
--- a/devel/autoconf253/Makefile
+++ b/devel/autoconf253/Makefile
@@ -3,12 +3,12 @@
 # Date created:		7 October 1995
 # Whom:			torstenb@FreeBSD.ORG
 #
-# $Id: Makefile,v 1.7 1996/04/01 05:09:13 asami Exp $
+# $Id: Makefile,v 1.8 1996/06/03 21:59:38 gpalmer Exp $
 #
 
 DISTNAME=       autoconf-2.10
 CATEGORIES=	devel
-MASTER_SITES=	ftp://prep.ai.mit.edu/pub/gnu/
+MASTER_SITES=	${MASTER_SITE_GNU}
 
 RUN_DEPENDS=	gm4:${PORTSDIR}/devel/m4
 
diff --git a/devel/autoconf254/Makefile b/devel/autoconf254/Makefile
index a29877aec55f..7120521a427b 100644
--- a/devel/autoconf254/Makefile
+++ b/devel/autoconf254/Makefile
@@ -3,12 +3,12 @@
 # Date created:		7 October 1995
 # Whom:			torstenb@FreeBSD.ORG
 #
-# $Id: Makefile,v 1.7 1996/04/01 05:09:13 asami Exp $
+# $Id: Makefile,v 1.8 1996/06/03 21:59:38 gpalmer Exp $
 #
 
 DISTNAME=       autoconf-2.10
 CATEGORIES=	devel
-MASTER_SITES=	ftp://prep.ai.mit.edu/pub/gnu/
+MASTER_SITES=	${MASTER_SITE_GNU}
 
 RUN_DEPENDS=	gm4:${PORTSDIR}/devel/m4
 
diff --git a/devel/autoconf257/Makefile b/devel/autoconf257/Makefile
index a29877aec55f..7120521a427b 100644
--- a/devel/autoconf257/Makefile
+++ b/devel/autoconf257/Makefile
@@ -3,12 +3,12 @@
 # Date created:		7 October 1995
 # Whom:			torstenb@FreeBSD.ORG
 #
-# $Id: Makefile,v 1.7 1996/04/01 05:09:13 asami Exp $
+# $Id: Makefile,v 1.8 1996/06/03 21:59:38 gpalmer Exp $
 #
 
 DISTNAME=       autoconf-2.10
 CATEGORIES=	devel
-MASTER_SITES=	ftp://prep.ai.mit.edu/pub/gnu/
+MASTER_SITES=	${MASTER_SITE_GNU}
 
 RUN_DEPENDS=	gm4:${PORTSDIR}/devel/m4
 
diff --git a/devel/autoconf259/Makefile b/devel/autoconf259/Makefile
index a29877aec55f..7120521a427b 100644
--- a/devel/autoconf259/Makefile
+++ b/devel/autoconf259/Makefile
@@ -3,12 +3,12 @@
 # Date created:		7 October 1995
 # Whom:			torstenb@FreeBSD.ORG
 #
-# $Id: Makefile,v 1.7 1996/04/01 05:09:13 asami Exp $
+# $Id: Makefile,v 1.8 1996/06/03 21:59:38 gpalmer Exp $
 #
 
 DISTNAME=       autoconf-2.10
 CATEGORIES=	devel
-MASTER_SITES=	ftp://prep.ai.mit.edu/pub/gnu/
+MASTER_SITES=	${MASTER_SITE_GNU}
 
 RUN_DEPENDS=	gm4:${PORTSDIR}/devel/m4
 
diff --git a/devel/autoconf26/Makefile b/devel/autoconf26/Makefile
index a29877aec55f..7120521a427b 100644
--- a/devel/autoconf26/Makefile
+++ b/devel/autoconf26/Makefile
@@ -3,12 +3,12 @@
 # Date created:		7 October 1995
 # Whom:			torstenb@FreeBSD.ORG
 #
-# $Id: Makefile,v 1.7 1996/04/01 05:09:13 asami Exp $
+# $Id: Makefile,v 1.8 1996/06/03 21:59:38 gpalmer Exp $
 #
 
 DISTNAME=       autoconf-2.10
 CATEGORIES=	devel
-MASTER_SITES=	ftp://prep.ai.mit.edu/pub/gnu/
+MASTER_SITES=	${MASTER_SITE_GNU}
 
 RUN_DEPENDS=	gm4:${PORTSDIR}/devel/m4
 
diff --git a/devel/autoconf261/Makefile b/devel/autoconf261/Makefile
index a29877aec55f..7120521a427b 100644
--- a/devel/autoconf261/Makefile
+++ b/devel/autoconf261/Makefile
@@ -3,12 +3,12 @@
 # Date created:		7 October 1995
 # Whom:			torstenb@FreeBSD.ORG
 #
-# $Id: Makefile,v 1.7 1996/04/01 05:09:13 asami Exp $
+# $Id: Makefile,v 1.8 1996/06/03 21:59:38 gpalmer Exp $
 #
 
 DISTNAME=       autoconf-2.10
 CATEGORIES=	devel
-MASTER_SITES=	ftp://prep.ai.mit.edu/pub/gnu/
+MASTER_SITES=	${MASTER_SITE_GNU}
 
 RUN_DEPENDS=	gm4:${PORTSDIR}/devel/m4
 
diff --git a/devel/autoconf262/Makefile b/devel/autoconf262/Makefile
index a29877aec55f..7120521a427b 100644
--- a/devel/autoconf262/Makefile
+++ b/devel/autoconf262/Makefile
@@ -3,12 +3,12 @@
 # Date created:		7 October 1995
 # Whom:			torstenb@FreeBSD.ORG
 #
-# $Id: Makefile,v 1.7 1996/04/01 05:09:13 asami Exp $
+# $Id: Makefile,v 1.8 1996/06/03 21:59:38 gpalmer Exp $
 #
 
 DISTNAME=       autoconf-2.10
 CATEGORIES=	devel
-MASTER_SITES=	ftp://prep.ai.mit.edu/pub/gnu/
+MASTER_SITES=	${MASTER_SITE_GNU}
 
 RUN_DEPENDS=	gm4:${PORTSDIR}/devel/m4
 
diff --git a/devel/autoconf267/Makefile b/devel/autoconf267/Makefile
index a29877aec55f..7120521a427b 100644
--- a/devel/autoconf267/Makefile
+++ b/devel/autoconf267/Makefile
@@ -3,12 +3,12 @@
 # Date created:		7 October 1995
 # Whom:			torstenb@FreeBSD.ORG
 #
-# $Id: Makefile,v 1.7 1996/04/01 05:09:13 asami Exp $
+# $Id: Makefile,v 1.8 1996/06/03 21:59:38 gpalmer Exp $
 #
 
 DISTNAME=       autoconf-2.10
 CATEGORIES=	devel
-MASTER_SITES=	ftp://prep.ai.mit.edu/pub/gnu/
+MASTER_SITES=	${MASTER_SITE_GNU}
 
 RUN_DEPENDS=	gm4:${PORTSDIR}/devel/m4
 
diff --git a/devel/autoconf268/Makefile b/devel/autoconf268/Makefile
index a29877aec55f..7120521a427b 100644
--- a/devel/autoconf268/Makefile
+++ b/devel/autoconf268/Makefile
@@ -3,12 +3,12 @@
 # Date created:		7 October 1995
 # Whom:			torstenb@FreeBSD.ORG
 #
-# $Id: Makefile,v 1.7 1996/04/01 05:09:13 asami Exp $
+# $Id: Makefile,v 1.8 1996/06/03 21:59:38 gpalmer Exp $
 #
 
 DISTNAME=       autoconf-2.10
 CATEGORIES=	devel
-MASTER_SITES=	ftp://prep.ai.mit.edu/pub/gnu/
+MASTER_SITES=	${MASTER_SITE_GNU}
 
 RUN_DEPENDS=	gm4:${PORTSDIR}/devel/m4
 
diff --git a/devel/gcc-6811/Makefile b/devel/gcc-6811/Makefile
index 796f403b1765..478aaad7aa7a 100644
--- a/devel/gcc-6811/Makefile
+++ b/devel/gcc-6811/Makefile
@@ -3,15 +3,14 @@
 # Date created:		Thu Sep 14 11:10:01 CDT 1995
 # Whom:			erich@FreeBSD.org
 #
-# $Id: Makefile,v 1.2 1996/08/02 08:36:40 asami Exp $
+# $Id: Makefile,v 1.3 1996/09/11 05:53:42 asami Exp $
 #
 
 DISTNAME=	gcc11
 PKGNAME=	gcc11-2.6.3
 CATEGORIES=	devel
 MASTER_SITES=	ftp://nyquist.ee.ualberta.ca/pub/motorola/68hc11/gcc/ \
-		ftp://archive.cis.ohio-state.edu/pub/gnu/mirror/ \
-		ftp://prep.ai.mit.edu/pub/gnu/
+		${MASTER_SITE_GNU}
 DISTFILES=	gcc-6811-fsf.tar.gz gcc-2.6.3.tar.gz
 
 MAINTAINER=	erich@FreeBSD.ORG
diff --git a/devel/gmake/Makefile b/devel/gmake/Makefile
index e909af07af14..fcbc07a21e78 100644
--- a/devel/gmake/Makefile
+++ b/devel/gmake/Makefile
@@ -3,14 +3,13 @@
 # Date created:		11 September 1994
 # Whom:			jkh
 #
-# $Id: Makefile,v 1.10 1995/11/26 11:29:02 asami Exp $
+# $Id: Makefile,v 1.11 1996/09/14 03:25:31 ache Exp $
 #
 
 DISTNAME=       make-3.75
 PKGNAME=        gmake-3.75
-CATEGORIES+=	devel
-MASTER_SITES=   ftp://prep.ai.mit.edu/pub/gnu/ \
-		ftp://ftp.uu.net/systems/gnu/
+CATEGORIES=	devel
+MASTER_SITES=   ${MASTER_SITE_GNU}
 
 GNU_CONFIGURE=	yes
 
diff --git a/devel/gmake381/Makefile b/devel/gmake381/Makefile
index e909af07af14..fcbc07a21e78 100644
--- a/devel/gmake381/Makefile
+++ b/devel/gmake381/Makefile
@@ -3,14 +3,13 @@
 # Date created:		11 September 1994
 # Whom:			jkh
 #
-# $Id: Makefile,v 1.10 1995/11/26 11:29:02 asami Exp $
+# $Id: Makefile,v 1.11 1996/09/14 03:25:31 ache Exp $
 #
 
 DISTNAME=       make-3.75
 PKGNAME=        gmake-3.75
-CATEGORIES+=	devel
-MASTER_SITES=   ftp://prep.ai.mit.edu/pub/gnu/ \
-		ftp://ftp.uu.net/systems/gnu/
+CATEGORIES=	devel
+MASTER_SITES=   ${MASTER_SITE_GNU}
 
 GNU_CONFIGURE=	yes
 
diff --git a/devel/gnu-autoconf/Makefile b/devel/gnu-autoconf/Makefile
index a29877aec55f..7120521a427b 100644
--- a/devel/gnu-autoconf/Makefile
+++ b/devel/gnu-autoconf/Makefile
@@ -3,12 +3,12 @@
 # Date created:		7 October 1995
 # Whom:			torstenb@FreeBSD.ORG
 #
-# $Id: Makefile,v 1.7 1996/04/01 05:09:13 asami Exp $
+# $Id: Makefile,v 1.8 1996/06/03 21:59:38 gpalmer Exp $
 #
 
 DISTNAME=       autoconf-2.10
 CATEGORIES=	devel
-MASTER_SITES=	ftp://prep.ai.mit.edu/pub/gnu/
+MASTER_SITES=	${MASTER_SITE_GNU}
 
 RUN_DEPENDS=	gm4:${PORTSDIR}/devel/m4
 
diff --git a/devel/id-utils/Makefile b/devel/id-utils/Makefile
index 88e98fc6e09b..58488e2ba0de 100644
--- a/devel/id-utils/Makefile
+++ b/devel/id-utils/Makefile
@@ -3,12 +3,12 @@
 # Date created:		22 Aug 1996
 # Whom:			pst@freebsd.org
 #
-# $Id: Makefile,v 1.2 1996/08/23 09:00:04 asami Exp $
+# $Id: Makefile,v 1.3 1996/11/17 02:32:06 asami Exp $
 #
 
 DISTNAME=	id-utils-3.2
-CATEGORIES+=	devel
-MASTER_SITES=	ftp://prep.ai.mit.edu/pub/gnu/
+CATEGORIES=	devel
+MASTER_SITES=	${MASTER_SITE_GNU}
 
 MAINTAINER=	pst@FreeBSD.ORG
 
diff --git a/devel/idutils/Makefile b/devel/idutils/Makefile
index 88e98fc6e09b..58488e2ba0de 100644
--- a/devel/idutils/Makefile
+++ b/devel/idutils/Makefile
@@ -3,12 +3,12 @@
 # Date created:		22 Aug 1996
 # Whom:			pst@freebsd.org
 #
-# $Id: Makefile,v 1.2 1996/08/23 09:00:04 asami Exp $
+# $Id: Makefile,v 1.3 1996/11/17 02:32:06 asami Exp $
 #
 
 DISTNAME=	id-utils-3.2
-CATEGORIES+=	devel
-MASTER_SITES=	ftp://prep.ai.mit.edu/pub/gnu/
+CATEGORIES=	devel
+MASTER_SITES=	${MASTER_SITE_GNU}
 
 MAINTAINER=	pst@FreeBSD.ORG
 
diff --git a/devel/m4/Makefile b/devel/m4/Makefile
index 12a37906fdc3..5945665446ea 100644
--- a/devel/m4/Makefile
+++ b/devel/m4/Makefile
@@ -3,15 +3,14 @@
 # Date created:		25 October 1994
 # Whom:			mr
 #
-# $Id: Makefile,v 1.4 1995/04/09 10:05:14 asami Exp $
+# $Id: Makefile,v 1.5 1995/11/26 11:29:12 asami Exp $
 #
 
 DISTNAME=       m4-1.4
-CATEGORIES+=	devel
-MASTER_SITES=   ftp://gatekeeper.dec.com/pub/GNU/ \
-		ftp://prep.ai.mit.edu/pub/gnu/
+CATEGORIES=	devel
+MASTER_SITES=   ${MASTER_SITE_GNU}
 
 GNU_CONFIGURE=yes
-CONFIGURE_ARGS= --program-prefix=g --prefix=${PREFIX}
+CONFIGURE_ARGS= --program-prefix=g
 
 .include <bsd.port.mk>
diff --git a/devel/m6811-gcc/Makefile b/devel/m6811-gcc/Makefile
index 796f403b1765..478aaad7aa7a 100644
--- a/devel/m6811-gcc/Makefile
+++ b/devel/m6811-gcc/Makefile
@@ -3,15 +3,14 @@
 # Date created:		Thu Sep 14 11:10:01 CDT 1995
 # Whom:			erich@FreeBSD.org
 #
-# $Id: Makefile,v 1.2 1996/08/02 08:36:40 asami Exp $
+# $Id: Makefile,v 1.3 1996/09/11 05:53:42 asami Exp $
 #
 
 DISTNAME=	gcc11
 PKGNAME=	gcc11-2.6.3
 CATEGORIES=	devel
 MASTER_SITES=	ftp://nyquist.ee.ualberta.ca/pub/motorola/68hc11/gcc/ \
-		ftp://archive.cis.ohio-state.edu/pub/gnu/mirror/ \
-		ftp://prep.ai.mit.edu/pub/gnu/
+		${MASTER_SITE_GNU}
 DISTFILES=	gcc-6811-fsf.tar.gz gcc-2.6.3.tar.gz
 
 MAINTAINER=	erich@FreeBSD.ORG
diff --git a/editors/emacs/Makefile b/editors/emacs/Makefile
index 69ae004bf139..9871d67c8344 100644
--- a/editors/emacs/Makefile
+++ b/editors/emacs/Makefile
@@ -3,12 +3,12 @@
 # Date created:		29 October 1994
 # Whom:			jkh
 #
-# $Id: Makefile,v 1.23 1996/11/11 05:07:06 obrien Exp $
+# $Id: Makefile,v 1.24 1996/11/17 07:01:27 obrien Exp $
 #
 
 DISTNAME=	emacs-19.34
 CATEGORIES=	editors
-MASTER_SITES=	ftp://prep.ai.mit.edu/pub/gnu/
+MASTER_SITES=	${MASTER_SITE_GNU}
 
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
diff --git a/editors/emacs19/Makefile b/editors/emacs19/Makefile
index 69ae004bf139..9871d67c8344 100644
--- a/editors/emacs19/Makefile
+++ b/editors/emacs19/Makefile
@@ -3,12 +3,12 @@
 # Date created:		29 October 1994
 # Whom:			jkh
 #
-# $Id: Makefile,v 1.23 1996/11/11 05:07:06 obrien Exp $
+# $Id: Makefile,v 1.24 1996/11/17 07:01:27 obrien Exp $
 #
 
 DISTNAME=	emacs-19.34
 CATEGORIES=	editors
-MASTER_SITES=	ftp://prep.ai.mit.edu/pub/gnu/
+MASTER_SITES=	${MASTER_SITE_GNU}
 
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
diff --git a/editors/emacs20/Makefile b/editors/emacs20/Makefile
index 69ae004bf139..9871d67c8344 100644
--- a/editors/emacs20/Makefile
+++ b/editors/emacs20/Makefile
@@ -3,12 +3,12 @@
 # Date created:		29 October 1994
 # Whom:			jkh
 #
-# $Id: Makefile,v 1.23 1996/11/11 05:07:06 obrien Exp $
+# $Id: Makefile,v 1.24 1996/11/17 07:01:27 obrien Exp $
 #
 
 DISTNAME=	emacs-19.34
 CATEGORIES=	editors
-MASTER_SITES=	ftp://prep.ai.mit.edu/pub/gnu/
+MASTER_SITES=	${MASTER_SITE_GNU}
 
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
diff --git a/editors/emacs22/Makefile b/editors/emacs22/Makefile
index 69ae004bf139..9871d67c8344 100644
--- a/editors/emacs22/Makefile
+++ b/editors/emacs22/Makefile
@@ -3,12 +3,12 @@
 # Date created:		29 October 1994
 # Whom:			jkh
 #
-# $Id: Makefile,v 1.23 1996/11/11 05:07:06 obrien Exp $
+# $Id: Makefile,v 1.24 1996/11/17 07:01:27 obrien Exp $
 #
 
 DISTNAME=	emacs-19.34
 CATEGORIES=	editors
-MASTER_SITES=	ftp://prep.ai.mit.edu/pub/gnu/
+MASTER_SITES=	${MASTER_SITE_GNU}
 
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
diff --git a/editors/emacs23/Makefile b/editors/emacs23/Makefile
index 69ae004bf139..9871d67c8344 100644
--- a/editors/emacs23/Makefile
+++ b/editors/emacs23/Makefile
@@ -3,12 +3,12 @@
 # Date created:		29 October 1994
 # Whom:			jkh
 #
-# $Id: Makefile,v 1.23 1996/11/11 05:07:06 obrien Exp $
+# $Id: Makefile,v 1.24 1996/11/17 07:01:27 obrien Exp $
 #
 
 DISTNAME=	emacs-19.34
 CATEGORIES=	editors
-MASTER_SITES=	ftp://prep.ai.mit.edu/pub/gnu/
+MASTER_SITES=	${MASTER_SITE_GNU}
 
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
diff --git a/emulators/mtools/Makefile b/emulators/mtools/Makefile
index ea0fe6d3a54d..60e4b6adcc95 100644
--- a/emulators/mtools/Makefile
+++ b/emulators/mtools/Makefile
@@ -3,12 +3,12 @@
 # Date created:         5 October 1994
 # Whom:                 jmz
 #
-# $Id: Makefile,v 1.9 1996/11/12 02:16:47 obrien Exp $
+# $Id: Makefile,v 1.10 1996/11/17 05:48:41 obrien Exp $
 #
 
 DISTNAME=	mtools-3.0
 CATEGORIES=	emulators
-MASTER_SITES=	ftp://prep.ai.mit.edu/pub/gnu/
+MASTER_SITES=	${MASTER_SITE_GNU}
 
 MAINTAINER=	jmz@FreeBSD.org
 
diff --git a/games/gnuchess/Makefile b/games/gnuchess/Makefile
index 097086e7e21a..b9a8d6d0ae96 100644
--- a/games/gnuchess/Makefile
+++ b/games/gnuchess/Makefile
@@ -3,13 +3,13 @@
 # Date created:		04 July 1996
 # Whom:			markm
 #
-# $Id: Makefile,v 1.1.1.1 1995/12/23 16:54:11 markm Exp $
+# $Id: Makefile,v 1.2 1996/07/10 02:36:38 asami Exp $
 #
 
 DISTNAME=	gnuchess-4.0.pl77
 PKGNAME=	gnuchess-4.0.77
-CATEGORIES+=	games
-MASTER_SITES=	ftp://prep.ai.mit.edu/pub/gnu/
+CATEGORIES=	games
+MASTER_SITES=	${MASTER_SITE_GNU}
 
 MAINTAINER=	markm@FreeBSD.ORG
 
diff --git a/games/nethack/Makefile b/games/nethack/Makefile
index 20dea62126f0..fec86ba28b26 100644
--- a/games/nethack/Makefile
+++ b/games/nethack/Makefile
@@ -3,13 +3,14 @@
 # Date created:		27 March 1995
 # Whom:			asami
 #
-# $Id: Makefile,v 1.7 1996/07/23 10:34:25 asami Exp $
+# $Id: Makefile,v 1.8 1996/08/30 08:29:55 asami Exp $
 #
 
 DISTNAME=	nethack-3.2.1
-CATEGORIES+=	games
-MASTER_SITES=	ftp://prep.ai.mit.edu/pub/gnu/ \
-	ftp://ftp.win.tue.nl/pub/games/nethack/General/Source/NH32/sources/
+CATEGORIES=	games
+MASTER_SITES=	\
+	ftp://ftp.win.tue.nl/pub/games/nethack/General/Source/NH32/sources/ \
+	${MASTER_SITE_GNU}
 
 MAINTAINER=	asami@FreeBSD.ORG
 
@@ -17,6 +18,7 @@ LIB_DEPENDS=	Xpm\\.4\\.:${PORTSDIR}/graphics/xpm
 
 USE_GMAKE=	yes
 SHELL=		/bin/sh
+MAN6=		dgn_comp.6 dlb.6 lev_comp.6 nethack.6 recover.6
 
 pre-configure:
 	@cd ${WRKSRC}/sys/unix; ${SHELL} setup.sh
@@ -24,11 +26,6 @@ pre-configure:
 post-install:
 	@cd ${WRKSRC}/doc; chmod 644 *.6
 	@cd ${WRKSRC}/doc; PREFIX=${PREFIX} ${MAKE} manpages
-.if !defined(NOMANCOMPRESS)
-	for file in dgn_comp dlb lev_comp nethack recover; do \
-	  gzip -9nf ${PREFIX}/man/man6/$$file.6; \
-	done
-.endif
 .if !defined(NOPORTDOCS)
 	mkdir -p ${PREFIX}/share/doc/nethack
 	cp ${WRKSRC}/doc/Guidebook.txt ${PREFIX}/share/doc/nethack
diff --git a/games/nethack3-tty/Makefile b/games/nethack3-tty/Makefile
index 20dea62126f0..fec86ba28b26 100644
--- a/games/nethack3-tty/Makefile
+++ b/games/nethack3-tty/Makefile
@@ -3,13 +3,14 @@
 # Date created:		27 March 1995
 # Whom:			asami
 #
-# $Id: Makefile,v 1.7 1996/07/23 10:34:25 asami Exp $
+# $Id: Makefile,v 1.8 1996/08/30 08:29:55 asami Exp $
 #
 
 DISTNAME=	nethack-3.2.1
-CATEGORIES+=	games
-MASTER_SITES=	ftp://prep.ai.mit.edu/pub/gnu/ \
-	ftp://ftp.win.tue.nl/pub/games/nethack/General/Source/NH32/sources/
+CATEGORIES=	games
+MASTER_SITES=	\
+	ftp://ftp.win.tue.nl/pub/games/nethack/General/Source/NH32/sources/ \
+	${MASTER_SITE_GNU}
 
 MAINTAINER=	asami@FreeBSD.ORG
 
@@ -17,6 +18,7 @@ LIB_DEPENDS=	Xpm\\.4\\.:${PORTSDIR}/graphics/xpm
 
 USE_GMAKE=	yes
 SHELL=		/bin/sh
+MAN6=		dgn_comp.6 dlb.6 lev_comp.6 nethack.6 recover.6
 
 pre-configure:
 	@cd ${WRKSRC}/sys/unix; ${SHELL} setup.sh
@@ -24,11 +26,6 @@ pre-configure:
 post-install:
 	@cd ${WRKSRC}/doc; chmod 644 *.6
 	@cd ${WRKSRC}/doc; PREFIX=${PREFIX} ${MAKE} manpages
-.if !defined(NOMANCOMPRESS)
-	for file in dgn_comp dlb lev_comp nethack recover; do \
-	  gzip -9nf ${PREFIX}/man/man6/$$file.6; \
-	done
-.endif
 .if !defined(NOPORTDOCS)
 	mkdir -p ${PREFIX}/share/doc/nethack
 	cp ${WRKSRC}/doc/Guidebook.txt ${PREFIX}/share/doc/nethack
diff --git a/games/nethack3/Makefile b/games/nethack3/Makefile
index 20dea62126f0..fec86ba28b26 100644
--- a/games/nethack3/Makefile
+++ b/games/nethack3/Makefile
@@ -3,13 +3,14 @@
 # Date created:		27 March 1995
 # Whom:			asami
 #
-# $Id: Makefile,v 1.7 1996/07/23 10:34:25 asami Exp $
+# $Id: Makefile,v 1.8 1996/08/30 08:29:55 asami Exp $
 #
 
 DISTNAME=	nethack-3.2.1
-CATEGORIES+=	games
-MASTER_SITES=	ftp://prep.ai.mit.edu/pub/gnu/ \
-	ftp://ftp.win.tue.nl/pub/games/nethack/General/Source/NH32/sources/
+CATEGORIES=	games
+MASTER_SITES=	\
+	ftp://ftp.win.tue.nl/pub/games/nethack/General/Source/NH32/sources/ \
+	${MASTER_SITE_GNU}
 
 MAINTAINER=	asami@FreeBSD.ORG
 
@@ -17,6 +18,7 @@ LIB_DEPENDS=	Xpm\\.4\\.:${PORTSDIR}/graphics/xpm
 
 USE_GMAKE=	yes
 SHELL=		/bin/sh
+MAN6=		dgn_comp.6 dlb.6 lev_comp.6 nethack.6 recover.6
 
 pre-configure:
 	@cd ${WRKSRC}/sys/unix; ${SHELL} setup.sh
@@ -24,11 +26,6 @@ pre-configure:
 post-install:
 	@cd ${WRKSRC}/doc; chmod 644 *.6
 	@cd ${WRKSRC}/doc; PREFIX=${PREFIX} ${MAKE} manpages
-.if !defined(NOMANCOMPRESS)
-	for file in dgn_comp dlb lev_comp nethack recover; do \
-	  gzip -9nf ${PREFIX}/man/man6/$$file.6; \
-	done
-.endif
 .if !defined(NOPORTDOCS)
 	mkdir -p ${PREFIX}/share/doc/nethack
 	cp ${WRKSRC}/doc/Guidebook.txt ${PREFIX}/share/doc/nethack
diff --git a/games/nethack32/Makefile b/games/nethack32/Makefile
index 20dea62126f0..fec86ba28b26 100644
--- a/games/nethack32/Makefile
+++ b/games/nethack32/Makefile
@@ -3,13 +3,14 @@
 # Date created:		27 March 1995
 # Whom:			asami
 #
-# $Id: Makefile,v 1.7 1996/07/23 10:34:25 asami Exp $
+# $Id: Makefile,v 1.8 1996/08/30 08:29:55 asami Exp $
 #
 
 DISTNAME=	nethack-3.2.1
-CATEGORIES+=	games
-MASTER_SITES=	ftp://prep.ai.mit.edu/pub/gnu/ \
-	ftp://ftp.win.tue.nl/pub/games/nethack/General/Source/NH32/sources/
+CATEGORIES=	games
+MASTER_SITES=	\
+	ftp://ftp.win.tue.nl/pub/games/nethack/General/Source/NH32/sources/ \
+	${MASTER_SITE_GNU}
 
 MAINTAINER=	asami@FreeBSD.ORG
 
@@ -17,6 +18,7 @@ LIB_DEPENDS=	Xpm\\.4\\.:${PORTSDIR}/graphics/xpm
 
 USE_GMAKE=	yes
 SHELL=		/bin/sh
+MAN6=		dgn_comp.6 dlb.6 lev_comp.6 nethack.6 recover.6
 
 pre-configure:
 	@cd ${WRKSRC}/sys/unix; ${SHELL} setup.sh
@@ -24,11 +26,6 @@ pre-configure:
 post-install:
 	@cd ${WRKSRC}/doc; chmod 644 *.6
 	@cd ${WRKSRC}/doc; PREFIX=${PREFIX} ${MAKE} manpages
-.if !defined(NOMANCOMPRESS)
-	for file in dgn_comp dlb lev_comp nethack recover; do \
-	  gzip -9nf ${PREFIX}/man/man6/$$file.6; \
-	done
-.endif
 .if !defined(NOPORTDOCS)
 	mkdir -p ${PREFIX}/share/doc/nethack
 	cp ${WRKSRC}/doc/Guidebook.txt ${PREFIX}/share/doc/nethack
diff --git a/games/nethack33-nox11/Makefile b/games/nethack33-nox11/Makefile
index 20dea62126f0..fec86ba28b26 100644
--- a/games/nethack33-nox11/Makefile
+++ b/games/nethack33-nox11/Makefile
@@ -3,13 +3,14 @@
 # Date created:		27 March 1995
 # Whom:			asami
 #
-# $Id: Makefile,v 1.7 1996/07/23 10:34:25 asami Exp $
+# $Id: Makefile,v 1.8 1996/08/30 08:29:55 asami Exp $
 #
 
 DISTNAME=	nethack-3.2.1
-CATEGORIES+=	games
-MASTER_SITES=	ftp://prep.ai.mit.edu/pub/gnu/ \
-	ftp://ftp.win.tue.nl/pub/games/nethack/General/Source/NH32/sources/
+CATEGORIES=	games
+MASTER_SITES=	\
+	ftp://ftp.win.tue.nl/pub/games/nethack/General/Source/NH32/sources/ \
+	${MASTER_SITE_GNU}
 
 MAINTAINER=	asami@FreeBSD.ORG
 
@@ -17,6 +18,7 @@ LIB_DEPENDS=	Xpm\\.4\\.:${PORTSDIR}/graphics/xpm
 
 USE_GMAKE=	yes
 SHELL=		/bin/sh
+MAN6=		dgn_comp.6 dlb.6 lev_comp.6 nethack.6 recover.6
 
 pre-configure:
 	@cd ${WRKSRC}/sys/unix; ${SHELL} setup.sh
@@ -24,11 +26,6 @@ pre-configure:
 post-install:
 	@cd ${WRKSRC}/doc; chmod 644 *.6
 	@cd ${WRKSRC}/doc; PREFIX=${PREFIX} ${MAKE} manpages
-.if !defined(NOMANCOMPRESS)
-	for file in dgn_comp dlb lev_comp nethack recover; do \
-	  gzip -9nf ${PREFIX}/man/man6/$$file.6; \
-	done
-.endif
 .if !defined(NOPORTDOCS)
 	mkdir -p ${PREFIX}/share/doc/nethack
 	cp ${WRKSRC}/doc/Guidebook.txt ${PREFIX}/share/doc/nethack
diff --git a/games/nethack33/Makefile b/games/nethack33/Makefile
index 20dea62126f0..fec86ba28b26 100644
--- a/games/nethack33/Makefile
+++ b/games/nethack33/Makefile
@@ -3,13 +3,14 @@
 # Date created:		27 March 1995
 # Whom:			asami
 #
-# $Id: Makefile,v 1.7 1996/07/23 10:34:25 asami Exp $
+# $Id: Makefile,v 1.8 1996/08/30 08:29:55 asami Exp $
 #
 
 DISTNAME=	nethack-3.2.1
-CATEGORIES+=	games
-MASTER_SITES=	ftp://prep.ai.mit.edu/pub/gnu/ \
-	ftp://ftp.win.tue.nl/pub/games/nethack/General/Source/NH32/sources/
+CATEGORIES=	games
+MASTER_SITES=	\
+	ftp://ftp.win.tue.nl/pub/games/nethack/General/Source/NH32/sources/ \
+	${MASTER_SITE_GNU}
 
 MAINTAINER=	asami@FreeBSD.ORG
 
@@ -17,6 +18,7 @@ LIB_DEPENDS=	Xpm\\.4\\.:${PORTSDIR}/graphics/xpm
 
 USE_GMAKE=	yes
 SHELL=		/bin/sh
+MAN6=		dgn_comp.6 dlb.6 lev_comp.6 nethack.6 recover.6
 
 pre-configure:
 	@cd ${WRKSRC}/sys/unix; ${SHELL} setup.sh
@@ -24,11 +26,6 @@ pre-configure:
 post-install:
 	@cd ${WRKSRC}/doc; chmod 644 *.6
 	@cd ${WRKSRC}/doc; PREFIX=${PREFIX} ${MAKE} manpages
-.if !defined(NOMANCOMPRESS)
-	for file in dgn_comp dlb lev_comp nethack recover; do \
-	  gzip -9nf ${PREFIX}/man/man6/$$file.6; \
-	done
-.endif
 .if !defined(NOPORTDOCS)
 	mkdir -p ${PREFIX}/share/doc/nethack
 	cp ${WRKSRC}/doc/Guidebook.txt ${PREFIX}/share/doc/nethack
diff --git a/games/nethack34-nox11/Makefile b/games/nethack34-nox11/Makefile
index 20dea62126f0..fec86ba28b26 100644
--- a/games/nethack34-nox11/Makefile
+++ b/games/nethack34-nox11/Makefile
@@ -3,13 +3,14 @@
 # Date created:		27 March 1995
 # Whom:			asami
 #
-# $Id: Makefile,v 1.7 1996/07/23 10:34:25 asami Exp $
+# $Id: Makefile,v 1.8 1996/08/30 08:29:55 asami Exp $
 #
 
 DISTNAME=	nethack-3.2.1
-CATEGORIES+=	games
-MASTER_SITES=	ftp://prep.ai.mit.edu/pub/gnu/ \
-	ftp://ftp.win.tue.nl/pub/games/nethack/General/Source/NH32/sources/
+CATEGORIES=	games
+MASTER_SITES=	\
+	ftp://ftp.win.tue.nl/pub/games/nethack/General/Source/NH32/sources/ \
+	${MASTER_SITE_GNU}
 
 MAINTAINER=	asami@FreeBSD.ORG
 
@@ -17,6 +18,7 @@ LIB_DEPENDS=	Xpm\\.4\\.:${PORTSDIR}/graphics/xpm
 
 USE_GMAKE=	yes
 SHELL=		/bin/sh
+MAN6=		dgn_comp.6 dlb.6 lev_comp.6 nethack.6 recover.6
 
 pre-configure:
 	@cd ${WRKSRC}/sys/unix; ${SHELL} setup.sh
@@ -24,11 +26,6 @@ pre-configure:
 post-install:
 	@cd ${WRKSRC}/doc; chmod 644 *.6
 	@cd ${WRKSRC}/doc; PREFIX=${PREFIX} ${MAKE} manpages
-.if !defined(NOMANCOMPRESS)
-	for file in dgn_comp dlb lev_comp nethack recover; do \
-	  gzip -9nf ${PREFIX}/man/man6/$$file.6; \
-	done
-.endif
 .if !defined(NOPORTDOCS)
 	mkdir -p ${PREFIX}/share/doc/nethack
 	cp ${WRKSRC}/doc/Guidebook.txt ${PREFIX}/share/doc/nethack
diff --git a/games/nethack34/Makefile b/games/nethack34/Makefile
index 20dea62126f0..fec86ba28b26 100644
--- a/games/nethack34/Makefile
+++ b/games/nethack34/Makefile
@@ -3,13 +3,14 @@
 # Date created:		27 March 1995
 # Whom:			asami
 #
-# $Id: Makefile,v 1.7 1996/07/23 10:34:25 asami Exp $
+# $Id: Makefile,v 1.8 1996/08/30 08:29:55 asami Exp $
 #
 
 DISTNAME=	nethack-3.2.1
-CATEGORIES+=	games
-MASTER_SITES=	ftp://prep.ai.mit.edu/pub/gnu/ \
-	ftp://ftp.win.tue.nl/pub/games/nethack/General/Source/NH32/sources/
+CATEGORIES=	games
+MASTER_SITES=	\
+	ftp://ftp.win.tue.nl/pub/games/nethack/General/Source/NH32/sources/ \
+	${MASTER_SITE_GNU}
 
 MAINTAINER=	asami@FreeBSD.ORG
 
@@ -17,6 +18,7 @@ LIB_DEPENDS=	Xpm\\.4\\.:${PORTSDIR}/graphics/xpm
 
 USE_GMAKE=	yes
 SHELL=		/bin/sh
+MAN6=		dgn_comp.6 dlb.6 lev_comp.6 nethack.6 recover.6
 
 pre-configure:
 	@cd ${WRKSRC}/sys/unix; ${SHELL} setup.sh
@@ -24,11 +26,6 @@ pre-configure:
 post-install:
 	@cd ${WRKSRC}/doc; chmod 644 *.6
 	@cd ${WRKSRC}/doc; PREFIX=${PREFIX} ${MAKE} manpages
-.if !defined(NOMANCOMPRESS)
-	for file in dgn_comp dlb lev_comp nethack recover; do \
-	  gzip -9nf ${PREFIX}/man/man6/$$file.6; \
-	done
-.endif
 .if !defined(NOPORTDOCS)
 	mkdir -p ${PREFIX}/share/doc/nethack
 	cp ${WRKSRC}/doc/Guidebook.txt ${PREFIX}/share/doc/nethack
diff --git a/games/xboard/Makefile b/games/xboard/Makefile
index 7c2649c34610..9a8151929e7e 100644
--- a/games/xboard/Makefile
+++ b/games/xboard/Makefile
@@ -3,17 +3,17 @@
 # Date created:         2 Jan 1995
 # Whom:                 swallace
 #
-# $Id: Makefile,v 1.5 1996/03/30 17:05:46 markm Exp $
+# $Id: Makefile,v 1.6 1996/07/12 11:07:20 asami Exp $
 #
 
 DISTNAME=       xboard-3.4.pl1
 PKGNAME=	xboard-3.4.1
-CATEGORIES+=	games
-MASTER_SITES=	ftp://prep.ai.mit.edu/pub/gnu/
+CATEGORIES=	games
+MASTER_SITES=	${MASTER_SITE_GNU}
 
 MAINTAINER=	markm@FreeBSD.ORG
 
-BUILD_DEPENDS+= autoconf:${PORTSDIR}/devel/autoconf
+BUILD_DEPENDS=  autoconf:${PORTSDIR}/devel/autoconf
 
 HAS_CONFIGURE=  yes
 CONFIGURE_ARGS= --prefix=${PREFIX}
diff --git a/japanese/gawk/Makefile b/japanese/gawk/Makefile
index 5a6731aadc5f..a671447a5fb7 100644
--- a/japanese/gawk/Makefile
+++ b/japanese/gawk/Makefile
@@ -3,13 +3,13 @@
 # Date created:		5 April 1995
 # Whom:			Nobuhiro Yasutomi <nobu@psrc.isac.co.jp>
 #
-# $Id: Makefile,v 1.7 1996/06/26 22:13:52 gpalmer Exp $
+# $Id: Makefile,v 1.8 1996/11/11 10:11:53 max Exp $
 #
 
 DISTNAME=	gawk-2.15.6
 PKGNAME=	jp-gawk-2.15.6
 CATEGORIES=	japanese
-MASTER_SITES=	ftp://gatekeeper.dec.com/pub/GNU/
+MASTER_SITES=	${MASTER_SITE_GNU}
 
 MAINTAINER=	asami@FreeBSD.ORG
 
diff --git a/japanese/grep/Makefile b/japanese/grep/Makefile
index bae826c31008..e85a6f39a700 100644
--- a/japanese/grep/Makefile
+++ b/japanese/grep/Makefile
@@ -3,13 +3,13 @@
 # Date created:		2 April 1995
 # Whom:			Nobuhiro Yasutomi <nobu@psrc.isac.co.jp>
 #
-# $Id: Makefile,v 1.3 1995/04/09 09:24:21 asami Exp $
+# $Id: Makefile,v 1.4 1996/11/11 10:11:56 max Exp $
 #
 
 DISTNAME=	grep-2.0
 PKGNAME=	jp-grep-2.0
 CATEGORIES=	japanese
-MASTER_SITES=	ftp://ftp.uu.net/systems/gnu/
+MASTER_SITES=	${MASTER_SITE_GNU}
 
 MAINTAINER=	asami@FreeBSD.ORG
 
diff --git a/japanese/groff/Makefile b/japanese/groff/Makefile
index 4ff26a037fd4..7f4f4c0f0351 100644
--- a/japanese/groff/Makefile
+++ b/japanese/groff/Makefile
@@ -3,14 +3,13 @@
 # Date created:		14 April 1995
 # Whom:			Nobuhiro Yasutomi <nobu@psrc.isac.co.jp>
 #
-# $Id$
+# $Id: Makefile,v 1.6 1996/03/31 23:25:11 asami Exp $
 #
 
 DISTNAME=	groff-1.10
 PKGNAME=	jp-groff-0.99
 CATEGORIES=	japanese print
-MASTER_SITES=	ftp://ftp.ae.keio.ac.jp/pub/GNU/ \
-		ftp://prep.ai.mit.edu/pub/gnu/
+MASTER_SITES=	${MASTER_SITE_GNU}
 
 MAINTAINER=	graphite@taurus.bekkoame.or.jp
 
diff --git a/japanese/gxditview/Makefile b/japanese/gxditview/Makefile
index 8e3c20f5fb76..87fa82793ef9 100644
--- a/japanese/gxditview/Makefile
+++ b/japanese/gxditview/Makefile
@@ -3,13 +3,13 @@
 # Date created:		14 April 1995
 # Whom:			Nobuhiro Yasutomi <nobu@psrc.isac.co.jp>
 #
-# $Id: Makefile,v 1.4 1995/11/22 13:06:27 asami Exp $
+# $Id: Makefile,v 1.5 1996/06/26 22:20:07 gpalmer Exp $
 #
 
 DISTNAME=	groff-1.09
 PKGNAME=	jp-gxditview-0.98
 CATEGORIES=	japanese print
-MASTER_SITES=	ftp://prep.ai.mit.edu/pub/gnu/
+MASTER_SITES=	${MASTER_SITE_GNU}
 
 MAINTAINER=	asami@FreeBSD.ORG
 
diff --git a/japanese/less/Makefile b/japanese/less/Makefile
index 4f9054a26574..7614ec6cc99c 100644
--- a/japanese/less/Makefile
+++ b/japanese/less/Makefile
@@ -3,13 +3,13 @@
 # Date created:		7 March 1995
 # Whom:			Nobuhiro Yasutomi <nobu@psrc.isac.co.jp>
 #
-# $Id: Makefile,v 1.6 1995/04/19 11:04:34 asami Exp $
+# $Id: Makefile,v 1.7 1996/11/11 10:12:22 max Exp $
 #
 
 DISTNAME=	less-290
 PKGNAME=	jp-less-290
 CATEGORIES=	japanese
-MASTER_SITES=	ftp://ftp.aist-nara.ac.jp/pub/misc/less/
+MASTER_SITES=	${MASTER_SITE_GNU}
 
 PATCH_SITES=	ftp://ftp.aist-nara.ac.jp/pub/misc/less/
 PATCHFILES=	less-290-iso2.pl1.gz
diff --git a/japanese/nethack/Makefile b/japanese/nethack/Makefile
index 322501a96915..9d58e7a92ab1 100644
--- a/japanese/nethack/Makefile
+++ b/japanese/nethack/Makefile
@@ -3,13 +3,13 @@
 # Date created:		13 February 1995
 # Whom:			asami
 #
-# $Id: Makefile,v 1.11 1996/11/11 10:12:34 max Exp $
+# $Id: Makefile,v 1.12 1996/11/13 12:41:06 asami Exp $
 #
 
 DISTNAME=	nethack-3.2.1
 PKGNAME=	jp-nethack-1.0.5.3.1
 CATEGORIES=	japanese games
-MASTER_SITES=	ftp://prep.ai.mit.edu/pub/gnu/
+MASTER_SITES=	${MASTER_SITE_GNU}
 
 PATCH_SITES=	ftp://mitsuko.jaist.ac.jp/pub/jnethack/
 PATCHFILES=	jnethack-1.0.5.3-beta-960925.gz
diff --git a/japanese/nethack32/Makefile b/japanese/nethack32/Makefile
index 322501a96915..9d58e7a92ab1 100644
--- a/japanese/nethack32/Makefile
+++ b/japanese/nethack32/Makefile
@@ -3,13 +3,13 @@
 # Date created:		13 February 1995
 # Whom:			asami
 #
-# $Id: Makefile,v 1.11 1996/11/11 10:12:34 max Exp $
+# $Id: Makefile,v 1.12 1996/11/13 12:41:06 asami Exp $
 #
 
 DISTNAME=	nethack-3.2.1
 PKGNAME=	jp-nethack-1.0.5.3.1
 CATEGORIES=	japanese games
-MASTER_SITES=	ftp://prep.ai.mit.edu/pub/gnu/
+MASTER_SITES=	${MASTER_SITE_GNU}
 
 PATCH_SITES=	ftp://mitsuko.jaist.ac.jp/pub/jnethack/
 PATCHFILES=	jnethack-1.0.5.3-beta-960925.gz
diff --git a/japanese/nethack34/Makefile b/japanese/nethack34/Makefile
index 322501a96915..9d58e7a92ab1 100644
--- a/japanese/nethack34/Makefile
+++ b/japanese/nethack34/Makefile
@@ -3,13 +3,13 @@
 # Date created:		13 February 1995
 # Whom:			asami
 #
-# $Id: Makefile,v 1.11 1996/11/11 10:12:34 max Exp $
+# $Id: Makefile,v 1.12 1996/11/13 12:41:06 asami Exp $
 #
 
 DISTNAME=	nethack-3.2.1
 PKGNAME=	jp-nethack-1.0.5.3.1
 CATEGORIES=	japanese games
-MASTER_SITES=	ftp://prep.ai.mit.edu/pub/gnu/
+MASTER_SITES=	${MASTER_SITE_GNU}
 
 PATCH_SITES=	ftp://mitsuko.jaist.ac.jp/pub/jnethack/
 PATCHFILES=	jnethack-1.0.5.3-beta-960925.gz
diff --git a/japanese/sed/Makefile b/japanese/sed/Makefile
index ba22999e8eed..41de72c819e7 100644
--- a/japanese/sed/Makefile
+++ b/japanese/sed/Makefile
@@ -3,13 +3,13 @@
 # Date created:		2 April 1995
 # Whom:			Nobuhiro Yasutomi <nobu@psrc.isac.co.jp>
 #
-# $Id: Makefile,v 1.1.1.1 1995/04/04 09:37:51 asami Exp $
+# $Id: Makefile,v 1.2 1995/04/07 05:48:11 asami Exp $
 #
 
 DISTNAME=	sed-1.18
 PKGNAME=	jp-sed-1.18
 CATEGORIES=	japanese
-MASTER_SITES=	ftp://ftp.uu.net/systems/gnu/
+MASTER_SITES=	${MASTER_SITE_GNU}
 
 MAINTAINER=	asami@FreeBSD.ORG
 
diff --git a/japanese/vfghostscript/Makefile b/japanese/vfghostscript/Makefile
index 2396c017bf77..1b73e0c7735f 100644
--- a/japanese/vfghostscript/Makefile
+++ b/japanese/vfghostscript/Makefile
@@ -3,13 +3,14 @@
 # Date created:		14 May 1996
 # Whom:			Mita Yoshio <mita@jp.FreeBSD.org>
 #
-# $Id: Makefile,v 1.4 1996/11/11 10:13:03 max Exp $
+# $Id: Makefile,v 1.5 1996/11/13 12:41:13 asami Exp $
 #
 
 DISTNAME=	ghostscript2.6.2
 PKGNAME=	jp-vfghostscript-2.6.2
 CATEGORIES=	japanese print
-MASTER_SITES=	ftp://ftp.iis.u-tokyo.ac.jp/GNU/ \
+MASTER_SITES=	${MASTER_SITE_GNU} \
+		ftp://ftp.iis.u-tokyo.ac.jp/GNU/ \
 		ftp://ftp.ae.keio.ac.jp/pub/msdos/gnu/ghostscript/ \
 		ftp://i1nws2.fukui-u.ac.jp/pub/TeX/dvipr/ \
 		ftp://ftp.mei.co.jp/free/gnu/util/ghostscript/drivers/
diff --git a/lang/logo/Makefile b/lang/logo/Makefile
index d1e6976ff4a7..30c453499c76 100644
--- a/lang/logo/Makefile
+++ b/lang/logo/Makefile
@@ -1,14 +1,14 @@
 # New ports collection makefile for:	logo
-# Version required:	3.1
+# Version required:	3.3
 # Date created:		22 October 1994
 # Whom:			jkh
 #
-# $Id: Makefile,v 1.9 1995/11/22 13:12:54 asami Exp $
+# $Id: Makefile,v 1.10 1996/11/12 02:18:32 obrien Exp $
 #
 
 DISTNAME=	ucblogo-3.3
 CATEGORIES=	lang
-MASTER_SITES=	ftp://gatekeeper.dec.com/pub/GNU/
+MASTER_SITES=	${MASTER_SITE_GNU}
 
 MAINTAINER=	jmacd@FreeBSD.ORG
 
diff --git a/lang/smalltalk/Makefile b/lang/smalltalk/Makefile
index 384d5c06dbf6..b3810f8b0ebb 100644
--- a/lang/smalltalk/Makefile
+++ b/lang/smalltalk/Makefile
@@ -3,12 +3,12 @@
 # Date created:		09 Feb 1995
 # Whom:			gpalmer
 #
-# $Id: Makefile,v 1.9 1996/06/05 17:35:13 jraynard Exp $
+# $Id: Makefile,v 1.10 1996/11/12 02:19:10 obrien Exp $
 #
 
 DISTNAME=	smalltalk-1.1.1
 CATEGORIES=	lang
-MASTER_SITES=	ftp://prep.ai.mit.edu/pub/gnu/
+MASTER_SITES=	${MASTER_SITE_GNU}
 
 MAINTAINER=	jraynard@FreeBSD.ORG
 
diff --git a/math/gnuplot/Makefile b/math/gnuplot/Makefile
index 9e22739f27ae..b2b0b358864b 100644
--- a/math/gnuplot/Makefile
+++ b/math/gnuplot/Makefile
@@ -3,13 +3,14 @@
 # Date created:         6 October 1994
 # Whom:                 jmz
 #
-# $Id: Makefile,v 1.4 1995/04/22 11:30:11 asami Exp $
+# $Id: Makefile,v 1.5 1995/04/28 13:35:36 jkh Exp $
 #
 
 DISTNAME=	gnuplot
 PKGNAME=	gnuplot-3.5
-CATEGORIES+=	math graphics
-MASTER_SITES=	ftp://ftp.dartmouth.edu/pub/gnuplot/
+CATEGORIES=	math graphics
+MASTER_SITES=	ftp://ftp.dartmouth.edu/pub/gnuplot/ \
+		${MASTER_SITE_GNU}
 DISTFILES=	gnuplot3.5.tar.Z
 
 MAINTAINER=	jmz@FreeBSD.org
diff --git a/math/oleo/Makefile b/math/oleo/Makefile
index c8a337ab7fc7..78938e9c3e10 100644
--- a/math/oleo/Makefile
+++ b/math/oleo/Makefile
@@ -3,19 +3,17 @@
 # Date created:		3 September 1994
 # Whom:			mr
 #
-# $Id: Makefile,v 1.8 1996/08/10 13:14:51 chuckr Exp $
+# $Id: Makefile,v 1.9 1996/09/22 18:31:58 max Exp $
 #
 
 DISTNAME=	oleo-1.6
-CATEGORIES+=	math
-MASTER_SITES=	ftp://prep.ai.mit.edu/pub/gnu/
+CATEGORIES=	math
+MASTER_SITES=	${MASTER_SITE_GNU}
 
 HAS_CONFIGURE=yes
+MAN1=		oleo.1
 
 post-install:
 	$(INSTALL_MAN) $(FILESDIR)/oleo.1 $(PREFIX)/man/man1
-.if !defined(NOMANCOMPRESS)
-	gzip -9nf $(PREFIX)/man/man1/oleo.1
-.endif
 	
 .include <bsd.port.mk>
diff --git a/misc/dejagnu/Makefile b/misc/dejagnu/Makefile
index 5400235a9595..a57f7498fd7e 100644
--- a/misc/dejagnu/Makefile
+++ b/misc/dejagnu/Makefile
@@ -3,12 +3,12 @@
 # Date created:		12 October 1996
 # Whom:			markm
 #
-# $Id: Makefile,v 1.3 1996/11/11 05:49:24 obrien Exp $
+# $Id: Makefile,v 1.4 1996/11/17 09:05:37 obrien Exp $
 #
 
 DISTNAME=	dejagnu-1.3
 CATEGORIES=	misc
-MASTER_SITES=	ftp://prep.ai.mit.edu/pub/gnu/
+MASTER_SITES=	${MASTER_SITE_GNU}
 
 MAINTAINER=	markm@FreeBSD.ORG
 
diff --git a/misc/git/Makefile b/misc/git/Makefile
index 6ccf342e01a9..e4af273ebfc4 100644
--- a/misc/git/Makefile
+++ b/misc/git/Makefile
@@ -3,12 +3,12 @@
 # Date created:		12 Jul 1995
 # Whom:			torstenb@FreeBSD.ORG
 #
-# $Id: Makefile,v 1.5 1996/11/11 05:49:35 obrien Exp $
+# $Id: Makefile,v 1.6 1996/11/17 09:05:46 obrien Exp $
 #
 
 DISTNAME=	git-4.3.11
 CATEGORIES=	misc
-MASTER_SITES=	ftp://prep.ai.mit.edu/pub/gnu/
+MASTER_SITES=	${MASTER_SITE_GNU}
 
 GNU_CONFIGURE=	YES
 MAN1=		git.1 gitmount.1 gitcmp.1 gitkeys.1 gitredir.1 gitrgrep.1 \
diff --git a/misc/gnuit/Makefile b/misc/gnuit/Makefile
index 6ccf342e01a9..e4af273ebfc4 100644
--- a/misc/gnuit/Makefile
+++ b/misc/gnuit/Makefile
@@ -3,12 +3,12 @@
 # Date created:		12 Jul 1995
 # Whom:			torstenb@FreeBSD.ORG
 #
-# $Id: Makefile,v 1.5 1996/11/11 05:49:35 obrien Exp $
+# $Id: Makefile,v 1.6 1996/11/17 09:05:46 obrien Exp $
 #
 
 DISTNAME=	git-4.3.11
 CATEGORIES=	misc
-MASTER_SITES=	ftp://prep.ai.mit.edu/pub/gnu/
+MASTER_SITES=	${MASTER_SITE_GNU}
 
 GNU_CONFIGURE=	YES
 MAN1=		git.1 gitmount.1 gitcmp.1 gitkeys.1 gitredir.1 gitrgrep.1 \
diff --git a/misc/gnuls/Makefile b/misc/gnuls/Makefile
index 759abb2332f8..fecc627d3900 100644
--- a/misc/gnuls/Makefile
+++ b/misc/gnuls/Makefile
@@ -3,14 +3,13 @@
 # Date created:				06 January 1996
 # Whom:					bmc@WillsCreek.COM
 #
-# $Id: Makefile,v 1.2 1996/11/11 05:49:44 obrien Exp $
+# $Id: Makefile,v 1.3 1996/11/17 09:06:05 obrien Exp $
 #
 
 DISTNAME=	fileutils-3.12
 PKGNAME=	linuxls-3.12.0.2
 CATEGORIES=	misc
-MASTER_SITES=	ftp://prep.ai.mit.edu/pub/gnu/ \
-		ftp://ftp.cdrom.com/pub/linux/slackware_source/a/bin/
+MASTER_SITES=	${MASTER_SITE_GNU}
 
 PATCHFILES=	color-ls-3.12.0.2.patch.gz
 PATCH_SITES=	ftp://sunsite.unc.edu/pub/Linux/distributions/slackware/source/a/bin/ \
diff --git a/misc/less/Makefile b/misc/less/Makefile
index 338626b2b767..d0e2b2481a27 100644
--- a/misc/less/Makefile
+++ b/misc/less/Makefile
@@ -3,12 +3,12 @@
 # Date created:         8 Nov 1994
 # Whom:                 ache
 #
-# $Id: Makefile,v 1.12 1996/11/11 05:49:42 obrien Exp $
+# $Id: Makefile,v 1.13 1996/11/17 09:06:02 obrien Exp $
 #
 
 DISTNAME=       less-321
 CATEGORIES=	misc
-MASTER_SITES=   ftp://prep.ai.mit.edu/pub/gnu/ ftp://ftp.uu.net/systems/gnu/
+MASTER_SITES=   ${MASTER_SITE_GNU}
 
 MAINTAINER=	ache@FreeBSD.ORG
 
diff --git a/misc/mc/Makefile b/misc/mc/Makefile
index 4b90492243ba..e1404f4a39c4 100644
--- a/misc/mc/Makefile
+++ b/misc/mc/Makefile
@@ -3,12 +3,12 @@
 # Date created:		15 Jul 1995
 # Whom:			torstenb@FreeBSD.ORG
 #
-# $Id: Makefile,v 1.7 1996/11/11 05:49:48 obrien Exp $
+# $Id: Makefile,v 1.8 1996/11/17 09:06:08 obrien Exp $
 #
 
 DISTNAME=	mc-3.2.1
 CATEGORIES=	misc
-MASTER_SITES=	ftp://prep.ai.mit.edu/pub/gnu/
+MASTER_SITES=	${MASTER_SITE_GNU}
 
 MAINTAINER=	torstenb@FreeBSD.ORG
 
diff --git a/net/gnu-finger/Makefile b/net/gnu-finger/Makefile
index 6a1a85945b8a..d767fc1f9e38 100644
--- a/net/gnu-finger/Makefile
+++ b/net/gnu-finger/Makefile
@@ -3,14 +3,13 @@
 # Date created:         20 June 1996
 # Whom:                 Yoshiro MIHIRA <sanpei@yy.cs.keio.ac.jp>
 #
-# $Id: Makefile,v 1.2 1996/07/11 17:51:35 andreas Exp $
+# $Id: Makefile,v 1.3 1996/07/12 11:01:27 asami Exp $
 #
 
 DISTNAME=       finger-1.37
 PKGNAME=        gnu-finger-1.37
 CATEGORIES=     net
-MASTER_SITES=   ftp://gatekeeper.dec.com/pub/GNU/ \
-		ftp://ftp.cc.keio.ac.jp/pub/mirror/GNU/
+MASTER_SITES=   ${MASTER_SITE_GNU}
 
 MAINTAINER=     sanpei@yy.cs.keio.ac.jp
 
diff --git a/print/ghostview/Makefile b/print/ghostview/Makefile
index 872b83864a6e..a382ce53c293 100644
--- a/print/ghostview/Makefile
+++ b/print/ghostview/Makefile
@@ -3,12 +3,12 @@
 # Date created:		21 October 1994
 # Whom:			jkh
 #
-# $Id: Makefile,v 1.6 1996/04/18 07:58:21 tg Exp $
+# $Id: Makefile,v 1.7 1996/11/17 08:44:40 obrien Exp $
 #
 
 DISTNAME=	ghostview-1.5
 CATEGORIES=	print
-MASTER_SITES=	ftp://prep.ai.mit.edu/pub/gnu/
+MASTER_SITES=	${MASTER_SITE_GNU}
 
 MAINTAINER=	ports@FreeBSD.org
 
diff --git a/sysutils/less/Makefile b/sysutils/less/Makefile
index 338626b2b767..d0e2b2481a27 100644
--- a/sysutils/less/Makefile
+++ b/sysutils/less/Makefile
@@ -3,12 +3,12 @@
 # Date created:         8 Nov 1994
 # Whom:                 ache
 #
-# $Id: Makefile,v 1.12 1996/11/11 05:49:42 obrien Exp $
+# $Id: Makefile,v 1.13 1996/11/17 09:06:02 obrien Exp $
 #
 
 DISTNAME=       less-321
 CATEGORIES=	misc
-MASTER_SITES=   ftp://prep.ai.mit.edu/pub/gnu/ ftp://ftp.uu.net/systems/gnu/
+MASTER_SITES=   ${MASTER_SITE_GNU}
 
 MAINTAINER=	ache@FreeBSD.ORG