diff options
| author | agc <agc@pkgsrc.org> | 2000-06-30 10:04:46 +0000 |
|---|---|---|
| committer | agc <agc@pkgsrc.org> | 2000-06-30 10:04:46 +0000 |
| commit | d951a0d54f3912eebf30c771ca112dea66e8bb7e (patch) | |
| tree | 95bda78b9cc67d9eb423003a92ffd082f193791e /graphics | |
| parent | 1881d3df91dc350bff14b275760b48458b9e7c66 (diff) | |
| download | pkgsrc-d951a0d54f3912eebf30c771ca112dea66e8bb7e.tar.gz | |
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.]
Diffstat (limited to 'graphics')
| -rw-r--r-- | graphics/gimp-current/Makefile | 4 | ||||
| -rw-r--r-- | graphics/gimp-helpbrowser/Makefile | 4 | ||||
| -rw-r--r-- | graphics/gimp/Makefile | 4 | ||||
| -rw-r--r-- | graphics/giram/Makefile | 4 |
4 files changed, 8 insertions, 8 deletions
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 |