Thu Dec 20 12:33:24 2018 UTC ()
Updated wm/spectrwm to version 3.2.0.

Changed distribution (upstream is now on github).
Patches to the build system have been submitted upstream.

As for features since the last version, there have been many changes
that can all be found in CHANGELOG.md in the distribution. The program
continues to work as before, just better.


(jaapb)
diff -r1.12 -r1.13 pkgsrc/wm/spectrwm/Makefile
diff -r1.2 -r1.3 pkgsrc/wm/spectrwm/PLIST
diff -r1.6 -r1.7 pkgsrc/wm/spectrwm/distinfo
diff -r0 -r1.1 pkgsrc/wm/spectrwm/patches/patch-netbsd_Makefile
diff -r0 -r1.1 pkgsrc/wm/spectrwm/patches/patch-netbsd_util.h
diff -r0 -r1.1 pkgsrc/wm/spectrwm/patches/patch-spectrwm.c
cvs diff -r1.12 -r1.13 pkgsrc/wm/spectrwm/Makefile (expand / switch to unified diff)

--- pkgsrc/wm/spectrwm/Makefile 2018/03/12 11:17:44 1.12
+++ pkgsrc/wm/spectrwm/Makefile 2018/12/20 12:33:23 1.13
@@ -1,53 +1,60 @@ @@ -1,53 +1,60 @@
1# $NetBSD: Makefile,v 1.12 2018/03/12 11:17:44 wiz Exp $ 1# $NetBSD: Makefile,v 1.13 2018/12/20 12:33:23 jaapb Exp $
2 2
3DISTNAME= spectrwm-2.5.1 3DISTNAME= spectrwm-3.2.0
4PKGREVISION= 2 
5CATEGORIES= wm 4CATEGORIES= wm
6MASTER_SITES= https://opensource.conformal.com/snapshots/spectrwm/ 5MASTER_SITES= ${MASTER_SITE_GITHUB:=conformal/}
7EXTRACT_SUFX= .tgz 6GITHUB_TAG= ${GITHUB_PROJECT:tu}_${PKGVERSION_NOREV:S/./_/g}
8 7
9MAINTAINER= pkgsrc-users@NetBSD.org 8MAINTAINER= pkgsrc-users@NetBSD.org
10#HOMEPAGE= https://opensource.conformal.com/wiki/spectrwm 9HOMEPAGE= https://github.com/conformal/spectrwm
11COMMENT= Small dynamic tiling window manager for X11 10COMMENT= Small dynamic tiling window manager for X11
12LICENSE= isc 11LICENSE= isc
13 12
14DEPENDS+= dmenu-[0-9]*:../../x11/dmenu 13DEPENDS+= dmenu-[0-9]*:../../x11/dmenu
15 14
16BUILDLINK_TRANSFORM+= rm:-Werror 15BUILDLINK_TRANSFORM+= rm:-Werror
17 16
18.include "../../mk/bsd.prefs.mk" 17.include "../../mk/bsd.prefs.mk"
19 18
20.if ${OPSYS} == "OpenBSD" 19.if ${OPSYS} == "OpenBSD"
21USE_BSD_MAKEFILE= yes 20USE_BSD_MAKEFILE= yes
22INSTALLATION_DIRS+= bin lib ${PKGMANDIR}/man1 21INSTALLATION_DIRS+= bin lib ${PKGMANDIR}/man1
23MAKE_FLAGS+= MANDIR=${PREFIX}/${PKGMANDIR} 22MAKE_FLAGS+= MANDIR=${PREFIX}/${PKGMANDIR}
24MAKE_FLAGS+= MANINSTALL=maninstall 23MAKE_FLAGS+= MANINSTALL=maninstall
25# sync with major.minor from ${WRKSRC}/lib/shlib_version. 24# sync with major.minor from ${WRKSRC}/lib/shlib_version.
26CFLAGS+= -DSWM_LIB=\"${PREFIX}/lib/libswmhack.so.0.0\" 25CFLAGS+= -DSWM_LIB=\"${PREFIX}/lib/libswmhack.so.0.0\"
27.else 26.else
28USE_TOOLS+= gmake 
29CFLAGS+= -I${PREFIX}/include 27CFLAGS+= -I${PREFIX}/include
30LDFLAGS+= -L${PREFIX}/lib ${COMPILER_RPATH_FLAG}${PREFIX}/lib 28LDFLAGS+= -L${PREFIX}/lib ${COMPILER_RPATH_FLAG}${PREFIX}/lib
31MAKE_FLAGS+= MANDIR=${PREFIX}/${PKGMANDIR} 29MAKE_FLAGS+= MANDIR=${PREFIX}/${PKGMANDIR}
32. if ${OPSYS} == "Darwin" 30. if ${OPSYS} == "Darwin"
 31USE_TOOLS+= gmake
33BUILD_DIRS= osx 32BUILD_DIRS= osx
 33. elif ${OPSYS} == "FreeBSD"
 34BUILD_DIRS= freebsd
 35. elif ${OPSYS} == "NetBSD"
 36BUILD_DIRS= netbsd
34. else 37. else
 38USE_TOOLS+= gmake
35BUILD_DIRS= linux 39BUILD_DIRS= linux
36. endif 40. endif
37.endif 41.endif
38 42
39INSTALLATION_DIRS+= share/examples/spectrwm 43INSTALLATION_DIRS+= share/examples/spectrwm
40 44
 45post-extract:
 46 ${RUN} cd ${WRKSRC} && ${CP} -R freebsd netbsd
 47
41post-install: 48post-install:
42 ${INSTALL_DATA} ${WRKSRC}/*.conf ${DESTDIR}${PREFIX}/share/examples/spectrwm 49 ${INSTALL_DATA} ${WRKSRC}/*.conf ${DESTDIR}${PREFIX}/share/examples/spectrwm
43 ${INSTALL_DATA} ${WRKSRC}/*.sh ${DESTDIR}${PREFIX}/share/examples/spectrwm 50 ${INSTALL_DATA} ${WRKSRC}/*.sh ${DESTDIR}${PREFIX}/share/examples/spectrwm
44 51
45.include "../../x11/libX11/buildlink3.mk" 52.include "../../x11/libX11/buildlink3.mk"
46.include "../../x11/libXcursor/buildlink3.mk" 53.include "../../x11/libXcursor/buildlink3.mk"
47.include "../../x11/libXft/buildlink3.mk" 54.include "../../x11/libXft/buildlink3.mk"
48BUILDLINK_DEPMETHOD.libXt= build 55BUILDLINK_DEPMETHOD.libXt= build
49.include "../../x11/libXt/buildlink3.mk" 56.include "../../x11/libXt/buildlink3.mk"
50.include "../../x11/libXrandr/buildlink3.mk" 57.include "../../x11/libXrandr/buildlink3.mk"
51.include "../../x11/xorgproto/buildlink3.mk" 58.include "../../x11/xorgproto/buildlink3.mk"
52.include "../../x11/xcb-util/buildlink3.mk" 59.include "../../x11/xcb-util/buildlink3.mk"
53.include "../../x11/xcb-util-keysyms/buildlink3.mk" 60.include "../../x11/xcb-util-keysyms/buildlink3.mk"
cvs diff -r1.2 -r1.3 pkgsrc/wm/spectrwm/PLIST (expand / switch to unified diff)

--- pkgsrc/wm/spectrwm/PLIST 2013/07/29 06:42:32 1.2
+++ pkgsrc/wm/spectrwm/PLIST 2018/12/20 12:33:23 1.3
@@ -1,23 +1,16 @@ @@ -1,23 +1,16 @@
1@comment $NetBSD: PLIST,v 1.2 2013/07/29 06:42:32 wiz Exp $ 1@comment $NetBSD: PLIST,v 1.3 2018/12/20 12:33:23 jaapb Exp $
2bin/scrotwm 2bin/scrotwm
3bin/spectrwm 3bin/spectrwm
4lib/libswmhack.so 
5lib/libswmhack.so.0 
6lib/libswmhack.so.0.0 4lib/libswmhack.so.0.0
7man/man1/spectrwm.1 5man/man1/spectrwm.1
8man/man1/spectrwm_es.1 
9man/man1/spectrwm_it.1 
10man/man1/spectrwm_pt.1 
11man/man1/spectrwm_ru.1 
12share/examples/spectrwm/baraction.sh 6share/examples/spectrwm/baraction.sh
13share/examples/spectrwm/buildver.sh 7share/examples/spectrwm/buildver.sh
14share/examples/spectrwm/initscreen.sh 8share/examples/spectrwm/initscreen.sh
15share/examples/spectrwm/release.sh 
16share/examples/spectrwm/screenshot.sh 9share/examples/spectrwm/screenshot.sh
17share/examples/spectrwm/spectrwm.conf 10share/examples/spectrwm/spectrwm.conf
18share/examples/spectrwm/spectrwm_cz.conf 11share/examples/spectrwm/spectrwm_cz.conf
19share/examples/spectrwm/spectrwm_es.conf 12share/examples/spectrwm/spectrwm_es.conf
20share/examples/spectrwm/spectrwm_fr.conf 13share/examples/spectrwm/spectrwm_fr.conf
21share/examples/spectrwm/spectrwm_fr_ch.conf 14share/examples/spectrwm/spectrwm_fr_ch.conf
22share/examples/spectrwm/spectrwm_se.conf 15share/examples/spectrwm/spectrwm_se.conf
23share/examples/spectrwm/spectrwm_us.conf 16share/examples/spectrwm/spectrwm_us.conf
cvs diff -r1.6 -r1.7 pkgsrc/wm/spectrwm/distinfo (expand / switch to unified diff)

--- pkgsrc/wm/spectrwm/distinfo 2015/11/02 23:42:54 1.6
+++ pkgsrc/wm/spectrwm/distinfo 2018/12/20 12:33:23 1.7
@@ -1,6 +1,9 @@ @@ -1,6 +1,9 @@
1$NetBSD: distinfo,v 1.6 2015/11/02 23:42:54 agc Exp $ 1$NetBSD: distinfo,v 1.7 2018/12/20 12:33:23 jaapb Exp $
2 2
3SHA1 (spectrwm-2.5.1.tgz) = a7803e88f1ac3f06f136d455b7408afa0e4d0042 3SHA1 (spectrwm-3.2.0.tar.gz) = fa16b02c720ac13264d7e9ba9d3c81d75e8b47c0
4RMD160 (spectrwm-2.5.1.tgz) = 8d05b65ad8eb6be2ae8687f5bb9f679e4f224637 4RMD160 (spectrwm-3.2.0.tar.gz) = 89e740deee7c76d763d016bbfc135c3dfccd71ea
5SHA512 (spectrwm-2.5.1.tgz) = 2bcb88d0b9ea9ed02672ca6a2d963644f5b38d1612ac3d7f16327e9ebf373464032ce3bc8fd3eec0e8f040a40ef6abccb502b2fa216c6ee5164c6621cc418512 5SHA512 (spectrwm-3.2.0.tar.gz) = 038d7fc5716fbca324a078a311939ec23db6ff53e9ef33b2804c687838e729f0e7bb7f724c539e8ac8efed9607358962d4dd742db7f1a30bf3c6ab72eade1039
6Size (spectrwm-2.5.1.tgz) = 116781 bytes 6Size (spectrwm-3.2.0.tar.gz) = 150691 bytes
 7SHA1 (patch-netbsd_Makefile) = a7b0c3c287a32bcd23f47339ac7f57d21ebe277c
 8SHA1 (patch-netbsd_util.h) = ba27856f79e59c7841287fc48c61d89923ad515f
 9SHA1 (patch-spectrwm.c) = fe95be29129ad3ba6e9d19c186eb5fd5f97d67e7
File Added: pkgsrc/wm/spectrwm/patches/Attic/patch-netbsd_Makefile
$NetBSD: patch-netbsd_Makefile,v 1.1 2018/12/20 12:33:24 jaapb Exp $

Changes from the freebsd Makefile to NetBSD
(use DESTDIR and BSD_INSTALL_*, mainly)
--- netbsd/Makefile.orig	2018-12-20 10:44:24.500341942 +0000
+++ netbsd/Makefile
@@ -1,13 +1,11 @@
-.sinclude <bsd.port.pre.mk>
+.sinclude <bsd.pkg.pre.mk>
 
-PREFIX?= /usr/local
-LOCALBASE?= /usr/local
+PREFIX?= /usr/pkg
+LOCALBASE?= /usr/pkg
 
-SWM_BINDIR?= $(PREFIX)/bin
-SWM_LIBDIR?= $(PREFIX)/lib
-SWM_MANDIR?= $(PREFIX)/man
-
-CC?= cc
+SWM_BINDIR?= ${DESTDIR}$(PREFIX)/bin
+SWM_LIBDIR?= ${DESTDIR}$(PREFIX)/lib
+SWM_MANDIR?= ${DESTDIR}$(PREFIX)/${PKGMANDIR}
 
 LVERS!=	awk -F = '/major/ { printf( "%s.", $$2 ) } /minor/ { printf( "%s", $$2 ) }' ${.CURDIR}/../lib/shlib_version
 BUILDVERSION!= sh "${.CURDIR}/../buildver.sh"
@@ -41,12 +39,12 @@ libswmhack.so.$(LVERS): swm_hack.so
 	$(CC) $(LDFLAGS) -shared -fpic -o ${.TARGET} ${.ALLSRC}
 
 install: all
-	install -m 755 -d $(SWM_BINDIR)
-	install -m 755 -d $(SWM_LIBDIR)
-	install -m 755 -d $(SWM_MANDIR)/man1
-	install -m 755 spectrwm $(SWM_BINDIR)
-	install -m 755 libswmhack.so.$(LVERS) $(SWM_LIBDIR)
-	install -m 644 ../spectrwm.1 $(SWM_MANDIR)/man1/spectrwm.1
+	$(BSD_INSTALL_PROGRAM_DIR) $(SWM_BINDIR)
+	$(BSD_INSTALL_LIB_DIR) $(SWM_LIBDIR)
+	$(BSD_INSTALL_MAN_DIR) $(SWM_MANDIR)/man1
+	$(BSD_INSTALL_PROGRAM) spectrwm $(SWM_BINDIR)
+	$(BSD_INSTALL_LIB) libswmhack.so.$(LVERS) $(SWM_LIBDIR)
+	$(BSD_INSTALL_MAN) ../spectrwm.1 $(SWM_MANDIR)/man1/spectrwm.1
 	ln -sf spectrwm $(SWM_BINDIR)/scrotwm
 
 clean:
@@ -54,4 +52,4 @@ clean:
 
 .PHONY:	all install clean
 
-.sinclude <bsd.port.post.mk>
+.sinclude <bsd.pkg.post.mk>
File Added: pkgsrc/wm/spectrwm/patches/Attic/patch-netbsd_util.h
$NetBSD: patch-netbsd_util.h,v 1.1 2018/12/20 12:33:24 jaapb Exp $

Changes from the freebsd Makefile to NetBSD
--- netbsd/util.h.orig	2018-12-20 10:44:24.500489587 +0000
+++ netbsd/util.h
@@ -1,5 +1,3 @@
-#include <libutil.h>
-
 #ifndef TAILQ_END
 #define TAILQ_END(head)			NULL
 #endif
File Added: pkgsrc/wm/spectrwm/patches/Attic/patch-spectrwm.c
$NetBSD: patch-spectrwm.c,v 1.1 2018/12/20 12:33:24 jaapb Exp $

NetBSD also has sys/tree.h
--- spectrwm.c.orig	2018-09-07 19:17:52.000000000 +0000
+++ spectrwm.c
@@ -42,6 +42,8 @@
 #include <sys/tree.h>
 #elif defined(__FreeBSD__)
 #include <sys/tree.h>
+#elif defined(__NetBSD__)
+#include <sys/tree.h>
 #else
 #include "tree.h"
 #endif