diff options
Diffstat (limited to 'wm')
-rw-r--r-- | wm/spectrwm/Makefile | 4 | ||||
-rw-r--r-- | wm/spectrwm/distinfo | 10 | ||||
-rw-r--r-- | wm/spectrwm/patches/patch-linux_Makefile | 22 |
3 files changed, 17 insertions, 19 deletions
diff --git a/wm/spectrwm/Makefile b/wm/spectrwm/Makefile index 6d2f0de3212..e758bb5334f 100644 --- a/wm/spectrwm/Makefile +++ b/wm/spectrwm/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.2 2013/07/29 06:42:32 wiz Exp $ +# $NetBSD: Makefile,v 1.3 2013/11/29 23:30:47 wiz Exp $ -DISTNAME= spectrwm-2.3.0 +DISTNAME= spectrwm-2.4.0 CATEGORIES= wm MASTER_SITES= https://opensource.conformal.com/snapshots/spectrwm/ EXTRACT_SUFX= .tgz diff --git a/wm/spectrwm/distinfo b/wm/spectrwm/distinfo index f2b2221cfda..dbaf3998552 100644 --- a/wm/spectrwm/distinfo +++ b/wm/spectrwm/distinfo @@ -1,6 +1,6 @@ -$NetBSD: distinfo,v 1.2 2013/07/29 06:42:32 wiz Exp $ +$NetBSD: distinfo,v 1.3 2013/11/29 23:30:47 wiz Exp $ -SHA1 (spectrwm-2.3.0.tgz) = 38a4ec1f11e469e1a8bddeb2e478fe2ff6bc3fdc -RMD160 (spectrwm-2.3.0.tgz) = e27c47765d818ffbcc5363b32bae44df68e9a872 -Size (spectrwm-2.3.0.tgz) = 109384 bytes -SHA1 (patch-linux_Makefile) = 804bbae49715516cd54b4fa44a660ae68b0e1feb +SHA1 (spectrwm-2.4.0.tgz) = 6d32d1a41436754b135b3152ebd288f06554ef03 +RMD160 (spectrwm-2.4.0.tgz) = 5beb65f25f4593db445570195f120398d29c29ba +Size (spectrwm-2.4.0.tgz) = 112193 bytes +SHA1 (patch-linux_Makefile) = f5cde3ae112c81f1d2e1a819bc59a80d14564a18 diff --git a/wm/spectrwm/patches/patch-linux_Makefile b/wm/spectrwm/patches/patch-linux_Makefile index a258610034a..e2533362fe7 100644 --- a/wm/spectrwm/patches/patch-linux_Makefile +++ b/wm/spectrwm/patches/patch-linux_Makefile @@ -1,15 +1,13 @@ -$NetBSD: patch-linux_Makefile,v 1.1 2013/07/26 17:55:37 wiz Exp $ +$NetBSD: patch-linux_Makefile,v 1.2 2013/11/29 23:30:47 wiz Exp $ -Add rpath. +Find installed library. ---- linux/Makefile.orig 2013-03-23 14:04:01.000000000 +0000 -+++ linux/Makefile -@@ -32,7 +32,7 @@ spectrwm: spectrwm.o linux.o - $(CC) $(CFLAGS) -c -fpic -DPIC $+ -o $@ +--- linux/Makefile.orig 2013-11-24 00:09:06.031887162 -0600 ++++ linux/Makefile 2013-11-24 00:09:46.706760816 -0600 +@@ -1,5 +1,5 @@ + CFLAGS+= -std=c99 -Wmissing-prototypes -Wall -Wextra -Wshadow -Wno-uninitialized -g +-CFLAGS+= -D_GNU_SOURCE -I. -I/usr/include/freetype2 -DSWM_LIB=\"libswmhack.so.$(LVERS)\" ++CFLAGS+= -D_GNU_SOURCE -I. -I/usr/include/freetype2 -DSWM_LIB=\"$(LIBDIR)/libswmhack.so.$(LVERS)\" + LDADD+= -lX11 -lX11-xcb -lxcb -lxcb-icccm -lxcb-randr -lxcb-keysyms -lxcb-util -lxcb-xtest -lXft -lXcursor - libswmhack.so.$(LVERS): swm_hack.so -- $(CC) -shared -fpic -o libswmhack.so.$(LVERS) swm_hack.so $(LDADD) -+ $(CC) $(LDFLAGS) -shared -fpic -o libswmhack.so.$(LVERS) swm_hack.so $(LDADD) - - install: all - install -m 755 -d $(DESTDIR)$(BINDIR) + PREFIX?= /usr/local |