Use MASTER_SITE_XCONTRIB. Use MAN? macros. CATEGORIES+= -> CATEGORIES.

10 files changed, 39 insertions, 32 deletions

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