diff options
| author | agc <agc@pkgsrc.org> | 2000-07-10 10:40:39 +0000 |
|---|---|---|
| committer | agc <agc@pkgsrc.org> | 2000-07-10 10:40:39 +0000 |
| commit | e05e4735ddf3f9207384f7ffab7fa66a65f20df7 (patch) | |
| tree | eb8c75c4d78a779a039aa1995f70225e25ce9df1 /graphics | |
| parent | b16e065ccc96b67b06741355aaed54c93e111998 (diff) | |
| download | pkgsrc-e05e4735ddf3f9207384f7ffab7fa66a65f20df7.tar.gz | |
Hardcoding X11PREFIX into package Makefiles forces the user to install
xpkgwedge once, before any other packages have been installed, and
never to delete it. This change finds the prefix of the installed
pre-req package using pkg_info(1), and allows packages to be found in
${X11BASE} and ${LOCALBASE}, not just ${X11PREFIX} - from mail from
Dave Sainty <dave@dtsp.co.nz>, munged slightly by myself.
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 374ba7a796d..49e5bf664d8 100644 --- a/graphics/gimp-current/Makefile +++ b/graphics/gimp-current/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.18 2000/07/06 07:12:47 tron Exp $ +# $NetBSD: Makefile,v 1.19 2000/07/10 10:40:40 agc Exp $ DISTNAME= gimp-1.1.24 CATEGORIES= graphics @@ -23,7 +23,7 @@ USE_GMAKE= yes USE_LIBTOOL= yes LTCONFIG_OVERRIDE= ${WRKSRC}/ltconfig GNU_CONFIGURE= yes -CONFIGURE_ARGS+= --with-gtk-prefix=${X11PREFIX} \ +CONFIGURE_ARGS+= --with-gtk-prefix="`${PKG_INFO} -qp gtk+ | ${AWK} '{print $$2}'`" \ --disable-perl \ --disable-python CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" INTLLIBS="-lintl" \ diff --git a/graphics/gimp-helpbrowser/Makefile b/graphics/gimp-helpbrowser/Makefile index 0bef920ec21..de0ff526786 100644 --- a/graphics/gimp-helpbrowser/Makefile +++ b/graphics/gimp-helpbrowser/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2000/07/05 03:40:27 hubertf Exp $ +# $NetBSD: Makefile,v 1.5 2000/07/10 10:40:40 agc Exp $ DISTNAME= gimp-1.1.24 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=${X11PREFIX} \ +CONFIGURE_ARGS+= --with-gtk-prefix="`${PKG_INFO} -qp gtk+ | ${AWK} '{print $$2}'`" \ --disable-perl \ --disable-python CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" INTLLIBS="-lintl" \ diff --git a/graphics/gimp/Makefile b/graphics/gimp/Makefile index e4bad7a8b7a..2e64d5b34e9 100644 --- a/graphics/gimp/Makefile +++ b/graphics/gimp/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.52 2000/06/30 10:04:47 agc Exp $ +# $NetBSD: Makefile,v 1.53 2000/07/10 10:40:41 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=${X11PREFIX} +CONFIGURE_ARGS+= --with-gtk-prefix="`${PKG_INFO} -qp gtk+ | ${AWK} '{print $$2}'`" CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" INFO_FILES= pdb.info diff --git a/graphics/giram/Makefile b/graphics/giram/Makefile index cb168fa5af5..7ba067d7de1 100644 --- a/graphics/giram/Makefile +++ b/graphics/giram/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2000/06/30 10:04:47 agc Exp $ +# $NetBSD: Makefile,v 1.9 2000/07/10 10:40:41 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="${X11PREFIX}/bin/gtk-config" \ +CONFIGURE_ENV= GTK_CONFIG="`${PKG_INFO} -qp gtk+ | ${AWK} '{print $$2}'`/bin/gtk-config" \ CFLAGS="-I${LOCALBASE}/include ${CFLAGS}" ALL_TARGET= install-strip |