Yet another round of Makefile updates, graphics version.

21 files changed, 123 insertions, 88 deletions

diff --git a/graphics/ImageMagick/Makefile b/graphics/ImageMagick/Makefile
index 1f309ab88ced..d4547103fb74 100644
--- a/graphics/ImageMagick/Makefile
+++ b/graphics/ImageMagick/Makefile
@@ -1,22 +1,23 @@
 # New ports collection makefile for:	ImageMagick
-# Version required:	3.4
+# Version required:	3.6
 # Date created:		15 November 1994
 # Whom:			torstenb
 #
-# $Id: Makefile,v 1.2 1995/03/28 06:29:01 gpalmer Exp $
+# $Id: Makefile,v 1.3 1995/04/01 12:45:44 jkh Exp $
 #
 
 DISTNAME=	ImageMagick-3.6
-MASTER_SITES=	ftp://ftp.x.org/contrib/applications/ImageMagick/
 CATEGORIES+=	graphics
+MASTER_SITES=	ftp://ftp.x.org/contrib/applications/ImageMagick/
+
+LIB_DEPENDS=	jpeg\\.5\\.:${PORTSDIR}/graphics/jpeg \
+		mpeg\\.1\\.:${PORTSDIR}/graphics/mpeg-lib \
+		tiff\\.3\\.:${PORTSDIR}/graphics/tiff \
+		Xpm\\.4\\.:${PORTSDIR}/graphics/xpm
+
 WRKSRC=		${WRKDIR}/ImageMagick
 USE_IMAKE=	YES
 
-LIB_DEPENDS+=	jpeg\\.5\\.:${PORTSDIR}/graphics/jpeg
-LIB_DEPENDS+=	mpeg\\.1\\.:${PORTSDIR}/graphics/mpeg-lib
-LIB_DEPENDS+=	tiff\\.3\\.:${PORTSDIR}/graphics/tiff
-LIB_DEPENDS+=	Xpm\\.4\\.:${PORTSDIR}/graphics/xpm
-
 pre-build:
 	@(cd ${WRKSRC}/magick;make)
 
diff --git a/graphics/Mesa3/Makefile b/graphics/Mesa3/Makefile
index 039f01d86f27..78c5b66bf73c 100644
--- a/graphics/Mesa3/Makefile
+++ b/graphics/Mesa3/Makefile
@@ -3,18 +3,20 @@
 # Date created:         Tue Feb  7 12:02:49  1995
 # Whom:                 hsu
 #
-# $Id: Makefile,v 1.6 1995/04/04 04:56:34 hsu Exp $
+# $Id: Makefile,v 1.7 1995/04/04 06:09:38 jkh Exp $
 #
 
 DISTNAME=       Mesa-1.1.3beta
-MASTER_SITES=   ftp://iris.ssec.wisc.edu/pub/misc/
+PKGNAME=	Mesa-1.1.3b
 CATEGORIES+=	graphics
+MASTER_SITES=   ftp://iris.ssec.wisc.edu/pub/misc/
+
+# won't install until I convert the Makefiles to Imakefiles
+NO_INSTALL=	yes
 WRKSRC=		${WRKDIR}/Mesa
 USE_GMAKE=	yes
 USE_X11=	yes
 ALL_TARGET=	freebsd
-# won't install until I convert the Makefiles to Imakefiles
-NO_INSTALL=	yes
 
 # won't need this after I convert the Makefiles to Imakefiles
 pre-build:
diff --git a/graphics/dore/Makefile b/graphics/dore/Makefile
index d5585ea6b03c..b8729ce3b960 100644
--- a/graphics/dore/Makefile
+++ b/graphics/dore/Makefile
@@ -3,19 +3,20 @@
 # Date created:		10 February 1995
 # Whom:			jkh
 #
-# $Id: Makefile,v 1.1.1.1 1995/02/19 10:34:04 jkh Exp $
+# $Id: Makefile,v 1.2 1995/04/01 12:45:49 jkh Exp $
 #
 
 DISTNAME=	pdore-6.0
-MASTER_SITES=   ftp://freefall.cdrom.com/pub/FreeBSD/LOCAL_PORTS/
 CATEGORIES+=	graphics
-USE_GMAKE=	yes
-PREFIX=		${X11BASE}
+MASTER_SITES=   ftp://freefall.cdrom.com/pub/FreeBSD/LOCAL_PORTS/
 EXTRACT_SUFX=	.tar.Z
+
+USE_GMAKE=	yes
+USE_X11=	yes
 WRKDIR=		${.CURDIR}/work/dore
+NO_WRKSUBDIR=	yes
 MAKEFILE=	mk.stdx
 MAKE_FLAGS=	DORE_LOC=${WRKDIR}/.. CFLAGS=-O2 MAKEFLAGS=m -f
 ALL_TARGET=
-NO_WRKSUBDIR=	yes
 
 .include <bsd.port.mk>
diff --git a/graphics/jpeg-mmx/Makefile b/graphics/jpeg-mmx/Makefile
index a834f0edb7f6..383ad776e092 100644
--- a/graphics/jpeg-mmx/Makefile
+++ b/graphics/jpeg-mmx/Makefile
@@ -3,14 +3,16 @@
 # Date created:		6 November 1994
 # Whom:			smace
 #
-# $Id: Makefile,v 1.4 1995/01/28 07:26:11 asami Exp $
+# $Id: Makefile,v 1.5 1995/04/01 12:45:51 jkh Exp $
 #
 
 DISTNAME=	jpegsrc.v5a
 PKGNAME=	jpeg-5a
-GNU_CONFIGURE=	yes
-MASTER_SITES=	ftp://ftp.uu.net/graphics/jpeg/ ftp://ftp.netcom.com/pub/tgl/uunet/
 CATEGORIES+=	graphics
+MASTER_SITES=	ftp://ftp.uu.net/graphics/jpeg/ \
+		ftp://ftp.netcom.com/pub/tgl/uunet/
+
 WRKSRC=		${WRKDIR}/jpeg-5a
+GNU_CONFIGURE=	yes
 
 .include <bsd.port.mk>
diff --git a/graphics/jpeg/Makefile b/graphics/jpeg/Makefile
index a834f0edb7f6..383ad776e092 100644
--- a/graphics/jpeg/Makefile
+++ b/graphics/jpeg/Makefile
@@ -3,14 +3,16 @@
 # Date created:		6 November 1994
 # Whom:			smace
 #
-# $Id: Makefile,v 1.4 1995/01/28 07:26:11 asami Exp $
+# $Id: Makefile,v 1.5 1995/04/01 12:45:51 jkh Exp $
 #
 
 DISTNAME=	jpegsrc.v5a
 PKGNAME=	jpeg-5a
-GNU_CONFIGURE=	yes
-MASTER_SITES=	ftp://ftp.uu.net/graphics/jpeg/ ftp://ftp.netcom.com/pub/tgl/uunet/
 CATEGORIES+=	graphics
+MASTER_SITES=	ftp://ftp.uu.net/graphics/jpeg/ \
+		ftp://ftp.netcom.com/pub/tgl/uunet/
+
 WRKSRC=		${WRKDIR}/jpeg-5a
+GNU_CONFIGURE=	yes
 
 .include <bsd.port.mk>
diff --git a/graphics/mesagl/Makefile b/graphics/mesagl/Makefile
index 039f01d86f27..78c5b66bf73c 100644
--- a/graphics/mesagl/Makefile
+++ b/graphics/mesagl/Makefile
@@ -3,18 +3,20 @@
 # Date created:         Tue Feb  7 12:02:49  1995
 # Whom:                 hsu
 #
-# $Id: Makefile,v 1.6 1995/04/04 04:56:34 hsu Exp $
+# $Id: Makefile,v 1.7 1995/04/04 06:09:38 jkh Exp $
 #
 
 DISTNAME=       Mesa-1.1.3beta
-MASTER_SITES=   ftp://iris.ssec.wisc.edu/pub/misc/
+PKGNAME=	Mesa-1.1.3b
 CATEGORIES+=	graphics
+MASTER_SITES=   ftp://iris.ssec.wisc.edu/pub/misc/
+
+# won't install until I convert the Makefiles to Imakefiles
+NO_INSTALL=	yes
 WRKSRC=		${WRKDIR}/Mesa
 USE_GMAKE=	yes
 USE_X11=	yes
 ALL_TARGET=	freebsd
-# won't install until I convert the Makefiles to Imakefiles
-NO_INSTALL=	yes
 
 # won't need this after I convert the Makefiles to Imakefiles
 pre-build:
diff --git a/graphics/mpeg-lib/Makefile b/graphics/mpeg-lib/Makefile
index bedf63b15be4..04a57cd45f1f 100644
--- a/graphics/mpeg-lib/Makefile
+++ b/graphics/mpeg-lib/Makefile
@@ -3,12 +3,13 @@
 # Date created:		16 November 1994
 # Whom:			torstenb
 #
-# $Id: Makefile,v 1.1.1.1 1994/11/20 16:00:09 torstenb Exp $
+# $Id: Makefile,v 1.2 1995/04/01 12:45:52 jkh Exp $
 #
 
 DISTNAME=	mpeg_lib-1.1
-MASTER_SITES=	ftp://ftp.mni.mcgill.ca/pub/mpeg/
 CATEGORIES+=	graphics
+MASTER_SITES=	ftp://ftp.mni.mcgill.ca/pub/mpeg/
+
 WRKSRC=		${WRKDIR}/mpeg_lib
 
 pre-install:
diff --git a/graphics/mpeg_play/Makefile b/graphics/mpeg_play/Makefile
index c6f6f8217193..c85abac5c6bd 100644
--- a/graphics/mpeg_play/Makefile
+++ b/graphics/mpeg_play/Makefile
@@ -3,16 +3,18 @@
 # Date created:		17 December 1994
 # Whom:			asami
 #
-# $Id: Makefile,v 1.3 1995/03/24 11:09:05 asami Exp $
+# $Id: Makefile,v 1.4 1995/04/01 12:45:54 jkh Exp $
 #
 
 DISTNAME=	mpeg_play-2.0
-USE_IMAKE=	yes
-MASTER_SITES=	ftp://s2k-ftp.cs.berkeley.edu/pub/multimedia/mpeg/
 CATEGORIES+=	graphics
-MAINTAINER=	asami@FreeBSD.ORG
+MASTER_SITES=	ftp://s2k-ftp.cs.berkeley.edu/pub/multimedia/mpeg/
 EXTRACT_SUFX=	.tar.Z
+
+MAINTAINER=	asami@FreeBSD.ORG
+
 NO_WRKSUBDIR=	yes
+USE_IMAKE=	yes
 
 pre-patch:
 	cp ${WRKSRC}/Imakefile.proto ${WRKSRC}/Imakefile
diff --git a/graphics/netpbm/Makefile b/graphics/netpbm/Makefile
index 6c893e13a126..597e465d3184 100644
--- a/graphics/netpbm/Makefile
+++ b/graphics/netpbm/Makefile
@@ -3,16 +3,19 @@
 # Date created:		?
 # Whom:			jmz (original)
 #
-# $Id: Makefile,v 1.5 1995/03/24 11:09:06 asami Exp $
+# $Id: Makefile,v 1.6 1995/04/01 12:45:56 jkh Exp $
 #
 
 DISTNAME=	netpbm
-DISTFILES=	netpbm-1mar1994.tar.gz
-MASTER_SITES=	ftp://ftp.x.org/R5contrib/
+PKGNAME=	netpbm-94.3.1
 CATEGORIES+=	graphics
+MASTER_SITES=	ftp://ftp.x.org/R5contrib/
+DISTFILES=	netpbm-1mar1994.tar.gz
+
 MAINTAINER=	asami@FreeBSD.ORG
-USE_IMAKE=	yes
 
 LIB_DEPENDS=	tiff\\.3\\.:${PORTSDIR}/graphics/tiff
 
+USE_IMAKE=	yes
+
 .include <bsd.port.mk>
diff --git a/graphics/pixmap/Makefile b/graphics/pixmap/Makefile
index e6aaf7b9cbee..bc291f10294c 100644
--- a/graphics/pixmap/Makefile
+++ b/graphics/pixmap/Makefile
@@ -3,14 +3,17 @@
 # Date created:		19 February 1995
 # Whom:			jmz
 #
-# $Id: Makefile,v 1.4 1995/02/28 05:06:26 asami Exp $
+# $Id: Makefile,v 1.5 1995/04/01 12:45:58 jkh Exp $
 #
 
-USE_IMAKE=	yes
 DISTNAME=	pixmap2.6
-LIB_DEPENDS=	Xpm\\.4\\.:${PORTSDIR}/graphics/xpm
-MASTER_SITES=	ftp://crl.dec.com/pub/X11/contrib/applications/pixmap/
+PKGNAME=	pixmap-2.6
 CATEGORIES+=	graphics
+MASTER_SITES=	ftp://crl.dec.com/pub/X11/contrib/applications/pixmap/
+
+LIB_DEPENDS=	Xpm\\.4\\.:${PORTSDIR}/graphics/xpm
+
 WRKSRC=		${WRKDIR}/pixmap
+USE_IMAKE=	yes
 
 .include <bsd.port.mk>
diff --git a/graphics/povray/Makefile b/graphics/povray/Makefile
index cede05f4075e..724b47fdcd0d 100644
--- a/graphics/povray/Makefile
+++ b/graphics/povray/Makefile
@@ -3,15 +3,15 @@
 # Date created:         28 Dec 1994
 # Whom:                 jmacd@uclink.berkeley.edu
 #
-# $Id: Makefile,v 1.1.1.1 1994/12/29 01:10:56 swallace Exp $
+# $Id: Makefile,v 1.2 1995/04/01 12:45:59 jkh Exp $
 #
 
 DISTNAME=       POV-Ray-2.2
-MASTER_SITES=	ftp://povray.cdrom.com/pub/povray/Official/Generic-Unix/
+PKGNAME=	povray-2.2
 CATEGORIES+=	graphics
+MASTER_SITES=	ftp://povray.cdrom.com/pub/povray/Official/Generic-Unix/
 DISTFILES=      povdoc.tar.Z povscn.tar.Z povsrc.tar.Z
-EXTRACT_SUFX=	tar.Z
-NO_WRKSUBDIR=
 
+NO_WRKSUBDIR=	yes
 
 .include <bsd.port.mk>
diff --git a/graphics/povray36/Makefile b/graphics/povray36/Makefile
index cede05f4075e..724b47fdcd0d 100644
--- a/graphics/povray36/Makefile
+++ b/graphics/povray36/Makefile
@@ -3,15 +3,15 @@
 # Date created:         28 Dec 1994
 # Whom:                 jmacd@uclink.berkeley.edu
 #
-# $Id: Makefile,v 1.1.1.1 1994/12/29 01:10:56 swallace Exp $
+# $Id: Makefile,v 1.2 1995/04/01 12:45:59 jkh Exp $
 #
 
 DISTNAME=       POV-Ray-2.2
-MASTER_SITES=	ftp://povray.cdrom.com/pub/povray/Official/Generic-Unix/
+PKGNAME=	povray-2.2
 CATEGORIES+=	graphics
+MASTER_SITES=	ftp://povray.cdrom.com/pub/povray/Official/Generic-Unix/
 DISTFILES=      povdoc.tar.Z povscn.tar.Z povsrc.tar.Z
-EXTRACT_SUFX=	tar.Z
-NO_WRKSUBDIR=
 
+NO_WRKSUBDIR=	yes
 
 .include <bsd.port.mk>
diff --git a/graphics/povray37/Makefile b/graphics/povray37/Makefile
index cede05f4075e..724b47fdcd0d 100644
--- a/graphics/povray37/Makefile
+++ b/graphics/povray37/Makefile
@@ -3,15 +3,15 @@
 # Date created:         28 Dec 1994
 # Whom:                 jmacd@uclink.berkeley.edu
 #
-# $Id: Makefile,v 1.1.1.1 1994/12/29 01:10:56 swallace Exp $
+# $Id: Makefile,v 1.2 1995/04/01 12:45:59 jkh Exp $
 #
 
 DISTNAME=       POV-Ray-2.2
-MASTER_SITES=	ftp://povray.cdrom.com/pub/povray/Official/Generic-Unix/
+PKGNAME=	povray-2.2
 CATEGORIES+=	graphics
+MASTER_SITES=	ftp://povray.cdrom.com/pub/povray/Official/Generic-Unix/
 DISTFILES=      povdoc.tar.Z povscn.tar.Z povsrc.tar.Z
-EXTRACT_SUFX=	tar.Z
-NO_WRKSUBDIR=
 
+NO_WRKSUBDIR=	yes
 
 .include <bsd.port.mk>
diff --git a/graphics/vcg/Makefile b/graphics/vcg/Makefile
index 6a823937cdfa..4cde7f55a9ec 100644
--- a/graphics/vcg/Makefile
+++ b/graphics/vcg/Makefile
@@ -1,10 +1,16 @@
 # New ports collection makefile for: vcg
 # Version required:     1.30.r3.17
+# Date created: 19 February 1995
+# Whom: hsu
+#
+# $Id$
+#
 
 DISTNAME=	vcg.1.30
-DISTFILES=	vcg.1.30.r3.17.tgz
-MASTER_SITES=	ftp://ftp.cs.uni-sb.de/pub/graphics/vcg/
+PKGNAME=	vcg-1.30
 CATEGORIES+=	graphics
+MASTER_SITES=	ftp://ftp.cs.uni-sb.de/pub/graphics/vcg/
+DISTFILES=	vcg.1.30.r3.17.tgz
 
 pre-patch:
 	@mkdir -p ${WRKSRC}/preconf/X11ccFreeBSD
diff --git a/graphics/xanim/Makefile b/graphics/xanim/Makefile
index 2eecc8bb9546..783fc66d83da 100644
--- a/graphics/xanim/Makefile
+++ b/graphics/xanim/Makefile
@@ -1,16 +1,16 @@
+# New ports collection makefile for:	xanim
+# Version required:     2683
+# Date created:         Sat Nov 5 11:43:03 PST 1994
+# Whom:                 piero
 #
-# Makefile for x11/xanim (FreeBSD) - piero Sat Nov  5 11:43:03 PST 1994
-# $Id: Makefile,v 1.1.1.1 1994/11/06 22:15:45 jkh Exp $
+# $Id: Makefile,v 1.2 1995/04/01 12:46:04 jkh Exp $
 #
 
-# Distribution stuff
 DISTNAME=	xanim2683
-EXTRACT_SUFX=	.tar.Z
-MASTER_SITES=	ftp://crl.dec.com/pub/X11/contrib/applications/
+PKGNAME=	xanim-2.68.3
 CATEGORIES+=	graphics x11
-
-# working directory
-WRKDIR=		work
+MASTER_SITES=	ftp://crl.dec.com/pub/X11/contrib/applications/
+EXTRACT_SUFX=	.tar.Z
 
 USE_IMAKE=	is_set
 
diff --git a/graphics/xfig-devel/Makefile b/graphics/xfig-devel/Makefile
index 771bb4d515e0..3bafdf7109c2 100644
--- a/graphics/xfig-devel/Makefile
+++ b/graphics/xfig-devel/Makefile
@@ -1,20 +1,22 @@
 # New ports collection makefile for:	xfig
 # Version required:	3.1.3
 # Date created:		4 January 1995
-# Whom:			asami
-# Original by:		roberto
+# Whom:			roberto
 #
-# $Id: Makefile,v 1.7 1995/03/24 11:09:12 asami Exp $
+# $Id: Makefile,v 1.8 1995/04/01 12:46:06 jkh Exp $
 #
 
 DISTNAME=	xfig.3.1.3
 PKGNAME=	xfig-3.1.3
-WRKSRC=		${WRKDIR}/xfig
+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
+
 MAINTAINER=	asami@FreeBSD.ORG
+
 LIB_DEPENDS=	Xpm\\.4\\.:${PORTSDIR}/graphics/xpm
+
+WRKSRC=		${WRKDIR}/xfig
 USE_IMAKE=	yes
 MAKE_FLAGS=	BINDIR=${PREFIX}/bin MANDIR=${PREFIX}/man/man1 \
 		XAPPLOADDIR=${PREFIX}/lib/app-defaults  \
diff --git a/graphics/xfig/Makefile b/graphics/xfig/Makefile
index 771bb4d515e0..3bafdf7109c2 100644
--- a/graphics/xfig/Makefile
+++ b/graphics/xfig/Makefile
@@ -1,20 +1,22 @@
 # New ports collection makefile for:	xfig
 # Version required:	3.1.3
 # Date created:		4 January 1995
-# Whom:			asami
-# Original by:		roberto
+# Whom:			roberto
 #
-# $Id: Makefile,v 1.7 1995/03/24 11:09:12 asami Exp $
+# $Id: Makefile,v 1.8 1995/04/01 12:46:06 jkh Exp $
 #
 
 DISTNAME=	xfig.3.1.3
 PKGNAME=	xfig-3.1.3
-WRKSRC=		${WRKDIR}/xfig
+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
+
 MAINTAINER=	asami@FreeBSD.ORG
+
 LIB_DEPENDS=	Xpm\\.4\\.:${PORTSDIR}/graphics/xpm
+
+WRKSRC=		${WRKDIR}/xfig
 USE_IMAKE=	yes
 MAKE_FLAGS=	BINDIR=${PREFIX}/bin MANDIR=${PREFIX}/man/man1 \
 		XAPPLOADDIR=${PREFIX}/lib/app-defaults  \
diff --git a/graphics/xli/Makefile b/graphics/xli/Makefile
index d695191a68b4..9f2617184277 100644
--- a/graphics/xli/Makefile
+++ b/graphics/xli/Makefile
@@ -3,16 +3,17 @@
 # Date created:		24 November 1994
 # Whom:			asami
 #
-# $Id: Makefile,v 1.3 1995/03/24 11:09:14 asami Exp $
+# $Id: Makefile,v 1.4 1995/04/01 12:46:08 jkh Exp $
 #
 
 DISTNAME=	xli.1.16
-USE_IMAKE=	yes
-MASTER_SITES=	ftp://crl.dec.com/pub/X11/contrib/applications/
+PKGNAME=	xli-1.16
 CATEGORIES+=	graphics x11
-MAINTAINER=	asami@FreeBSD.ORG
-EXTRACT_SUFX=	.tar.gz
+MASTER_SITES=	ftp://crl.dec.com/pub/X11/contrib/applications/
+
+MAINTAINER=	ports@FreeBSD.ORG
+
+USE_IMAKE=	yes
 NO_WRKSUBDIR=	yes
-# PKG_CMD=	pkg_create -N
 
 .include <bsd.port.mk>
diff --git a/graphics/xpaint/Makefile b/graphics/xpaint/Makefile
index 3dc5c07b6bfe..c57ab5e892d0 100644
--- a/graphics/xpaint/Makefile
+++ b/graphics/xpaint/Makefile
@@ -3,16 +3,18 @@
 # Date created:         2 Jan 1995
 # Whom:                 swallace
 #
-# $Id: Makefile,v 1.4 1995/02/11 13:49:38 asami Exp $
+# $Id: Makefile,v 1.5 1995/04/01 12:46:10 jkh Exp $
 #
 
 DISTNAME=       xpaint-2.1.1
-MASTER_SITES=	ftp://romulus.ucs.uoknor.edu/X/R5contrib/
 CATEGORIES+=	graphics x11
+MASTER_SITES=	ftp://romulus.ucs.uoknor.edu/X/R5contrib/
+
 LIB_DEPENDS=	jpeg\\.5\\.:${PORTSDIR}/graphics/jpeg \
 		tiff\\.3\\.:${PORTSDIR}/graphics/tiff \
 		Xpm\\.4\\.:${PORTSDIR}/graphics/xpm
-USE_IMAKE=      yes
+
 WRKSRC=		${.CURDIR}/work/xpaint
+USE_IMAKE=      yes
 
 .include <bsd.port.mk>
diff --git a/graphics/xpm/Makefile b/graphics/xpm/Makefile
index 34e86a492f59..7719e25714b5 100644
--- a/graphics/xpm/Makefile
+++ b/graphics/xpm/Makefile
@@ -3,13 +3,14 @@
 # Date created:		14 September 1994
 # Whom:			jkh
 #
-# $Id: Makefile,v 1.4 1995/03/22 11:01:02 asami Exp $
+# $Id: Makefile,v 1.5 1995/04/01 12:46:12 jkh Exp $
 #
 
 DISTNAME=	xpm-3.4e
-USE_IMAKE=	yes
-MASTER_SITES=	ftp://avahi.inria.fr/pub/xpm/
 CATEGORIES+=	graphics x11
+MASTER_SITES=	ftp://avahi.inria.fr/pub/xpm/
+
+USE_IMAKE=	yes
 XMKMF=		xmkmf
 
 .include <bsd.port.mk>
diff --git a/graphics/xv/Makefile b/graphics/xv/Makefile
index e9e732689855..fbd0a577c969 100644
--- a/graphics/xv/Makefile
+++ b/graphics/xv/Makefile
@@ -3,14 +3,16 @@
 # Date created:		30 October 1994
 # Whom:			smace
 #
-# $Id: Makefile,v 1.5 1995/02/11 13:49:40 asami Exp $
+# $Id: Makefile,v 1.6 1995/04/01 12:46:17 jkh Exp $
 #
 
 DISTNAME=	xv-3.10a
-USE_IMAKE=	yes
-MASTER_SITES=	ftp://ftp.cis.upenn.edu/pub/xv/
 CATEGORIES+=	graphics x11
+MASTER_SITES=	ftp://ftp.cis.upenn.edu/pub/xv/
+
 LIB_DEPENDS=	jpeg\\.5\\.:${PORTSDIR}/graphics/jpeg \
 		tiff\\.3\\.:${PORTSDIR}/graphics/tiff
 
+USE_IMAKE=	yes
+
 .include <bsd.port.mk>