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

8 files changed, 31 insertions, 41 deletions

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