Catch up with MASTER_SITE_GNU reorganization.

20 files changed, 40 insertions, 42 deletions

diff --git a/archivers/gcpio/Makefile b/archivers/gcpio/Makefile
index ed712bd5046..6c451f6aeb7 100644
--- a/archivers/gcpio/Makefile
+++ b/archivers/gcpio/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.8 1998/08/20 15:16:35 tsarna Exp $
+# $NetBSD: Makefile,v 1.9 1999/03/22 16:08:30 bad Exp $
 #
 
 DISTNAME=       cpio-2.4.2
 PKGNAME=	gcpio-2.4.2
 CATEGORIES=	archivers
-MASTER_SITES=   ${MASTER_SITE_GNU}
+MASTER_SITES=   ${MASTER_SITE_GNU:=/cpio/}
 
 MAINTAINER=	packages@netbsd.org
 HOMEPAGE=	http://www.gnu.org/software/cpio/cpio.html
diff --git a/archivers/gtar/Makefile b/archivers/gtar/Makefile
index 457fa189f61..ad09e18a7d3 100644
--- a/archivers/gtar/Makefile
+++ b/archivers/gtar/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.9 1998/08/20 15:16:35 tsarna Exp $
+# $NetBSD: Makefile,v 1.10 1999/03/22 16:08:31 bad Exp $
 #
 
 DISTNAME=       tar-1.12
 PKGNAME=	gtar-1.12
 CATEGORIES=	archivers
-MASTER_SITES=   ${MASTER_SITE_GNU}
+MASTER_SITES=   ${MASTER_SITE_GNU:=/tar/}
 
 MAINTAINER=	packages@netbsd.org
 HOMEPAGE=	http://www.gnu.org/software/tar/tar.html
diff --git a/converters/recode/Makefile b/converters/recode/Makefile
index f9016daa983..da768f36e42 100644
--- a/converters/recode/Makefile
+++ b/converters/recode/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.2 1999/01/25 15:25:23 kleink Exp $
+# $NetBSD: Makefile,v 1.3 1999/03/22 16:08:31 bad Exp $
 #
 
 DISTNAME=		recode-3.4
 CATEGORIES=		converters
-MASTER_SITES=		${MASTER_SITE_GNU}
-MASTER_SITE_SUBDIR=	recode
+MASTER_SITES=		${MASTER_SITE_GNU:=/recode/}
 
 MAINTAINER=		kleink@netbsd.org
 
diff --git a/databases/gdbm/Makefile b/databases/gdbm/Makefile
index 305bbbc33c8..3467e8483c8 100644
--- a/databases/gdbm/Makefile
+++ b/databases/gdbm/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.13 1999/03/08 10:53:56 agc Exp $
+# $NetBSD: Makefile,v 1.14 1999/03/22 16:08:31 bad Exp $
 # FreeBSD Id: Makefile,v 1.4 1997/01/28 08:11:23 asami Exp 
 #
 
 DISTNAME=	gdbm-1.7.3
 CATEGORIES=	databases
-MASTER_SITES=	${MASTER_SITE_GNU}
+MASTER_SITES=	${MASTER_SITE_GNU:=/gdbm/}
 
 MAINTAINER=	packages@netbsd.org
 HOMEPAGE=	http://www.gnu.org/software/gdbm/gdbm.html
diff --git a/devel/gindent/Makefile b/devel/gindent/Makefile
index febaf902045..519c1a385ea 100644
--- a/devel/gindent/Makefile
+++ b/devel/gindent/Makefile
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.13 1998/09/04 21:56:41 agc Exp $
+# $NetBSD: Makefile,v 1.14 1999/03/22 16:08:31 bad Exp $
 # FreeBSD Id: Makefile,v 1.1.1.1 1997/08/29 09:20:00 obrien Exp
 #
 
 DISTNAME=	indent-1.9.1
 PKGNAME=	gindent-1.9.1
 CATEGORIES=	devel
-MASTER_SITES=	${MASTER_SITE_GNU}
+MASTER_SITES=	${MASTER_SITE_GNU:=/indent/}
 
 MAINTAINER=	kchowksey@hss.hns.com
 HOMEPAGE=	http://www.gnu.org/software/indent/indent.html
diff --git a/devel/gperf/Makefile b/devel/gperf/Makefile
index f3efe5ab2b5..8627de6bab4 100644
--- a/devel/gperf/Makefile
+++ b/devel/gperf/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.2 1998/06/22 11:27:49 agc Exp $
+# $NetBSD: Makefile,v 1.3 1999/03/22 16:08:31 bad Exp $
 #
 
 DISTNAME=	gperf-2.7
 CATEGORIES=	devel
-MASTER_SITES=	${MASTER_SITE_GNU}
+MASTER_SITES=	${MASTER_SITE_GNU:=/gperf/}
 
 MAINTAINER=	tv@netbsd.org
 
diff --git a/devel/id-utils/Makefile b/devel/id-utils/Makefile
index 56de90f03ab..4a1352bdd89 100644
--- a/devel/id-utils/Makefile
+++ b/devel/id-utils/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.8 1998/10/01 21:03:33 garbled Exp $
+# $NetBSD: Makefile,v 1.9 1999/03/22 16:08:31 bad Exp $
 # FreeBSD Id: Makefile,v 1.4 1996/11/18 10:22:47 asami Exp
 #
 
 DISTNAME=	id-utils-3.2
 CATEGORIES=	devel
-MASTER_SITES=	${MASTER_SITE_GNU}
+MASTER_SITES=	${MASTER_SITE_GNU:=/id-utils/}
 
 MAINTAINER=	packages@netbsd.org
 HOMEPAGE=	http://www.gnu.org/software/idutils/idutils.html
diff --git a/devel/libg++/Makefile b/devel/libg++/Makefile
index 93d8450c10e..f46e012c3f5 100644
--- a/devel/libg++/Makefile
+++ b/devel/libg++/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.8 1998/11/12 23:03:40 frueauf Exp $
+# $NetBSD: Makefile,v 1.9 1999/03/22 16:08:32 bad Exp $
 #
 
 DISTNAME=	libg++-${GXXVERSION}
 CATEGORIES=	devel
-MASTER_SITES=	${MASTER_SITE_GNU}
+MASTER_SITES=	${MASTER_SITE_GNU:=/libg++/}
 
 MAINTAINER=	tv@netbsd.org
 
diff --git a/devel/libtool/Makefile b/devel/libtool/Makefile
index d0753ccd2ad..be670004b8e 100644
--- a/devel/libtool/Makefile
+++ b/devel/libtool/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 1999/02/20 22:48:27 hubertf Exp $
+# $NetBSD: Makefile,v 1.7 1999/03/22 16:08:32 bad Exp $
 #
 
 DISTNAME=	libtool-1.2
@@ -6,7 +6,7 @@ DISTNAME=	libtool-1.2
 # libtool from pkg-customized libtool, the latter under the "libtool-1.2" name
 PKGNAME=	glibtool-1.2
 CATEGORIES=	devel
-MASTER_SITES=	${MASTER_SITE_GNU}
+MASTER_SITES=	${MASTER_SITE_GNU:=/libtool/}
 
 MAINTAINER=	tv@netbsd.org
 HOMEPAGE=	http://www.profitpress.com/libtool/
diff --git a/devel/m4/Makefile b/devel/m4/Makefile
index b66b0fac8a1..8b8061771d7 100644
--- a/devel/m4/Makefile
+++ b/devel/m4/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.9 1998/04/22 11:05:03 agc Exp $
+# $NetBSD: Makefile,v 1.10 1999/03/22 16:08:32 bad Exp $
 # FreeBSD Id: Makefile,v 1.7 1997/06/16 08:22:35 max Exp
 #
 
 DISTNAME=       m4-1.4
 CATEGORIES=	devel
-MASTER_SITES=   ${MASTER_SITE_GNU}
+MASTER_SITES=   ${MASTER_SITE_GNU:=/m4/}
 
 MAINTAINER=	packages@netbsd.org
 
diff --git a/devel/readline/Makefile b/devel/readline/Makefile
index e886a57d3f6..60eaa8f5329 100644
--- a/devel/readline/Makefile
+++ b/devel/readline/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.10 1999/03/08 10:53:56 agc Exp $
+# $NetBSD: Makefile,v 1.11 1999/03/22 16:08:32 bad Exp $
 #
 
 DISTNAME=	readline-2.2
 CATEGORIES=	devel
-MASTER_SITES=	${MASTER_SITE_GNU}
+MASTER_SITES=	${MASTER_SITE_GNU:=/readline/}
 
 MAINTAINER=	packages@netbsd.org
 
diff --git a/editors/emacs/Makefile b/editors/emacs/Makefile
index 5f9352f5436..97ebcdfc4af 100644
--- a/editors/emacs/Makefile
+++ b/editors/emacs/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.26 1999/02/25 17:08:33 sommerfe Exp $
+# $NetBSD: Makefile,v 1.27 1999/03/22 16:08:32 bad Exp $
 # FreeBSD Id: Makefile,v 1.30 1997/12/14 02:03:53 asami Exp
 #
 
 DISTNAME=	emacs-20.3
 CATEGORIES=	editors
-MASTER_SITES=	${MASTER_SITE_GNU}
+MASTER_SITES=	${MASTER_SITE_GNU:=/emacs/}
 
 MAINTAINER=	tron@netbsd.org
 HOMEPAGE=	http://www.gnu.org/software/emacs/emacs.html
diff --git a/games/gnuchess/Makefile b/games/gnuchess/Makefile
index a0ea65b8a49..9a69c1ebedd 100644
--- a/games/gnuchess/Makefile
+++ b/games/gnuchess/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 1999/02/08 08:48:37 frueauf Exp $
+# $NetBSD: Makefile,v 1.2 1999/03/22 16:08:32 bad Exp $
 # FreeBSD Id: Makefile,v 1.6 1999/01/27 07:41:12 fenner Exp
 #
 
@@ -6,8 +6,7 @@ DISTNAME=		gnuchess-4.0.pl79
 PKGNAME=		gnuchess-4.0.79
 WRKSRC=			${WRKDIR}/${DISTNAME}/src
 CATEGORIES=		games
-MASTER_SITES=		${MASTER_SITE_GNU}
-MASTER_SITE_SUBDIR=	gnuchess
+MASTER_SITES=		${MASTER_SITE_GNU:=/gnuchess/}
 
 MAINTAINER=		packages@netbsd.org
 
diff --git a/graphics/hp2xx/Makefile b/graphics/hp2xx/Makefile
index abbd52c7037..9ba51d33fc1 100644
--- a/graphics/hp2xx/Makefile
+++ b/graphics/hp2xx/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.4 1999/01/30 23:18:50 agc Exp $
+# $NetBSD: Makefile,v 1.5 1999/03/22 16:08:32 bad Exp $
 #
 
 DISTNAME=	hp2xx-3.1.4
 CATEGORIES=	graphics
-MASTER_SITES=	${MASTER_SITE_GNU}
+MASTER_SITES=	${MASTER_SITE_GNU:=/hp2xx/}
 
 MAINTAINER=	mcmahill@alum.mit.edu
 HOMEPAGE=	http://www.gnu.org/software/hp2xx/hp2xx.html
diff --git a/japanese/less/Makefile b/japanese/less/Makefile
index 83c99dec84a..55e3e55fdf3 100644
--- a/japanese/less/Makefile
+++ b/japanese/less/Makefile
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.1.1.1 1998/10/28 18:12:10 garbled Exp $
+# $NetBSD: Makefile,v 1.2 1999/03/22 16:08:32 bad Exp $
 # FreeBSD Id: Makefile,v 1.13 1998/07/17 20:36:13 steve Exp
 #
 
 DISTNAME=       less-332
 PKGNAME=        ja-less-332
 CATEGORIES=     japanese
-MASTER_SITES=   ${MASTER_SITE_GNU}
+MASTER_SITES=   ${MASTER_SITE_GNU:=/less/}
 
 PATCH_SITES=    ftp://ftp.big.or.jp/pub/usr2/jam/less/
 PATCHFILES=     less-332-iso242.patch.gz \
diff --git a/misc/git/Makefile b/misc/git/Makefile
index 753a060f9af..5bab9271145 100644
--- a/misc/git/Makefile
+++ b/misc/git/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.13 1998/08/20 15:17:13 tsarna Exp $
+# $NetBSD: Makefile,v 1.14 1999/03/22 16:08:32 bad Exp $
 # FreeBSD Id: Makefile,v 1.8 1996/11/21 11:54:39 asami Exp
 #
 
 DISTNAME=	git-4.3.17
 CATEGORIES=	misc
-MASTER_SITES=	${MASTER_SITE_GNU}
+MASTER_SITES=	${MASTER_SITE_GNU:=/git/}
 
 MAINTAINER=	packages@netbsd.org
 HOMEPAGE=	http://www.cs.unh.edu/~tudor/git/
diff --git a/misc/screen/Makefile b/misc/screen/Makefile
index ff7875aa35b..3b3450ff4b4 100644
--- a/misc/screen/Makefile
+++ b/misc/screen/Makefile
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.12 1999/02/20 22:48:36 hubertf Exp $
+# $NetBSD: Makefile,v 1.13 1999/03/22 16:08:33 bad Exp $
 # FreeBSD Id: Makefile,v 1.17 1997/06/16 06:39:51 max Exp
 #
 
 DISTNAME=       screen-3.7.6
 CATEGORIES=	misc
 MASTER_SITES=   ftp://ftp.uni-erlangen.de/pub/utilities/screen/ \
-		${MASTER_SITE_GNU}
+		${MASTER_SITE_GNU:=/screen/}
 
 MAINTAINER=	hubertf@netbsd.org
 
diff --git a/net/wget/Makefile b/net/wget/Makefile
index 6d4830c8a11..0023d23f4ac 100644
--- a/net/wget/Makefile
+++ b/net/wget/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.17 1999/02/20 22:48:37 hubertf Exp $
+# $NetBSD: Makefile,v 1.18 1999/03/22 16:08:33 bad Exp $
 # FreeBSD Id: Makefile,v 1.4 1997/05/22 07:53:29 tg Exp
 #
 
 DISTNAME=	wget-1.5.3
 CATEGORIES=	net
-MASTER_SITES=	${MASTER_SITE_GNU}
+MASTER_SITES=	${MASTER_SITE_GNU:=/wget/}
 
 MAINTAINER=	packages@netbsd.org
 HOMEPAGE=	http://www.gnu.org/software/wget/wget.html
diff --git a/pkgtools/pkglibtool/Makefile b/pkgtools/pkglibtool/Makefile
index 205ab333497..85264150ae0 100644
--- a/pkgtools/pkglibtool/Makefile
+++ b/pkgtools/pkglibtool/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.6 1999/02/25 22:11:14 hubertf Exp $
+# $NetBSD: Makefile,v 1.7 1999/03/22 16:08:33 bad Exp $
 #
 
 DISTNAME=	libtool-1.2
 PKGNAME=	pkglibtool-1.2p1
 CATEGORIES=	pkgtools devel
-MASTER_SITES=	${MASTER_SITE_GNU}
+MASTER_SITES=	${MASTER_SITE_GNU:=/libtool/}
 
 MAINTAINER=	tv@netbsd.org
 HOMEPAGE=	http://www.profitpress.com/libtool/
diff --git a/shells/bash2/Makefile b/shells/bash2/Makefile
index bd0a592356d..0046e72fb15 100644
--- a/shells/bash2/Makefile
+++ b/shells/bash2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 1999/03/02 03:53:07 hubertf Exp $
+# $NetBSD: Makefile,v 1.18 1999/03/22 16:08:33 bad Exp $
 # FreeBSD Id: Makefile,v 1.26 1997/06/27 23:03:27 ache Exp 
 #
 
@@ -7,7 +7,7 @@ DV=		2.03
 DISTNAME=       bash-${V}
 CATEGORIES=	shells
 MASTER_SITES=	ftp://slc2.ins.cwru.edu/pub/dist/  \
-		${MASTER_SITE_GNU}/bash/
+		${MASTER_SITE_GNU:=/bash/}
 
 .include "../../mk/bsd.prefs.mk"