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 /net | |
| 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 'net')
| -rw-r--r-- | net/ethereal/Makefile | 4 | ||||
| -rw-r--r-- | net/gtk-gnutella/Makefile | 4 | ||||
| -rw-r--r-- | net/xtraceroute/Makefile | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/net/ethereal/Makefile b/net/ethereal/Makefile index 28ee39b5b33..ec4b57ca7a0 100644 --- a/net/ethereal/Makefile +++ b/net/ethereal/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.25 2000/07/05 21:52:43 frueauf Exp $ +# $NetBSD: Makefile,v 1.26 2000/07/10 10:40:41 agc Exp $ # DISTNAME= ethereal-0.8.10 @@ -13,6 +13,6 @@ BUILD_DEPENDS+= ${LOCALBASE}/bin/perl:../../lang/perl5 USE_X11= yes GNU_CONFIGURE= yes -CONFIGURE_ARGS+= --with-gtk-prefix=${X11PREFIX} +CONFIGURE_ARGS+= --with-gtk-prefix="`${PKG_INFO} -qp gtk+ | ${AWK} '{ print $$2 }'`" .include "../../mk/bsd.pkg.mk" diff --git a/net/gtk-gnutella/Makefile b/net/gtk-gnutella/Makefile index 7156aea005d..accacba8e70 100644 --- a/net/gtk-gnutella/Makefile +++ b/net/gtk-gnutella/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2000/06/30 10:04:47 agc Exp $ +# $NetBSD: Makefile,v 1.5 2000/07/10 10:40:42 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=${X11PREFIX} +CONFIGURE_ARGS+= --with-gtk-prefix="`${PKG_INFO} -qp gtk+ | ${AWK} '{print $$2}'`" .include "../../mk/bsd.pkg.mk" diff --git a/net/xtraceroute/Makefile b/net/xtraceroute/Makefile index 5b2b5d95e18..a7ffed0682f 100644 --- a/net/xtraceroute/Makefile +++ b/net/xtraceroute/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2000/06/30 10:04:48 agc Exp $ +# $NetBSD: Makefile,v 1.11 2000/07/10 10:40:42 agc Exp $ # DISTNAME= xtraceroute-0.8.14 @@ -15,7 +15,7 @@ DEPENDS+= tiff-*:../../graphics/tiff USE_X11= yes GNU_CONFIGURE= yes -CONFIGURE_ARGS+= --with-gtk-prefix=${X11PREFIX} +CONFIGURE_ARGS+= --with-gtk-prefix="`${PKG_INFO} -qp gtk+ | ${AWK} '{print $$2}'`" # 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. |