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

11 files changed, 50 insertions, 52 deletions

diff --git a/graphics/fxtv/Makefile b/graphics/fxtv/Makefile
index 852fbabb49b..3c300ecede2 100644
--- a/graphics/fxtv/Makefile
+++ b/graphics/fxtv/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2000/08/23 21:27:58 veego Exp $
+# $NetBSD: Makefile,v 1.10 2000/08/23 23:14:29 tron Exp $
 
 DISTNAME=	fxtv-1.02
 CATEGORIES=	graphics
@@ -14,9 +14,10 @@ DEPENDS+=	xpm-3.4[j-z]:../../graphics/xpm
 ONLY_FOR_PLATFORM=	NetBSD-1.4[Y-Z]-* NetBSD-1.4Z[A-Z]-* \
 			NetBSD-1.5_ALPHA-* NetBSD-1.[5-9]*-*
 
-USE_GMAKE=	yes
-USE_XAW=	yes
-USE_X11BASE=	yes
+USE_X11BASE=	YES
+USE_XAW=	YES
+USE_XPM=	YES
+USE_GMAKE=	YES
 
 .include "../../mk/bsd.prefs.mk"
 
diff --git a/graphics/gd/Makefile b/graphics/gd/Makefile
index b82d65259bd..d8f550219ac 100644
--- a/graphics/gd/Makefile
+++ b/graphics/gd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2000/08/04 23:59:02 jlam Exp $
+# $NetBSD: Makefile,v 1.23 2000/08/23 23:14:27 tron Exp $
 # FreeBSD Id: Makefile,v 1.2 1997/02/14 07:55:45 asami Exp
 #
 
@@ -11,13 +11,13 @@ HOMEPAGE=	http://www.boutell.com/gd/
 
 DEPENDS+=	freetype-lib>=1.3.1:../../graphics/freetype-lib
 DEPENDS+=	png>=1.0.6:../../graphics/png
-DEPENDS+=	xpm-*:../../graphics/xpm
 DEPENDS+=	jpeg-*:../../graphics/jpeg
 
-USE_X11=	# defined
-USE_LIBTOOL=	# defined
+USE_X11=	YES
+USE_XPM=	YES
+USE_LIBTOOL=	YES
 
-NO_CONFIGURE=	# defined
+NO_CONFIGURE=	YES
 
 .include "../../mk/bsd.prefs.mk"
 
diff --git a/graphics/gimp-current/Makefile b/graphics/gimp-current/Makefile
index 6cee6ede595..a8557d6dea3 100644
--- a/graphics/gimp-current/Makefile
+++ b/graphics/gimp-current/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2000/07/31 04:14:07 jlam Exp $
+# $NetBSD: Makefile,v 1.24 2000/08/23 23:14:28 tron Exp $
 
 DISTNAME=		gimp-1.1.24
 CATEGORIES=		graphics
@@ -16,13 +16,13 @@ DEPENDS+=		gtk+>=1.2.7:../../x11/gtk
 DEPENDS+=		mpeg-1.2.1:../../graphics/mpeg-lib
 DEPENDS+=		png>=1.0.6:../../graphics/png
 DEPENDS+=		tiff-*:../../graphics/tiff
-DEPENDS+=		xpm-3.4k:../../graphics/xpm
 
-USE_X11BASE=		yes
-USE_GMAKE=		yes
-USE_LIBTOOL=		yes
+USE_X11BASE=		YES
+USE_XPM=		YES
+USE_GMAKE=		YES
+USE_LIBTOOL=		YES
 LTCONFIG_OVERRIDE=	${WRKSRC}/ltconfig
-GNU_CONFIGURE=		yes
+GNU_CONFIGURE=		YES
 EVAL_PREFIX+=		GTKDIR=gtk+
 CONFIGURE_ARGS+=	--with-gtk-prefix="${GTKDIR}" \
 			--disable-perl \
diff --git a/graphics/gimp/Makefile b/graphics/gimp/Makefile
index 19756ffb3c7..6be60a88a44 100644
--- a/graphics/gimp/Makefile
+++ b/graphics/gimp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.57 2000/08/15 23:13:59 wiz Exp $
+# $NetBSD: Makefile,v 1.58 2000/08/23 23:14:27 tron Exp $
 
 DISTNAME=		gimp-1.0.4
 CATEGORIES=		graphics
@@ -17,17 +17,17 @@ DEPENDS+=		gtk+-1.2.*:../../x11/gtk
 DEPENDS+=		mpeg-1.2.1:../../graphics/mpeg-lib
 DEPENDS+=		png>=1.0.6:../../graphics/png
 DEPENDS+=		tiff-*:../../graphics/tiff
-DEPENDS+=		xpm-3.4k:../../graphics/xpm
 
 GIMP_DATA=		gimp-data-extras-1.0.0
 
 .ifndef DISPLAY
-IS_INTERACTIVE=		yes
+IS_INTERACTIVE=		YES
 .endif
-USE_X11BASE=		yes
-USE_GMAKE=		yes
-USE_LIBTOOL=		yes
-GNU_CONFIGURE=		yes
+USE_X11BASE=		YES
+USE_XPM=		YES
+USE_GMAKE=		YES
+USE_LIBTOOL=		YES
+GNU_CONFIGURE=		YES
 
 EVAL_PREFIX+=		GTKDIR=gtk+
 CONFIGURE_ARGS+=	--with-gtk-prefix="${GTKDIR}"
diff --git a/graphics/libwmf/Makefile b/graphics/libwmf/Makefile
index 103dc85f65c..3429c6471f4 100644
--- a/graphics/libwmf/Makefile
+++ b/graphics/libwmf/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2000/08/06 14:18:32 wiz Exp $
+# $NetBSD: Makefile,v 1.14 2000/08/23 23:14:29 tron Exp $
 #
 
 DISTNAME=		libwmf-0.1.17
@@ -12,13 +12,10 @@ HOMEPAGE=		http://www.csn.ul.ie/~caolan/docs/libwmf.html
 BUILD_DEPENDS+=		autoconf:../../devel/autoconf
 DEPENDS+=		freetype-lib>=1.3.1:../../graphics/freetype-lib
 DEPENDS+=		png>=1.0.6:../../graphics/png
-DEPENDS+=		xpm-3.4k:../../graphics/xpm
-
-WRKSRC=			${WRKDIR}/libwmf
-USE_X11=		# defined
-
-GNU_CONFIGURE=		# defined
 
+USE_X11=		YES
+USE_XPM=		YES
+GNU_CONFIGURE=		YES
 EVAL_PREFIX+=		XPMDIR=xpm
 CONFIGURE_ARGS+=	--includedir="${PREFIX}/include/libwmf"
 CONFIGURE_ARGS+=	--with-png="${LOCALBASE}"
@@ -27,9 +24,9 @@ CONFIGURE_ARGS+=	--with-xpm="${XPMDIR}"
 CONFIGURE_ENV+=		CPPFLAGS="${CPPFLAGS}"
 
 CPPFLAGS+=		-I${LOCALBASE}/include			# png.h
-
 INCLUDEDIR=		${PREFIX}/include/libwmf
 HTMLDIR=		${PREFIX}/share/doc/html/libwmf
+WRKSRC=			${WRKDIR}/libwmf
 
 pre-configure:
 	cd ${WRKSRC} && autoconf
diff --git a/graphics/pixmap/Makefile b/graphics/pixmap/Makefile
index 7eade522373..f840071a776 100644
--- a/graphics/pixmap/Makefile
+++ b/graphics/pixmap/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 1999/04/15 20:39:43 tron Exp $
+# $NetBSD: Makefile,v 1.10 2000/08/23 23:14:27 tron Exp $
 # FreeBSD: Makefile,v 1.8 1996/11/18 09:53:36 asami Exp
 #
 
@@ -9,9 +9,9 @@ MASTER_SITES=		${MASTER_SITE_XCONTRIB:=applications/pixmap/}
 
 MAINTAINER=		packages@netbsd.org
 
-DEPENDS+=		xpm-3.4k:../../graphics/xpm
+USE_IMAKE=		YES
+USE_XPM=		YES
 
 WRKSRC=			${WRKDIR}/pixmap
-USE_IMAKE=		yes
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/xart/Makefile b/graphics/xart/Makefile
index cbe0cb57250..d28c051ce2a 100644
--- a/graphics/xart/Makefile
+++ b/graphics/xart/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2000/03/21 22:40:55 tron Exp $
+# $NetBSD: Makefile,v 1.15 2000/08/23 23:14:27 tron Exp $
 #
 
 DISTNAME=       xart19980415
@@ -12,11 +12,12 @@ HOMEPAGE=	http://www.cqi.com/~humbubba/linux.html
 
 DEPENDS+=	jpeg-6b:../../graphics/jpeg
 DEPENDS+=	tiff-*:../../graphics/tiff
-DEPENDS+=	xpm-3.4k:../../graphics/xpm
 DEPENDS+=	png>=1.0.6:../../graphics/png
 
+USE_IMAKE=      YES
+USE_XPM=	YES
+
 WRKSRC=		${WRKDIR}/19980415
-USE_IMAKE=      yes
 
 post-extract:
 	${FIND} ${WRKSRC} -type d -print | xargs ${CHMOD} 755
diff --git a/graphics/xbmbrowser/Makefile b/graphics/xbmbrowser/Makefile
index e5bf61bfec0..a3199ae7bf1 100644
--- a/graphics/xbmbrowser/Makefile
+++ b/graphics/xbmbrowser/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 1999/04/15 20:39:43 tron Exp $
+# $NetBSD: Makefile,v 1.11 2000/08/23 23:14:28 tron Exp $
 # FreeBSD: Makefile,v 1.3 1997/08/26 07:12:20 tg Exp
 #
 
@@ -9,9 +9,8 @@ MASTER_SITES=		${MASTER_SITE_XCONTRIB:=utilities/}
 
 MAINTAINER=		packages@netbsd.org
 
-DEPENDS+=		xpm-3.4k:../../graphics/xpm
-
-USE_IMAKE=		yes
-USE_GMAKE=		yes
+USE_IMAKE=		YES
+USE_GMAKE=		YES
+USE_XPM=		YES
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/xfig/Makefile b/graphics/xfig/Makefile
index 47b4cbdd152..05665171c0d 100644
--- a/graphics/xfig/Makefile
+++ b/graphics/xfig/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2000/07/27 14:01:00 jlam Exp $
+# $NetBSD: Makefile,v 1.24 2000/08/23 23:14:28 tron Exp $
 #
 
 DISTNAME=		xfig.3.2.3a
@@ -11,11 +11,11 @@ MAINTAINER=		root@garbled.net
 HOMEPAGE=		http://epb1.lbl.gov/BVSmith/xfig/
 
 DEPENDS+=		transfig-3.2.3:../../print/transfig
-DEPENDS+=		xpm-3.4k:../../graphics/xpm
 DEPENDS+=		jpeg-6b:../../graphics/jpeg
 
-USE_IMAKE=		yes
-USE_XAW=		yes
+USE_IMAKE=		YES
+USE_XAW=		YES
+USE_XPM=		YES
 
 .include "../../mk/bsd.prefs.mk"
 
diff --git a/graphics/xpaint/Makefile b/graphics/xpaint/Makefile
index e64b7329efc..852c803255d 100644
--- a/graphics/xpaint/Makefile
+++ b/graphics/xpaint/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2000/05/15 02:32:51 hubertf Exp $
+# $NetBSD: Makefile,v 1.23 2000/08/23 23:14:28 tron Exp $
 # FreeBSD Id: Makefile,v 1.14 1997/08/29 12:17:50 tg Exp
 #
 
@@ -10,12 +10,12 @@ MASTER_SITES=	http://home.worldonline.dk/~torsten/xpaint/
 MAINTAINER=	packages@netbsd.org
 HOMEPAGE=	http://home.worldonline.dk/~torsten/xpaint/
 
-DEPENDS+=	xpm-3.4k:../../graphics/xpm
 DEPENDS+=	tiff-*:../../graphics/tiff
 DEPENDS+=	jpeg-6b:../../graphics/jpeg
 DEPENDS+=	png>=1.0.6:../../graphics/png
 
-USE_IMAKE=      yes
+USE_IMAKE=      YES
+USE_XPM=	YES
 
 pre-configure:
 	@${SED} -e 's|\$${LOCALBASE}|'${LOCALBASE}'|g' \
diff --git a/graphics/xpdf/Makefile b/graphics/xpdf/Makefile
index b7fa7f1dac0..cdba56b4c54 100644
--- a/graphics/xpdf/Makefile
+++ b/graphics/xpdf/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2000/08/21 15:16:00 fredb Exp $
+# $NetBSD: Makefile,v 1.17 2000/08/23 23:14:28 tron Exp $
 # FreeBSD Id: Makefile,v 1.12 1998/03/11 03:08:12 vanilla Exp
 # 
 
@@ -14,12 +14,12 @@ HOMEPAGE=	http://www.foolabs.com/xpdf/
 DEPENDS+=	freetype-lib-1.3.1:../../graphics/freetype
 DEPENDS+=	ghostscript-fonts-*:../../print/ghostscript-fonts
 DEPENDS+=	t1lib-1.0.1:../../textproc/t1lib
-DEPENDS+=	xpm-3.4k:../../graphics/xpm
 
 CONFLICTS=	xpdf-crypto-*
 
-USE_X11BASE=	yes
-GNU_CONFIGURE=	yes
+USE_X11BASE=	YES
+USE_XPM=	YES
+GNU_CONFIGURE=	YES
 
 CONFIGURE_ARGS+=--enable-japanese --enable-chinese
 CONFIGURE_ARGS+=--with-freetype-includes=${LOCALBASE}/include