x11-wm/stumpwm: Fix build by updating to 22.05-157

SBCL removed the symbol sb-unix:unix-select in 7882c92e6. As StumpWM used this function, it could no longer build when lang/sbcl was updated to 2.2.7. This update pulls in a fix which replaces sb-unix:unix-select with sb-unix:unix-fast-select. Thanks to Catie in the #stumpwm IRC channel on Libera.Chat for assistance with debugging and testing. Sponsored by: The FreeBSD Foundation
freebsd · Aug 25, 2022 · 8bcff3b · 8bcff3b
1 parent f95fbcc
commit 8bcff3b
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 10 deletions.
diff --git a/x11-wm/stumpwm/Makefile b/x11-wm/stumpwm/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	stumpwm
-DISTVERSION=	22.05
-PORTREVISION=	2
+DISTVERSION=	22.05-157
+DISTVERSIONSUFFIX=	-g740e945
 CATEGORIES=	x11-wm lisp
 
 MAINTAINER=	jrm@FreeBSD.org
@@ -52,7 +52,8 @@ do-build:
 		ASDF_OUTPUT_TRANSLATIONS="/:" \
 		FBSD_ASDF_COMPILE_PORT=t PORTNAME=${PORTNAME} WRKSRC=${WRKSRC}/ \
 		${SBCL} \
-		--noinform --no-sysinit --no-userinit \
+		--noinform --non-interactive --no-sysinit --no-userinit \
+		--eval "(setf sb-impl::*default-external-format* :UTF-8)" \
 		--eval '#.(load "${LOCALBASE}/etc/asdf-init")' \
 		--eval "(asdf:oos 'asdf:compile-op :${PORTNAME} :force t)" \
 		--eval '(load "load-stumpwm.lisp")' \
@@ -62,13 +63,19 @@ do-build:
 		makeinfo stumpwm.texi)
 
 do-install:
-	@${MKDIR} ${STAGEDIR}${ASDF_PATHNAME} \
-		${STAGEDIR}${ASDF_REGISTRY} \
-		${STAGEDIR}${ASDF_PATHNAME}/sbclfasl
+	@${MKDIR} ${STAGEDIR}${ASDF_PATHNAME}/dynamic-mixins/src \
+		${STAGEDIR}${ASDF_PATHNAME}/sbclfasl/dynamic-mixins/src \
+		${STAGEDIR}${ASDF_REGISTRY}
 	${INSTALL_SCRIPT} ${WRKDIR}/stumpwm ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_DATA} ${WRKSRC}/.dir-locals.el ${WRKSRC}/${PORTNAME}.asd \
 		${WRKSRC}/*.lisp ${STAGEDIR}${ASDF_PATHNAME}
+	 ${INSTALL_DATA} ${WRKSRC}/dynamic-mixins/dynamic-mixins.asd \
+		${STAGEDIR}${ASDF_PATHNAME}/dynamic-mixins/
+	${INSTALL_DATA} ${WRKSRC}/dynamic-mixins/src/*.lisp \
+		${STAGEDIR}${ASDF_PATHNAME}/dynamic-mixins/src/
 	${INSTALL_DATA} ${WRKSRC}/*.fasl ${STAGEDIR}${ASDF_PATHNAME}/sbclfasl
+	${INSTALL_DATA} ${WRKSRC}/dynamic-mixins/src/*.fasl \
+		${STAGEDIR}${ASDF_PATHNAME}/sbclfasl/dynamic-mixins/src
 	${INSTALL_DATA} ${WRKSRC}/${PORTNAME}.info \
 		${STAGEDIR}${PREFIX}/${INFO_PATH}
 	@${RLN} ${STAGEDIR}${ASDF_PATHNAME}/${PORTNAME}.asd \

diff --git a/x11-wm/stumpwm/distinfo b/x11-wm/stumpwm/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1653441154
-SHA256 (stumpwm-stumpwm-22.05_GH0.tar.gz) = d843302f9ce54660bc96e4f0d8e9584f07a81d43c4c26357d5a29cb07194abae
-SIZE (stumpwm-stumpwm-22.05_GH0.tar.gz) = 238196
+TIMESTAMP = 1661384264
+SHA256 (stumpwm-stumpwm-22.05-157-g740e945_GH0.tar.gz) = 57b3d723e7342639826828c44bc2711e4ff78b1e940e14ab8d26322021814b23
+SIZE (stumpwm-stumpwm-22.05-157-g740e945_GH0.tar.gz) = 273076
diff --git a/x11-wm/stumpwm/pkg-plist b/x11-wm/stumpwm/pkg-plist
@@ -1,10 +1,14 @@
+bin/stumpwm
 %%ASDF_PATHNAME%%/.dir-locals.el
 %%ASDF_PATHNAME%%/bindings.lisp
 %%ASDF_PATHNAME%%/color.lisp
 %%ASDF_PATHNAME%%/command.lisp
 %%ASDF_PATHNAME%%/core.lisp
 %%ASDF_PATHNAME%%/debug.lisp
 %%ASDF_PATHNAME%%/dynamic-group.lisp
+%%ASDF_PATHNAME%%/dynamic-mixins/dynamic-mixins.asd
+%%ASDF_PATHNAME%%/dynamic-mixins/src/dynamic-mixins.lisp
+%%ASDF_PATHNAME%%/dynamic-mixins/src/package.lisp
 %%ASDF_PATHNAME%%/dynamic-window.lisp
 %%ASDF_PATHNAME%%/events.lisp
 %%ASDF_PATHNAME%%/fdump.lisp
@@ -27,20 +31,24 @@
 %%ASDF_PATHNAME%%/menu-declarations.lisp
 %%ASDF_PATHNAME%%/menu-definitions.lisp
 %%ASDF_PATHNAME%%/message-window.lisp
+%%ASDF_PATHNAME%%/minor-modes.lisp
 %%ASDF_PATHNAME%%/mode-line-formatters.lisp
 %%ASDF_PATHNAME%%/mode-line.lisp
 %%ASDF_PATHNAME%%/module.lisp
 %%ASDF_PATHNAME%%/package.lisp
 %%ASDF_PATHNAME%%/pathnames.lisp
 %%ASDF_PATHNAME%%/primitives.lisp
 %%ASDF_PATHNAME%%/remap-keys.lisp
+%%ASDF_PATHNAME%%/replace-class.lisp
 %%ASDF_PATHNAME%%/sample-stumpwmrc.lisp
 %%ASDF_PATHNAME%%/sbclfasl/bindings.fasl
 %%ASDF_PATHNAME%%/sbclfasl/color.fasl
 %%ASDF_PATHNAME%%/sbclfasl/command.fasl
 %%ASDF_PATHNAME%%/sbclfasl/core.fasl
 %%ASDF_PATHNAME%%/sbclfasl/debug.fasl
 %%ASDF_PATHNAME%%/sbclfasl/dynamic-group.fasl
+%%ASDF_PATHNAME%%/sbclfasl/dynamic-mixins/src/dynamic-mixins.fasl
+%%ASDF_PATHNAME%%/sbclfasl/dynamic-mixins/src/package.fasl
 %%ASDF_PATHNAME%%/sbclfasl/dynamic-window.fasl
 %%ASDF_PATHNAME%%/sbclfasl/events.fasl
 %%ASDF_PATHNAME%%/sbclfasl/fdump.fasl
@@ -60,13 +68,15 @@
 %%ASDF_PATHNAME%%/sbclfasl/menu-declarations.fasl
 %%ASDF_PATHNAME%%/sbclfasl/menu-definitions.fasl
 %%ASDF_PATHNAME%%/sbclfasl/message-window.fasl
+%%ASDF_PATHNAME%%/sbclfasl/minor-modes.fasl
 %%ASDF_PATHNAME%%/sbclfasl/mode-line-formatters.fasl
 %%ASDF_PATHNAME%%/sbclfasl/mode-line.fasl
 %%ASDF_PATHNAME%%/sbclfasl/module.fasl
 %%ASDF_PATHNAME%%/sbclfasl/package.fasl
 %%ASDF_PATHNAME%%/sbclfasl/pathnames.fasl
 %%ASDF_PATHNAME%%/sbclfasl/primitives.fasl
 %%ASDF_PATHNAME%%/sbclfasl/remap-keys.fasl
+%%ASDF_PATHNAME%%/sbclfasl/replace-class.fasl
 %%ASDF_PATHNAME%%/sbclfasl/screen.fasl
 %%ASDF_PATHNAME%%/sbclfasl/selection.fasl
 %%ASDF_PATHNAME%%/sbclfasl/stumpwm.fasl
@@ -96,4 +106,3 @@
 %%ASDF_PATHNAME%%/wrappers.lisp
 %%ASDF_PATHNAME%%/wse.lisp
 %%ASDF_REGISTRY%%/stumpwm.asd
-bin/stumpwm