summaryrefslogtreecommitdiff
path: root/graphics
diff options
context:
space:
mode:
authoragc <agc@pkgsrc.org>2000-07-18 15:20:59 +0000
committeragc <agc@pkgsrc.org>2000-07-18 15:20:59 +0000
commit90515e7cce488a5a5e69eb5e4521bf2c71e744dc (patch)
treed5f0918fc02f3fe5b36f4fc151af6bb7db0076d1 /graphics
parent2e2b2ad5e7c84dab36d5cc8d785479c4a46758ff (diff)
downloadpkgsrc-90515e7cce488a5a5e69eb5e4521bf2c71e744dc.tar.gz
Use EVAL_PREFIX to be a bit more precise about package prefices.
Diffstat (limited to 'graphics')
-rw-r--r--graphics/fly/Makefile7
-rw-r--r--graphics/gd/Makefile6
-rw-r--r--graphics/gimp-helpbrowser/Makefile8
3 files changed, 12 insertions, 9 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"