USE_IMAKE implies USE_X11BASE, remove it.

12 files changed, 13 insertions, 25 deletions

diff --git a/graphics/plotmtv/Makefile b/graphics/plotmtv/Makefile
index d4f55fe864f..39c177bf532 100644
--- a/graphics/plotmtv/Makefile
+++ b/graphics/plotmtv/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2004/01/20 12:18:16 agc Exp $
+# $NetBSD: Makefile,v 1.12 2004/07/21 21:16:10 salo Exp $
 
 DISTNAME=	Plotmtv1.4.1
 PKGNAME=	plotmtv-1.4.1
@@ -12,7 +12,6 @@ COMMENT=	Multipurpose X11 plotting program
 
 WRKSRC=		${WRKDIR}/${DISTNAME}
 USE_IMAKE=	yes
-USE_X11BASE=	yes
 
 post-extract:
 	@${MV} -f ${WRKSRC}/Docs/plotmtv.man ${WRKSRC}/Plot
diff --git a/multimedia/xanim/Makefile b/multimedia/xanim/Makefile
index c7c45d88696..b0bb2d08d5c 100644
--- a/multimedia/xanim/Makefile
+++ b/multimedia/xanim/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2004/04/18 07:07:06 snj Exp $
+# $NetBSD: Makefile,v 1.3 2004/07/21 21:16:10 salo Exp $
 
 DISTNAME=	xanim2801
 PKGNAME=	xanim-2.80.1
@@ -23,7 +23,6 @@ EXTRACT_ONLY=   ${DISTNAME}${EXTRACT_SUFX}
 .include "Makefile.codecs"
 
 USE_BUILDLINK3=	YES
-USE_X11BASE=	YES
 USE_IMAKE=	YES
 
 .include "../../mk/bsd.prefs.mk"
diff --git a/net/wmpload/Makefile b/net/wmpload/Makefile
index 58b1dde1d05..2113e3d05c2 100644
--- a/net/wmpload/Makefile
+++ b/net/wmpload/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2004/04/18 07:14:19 snj Exp $
+# $NetBSD: Makefile,v 1.7 2004/07/21 21:16:10 salo Exp $
 #
 
 DISTNAME=	wmpload-0.9.4
@@ -12,7 +12,6 @@ COMMENT=	PPP monitor for X11, totals and current in/out rates in 64x64 cube
 HAS_CONFIGURE=	YES
 USE_BUILDLINK3=	YES
 USE_IMAKE=	YES
-USE_X11BASE=	YES
 
 .include "../../graphics/xpm/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/security/ssh-askpass/Makefile b/security/ssh-askpass/Makefile
index 48e03c8826a..08e979c9d43 100644
--- a/security/ssh-askpass/Makefile
+++ b/security/ssh-askpass/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2003/07/17 22:53:17 grant Exp $
+# $NetBSD: Makefile,v 1.5 2004/07/21 21:16:10 salo Exp $
 
 DISTNAME=	x11-ssh-askpass-1.0
 PKGNAME=	${DISTNAME:S/^x11-//}
@@ -9,7 +9,6 @@ MAINTAINER=	tech-pkg@NetBSD.org
 HOMEPAGE=	http://www.ntrnet.net/~jmknoble/software/x11-ssh-askpass/
 COMMENT=	X11-based passphrase dialog for OpenSSH
 
-USE_X11BASE=	# defined
 USE_IMAKE=	# defined
 
 post-install:
diff --git a/sysutils/xmeter/Makefile b/sysutils/xmeter/Makefile
index 831a8963ecb..ba40b777e0e 100644
--- a/sysutils/xmeter/Makefile
+++ b/sysutils/xmeter/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2004/01/20 12:26:16 agc Exp $
+# $NetBSD: Makefile,v 1.8 2004/07/21 21:16:10 salo Exp $
 #
 
 DISTNAME=	xmeter-1.15
@@ -11,7 +11,6 @@ HOMEPAGE=	#
 COMMENT=	Distributed system load meter for X11
 
 WRKSRC=		${WRKDIR}
-USE_X11BASE=	yes
 USE_IMAKE=	yes
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/time/polclock/Makefile b/time/polclock/Makefile
index f0fefe1d991..5877bec2e58 100644
--- a/time/polclock/Makefile
+++ b/time/polclock/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2003/07/17 22:55:04 grant Exp $
+# $NetBSD: Makefile,v 1.6 2004/07/21 21:16:10 salo Exp $
 #
 
 DISTNAME=		polclock-1.11
@@ -10,7 +10,6 @@ MAINTAINER=		tech-pkg@NetBSD.org
 HOMEPAGE=		http://www.daionet.gr.jp/~masa/glclock
 COMMENT=		Digital clock with some nice graphics effects
 
-USE_X11BASE=		yes
 USE_IMAKE=		yes
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/wm/olvwm/Makefile b/wm/olvwm/Makefile
index 28422537cd5..05d78671b9e 100644
--- a/wm/olvwm/Makefile
+++ b/wm/olvwm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2004/05/01 17:57:54 snj Exp $
+# $NetBSD: Makefile,v 1.10 2004/07/21 21:16:10 salo Exp $
 #
 
 DISTNAME=	olvwm4.src4
@@ -15,8 +15,7 @@ DEPENDS+=	xview-clients>=3.2.1:../../x11/xview-clients
 
 WRKSRC=		${WRKDIR}
 USE_BUILDLINK3=	yes
-USE_IMAKE=	# defined
-USE_X11BASE=	# defined
+USE_IMAKE=	yes
 
 .include "../../graphics/xpm/buildlink3.mk"
 .include "../../x11/xview-lib/buildlink3.mk"
diff --git a/x11/x2x/Makefile b/x11/x2x/Makefile
index b810ee58667..f4f42162da9 100644
--- a/x11/x2x/Makefile
+++ b/x11/x2x/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2003/07/17 22:56:50 grant Exp $
+# $NetBSD: Makefile,v 1.7 2004/07/21 21:16:10 salo Exp $
 
 DISTNAME=	x2x-1.27
 PKGREVISION=	1
@@ -9,7 +9,6 @@ MASTER_SITES=	ftp://ftp.digital.com/pub/Digital/SRC/x2x/ \
 MAINTAINER=	tech-pkg@NetBSD.org
 COMMENT=	One keyboard and mouse to control multiple X displays
 
-USE_X11BASE=	yes
 USE_IMAKE=	yes
 
 post-configure:
diff --git a/x11/xmon/Makefile b/x11/xmon/Makefile
index fe555e9ffbd..792faa404da 100644
--- a/x11/xmon/Makefile
+++ b/x11/xmon/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2003/07/21 17:38:34 martti Exp $
+# $NetBSD: Makefile,v 1.7 2004/07/21 21:16:10 salo Exp $
 #
 
 DISTNAME=	xmon.1.5.4
@@ -11,7 +11,6 @@ MAINTAINER=	tech-pkg@NetBSD.org
 HOMEPAGE=	http://www.ee.ryerson.ca/~elf/xapps/Q-XVIII.html
 COMMENT=	Interactive X protocol monitor
 
-USE_X11BASE=	YES
 USE_IMAKE=	YES
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/xmountains/Makefile b/x11/xmountains/Makefile
index e0a2794a8b2..57e1a7d4b58 100644
--- a/x11/xmountains/Makefile
+++ b/x11/xmountains/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2004/01/20 12:28:28 agc Exp $
+# $NetBSD: Makefile,v 1.11 2004/07/21 21:16:10 salo Exp $
 #
 
 DISTNAME=	xmountains_2.6
@@ -13,6 +13,5 @@ COMMENT=	Fractal terrain generator for X11
 
 WRKSRC=		${WRKDIR}
 USE_IMAKE=	YES
-USE_X11BASE=	YES
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/xmx/Makefile b/x11/xmx/Makefile
index d30499ccae3..6ac7f262def 100644
--- a/x11/xmx/Makefile
+++ b/x11/xmx/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2003/07/17 22:56:54 grant Exp $
+# $NetBSD: Makefile,v 1.6 2004/07/21 21:16:10 salo Exp $
 
 DISTNAME=	xmx-2.1alpha.pl7
 PKGNAME=	xmx-2.1a7
@@ -11,7 +11,6 @@ COMMENT=	X11 Protocol Multiplexor
 
 ONLY_FOR_PLATFORM=	SunOS-*-*	# minor PLIST problems
 
-USE_X11BASE=	yes
 USE_IMAKE=	yes
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/xscript/Makefile b/x11/xscript/Makefile
index 35a4a568e92..1996183d5bd 100644
--- a/x11/xscript/Makefile
+++ b/x11/xscript/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2004/04/18 07:42:55 snj Exp $
+# $NetBSD: Makefile,v 1.9 2004/07/21 21:16:10 salo Exp $
 #
 
 DISTNAME=	xscript.tar
@@ -18,7 +18,6 @@ COMMENT=	X Window system script recording and playback
 
 WRKSRC=		${WRKDIR}/test-distrib/src
 USE_BUILDLINK3=	YES
-USE_X11BASE=	YES
 USE_IMAKE=	YES
 
 .include "../../mk/bsd.pkg.mk"