diff options
author | jlam <jlam@pkgsrc.org> | 2000-07-22 06:44:53 +0000 |
---|---|---|
committer | jlam <jlam@pkgsrc.org> | 2000-07-22 06:44:53 +0000 |
commit | 7960905b4c52b8058199f8488ef48fac34e6fda3 (patch) | |
tree | 7d82a58dd3454ed542f8ce98f55acdedf48985a0 /x11 | |
parent | 463e381f7bbec307532e645070e3ce5f50348871 (diff) | |
download | pkgsrc-7960905b4c52b8058199f8488ef48fac34e6fda3.tar.gz |
Find xpm headers if xpkgwedge is installed by using EVAL_PREFIX (I hope I
did this right...documentation about how to use EVAL_PREFIX is scarce).
Diffstat (limited to 'x11')
-rw-r--r-- | x11/wmx/Makefile | 7 | ||||
-rw-r--r-- | x11/wmx/files/patch-sum | 4 | ||||
-rw-r--r-- | x11/wmx/patches/patch-aa | 8 |
3 files changed, 11 insertions, 8 deletions
diff --git a/x11/wmx/Makefile b/x11/wmx/Makefile index 5c2e347f095..6513cf2682f 100644 --- a/x11/wmx/Makefile +++ b/x11/wmx/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1.1.1 1999/10/01 15:10:23 fredb Exp $ +# $NetBSD: Makefile,v 1.2 2000/07/22 06:44:53 jlam Exp $ DISTNAME= wmx-5 PKGNAME= wmx-5.0 @@ -11,13 +11,16 @@ HOMEPAGE= http://www.all-day-breakfast.com/wmx/ DEPENDS= xpm-3.4k:../../graphics/xpm USE_X11BASE= yes +EVAL_PREFIX= XPMDIR=xpm + +MAKE_ENV+= XPMDIR=${XPMDIR} do-configure: cd ${WRKSRC}; \ ${MV} Config.h Config.h.dist; \ ${SED} '/SYSTEM_COMMAND_MENU/s|/usr/local/lib/wmx/menu|${PREFIX}/etc/wmx|' \ < Config.h.dist > Config.h; \ - ${MAKE} depend + ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} ${MAKE_FLAGS} depend do-install: ${INSTALL_PROGRAM} ${WRKSRC}/wmx ${PREFIX}/bin diff --git a/x11/wmx/files/patch-sum b/x11/wmx/files/patch-sum index 9fc8871378a..e08704ad18a 100644 --- a/x11/wmx/files/patch-sum +++ b/x11/wmx/files/patch-sum @@ -1,3 +1,3 @@ -$NetBSD: patch-sum,v 1.1.1.1 1999/10/01 15:10:23 fredb Exp $ +$NetBSD: patch-sum,v 1.2 2000/07/22 06:44:54 jlam Exp $ -MD5 (patch-aa) = b1f1b527e5879318be9558d424451c27 +MD5 (patch-aa) = 8316a7a06e93596d8ddef91333b6e66e diff --git a/x11/wmx/patches/patch-aa b/x11/wmx/patches/patch-aa index 7e8dc9e87c1..a36f9d19b08 100644 --- a/x11/wmx/patches/patch-aa +++ b/x11/wmx/patches/patch-aa @@ -1,7 +1,7 @@ -$NetBSD: patch-aa,v 1.1.1.1 1999/10/01 15:10:23 fredb Exp $ +$NetBSD: patch-aa,v 1.2 2000/07/22 06:44:55 jlam Exp $ ---- Makefile.orig Wed Sep 29 00:08:22 1999 -+++ Makefile Wed Sep 29 00:17:16 1999 +--- Makefile.orig Wed Jan 13 05:28:43 1999 ++++ Makefile Sat Jul 22 02:41:55 2000 @@ -5,12 +5,12 @@ # If you're not using background pixmaps, remove -lXpm from the LIBS. # If your X libraries are somewhere other than /usr/X11/lib, give their @@ -13,7 +13,7 @@ $NetBSD: patch-aa,v 1.1.1.1 1999/10/01 15:10:23 fredb Exp $ # as a -I option here (excluding the X11 bit). If you're using I18N # and Xlocale, please add -DX_LOCALE. -CFLAGS = -g -O2 -I/usr/include -I/usr/openwin/include -+CFLAGS = -g -O2 -I${X11BASE}/include ++CFLAGS = -g -O2 -I${X11BASE}/include -I${XPMDIR}/include OBJECTS = Border.o Buttons.o Channel.o Client.o Config.o Events.o Main.o Manager.o Menu.o Rotated.o Session.o |