55 files changed, 195 insertions, 178 deletions

diff --git a/astro/sunclock/Makefile b/astro/sunclock/Makefile
index 4c99d6f8b3d8..a169e8c2c3c2 100644
--- a/astro/sunclock/Makefile
+++ b/astro/sunclock/Makefile
@@ -3,13 +3,14 @@
 # Date created:		15 September 1996
 # Whom:			torstenb
 #
-# $Id: Makefile,v 1.2 1996/10/31 10:45:37 asami Exp $
+# $Id: Makefile,v 1.3 1996/11/15 22:34:59 obrien Exp $
 #
 
 DISTNAME=	sunclock1.3
 PKGNAME=	sunclock-1.3
 CATEGORIES=	astro
-MASTER_SITES=	ftp://ftp.x.org/contrib/applications/
+MASTER_SITES=	${MASTER_SITE_XCONTRIB}
+MASTER_SITE_SUBDIR=	applications
 
 MAINTAINER=	torstenb@FreeBSD.org
 
diff --git a/astro/xephem/Makefile b/astro/xephem/Makefile
index a0b8dc83c9bb..6567d3efe81c 100644
--- a/astro/xephem/Makefile
+++ b/astro/xephem/Makefile
@@ -3,13 +3,14 @@
 # Date created:         Thu Aug  1 09:10:22 CDT 1996
 # Whom:                 erich@FreeBSD.org
 #
-# $Id: Makefile,v 1.2 1996/10/31 10:45:42 asami Exp $
+# $Id: Makefile,v 1.3 1996/11/15 22:35:07 obrien Exp $
 #
 
 DISTNAME=	xephem_2.7.1
 PKGNAME=	xephem-2.7.1
 CATEGORIES=	astro
-MASTER_SITES=	ftp://ftp.x.org/contrib/applications/
+MASTER_SITES=	${MASTER_SITE_XCONTRIB}
+MASTER_SITE_SUBDIR=	applications
 
 MAINTAINER=	erich@FreeBSD.org
 
diff --git a/audio/nas/Makefile b/audio/nas/Makefile
index 2a4c3c620e2a..026c4b365e86 100644
--- a/audio/nas/Makefile
+++ b/audio/nas/Makefile
@@ -3,13 +3,14 @@
 # Date created:		03 Nov 1994
 # Whom:			jkh
 #
-# $Id: Makefile,v 1.5 1996/10/03 13:42:48 adam Exp $
+# $Id: Makefile,v 1.6 1996/11/15 23:13:56 obrien Exp $
 #
 
 DISTNAME=	nas-1.2p5
 PKGNAME=	nas-1.2.5
 CATEGORIES=	audio
-MASTER_SITES=	ftp://ftp.x.org/contrib/audio/nas/
+MASTER_SITES=	${MASTER_SITE_XCONTRIB}
+MASTER_SITE_SUBDIR=	audio/nas
 
 MAINTAINER=	jkh@FreeBSD.org
 
diff --git a/audio/workman/Makefile b/audio/workman/Makefile
index 7ca2ecb84fd4..ff8e64266f86 100644
--- a/audio/workman/Makefile
+++ b/audio/workman/Makefile
@@ -3,13 +3,14 @@
 # Date created:         25 Now 1995
 # Whom:                 Donald Burr <d_burr@ix.netcom.com>
 #
-# $Id: Makefile,v 1.1.1.1 1995/11/26 12:47:05 asami Exp $
+# $Id: Makefile,v 1.2 1996/11/15 23:14:31 obrien Exp $
 #
 
 DISTNAME=       WorkMan-1.3
 PKGNAME=	workman-1.3
 CATEGORIES=	audio
-MASTER_SITES=	ftp://ftp.x.org/contrib/applications/WorkMan/
+MASTER_SITES=	${MASTER_SITE_XCONTRIB}
+MASTER_SITE_SUBDIR=	applications/WorkMan
 
 MAINTAINER=	d_burr@ix.netcom.com
 
diff --git a/audio/xmcd/Makefile b/audio/xmcd/Makefile
index 184e53a391d6..bb9d93b956ca 100644
--- a/audio/xmcd/Makefile
+++ b/audio/xmcd/Makefile
@@ -3,13 +3,13 @@
 # Date created:		16 Februar 1995
 # Whom:			Gennady Sorokopud <gena@NetVision.net.il>
 #
-# $Id: Makefile,v 1.4 1996/04/11 08:46:50 asami Exp $
+# $Id: Makefile,v 1.5 1996/11/15 23:14:50 obrien Exp $
 #
 
 DISTNAME=	xmcd-2.0
 CATEGORIES=	audio
-MASTER_SITES=	ftp://ftp.x.org/contrib/applications/xmcd/ \
-		ftp://crl.dec.com/pub/X11/contrib/applications/xmcd/
+MASTER_SITES=	${MASTER_SITE_XCONTRIB}
+MASTER_SITE_SUBDIR=	applications/xmcd
 
 MAINTAINER=	deischen@iworks.InterWorks.org
 
diff --git a/audio/xmmix/Makefile b/audio/xmmix/Makefile
index 98020c14ccd2..3b4a898228d3 100644
--- a/audio/xmmix/Makefile
+++ b/audio/xmmix/Makefile
@@ -3,12 +3,13 @@
 # Date created:		Mon Aug  5 10:54:25 CDT 1996
 # Whom:			erich@FreeBSD.org
 #
-# $Id: Makefile,v 1.2 1996/08/19 11:01:53 asami Exp $
+# $Id: Makefile,v 1.3 1996/11/15 23:14:56 obrien Exp $
 #
 
 DISTNAME=	xmmix-1.2
 CATEGORIES=	audio
-MASTER_SITES=	ftp://ftp.x.org/contrib/applications/xmmix/
+MASTER_SITES=	${MASTER_SITE_XCONTRIB}
+MASTER_SITE_SUBDIR=	applications/xmmix
 
 MAINTAINER=	erich@FreeBSD.org
 
diff --git a/deskutils/plan/Makefile b/deskutils/plan/Makefile
index 0e9f9843b336..2b730539abc9 100644
--- a/deskutils/plan/Makefile
+++ b/deskutils/plan/Makefile
@@ -3,12 +3,13 @@
 # Date created:				14 April 1996
 # Whom:	Daniel Eischen <deischen@iworks.InterWorks.org>
 #
-# $Id: Makefile,v 1.2 1996/08/09 04:27:44 asami Exp $
+# $Id: Makefile,v 1.3 1996/11/17 09:06:28 obrien Exp $
 #
 
 DISTNAME=	plan-1.5.1
 CATEGORIES=	misc
-MASTER_SITES=	ftp://ftp.x.org/contrib/applications/
+MASTER_SITES=	${MASTER_SITE_XCONTRIB}
+MASTER_SITE_XCONTRIB=	applications
 
 MAINTAINER=	deischen@iworks.InterWorks.org
 
diff --git a/devel/xxgdb/Makefile b/devel/xxgdb/Makefile
index 52bd198898b8..a6c7a6dcf971 100644
--- a/devel/xxgdb/Makefile
+++ b/devel/xxgdb/Makefile
@@ -3,13 +3,13 @@
 # Date created:		2 May 1995
 # Whom:			jkh
 #
-# $Id: Makefile,v 1.3 1995/11/26 10:24:02 asami Exp $
+# $Id: Makefile,v 1.4 1995/11/26 11:29:21 asami Exp $
 #
 
 DISTNAME=	xxgdb-1.12
-CATEGORIES+=	devel
-MASTER_SITES=   ftp://ftp.x.org/contrib/utilities/ \
-		ftp://crl.dec.com/pub/X11/contrib/utilities/
+CATEGORIES=	devel
+MASTER_SITES=   ${MASTER_SITE_XCONTRIB}
+MASTER_SITE_SUBDIR=	utilities
 
 MAINTAINER=	asami@FreeBSD.ORG
 
diff --git a/editors/axe/Makefile b/editors/axe/Makefile
index ba446f552bbb..49b4fec9d38b 100644
--- a/editors/axe/Makefile
+++ b/editors/axe/Makefile
@@ -3,12 +3,13 @@
 # Date created:		28 December 1994
 # Whom:			jc@irbs.com John Capo
 #
-# $Id: Makefile,v 1.3 1995/04/09 06:11:04 asami Exp $
+# $Id: Makefile,v 1.4 1996/11/11 05:06:43 obrien Exp $
 #
 
 DISTNAME=	aXe-6.1.2
 CATEGORIES=	editors
-MASTER_SITES=	ftp://crl.dec.com/pub/X11/contrib/editors/
+MASTER_SITES=	${MASTER_SITE_XCONTRIB}
+MASTER_SITE_SUBDIR=	editors
 EXTRACT_SUFX=	.tar.Z
 
 USE_IMAKE=	yes
diff --git a/editors/e93/Makefile b/editors/e93/Makefile
index cf7f7a6dbda4..a1c88ba93d73 100644
--- a/editors/e93/Makefile
+++ b/editors/e93/Makefile
@@ -3,14 +3,14 @@
 # Date created:		21 June 1995
 # Whom:			Satoshi Asami (asami)
 #
-# $Id: Makefile,v 1.8 1996/11/11 05:07:03 obrien Exp $
+# $Id: Makefile,v 1.9 1996/11/17 07:01:21 obrien Exp $
 #
 
 DISTNAME=	e93-1.2r6X
 PKGNAME=	e93-1.2.6
 CATEGORIES=	editors
-MASTER_SITES=	ftp://ftp.x.org/contrib/editors/ \
-		ftp://crl.dec.com/pub/X11/contrib/editors/
+MASTER_SITES=	${MASTER_SITE_XCONTRIB}
+MASTER_SITE_SUBDIR=	editors
 
 MAINTAINER=	asami@FreeBSD.ORG
 
diff --git a/editors/xcoral/Makefile b/editors/xcoral/Makefile
index 12594297b31a..b9686a0994ba 100644
--- a/editors/xcoral/Makefile
+++ b/editors/xcoral/Makefile
@@ -3,12 +3,13 @@
 # Date created:         
 # Whom:                 erich@rrnet.com
 #
-# $Id: Makefile,v 1.2 1996/10/10 16:01:56 erich Exp $
+# $Id: Makefile,v 1.3 1996/11/11 05:07:39 obrien Exp $
 #
 
 DISTNAME=	xcoral-2.5
 CATEGORIES=	editors
-MASTER_SITES=	ftp://public.x.org/contrib/editors/
+MASTER_SITES=	${MASTER_SITE_XCONTRIB}
+MASTER_SITE_SUBDIR=	editors
 
 MAINTAINER=	erich@FreeBSD.ORG
 
diff --git a/editors/xed/Makefile b/editors/xed/Makefile
index bf06c8014732..dcd5eb89f5b5 100644
--- a/editors/xed/Makefile
+++ b/editors/xed/Makefile
@@ -3,13 +3,14 @@
 # Date created:		28 Jul 1996
 # Whom:			shanee
 #
-# $Id: Makefile,v 1.3 1996/07/30 00:29:12 chuckr Exp $
+# $Id: Makefile,v 1.4 1996/11/11 05:07:43 obrien Exp $
 #
 
 DISTNAME=	xed1.3
 PKGNAME=	xed-1.3
 CATEGORIES=	editors x11
-MASTER_SITES=	ftp://ftp.x.org/contrib/editors/
+MASTER_SITES=	${MASTER_SITE_XCONTRIB}
+MASTER_SITE_SUBDIR=	editors
 EXTRACT_SUFX=	.tar.Z
 
 MAINTAINER=	shanee@rabbit.augusta.de
diff --git a/ftp/ftptool/Makefile b/ftp/ftptool/Makefile
index 239933998142..a89713dd731c 100644
--- a/ftp/ftptool/Makefile
+++ b/ftp/ftptool/Makefile
@@ -3,14 +3,13 @@
 # Date created:		19 March 1996
 # Whom:			janek@gaja.ipan.lublin.pl
 #
-# $Id$
+# $Id: Makefile,v 1.1.1.1 1996/03/25 08:58:58 asami Exp $
 #
 
 DISTNAME=	ftptool-4.6
-CATEGORIES+=	net
-MASTER_SITES=	ftp://ftp.x.org/contrib/utilities \
-		ftp://crl.dec.com/pub/X11/contrib/utilities/ \
-		ftp://ftp.icm.edu.pl/pub/X11/contrib/utilities/
+CATEGORIES=	net
+MASTER_SITES=	${MASTER_SITE_XCONTRIB}
+MASTER_SITE_SUBDIR=	utilities
 DISTFILES=	Ftptool4.6.tar.gz
 
 MAINTAINER=	janek@gaja.ipan.lublin.pl
diff --git a/ftp/moxftp/Makefile b/ftp/moxftp/Makefile
index 1eff5ea22f3e..c3982601d9ca 100644
--- a/ftp/moxftp/Makefile
+++ b/ftp/moxftp/Makefile
@@ -3,12 +3,13 @@
 # Date created:		19 December 1994
 # Whom:			janek
 #
-# $Id: Makefile,v 1.9 1996/10/11 20:35:59 erich Exp $
+# $Id: Makefile,v 1.10 1996/10/15 18:25:56 erich Exp $
 #
 
 DISTNAME=	moxftp-2.2
-CATEGORIES+=	net
-MASTER_SITES=	ftp://ftp.x.org/contrib/applications/
+CATEGORIES=	net
+MASTER_SITES=	${MASTER_SITE_XCONTRIB}
+MASTER_SITE_SUBDIR=	applications
 EXTRACT_SUFX=	.tar.Z
 
 HAS_CONFIGURE=	yes
diff --git a/games/xbill/Makefile b/games/xbill/Makefile
index 497f0aef4a30..32166ed7e059 100644
--- a/games/xbill/Makefile
+++ b/games/xbill/Makefile
@@ -3,12 +3,13 @@
 # Date created:		12 September 1995
 # Whom:			asami
 #
-# $Id: Makefile,v 1.1.1.1 1995/09/12 10:29:41 asami Exp $
+# $Id: Makefile,v 1.2 1995/10/06 07:53:05 asami Exp $
 #
 
 DISTNAME=	xbill-1.1
-CATEGORIES+=	games
-MASTER_SITES=	ftp://crl.dec.com/pub/X11/contrib/games/
+CATEGORIES=	games
+MASTER_SITES=	${MASTER_SITE_XCONTRIB}
+MASTER_SITE_SUBDIR=	games
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	asami@FreeBSD.ORG
diff --git a/games/xblackjack/Makefile b/games/xblackjack/Makefile
index b4528e02c09a..148d611d1938 100644
--- a/games/xblackjack/Makefile
+++ b/games/xblackjack/Makefile
@@ -3,12 +3,13 @@
 # Date created:         
 # Whom:                 erich@FreeBSD.org
 #
-# $Id: Makefile,v 1.1.1.1 1996/08/16 13:28:47 erich Exp $
+# $Id: Makefile,v 1.2 1996/08/17 10:26:10 asami Exp $
 #
 
 DISTNAME=	xblackjack-2.2
-CATEGORIES+=	games
-MASTER_SITES=	ftp://ftp.x.org/contrib/games/
+CATEGORIES=	games
+MASTER_SITES=	${MASTER_SITE_XCONTRIB}
+MASTER_SITE_SUBDIR=	games
 
 MAINTAINER=	erich@FreeBSD.org
 
diff --git a/games/xboing/Makefile b/games/xboing/Makefile
index 50482a287fc9..0ec644bd7cb3 100644
--- a/games/xboing/Makefile
+++ b/games/xboing/Makefile
@@ -3,12 +3,13 @@
 # Date created:		31 January 1995
 # Whom:			janek
 #
-# $Id$
+# $Id: Makefile,v 1.6 1995/04/08 05:06:13 asami Exp $
 
 DISTNAME=	xboing2.3
 PKGNAME=	xboing-2.3
-CATEGORIES+=	games
-MASTER_SITES=	ftp://crl.dec.com/pub/X11/contrib/games/
+CATEGORIES=	games
+MASTER_SITES=	${MASTER_SITE_XCONTRIB}
+MASTER_SITE_SUBDIR=	games
 EXTRACT_SUFX=	.tar.gz
 
 LIB_DEPENDS=	Xpm\\.4\\.:${PORTSDIR}/graphics/xpm
diff --git a/games/xevil/Makefile b/games/xevil/Makefile
index 352e4a09c1fc..6e03c3f6ec54 100644
--- a/games/xevil/Makefile
+++ b/games/xevil/Makefile
@@ -5,8 +5,9 @@
 #
 
 PKGNAME=	xevil-1.5
-CATEGORIES+=	games x11
-MASTER_SITES=	ftp://ftp.x.org/contrib/games/xevil1.5/
+CATEGORIES=	games
+MASTER_SITES=	${MASTER_SITE_XCONTRIB}
+MASTER_SITE_SUBDIR=	games/xevil1.5
 DISTFILES=	xevil1.5.tar.Z
 
 MAINTAINER=	jmz@FreeBSD.org
diff --git a/games/xgalaga/Makefile b/games/xgalaga/Makefile
index 02e160f893c0..a1f851032c18 100644
--- a/games/xgalaga/Makefile
+++ b/games/xgalaga/Makefile
@@ -3,12 +3,13 @@
 # Date created:		27 August 1995
 # Whom:			asami
 #
-# $Id: Makefile,v 1.1.1.1 1995/08/28 07:43:37 asami Exp $
+# $Id: Makefile,v 1.2 1996/01/16 10:39:49 asami Exp $
 #
 
 DISTNAME=	xgalaga-1.6b
-CATEGORIES+=	games
-MASTER_SITES=	ftp://crl.dec.com/pub/X11/contrib/games/
+CATEGORIES=	games
+MASTER_SITES=	${MASTER_SITE_XCONTRIB}
+MASTER_SITE_SUBDIR=	games
 
 MAINTAINER=	asami@FreeBSD.ORG
 
diff --git a/games/xtic/Makefile b/games/xtic/Makefile
index 0118ef62cfcc..8fb221042482 100644
--- a/games/xtic/Makefile
+++ b/games/xtic/Makefile
@@ -3,14 +3,14 @@
 # Date created:         22 June 1995
 # Whom:                 asami
 #
-# $Id: Makefile,v 1.4 1995/04/11 00:20:39 asami Exp $
+# $Id: Makefile,v 1.1.1.1 1995/06/23 04:35:56 asami Exp $
 #
 
 DISTNAME=       xtic1.12
 PKGNAME=	xtic-1.12
-CATEGORIES+=	games
-MASTER_SITES=	ftp://ftp.x.org/contrib/games/ \
-		ftp://crl.dec.com/pub/X11/contrib/games/
+CATEGORIES=	games
+MASTER_SITES=	${MASTER_SITE_XCONTRIB}
+MASTER_SITE_SUBDIR=	games
 
 MAINTAINER=	asami@FreeBSD.ORG
 
diff --git a/graphics/ImageMagick/Makefile b/graphics/ImageMagick/Makefile
index 5d906ab8202b..25478ee85ae6 100644
--- a/graphics/ImageMagick/Makefile
+++ b/graphics/ImageMagick/Makefile
@@ -3,11 +3,11 @@
 # Date created:		15 November 1994
 # Whom:			torstenb
 #
-# $Id: Makefile,v 1.8 1996/11/06 07:53:19 tg Exp $
+# $Id: Makefile,v 1.9 1996/11/15 16:04:24 tg Exp $
 #
 
 DISTNAME=	ImageMagick-3.7.7
-CATEGORIES+=	graphics
+CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_XCONTRIB}
 MASTER_SITE_SUBDIR=	applications/ImageMagick
 
diff --git a/graphics/pixmap/Makefile b/graphics/pixmap/Makefile
index b6307ac1a3f4..8026965c1089 100644
--- a/graphics/pixmap/Makefile
+++ b/graphics/pixmap/Makefile
@@ -3,13 +3,15 @@
 # Date created:		19 February 1995
 # Whom:			jmz
 #
-# $Id: Makefile,v 1.6 1995/04/09 07:09:39 asami Exp $
+# $Id: Makefile,v 1.7 1995/04/11 02:00:42 jmz Exp $
 #
 
 DISTNAME=	pixmap2.6
 PKGNAME=	pixmap-2.6
-CATEGORIES+=	graphics
-MASTER_SITES=	ftp://crl.dec.com/pub/X11/contrib/applications/pixmap/
+CATEGORIES=	graphics
+MASTER_SITES=	${MASTER_SITE_XCONTRIB}
+MASTER_SITE_SUBDIR=	applications/pixmap
+
 MAINTAINER=	jmz@FreeBSD.org
 
 LIB_DEPENDS=	Xpm\\.4\\.:${PORTSDIR}/graphics/xpm
diff --git a/graphics/tgif/Makefile b/graphics/tgif/Makefile
index bed9d82f31c0..a4c603c7b091 100644
--- a/graphics/tgif/Makefile
+++ b/graphics/tgif/Makefile
@@ -3,15 +3,14 @@
 # Date created:         10 Oct 1996
 # Whom:                 bmc@WillsCreek.COM
 #
-# $Id$
+# $Id: Makefile,v 1.2 1996/10/19 02:20:05 chuckr Exp $
 #
 
 DISTNAME=	tgif-3.0-p9
 PKGNAME=	tgif-3.0.9
-CATEGORIES+=	graphics x11
-MASTER_SITES=	ftp://ftp.x.org/contrib/applications/tgif/ \
-		ftp://ftp.cs.ucla.edu/pub/tgif/ \
-		ftp://bourbon.cs.columbia.edu/pub/tgif/
+CATEGORIES=	graphics x11
+MASTER_SITES=	${MASTER_SITE_XCONTRIB}
+MASTER_SITE_SUBDIR=	applications/tgif
 
 MAINTAINER=	bmc@WillsCreek.COM
 
diff --git a/graphics/xbmbrowser/Makefile b/graphics/xbmbrowser/Makefile
index c52ac67788c3..96348b878490 100644
--- a/graphics/xbmbrowser/Makefile
+++ b/graphics/xbmbrowser/Makefile
@@ -3,14 +3,14 @@
 # Date created:		06 September 1995
 # Whom:			thomas@ghpc8.ihf.rwth-aachen.de
 #
-# $Id$
+# $Id: Makefile,v 1.1.1.1 1995/11/09 06:49:26 asami Exp $
 #
 
 DISTNAME=	xbmbrowser5.1
 PKGNAME=	xbmbrowser-5.1
-CATEGORIES+=	graphics
-MASTER_SITES=	ftp://crl.dec.com/pub/X11/contrib/utilities/ \
-		ftp://ftp.th-darmstadt.de/pub/X11/contrib/utilities/
+CATEGORIES=	graphics
+MASTER_SITES=	${MASTER_SITE_XCONTRIB}
+MASTER_SITE_SUBDIR=	utilities
 
 MAINTAINER=	thomas@ghpc8.ihf.rwth-aachen.de
 
diff --git a/graphics/xfig-devel/Makefile b/graphics/xfig-devel/Makefile
index 2f39969269cb..3d41cee55325 100644
--- a/graphics/xfig-devel/Makefile
+++ b/graphics/xfig-devel/Makefile
@@ -3,14 +3,14 @@
 # Date created:		4 January 1995
 # Whom:			roberto
 #
-# $Id: Makefile,v 1.11 1995/09/26 09:45:20 asami Exp $
+# $Id: Makefile,v 1.12 1995/10/03 21:58:31 ache Exp $
 #
 
 DISTNAME=	xfig.3.1.4
 PKGNAME=	xfig-3.1.4
-CATEGORIES+=	graphics x11
-MASTER_SITES=	ftp://ftp.x.org/contrib/applications/drawing_tools/xfig/ \
-	ftp://crl.dec.com/pub/X11/contrib/applications/drawing_tools/xfig/
+CATEGORIES=	graphics x11
+MASTER_SITES=	${MASTER_SITE_XCONTRIB}
+MASTER_SITE_SUBDIR=	applications/drawing_tools/xfig
 
 MAINTAINER=	asami@FreeBSD.ORG
 
diff --git a/graphics/xfig/Makefile b/graphics/xfig/Makefile
index 2f39969269cb..3d41cee55325 100644
--- a/graphics/xfig/Makefile
+++ b/graphics/xfig/Makefile
@@ -3,14 +3,14 @@
 # Date created:		4 January 1995
 # Whom:			roberto
 #
-# $Id: Makefile,v 1.11 1995/09/26 09:45:20 asami Exp $
+# $Id: Makefile,v 1.12 1995/10/03 21:58:31 ache Exp $
 #
 
 DISTNAME=	xfig.3.1.4
 PKGNAME=	xfig-3.1.4
-CATEGORIES+=	graphics x11
-MASTER_SITES=	ftp://ftp.x.org/contrib/applications/drawing_tools/xfig/ \
-	ftp://crl.dec.com/pub/X11/contrib/applications/drawing_tools/xfig/
+CATEGORIES=	graphics x11
+MASTER_SITES=	${MASTER_SITE_XCONTRIB}
+MASTER_SITE_SUBDIR=	applications/drawing_tools/xfig
 
 MAINTAINER=	asami@FreeBSD.ORG
 
diff --git a/graphics/xli/Makefile b/graphics/xli/Makefile
index c379c6853e2e..5e2a64f819b8 100644
--- a/graphics/xli/Makefile
+++ b/graphics/xli/Makefile
@@ -3,26 +3,14 @@
 # Date created:		24 November 1994
 # Whom:			asami
 #
-# $Id: Makefile,v 1.5 1995/04/09 07:09:50 asami Exp $
+# $Id: Makefile,v 1.6 1996/08/04 16:48:17 chuckr Exp $
 #
 
 DISTNAME=	xli.1.16
 PKGNAME=	xli-1.16
-CATEGORIES+=	graphics x11
-MASTER_SITES=	ftp://physics.su.oz.au/FreeBSD/distfiles/ \
-		ftp://nic.switch.ch/mirror/X11/contrib/applications/ \
-		ftp://isdec.vc.cvut.cz/pub/bsd/FreeBSD/distfiles/ \
-		ftp://pascal.zedat.fu-berlin.de/unix/X11/contrib/applications/ \
-		ftp://rs104.hrz.th-darmstadt.de/pub/X11/contrib/applications/ \
-		ftp://ftp.denet.dk/mirror2/X11/contrib/applications/ \
-		ftp://ftp.cs.umn.edu/packages/X11/contrib/applications/ \
-		ftp://wuarchive.wustl.edu/systems/unix/FreeBSD/distfiles/ \
-		ftp://geocub.greco-prog.fr/pub/X11/ \
-		ftp://pascal.ibp.fr/pub14/FreeBSD/distfiles/ \
-		ftp://cnuce-arch.cnr.it/pub/X/R6contrib/applications/ \
-		ftp://wsclark.huie.hokudai.ac.jp/pub/system/FreeBSD-distfiles/ \
-		ftp://ftp.luth.se/pub/X11/R6contrib/applications/ \
-		ftp://ccsun42.csie.nctu.edu.tw/pub/X11/contrib/applications
+CATEGORIES=	graphics x11
+MASTER_SITES=	${MASTER_SITE_XCONTRIB}
+MASTER_SITE_SUBDIR=	applications
 
 MAINTAINER=	ports@FreeBSD.ORG
 
diff --git a/graphics/xmfract/Makefile b/graphics/xmfract/Makefile
index 6ef7203afd8b..d4f2c5edce0e 100644
--- a/graphics/xmfract/Makefile
+++ b/graphics/xmfract/Makefile
@@ -3,13 +3,14 @@
 # Date created:         Thu Aug  1 09:10:22 CDT 1996
 # Whom:                 erich@FreeBSD.org
 #
-# $Id: Makefile,v 1.2 1996/08/01 20:38:11 erich Exp $
+# $Id: Makefile,v 1.3 1996/08/03 09:00:15 asami Exp $
 #
 
 DISTNAME=	xmfract_1.4
 PKGNAME=	xmfract-1.4
-CATEGORIES+=	graphics
-MASTER_SITES=	ftp://ftp.x.org/contrib/graphics/
+CATEGORIES=	graphics
+MASTER_SITES=	${MASTER_SITE_XCONTRIB}
+MASTER_SITE_SUBDIR=	graphics
 
 MAINTAINER=	erich@FreeBSD.org
 
diff --git a/japanese/kterm/Makefile b/japanese/kterm/Makefile
index eb763fa1d714..e035e1bb5cfd 100644
--- a/japanese/kterm/Makefile
+++ b/japanese/kterm/Makefile
@@ -3,13 +3,14 @@
 # Date created:		18 November 1994
 # Whom:			asami
 #
-# $Id: Makefile,v 1.11 1996/11/01 13:43:14 asami Exp $
+# $Id: Makefile,v 1.12 1996/11/11 10:12:21 max Exp $
 #
 
 DISTNAME=	kterm-6.2.0
 PKGNAME=	jp-kterm-6.2.0
 CATEGORIES=	japanese x11
-MASTER_SITES=	ftp://ftp.x.org/contrib/applications/
+MASTER_SITES=	${MASTER_SITE_XCONTRIB}
+MASTER_SITE_SUBDIR=	applications
 
 MAINTAINER=	asami@FreeBSD.ORG
 
diff --git a/japanese/kterm16c/Makefile b/japanese/kterm16c/Makefile
index eb763fa1d714..e035e1bb5cfd 100644
--- a/japanese/kterm16c/Makefile
+++ b/japanese/kterm16c/Makefile
@@ -3,13 +3,14 @@
 # Date created:		18 November 1994
 # Whom:			asami
 #
-# $Id: Makefile,v 1.11 1996/11/01 13:43:14 asami Exp $
+# $Id: Makefile,v 1.12 1996/11/11 10:12:21 max Exp $
 #
 
 DISTNAME=	kterm-6.2.0
 PKGNAME=	jp-kterm-6.2.0
 CATEGORIES=	japanese x11
-MASTER_SITES=	ftp://ftp.x.org/contrib/applications/
+MASTER_SITES=	${MASTER_SITE_XCONTRIB}
+MASTER_SITE_SUBDIR=	applications
 
 MAINTAINER=	asami@FreeBSD.ORG
 
diff --git a/japanese/tgif/Makefile b/japanese/tgif/Makefile
index 97a395f863ad..cf76fe8d1122 100644
--- a/japanese/tgif/Makefile
+++ b/japanese/tgif/Makefile
@@ -3,13 +3,14 @@
 # Date created:		8 Dec 1995
 # Whom:			Mita Yoshio <mita@jp.FreeBSD.org>
 #
-# $Id: Makefile,v 1.3 1996/10/19 03:18:11 max Exp $
+# $Id: Makefile,v 1.4 1996/11/11 10:12:57 max Exp $
 #
 
 DISTNAME=	tgif-2.16-p12
 PKGNAME=	jp-tgif-216-p12
 CATEGORIES=	japanese
-MASTER_SITES=	ftp://ftp.iis.u-tokyo.ac.jp/pub1/X/contrib/applications/tgif/
+MASTER_SITES=	${MASTER_SITE_XCONTRIB}
+MASTER_SITE_SUBDIR=	applications/tgif
 
 PATCH_SITES=	ftp://ftp.eos.hokudai.ac.jp/pub/X/contrib/misc/tgif/
 PATCHFILES=	tgif-2.16-p12.jp.gz \
diff --git a/lang/elk/Makefile b/lang/elk/Makefile
index aa82a38110a1..0e87eb5f0581 100644
--- a/lang/elk/Makefile
+++ b/lang/elk/Makefile
@@ -3,15 +3,15 @@
 # Date created:         08 March 1995
 # Whom:                 thomas@ghpc8.ihf.rwth-aachen.de
 #
-# $Id: Makefile,v 1.12 1996/11/12 02:18:06 obrien Exp $
+# $Id: Makefile,v 1.13 1996/11/17 06:12:31 obrien Exp $
 #
 
 DISTNAME=	elk-3.0
 PKGNAME=	elk-3.0.2
 CATEGORIES=	lang
 MASTER_SITES=	ftp://ftp.uni-bremen.de/pub/programming/languages/scheme/elk/ \
-		ftp://crl.dec.com/pub/X11/contrib/devel_tools/ \
-		ftp://ftp.th-darmstadt.de/pub/X11/contrib/devel_tools/
+		${MASTER_SITE_XCONTRIB}
+MASTER_SITE_SUBDIR=	devel_tools
 
 MAINTAINER=	tg@freebsd.org
 
diff --git a/mail/xbuffy/Makefile b/mail/xbuffy/Makefile
index c49ce7a4a948..01cc5c0903d2 100644
--- a/mail/xbuffy/Makefile
+++ b/mail/xbuffy/Makefile
@@ -3,14 +3,14 @@
 # Date created:		18 June 1995
 # Whom:			dchapes@zeus.leitch.com
 #
-# $Id: Makefile,v $
+# $Id: Makefile,v 1.1.1.1 1995/06/22 06:32:39 asami Exp $
 #
 
 DISTNAME=	xbuffy3.2.1
 PKGNAME=	xbuffy-3.2.1
-CATEGORIES+=	x11
-MASTER_SITES=	ftp://sunsite.doc.ic.ac.uk/computing/graphics/systems/X11/contrib/utilities/
-MASTER_SITES+=	ftp://ftp.cyf-kr.edu.pl/etc/lfs/x-contrib/utilities/
+CATEGORIES=	x11
+MASTER_SITES=	${MASTER_SITE_XCONTRIB}
+MASTER_SITE_SUBDIR=	utilities
 
 MAINTAINER=	dchapes@zeus.leitch.com
 
diff --git a/misc/unclutter/Makefile b/misc/unclutter/Makefile
index 6beb8929169b..8630c20cbf8e 100644
--- a/misc/unclutter/Makefile
+++ b/misc/unclutter/Makefile
@@ -3,16 +3,13 @@
 # Date created:		03 Aug 1996
 # Whom:			shanee@rabbit.augusta.de
 #
-# $Id: Makefile,v 1.2 1996/08/24 17:02:29 chuckr Exp $
+# $Id: Makefile,v 1.3 1996/11/11 05:50:19 obrien Exp $
 #
 
 DISTNAME=	unclutter-8
 CATEGORIES=	misc
-MASTER_SITES=	ftp://ftp.cs.umn.edu/packages/X11/contrib/utilities/ \
-		ftp://csg.uwaterloo.ca/pub/lhf/net/ \
-		ftp://ftp.univ-angers.fr/pub2/X11/contrib/utilities/ \
-		ftp://ftp.huji.ac.il/mirror/X11/contrib/utilities/ \
-		ftp://ftp.rz.uni-wuerzburg.de/pub/X11/contrib/utilities/
+MASTER_SITES=	${MASTER_SITE_XCONTRIB}
+MASTER_SITE_SUBDIR=	utilities
 
 MAINTAINER=	shanee@rabbit.augusta.de
 
diff --git a/net/xarchie/Makefile b/net/xarchie/Makefile
index 1cdbe6c58a76..63fe99d9baab 100644
--- a/net/xarchie/Makefile
+++ b/net/xarchie/Makefile
@@ -3,13 +3,13 @@
 # Date created:		24 September 1994
 # Whom:			jkh
 #
-# $Id: Makefile,v 1.9 1995/11/27 04:05:52 asami Exp $
+# $Id: Makefile,v 1.10 1995/12/02 12:27:27 asami Exp $
 #
 
 DISTNAME=	xarchie-2.0.10
-CATEGORIES+=	net
-MASTER_SITES=	ftp://crl.dec.com/pub/X11/contrib/applications/ \
-		ftp://ftp.funet.fi/pub/X11/contrib/applications/
+CATEGORIES=	net
+MASTER_SITES=	${MASTER_SITE_XCONTRIB}
+MASTER_SITE_SUBDIR=	applications
 
 USE_IMAKE=	yes
 
diff --git a/print/transfig/Makefile b/print/transfig/Makefile
index faf6fea2dbaf..b6161794039a 100644
--- a/print/transfig/Makefile
+++ b/print/transfig/Makefile
@@ -3,14 +3,14 @@
 # Date created:		9 August 1996
 # Whom:			chuckr@freebsd.org
 #
-# $Id: Makefile,v 1.10 1996/08/11 02:42:59 chuckr Exp $
+# $Id: Makefile,v 1.11 1996/11/17 08:45:17 obrien Exp $
 #
 
 DISTNAME=	transfig.3.1.2
 PKGNAME=	transfig-3.1.2
 CATEGORIES=	print
-MASTER_SITES=	ftp://ftp.x.org/contrib/applications/drawing_tools/transfig/ \
-	ftp://crl.dec.com/pub/X11/contrib/applications/drawing_tools/transfig/
+MASTER_SITES=	${MASTER_SITE_XCONTRIB}
+MASTER_SITE_SUBDIR=	applications/drawing_tools/transfig
 
 MAINTAINER=	chuckr@freebsd.org
 
diff --git a/print/xdvi/Makefile b/print/xdvi/Makefile
index 4defa7a58e33..2df6e53206d5 100644
--- a/print/xdvi/Makefile
+++ b/print/xdvi/Makefile
@@ -3,14 +3,14 @@
 # Date created:         1 October 1994
 # Whom:                 jmz
 #
-# $Id: Makefile,v 1.19 1996/09/16 00:56:30 asami Exp $
+# $Id: Makefile,v 1.20 1996/11/17 08:45:20 obrien Exp $
 #
 
 DISTNAME=	xdvi-20
 PKGNAME=	xdvi-pl20
 CATEGORIES=	print
-MASTER_SITES=	ftp://ftp.x.org/contrib/applications/	\
-		ftp://crl.dec.com/pub/X11/contrib/applications/
+MASTER_SITES=	${MASTER_SITE_XCONTRIB}
+MASTER_SITE_SUBDIR=	applications
 EXTRACT_SUFX=	.tar.Z
 
 MAINTAINER=	jmz@FreeBSD.org
diff --git a/sysutils/xcpustate/Makefile b/sysutils/xcpustate/Makefile
index e14ccafc3f81..5a90c0f11b58 100644
--- a/sysutils/xcpustate/Makefile
+++ b/sysutils/xcpustate/Makefile
@@ -3,13 +3,14 @@
 # Date created:		31-Dec-1995
 # Whom:                 David O'Brien <obrien@cs.ucdavis.edu>
 #
-# $Id: Makefile,v 1.1.1.1 1996/02/29 01:57:44 asami Exp $
+# $Id: Makefile,v 1.2 1996/11/17 08:06:36 obrien Exp $
 #
 
 DISTNAME=	xcpustate-2.1
 CATEGORIES=	sysutils
 MASTER_SITES=	ftp://ftp.cdf.toronto.edu/pub/xcpustate/  \
-		ftp://ftp.x.org/contrib/utilities/xcpustate/
+		${MASTER_SITE_XCONTRIB}
+MASTER_SITE_SUBDIR=	utilities/xcpustate
 EXTRACT_SUFX=	.shar.gz
 
 MAINTAINER=     obrien@cs.ucdavis.edu
diff --git a/sysutils/xsysstats/Makefile b/sysutils/xsysstats/Makefile
index e4afb6a9175b..aa17d137804c 100644
--- a/sysutils/xsysstats/Makefile
+++ b/sysutils/xsysstats/Makefile
@@ -3,13 +3,14 @@
 # Date created:		12 December 1994
 # Whom:			asami
 #
-# $Id: Makefile,v 1.7 1995/07/13 01:21:35 asami Exp $
+# $Id: Makefile,v 1.8 1996/11/17 08:06:46 obrien Exp $
 #
 
 DISTNAME=	xsysstats1.34
 PKGNAME=	xsysstats-1.34
 CATEGORIES=	sysutils x11
-MASTER_SITES=	ftp://crl.dec.com/pub/X11/contrib/utilities/
+MASTER_SITES=	${MASTER_SITE_XCONTRIB}
+MASTER_SITE_SUBDIR=	utilities
 
 MAINTAINER=	asami@FreeBSD.ORG
 
diff --git a/x11-clocks/xdaliclock/Makefile b/x11-clocks/xdaliclock/Makefile
index 10885b25709d..01dd5a64afc6 100644
--- a/x11-clocks/xdaliclock/Makefile
+++ b/x11-clocks/xdaliclock/Makefile
@@ -3,12 +3,13 @@
 # Date created:				10th February 1995
 # Whom:					gpalmer
 #
-# $Id: Makefile,v 1.2 1995/04/01 12:51:18 jkh Exp $
+# $Id: Makefile,v 1.3 1995/04/12 20:31:51 asami Exp $
 #
 
 DISTNAME=	xdaliclock-2.05
-CATEGORIES+=	x11
-MASTER_SITES=	ftp://ftp.x.org/contrib/applications/
+CATEGORIES=	x11
+MASTER_SITES=	${MASTER_SITE_XCONTRIB}
+MASTER_SITE_SUBDIR=	applications
 EXTRACT_SUFX=	.tar.Z
 
 MAINTAINER=	gpalmer@FreeBSD.ORG
diff --git a/x11-fm/xfm/Makefile b/x11-fm/xfm/Makefile
index a104ebfebb83..9cf8ffcdbe3b 100644
--- a/x11-fm/xfm/Makefile
+++ b/x11-fm/xfm/Makefile
@@ -3,12 +3,13 @@
 # Date created:		28 December 1994
 # Whom:			jc@irbs.com John Capo
 #
-# $Id: Makefile,v 1.5 1995/04/12 20:31:59 asami Exp $
+# $Id: Makefile,v 1.6 1995/07/27 00:25:58 asami Exp $
 #
 
 DISTNAME=	xfm-1.3.2
-CATEGORIES+=	x11
-MASTER_SITES=	ftp://crl.dec.com/pub/X11/contrib/applications/
+CATEGORIES=	x11
+MASTER_SITES=	${MASTER_SITE_XCONTRIB}
+MASTER_SITE_SUBDIR=	applications
 
 LIB_DEPENDS=    Xpm\\.4\\.:${PORTSDIR}/graphics/xpm
 
diff --git a/x11-toolkits/Xaw3d/Makefile b/x11-toolkits/Xaw3d/Makefile
index 0899d73d52d7..340c8e389c3e 100644
--- a/x11-toolkits/Xaw3d/Makefile
+++ b/x11-toolkits/Xaw3d/Makefile
@@ -3,12 +3,13 @@
 # Date created:		18 November 1994
 # Whom:			asami
 #
-# $Id: Makefile,v 1.10 1995/08/26 09:14:59 asami Exp $
+# $Id: Makefile,v 1.11 1996/10/16 09:11:58 asami Exp $
 #
 
 DISTNAME=	Xaw3d-1.3
-CATEGORIES+=	x11
-MASTER_SITES=	ftp://crl.dec.com/pub/X11/contrib/widgets/Xaw3d/R6.1/
+CATEGORIES=	x11
+MASTER_SITES=	${MASTER_SITE_XCONTRIB}
+MASTER_SITE_SUBDIR=	widgets/Xaw3d/R6.1
 
 MAINTAINER=	asami@FreeBSD.ORG
 
diff --git a/x11-wm/ctwm/Makefile b/x11-wm/ctwm/Makefile
index 398942f6a138..a10b803b9e99 100644
--- a/x11-wm/ctwm/Makefile
+++ b/x11-wm/ctwm/Makefile
@@ -3,14 +3,14 @@
 # Date created:		13 November 1994
 # Whom:			torstenb
 #
-# $Id: Makefile,v 1.9 1995/11/09 05:55:29 asami Exp $
+# $Id: Makefile,v 1.10 1996/09/14 22:53:11 torstenb Exp $
 #
 
 DISTNAME=	ctwm-3.4pl2
 PKGNAME=	ctwm-3.4.2
-CATEGORIES+=	x11
-MASTER_SITES=	ftp://ftp.x.org/contrib/window_managers/
-EXTRACT_SUFX=	.tar.gz
+CATEGORIES=	x11
+MASTER_SITES=	${MASTER_SITE_XCONTRIB}
+MASTER_SITE_SUBDIR=	window_managers
 
 MAINTAINER=	torstenb@FreeBSD.ORG
 
diff --git a/x11-wm/gwm/Makefile b/x11-wm/gwm/Makefile
index f1af1ea97d74..d13318ac4262 100644
--- a/x11-wm/gwm/Makefile
+++ b/x11-wm/gwm/Makefile
@@ -3,11 +3,11 @@
 # Date created:		14 November 1996
 # Whom:			markm
 #
-# $Id: Makefile,v 1.1.1.1 1996/11/14 20:03:50 markm Exp $
+# $Id: Makefile,v 1.2 1996/11/15 04:51:00 asami Exp $
 #
 
 DISTNAME=	gwm-1.8c
-CATEGORIES+=	x11
+CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_XCONTRIB}
 MASTER_SITE_SUBDIR=	window_managers/gwm
 
diff --git a/x11-wm/tvtwm/Makefile b/x11-wm/tvtwm/Makefile
index 3c2c66c1aa7e..39f863bd53e4 100644
--- a/x11-wm/tvtwm/Makefile
+++ b/x11-wm/tvtwm/Makefile
@@ -3,13 +3,14 @@
 # Date created:		5th December 1994
 # Whom:			gpalmer
 #
-# $Id: Makefile,v 1.7 1995/04/12 20:31:45 asami Exp $
+# $Id: Makefile,v 1.8 1995/04/22 11:59:12 asami Exp $
 #
 
 DISTNAME=	tvtwm
 PKGNAME=	tvtwm-pl11
-CATEGORIES+=	x11
-MASTER_SITES=	ftp://ftp.x.org/contrib/window_managers/
+CATEGORIES=	x11
+MASTER_SITES=	${MASTER_SITE_XCONTRIB}
+MASTER_SITE_SUBDIR=	window_managers
 DISTFILES=	tvtwm.pl11.tar.gz
 
 MAINTAINER=	gpalmer@FreeBSD.ORG
diff --git a/x11/emu/Makefile b/x11/emu/Makefile
index 656a1fb3eb44..aa162abdfb97 100644
--- a/x11/emu/Makefile
+++ b/x11/emu/Makefile
@@ -3,13 +3,14 @@
 # Date created:		13 September 1994
 # Whom:			jkh
 #
-# $Id$
+# $Id: Makefile,v 1.9 1995/04/11 02:32:57 asami Exp $
 #
 
 DISTNAME=	emu-1.31
 PKGNAME=	emu-1.3.1
-MASTER_SITES=	ftp://ftp.x.org/contrib/applications/
-CATEGORIES+=	x11
+CATEGORIES=	x11
+MASTER_SITES=	${MASTER_SITE_XCONTRIB}
+MASTER_SITE_SUBDIR=	applications
 
 MAINTAINER=	me@FreeBSD.org
 
diff --git a/x11/x3270/Makefile b/x11/x3270/Makefile
index 412c98aecf9c..57478e4e53dc 100644
--- a/x11/x3270/Makefile
+++ b/x11/x3270/Makefile
@@ -3,13 +3,13 @@
 # Date created:		31 January 1995
 # Whom:			janek
 #
-# $Id: Makefile,v 1.7 1995/05/13 10:11:35 asami Exp $
+# $Id: Makefile,v 1.8 1995/11/22 13:21:37 asami Exp $
 #
 
 DISTNAME=	x3270-3.0.3.7
-CATEGORIES+=	x11 emulators
-MASTER_SITES=	ftp://ftp.icm.edu.pl/pub/X11/contrib/applications/x3270/ \
-		ftp://ftp.x.org/contrib/applications/x3270/
+CATEGORIES=	x11 emulators
+MASTER_SITES=	${MASTER_SITE_XCONTRIB}
+MASTER_SITE_SUBDIR=	applications/x3270
 
 USE_IMAKE=	yes
 
diff --git a/x11/xautolock/Makefile b/x11/xautolock/Makefile
index 3dbd43b659aa..3b08e8e2c002 100644
--- a/x11/xautolock/Makefile
+++ b/x11/xautolock/Makefile
@@ -3,13 +3,14 @@
 # Date created:		20 Jul 1996
 # Whom:			Eric Blood <eblood@cs.unr.edu>
 #
-# $Id$
+# $Id: Makefile,v 1.1.1.1 1996/08/16 07:54:26 asami Exp $
 #
 
 DISTNAME=	xautolock-1pl10
 PKGNAME=	xautolock-1.10
-CATEGORIES+=	x11
-MASTER_SITES=	ftp://ftp.x.org/contrib/applications/
+CATEGORIES=	x11
+MASTER_SITES=	${MASTER_SITE_XCONTRIB}
+MASTER_SITE_SUBDIR=	applications
 DISTFILES=	xautolock.pl10.tz
 
 MAINTAINER=	eblood@cs.unr.edu
diff --git a/x11/xcb/Makefile b/x11/xcb/Makefile
index ebd2e31c64c1..6b837cda07bb 100644
--- a/x11/xcb/Makefile
+++ b/x11/xcb/Makefile
@@ -3,12 +3,13 @@
 # Date created:		1 August 1995
 # Whom:			jkh
 #
-# $Id$
+# $Id: Makefile,v 1.1.1.1 1995/08/02 06:27:24 jkh Exp $
 #
 
 DISTNAME=	xcb-2.3
-CATEGORIES+=	x11
-MASTER_SITES=	ftp://crl.dec.com/pub/X11/contrib/utilities/
+CATEGORIES=	x11
+MASTER_SITES=	${MASTER_SITE_XCONTRIB}
+MASTER_SITE_SUBDIR=	utilities
 
 MAINTAINER=	jkh@FreeBSD.ORG
 USE_IMAKE=	yes
diff --git a/x11/xdtm/Makefile b/x11/xdtm/Makefile
index 2535aa02674d..669c57048308 100644
--- a/x11/xdtm/Makefile
+++ b/x11/xdtm/Makefile
@@ -3,12 +3,13 @@
 # Date created:         		26th April 1995
 # Whom:                 		gpalmer
 #
-# $Id$
+# $Id: Makefile,v 1.1.1.1 1995/04/26 11:49:41 gpalmer Exp $
 #
 
 DISTNAME=		xdtm-2.5.5
-CATEGORIES+=		x11
-MASTER_SITES=		ftp://ftp.x.org/contrib/applications/xdtm/
+CATEGORIES=		x11
+MASTER_SITES=		${MASTER_SITE_XCONTRIB}
+MASTER_SITE_SUBDIR=	applications/xdtm
 
 MAINTAINER=		gpalmer@FreeBSD.ORG
 
diff --git a/x11/xgrab/Makefile b/x11/xgrab/Makefile
index a38060dbab33..36c808c080e9 100644
--- a/x11/xgrab/Makefile
+++ b/x11/xgrab/Makefile
@@ -3,13 +3,14 @@
 # Date created:         27 February 1995
 # Whom:                 jmz
 #
-# $Id: Makefile,v 1.6 1995/05/15 16:33:19 jmz Exp $
+# $Id: Makefile,v 1.7 1996/07/31 01:01:36 jmz Exp $
 #
 
 DISTNAME=	xgrabsc.2_41
 PKGNAME=	xgrab-2.41
-CATEGORIES+=	x11
-MASTER_SITES=	ftp://ftp.ibp.fr/pub/X11/contrib/applications/
+CATEGORIES=	x11
+MASTER_SITES=	${MASTER_SITE_XCONTRIB}
+MASTER_SITE_SUBDIR=	applications
 
 MAINTAINER=	jmz@FreeBSD.org
 
diff --git a/x11/xkeycaps/Makefile b/x11/xkeycaps/Makefile
index 0516d1f5915a..f6f6df0e3251 100644
--- a/x11/xkeycaps/Makefile
+++ b/x11/xkeycaps/Makefile
@@ -3,12 +3,13 @@
 # Date created:         12 February 1995
 # Whom:                 jmz
 #
-# $Id: Makefile,v 1.4 1995/04/12 20:32:05 asami Exp $
+# $Id: Makefile,v 1.5 1996/07/30 13:53:58 jmz Exp $
 #
 
 DISTNAME=	xkeycaps-2.31
-CATEGORIES+=	x11
-MASTER_SITES=	ftp://ftp.ibp.fr/pub/X11/contrib/applications/
+CATEGORIES=	x11
+MASTER_SITES=	${MASTER_SITE_XCONTRIB}
+MASTER_SITE_SUBDIR=	applications
 
 MAINTAINER=	jmz@FreeBSD.org
 
diff --git a/x11/xlockmore/Makefile b/x11/xlockmore/Makefile
index ac2dbe402e2f..011447183ac1 100644
--- a/x11/xlockmore/Makefile
+++ b/x11/xlockmore/Makefile
@@ -3,12 +3,12 @@
 # Date created:		9 November 1994
 # Whom:			smace
 #
-# $Id: Makefile,v 1.0 1994/11/09 00:00:00 smace Exp $
+# $Id: Makefile,v 1.10 1996/11/12 07:08:28 tg Exp $
 #
 
 DISTNAME=       xlockmore-3.11
-MASTER_SITES+=  ftp://crl.dec.com/pub/X11/contrib/applications/
-MASTER_SITES+=	ftp://ftp.x.org/contrib/applications/
+MASTER_SITES=  ${MASTER_SITE_XCONTRIB}
+MASTER_SITE_SUBDIR=	applications
 
 PATCH_SITES=	${MASTER_SITES}
 PATCHFILES=	${DISTNAME}.patches
diff --git a/x11/xscreensaver/Makefile b/x11/xscreensaver/Makefile
index 43f13128d22f..bb93e610b399 100644
--- a/x11/xscreensaver/Makefile
+++ b/x11/xscreensaver/Makefile
@@ -3,13 +3,13 @@
 # Date created:         10 July 1995
 # Whom:                 asami
 #
-# $Id: Makefile,v 1.4 1995/04/12 20:31:54 asami Exp $
+# $Id: Makefile,v 1.1.1.1 1995/07/11 06:50:12 asami Exp $
 #
 
 DISTNAME=	xscreensaver-1.25
-CATEGORIES+=	x11
-MASTER_SITES=	ftp://ftp.x.org/contrib/applications/ \
-		ftp://crl.dec.com/pub/X11/contrib/applications/
+CATEGORIES=	x11
+MASTER_SITES=	${MASTER_SITE_XCONTRIB}
+MASTER_SITE_SUBDIR=	applications
 EXTRACT_SUFX=	.tar.Z
 
 MAINTAINER=	asami@FreeBSD.ORG
diff --git a/x11/xsnow/Makefile b/x11/xsnow/Makefile
index 7f73133f5698..4e04c6c990ca 100644
--- a/x11/xsnow/Makefile
+++ b/x11/xsnow/Makefile
@@ -3,12 +3,13 @@
 # Date created:         12 November 1994
 # Whom:                 jmz
 #
-# $Id: Makefile,v 1.5 1995/04/12 15:22:40 asami Exp $
+# $Id: Makefile,v 1.6 1995/11/26 09:51:30 asami Exp $
 #
 
 DISTNAME=	xsnow-1.40
-CATEGORIES+=	x11
-MASTER_SITES=	ftp://ftp.x.org/contrib/games/
+CATEGORIES=	x11
+MASTER_SITES=	${MASTER_SITE_XCONTRIB}
+MASTER_SITE_SUBDIR=	games
 EXTRACT_SUFX=	.tar.Z
 
 MAINTAINER=	jmz@FreeBSD.org