Use "USE_XPM" option instead of direct dependence on the "xpm" package.

19 files changed, 67 insertions, 78 deletions

diff --git a/games/crossfire/Makefile b/games/crossfire/Makefile
index 5b805192b9c..f4541cccc22 100644
--- a/games/crossfire/Makefile
+++ b/games/crossfire/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2000/07/11 08:38:01 agc Exp $
+# $NetBSD: Makefile,v 1.8 2000/08/23 23:14:24 tron Exp $
 #
 
 DISTNAME=	crossfire-0.94.2
@@ -10,7 +10,6 @@ MAINTAINER=	root@garbled.net
 HOMEPAGE=	http://www.fak14.uni-muenchen.de/~h729ihqu/games/crossfire.html
 
 DEPENDS+=	rplay>=3.2.0:../../audio/rplay
-DEPENDS+=	xpm-3.4k:../../graphics/xpm
 
 EXTRACT_ONLY=	${CF_SRC}
 
@@ -18,8 +17,9 @@ CF_SRC=		crossfire-0.94.2.tar.gz
 CF_MAPS=	crossfire-0.94.2.maps.tar.gz
 CF_SOUND=	crossfire-0.92.7.sounds.tar.gz
 
-USE_IMAKE=	yes
-USE_PERL5=	yes
+USE_IMAKE=	YES
+USE_PERL5=	YES
+USE_XPM=	YES
 SCRIPTS_ENV+=	${SCRIPTSDIR}
 
 INSTALL_FILE=	${WRKDIR}/.INSTALL
diff --git a/games/freeciv-client/Makefile b/games/freeciv-client/Makefile
index c9d80a2f1f4..f954ad62e1d 100644
--- a/games/freeciv-client/Makefile
+++ b/games/freeciv-client/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2000/08/12 06:34:33 jlam Exp $
+# $NetBSD: Makefile,v 1.4 2000/08/23 23:14:27 tron Exp $
 
 PKGNAME=		${DISTNAME:S/-/-client-/}
 
@@ -8,8 +8,9 @@ DEPENDS+=		xpm-*:../../graphics/xpm
 
 CONFLICTS=		freeciv-client-gtk-*
 
-USE_XAW=		# defined
-USE_X11=		# defined
+USE_X11=		YES
+USE_XAW=		YES
+USE_XPM=		YES
 
 .include "../../mk/bsd.prefs.mk"
 
diff --git a/games/maelstrom/Makefile b/games/maelstrom/Makefile
index f1d497f241c..e66a3578ba3 100644
--- a/games/maelstrom/Makefile
+++ b/games/maelstrom/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2000/07/30 05:46:24 jlam Exp $
+# $NetBSD: Makefile,v 1.9 2000/08/23 23:14:25 tron Exp $
 
 DISTNAME=		Maelstrom-1.4.3-L2.0.6-src.tar.gz
 PKGNAME=		maelstrom-2.0.6
@@ -11,8 +11,6 @@ DISTFILES=		${DISTNAME} ${STREK} ${SWARS} ${ESOUND}
 MAINTAINER=		root@garbled.net
 HOMEPAGE=		http://www.ambrosiasw.com/Products/Maelstrom.html
 
-DEPENDS+=		xpm-3.4k:../../graphics/xpm
-
 ESOUND=			Maelstrom-Sounds-L2.0.0.tar.gz
 STREK=			Star_Trek.tar.gz
 SWARS=			Star_Wars.tar.gz
@@ -20,7 +18,8 @@ SWARS=			Star_Wars.tar.gz
 EXTRACT_ONLY=		${DISTNAME}
 WRKSRC=			${WRKDIR}/Maelstrom
 
-USE_X11BASE=		yes
+USE_X11BASE=		YES
+USE_XPM=		YES
 EVAL_PREFIX+=		XPMDIR=xpm
 MAKE_ENV+=		BINOWN=${BINOWN} BINGRP=${BINGRP} XPMDIR=${XPMDIR}
 
diff --git a/games/mirrormagic/Makefile b/games/mirrormagic/Makefile
index f538d0af990..c621c72da86 100644
--- a/games/mirrormagic/Makefile
+++ b/games/mirrormagic/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2000/07/11 08:39:54 agc Exp $
+# $NetBSD: Makefile,v 1.8 2000/08/23 23:14:24 tron Exp $
 #
 
 DISTNAME=		mirrormagic-1.3
@@ -7,9 +7,8 @@ MASTER_SITES=		${MASTER_SITE_XCONTRIB:=games/}
 
 MAINTAINER=		root@garbled.net
 
-DEPENDS=		xpm-3.4k:../../graphics/xpm
-
 USE_X11BASE=		YES
+USE_XPM=		YES
 
 do-install:
 	${INSTALL_PROGRAM} -o bin -g games -m 2755 ${WRKSRC}/mirrormagic ${X11PREFIX}/bin
diff --git a/games/nethack-qt/Makefile b/games/nethack-qt/Makefile
index 9fb093c0444..3dd1242e49d 100644
--- a/games/nethack-qt/Makefile
+++ b/games/nethack-qt/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2000/08/10 17:50:10 pooka Exp $
+# $NetBSD: Makefile,v 1.21 2000/08/23 23:14:26 tron Exp $
 #
 
 .include		"../nethack-lib/Makefile.common"
@@ -7,13 +7,13 @@ PKGNAME=		nethack-qt-${NETHACK_VERSION}
 CATEGORIES+=		x11
 
 DEPENDS+=		nethack-lib-${NETHACK_VERSION}:../nethack-lib
-DEPENDS+=		xpm-3.4k:../../graphics/xpm
 DEPENDS+=		qt2-2.0.2:../../x11/qt
 
-USE_X11=		yes
+USE_X11=		YES
+USE_XPM=		YES
+
 ALL_TARGET=		x11tiles nethack
 INSTALL_TARGET=		binfiles
-
 EVAL_PREFIX+=		QT2DIR=qt2
 PATH=   		${QT2DIR}/qt2/bin:$$PATH
 MAKE_ENV+=		GTYPE=-qt QTDIR=${QT2DIR}/qt2
diff --git a/games/nethack-x11/Makefile b/games/nethack-x11/Makefile
index b810648a445..b9cb2e66097 100644
--- a/games/nethack-x11/Makefile
+++ b/games/nethack-x11/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2000/08/10 17:50:08 pooka Exp $
+# $NetBSD: Makefile,v 1.9 2000/08/23 23:14:26 tron Exp $
 #
 
 .include		"../nethack-lib/Makefile.common"
@@ -8,9 +8,9 @@ PKGNAME=		nethack-x11-${NETHACK_VERSION}
 CATEGORIES+=		x11
 
 DEPENDS+=		nethack-lib-${NETHACK_VERSION}:../nethack-lib
-DEPENDS+=		xpm-3.4k:../../graphics/xpm
 
-USE_X11=		yes
+USE_X11=		YES
+USE_XPM=		YES
 ALL_TARGET=		nethack
 INSTALL_TARGET=		binfiles
 MAKE_ENV+=		GTYPE=-x11
diff --git a/games/nighthawk/Makefile b/games/nighthawk/Makefile
index 7ca42a903bc..1bc3a62874d 100644
--- a/games/nighthawk/Makefile
+++ b/games/nighthawk/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2000/01/02 03:20:12 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2000/08/23 23:14:26 tron Exp $
 #
 
 DISTNAME=		nighthawk-2.1
@@ -14,10 +14,9 @@ PATCH_DIST_STRIP=	-p1
 MAINTAINER=		hubertf@netbsd.org
 HOMEPAGE=		http://www.downunder.net.au/~jsno/
 
-DEPENDS+=		xpm-3.4k:../../graphics/xpm
-
 USE_GMAKE=		YES
 USE_X11=		YES
+USE_XPM=		YES
 
 post-build:
 	cd ${WRKSRC}/src_sound ; \
diff --git a/games/tanked/Makefile b/games/tanked/Makefile
index 03bc7e3a959..43ab904eab6 100644
--- a/games/tanked/Makefile
+++ b/games/tanked/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2000/07/11 08:41:32 agc Exp $
+# $NetBSD: Makefile,v 1.5 2000/08/23 23:14:25 tron Exp $
 #
 
 DISTNAME=		tanked-0.90
@@ -8,9 +8,8 @@ MASTER_SITES=		http://ogresoft.dyn.ml.org/
 MAINTAINER=		root@garbled.net
 HOMEPAGE=		http://ogresoft.dyn.ml.org/tanked.html
 
-DEPENDS+=		xpm-3.4k:../../graphics/xpm
-
-USE_X11BASE=		yes
+USE_X11BASE=		YES
+USE_XPM=		YES
 
 post-patch:
 	@${TOUCH} ${WRKSRC}/client/tanked.man
diff --git a/games/xarchon/Makefile b/games/xarchon/Makefile
index 3bf1dc6d51c..819ac1146c3 100644
--- a/games/xarchon/Makefile
+++ b/games/xarchon/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2000/07/15 20:39:19 agc Exp $
+# $NetBSD: Makefile,v 1.15 2000/08/23 23:14:26 tron Exp $
 #
 
 DISTNAME=	xarchon-0.50
@@ -9,11 +9,11 @@ MASTER_SITES=	http://xarchon.seul.org/ \
 MAINTAINER=	hubertf@netbsd.org
 HOMEPAGE=	http://xarchon.seul.org/
 
-DEPENDS+=	xpm-3.4k:../../graphics/xpm
 DEPENDS+=	gtk+-1.2.*:../../x11/gtk
 DEPENDS+=	esound-*:../../audio/esound
 
-GNU_CONFIGURE=	yes
+USE_XPM=	YES
+GNU_CONFIGURE=	YES
 EVAL_PREFIX+=	GTKDIR=gtk+ XPMDIR=xpm
 CONFIGURE_ARGS+=--with-xpm-prefix=${XPMDIR} \
 		--with-gtk-prefix=${GTKDIR} \
diff --git a/games/xbill/Makefile b/games/xbill/Makefile
index b1dd8647450..16c2893129d 100644
--- a/games/xbill/Makefile
+++ b/games/xbill/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 1999/12/29 17:15:17 pooka Exp $
+# $NetBSD: Makefile,v 1.6 2000/08/23 23:14:25 tron Exp $
 #
 
 DISTNAME=		xbill-2.0
@@ -9,10 +9,9 @@ EXTRACT_SUFX=		.tgz
 MAINTAINER=		root@garbled.net
 HOMEPAGE=		http://www.xbill.org/
 
-DEPENDS+=		xpm-3.4k:../../graphics/xpm
-
-NO_INSTALL_MANPAGES=	yes
-USE_IMAKE=		yes
+USE_IMAKE=		YES
+USE_XPM=		YES
+NO_INSTALL_MANPAGES=	YES
 
 post-install:
 	${INSTALL_MAN} ${WRKSRC}/xbill.man ${PREFIX}/man/man6/xbill.6
diff --git a/games/xboing/Makefile b/games/xboing/Makefile
index 6f56f8aff4f..21971c69f6e 100644
--- a/games/xboing/Makefile
+++ b/games/xboing/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2000/07/11 08:43:53 agc Exp $
+# $NetBSD: Makefile,v 1.6 2000/08/23 23:14:25 tron Exp $
 #
 
 DISTNAME=		xboing2.4
@@ -9,11 +9,11 @@ MASTER_SITES=		${MASTER_SITE_XCONTRIB:=games/}
 MAINTAINER=		root@garbled.net
 HOMEPAGE=		http://www.catt.rmit.edu.au/xboing/xboing.html
 
-DEPENDS+=		xpm-3.4k:../../graphics/xpm
+USE_IMAKE=		YES
+USE_XPM=		YES
 
+NO_INSTALL_MANPAGES=	YES
 WRKSRC=			${WRKDIR}/xboing
-NO_INSTALL_MANPAGES=	yes
-USE_IMAKE=		yes
 
 post-install:
 	${CHOWN} bin:games ${X11PREFIX}/bin/xboing
diff --git a/games/xconq/Makefile b/games/xconq/Makefile
index 99724c6a222..226834b237e 100644
--- a/games/xconq/Makefile
+++ b/games/xconq/Makefile
@@ -1,5 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 1999/06/12 20:22:53 kleink Exp $
-#
+# $NetBSD: Makefile,v 1.2 2000/08/23 23:14:26 tron Exp $
 
 DISTNAME=		xconq-7.2.2
 CATEGORIES=		games x11
@@ -8,10 +7,9 @@ MASTER_SITES=		ftp://sourceware.cygnus.com/pub/xconq/
 MAINTAINER=		kleink@netbsd.org
 HOMEPAGE=		http://sourceware.cygnus.com/xconq/
 
-DEPENDS=		xpm-3.4k:../../graphics/xpm
-
-USE_X11BASE=		yes
-GNU_CONFIGURE=		yes
+USE_X11BASE=		YES
+USE_XPM=		YES
+GNU_CONFIGURE=		YES
 CONFIGURE_ARGS+=	--with-xpm
 
 INFO_FILES=     	xcdesign.info xconq.info
diff --git a/games/xdemineur/Makefile b/games/xdemineur/Makefile
index fb4ad99aa58..5e787a1daf7 100644
--- a/games/xdemineur/Makefile
+++ b/games/xdemineur/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 1999/08/13 14:30:45 bouyer Exp $
+# $NetBSD: Makefile,v 1.13 2000/08/23 23:14:24 tron Exp $
 #
 
 DISTNAME=       xdemineur-2.1.1
@@ -9,8 +9,7 @@ MASTER_SITES=	ftp://ftp.babafou.eu.org/pub/babafou/ \
 MAINTAINER=	bouyer@netbsd.org
 HOMEPAGE=	http://www.spinne.com/x/games/xdemineur/
 
-DEPENDS+=	xpm-3.4k:../../graphics/xpm
-
-USE_IMAKE=	yes
+USE_IMAKE=	YES
+USE_XPM=	YES
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/games/xgalaga/Makefile b/games/xgalaga/Makefile
index 8f513da8c3c..ad317e7497b 100644
--- a/games/xgalaga/Makefile
+++ b/games/xgalaga/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2000/07/11 08:43:53 agc Exp $
+# $NetBSD: Makefile,v 1.5 2000/08/23 23:14:25 tron Exp $
 #
 
 DISTNAME=		xgalaga-2.0.34
@@ -8,10 +8,9 @@ MASTER_SITES=		http://ogresoft.dyn.ml.org/
 MAINTAINER=		root@garbled.net
 HOMEPAGE=		http://ogresoft.dyn.ml.org/xgal.html
 
-DEPENDS+=		xpm-3.4k:../../graphics/xpm
-
-USE_X11BASE=		yes
-HAS_CONFIGURE=		yes
+USE_X11BASE=		YES
+USE_XPM=		YES
+HAS_CONFIGURE=		YES
 CONFIGURE_ARGS+=	--prefix=${X11PREFIX}/share/xgalaga
 CONFIGURE_ARGS+=	--exec-prefix=${X11PREFIX}/bin
 
diff --git a/games/xnibbles/Makefile b/games/xnibbles/Makefile
index 050b99af1ae..1a2f8d9bf94 100644
--- a/games/xnibbles/Makefile
+++ b/games/xnibbles/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 1999/01/30 23:18:49 agc Exp $
+# $NetBSD: Makefile,v 1.3 2000/08/23 23:14:25 tron Exp $
 #
 
 DISTNAME=		xnibbles-1.0BETA4
@@ -9,11 +9,11 @@ MASTER_SITES=		http://www.tjhsst.edu/xnibbles/
 MAINTAINER=		root@garbled.net
 HOMEPAGE=		http://www.tjhsst.edu/xnibbles/
 
-DEPENDS+=		xpm-3.4k:../../graphics/xpm
+USE_X11BASE=		YES
+USE_XPM=		YES
+USE_GMAKE=		YES
 
 WRKSRC=			${WRKDIR}/xnibbles
-USE_X11BASE=		yes
-USE_GMAKE=		yes
 ALL_TARGET=		netbsd
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/games/xpat2/Makefile b/games/xpat2/Makefile
index f27dee92bb3..4af49333d8d 100644
--- a/games/xpat2/Makefile
+++ b/games/xpat2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2000/07/28 18:12:06 jlam Exp $
+# $NetBSD: Makefile,v 1.2 2000/08/23 23:14:27 tron Exp $
 # FreeBSD: ports/games/xpat2/Makefile,v 1.11 2000/04/14 12:27:59 asami Exp
 
 DISTNAME=	xpat2-1.06
@@ -7,9 +7,8 @@ MASTER_SITES=	${MASTER_SITE_SUNSITE:=games/solitaires/}
 
 MAINTAINER=	kuebart@mathematik.uni-ulm.de
 
-DEPENDS=	xpm-*:../../graphics/xpm
-
-USE_X11BASE=	# defined
+USE_X11BASE=	YES
+USE_XPM=	YES
 
 EVAL_PREFIX=	XPMDIR=xpm
 MAKE_ENV+=	XPMDIR="${XPMDIR}"
diff --git a/games/xpuyopuyo/Makefile b/games/xpuyopuyo/Makefile
index 7b3ceba4b02..4949f591ef5 100644
--- a/games/xpuyopuyo/Makefile
+++ b/games/xpuyopuyo/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2000/08/11 20:01:19 jlam Exp $
+# $NetBSD: Makefile,v 1.5 2000/08/23 23:14:26 tron Exp $
 
 DISTNAME=		xpuyopuyo-0.9.1
 CATEGORIES=		games x11
@@ -11,13 +11,13 @@ HOMEPAGE=		http://chaos2.org/xpuyopuyo/
 BUILD_DEPENDS+=		autoreconf:../../devel/autoconf
 DEPENDS+=		gtk+-1.2.*:../../x11/gtk
 DEPENDS+=		libmikmod>=3.1.9:../../audio/libmikmod
-DEPENDS+=		xpm-*:../../graphics/xpm
 
-USE_X11BASE=		# defined
-USE_LIBTOOL=		# defined
+USE_X11BASE=		YES
+USE_XPM=		YES
+USE_LIBTOOL=		YES
 LTCONFIG_OVERRIDE=	${WRKSRC}/ltconfig
 
-GNU_CONFIGURE=		# defined
+GNU_CONFIGURE=		YES
 CONFIGURE_ARGS+=	--with-gnome	# install desktop and pixmap files
 CONFIGURE_ENV+=		ac_cv_path_GNOME_CONFIG="${GNOME_CONFIG}"
 
diff --git a/games/xscrabble/Makefile b/games/xscrabble/Makefile
index 805fbe4d77e..c98004e431e 100644
--- a/games/xscrabble/Makefile
+++ b/games/xscrabble/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2000/01/02 03:20:14 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2000/08/23 23:14:26 tron Exp $
 #
 
 DISTNAME=	xscrabble
@@ -9,11 +9,10 @@ MASTER_SITES=	http://www.belgarath.demon.co.uk/programs/
 MAINTAINER=	dmcmahill@netbsd.org
 HOMEPAGE=	http://www.belgarath.demon.co.uk/programs/
 
-DEPENDS+=	xpm-3.4k:../../graphics/xpm
-
 WRKSRC=		${WRKDIR}/xscrabble
-USE_X11BASE=	yes
-USE_IMAKE=	yes
+USE_X11BASE=	YES
+USE_XPM=	YES
+USE_IMAKE=	YES
 
 post-patch:
 	${SED} 's!/usr/local/lib!${PREFIX}/share/games/xscrabble!g' \
diff --git a/games/xsoldier/Makefile b/games/xsoldier/Makefile
index 015d043a06f..5d05b476edf 100644
--- a/games/xsoldier/Makefile
+++ b/games/xsoldier/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 1998/08/20 15:16:59 tsarna Exp $
+# $NetBSD: Makefile,v 1.3 2000/08/23 23:14:25 tron Exp $
 #
 
 DISTNAME=		xsoldier-0.96
@@ -8,10 +8,9 @@ MASTER_SITES=		http://www.surfline.ne.jp/hachi/xsoldier/
 MAINTAINER=		root@garbled.net
 HOMEPAGE=		http://www.surfline.ne.jp/hachi/xsoldier.html
 
-DEPENDS+=		xpm-3.4k:../../graphics/xpm
-
-USE_IMAKE=		yes
-NO_INSTALL_MANPAGES=	yes
+USE_IMAKE=		YES
+USE_XPM=		YES
+NO_INSTALL_MANPAGES=	YES
 
 post-patch:
 	${TOUCH} ${WRKSRC}/xsoldier.man