Make this package xpkgwedge-safe by using the new X11PREFIX definition

in preference to X11BASE when trying to find the installed location of
X11 libraries, programs and headers (which will change if xpkgwedge is
installed).

[X11BASE reflects the location of the X11 libs, headers and programs.
X11PREFIX reflects the installed location of X11 packages.]

12 files changed, 27 insertions, 27 deletions

diff --git a/comms/jpilot/Makefile b/comms/jpilot/Makefile
index d0c3db83305..f8840de61f9 100644
--- a/comms/jpilot/Makefile
+++ b/comms/jpilot/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2000/06/15 21:14:06 rh Exp $
+# $NetBSD: Makefile,v 1.3 2000/06/30 10:04:46 agc Exp $
 #
 
 DISTNAME=		jpilot-0.98.1
@@ -16,7 +16,7 @@ USE_LIBTOOL=		YES
 USE_X11=		YES
 
 LTCONFIG_OVERRIDE=	${WRKSRC}/ltconfig
-CONFIGURE_ARGS+=	--with-gtk-prefix=${X11BASE}
+CONFIGURE_ARGS+=	--with-gtk-prefix=${X11PREFIX}
 CONFIGURE_ARGS+=	--with-pilot-prefix=${LOCALBASE}
 
 post-install:
diff --git a/games/baduki/Makefile b/games/baduki/Makefile
index 020e5e41979..4f218ccdbd9 100644
--- a/games/baduki/Makefile
+++ b/games/baduki/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2000/02/05 18:34:43 wiz Exp $
+# $NetBSD: Makefile,v 1.8 2000/06/30 10:04:46 agc Exp $
 
 DISTNAME=	baduki-0.2.9
 CATEGORIES=	games
@@ -11,8 +11,8 @@ DEPENDS+=	gtk+-1.2.*:../../x11/gtk
 
 USE_X11=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS+=	--with-gtk-prefix=${X11BASE} --without-included-gettext
-CONFIGURE_ENV+=	GTK_CONFIG="${X11BASE}/bin/gtk-config"
+CONFIGURE_ARGS+=	--with-gtk-prefix=${X11PREFIX} --without-included-gettext
+CONFIGURE_ENV+=	GTK_CONFIG="${X11PREFIX}/bin/gtk-config"
 LDFLAGS+=	-L${LOCALBASE}/lib
 CPPFLAGS+=	-I${LOCALBASE}/include
 CONFIGURE_ENV+=	CPPFLAGS="${CPPFLAGS}"
diff --git a/games/xarchon/Makefile b/games/xarchon/Makefile
index 084e538e479..237bdef9c7b 100644
--- a/games/xarchon/Makefile
+++ b/games/xarchon/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2000/02/06 03:36:03 wiz Exp $
+# $NetBSD: Makefile,v 1.9 2000/06/30 10:04:46 agc Exp $
 #
 
 DISTNAME=	xarchon-0.50
@@ -14,8 +14,8 @@ DEPENDS+=	gtk+-1.2.*:../../x11/gtk
 DEPENDS+=	esound-*:../../audio/esound
 
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS+=--with-xpm-prefix=${X11BASE} \
-		--with-gtk-prefix=${X11BASE} \
+CONFIGURE_ARGS+=--with-xpm-prefix=${X11PREFIX} \
+		--with-gtk-prefix=${X11PREFIX} \
 		--with-esd-prefix=${LOCALBASE}
 
 .include "../../mk/bsd.prefs.mk"
diff --git a/graphics/gimp-current/Makefile b/graphics/gimp-current/Makefile
index c5135a829e3..0d322d56415 100644
--- a/graphics/gimp-current/Makefile
+++ b/graphics/gimp-current/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2000/06/25 01:06:20 wiz Exp $
+# $NetBSD: Makefile,v 1.14 2000/06/30 10:04:46 agc Exp $
 
 DISTNAME=		gimp-1.1.18
 CATEGORIES=		graphics
@@ -22,7 +22,7 @@ USE_GMAKE=		yes
 USE_LIBTOOL=		yes
 LTCONFIG_OVERRIDE=	${WRKSRC}/ltconfig
 GNU_CONFIGURE=		yes
-CONFIGURE_ARGS+=	--with-gtk-prefix=${X11BASE} \
+CONFIGURE_ARGS+=	--with-gtk-prefix=${X11PREFIX} \
 			--disable-perl \
 			--disable-python
 CONFIGURE_ENV=		CPPFLAGS="${CPPFLAGS}" INTLLIBS="-lintl" \
diff --git a/graphics/gimp-helpbrowser/Makefile b/graphics/gimp-helpbrowser/Makefile
index 13e485534ae..e4a044f23a5 100644
--- a/graphics/gimp-helpbrowser/Makefile
+++ b/graphics/gimp-helpbrowser/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2000/06/01 11:23:28 rh Exp $
+# $NetBSD: Makefile,v 1.3 2000/06/30 10:04:47 agc Exp $
 
 DISTNAME=		gimp-1.1.18
 PKGNAME=		${DISTNAME:S/-/-helpbrowser-/}
@@ -18,7 +18,7 @@ USE_X11BASE=		yes
 USE_GMAKE=		yes
 USE_PKGLIBTOOL=		yes
 GNU_CONFIGURE=		yes
-CONFIGURE_ARGS+=	--with-gtk-prefix=${X11BASE} \
+CONFIGURE_ARGS+=	--with-gtk-prefix=${X11PREFIX} \
 			--disable-perl \
 			--disable-python
 CONFIGURE_ENV=		CPPFLAGS="${CPPFLAGS}" INTLLIBS="-lintl" \
diff --git a/graphics/gimp/Makefile b/graphics/gimp/Makefile
index 75f324125f6..e4bad7a8b7a 100644
--- a/graphics/gimp/Makefile
+++ b/graphics/gimp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.51 2000/06/01 11:23:29 rh Exp $
+# $NetBSD: Makefile,v 1.52 2000/06/30 10:04:47 agc Exp $
 
 DISTNAME=		gimp-1.0.4
 CATEGORIES=		graphics
@@ -28,7 +28,7 @@ USE_X11BASE=		yes
 USE_GMAKE=		yes
 USE_PKGLIBTOOL=		yes
 GNU_CONFIGURE=		yes
-CONFIGURE_ARGS+=	--with-gtk-prefix=${X11BASE}
+CONFIGURE_ARGS+=	--with-gtk-prefix=${X11PREFIX}
 CONFIGURE_ENV=		CPPFLAGS="${CPPFLAGS}"
 
 INFO_FILES=		pdb.info
diff --git a/graphics/giram/Makefile b/graphics/giram/Makefile
index 2f4927c29eb..cb168fa5af5 100644
--- a/graphics/giram/Makefile
+++ b/graphics/giram/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 1999/10/23 00:11:06 tron Exp $
+# $NetBSD: Makefile,v 1.8 2000/06/30 10:04:47 agc Exp $
 # FreeBSD Id: Makefile,v 1.1.1.1 1999/06/19 17:38:24 cpiazza Exp $
 
 DISTNAME=	Giram-0.1.2
@@ -17,7 +17,7 @@ DEPENDS+=	povray-*:../../graphics/povray
 USE_X11=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	GTK_CONFIG="${X11BASE}/bin/gtk-config" \
+CONFIGURE_ENV=	GTK_CONFIG="${X11PREFIX}/bin/gtk-config" \
 		CFLAGS="-I${LOCALBASE}/include ${CFLAGS}"
 
 ALL_TARGET=	install-strip
diff --git a/net/ethereal/Makefile b/net/ethereal/Makefile
index f8a3b848e8e..560dba701b9 100644
--- a/net/ethereal/Makefile
+++ b/net/ethereal/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2000/06/10 20:40:51 frueauf Exp $
+# $NetBSD: Makefile,v 1.24 2000/06/30 10:04:47 agc Exp $
 #
 
 DISTNAME=		ethereal-0.8.9
@@ -13,6 +13,6 @@ BUILD_DEPENDS+=		${LOCALBASE}/bin/perl:../../lang/perl5
 
 USE_X11=		yes
 GNU_CONFIGURE=		yes
-CONFIGURE_ARGS+=	--with-gtk-prefix=${X11BASE}
+CONFIGURE_ARGS+=	--with-gtk-prefix=${X11PREFIX}
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/gtk-gnutella/Makefile b/net/gtk-gnutella/Makefile
index 77fbf8150d9..7156aea005d 100644
--- a/net/gtk-gnutella/Makefile
+++ b/net/gtk-gnutella/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2000/05/05 13:43:07 hubertf Exp $
+# $NetBSD: Makefile,v 1.4 2000/06/30 10:04:47 agc Exp $
 #
 
 DISTNAME=		gtk-gnutella-0.12
@@ -14,6 +14,6 @@ DEPENDS=		gtk+-1.2.*:../../x11/gtk
 USE_GMAKE=		yes
 USE_X11=		yes
 GNU_CONFIGURE=		yes
-CONFIGURE_ARGS+=	--with-gtk-prefix=${X11BASE}
+CONFIGURE_ARGS+=	--with-gtk-prefix=${X11PREFIX}
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/xtraceroute/Makefile b/net/xtraceroute/Makefile
index 5f3caf7830e..5b2b5d95e18 100644
--- a/net/xtraceroute/Makefile
+++ b/net/xtraceroute/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 1999/10/08 21:12:52 jlam Exp $
+# $NetBSD: Makefile,v 1.10 2000/06/30 10:04:48 agc Exp $
 #
 
 DISTNAME=	xtraceroute-0.8.14
@@ -15,8 +15,8 @@ DEPENDS+=	tiff-*:../../graphics/tiff
 
 USE_X11=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS+= --with-gtk-prefix=${X11BASE}
-# XXX Actually, Mesa's in X11BASE too, but as our tiff is in LOCALBASE
+CONFIGURE_ARGS+= --with-gtk-prefix=${X11PREFIX}
+# XXX Actually, Mesa's in X11PREFIX too, but as our tiff is in LOCALBASE
 # and xtraceroute doesn't have a switch to tell it so (yet?), we abuse
 # the --with-GL-prefix switch for this.
 CONFIGURE_ARGS+= --with-GL-prefix=${LOCALBASE}
diff --git a/x11/gtkglarea/Makefile b/x11/gtkglarea/Makefile
index 4065fd51dbc..70e196d2738 100644
--- a/x11/gtkglarea/Makefile
+++ b/x11/gtkglarea/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2000/06/21 03:20:33 jlam Exp $
+# $NetBSD: Makefile,v 1.15 2000/06/30 10:04:48 agc Exp $
 
 DISTNAME=		gtkglarea-1.2.1
 CATEGORIES=		x11 graphics
@@ -15,7 +15,7 @@ USE_LIBTOOL=		# defined
 LTCONFIG_OVERRIDE=	${WRKSRC}/ltconfig
 
 GNU_CONFIGURE=		# defined
-CONFIGURE_ARGS+=	--with-gtk-prefix=${X11BASE}
+CONFIGURE_ARGS+=	--with-gtk-prefix=${X11PREFIX}
 CONFIGURE_ARGS+=	--with-GL-prefix=${X11BASE}
 CONFIGURE_ARGS+=	--with-lib-MesaGL
 
diff --git a/x11/scwm/Makefile b/x11/scwm/Makefile
index 4c2f29f8fb9..2e204fa0e4e 100644
--- a/x11/scwm/Makefile
+++ b/x11/scwm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2000/06/20 13:39:36 dmcmahill Exp $
+# $NetBSD: Makefile,v 1.9 2000/06/30 10:04:48 agc Exp $
 #
 
 DISTNAME=	scwm-0.9
@@ -15,7 +15,7 @@ DEPENDS+=	readline-4.0:../../devel/readline
 DEPENDS+=	xpm-3.4k:../../graphics/xpm
 
 CONFIGURE_ARGS+=	--with-guile-prefix=${LOCALBASE}	\
-			--with-gtk-prefix=${X11BASE}		\
+			--with-gtk-prefix=${X11PREFIX}		\
 			--enable-multibyte
 
 USE_X11BASE=	yes