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

30 files changed, 67 insertions, 78 deletions

diff --git a/graphics/Mesa3/Makefile b/graphics/Mesa3/Makefile
index eeda56b89685..cae56d17efc9 100644
--- a/graphics/Mesa3/Makefile
+++ b/graphics/Mesa3/Makefile
@@ -3,11 +3,11 @@
 # Date created:         Tue Feb  7 12:02:49  1995
 # Whom:                 hsu
 #
-# $Id: Makefile,v 1.9 1996/04/12 08:29:07 asami Exp $
+# $Id: Makefile,v 1.10 1996/05/16 06:19:11 asami Exp $
 #
 
 DISTNAME=       Mesa-1.2.7
-CATEGORIES+=	graphics
+CATEGORIES=	graphics
 MASTER_SITES=   ftp://iris.ssec.wisc.edu/pub/Mesa/
 
 ALL_TARGET=     freebsd
diff --git a/graphics/aero/Makefile b/graphics/aero/Makefile
index 6e0940c584b9..7d713f74c748 100644
--- a/graphics/aero/Makefile
+++ b/graphics/aero/Makefile
@@ -3,12 +3,12 @@
 # Date created:         Mon Aug 28 13:35:31 CDT 1995
 # Whom:                 erich@rrnet.com
 #
-# $Id: Makefile,v 1.4 1996/08/20 13:32:17 erich Exp $
+# $Id: Makefile,v 1.5 1996/08/22 12:46:41 erich Exp $
 #
 
 DISTNAME=	aero_1.5.2_src
 PKGNAME=	aero-1.5.2
-CATEGORIES+=	graphics
+CATEGORIES=	graphics
 MASTER_SITES=	ftp://ftp.povray.org/pub/povray/modellers/aero/
 
 MAINTAINER=	erich@FreeBSD.org
diff --git a/graphics/dore/Makefile b/graphics/dore/Makefile
index 08f01cae21e9..ffe8833b7e10 100644
--- a/graphics/dore/Makefile
+++ b/graphics/dore/Makefile
@@ -3,11 +3,11 @@
 # Date created:		10 February 1995
 # Whom:			jkh
 #
-# $Id: Makefile,v 1.3 1995/04/09 07:09:33 asami Exp $
+# $Id: Makefile,v 1.4 1996/03/07 00:21:43 asami Exp $
 #
 
 DISTNAME=	pdore-6.0
-CATEGORIES+=	graphics
+CATEGORIES=	graphics
 MASTER_SITES=   ftp://freefall.freebsd.org/pub/FreeBSD/LOCAL_PORTS/
 EXTRACT_SUFX=	.tar.Z
 
diff --git a/graphics/giftool/Makefile b/graphics/giftool/Makefile
index ef814245aa46..add0f27747bb 100644
--- a/graphics/giftool/Makefile
+++ b/graphics/giftool/Makefile
@@ -3,12 +3,12 @@
 # Date created:        14 October 1996
 # Whom:                Yukihiro Nakai <Nakai@Mlab.t.u-tokyo.ac.jp>
 #
-# $Id$
+# $Id: Makefile,v 1.1.1.1 1996/10/30 13:44:05 jfitz Exp $
 #
 
 DISTNAME=	giftool
 PKGNAME=        giftool-0.9
-CATEGORIES+=	graphics
+CATEGORIES=	graphics
 MASTER_SITES=   ftp://ftp.huie.hokudai.ac.jp/pub/tool/graphics/
 
 MAINTAINER=	Nakai@Mlab.t.u-tokyo.ac.jp
diff --git a/graphics/giftrans/Makefile b/graphics/giftrans/Makefile
index def41d97bcb1..8358d75af402 100644
--- a/graphics/giftrans/Makefile
+++ b/graphics/giftrans/Makefile
@@ -3,17 +3,18 @@
 # Date created:        14 October 1996
 # Whom:                Yukihiro Nakai <Nakai@Mlab.t.u-tokyo.ac.jp>
 #
-# $Id$
+# $Id: Makefile,v 1.1.1.1 1996/10/30 11:12:25 jfitz Exp $
 #
 
 DISTNAME=	giftrans
 PKGNAME=        giftrans-1.12
-CATEGORIES+=	graphics
+CATEGORIES=	graphics
 MASTER_SITES=   ftp://ftp.lab.kdd.co.jp/infosystems/misc/tools/
 
 MAINTAINER=	Nakai@Mlab.t.u-tokyo.ac.jp
 
-CONFIGURE_ENV+=	X11BASE=${X11BASE}
+CONFIGURE_ENV=	X11BASE=${X11BASE}
+MAN1=		giftrans.1
 
 do-build:
 	(cd ${WRKSRC}; cc -O2 -m486 giftrans.c -o giftrans)
@@ -22,8 +23,4 @@ do-install:
 	@ ${INSTALL_PROGRAM} ${WRKSRC}/giftrans ${PREFIX}/bin
 	@ ${INSTALL_MAN} ${WRKSRC}/giftrans.1 ${PREFIX}/man/man1
 
-.if !defined(NOMANCOMPRESS)
-	gzip -9nf ${PREFIX}/man/man1/giftrans.1
-.endif
-
 .include <bsd.port.mk>
diff --git a/graphics/hpscan/Makefile b/graphics/hpscan/Makefile
index 7a20d9613646..a0fe599f9d60 100644
--- a/graphics/hpscan/Makefile
+++ b/graphics/hpscan/Makefile
@@ -3,12 +3,12 @@
 # Date created:		12 January 1996
 # Whom:			nate
 #
-# $Id: Makefile,v 1.4 1996/06/03 02:17:20 asami Exp $
+# $Id: Makefile,v 1.5 1996/09/26 10:54:43 jkh Exp $
 #
 
 DISTNAME=	scanner
 PKGNAME=	hpscan-1.0
-CATEGORIES+=	graphics
+CATEGORIES=	graphics
 MASTER_SITES=	ftp://freefall.freebsd.org/pub/FreeBSD/LOCAL_PORTS/ \
 		ftp://macbeth.cogsci.ed.ac.uk/pub/
 
diff --git a/graphics/mesagl/Makefile b/graphics/mesagl/Makefile
index eeda56b89685..cae56d17efc9 100644
--- a/graphics/mesagl/Makefile
+++ b/graphics/mesagl/Makefile
@@ -3,11 +3,11 @@
 # Date created:         Tue Feb  7 12:02:49  1995
 # Whom:                 hsu
 #
-# $Id: Makefile,v 1.9 1996/04/12 08:29:07 asami Exp $
+# $Id: Makefile,v 1.10 1996/05/16 06:19:11 asami Exp $
 #
 
 DISTNAME=       Mesa-1.2.7
-CATEGORIES+=	graphics
+CATEGORIES=	graphics
 MASTER_SITES=   ftp://iris.ssec.wisc.edu/pub/Mesa/
 
 ALL_TARGET=     freebsd
diff --git a/graphics/mpeg-lib/Makefile b/graphics/mpeg-lib/Makefile
index 1a0f2a2a017e..47a197518224 100644
--- a/graphics/mpeg-lib/Makefile
+++ b/graphics/mpeg-lib/Makefile
@@ -3,11 +3,11 @@
 # Date created:		16 November 1994
 # Whom:			torstenb
 #
-# $Id: Makefile,v 1.3 1995/04/09 07:09:35 asami Exp $
+# $Id: Makefile,v 1.4 1995/06/24 11:38:07 asami Exp $
 #
 
 DISTNAME=	mpeg_lib-1.1
-CATEGORIES+=	graphics
+CATEGORIES=	graphics
 MASTER_SITES=	ftp://ftp.mni.mcgill.ca/pub/mpeg/
 
 WRKSRC=		${WRKDIR}/mpeg_lib
diff --git a/graphics/mpeg2codec/Makefile b/graphics/mpeg2codec/Makefile
index 7fe575fb24d5..99c6415367c4 100644
--- a/graphics/mpeg2codec/Makefile
+++ b/graphics/mpeg2codec/Makefile
@@ -3,11 +3,11 @@
 # Date created:		June 21, 1996
 # Whom:			"Philippe Charnier" <charnier@lirmm.fr>
 #
-# $Id$
+# $Id: Makefile,v 1.1.1.1 1996/07/10 05:32:53 asami Exp $
 #
 
 DISTNAME=	mpeg2codec-1.1a
-CATEGORIES+=	graphics
+CATEGORIES=	graphics
 MASTER_SITES=	ftp://ftp.netcom.com/pub/cf/cfogg/mpeg2/
 DISTFILES=	mpeg2codec_v1.1a.tar.gz
 
diff --git a/graphics/mpeg2play/Makefile b/graphics/mpeg2play/Makefile
index 55504a2be18d..a402195e4e56 100644
--- a/graphics/mpeg2play/Makefile
+++ b/graphics/mpeg2play/Makefile
@@ -3,11 +3,11 @@
 # Date created:		June 21, 1996
 # Whom:			"Philippe Charnier" <charnier@lirmm.fr>
 #
-# $Id$
+# $Id: Makefile,v 1.1.1.1 1996/07/10 05:38:41 asami Exp $
 #
 
 DISTNAME=	mpeg2play-1.1b
-CATEGORIES+=	graphics
+CATEGORIES=	graphics
 MASTER_SITES=	ftp://ftp.netcom.com/pub/cf/cfogg/mpeg2/
 DISTFILES=	mpeg2play_v1.1b.tar.gz
 
diff --git a/graphics/mpeg_encode/Makefile b/graphics/mpeg_encode/Makefile
index f962097b1185..56c51150c5d6 100644
--- a/graphics/mpeg_encode/Makefile
+++ b/graphics/mpeg_encode/Makefile
@@ -3,12 +3,12 @@
 # Date created:         
 # Whom:                 erich@FreeBSD.org
 #
-# $Id: Makefile,v 1.1.1.1 1996/08/01 20:04:36 erich Exp $
+# $Id: Makefile,v 1.2 1996/08/02 07:32:41 asami Exp $
 #
 
 DISTNAME=	mpeg_encode-1.5b-src
 PKGNAME=	mpeg_encode-1.5b
-CATEGORIES+=	graphics
+CATEGORIES=	graphics
 MASTER_SITES=	ftp://s2k-ftp.CS.Berkeley.EDU/pub/multimedia/mpeg/encode/
 
 MAINTAINER=	erich@FreeBSD.org
diff --git a/graphics/mpeg_play/Makefile b/graphics/mpeg_play/Makefile
index 6673592b671d..14c83dd0f180 100644
--- a/graphics/mpeg_play/Makefile
+++ b/graphics/mpeg_play/Makefile
@@ -3,11 +3,11 @@
 # Date created:		17 December 1994
 # Whom:			asami
 #
-# $Id: Makefile,v 1.6 1996/02/07 09:28:22 asami Exp $
+# $Id: Makefile,v 1.7 1996/06/12 03:09:02 asami Exp $
 #
 
 DISTNAME=	mpeg_play-2.3
-CATEGORIES+=	graphics
+CATEGORIES=	graphics
 MASTER_SITES=	ftp://mm-ftp.cs.berkeley.edu/pub/multimedia/mpeg/play/
 EXTRACT_SUFX=	-src.tar.gz
 
diff --git a/graphics/mpeg_stat/Makefile b/graphics/mpeg_stat/Makefile
index c4998334cfe6..14cc5839e88e 100644
--- a/graphics/mpeg_stat/Makefile
+++ b/graphics/mpeg_stat/Makefile
@@ -3,12 +3,12 @@
 # Date created:         Thu Aug  1 21:52:06 CDT 1996
 # Whom:                 erich@FreeBSD.org
 #
-# $Id: Makefile,v 1.1.1.1 1996/08/16 13:40:48 erich Exp $
+# $Id: Makefile,v 1.2 1996/08/17 10:31:50 asami Exp $
 #
 
 DISTNAME=	mpeg_stat-2.2b-src
 PKGNAME=	mpeg_stat-2.2b
-CATEGORIES+=	graphics
+CATEGORIES=	graphics
 MASTER_SITES=	ftp://s2k-ftp.CS.Berkeley.EDU/pub/multimedia/mpeg/stat/
 
 MAINTAINER=	erich@FreeBSD.org
diff --git a/graphics/mpegedit/Makefile b/graphics/mpegedit/Makefile
index e2db7ffbd328..f403d725a140 100644
--- a/graphics/mpegedit/Makefile
+++ b/graphics/mpegedit/Makefile
@@ -3,12 +3,12 @@
 # Date created:         Thu Aug  1 10:50:57 CDT 1996
 # Whom:                 erich@FreeBSD.org
 #
-# $Id: Makefile,v 1.1.1.1 1996/08/01 20:11:56 erich Exp $
+# $Id: Makefile,v 1.2 1996/08/02 07:43:06 asami Exp $
 #
 
 DISTNAME=	mpegedit_v2.2
 PKGNAME=	mpegedit-2.2
-CATEGORIES+=	graphics
+CATEGORIES=	graphics
 MASTER_SITES=	ftp://ftp.demon.co.uk/.d2/unix/unix/tools/
 
 MAINTAINER=	erich@FreeBSD.org
diff --git a/graphics/mplex/Makefile b/graphics/mplex/Makefile
index 2fea73450e95..48e2eae48e55 100644
--- a/graphics/mplex/Makefile
+++ b/graphics/mplex/Makefile
@@ -3,12 +3,12 @@
 # Date created:         Wed Jul 31 20:54:54 CDT 1996
 # Whom:                 erich@FreeBSD.org
 #
-# $Id$
+# $Id: Makefile,v 1.1.1.1 1996/08/01 20:18:17 erich Exp $
 #
 
 DISTNAME=	mplex-1.1
 
-CATEGORIES+=	graphics
+CATEGORIES=	graphics
 MASTER_SITES=	ftp://ftp.informatik.tu-muenchen.de/pub/comp/graphics/mpeg/mplex/
 
 MAINTAINER=	erich@FreeBSD.org
diff --git a/graphics/netpbm/Makefile b/graphics/netpbm/Makefile
index 597e465d3184..e298c10b9df9 100644
--- a/graphics/netpbm/Makefile
+++ b/graphics/netpbm/Makefile
@@ -3,12 +3,12 @@
 # Date created:		?
 # Whom:			jmz (original)
 #
-# $Id: Makefile,v 1.6 1995/04/01 12:45:56 jkh Exp $
+# $Id: Makefile,v 1.7 1995/04/09 07:09:38 asami Exp $
 #
 
 DISTNAME=	netpbm
 PKGNAME=	netpbm-94.3.1
-CATEGORIES+=	graphics
+CATEGORIES=	graphics
 MASTER_SITES=	ftp://ftp.x.org/R5contrib/
 DISTFILES=	netpbm-1mar1994.tar.gz
 
diff --git a/graphics/png/Makefile b/graphics/png/Makefile
index 1f550fa3b602..377baac40ce7 100644
--- a/graphics/png/Makefile
+++ b/graphics/png/Makefile
@@ -3,12 +3,12 @@
 # Date created:         5 Dec 1995
 # Whom:                 ache
 #
-# $Id: Makefile,v 1.6 1996/07/17 20:07:25 ache Exp $
+# $Id: Makefile,v 1.7 1996/08/19 10:30:59 asami Exp $
 #
 
 DISTNAME=       libpng-0.89c
 PKGNAME=        png-0.89c
-CATEGORIES+=    graphics
+CATEGORIES=     graphics
 MASTER_SITES=   ftp://ftp.uu.net/graphics/png/src/
 
 MAINTAINER=     ache@FreeBSD.org
diff --git a/graphics/povray/Makefile b/graphics/povray/Makefile
index 724b47fdcd0d..39e5fd08dd7e 100644
--- a/graphics/povray/Makefile
+++ b/graphics/povray/Makefile
@@ -3,12 +3,12 @@
 # Date created:         28 Dec 1994
 # Whom:                 jmacd@uclink.berkeley.edu
 #
-# $Id: Makefile,v 1.2 1995/04/01 12:45:59 jkh Exp $
+# $Id: Makefile,v 1.3 1995/04/09 07:09:41 asami Exp $
 #
 
 DISTNAME=       POV-Ray-2.2
 PKGNAME=	povray-2.2
-CATEGORIES+=	graphics
+CATEGORIES=	graphics
 MASTER_SITES=	ftp://povray.cdrom.com/pub/povray/Official/Generic-Unix/
 DISTFILES=      povdoc.tar.Z povscn.tar.Z povsrc.tar.Z
 
diff --git a/graphics/povray36/Makefile b/graphics/povray36/Makefile
index 724b47fdcd0d..39e5fd08dd7e 100644
--- a/graphics/povray36/Makefile
+++ b/graphics/povray36/Makefile
@@ -3,12 +3,12 @@
 # Date created:         28 Dec 1994
 # Whom:                 jmacd@uclink.berkeley.edu
 #
-# $Id: Makefile,v 1.2 1995/04/01 12:45:59 jkh Exp $
+# $Id: Makefile,v 1.3 1995/04/09 07:09:41 asami Exp $
 #
 
 DISTNAME=       POV-Ray-2.2
 PKGNAME=	povray-2.2
-CATEGORIES+=	graphics
+CATEGORIES=	graphics
 MASTER_SITES=	ftp://povray.cdrom.com/pub/povray/Official/Generic-Unix/
 DISTFILES=      povdoc.tar.Z povscn.tar.Z povsrc.tar.Z
 
diff --git a/graphics/povray37/Makefile b/graphics/povray37/Makefile
index 724b47fdcd0d..39e5fd08dd7e 100644
--- a/graphics/povray37/Makefile
+++ b/graphics/povray37/Makefile
@@ -3,12 +3,12 @@
 # Date created:         28 Dec 1994
 # Whom:                 jmacd@uclink.berkeley.edu
 #
-# $Id: Makefile,v 1.2 1995/04/01 12:45:59 jkh Exp $
+# $Id: Makefile,v 1.3 1995/04/09 07:09:41 asami Exp $
 #
 
 DISTNAME=       POV-Ray-2.2
 PKGNAME=	povray-2.2
-CATEGORIES+=	graphics
+CATEGORIES=	graphics
 MASTER_SITES=	ftp://povray.cdrom.com/pub/povray/Official/Generic-Unix/
 DISTFILES=      povdoc.tar.Z povscn.tar.Z povsrc.tar.Z
 
diff --git a/graphics/spigot/Makefile b/graphics/spigot/Makefile
index 1a0d0cdef8ca..2096af50e722 100644
--- a/graphics/spigot/Makefile
+++ b/graphics/spigot/Makefile
@@ -3,11 +3,11 @@
 # Date Created:		Fri Sep 15 10:04:46 CDT 1995
 # Whom:			james@cs.uwm.edu
 #
-# $Id$
+# $Id: Makefile,v 1.2 1995/10/12 09:19:57 asami Exp $
 #
 
 DISTNAME= 	spigot-1.6
-CATEGORIES+=	graphics
+CATEGORIES=	graphics
 MASTER_SITES=	ftp://ftp.cs.uwm.edu/pub/FreeBSD/spigot/
 DISTFILES=	spigot.tar.gz
 
diff --git a/graphics/splitmpg/Makefile b/graphics/splitmpg/Makefile
index 093cd0a7c4d3..9e6fb786b1f9 100644
--- a/graphics/splitmpg/Makefile
+++ b/graphics/splitmpg/Makefile
@@ -3,12 +3,12 @@
 # Date created:         Wed Jul 31 21:59:42 CDT 1996
 # Whom:                 erich@FreeBSD.org
 #
-# $Id: Makefile,v 1.1.1.1 1996/08/01 20:22:28 erich Exp $
+# $Id: Makefile,v 1.2 1996/08/02 08:25:02 asami Exp $
 #
 
 DISTNAME=	splitmpg
 PKGNAME=	splitmpg-1.0
-CATEGORIES+=	graphics
+CATEGORIES=	graphics
 MASTER_SITES=	ftp://ftp.ecel.uwa.edu.au/users/michael/
 EXTRACT_SUFX=	.tgz
 
diff --git a/graphics/vcg/Makefile b/graphics/vcg/Makefile
index f6235cfe148d..9084e11d3ccc 100644
--- a/graphics/vcg/Makefile
+++ b/graphics/vcg/Makefile
@@ -3,12 +3,12 @@
 # Date created: 19 February 1995
 # Whom: hsu
 #
-# $Id: Makefile,v 1.3 1995/04/09 07:09:43 asami Exp $
+# $Id: Makefile,v 1.4 1995/05/16 11:34:33 asami Exp $
 #
 
 DISTNAME=	vcg.1.30
 PKGNAME=	vcg-1.30
-CATEGORIES+=	graphics
+CATEGORIES=	graphics
 MASTER_SITES=	ftp://ftp.cs.uni-sb.de/pub/graphics/vcg/
 DISTFILES=	vcg.1.30.r3.17.tgz
 
diff --git a/graphics/xanim/Makefile b/graphics/xanim/Makefile
index 3c6241bb3450..52074373ee1d 100644
--- a/graphics/xanim/Makefile
+++ b/graphics/xanim/Makefile
@@ -3,12 +3,12 @@
 # Date created:         Sat Nov 5 11:43:03 PST 1994
 # Whom:                 piero
 #
-# $Id: Makefile,v 1.8 1996/03/26 04:02:32 ache Exp $
+# $Id: Makefile,v 1.9 1996/09/26 21:27:12 ache Exp $
 #
 
 DISTNAME=       xanim27063
 PKGNAME=        xanim-2.70.6.3
-CATEGORIES+=	graphics x11
+CATEGORIES=	graphics x11
 MASTER_SITES=	ftp://ftp.portal.com/pub/podlipec/ \
 		ftp://ftp.portal.com/pub/podlipec/cinepak/ \
 		ftp://ftp.portal.com/pub/podlipec/indeo/ \
diff --git a/graphics/xdl/Makefile b/graphics/xdl/Makefile
index 384cc3a2cce6..d7d3b2d407d0 100644
--- a/graphics/xdl/Makefile
+++ b/graphics/xdl/Makefile
@@ -3,18 +3,16 @@
 # Date created:         17 July 1995
 # Whom:                 asami
 #
-# $Id: Makefile,v 1.1.1.1 1995/07/18 00:32:33 asami Exp $
+# $Id: Makefile,v 1.2 1995/07/27 10:11:27 ats Exp $
 #
 
 DISTNAME=	xdl-2.1
-CATEGORIES+=	graphics x11
+CATEGORIES=	graphics x11
 MASTER_SITES=	ftp://ftp.uoknor.edu/src/X11R5/
 
 MAINTAINER=	asami@FreeBSD.ORG
 
 USE_X11=	yes
-
-post-install:
-	gzip -9nf ${PREFIX}/man/man1/xdl.1
+MAN1=		xdl.1
 
 .include <bsd.port.mk>
diff --git a/graphics/xfractint/Makefile b/graphics/xfractint/Makefile
index c189cc0fffc4..59a2d61a6359 100644
--- a/graphics/xfractint/Makefile
+++ b/graphics/xfractint/Makefile
@@ -3,12 +3,12 @@
 # Date created:         7 Sept 1995
 # Whom:                 cacho@mexicano.gdl.iteso.mx
 #
-# $Id$
+# $Id: Makefile,v 1.1.1.1 1995/09/09 04:21:56 asami Exp $
 #
 
 DISTNAME=       xfract300
 PKGNAME=	xfractint-3.00
-CATEGORIES+=	graphics
+CATEGORIES=	graphics
 MASTER_SITES=	ftp://ftp.cs.berkeley.edu/ucb/sprite/
 EXTRACT_SUFX=	.shar.Z
 
@@ -16,10 +16,6 @@ EXTRACT_CMD=	zcat
 EXTRACT_BEFORE_ARGS=
 EXTRACT_AFTER_ARGS=	|sh
 NO_WRKSUBDIR=	yes
-
-post-install:
-.if !defined(NOMANCOMPRESS)
-	gzip -9nf ${PREFIX}/man/man1/xfractint.1
-.endif
+MAN1=		xfractint.1
 
 .include <bsd.port.mk>
diff --git a/graphics/xgrasp/Makefile b/graphics/xgrasp/Makefile
index 742bf245bc85..14c03996f2e6 100644
--- a/graphics/xgrasp/Makefile
+++ b/graphics/xgrasp/Makefile
@@ -3,12 +3,12 @@
 # Date created:         23 July 1995
 # Whom:                 asami
 #
-# $Id: Makefile,v 1.1.1.1 1995/07/18 00:32:33 asami Exp $
+# $Id: Makefile,v 1.1.1.1 1995/07/29 11:30:49 asami Exp $
 #
 
 DISTNAME=	xgrasp.1.7d
 PKGNAME=	xgrasp-1.7d
-CATEGORIES+=	graphics x11
+CATEGORIES=	graphics x11
 MASTER_SITES=	ftp://qiclab.scn.rain.com/pub/X11/	\
 		ftp://ftp.cs.ubc.ca/mirror1/x-contrib.R5/
 EXTRACT_SUFX=	.tar.Z
diff --git a/graphics/xpaint/Makefile b/graphics/xpaint/Makefile
index d2ba853c40a3..305b4e137ad7 100644
--- a/graphics/xpaint/Makefile
+++ b/graphics/xpaint/Makefile
@@ -3,11 +3,11 @@
 # Date created:         2 Jan 1995
 # Whom:                 swallace
 #
-# $Id: Makefile,v 1.8 1996/06/15 00:51:15 asami Exp $
+# $Id: Makefile,v 1.9 1996/09/29 16:08:44 chuckr Exp $
 #
 
 DISTNAME=       xpaint-2.4.6
-CATEGORIES+=	graphics x11
+CATEGORIES=	graphics x11
 MASTER_SITES=	http://www2.dk-online.dk/users/Torsten_Martinsen/xpaint/
 
 LIB_DEPENDS=    jpeg\\.6\\.:${PORTSDIR}/graphics/jpeg \
diff --git a/graphics/xpdf/Makefile b/graphics/xpdf/Makefile
index d582855eb394..a7e3cb6b0060 100644
--- a/graphics/xpdf/Makefile
+++ b/graphics/xpdf/Makefile
@@ -3,22 +3,20 @@
 # Date created:         02 Feb 1996
 # Whom:                 chuckr@glue.umd.edu
 #
-# $Id: Makefile,v 1.5 1996/05/30 11:11:10 peter Exp $
+# $Id: Makefile,v 1.6 1996/06/03 00:13:01 asami Exp $
 #
 
 DISTNAME=       xpdf-0.5
-CATEGORIES+=	graphics
+CATEGORIES=	graphics
 MASTER_SITES=   ftp://ftp.andrew.cmu.edu/pub/xpdf/
 
 MAINTAINER=	chuckr@glue.umd.edu
 
 USE_X11=	yes
+MAN1=		xpdf.1 pdftops.1
 
 post-install:
-	install -c -m 444 ${WRKSRC}/xpdf.1 ${PREFIX}/man/man1
-	install -c -m 444 ${WRKSRC}/pdftops.1 ${PREFIX}/man/man1
-.if !defined(NOMANCOMPRESS)
-	gzip -9nf ${PREFIX}/man/man1/xpdf.1 ${PREFIX}/man/man1/pdftops.1
-.endif
+	${INSTALL_MAN} ${WRKSRC}/xpdf.1 ${PREFIX}/man/man1
+	${INSTALL_MAN} ${WRKSRC}/pdftops.1 ${PREFIX}/man/man1
 
 .include <bsd.port.mk>
diff --git a/graphics/xpm/Makefile b/graphics/xpm/Makefile
index b27a30d30783..c028ea6f55bf 100644
--- a/graphics/xpm/Makefile
+++ b/graphics/xpm/Makefile
@@ -3,11 +3,11 @@
 # Date created:		14 September 1994
 # Whom:			jkh
 #
-# $Id: Makefile,v 1.9 1995/08/06 22:16:27 torstenb Exp $
+# $Id: Makefile,v 1.10 1996/09/14 22:52:09 torstenb Exp $
 #
 
 DISTNAME=	xpm-3.4i
-CATEGORIES+=	graphics x11
+CATEGORIES=	graphics x11
 MASTER_SITES=	ftp://avahi.inria.fr/pub/xpm/
 
 USE_IMAKE=	yes