Use EVAL_PREFIX to be a bit more precise about package prefices.

5 files changed, 23 insertions, 17 deletions

diff --git a/graphics/fly/Makefile b/graphics/fly/Makefile
index 6a3009a2862..6f14fca782c 100644
--- a/graphics/fly/Makefile
+++ b/graphics/fly/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2000/03/17 23:36:09 tron Exp $
+# $NetBSD: Makefile,v 1.11 2000/07/18 15:20:59 agc Exp $
 #
 
 DISTNAME=	fly-1.6.5
@@ -11,8 +11,9 @@ HOMEPAGE=	http://www.unimelb.edu.au/fly/fly.html
 BUILD_DEPENDS+=	${LOCALBASE}/bin/gif2png:../../graphics/gif2png
 DEPENDS+=	gd>=1.8.1:../../graphics/gd
 
-USE_X11=	yes						# -lXpm
-CPPFLAGS+=	-I${X11BASE}/include -I${X11BASE}/include/X11	# Xpm.h
+EVAL_PREFIX+=	XPMDIR=xpm
+USE_X11=	yes						# (perhaps) -lXpm
+CPPFLAGS+=	-I${XPMDIR}/include -I${XPMDIR}/include/X11	# Xpm.h
 CPPFLAGS+=	-I${LOCALBASE}/include				# gd.h
 MAKE_ENV+=	CPPFLAGS="${CPPFLAGS}"
 
diff --git a/graphics/gd/Makefile b/graphics/gd/Makefile
index d0aaf269fc9..a5b2870477f 100644
--- a/graphics/gd/Makefile
+++ b/graphics/gd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2000/06/21 00:55:08 jlam Exp $
+# $NetBSD: Makefile,v 1.19 2000/07/18 15:21:00 agc Exp $
 # FreeBSD Id: Makefile,v 1.2 1997/02/14 07:55:45 asami Exp
 #
 
@@ -24,6 +24,7 @@ NO_CONFIGURE=	# defined
 .if ${OPSYS} == "SunOS"
 DEPENDS+=	zlib-*:../../devel/zlib
 CPPFLAGS+=	-I${LOCALBASE}/include				# zlib.h
+MAKE_ENV+=	EXTRA_LIBS="-lsocket -lnsl ${LOCALBASE}/lib/libz.a"
 .endif
 
 # When the API changes and breaks binary-compatibility with the previous
@@ -34,8 +35,9 @@ GD_MAJOR=	1
 GD_MINOR=	9
 MAKE_ENV+=	GD_MAJOR="${GD_MAJOR}" GD_MINOR="${GD_MINOR}"
 
+EVAL_PREFIX+=	XPMDIR=xpm
 MAKE_ENV+=	CPPFLAGS="${CPPFLAGS}"
 CPPFLAGS+=	-I${LOCALBASE}/include				# png.h
-CPPFLAGS+=	-I${X11BASE}/include -I${X11BASE}/include/X11	# xpm.h
+CPPFLAGS+=	-I${XPMDIR}/include -I${XPMDIR}/include/X11	# xpm.h
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/gimp-helpbrowser/Makefile b/graphics/gimp-helpbrowser/Makefile
index 9d5aa539035..212d77450d9 100644
--- a/graphics/gimp-helpbrowser/Makefile
+++ b/graphics/gimp-helpbrowser/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2000/07/15 20:39:19 agc Exp $
+# $NetBSD: Makefile,v 1.9 2000/07/18 15:21:00 agc Exp $
 
 DISTNAME=		gimp-1.1.24
 PKGNAME=		${DISTNAME:S/-/-helpbrowser-/}
@@ -19,7 +19,7 @@ USE_GMAKE=		yes
 USE_PKGLIBTOOL=		yes
 GNU_CONFIGURE=		yes
 
-EVAL_PREFIX+=		GTKDIR=gtk+
+EVAL_PREFIX+=		GTKDIR=gtk+ GNOMEDIR=gnome-libs IGIMPDIR=gimp
 CONFIGURE_ARGS+=	--with-gtk-prefix="${GTKDIR}" \
 			--disable-perl \
 			--disable-python
@@ -32,8 +32,8 @@ PATCHDIR=		${GIMPDIR}/patches
 
 CPPFLAGS=		-I${LOCALBASE}/include
 LDFLAGS+=		-L${LOCALBASE}/lib
-GNOME_CONFIG=		${X11BASE}/bin/gnome-config
-GIMP_CONFIG=		${X11BASE}/bin/gimp-config
+GNOME_CONFIG=		${GNOMEDIR}/bin/gnome-config
+GIMP_CONFIG=		${IGIMPDIR}/bin/gimp-config
 PLIST_SUBST+=		LOCALBASE=${LOCALBASE}
 
 .include "../../mk/bsd.prefs.mk"
diff --git a/x11/gtkglarea/Makefile b/x11/gtkglarea/Makefile
index 8663271c1a0..d58e1ceda95 100644
--- a/x11/gtkglarea/Makefile
+++ b/x11/gtkglarea/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2000/07/15 20:39:26 agc Exp $
+# $NetBSD: Makefile,v 1.20 2000/07/18 15:21:00 agc Exp $
 
 DISTNAME=		gtkglarea-1.2.1
 CATEGORIES=		x11 graphics
@@ -15,9 +15,9 @@ USE_LIBTOOL=		# defined
 LTCONFIG_OVERRIDE=	${WRKSRC}/ltconfig
 
 GNU_CONFIGURE=		# defined
-EVAL_PREFIX+=		GTKDIR=gtk+
+EVAL_PREFIX+=		GTKDIR=gtk+ MESADIR=Mesa
 CONFIGURE_ARGS+=	--with-gtk-prefix="${GTKDIR}"
-CONFIGURE_ARGS+=	--with-GL-prefix=${X11BASE}
+CONFIGURE_ARGS+=	--with-GL-prefix=${MESADIR}
 CONFIGURE_ARGS+=	--with-lib-MesaGL
 
 PLIST_SUBST+=		LOCALBASE=${LOCALBASE}
diff --git a/x11/icewm-gnome/Makefile b/x11/icewm-gnome/Makefile
index 154346fde3d..eac8ed7ae41 100644
--- a/x11/icewm-gnome/Makefile
+++ b/x11/icewm-gnome/Makefile
@@ -1,12 +1,15 @@
-# $NetBSD: Makefile,v 1.4 2000/03/07 17:46:38 jlam Exp $
+# $NetBSD: Makefile,v 1.5 2000/07/18 15:21:01 agc Exp $
 
-PKGNAME=	${DISTNAME:S/-/-gnome-/}
+PKGNAME=		${DISTNAME:S/-/-gnome-/}
 
-DEPENDS+=	gnome-libs-*:../../x11/gnome-libs
+DEPENDS+=		gnome-libs-*:../../x11/gnome-libs
 
-CONFLICTS+=	icewm-[0-9]*
+CONFLICTS+=		icewm-[0-9]*
 
-CONFIGURE_ARGS+=	--with-gnome-menus=${X11BASE}/bin/gnome-config \
+USE_X11=		yes
+
+EVAL_PREFIX+=		GNOMEDIR=gnome-libs
+CONFIGURE_ARGS+=	--with-gnome-menus=${GNOMEDIR}/bin/gnome-config \
 			--with-imlib
 CONFIGURE_ENV+=		LIBS="-lintl"