From owner-svn-ports-head@freebsd.org Wed Oct 4 20:14:26 2017 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 73543E41759; Wed, 4 Oct 2017 20:14:26 +0000 (UTC) (envelope-from zeising@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 355106FAE3; Wed, 4 Oct 2017 20:14:26 +0000 (UTC) (envelope-from zeising@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v94KEPur022945; Wed, 4 Oct 2017 20:14:25 GMT (envelope-from zeising@FreeBSD.org) Received: (from zeising@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v94KEOm1022941; Wed, 4 Oct 2017 20:14:24 GMT (envelope-from zeising@FreeBSD.org) Message-Id: <201710042014.v94KEOm1022941@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: zeising set sender to zeising@FreeBSD.org using -f From: Niclas Zeising Date: Wed, 4 Oct 2017 20:14:24 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r451244 - in head/x11-wm/spectrwm: . files X-SVN-Group: ports-head X-SVN-Commit-Author: zeising X-SVN-Commit-Paths: in head/x11-wm/spectrwm: . files X-SVN-Commit-Revision: 451244 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 04 Oct 2017 20:14:26 -0000 Author: zeising Date: Wed Oct 4 20:14:24 2017 New Revision: 451244 URL: https://svnweb.freebsd.org/changeset/ports/451244 Log: Update to 3.1.0 Changelog: Add +R for region index to bar formatting. Add new bar_color_selected and bar_font_color_selected options. Add new 'ws_empty' action. Enable padding in the bar_format using '_' character Handle MappingNotify during startup. Reset SIGPIPE before execvp(). Correct size for WM_STATE This release also fixes a bunch of bugs, linux build and man page nits. FreeBSD specific changes: Thhe screenshot.sh script is now installed into the examples dir, instead of bin/. If you are using it, you need to update your configuration file. I've reworked the examples handling and hid all examoles behind the EXAMPLES knob (on by default). This is mostly some example configurations, but I also added the baraction.sh script which can be used to do fancier stuff with the status bar. Modified: head/x11-wm/spectrwm/Makefile head/x11-wm/spectrwm/distinfo head/x11-wm/spectrwm/files/patch-spectrwm.c head/x11-wm/spectrwm/pkg-plist Modified: head/x11-wm/spectrwm/Makefile ============================================================================== --- head/x11-wm/spectrwm/Makefile Wed Oct 4 19:39:26 2017 (r451243) +++ head/x11-wm/spectrwm/Makefile Wed Oct 4 20:14:24 2017 (r451244) @@ -3,7 +3,7 @@ PORTNAME= spectrwm DISTVERSIONPREFIX= SPECTRWM_ -DISTVERSION= 3_0_2 +DISTVERSION= 3_1_0 CATEGORIES= x11-wm MAINTAINER= zeising@FreeBSD.org @@ -19,38 +19,49 @@ RUN_DEPENDS+= dmenu:x11/dmenu USE_GITHUB= yes GH_ACCOUNT= conformal +OPTIONS_DEFINE= EXAMPLES + +.include + USE_XORG= x11 xcb xcursor xft xrandr xt USE_LDCONFIG= yes -PORTEXAMPLES= spectrwm_cz.conf \ +CONFEXAMPLES= spectrwm_cz.conf \ spectrwm_es.conf \ spectrwm_fr.conf \ spectrwm_fr_ch.conf \ spectrwm_se.conf \ spectrwm_us.conf +SCRIPTEXAMPLES= baraction.sh \ + screenshot.sh + post-patch: @${REINPLACE_CMD} -e 's|/etc/|${PREFIX}/etc/|g' ${WRKSRC}/spectrwm.* do-build: - ${CC} ${CFLAGS} -I${LOCALBASE}/include \ + ${CC} ${CFLAGS} -Wall -Werror -I${LOCALBASE}/include \ -I${LOCALBASE}/include/freetype2 -I${WRKSRC}/freebsd \ -lutil -L${LOCALBASE}/lib -lX11 -lX11-xcb -lxcb -lxcb-icccm \ -lxcb-keysyms -lxcb-randr -lxcb-util -lxcb-xtest -lXcursor \ -lXft -DSWM_LIB=\"${PREFIX}/lib/libswmhack.so\" \ -o ${WRKSRC}/${PORTNAME} ${WRKSRC}/${PORTNAME}.c - ${CC} ${CFLAGS} -I${LOCALBASE}/include -shared -fpic -DPIC \ + ${CC} ${CFLAGS} -Wall -Werror -I${LOCALBASE}/include -shared -fpic -DPIC \ -o ${WRKSRC}/libswmhack.so ${WRKSRC}/lib/swm_hack.c do-install: ${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin - ${INSTALL_SCRIPT} ${WRKSRC}/screenshot.sh ${STAGEDIR}${PREFIX}/bin ${INSTALL_LIB} ${WRKSRC}/libswmhack.so ${STAGEDIR}${PREFIX}/lib ${INSTALL_MAN} ${WRKSRC}/spectrwm.1 ${STAGEDIR}${MAN1PREFIX}/man/man1 ${INSTALL_DATA} ${WRKSRC}/spectrwm.conf ${STAGEDIR}${PREFIX}/etc/spectrwm.conf.sample + +do-install-EXAMPLES-on: ${MKDIR} ${STAGEDIR}${EXAMPLESDIR} -.for conf in ${PORTEXAMPLES} - ${INSTALL_DATA} ${WRKSRC}/${conf} ${STAGEDIR}${EXAMPLESDIR} +.for file in ${CONFEXAMPLES} + ${INSTALL_DATA} ${WRKSRC}/${file} ${STAGEDIR}${EXAMPLESDIR} +.endfor +.for file in ${SCRIPTEXAMPLES} + ${INSTALL_SCRIPT} ${WRKSRC}/${file} ${STAGEDIR}${EXAMPLESDIR} .endfor .include Modified: head/x11-wm/spectrwm/distinfo ============================================================================== --- head/x11-wm/spectrwm/distinfo Wed Oct 4 19:39:26 2017 (r451243) +++ head/x11-wm/spectrwm/distinfo Wed Oct 4 20:14:24 2017 (r451244) @@ -1,3 +1,3 @@ -TIMESTAMP = 1465236118 -SHA256 (conformal-spectrwm-SPECTRWM_3_0_2_GH0.tar.gz) = 82ce0280039de642c41684f3096abb0388926b60c37987ca1dbc53a0913cab18 -SIZE (conformal-spectrwm-SPECTRWM_3_0_2_GH0.tar.gz) = 147355 +TIMESTAMP = 1507141425 +SHA256 (conformal-spectrwm-SPECTRWM_3_1_0_GH0.tar.gz) = b7a5e24fe6d923aadab947d354ff44ad742b721daaf334584e8eea9e15649d9a +SIZE (conformal-spectrwm-SPECTRWM_3_1_0_GH0.tar.gz) = 147206 Modified: head/x11-wm/spectrwm/files/patch-spectrwm.c ============================================================================== --- head/x11-wm/spectrwm/files/patch-spectrwm.c Wed Oct 4 19:39:26 2017 (r451243) +++ head/x11-wm/spectrwm/files/patch-spectrwm.c Wed Oct 4 20:14:24 2017 (r451244) @@ -1,6 +1,6 @@ ---- spectrwm.c.orig 2016-06-05 07:12:06 UTC +--- spectrwm.c.orig 2017-10-04 18:36:20 UTC +++ spectrwm.c -@@ -7876,7 +7876,7 @@ validate_spawns(void) +@@ -7960,7 +7960,7 @@ validate_spawns(void) void setup_spawn(void) { Modified: head/x11-wm/spectrwm/pkg-plist ============================================================================== --- head/x11-wm/spectrwm/pkg-plist Wed Oct 4 19:39:26 2017 (r451243) +++ head/x11-wm/spectrwm/pkg-plist Wed Oct 4 20:14:24 2017 (r451244) @@ -1,5 +1,12 @@ bin/spectrwm -bin/screenshot.sh lib/libswmhack.so man/man1/spectrwm.1.gz @sample etc/spectrwm.conf.sample +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/baraction.sh +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/screenshot.sh +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/spectrwm_cz.conf +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/spectrwm_es.conf +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/spectrwm_fr.conf +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/spectrwm_fr_ch.conf +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/spectrwm_se.conf +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/spectrwm_us.conf