timo.my...@bittivirhe.fi (Timo Myyrä) writes:
> Hi,
>
> Here is an another attempt at update stumpwm port to latest release.
> With this release we can drop patches from our port.
>
> Changes:
> - bump stumpwm to version 19.11
> - bump port dependency versions
> - use newer texinfo for doc generation
> - ensure threaded flavor of sbcl is used, this mandatory for stumpwm
> - use ASDF_OUTPUT_TRANSLATIONS to skip user cache (hope this is right)
> - use symlinks to asd system files to asdf
> - take maintainer role if ok
>
> This is very lightly tested, restart-{hard,soft}, reload commands work.
> Could use a bit more testing to see that everything is ok.
>
> 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 14 Dec 2019 07:09:30 -0000
> @@ -2,40 +2,48 @@
>
> COMMENT= easily hackable Common LISP window manager
>
> -VERSION= 18.05
> +VERSION= 19.11
> DISTNAME= stumpwm-${VERSION}
> -REVISION= 0
>
> CATEGORIES= x11
>
> HOMEPAGE= https://stumpwm.github.io/
>
> -MAINTAINER= Solene Rapenne <sol...@perso.pw>
> +MAINTAINER= Timo Myyra <timo.my...@bittivirhe.fi>
>
> # 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
>
> +USE_GMAKE= yes
> +MAKE_ENV= MAKEINFO=${PREFIX}/bin/gmakeinfo \
> + ASDF_OUTPUT_TRANSLATIONS=/:
> +
> DESTDIRNAME= destdir
> NO_TEST= yes
> -PORTHOME= ${WRKBUILD}
> +
> +# Use symlinks so ASDF finds system dependencies
> +pre-configure:
> + @find ${WRKDIR} -type f -name \*.asd -a \! -name stumpwm.asd \
> + -exec ln -s {} ${WRKSRC} \;
>
> .include <bsd.port.mk>
> 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 14 Dec 2019 07:09:30 -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-19.11.tar.gz) = shsClNZkNxtASwYb4QBVKJyrShPm1Q7wOF19ibFL8+8=
> +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-19.11.tar.gz) = 214705
> Index: patches/patch-Makefile_in
> ===================================================================
> RCS file: patches/patch-Makefile_in
> diff -N patches/patch-Makefile_in
> --- patches/patch-Makefile_in 10 Dec 2018 09:49:13 -0000 1.2
> +++ /dev/null 1 Jan 1970 00:00:00 -0000
> @@ -1,14 +0,0 @@
> -$OpenBSD: patch-Makefile_in,v 1.2 2018/12/10 09:49:13 solene Exp $
> -Index: Makefile.in
> ---- Makefile.in.orig
> -+++ Makefile.in
> -@@ -1,7 +1,7 @@
> - LISP=@LISP_PROGRAM@
> -
> --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))"
> -
> - datarootdir = @datarootdir@
> - prefix=@prefix@
> Index: patches/patch-bootstrap-depends_lisp
> ===================================================================
> RCS file: patches/patch-bootstrap-depends_lisp
> diff -N patches/patch-bootstrap-depends_lisp
> --- patches/patch-bootstrap-depends_lisp 8 Sep 2016 13:03:36 -0000
> 1.1.1.1
> +++ /dev/null 1 Jan 1970 00:00:00 -0000
> @@ -1,7 +0,0 @@
> -$OpenBSD: patch-bootstrap-depends_lisp,v 1.1.1.1 2016/09/08 13:03:36 jca Exp
> $
> ---- bootstrap-depends.lisp.orig Tue Sep 6 17:43:13 2016
> -+++ bootstrap-depends.lisp Tue Sep 6 17:43:03 2016
> -@@ -0,0 +1,3 @@
> -+(require 'asdf)
> -+(loop for path in (directory "../*/") do
> -+ (push path asdf:*central-registry*))
Here's new diff to which drops extra clx-xembed dependency, this is no longer
needed.
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 15 Dec 2019 06:31:47 -0000
@@ -2,40 +2,46 @@
COMMENT= easily hackable Common LISP window manager
-VERSION= 18.05
+VERSION= 19.11
DISTNAME= stumpwm-${VERSION}
-REVISION= 0
CATEGORIES= x11
HOMEPAGE= https://stumpwm.github.io/
-MAINTAINER= Solene Rapenne <sol...@perso.pw>
+MAINTAINER= Timo Myyra <timo.my...@bittivirhe.fi>
# 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/
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
-BUILD_DEPENDS= lang/sbcl
+BUILD_DEPENDS= lang/sbcl,threads \
+ print/texinfo
AUTOCONF_VERSION= 2.69
CONFIGURE_STYLE= autoconf no-autoheader
+USE_GMAKE= yes
+MAKE_ENV= MAKEINFO=${PREFIX}/bin/gmakeinfo \
+ ASDF_OUTPUT_TRANSLATIONS=/:
+
DESTDIRNAME= destdir
NO_TEST= yes
-PORTHOME= ${WRKBUILD}
+
+# Use symlinks so ASDF finds system dependencies
+pre-configure:
+ @find ${WRKDIR} -type f -name \*.asd -a \! -name stumpwm.asd \
+ -exec ln -s {} ${WRKSRC} \;
.include <bsd.port.mk>
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 15 Dec 2019 06:31:47 -0000
@@ -1,10 +1,8 @@
-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 (stumpwm-19.11.tar.gz) = shsClNZkNxtASwYb4QBVKJyrShPm1Q7wOF19ibFL8+8=
+SIZE (alexandria-20190710-git.tgz) = 53436
+SIZE (cl-ppcre-2.1.1.tar.gz) = 159055
+SIZE (clx-20190813-git.tgz) = 460647
+SIZE (stumpwm-19.11.tar.gz) = 214705
Index: patches/patch-Makefile_in
===================================================================
RCS file: patches/patch-Makefile_in
diff -N patches/patch-Makefile_in
--- patches/patch-Makefile_in 10 Dec 2018 09:49:13 -0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,14 +0,0 @@
-$OpenBSD: patch-Makefile_in,v 1.2 2018/12/10 09:49:13 solene Exp $
-Index: Makefile.in
---- Makefile.in.orig
-+++ Makefile.in
-@@ -1,7 +1,7 @@
- LISP=@LISP_PROGRAM@
-
--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))"
-
- datarootdir = @datarootdir@
- prefix=@prefix@
Index: patches/patch-bootstrap-depends_lisp
===================================================================
RCS file: patches/patch-bootstrap-depends_lisp
diff -N patches/patch-bootstrap-depends_lisp
--- patches/patch-bootstrap-depends_lisp 8 Sep 2016 13:03:36 -0000
1.1.1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,7 +0,0 @@
-$OpenBSD: patch-bootstrap-depends_lisp,v 1.1.1.1 2016/09/08 13:03:36 jca Exp $
---- bootstrap-depends.lisp.orig Tue Sep 6 17:43:13 2016
-+++ bootstrap-depends.lisp Tue Sep 6 17:43:03 2016
-@@ -0,0 +1,3 @@
-+(require 'asdf)
-+(loop for path in (directory "../*/") do
-+ (push path asdf:*central-registry*))
