diff options
| author | agc <agc@pkgsrc.org> | 2000-07-11 09:31:32 +0000 |
|---|---|---|
| committer | agc <agc@pkgsrc.org> | 2000-07-11 09:31:32 +0000 |
| commit | 1b0c8d610f13433a713d447b8781b70fd51158d3 (patch) | |
| tree | c9fbacddd7bd87d9d754a9fdd648e80a35196cbd /x11 | |
| parent | 5ee37a44d25efcca9a70607abd9cb5a3082b22e6 (diff) | |
| download | pkgsrc-1b0c8d610f13433a713d447b8781b70fd51158d3.tar.gz | |
Make these packages work better with xpkgwedge by using X11PREFIX in
preference to X11BASE, and by finding out where the xpm package is
installed by using pkg_info(1), not hardcoding a best guess.
Diffstat (limited to 'x11')
| -rw-r--r-- | x11/fvwm2/Makefile | 4 | ||||
| -rw-r--r-- | x11/rxvt/Makefile | 6 | ||||
| -rw-r--r-- | x11/xfce/Makefile | 8 |
3 files changed, 10 insertions, 8 deletions
diff --git a/x11/fvwm2/Makefile b/x11/fvwm2/Makefile index 526179db4f8..728419b612f 100644 --- a/x11/fvwm2/Makefile +++ b/x11/fvwm2/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.22 1999/12/02 12:04:18 kleink Exp $ +# $NetBSD: Makefile,v 1.23 2000/07/11 09:31:33 agc Exp $ # FreeBSD Id: Makefile,v 1.12 1997/10/11 10:42:43 jkh Exp # @@ -25,7 +25,7 @@ GNU_CONFIGURE= yes CONFIGURE_ARGS+= --enable-extras CONFIGURE_ARGS+= --sysconfdir=${PREFIX}/lib/X11/fvwm2 CONFIGURE_ARGS+= --libexecdir=${PREFIX}/lib/X11 -CONFIGURE_ARGS+= --with-xpm-includes=${PREFIX}/include +CONFIGURE_ARGS+= --with-xpm-includes=`${PKG_INFO} -qp xpm | ${AWK} '{print $$2}'`/include CONFIGURE_ARGS+= --with-readline-includes=${LOCALBASE}/include CONFIGURE_ARGS+= --with-rplay-includes=${LOCALBASE}/include CONFIGURE_ARGS+= --with-iconpath=${PREFIX}/lib/X11/fvwm2/pixmaps:${X11ROOT}/include/bitmaps:${X11ROOT}/include/pixmaps diff --git a/x11/rxvt/Makefile b/x11/rxvt/Makefile index 8704fc3a96f..eddb999c514 100644 --- a/x11/rxvt/Makefile +++ b/x11/rxvt/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2000/05/08 03:25:20 hubertf Exp $ +# $NetBSD: Makefile,v 1.14 2000/07/11 09:31:33 agc Exp $ # FreeBSD Id: Makefile,v 1.13 1997/03/07 12:29:49 obrien Exp # @@ -32,7 +32,7 @@ CONFIGURE_ARGS+= --enable-utmp \ --enable-frills \ --enable-keepscrolling \ --enable-mousewheel \ - --with-xpm-includes=${X11BASE}/include/X11 \ - --with-xpm-library=${X11BASE}/lib + --with-xpm-includes=`${PKG_INFO} -qp xpm | ${AWK} '{print $$2}'`/include/X11 \ + --with-xpm-library=`${PKG_INFO} -qp xpm | ${AWK} '{print $$2}'`/lib .include "../../mk/bsd.pkg.mk" diff --git a/x11/xfce/Makefile b/x11/xfce/Makefile index bf291ed6d61..590dc3c1ff2 100644 --- a/x11/xfce/Makefile +++ b/x11/xfce/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2000/03/03 17:50:25 jwise Exp $ +# $NetBSD: Makefile,v 1.6 2000/07/11 09:31:33 agc Exp $ DISTNAME= xfce-3.3.1 CATEGORIES= x11 @@ -16,8 +16,10 @@ USE_X11= yes USE_X11BASE= yes GNU_CONFIGURE= yes CONFIGURE_ENV+= XFCE_LOCALE_DIR=${PREFIX}/share/locale -CONFIGURE_ARGS+=--without-included-gettext --datadir=${PREFIX}/share \ - --with-imlib=${X11BASE} --with-xpm=${X11BASE} +CONFIGURE_ARGS+=--without-included-gettext \ + --datadir=${PREFIX}/share \ + --with-imlib=${X11BASE} \ + --with-xpm=`${PKG_INFO} -qp xpm | ${AWK} '{print $$2}'` USE_GMAKE= yes .include "../../mk/bsd.pkg.mk" |