Date: Thu, 24 Jan 2019 20:26:37 +0000 (UTC) From: Jan Beich <jbeich@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r491116 - in head/x11-wm/sway: . files Message-ID: <201901242026.x0OKQba5047400@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: jbeich Date: Thu Jan 24 20:26:36 2019 New Revision: 491116 URL: https://svnweb.freebsd.org/changeset/ports/491116 Log: x11-wm/sway: back out r490400 - Upstream doesn't want a terminal chooser - xkb_rules evdev breaks input on X11 sessions i.e., xf86-input-keyboard Deleted: head/x11-wm/sway/files/ Modified: head/x11-wm/sway/Makefile (contents, props changed) head/x11-wm/sway/pkg-plist (contents, props changed) Modified: head/x11-wm/sway/Makefile ============================================================================== --- head/x11-wm/sway/Makefile Thu Jan 24 20:07:22 2019 (r491115) +++ head/x11-wm/sway/Makefile Thu Jan 24 20:26:36 2019 (r491116) @@ -3,6 +3,7 @@ PORTNAME= sway DISTVERSION= 1.0-beta.2-270 DISTVERSIONSUFFIX= -g1a1133dc +PORTREVISION= 1 CATEGORIES= x11-wm PATCH_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/ @@ -56,14 +57,5 @@ post-patch: # Let @sample handle default files under etc/ @${REINPLACE_CMD} -e '/config\.in/{ N; s/@BASENAME@/&.sample/; }' \ ${WRKSRC}/meson.build -# Let terminal chooser pick default - @${REINPLACE_CMD} -e 's/urxvt/swayterm/' \ - ${WRKSRC}/config.in - -post-install: - ${INSTALL_SCRIPT} ${FILESDIR}/swayterm ${STAGEDIR}${PREFIX}/bin - ${MKDIR} ${STAGEDIR}${ETCDIR}/config.d -# x11/libxkbcommon has --with-default-rules="xorg" but x11/libinput expects "evdev" - ${ECHO_CMD} 'input * xkb_rules evdev' >${STAGEDIR}${ETCDIR}/config.d/evdev .include <bsd.port.mk> Modified: head/x11-wm/sway/pkg-plist ============================================================================== --- head/x11-wm/sway/pkg-plist Thu Jan 24 20:07:22 2019 (r491115) +++ head/x11-wm/sway/pkg-plist Thu Jan 24 20:26:36 2019 (r491116) @@ -3,8 +3,6 @@ bin/swaybar bin/swaybg bin/swaymsg bin/swaynag -bin/swayterm -%%ETCDIR%%/config.d/evdev @sample %%ETCDIR%%/config.sample %%ETCDIR%%/security.d/10-freebsd %%MANPAGES%%man/man1/sway.1.gz
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201901242026.x0OKQba5047400>