Hi,
I'm getting back to StumpWM and noticed there has update for it.
Here's a bit of large diff to update it to latest release:
- backport commit to fix info generation
- patch makeinfo command as base version can't create docs
- force threaded flavor, won't start without
- use GNU make, saw some sed error during build
- patch to read dependencies recursively from WRKDIR
Timo
Index: Makefile
===================================================================
RCS file: /cvs/ports/x11/stumpwm/Makefile,v
retrieving revision 1.5
diff -u -p -u -p -r1.5 Makefile
--- Makefile 12 Jul 2019 20:51:22 -0000 1.5
+++ Makefile 6 Sep 2019 10:47:58 -0000
@@ -2,9 +2,8 @@
COMMENT= easily hackable Common LISP window manager
-VERSION= 18.05
+VERSION= 18.11
DISTNAME= stumpwm-${VERSION}
-REVISION= 0
CATEGORIES= x11
@@ -13,26 +12,31 @@ HOMEPAGE= https://stumpwm.github.io/
MAINTAINER= Solene Rapenne <[email protected]>
# GPLv2
-PERMIT_PACKAGE= Yes
+PERMIT_PACKAGE= Yes
WANTLIB += c m util z
MASTER_SITES= https://github.com/stumpwm/stumpwm/archive/
MASTER_SITES0= https://github.com/edicl/cl-ppcre/archive/
-MASTER_SITES1= https://beta.quicklisp.org/archive/clx/2018-04-30/
-MASTER_SITES2=
https://beta.quicklisp.org/archive/alexandria/2017-08-30/
-MASTER_SITES3=
https://beta.quicklisp.org/archive/clx-xembed/2012-09-09/
+MASTER_SITES1= https://beta.quicklisp.org/archive/clx/2019-08-13/
+MASTER_SITES2=
https://beta.quicklisp.org/archive/alexandria/2019-07-10/
+MASTER_SITES3=
https://beta.quicklisp.org/archive/clx-xembed/2019-03-07/
DISTFILES= ${DISTNAME}{${VERSION}}${EXTRACT_SUFX} \
- cl-ppcre-2.0.11{v2.0.11}.tar.gz:0 \
- clx-20180430-git.tgz:1 \
- alexandria-20170830-git.tgz:2 \
- clx-xembed-20120909-git.tgz:3
+ cl-ppcre-2.1.1{v2.1.1}.tar.gz:0 \
+ clx-20190813-git.tgz:1 \
+ alexandria-20190710-git.tgz:2 \
+ clx-xembed-20190307-git.tgz:3
-BUILD_DEPENDS= lang/sbcl
+BUILD_DEPENDS= lang/sbcl,threads \
+ print/texinfo
AUTOCONF_VERSION= 2.69
CONFIGURE_STYLE= autoconf no-autoheader
+CONFIGURE_ENV= WRKDIR=${WRKDIR}
+
+USE_GMAKE= yes
+MAKE_ENV= MAKEINFO=${PREFIX}/bin/gmakeinfo
DESTDIRNAME= destdir
NO_TEST= yes
Index: distinfo
===================================================================
RCS file: /cvs/ports/x11/stumpwm/distinfo,v
retrieving revision 1.3
diff -u -p -u -p -r1.3 distinfo
--- distinfo 10 Dec 2018 09:49:13 -0000 1.3
+++ distinfo 6 Sep 2019 10:47:58 -0000
@@ -1,10 +1,10 @@
-SHA256 (alexandria-20170830-git.tgz) =
iU5U93WUsTE3tbjsBZN61reLwVxGMP/R5VDh8iai+W4=
-SHA256 (cl-ppcre-2.0.11.tar.gz) = 7YVxkVIWeI3E9s20Tkmw4HguID7VR/4uWM1bDlxX7cQ=
-SHA256 (clx-20180430-git.tgz) = o6ev7FfWYwc8Bz6so9XCr1qQElSeV6UDPlqCbnOE8KE=
-SHA256 (clx-xembed-20120909-git.tgz) =
a9FM5PWYI+XFq5FxrbQGUwBm3flnljfvilmDRUGrAho=
-SHA256 (stumpwm-18.05.tar.gz) = aa2ZWIO7u4lEh1rY3E5rPe3ZRuCs8QpDLu5xOpZST9g=
-SIZE (alexandria-20170830-git.tgz) = 51131
-SIZE (cl-ppcre-2.0.11.tar.gz) = 158418
-SIZE (clx-20180430-git.tgz) = 468017
-SIZE (clx-xembed-20120909-git.tgz) = 21772
-SIZE (stumpwm-18.05.tar.gz) = 199467
+SHA256 (alexandria-20190710-git.tgz) =
4GQr1vivjrceM1m0XhGhNfo8mlEUkrydu80Q7H1pRwQ=
+SHA256 (cl-ppcre-2.1.1.tar.gz) = iWMRebcWSNnmxWWpKPaJap1XQqogg7nBtwX+C0XYXe8=
+SHA256 (clx-20190813-git.tgz) = qrn8jYEnnT1Dxh748Dn8rj31jbwzUzDrb4gORwVuE98=
+SHA256 (clx-xembed-20190307-git.tgz) =
cjjFURnv3Z1n61IUe4Vuww6tFYV1KwoE12c1fMDxHqg=
+SHA256 (stumpwm-18.11.tar.gz) = aWjzXhAPDWWvWNK+v6l/0P4bZ3Wmw5dZikcERqbr75w=
+SIZE (alexandria-20190710-git.tgz) = 53436
+SIZE (cl-ppcre-2.1.1.tar.gz) = 159055
+SIZE (clx-20190813-git.tgz) = 460647
+SIZE (clx-xembed-20190307-git.tgz) = 21858
+SIZE (stumpwm-18.11.tar.gz) = 211752
Index: patches/patch-Makefile_in
===================================================================
RCS file: /cvs/ports/x11/stumpwm/patches/patch-Makefile_in,v
retrieving revision 1.2
diff -u -p -u -p -r1.2 patch-Makefile_in
--- patches/patch-Makefile_in 10 Dec 2018 09:49:13 -0000 1.2
+++ patches/patch-Makefile_in 6 Sep 2019 10:47:58 -0000
@@ -2,13 +2,18 @@ $OpenBSD: patch-Makefile_in,v 1.2 2018/1
Index: Makefile.in
--- Makefile.in.orig
+++ Makefile.in
-@@ -1,7 +1,7 @@
+@@ -1,4 +1,5 @@
LISP=@LISP_PROGRAM@
++MAKEINFO?=makeinfo
--sbcl_BUILDOPTS=--load ./make-image.lisp
--sbcl_INFOOPTS=--eval "(progn (load \"load-stumpwm.lisp\") (load
\"manual.lisp\"))" --eval "(progn (stumpwm::generate-manual) (sb-ext:quit))"
-+sbcl_BUILDOPTS=--disable-debugger --userinit bootstrap-depends.lisp --load
./make-image.lisp
-+sbcl_INFOOPTS=--disable-debugger --userinit bootstrap-depends.lisp --eval
"(progn (load \"load-stumpwm.lisp\") (load \"manual.lisp\"))" --eval "(progn
(stumpwm::generate-manual) (sb-ext:quit))"
+ sbcl_BUILDOPTS=--load ./make-image.lisp
+ sbcl_INFOOPTS=--eval "(progn (load \"load-stumpwm.lisp\") (load
\"manual.lisp\"))" --eval "(progn (stumpwm::generate-manual) (sb-ext:quit))"
+@@ -17,7 +18,7 @@ all: stumpwm stumpwm.info
- datarootdir = @datarootdir@
- prefix=@prefix@
+ travis: stumpwm
+ stumpwm.info: stumpwm.texi
+- makeinfo stumpwm.texi
++ $(MAKEINFO) stumpwm.texi
+
+ # FIXME: This rule is too hardcoded
+ stumpwm.texi: stumpwm.texi.in
Index: patches/patch-configure_ac
===================================================================
RCS file: patches/patch-configure_ac
diff -N patches/patch-configure_ac
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-configure_ac 6 Sep 2019 10:47:58 -0000
@@ -0,0 +1,16 @@
+$OpenBSD$
+
+use top-level dir as base
+
+Index: configure.ac
+--- configure.ac.orig
++++ configure.ac
+@@ -16,7 +16,7 @@ AC_ARG_WITH(module-dir,
+ [ --with-module-dir=PATH specify location of contrib
modules],
+ MODULE_DIR=$withval,
MODULE_DIR="${HOME}/.stumpwm.d/modules")
+
+-STUMPWM_ASDF_DIR="`pwd`"
++STUMPWM_ASDF_DIR="${WRKDIR}"
+
+ if test -x "$SBCL_PATH"; then
+ SBCL=$SBCL_PATH
Index: patches/patch-load-stumpwm_lisp_in
===================================================================
RCS file: patches/patch-load-stumpwm_lisp_in
diff -N patches/patch-load-stumpwm_lisp_in
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-load-stumpwm_lisp_in 6 Sep 2019 10:47:58 -0000
@@ -0,0 +1,16 @@
+$OpenBSD$
+
+read lisp dependencies recursively
+
+Index: load-stumpwm.lisp.in
+--- load-stumpwm.lisp.in.orig
++++ load-stumpwm.lisp.in
+@@ -7,7 +7,7 @@
+
+ (asdf:initialize-source-registry
+ '(:source-registry
+- (:directory "@STUMPWM_ASDF_DIR@")
++ (:tree "@STUMPWM_ASDF_DIR@")
+ :inherit-configuration))
+
+ (asdf:oos 'asdf:load-op 'stumpwm)
Index: patches/patch-stumpwm_texi_in
===================================================================
RCS file: patches/patch-stumpwm_texi_in
diff -N patches/patch-stumpwm_texi_in
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-stumpwm_texi_in 6 Sep 2019 10:47:58 -0000
@@ -0,0 +1,16 @@
+$OpenBSD$
+
+backport commit 6e5470e55ad8e812bab4105e5638418b51fe0248 to fix doc
+generation on BSD.
+
+Index: stumpwm.texi.in
+--- stumpwm.texi.in.orig
++++ stumpwm.texi.in
+@@ -2130,7 +2130,6 @@ section.
+ %%% move-to-head
+ @@@ no-focus
+ ### *numpad-map*
+-@@@ read-line-from-sysfs
+ ### *record-last-msg-override*
+ ### *resize-hides-windows*
+ ### *root-click-focuses-frame*
