x11-wm/stumpwm: Update to 18.11 (plus fixes for issues #538, #541)

Upstream changes: https://github.com/stumpwm/stumpwm/releases/tag/18.11

3 files changed, 30 insertions, 23 deletions

diff --git a/x11-wm/stumpwm/Makefile b/x11-wm/stumpwm/Makefile
index b9e22d67f645..c0990ee1a824 100644
--- a/x11-wm/stumpwm/Makefile
+++ b/x11-wm/stumpwm/Makefile
@@ -2,8 +2,8 @@
 # $FreeBSD$
 
 PORTNAME=	stumpwm
-DISTVERSION=	18.05
-PORTREVISION=	8
+DISTVERSION=	18.11-2
+DISTVERSIONSUFFIX=	-g84f093e
 CATEGORIES=	x11-wm lisp
 
 MAINTAINER=	jrm@FreeBSD.org
@@ -27,7 +27,6 @@ RUN_DEPENDS=	cl-alexandria>=0:devel/cl-alexandria \
 		cl-ppcre-sbcl>=0:textproc/cl-ppcre-sbcl
 
 USE_GITHUB=	yes
-GH_TAGNAME=	49fdf94
 USE_SBCL=	yes
 
 PLIST_SUB=	ASDF_PATHNAME="${ASDF_PATHNAME:S,^${PREFIX}/,,}" \
diff --git a/x11-wm/stumpwm/distinfo b/x11-wm/stumpwm/distinfo
index bd2b79aadf6e..1ca19ea30a77 100644
--- a/x11-wm/stumpwm/distinfo
+++ b/x11-wm/stumpwm/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1527471024
-SHA256 (stumpwm-stumpwm-18.05-49fdf94_GH0.tar.gz) = 243e621b8ce5e86f6fe79172fcaff9f05a115710efbcd9b88ec6388f69d17f1e
-SIZE (stumpwm-stumpwm-18.05-49fdf94_GH0.tar.gz) = 197676
+TIMESTAMP = 1545259573
+SHA256 (stumpwm-stumpwm-18.11-2-g84f093e_GH0.tar.gz) = 2d3fa436dae876aed9430a712244ee37d1440a76cd331026c00297fc26eaa692
+SIZE (stumpwm-stumpwm-18.11-2-g84f093e_GH0.tar.gz) = 211861
diff --git a/x11-wm/stumpwm/pkg-plist b/x11-wm/stumpwm/pkg-plist
index 2378fbc58f95..9d669ed53d66 100644
--- a/x11-wm/stumpwm/pkg-plist
+++ b/x11-wm/stumpwm/pkg-plist
@@ -3,6 +3,7 @@
 %%ASDF_PATHNAME%%/color.lisp
 %%ASDF_PATHNAME%%/command.lisp
 %%ASDF_PATHNAME%%/core.lisp
+%%ASDF_PATHNAME%%/dynamic-window.lisp
 %%ASDF_PATHNAME%%/events.lisp
 %%ASDF_PATHNAME%%/fdump.lisp
 %%ASDF_PATHNAME%%/floating-group.lisp
@@ -20,7 +21,8 @@
 %%ASDF_PATHNAME%%/load-stumpwm.lisp
 %%ASDF_PATHNAME%%/make-image.lisp
 %%ASDF_PATHNAME%%/manual.lisp
-%%ASDF_PATHNAME%%/menu.lisp
+%%ASDF_PATHNAME%%/menu-declarations.lisp
+%%ASDF_PATHNAME%%/menu-definitions.lisp
 %%ASDF_PATHNAME%%/message-window.lisp
 %%ASDF_PATHNAME%%/mode-line-formatters.lisp
 %%ASDF_PATHNAME%%/mode-line.lisp
@@ -28,26 +30,13 @@
 %%ASDF_PATHNAME%%/package.lisp
 %%ASDF_PATHNAME%%/pathnames.lisp
 %%ASDF_PATHNAME%%/primitives.lisp
+%%ASDF_PATHNAME%%/remap-keys.lisp
 %%ASDF_PATHNAME%%/sample-stumpwmrc.lisp
-%%ASDF_PATHNAME%%/screen.lisp
-%%ASDF_PATHNAME%%/selection.lisp
-%%ASDF_PATHNAME%%/stumpwm.asd
-%%ASDF_PATHNAME%%/stumpwm.lisp
-%%ASDF_PATHNAME%%/test-wm.lisp
-%%ASDF_PATHNAME%%/tile-group.lisp
-%%ASDF_PATHNAME%%/tile-window.lisp
-%%ASDF_PATHNAME%%/time.lisp
-%%ASDF_PATHNAME%%/user.lisp
-%%ASDF_PATHNAME%%/version.lisp
-%%ASDF_PATHNAME%%/window-placement.lisp
-%%ASDF_PATHNAME%%/window.lisp
-%%ASDF_PATHNAME%%/wrappers.lisp
-%%ASDF_PATHNAME%%/wse.lisp
-%%ASDF_REGISTRY%%/stumpwm.asd
 %%ASDF_PATHNAME%%/sbclfasl/bindings.fasl
 %%ASDF_PATHNAME%%/sbclfasl/color.fasl
 %%ASDF_PATHNAME%%/sbclfasl/command.fasl
 %%ASDF_PATHNAME%%/sbclfasl/core.fasl
+%%ASDF_PATHNAME%%/sbclfasl/dynamic-window.fasl
 %%ASDF_PATHNAME%%/sbclfasl/events.fasl
 %%ASDF_PATHNAME%%/sbclfasl/fdump.fasl
 %%ASDF_PATHNAME%%/sbclfasl/floating-group.fasl
@@ -62,7 +51,8 @@
 %%ASDF_PATHNAME%%/sbclfasl/keysyms.fasl
 %%ASDF_PATHNAME%%/sbclfasl/keytrans.fasl
 %%ASDF_PATHNAME%%/sbclfasl/kmap.fasl
-%%ASDF_PATHNAME%%/sbclfasl/menu.fasl
+%%ASDF_PATHNAME%%/sbclfasl/menu-declarations.fasl
+%%ASDF_PATHNAME%%/sbclfasl/menu-definitions.fasl
 %%ASDF_PATHNAME%%/sbclfasl/message-window.fasl
 %%ASDF_PATHNAME%%/sbclfasl/mode-line-formatters.fasl
 %%ASDF_PATHNAME%%/sbclfasl/mode-line.fasl
@@ -70,16 +60,34 @@
 %%ASDF_PATHNAME%%/sbclfasl/package.fasl
 %%ASDF_PATHNAME%%/sbclfasl/pathnames.fasl
 %%ASDF_PATHNAME%%/sbclfasl/primitives.fasl
+%%ASDF_PATHNAME%%/sbclfasl/remap-keys.fasl
 %%ASDF_PATHNAME%%/sbclfasl/screen.fasl
 %%ASDF_PATHNAME%%/sbclfasl/selection.fasl
 %%ASDF_PATHNAME%%/sbclfasl/stumpwm.fasl
 %%ASDF_PATHNAME%%/sbclfasl/tile-group.fasl
 %%ASDF_PATHNAME%%/sbclfasl/tile-window.fasl
 %%ASDF_PATHNAME%%/sbclfasl/time.fasl
+%%ASDF_PATHNAME%%/sbclfasl/timers.fasl
 %%ASDF_PATHNAME%%/sbclfasl/user.fasl
 %%ASDF_PATHNAME%%/sbclfasl/version.fasl
 %%ASDF_PATHNAME%%/sbclfasl/window-placement.fasl
 %%ASDF_PATHNAME%%/sbclfasl/window.fasl
 %%ASDF_PATHNAME%%/sbclfasl/wrappers.fasl
 %%ASDF_PATHNAME%%/sbclfasl/wse.fasl
+%%ASDF_PATHNAME%%/screen.lisp
+%%ASDF_PATHNAME%%/selection.lisp
+%%ASDF_PATHNAME%%/stumpwm.asd
+%%ASDF_PATHNAME%%/stumpwm.lisp
+%%ASDF_PATHNAME%%/test-wm.lisp
+%%ASDF_PATHNAME%%/tile-group.lisp
+%%ASDF_PATHNAME%%/tile-window.lisp
+%%ASDF_PATHNAME%%/time.lisp
+%%ASDF_PATHNAME%%/timers.lisp
+%%ASDF_PATHNAME%%/user.lisp
+%%ASDF_PATHNAME%%/version.lisp
+%%ASDF_PATHNAME%%/window-placement.lisp
+%%ASDF_PATHNAME%%/window.lisp
+%%ASDF_PATHNAME%%/wrappers.lisp
+%%ASDF_PATHNAME%%/wse.lisp
+%%ASDF_REGISTRY%%/stumpwm.asd
 bin/stumpwm