From 3bb1003bffe659fe78e3ff049aa5e426d687763a Mon Sep 17 00:00:00 2001
From: tron <tron>
Date: Wed, 23 Aug 2000 23:14:21 +0000
Subject: Use "USE_XPM" option instead of direct dependence on the "xpm"
 package.

---
 sysutils/asapm/Makefile   |  9 ++++-----
 sysutils/xbatt/Makefile   |  7 +++----
 sysutils/xosview/Makefile | 10 +++++-----
 3 files changed, 12 insertions(+), 14 deletions(-)

(limited to 'sysutils')

diff --git a/sysutils/asapm/Makefile b/sysutils/asapm/Makefile
index e842c8f131d..bb916cee57e 100644
--- a/sysutils/asapm/Makefile
+++ b/sysutils/asapm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2000/07/15 20:39:24 agc Exp $
+# $NetBSD: Makefile,v 1.14 2000/08/23 23:14:31 tron Exp $
 # FreeBSD Id: Makefile,v 1.5 1998/11/29 12:43:12 asami Exp
 #
 
@@ -15,10 +15,9 @@ HOMEPAGE=		http://www.tigr.net/afterstep/as-apps/download/asapm/
 IGNORE+=		"APM is not available for ${MACHINE_PLATFORM}"
 .endif
 
-DEPENDS+=		xpm-*:../../graphics/xpm
-
-GNU_CONFIGURE=		yes
-USE_X11=		yes
+GNU_CONFIGURE=		YES
+USE_X11=		YES
+USE_XPM=		YES
 CONFIGURE_ARGS+=	--disable-jpeg	# there actually is no JPEG support
 EVAL_PREFIX+=		XPMDIR=xpm
 CONFIGURE_ARGS+=	--with-xpm \
diff --git a/sysutils/xbatt/Makefile b/sysutils/xbatt/Makefile
index 460a0930744..c9edf821f7b 100644
--- a/sysutils/xbatt/Makefile
+++ b/sysutils/xbatt/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2000/07/11 10:15:41 agc Exp $
+# $NetBSD: Makefile,v 1.5 2000/08/23 23:14:31 tron Exp $
 #
 
 DISTNAME=	xbatt-1.3pr1
@@ -13,9 +13,8 @@ HOMEPAGE=	http://www2.clave.gr.jp/~eto/xbatt/	# Not really
 IGNORE+=	"APM is not available for ${MACHINE_PLATFORM}"                  
 .endif
 
-DEPENDS+=	xpm-3.4k:../../graphics/xpm
-
-USE_IMAKE=	yes
+USE_IMAKE=	YES
+USE_XPM=	YES
 ALL_TARGET=	xbatt
 
 post-install:
diff --git a/sysutils/xosview/Makefile b/sysutils/xosview/Makefile
index 9a0e5e28919..24101af3bba 100644
--- a/sysutils/xosview/Makefile
+++ b/sysutils/xosview/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.29 2000/07/13 15:48:47 agc Exp $
+# $NetBSD: Makefile,v 1.30 2000/08/23 23:14:31 tron Exp $
 #
 
 DISTNAME=       xosview-1.7.0.b
@@ -9,21 +9,21 @@ MASTER_SITES=   http://www.ece.utexas.edu/~bgrayson/xosview/ \
 MAINTAINER=	bgrayson@netbsd.org
 HOMEPAGE=	http://lore.ece.utexas.edu/~bgrayson/xosview.html
 
-HAS_CONFIGURE=	yes
+HAS_CONFIGURE=	YES
 CONFIGURE_ARGS+= --prefix=${PREFIX}
-USE_X11BASE=	yes
+USE_X11BASE=	YES
+USE_XPM=	YES
 
 .include "../../mk/bsd.prefs.mk"
 
 .if ${OPSYS} == "NetBSD"
 BUILD_DEFS=	UVM
 .elif ${OPSYS} == "SunOS"
-DEPENDS+=	xpm-*:../../graphics/xpm
 BUILD_DEPENDS+=	${LOCALBASE}/egcs/bin/g++:../../lang/egcs
 CONFIGURE_ENV+=	CXX=${LOCALBASE}/egcs/bin/g++
 CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS} -I${X11BASE}/include"
 CONFIGURE_ENV+= LIBS="${LIBS} -lsocket -lnsl"
-USE_GMAKE=	yes
+USE_GMAKE=	YES
 .endif
 
 .include "../../mk/bsd.pkg.mk"
-- 
cgit v1.2.3