From 1b0c8d610f13433a713d447b8781b70fd51158d3 Mon Sep 17 00:00:00 2001
From: agc <agc@pkgsrc.org>
Date: Tue, 11 Jul 2000 09:31:32 +0000
Subject: 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.

---
 x11/xfce/Makefile | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

(limited to 'x11/xfce')

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"
-- 
cgit v1.2.3