diff options
| author | tonio <tonio> | 2010-02-12 22:28:56 +0000 |
|---|---|---|
| committer | tonio <tonio> | 2010-02-12 22:28:56 +0000 |
| commit | 6dd7d6afa25ded45ee0898f2f2e0531b58313dba (patch) | |
| tree | cc1124266c6df71cf6e9df1e71fa352e0619f16a /wm | |
| parent | 2d47be4566a1b2ab49448972ddc29ac6c0d99942 (diff) | |
| download | pkgsrc-6dd7d6afa25ded45ee0898f2f2e0531b58313dba.tar.gz | |
Make sure musca finds libX11, passing the correct LDFLAGS
Diffstat (limited to 'wm')
| -rw-r--r-- | wm/musca/Makefile | 5 | ||||
| -rw-r--r-- | wm/musca/distinfo | 3 | ||||
| -rw-r--r-- | wm/musca/patches/patch-aa | 17 |
3 files changed, 22 insertions, 3 deletions
diff --git a/wm/musca/Makefile b/wm/musca/Makefile index a575d0adc8c..afc62047176 100644 --- a/wm/musca/Makefile +++ b/wm/musca/Makefile @@ -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_CLASSES+= makefile 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 --git a/wm/musca/distinfo b/wm/musca/distinfo index 1e1e6419de0..278778acac8 100644 --- a/wm/musca/distinfo +++ b/wm/musca/distinfo @@ -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 --git a/wm/musca/patches/patch-aa b/wm/musca/patches/patch-aa new file mode 100644 index 00000000000..91a509035c9 --- /dev/null +++ b/wm/musca/patches/patch-aa @@ -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 |