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 /net | |
| 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 'net')
| -rw-r--r-- | net/ethereal/Makefile | 4 | ||||
| -rw-r--r-- | net/gtk-gnutella/Makefile | 4 | ||||
| -rw-r--r-- | net/xtraceroute/Makefile | 6 |
3 files changed, 7 insertions, 7 deletions
diff --git a/net/ethereal/Makefile b/net/ethereal/Makefile index f8a3b848e8e..560dba701b9 100644 --- a/net/ethereal/Makefile +++ b/net/ethereal/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.23 2000/06/10 20:40:51 frueauf Exp $ +# $NetBSD: Makefile,v 1.24 2000/06/30 10:04:47 agc Exp $ # DISTNAME= ethereal-0.8.9 @@ -13,6 +13,6 @@ BUILD_DEPENDS+= ${LOCALBASE}/bin/perl:../../lang/perl5 USE_X11= yes GNU_CONFIGURE= yes -CONFIGURE_ARGS+= --with-gtk-prefix=${X11BASE} +CONFIGURE_ARGS+= --with-gtk-prefix=${X11PREFIX} .include "../../mk/bsd.pkg.mk" diff --git a/net/gtk-gnutella/Makefile b/net/gtk-gnutella/Makefile index 77fbf8150d9..7156aea005d 100644 --- a/net/gtk-gnutella/Makefile +++ b/net/gtk-gnutella/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2000/05/05 13:43:07 hubertf Exp $ +# $NetBSD: Makefile,v 1.4 2000/06/30 10:04:47 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=${X11BASE} +CONFIGURE_ARGS+= --with-gtk-prefix=${X11PREFIX} .include "../../mk/bsd.pkg.mk" diff --git a/net/xtraceroute/Makefile b/net/xtraceroute/Makefile index 5f3caf7830e..5b2b5d95e18 100644 --- a/net/xtraceroute/Makefile +++ b/net/xtraceroute/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 1999/10/08 21:12:52 jlam Exp $ +# $NetBSD: Makefile,v 1.10 2000/06/30 10:04:48 agc Exp $ # DISTNAME= xtraceroute-0.8.14 @@ -15,8 +15,8 @@ DEPENDS+= tiff-*:../../graphics/tiff USE_X11= yes GNU_CONFIGURE= yes -CONFIGURE_ARGS+= --with-gtk-prefix=${X11BASE} -# XXX Actually, Mesa's in X11BASE too, but as our tiff is in LOCALBASE +CONFIGURE_ARGS+= --with-gtk-prefix=${X11PREFIX} +# 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. CONFIGURE_ARGS+= --with-GL-prefix=${LOCALBASE} |