Received: by mail.netbsd.org (Postfix, from userid 605) id 7EDFF84CD0; Thu, 20 Dec 2018 12:33:26 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 835D584CBC for ; Thu, 20 Dec 2018 12:33:25 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([127.0.0.1]) by localhost (mail.netbsd.org [127.0.0.1]) (amavisd-new, port 10025) with ESMTP id f2yw7uLbtOxz for ; Thu, 20 Dec 2018 12:33:24 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id 3B7D984C77 for ; Thu, 20 Dec 2018 12:33:24 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 3497AFB16; Thu, 20 Dec 2018 12:33:24 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1545309204135570" MIME-Version: 1.0 Date: Thu, 20 Dec 2018 12:33:24 +0000 From: "Jaap Boender" Subject: CVS commit: pkgsrc/wm/spectrwm To: pkgsrc-changes@NetBSD.org Reply-To: jaapb@netbsd.org X-Mailer: log_accum Message-Id: <20181220123324.3497AFB16@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: pkgsrc-changes.NetBSD.org Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_1545309204135570 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: jaapb Date: Thu Dec 20 12:33:24 UTC 2018 Modified Files: pkgsrc/wm/spectrwm: Makefile PLIST distinfo Added Files: pkgsrc/wm/spectrwm/patches: patch-netbsd_Makefile patch-netbsd_util.h patch-spectrwm.c Log Message: 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. To generate a diff of this commit: cvs rdiff -u -r1.12 -r1.13 pkgsrc/wm/spectrwm/Makefile cvs rdiff -u -r1.2 -r1.3 pkgsrc/wm/spectrwm/PLIST cvs rdiff -u -r1.6 -r1.7 pkgsrc/wm/spectrwm/distinfo cvs rdiff -u -r0 -r1.1 pkgsrc/wm/spectrwm/patches/patch-netbsd_Makefile \ pkgsrc/wm/spectrwm/patches/patch-netbsd_util.h \ pkgsrc/wm/spectrwm/patches/patch-spectrwm.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1545309204135570 Content-Disposition: inline Content-Length: 6962 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/wm/spectrwm/Makefile diff -u pkgsrc/wm/spectrwm/Makefile:1.12 pkgsrc/wm/spectrwm/Makefile:1.13 --- pkgsrc/wm/spectrwm/Makefile:1.12 Mon Mar 12 11:17:44 2018 +++ pkgsrc/wm/spectrwm/Makefile Thu Dec 20 12:33:23 2018 @@ -1,13 +1,12 @@ -# $NetBSD: Makefile,v 1.12 2018/03/12 11:17:44 wiz Exp $ +# $NetBSD: Makefile,v 1.13 2018/12/20 12:33:23 jaapb Exp $ -DISTNAME= spectrwm-2.5.1 -PKGREVISION= 2 +DISTNAME= spectrwm-3.2.0 CATEGORIES= wm -MASTER_SITES= https://opensource.conformal.com/snapshots/spectrwm/ -EXTRACT_SUFX= .tgz +MASTER_SITES= ${MASTER_SITE_GITHUB:=conformal/} +GITHUB_TAG= ${GITHUB_PROJECT:tu}_${PKGVERSION_NOREV:S/./_/g} MAINTAINER= pkgsrc-users@NetBSD.org -#HOMEPAGE= https://opensource.conformal.com/wiki/spectrwm +HOMEPAGE= https://github.com/conformal/spectrwm COMMENT= Small dynamic tiling window manager for X11 LICENSE= isc @@ -25,19 +24,27 @@ MAKE_FLAGS+= MANINSTALL=maninstall # sync with major.minor from ${WRKSRC}/lib/shlib_version. CFLAGS+= -DSWM_LIB=\"${PREFIX}/lib/libswmhack.so.0.0\" .else -USE_TOOLS+= gmake CFLAGS+= -I${PREFIX}/include LDFLAGS+= -L${PREFIX}/lib ${COMPILER_RPATH_FLAG}${PREFIX}/lib MAKE_FLAGS+= MANDIR=${PREFIX}/${PKGMANDIR} . if ${OPSYS} == "Darwin" +USE_TOOLS+= gmake BUILD_DIRS= osx +. elif ${OPSYS} == "FreeBSD" +BUILD_DIRS= freebsd +. elif ${OPSYS} == "NetBSD" +BUILD_DIRS= netbsd . else +USE_TOOLS+= gmake BUILD_DIRS= linux . endif .endif INSTALLATION_DIRS+= share/examples/spectrwm +post-extract: + ${RUN} cd ${WRKSRC} && ${CP} -R freebsd netbsd + post-install: ${INSTALL_DATA} ${WRKSRC}/*.conf ${DESTDIR}${PREFIX}/share/examples/spectrwm ${INSTALL_DATA} ${WRKSRC}/*.sh ${DESTDIR}${PREFIX}/share/examples/spectrwm Index: pkgsrc/wm/spectrwm/PLIST diff -u pkgsrc/wm/spectrwm/PLIST:1.2 pkgsrc/wm/spectrwm/PLIST:1.3 --- pkgsrc/wm/spectrwm/PLIST:1.2 Mon Jul 29 06:42:32 2013 +++ pkgsrc/wm/spectrwm/PLIST Thu Dec 20 12:33:23 2018 @@ -1,18 +1,11 @@ -@comment $NetBSD: PLIST,v 1.2 2013/07/29 06:42:32 wiz Exp $ +@comment $NetBSD: PLIST,v 1.3 2018/12/20 12:33:23 jaapb Exp $ bin/scrotwm bin/spectrwm -lib/libswmhack.so -lib/libswmhack.so.0 lib/libswmhack.so.0.0 man/man1/spectrwm.1 -man/man1/spectrwm_es.1 -man/man1/spectrwm_it.1 -man/man1/spectrwm_pt.1 -man/man1/spectrwm_ru.1 share/examples/spectrwm/baraction.sh share/examples/spectrwm/buildver.sh share/examples/spectrwm/initscreen.sh -share/examples/spectrwm/release.sh share/examples/spectrwm/screenshot.sh share/examples/spectrwm/spectrwm.conf share/examples/spectrwm/spectrwm_cz.conf Index: pkgsrc/wm/spectrwm/distinfo diff -u pkgsrc/wm/spectrwm/distinfo:1.6 pkgsrc/wm/spectrwm/distinfo:1.7 --- pkgsrc/wm/spectrwm/distinfo:1.6 Mon Nov 2 23:42:54 2015 +++ pkgsrc/wm/spectrwm/distinfo Thu Dec 20 12:33:23 2018 @@ -1,6 +1,9 @@ -$NetBSD: distinfo,v 1.6 2015/11/02 23:42:54 agc Exp $ +$NetBSD: distinfo,v 1.7 2018/12/20 12:33:23 jaapb Exp $ -SHA1 (spectrwm-2.5.1.tgz) = a7803e88f1ac3f06f136d455b7408afa0e4d0042 -RMD160 (spectrwm-2.5.1.tgz) = 8d05b65ad8eb6be2ae8687f5bb9f679e4f224637 -SHA512 (spectrwm-2.5.1.tgz) = 2bcb88d0b9ea9ed02672ca6a2d963644f5b38d1612ac3d7f16327e9ebf373464032ce3bc8fd3eec0e8f040a40ef6abccb502b2fa216c6ee5164c6621cc418512 -Size (spectrwm-2.5.1.tgz) = 116781 bytes +SHA1 (spectrwm-3.2.0.tar.gz) = fa16b02c720ac13264d7e9ba9d3c81d75e8b47c0 +RMD160 (spectrwm-3.2.0.tar.gz) = 89e740deee7c76d763d016bbfc135c3dfccd71ea +SHA512 (spectrwm-3.2.0.tar.gz) = 038d7fc5716fbca324a078a311939ec23db6ff53e9ef33b2804c687838e729f0e7bb7f724c539e8ac8efed9607358962d4dd742db7f1a30bf3c6ab72eade1039 +Size (spectrwm-3.2.0.tar.gz) = 150691 bytes +SHA1 (patch-netbsd_Makefile) = a7b0c3c287a32bcd23f47339ac7f57d21ebe277c +SHA1 (patch-netbsd_util.h) = ba27856f79e59c7841287fc48c61d89923ad515f +SHA1 (patch-spectrwm.c) = fe95be29129ad3ba6e9d19c186eb5fd5f97d67e7 Added files: Index: pkgsrc/wm/spectrwm/patches/patch-netbsd_Makefile diff -u /dev/null pkgsrc/wm/spectrwm/patches/patch-netbsd_Makefile:1.1 --- /dev/null Thu Dec 20 12:33:24 2018 +++ pkgsrc/wm/spectrwm/patches/patch-netbsd_Makefile Thu Dec 20 12:33:24 2018 @@ -0,0 +1,51 @@ +$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 ++.sinclude + +-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 ++.sinclude Index: pkgsrc/wm/spectrwm/patches/patch-netbsd_util.h diff -u /dev/null pkgsrc/wm/spectrwm/patches/patch-netbsd_util.h:1.1 --- /dev/null Thu Dec 20 12:33:24 2018 +++ pkgsrc/wm/spectrwm/patches/patch-netbsd_util.h Thu Dec 20 12:33:24 2018 @@ -0,0 +1,11 @@ +$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 +- + #ifndef TAILQ_END + #define TAILQ_END(head) NULL + #endif Index: pkgsrc/wm/spectrwm/patches/patch-spectrwm.c diff -u /dev/null pkgsrc/wm/spectrwm/patches/patch-spectrwm.c:1.1 --- /dev/null Thu Dec 20 12:33:24 2018 +++ pkgsrc/wm/spectrwm/patches/patch-spectrwm.c Thu Dec 20 12:33:24 2018 @@ -0,0 +1,14 @@ +$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 + #elif defined(__FreeBSD__) + #include ++#elif defined(__NetBSD__) ++#include + #else + #include "tree.h" + #endif --_----------=_1545309204135570--