Index: head/x11-wm/sway/files/swayterm
===================================================================
--- head/x11-wm/sway/files/swayterm	(revision 491115)
+++ head/x11-wm/sway/files/swayterm	(nonexistent)
@@ -1,50 +0,0 @@
-#!/bin/sh
-#
-# This file is in the public domain. It is based on i3-sensible-terminal.
-#
-# Find a terminal emulator among the list of known ones. Prefer user
-# default ($TERMINAL), system default (x-terminal-emulator on Debian)
-# then Wayland-native with few dependencies.
-#
-# See also https://lists.freedesktop.org/archives/xdg/2015-October/013583.html
-
-KNOWN_TERMINALS='
-	alacritty
-	sakura
-	termite
-	termit
-	tilix
-	kitty
-	cool-retro-term
-	qterminal
-	roxterm
-	xfce4-terminal
-	pantheon-terminal
-	terminology
-	gnome-terminal
-	mate-terminal
-	konsole
-	aminal
-	evilvte
-	mlterm
-	lxterminal
-	lilyterm
-	terminator
-	hyper
-	mrxvt
-	urxvt
-	xterm
-	st
-	Eterm
-	rxvt
-	aterm
-'
-
-for command in "$TERMINAL" x-terminal-emulator $KNOWN_TERMINALS; do
-    if hash "$command" 2>/dev/null; then
-        exec "$command" "$@"
-    fi
-done
-
-swaynag -m "${0##*/} could not find a terminal emulator. Please, \
-either install one, define \$TERMINAL or adjust Sway config."

Property changes on: head/x11-wm/sway/files/swayterm
___________________________________________________________________
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: head/x11-wm/sway/Makefile
===================================================================
--- head/x11-wm/sway/Makefile	(revision 491115)
+++ head/x11-wm/sway/Makefile	(revision 491116)
@@ -1,69 +1,61 @@
 # $FreeBSD$
 
 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/
 PATCHFILES=	f24c0e7b92a5.patch:-p1
 
 MAINTAINER=	jbeich@FreeBSD.org
 COMMENT=	i3-compatible Wayland compositor
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	evdev-proto>0:devel/evdev-proto \
 		wayland-protocols>=1.14:graphics/wayland-protocols \
 		wlroots>=0.2.138:x11-toolkits/wlroots
 LIB_DEPENDS=	libjson-c.so:devel/json-c \
 		libevdev.so:devel/libevdev \
 		libpcre.so:devel/pcre \
 		libwayland-egl.so:graphics/wayland \
 		libwlroots.so:x11-toolkits/wlroots \
 		libinput.so:x11/libinput \
 		libxkbcommon.so:x11/libxkbcommon
 
 USES=		compiler:c11 gnome meson pkgconfig
 USE_GITHUB=	yes
 USE_GNOME=	cairo pango
 USE_XORG=	pixman
 GH_ACCOUNT=	swaywm
 MESON_ARGS=	-Dsway-version="${DISTVERSIONFULL}"
 
 OPTIONS_DEFINE=	MANPAGES PIXBUF SUID X11
 OPTIONS_DEFAULT=MANPAGES PIXBUF SUID X11
 OPTIONS_SUB=	yes
 
 MANPAGES_BUILD_DEPENDS=	scdoc:textproc/scdoc
 MANPAGES_MESON_ON=	-Dman-pages=enabled
 MANPAGES_MESON_OFF=	-Dman-pages=disabled
 
 PIXBUF_USE=		GNOME=gdkpixbuf2
 PIXBUF_MESON_ON=	-Dgdk-pixbuf=enabled
 PIXBUF_MESON_OFF=	-Dgdk-pixbuf=disabled
 
 SUID_DESC=		setuid bit on "sway" binary (required for DRM session)
 SUID_PLIST_SUB=		MAYBE_SUID="@(,,4755) "
 SUID_PLIST_SUB_OFF=	MAYBE_SUID=""
 
 X11_USE=		XORG=xcb
 X11_MESON_ON=		-Dxwayland=enabled
 X11_MESON_OFF=		-Dxwayland=disabled
 
 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>
Index: head/x11-wm/sway/pkg-plist
===================================================================
--- head/x11-wm/sway/pkg-plist	(revision 491115)
+++ head/x11-wm/sway/pkg-plist	(revision 491116)
@@ -1,34 +1,32 @@
 %%MAYBE_SUID%%bin/sway
 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
 %%MANPAGES%%man/man1/swaymsg.1.gz
 %%MANPAGES%%man/man1/swaynag.1.gz
 %%MANPAGES%%man/man5/sway-bar.5.gz
 %%MANPAGES%%man/man5/sway-input.5.gz
 %%MANPAGES%%man/man5/sway-output.5.gz
 %%MANPAGES%%man/man5/sway.5.gz
 %%MANPAGES%%man/man5/swaynag.5.gz
 share/backgrounds/sway/Sway_Wallpaper_Blue_1136x640.png
 share/backgrounds/sway/Sway_Wallpaper_Blue_1136x640_Portrait.png
 share/backgrounds/sway/Sway_Wallpaper_Blue_1366x768.png
 share/backgrounds/sway/Sway_Wallpaper_Blue_1920x1080.png
 share/backgrounds/sway/Sway_Wallpaper_Blue_2048x1536.png
 share/backgrounds/sway/Sway_Wallpaper_Blue_2048x1536_Portrait.png
 share/backgrounds/sway/Sway_Wallpaper_Blue_768x1024.png
 share/backgrounds/sway/Sway_Wallpaper_Blue_768x1024_Portrait.png
 share/bash-completion/completions/sway
 share/bash-completion/completions/swaybar
 share/bash-completion/completions/swaymsg
 share/fish/completions/sway.fish
 share/fish/completions/swaymsg.fish
 share/fish/completions/swaynag.fish
 share/wayland-sessions/sway.desktop
 share/zsh/site-functions/_sway
 share/zsh/site-functions/_swaymsg