[pkgsrc/trunk]: pkgsrc/wm/musca Make sure musca finds libX11, passing the cor...

[tonio <tonio%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/f53686f3f10d
branches:  trunk
changeset: 571478:f53686f3f10d
user:      tonio <tonio%pkgsrc.org@localhost>
date:      Fri Feb 12 22:28:56 2010 +0000

description:
Make sure musca finds libX11, passing the correct LDFLAGS

diffstat:

 wm/musca/Makefile         |   5 +++--
 wm/musca/distinfo         |   3 ++-
 wm/musca/patches/patch-aa |  17 +++++++++++++++++
 3 files changed, 22 insertions(+), 3 deletions(-)

diffs (54 lines):

diff -r ee21a0470a3b -r f53686f3f10d wm/musca/Makefile
--- a/wm/musca/Makefile Fri Feb 12 20:56:54 2010 +0000
+++ b/wm/musca/Makefile Fri Feb 12 22:28:56 2010 +0000
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.1.1.1 2010/02/12 15:38:52 asau Exp $
+# $NetBSD: Makefile,v 1.2 2010/02/12 22:28:56 tonio Exp $
 #
 
 DISTNAME=      musca-0.9.24
+PKGREVISION=   1
 CATEGORIES=    wm
 MASTER_SITES=  http://aerosuidae.net/
 EXTRACT_SUFX=  .tgz
@@ -21,7 +22,7 @@
 SUBST_STAGE.makefile=  pre-build
 SUBST_MESSAGE.makefile=        Fixing Makefile
 SUBST_FILES.makefile=  Makefile
-SUBST_SED.makefile+=   -e 's,/usr/X11R6,${X11BASE},'
+SUBST_SED.makefile+=   -e 's,@X11BASE@,${X11BASE},g'
 
 do-install:
        ${INSTALL_PROGRAM} ${WRKSRC}/apis ${DESTDIR}${PREFIX}/bin
diff -r ee21a0470a3b -r f53686f3f10d wm/musca/distinfo
--- a/wm/musca/distinfo Fri Feb 12 20:56:54 2010 +0000
+++ b/wm/musca/distinfo Fri Feb 12 22:28:56 2010 +0000
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.1.1.1 2010/02/12 15:38:52 asau Exp $
+$NetBSD: distinfo,v 1.2 2010/02/12 22:28:56 tonio Exp $
 
 SHA1 (musca-0.9.24.tgz) = a74d27a352b76dccf09792a00e50ba3c05b9929b
 RMD160 (musca-0.9.24.tgz) = 599e6539455b94d05a48485ad28f4b28ca7d73e1
 Size (musca-0.9.24.tgz) = 81210 bytes
+SHA1 (patch-aa) = 426ff26a450af1d645828f466093f2396c00793c
diff -r ee21a0470a3b -r f53686f3f10d wm/musca/patches/patch-aa
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/wm/musca/patches/patch-aa Fri Feb 12 22:28:56 2010 +0000
@@ -0,0 +1,17 @@
+$NetBSD: patch-aa,v 1.1 2010/02/12 22:28:56 tonio Exp $
+
+--- Makefile.orig      2009-11-03 02:20:21.000000000 +0000
++++ Makefile
+@@ -1,9 +1,9 @@
+ CFLAGS?=-Wall -g
+ 
+ all:
+-      $(CC) $(CFLAGS) -I/usr/X11R6/include -L/usr/X11R6/lib -lc -lm -lX11 -o musca musca.c
+-      $(CC) $(CFLAGS) -I/usr/X11R6/include -L/usr/X11R6/lib -lc -lm -lX11 -o apis apis.c
+-      $(CC) $(CFLAGS) -I/usr/X11R6/include -L/usr/X11R6/lib -lc -lm -lX11 -o xlisten xlisten.c
++      $(CC) $(CFLAGS) $(LDFLAGS) -I@X11BASE@/include -L@X11BASE@/lib -lc -lm -lX11 -o musca musca.c
++      $(CC) $(CFLAGS) $(LDFLAGS) -I@X11BASE@/include -L@X11BASE@/lib -lc -lm -lX11 -o apis apis.c
++      $(CC) $(CFLAGS) $(LDFLAGS) -I@X11BASE@/include -L@X11BASE@/lib -lc -lm -lX11 -o xlisten xlisten.c
+ 
+ clean:
+       rm -f musca apis