summaryrefslogtreecommitdiff
path: root/x11/xfce
diff options
context:
space:
mode:
authoragc <agc@pkgsrc.org>2000-07-11 09:31:32 +0000
committeragc <agc@pkgsrc.org>2000-07-11 09:31:32 +0000
commit1b0c8d610f13433a713d447b8781b70fd51158d3 (patch)
treec9fbacddd7bd87d9d754a9fdd648e80a35196cbd /x11/xfce
parent5ee37a44d25efcca9a70607abd9cb5a3082b22e6 (diff)
downloadpkgsrc-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/xfce')
-rw-r--r--x11/xfce/Makefile8
1 files changed, 5 insertions, 3 deletions
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"