git: 177ead493e6f - 2022Q3 - x11-wm/stumpwm: Fix build by updating to 22.05-157

Go to: [ bottom of page ] [ top of archives ] [ this month ]
From: Joseph Mingrone <jrm_at_FreeBSD.org>
Date: Thu, 08 Sep 2022 02:35:55 UTC
The branch 2022Q3 has been updated by jrm:

URL: https://cgit.FreeBSD.org/ports/commit/?id=177ead493e6f60ef2ce4cb24daddb5c18c7b7d0f

commit 177ead493e6f60ef2ce4cb24daddb5c18c7b7d0f
Author:     Joseph Mingrone <jrm@FreeBSD.org>
AuthorDate: 2022-08-02 14:08:55 +0000
Commit:     Joseph Mingrone <jrm@FreeBSD.org>
CommitDate: 2022-09-08 02:34:16 +0000

    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
    
    (cherry picked from commit 8bcff3b7dc77952a94aadf0b421e421173a39546)
---
 x11-wm/stumpwm/Makefile  | 19 +++++++++++++------
 x11-wm/stumpwm/distinfo  |  6 +++---
 x11-wm/stumpwm/pkg-plist | 11 ++++++++++-
 3 files changed, 26 insertions(+), 10 deletions(-)

diff --git a/x11-wm/stumpwm/Makefile b/x11-wm/stumpwm/Makefile
index 01ad3ef47b73..85681a71abab 100644
--- a/x11-wm/stumpwm/Makefile
+++ b/x11-wm/stumpwm/Makefile
@@ -1,8 +1,8 @@
 # Created by: Alejandro Pulver <alepulver@FreeBSD.org>
 
 PORTNAME=	stumpwm
-DISTVERSION=	22.05
-PORTREVISION=	1
+DISTVERSION=	22.05-157
+DISTVERSIONSUFFIX=	-g740e945
 CATEGORIES=	x11-wm lisp
 
 MAINTAINER=	jrm@FreeBSD.org
@@ -54,7 +54,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")' \
@@ -64,13 +65,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
index c70214dd2120..5f4db8d6abca 100644
--- 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
index 83e22aff03ce..730522ea47fb 100644
--- a/x11-wm/stumpwm/pkg-plist
+++ b/x11-wm/stumpwm/pkg-plist
@@ -1,3 +1,4 @@
+bin/stumpwm
 %%ASDF_PATHNAME%%/.dir-locals.el
 %%ASDF_PATHNAME%%/bindings.lisp
 %%ASDF_PATHNAME%%/color.lisp
@@ -5,6 +6,9 @@
 %%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,6 +31,7 @@
 %%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
@@ -34,6 +39,7 @@
 %%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
@@ -41,6 +47,8 @@
 %%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,6 +68,7 @@
 %%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
@@ -67,6 +76,7 @@
 %%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