pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

stumpwm: initial import there are many questions still revolving around this. Mostly with the CL depends. Will resolve them later



Module Name:	pkgsrc-wip
Committed By:	Kevin Bloom <kevin.bloom%posteo.net@localhost>
Pushed By:	nuclearkev
Date:		Sun Jan 26 21:48:48 2025 -0500
Changeset:	b8668022888ed5e9ba8db23e2cd8cc7619fa402b

Modified Files:
	stumpwm/DESCR
	stumpwm/Makefile
	stumpwm/PLIST
	stumpwm/distinfo
Added Files:
	stumpwm/patches/patch-Makefile.in
Removed Files:
	stumpwm/files/stumpwm
	stumpwm/options.mk
	stumpwm/patches/patch-Makefile_in
	stumpwm/patches/patch-configure_ac-temp
	stumpwm/patches/patch-wrappers_lisp

Log Message:
stumpwm: initial import
there are many questions still revolving around this. Mostly with
the CL depends. Will resolve them later

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=b8668022888ed5e9ba8db23e2cd8cc7619fa402b

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 stumpwm/DESCR                           |  13 +--
 stumpwm/Makefile                        | 153 +++++++++++---------------------
 stumpwm/PLIST                           | 152 +------------------------------
 stumpwm/distinfo                        |  21 +++--
 stumpwm/files/stumpwm                   |  34 -------
 stumpwm/options.mk                      |  17 ----
 stumpwm/patches/patch-Makefile.in       |  13 +++
 stumpwm/patches/patch-Makefile_in       |  26 ------
 stumpwm/patches/patch-configure_ac-temp |  34 -------
 stumpwm/patches/patch-wrappers_lisp     |  13 ---
 10 files changed, 90 insertions(+), 386 deletions(-)

diffs:
diff --git a/stumpwm/DESCR b/stumpwm/DESCR
index f79e0856e5..0328086553 100644
--- a/stumpwm/DESCR
+++ b/stumpwm/DESCR
@@ -1,5 +1,8 @@
-Stumpwm is a tiling, keyboard driven X11 Window Manager written entirely in
-Common Lisp. It attempts to be customizable yet visually minimal. There are no
-window decorations, no icons, and no buttons. It does have various hooks to
-attach your personal customizations, and variables to tweak. With a 100% Common
-Lisp window manager there's no stopping the hacks. Just re-eval and GO!
+StumpWM is a window manager written entirely in Common Lisp. It
+attempts to be highly customizable while relying entirely on the
+keyboard for input. You will not find buttons, icons, title bars,
+tool bars, or any of the other conventional GUI widgets. StumpWM
+attempts to be customizable yet visually minimal. There are no
+window decorations, no icons, and no buttons. It does have various
+hooks to attach your personal customizations, and variables to
+tweak.
diff --git a/stumpwm/Makefile b/stumpwm/Makefile
index fc4137135d..eda9d2bc25 100644
--- a/stumpwm/Makefile
+++ b/stumpwm/Makefile
@@ -1,114 +1,67 @@
-# $NetBSD: Makefile,v 1.12 2012/11/03 19:41:30 kristerw Exp $
-#
+# $NetBSD$
 
-SHORTNAME=		stumpwm
-VERSION=		0.9.7
-PKGNAME=		${SHORTNAME}-${VERSION}
-DISTNAME=		${PKGNAME}
-CATEGORIES=		wm
-DISTFILES=		${DISTNAME}.tgz
-SITES.${DISTNAME}.tgz=	http://download.savannah.nongnu.org/releases/stumpwm/
+DISTNAME=	stumpwm-24.11
+CATEGORIES=	wm
+MASTER_SITES=	${MASTER_SITE_GITHUB:=stumpwm/}
+GITHUB_TAG=	${PKGVERSION_NOREV}
+DIST_SUBDIR=		stumpwm
 
-MAINTAINER=		jfranz%bsdprojects.net@localhost
-HOMEPAGE=		https://www.nongnu.org/stumpwm/
-COMMENT=		Tiling, keyboard driven X11 Window Manager written in Common Lisp
-LICENSE=		gnu-gpl-v2
+MAINTAINER=	ktnb%NetBSD.org@localhost
+HOMEPAGE=	https://stumpwm.github.io/
+COMMENT=	Tiling, keyboard driven window manager written in Common Lisp
+LICENSE=	gnu-gpl-v2
 
-.include "options.mk"
+PPCRE_VERSION=	2.1.2
+CLX_VERSION=	0.7.6
+ALEXANDRIA_VERSION=	1.4
 
-USE_TOOLS+=		autoconf make makeinfo install-info
-.if !empty(PKG_OPTIONS:Mclisp)
-# clisp-core target, until CLISP 2.50 release
-USE_LANGUAGES=		c
-USE_GNU_READLINE=	yes
-.endif
-INSTALLATION_DIRS+=	${PKGINFODIR} bin
-INFO_FILES=		yes
-INSTALL_UNSTRIPPED=	yes
+DISTFILES=	${DEFAULT_DISTFILES}
+DISTFILES+=	cl-ppcre-${PPCRE_VERSION}.tar.gz
+DISTFILES+=	cl-clx-${CLX_VERSION}.tar.gz
+DISTFILES+=	alexandria-${ALEXANDRIA_VERSION}.tar.gz
 
-DEPENDS=		sudo-[0-9]*:../../security/sudo
-.if !empty(PKG_OPTIONS:Mclisp)
-LISP_CENTRAL_REGISTRY=	${CLISP_CENTRAL_REGISTRY}
-# X11 bindings
-DEPENDS+=		clisp-new-clx>=2.42:../../x11/clisp-new-clx
-.endif
-.if !empty(PKG_OPTIONS:Msbcl)
-LISP_CENTRAL_REGISTRY=	${SBCL_CENTRAL_REGISTRY}
-DEPENDS+=		sbcl-portable-clx-[0-9]*:../../wip/cl-portable-clx
-.endif
-# From README: "by default stumpwm elects sbcl"
-.if !empty(PKG_OPTIONS:Mclisp)
-CONFIGURE_ARGS=		--with-lisp=clisp
-.endif
+SITES.cl-ppcre-${PPCRE_VERSION}.tar.gz= \
+        -https://github.com/edicl/cl-ppcre/archive/refs/tags/v${PPCRE_VERSION}.tar.gz
+SITES.cl-clx-${CLX_VERSION}.tar.gz= \
+        -https://github.com/sharplispers/clx/archive/refs/tags/${CLX_VERSION}.tar.gz
+SITES.alexandria-${ALEXANDRIA_VERSION}.tar.gz= \
+        -https://gitlab.common-lisp.net/alexandria/alexandria/-/archive/v${ALEXANDRIA_VERSION}/alexandria-v${ALEXANDRIA_VERSION}.tar.gz
 
-SUBST_CLASSES+=		sysconf
-SUBST_STAGE.sysconf=	post-extract
-SUBST_FILES.sysconf=	stumpwm.asd
-SUBST_SED.sysconf=	-e 's/version "CVS"/version "${VERSION}"/'
+WRKSRC=		${WRKDIR}/stumpwm-24.11
 
-SED_EXPRS=		-e "s\#asdf_path\#${PREFIX}/${LISP_CENTRAL_REGISTRY}\#"
-.if !empty(PKG_OPTIONS:Mclisp)
-SED_EXPRS+=		-e "s/expr_param/-x/"
-SED_EXPRS+=		-e "s/mem_param/-M/"
-SED_EXPRS+=		-e "s/lisp_comp/clisp/"
-SED_EXPRS+=		-e "s\#lisp_cmd\#-q -norc -x '(require \\\\\"clx\\\\\")'\#"
-# clisp-core target
-SED_EXPRS+=		-e "s\#\(clisp_core_temp=\"\)\#\1-K${PREFIX}/${LISP_CENTRAL_REGISTRY}${SHORTNAME}/clisp-core\#"
-SED_EXPRS+=		-e "s/used_save_cmd/clisp_save_cmd/"
-.endif
-.if !empty(PKG_OPTIONS:Msbcl)
-SED_EXPRS+=		-e "s/expr_param/--eval/"
-SED_EXPRS+=		-e "s/mem_param/--core/"
-SED_EXPRS+=		-e "s/lisp_comp/sbcl/"
-SED_EXPRS+=		-e "s/lisp_cmd/--disable-debugger --non-interactive/"
-SED_EXPRS+=		-e "s/used_save_cmd/sbcl_save_cmd/"
-.endif
+USE_TOOLS=	autoconf gmake makeinfo
+GNU_CONFIGURE=	yes
+CONFIGURE_ARGS=	--enable-compression \
+			--with-module-dir=${DATADIR}/modules
 
-post-extract:
-	${LN} -s ${WRKSRC}/cl-ppcre/cl-ppcre.asd ${WRKSRC}/cl-ppcre.asd
-.if !empty(PKG_OPTIONS:Mclisp)
-	${RM} ${WRKSRC}/asdf.lisp
-	@${ECHO} '(progn (require "clx"))' >> ${WRKSRC}/stumpwm.asd
-	${LN} -s ${PREFIX}/lib/clisp/dynmod/clx.lisp ${WRKSRC}/clx.lisp
-.endif
+DEPENDS+=	sbcl-[0-9]*:../../lang/sbcl
 
-do-configure:
-	cd ${WRKSRC} && autoconf && \
-		./configure ${CONFIGURE_ARGS} && ${MAKE} stumpwm.info
+MAKE_ENV=	CL_SOURCE_REGISTRY=${WRKSRC} \
+MAKE_ENV+=	ASDF_OUTPUT_TRANSLATIONS=/:
 
-	${SED} ${SED_EXPRS} ${FILESDIR}/${SHORTNAME} > ${WRKSRC}/stumpwm
-.if !empty(PKG_OPTIONS:Mclisp)
-	cd ${WRKSRC} && ${MAKE} clisp-core
-.endif
+MAKE_JOBS_SAFE=	NO
+MKPIE_SUPPORTED=	no
+
+SUBST_CLASSES+=		destdir
+SUBST_SED.destdir+=	-e "s,destdir,DESTDIR,g"
+SUBST_FILES.destdir+=	Makefile
+SUBST_STAGE.destdir=	pre-build
+SUBST_MESSAGE.destdir=	Use the real destdir
+
+# Use symlinks so ASDF finds system dependencies
+pre-configure:
+	find ${WRKDIR} -type f -name \*.asd -a \! -name stumpwm.asd \
+		-exec ln -s {} ${WRKSRC} \;
+	cd ${WRKSRC} && ./autogen.sh
+
+# Warning shouldn't fail the build
+# https://bugs.launchpad.net/sbcl/+bug/2090967
+pre-build:
+	echo '(declaim (sb-ext:muffle-conditions cl:warning))' \
+		> ${WRKDIR}/.home/.sbclrc
 
 post-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/stumpwm ${DESTDIR}${PREFIX}/bin/stumpwm
-	${INSTALL_MAN} ${WRKSRC}/stumpwm.info ${DESTDIR}${PREFIX}/${PKGINFODIR}/stumpwm.info
-	# Stumpwm is distributed not like just cl package, but like normal software, so move out the junk
-	mkdir -p ${DESTDIR}${PREFIX}/${LISP_CENTRAL_REGISTRY}/${SHORTNAME}-dest/cl-ppcre
-	cd ${DESTDIR}${PREFIX}/${LISP_CENTRAL_REGISTRY}${SHORTNAME} && ${MV} stumpwm.asd *.lisp *.fas* contrib ../${SHORTNAME}-dest/ && \
-		${MV} cl-ppcre/cl-ppcre.asd cl-ppcre/*.lisp cl-ppcre/*.fas* ../${SHORTNAME}-dest/cl-ppcre/
-	# ASDF requires .fasl files write dates to be more fresh than .lisp ones, or recompilation will be done.
-	# Do hardlinks of *.lisp from sources directory to return original dates.
-.if !empty(PKG_OPTIONS:Mclisp)
-	# As we don't need it after the build is done, remove it to prevent possible "cross-device link" error
-	${RM} ${WRKSRC}/clx.lisp
-.endif
-	${LN} -f ${WRKSRC}/cl-ppcre/*.lisp ${DESTDIR}${PREFIX}/${LISP_CENTRAL_REGISTRY}/${SHORTNAME}-dest/cl-ppcre/
-	${LN} -f ${WRKSRC}/*.lisp ${DESTDIR}${PREFIX}/${LISP_CENTRAL_REGISTRY}/${SHORTNAME}-dest/
-.if !empty(PKG_OPTIONS:Mclisp)
-	mkdir ${DESTDIR}${PREFIX}/${CLISP_CENTRAL_REGISTRY}/${SHORTNAME}-dest/clisp-core
-	cd ${DESTDIR}${PREFIX}/${CLISP_CENTRAL_REGISTRY}${SHORTNAME} && ${MV} clisp-core/lispinit.mem \
-		../${SHORTNAME}-dest/clisp-core
-.endif
-	${RM} -r ${DESTDIR}${PREFIX}/${LISP_CENTRAL_REGISTRY}${SHORTNAME}/
-	${MV} ${DESTDIR}${PREFIX}/${LISP_CENTRAL_REGISTRY}/${SHORTNAME}-dest/ ${DESTDIR}${PREFIX}/${LISP_CENTRAL_REGISTRY}${SHORTNAME}
-.if !empty(PKG_OPTIONS:Mclisp)
-	${INSTALL_PROGRAM} ${WRKSRC}/clisp-core/lisp.run \
-		${DESTDIR}${PREFIX}/${CLISP_CENTRAL_REGISTRY}${SHORTNAME}/clisp-core/lisp.run
+	${RM} ${DESTDIR}/${PREFIX}/share/info/dir
 
-# clisp-core target
-.include "../../wip/mk/clisp-temp.mk"
-.endif
-.include "../../wip/mk/cl-package.mk"
+.include "../../archivers/zstd/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/stumpwm/PLIST b/stumpwm/PLIST
index aaa42381b4..42a54fa3ab 100644
--- a/stumpwm/PLIST
+++ b/stumpwm/PLIST
@@ -1,151 +1,3 @@
-@comment $NetBSD: PLIST,v 1.2 2012/01/16 01:35:56 dukzcry Exp $
+@comment $NetBSD$
 bin/stumpwm
-info/stumpwm.info
-${CL}${CL_PATH}stumpwm/stumpwm.asd
-${CL}${CL_PATH}stumpwm/bindings.${EXT}
-${CL}${CL_PATH}stumpwm/bindings.lisp
-${CL}${CL_PATH}stumpwm/color.${EXT}
-${CL}${CL_PATH}stumpwm/color.lisp
-${CL}${CL_PATH}stumpwm/command.${EXT}
-${CL}${CL_PATH}stumpwm/command.lisp
-${CL}${CL_PATH}stumpwm/contrib/amixer.lisp
-${CL}${CL_PATH}stumpwm/contrib/aumix.lisp
-${CL}${CL_PATH}stumpwm/contrib/battery-portable.lisp
-${CL}${CL_PATH}stumpwm/contrib/battery.lisp
-${CL}${CL_PATH}stumpwm/contrib/cpu.lisp
-${CL}${CL_PATH}stumpwm/contrib/disk.lisp
-${CL}${CL_PATH}stumpwm/contrib/g15-keysyms.lisp
-${CL}${CL_PATH}stumpwm/contrib/maildir.lisp
-${CL}${CL_PATH}stumpwm/contrib/mem.lisp
-${CL}${CL_PATH}stumpwm/contrib/mpd.lisp
-${CL}${CL_PATH}stumpwm/contrib/net.lisp
-${CL}${CL_PATH}stumpwm/contrib/notifications.lisp
-${CL}${CL_PATH}stumpwm/contrib/productivity.lisp
-${CL}${CL_PATH}stumpwm/contrib/sbclfix.lisp
-${CL}${CL_PATH}stumpwm/contrib/stumpish
-${CL}${CL_PATH}stumpwm/contrib/stumpwm-mode.el
-${CL}${CL_PATH}stumpwm/contrib/surfraw.lisp
-${CL}${CL_PATH}stumpwm/contrib/wifi.lisp
-${CL}${CL_PATH}stumpwm/contrib/window-tags.lisp
-${CL}${CL_PATH}stumpwm/contrib/wmii-like-stumpwmrc.lisp
-${CL}${CL_PATH}stumpwm/core.${EXT}
-${CL}${CL_PATH}stumpwm/core.lisp
-${CL}${CL_PATH}stumpwm/events.${EXT}
-${CL}${CL_PATH}stumpwm/events.lisp
-${CL}${CL_PATH}stumpwm/fdump.${EXT}
-${CL}${CL_PATH}stumpwm/fdump.lisp
-${CL}${CL_PATH}stumpwm/floating-group.${EXT}
-${CL}${CL_PATH}stumpwm/floating-group.lisp
-${CL}${CL_PATH}stumpwm/group.${EXT}
-${CL}${CL_PATH}stumpwm/group.lisp
-${CL}${CL_PATH}stumpwm/head.${EXT}
-${CL}${CL_PATH}stumpwm/head.lisp
-${CL}${CL_PATH}stumpwm/help.${EXT}
-${CL}${CL_PATH}stumpwm/help.lisp
-${CL}${CL_PATH}stumpwm/input.${EXT}
-${CL}${CL_PATH}stumpwm/input.lisp
-${CL}${CL_PATH}stumpwm/iresize.${EXT}
-${CL}${CL_PATH}stumpwm/iresize.lisp
-${CL}${CL_PATH}stumpwm/keysyms.${EXT}
-${CL}${CL_PATH}stumpwm/keysyms.lisp
-${CL}${CL_PATH}stumpwm/keytrans.${EXT}
-${CL}${CL_PATH}stumpwm/keytrans.lisp
-${CL}${CL_PATH}stumpwm/kmap.${EXT}
-${CL}${CL_PATH}stumpwm/kmap.lisp
-${CL}${CL_PATH}stumpwm/make-image.lisp
-${CL}${CL_PATH}stumpwm/manual.lisp
-${CL}${CL_PATH}stumpwm/menu.${EXT}
-${CL}${CL_PATH}stumpwm/menu.lisp
-${CL}${CL_PATH}stumpwm/message-window.${EXT}
-${CL}${CL_PATH}stumpwm/message-window.lisp
-${CL}${CL_PATH}stumpwm/mode-line.${EXT}
-${CL}${CL_PATH}stumpwm/mode-line.lisp
-${CL}${CL_PATH}stumpwm/module.${EXT}
-${CL}${CL_PATH}stumpwm/module.lisp
-${CL}${CL_PATH}stumpwm/package.${EXT}
-${CL}${CL_PATH}stumpwm/package.lisp
-${CL}${CL_PATH}stumpwm/pathnames.${EXT}
-${CL}${CL_PATH}stumpwm/pathnames.lisp
-${CL}${CL_PATH}stumpwm/primitives.${EXT}
-${CL}${CL_PATH}stumpwm/primitives.lisp
-${CL}${CL_PATH}stumpwm/sample-stumpwmrc.lisp
-${CL}${CL_PATH}stumpwm/screen.${EXT}
-${CL}${CL_PATH}stumpwm/screen.lisp
-${CL}${CL_PATH}stumpwm/selection.${EXT}
-${CL}${CL_PATH}stumpwm/selection.lisp
-${CL}${CL_PATH}stumpwm/stumpwm.${EXT}
-${CL}${CL_PATH}stumpwm/stumpwm.lisp
-${CL}${CL_PATH}stumpwm/test-wm.lisp
-${CL}${CL_PATH}stumpwm/tile-group.${EXT}
-${CL}${CL_PATH}stumpwm/tile-group.lisp
-${CL}${CL_PATH}stumpwm/tile-window.${EXT}
-${CL}${CL_PATH}stumpwm/tile-window.lisp
-${CL}${CL_PATH}stumpwm/time.${EXT}
-${CL}${CL_PATH}stumpwm/time.lisp
-${CL}${CL_PATH}stumpwm/user.${EXT}
-${CL}${CL_PATH}stumpwm/user.lisp
-${CL}${CL_PATH}stumpwm/version.${EXT}
-${CL}${CL_PATH}stumpwm/version.lisp
-${CL}${CL_PATH}stumpwm/window-placement.${EXT}
-${CL}${CL_PATH}stumpwm/window-placement.lisp
-${CL}${CL_PATH}stumpwm/window.${EXT}
-${CL}${CL_PATH}stumpwm/window.lisp
-${CL}${CL_PATH}stumpwm/workarounds.${EXT}
-${CL}${CL_PATH}stumpwm/workarounds.lisp
-${CL}${CL_PATH}stumpwm/wrappers.${EXT}
-${CL}${CL_PATH}stumpwm/wrappers.lisp
-${CL}${CL_PATH}stumpwm/cl-ppcre/api.${EXT}
-${CL}${CL_PATH}stumpwm/cl-ppcre/api.lisp
-${CL}${CL_PATH}stumpwm/cl-ppcre/charmap.${EXT}
-${CL}${CL_PATH}stumpwm/cl-ppcre/charmap.lisp
-${CL}${CL_PATH}stumpwm/cl-ppcre/charset.${EXT}
-${CL}${CL_PATH}stumpwm/cl-ppcre/charset.lisp
-${CL}${CL_PATH}stumpwm/cl-ppcre/chartest.${EXT}
-${CL}${CL_PATH}stumpwm/cl-ppcre/chartest.lisp
-${CL}${CL_PATH}stumpwm/cl-ppcre/cl-ppcre.asd
-${CL}${CL_PATH}stumpwm/cl-ppcre/closures.${EXT}
-${CL}${CL_PATH}stumpwm/cl-ppcre/closures.lisp
-${CL}${CL_PATH}stumpwm/cl-ppcre/convert.${EXT}
-${CL}${CL_PATH}stumpwm/cl-ppcre/convert.lisp
-${CL}${CL_PATH}stumpwm/cl-ppcre/errors.${EXT}
-${CL}${CL_PATH}stumpwm/cl-ppcre/errors.lisp
-${CL}${CL_PATH}stumpwm/cl-ppcre/lexer.${EXT}
-${CL}${CL_PATH}stumpwm/cl-ppcre/lexer.lisp
-${CL}${CL_PATH}stumpwm/cl-ppcre/optimize.${EXT}
-${CL}${CL_PATH}stumpwm/cl-ppcre/optimize.lisp
-${CL}${CL_PATH}stumpwm/cl-ppcre/packages.${EXT}
-${CL}${CL_PATH}stumpwm/cl-ppcre/packages.lisp
-${CL}${CL_PATH}stumpwm/cl-ppcre/parser.${EXT}
-${CL}${CL_PATH}stumpwm/cl-ppcre/parser.lisp
-${CL}${CL_PATH}stumpwm/cl-ppcre/regex-class-util.${EXT}
-${CL}${CL_PATH}stumpwm/cl-ppcre/regex-class-util.lisp
-${CL}${CL_PATH}stumpwm/cl-ppcre/regex-class.${EXT}
-${CL}${CL_PATH}stumpwm/cl-ppcre/regex-class.lisp
-${CL}${CL_PATH}stumpwm/cl-ppcre/repetition-closures.${EXT}
-${CL}${CL_PATH}stumpwm/cl-ppcre/repetition-closures.lisp
-${CL}${CL_PATH}stumpwm/cl-ppcre/scanner.${EXT}
-${CL}${CL_PATH}stumpwm/cl-ppcre/scanner.lisp
-${CL}${CL_PATH}stumpwm/cl-ppcre/specials.${EXT}
-${CL}${CL_PATH}stumpwm/cl-ppcre/specials.lisp
-${CL}${CL_PATH}stumpwm/cl-ppcre/util.${EXT}
-${CL}${CL_PATH}stumpwm/cl-ppcre/util.lisp
-${CL}${CL_PATH}stumpwm/cl-ppcre/cl-ppcre.asd
-${CL}${CL_PATH}stumpwm/cl-ppcre/api.${EXT}
-${CL}${CL_PATH}stumpwm/cl-ppcre/charmap.${EXT}
-${CL}${CL_PATH}stumpwm/cl-ppcre/charset.${EXT}
-${CL}${CL_PATH}stumpwm/cl-ppcre/chartest.${EXT}
-${CL}${CL_PATH}stumpwm/cl-ppcre/closures.${EXT}
-${CL}${CL_PATH}stumpwm/cl-ppcre/convert.${EXT}
-${CL}${CL_PATH}stumpwm/cl-ppcre/errors.${EXT}
-${CL}${CL_PATH}stumpwm/cl-ppcre/lexer.${EXT}
-${CL}${CL_PATH}stumpwm/cl-ppcre/optimize.${EXT}
-${CL}${CL_PATH}stumpwm/cl-ppcre/packages.${EXT}
-${CL}${CL_PATH}stumpwm/cl-ppcre/parser.${EXT}
-${CL}${CL_PATH}stumpwm/cl-ppcre/regex-class-util.${EXT}
-${CL}${CL_PATH}stumpwm/cl-ppcre/regex-class.${EXT}
-${CL}${CL_PATH}stumpwm/cl-ppcre/repetition-closures.${EXT}
-${CL}${CL_PATH}stumpwm/cl-ppcre/scanner.${EXT}
-${CL}${CL_PATH}stumpwm/cl-ppcre/specials.${EXT}
-${CL}${CL_PATH}stumpwm/cl-ppcre/util.${EXT}
-${PLIST.clisp}${CLISP}${CL_PATH}stumpwm/clisp-core/lisp.run
-${PLIST.clisp}${CLISP}${CL_PATH}stumpwm/clisp-core/lispinit.mem
+share/info/stumpwm.info
diff --git a/stumpwm/distinfo b/stumpwm/distinfo
index 434defebbb..88b0b76d5d 100644
--- a/stumpwm/distinfo
+++ b/stumpwm/distinfo
@@ -1,8 +1,15 @@
-$NetBSD: distinfo,v 1.7 2012/01/18 08:58:58 dukzcry Exp $
+$NetBSD$
 
-RMD160 (stumpwm-0.9.7.tgz) = 7e0d521a12a0d0f28097d3756dd8ebcb01ce528b
-SHA512 (stumpwm-0.9.7.tgz) = 5c2ba6794bcb43f5988f1cd1a79daba28ea3b2ccbe5a13da64c904e99be439013653532540ccd06c0f0334239794cd53312f3873cc6a08f9e621f789be6bb260
-Size (stumpwm-0.9.7.tgz) = 497663 bytes
-SHA1 (patch-Makefile_in) = 07861b61f8677238ca52764a4b4861bb3b87aea4
-SHA1 (patch-configure_ac-temp) = 89f80222425b6209175895800f7a7bf50fb16f3f
-SHA1 (patch-wrappers_lisp) = e7eb984e1a03fe4f8d6d2d0b7592d146795256d8
+BLAKE2s (stumpwm/alexandria-1.4.tar.gz) = 173f0095c50f04a688658c4a3d29cf307e935b1b0985d82a83a5b4c0b4579746
+SHA512 (stumpwm/alexandria-1.4.tar.gz) = 4343be8eb2bac1924aaa8c890895aa885205af4c84110d7f8ceaf6c9ba1390e6037ffa3697fd1630266aede01bb596fd84c332ca43ded80326795637583332af
+Size (stumpwm/alexandria-1.4.tar.gz) = 57634 bytes
+BLAKE2s (stumpwm/cl-clx-0.7.6.tar.gz) = 991ffe6cd6d83cda66a44a12311d7489be58dda4736b687b4a9fdd67570403e2
+SHA512 (stumpwm/cl-clx-0.7.6.tar.gz) = 7ca1e1f55807d4af29b872937dcb5f03cc251185095e90ed224645ef23628cb3df019c57ca903b3fa2063d4c7d52c957699f15699abca9ae1a4ae8588ef9d0f3
+Size (stumpwm/cl-clx-0.7.6.tar.gz) = 462763 bytes
+BLAKE2s (stumpwm/cl-ppcre-2.1.2.tar.gz) = e812127ef3ccd8d194cb2ee21730b13b5e7d2ed080c07aa9ca44024f5aca509a
+SHA512 (stumpwm/cl-ppcre-2.1.2.tar.gz) = bfcea40b251a21861dae4883f6d5b277626ae2bed86fb895173e011bdf35a289eee949a3a87b3e83ed123ae22f2a19268038e624b378fd98d28855dda9e11f78
+Size (stumpwm/cl-ppcre-2.1.2.tar.gz) = 159376 bytes
+BLAKE2s (stumpwm/stumpwm-24.11.tar.gz) = a931416c7343a63e5e93bbef0b4f856788e6624ba005b4716cc0787caef31a1f
+SHA512 (stumpwm/stumpwm-24.11.tar.gz) = f5af75ac059481d0c24937f696a94f451e9dc26f24d3c65fb33ee5f1cbf04c8aa4c10a8faecd3c35021219d72ccdf91b194513433e648004c7c8dbb9c593830f
+Size (stumpwm/stumpwm-24.11.tar.gz) = 287797 bytes
+SHA1 (patch-Makefile.in) = 0d895efc6316c8f8f0d1f3368030b3b800dd2ccb
diff --git a/stumpwm/files/stumpwm b/stumpwm/files/stumpwm
deleted file mode 100644
index 7efca79259..0000000000
--- a/stumpwm/files/stumpwm
+++ /dev/null
@@ -1,34 +0,0 @@
-#!/bin/sh
-# Based on script from: http://stumpwm.svkt.org/cgi-bin/wiki.pl/SetUp
-
-clisp_core_temp=""
-path=$HOME/.lisp_comp/images/
-common_cmds="expr_param '(require \"asdf\")' \
-	expr_param \"(setf asdf:*central-registry* '(#p \\\"asdf_path/\\\"))\""
-
-mkdir -p ${path}
-# SBCL process running Stumpwm confuses new SBCL instantions where the default
-# core (interactive shell) is.
-ln -s asdf_path/../sbcl.core ${path} 2>/dev/null
-x="${path}/stumpwm-$(cksum $(which lisp_comp) | cut -d ' ' -f 1).core"
-
-sbcl_save_cmd="\"(save-lisp-and-die \\\"$x\\\" :toplevel 'stumpwm:stumpwm)\""
-clisp_save_cmd="\"(ext:saveinitmem \\\"$x\\\" :init-function 'stumpwm:stumpwm)\""
-
-if [ -e "$x" ] && ( for i in asdf_path/stumpwm/*.lisp
-	do test "$x" -ot "$i" && exit 0
-	done; exit 1 ); then
-	if [ "$1" = "recompile" ]; then
-		eval "sudo lisp_comp lisp_cmd ${common_cmds} expr_param \
-			\"(asdf:operate 'asdf:compile-op 'stumpwm)\"" && rm $x; exit
-	else
-		string="Recompilation required. Please run this script with \
-			\'recompile\' arg."
-		exec xterm -e "echo ${string}; ${SHELL}" && exit
-	fi
-fi
-if [ ! -e "$x" ]; then
-	eval "lisp_comp lisp_cmd ${common_cmds} expr_param \
-		\"(asdf:operate 'asdf:load-op 'stumpwm)\" expr_param ${used_save_cmd}"
-fi
-exec lisp_comp ${clisp_core_temp} mem_param "$x"
diff --git a/stumpwm/options.mk b/stumpwm/options.mk
deleted file mode 100644
index 4e96a6c24f..0000000000
--- a/stumpwm/options.mk
+++ /dev/null
@@ -1,17 +0,0 @@
-# $NetBSD: options.mk,v 1.1 2012/01/16 01:35:56 dukzcry Exp $
-#
-
-PKG_OPTIONS_VAR=		PKG_OPTIONS.stumpwm
-PKG_OPTIONS_REQUIRED_GROUPS=	lisp
-PKG_OPTIONS_GROUP.lisp=		clisp sbcl
-PKG_SUGGESTED_OPTIONS+=		clisp
-
-.include "../../mk/bsd.options.mk"
-
-PLIST_VARS+=			${PKG_OPTIONS_GROUP.lisp}
-.for opt in ${PKG_OPTIONS_GROUP.lisp}
-.  if !empty(PKG_OPTIONS:M${opt})
-PLIST.${opt}=			yes
-COMMON_LISP_SYSTEM:=		${opt}
-.  endif
-.endfor
diff --git a/stumpwm/patches/patch-Makefile.in b/stumpwm/patches/patch-Makefile.in
new file mode 100644
index 0000000000..46894d47fd
--- /dev/null
+++ b/stumpwm/patches/patch-Makefile.in
@@ -0,0 +1,13 @@
+$NetBSD$
+
+--- Makefile.in.orig	2024-10-19 13:57:35.000000000 +0000
++++ Makefile.in
+@@ -19,7 +19,7 @@ all: stumpwm stumpwm.info
+ 
+ travis: stumpwm test
+ stumpwm.info: stumpwm.texi
+-	test "$(MAKEINFO)" = "no" || $(MAKEINFO) stumpwm.texi
++	test "$(MAKEINFO)" = "no" || $(MAKEINFO) --force --no-validate stumpwm.texi
+ 
+ # FIXME: This rule is too hardcoded
+ stumpwm.texi: stumpwm.texi.in $(FILES)
diff --git a/stumpwm/patches/patch-Makefile_in b/stumpwm/patches/patch-Makefile_in
deleted file mode 100644
index 7583cbcd17..0000000000
--- a/stumpwm/patches/patch-Makefile_in
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD: patch-Makefile_in,v 1.2 2012/01/18 08:58:58 dukzcry Exp $
-
-Creation of temporary linking set using clisp-link is written by
-Dirk Sondermann <ds-stumpwm%dyximaq.de@localhost> and was posted under
-"Building with CLISP" topic in Stumpwm-devel mailing list.
---- Makefile.in.orig	2010-05-18 19:09:32.000000000 +0000
-+++ Makefile.in
-@@ -29,8 +29,8 @@ time.lisp color.lisp module.lisp stumpwm
- 
- all: stumpwm stumpwm.info
- 
--stumpwm.info: stumpwm.texi
--	makeinfo stumpwm.texi
-+stumpwm.info:
-+	makeinfo stumpwm.texi.in -o stumpwm.info
- 
- # FIXME: This rule is too hardcoded
- stumpwm.texi: stumpwm.texi.in
-@@ -71,4 +71,7 @@ uninstall:
- 	install-info --info-dir="$(destdir)$(infodir)" --remove "$(destdir)$(infodir)/stumpwm.info"
- 	rm "$(destdir)$(infodir)/stumpwm.info"
- 
-+clisp-core:
-+	MAKE=: with_dynamic_modules=no @LISP_LINK@ add "`$(LISP) -b`/base" $@ "`$(LISP) -b`/clx/new-clx"
-+
- # End of file
diff --git a/stumpwm/patches/patch-configure_ac-temp b/stumpwm/patches/patch-configure_ac-temp
deleted file mode 100644
index c121250105..0000000000
--- a/stumpwm/patches/patch-configure_ac-temp
+++ /dev/null
@@ -1,34 +0,0 @@
-$NetBSD: patch-configure_ac-temp,v 1.2 2012/01/16 01:35:57 dukzcry Exp $
-
-Creation of temporary linking set using clisp-link is written by
-Dirk Sondermann <ds-stumpwm%dyximaq.de@localhost> and was posted under
-"Building with CLISP" topic in Stumpwm-devel mailing list.
---- configure.ac.orig	2010-05-18 19:09:32.000000000 +0000
-+++ configure.ac
-@@ -6,6 +6,8 @@ AC_INIT(Stump Window Manager, 0.9.7-git,
- 
- AC_SUBST(CONTRIB_DIR)
- AC_SUBST(LISP_PROGRAM)
-+AC_SUBST(LISP_CORE)
-+AC_SUBST(LISP_LINK)
- AC_SUBST(LISP)
- AC_SUBST(PPCRE_PATH)
- 
-@@ -105,6 +107,17 @@ fi
- 
- if test "$LISP" = "clisp"; then
-    AC_CHECK_FILE([$PPCRE_PATH/cl-ppcre.asd],,AC_MSG_ERROR([Cannot find ppcre. When using clisp you must specify its location using --with-ppcre]))
-+   AC_MSG_CHECKING([whether clisp is built with dynamic modules support])
-+   result=$($LISP_PROGRAM -q -q -x '(nth-value 0 (find-symbol "DYNLOAD-MODULES" "SYS"))')
-+   if test "x$result" = "xNIL"; then
-+	AC_MSG_RESULT([no])
-+	LISP_PROGRAM="$LISP_PROGRAM -K full"
-+   else
-+	AC_MSG_RESULT([yes])
-+	LISP_CORE="clisp-core"
-+	LISP_LINK="$LISP_PROGRAM-link"
-+	LISP_PROGRAM="$LISP_PROGRAM -K `pwd`/$LISP_CORE"
-+   fi
- fi
- 
- # XXX How to do an OR ?
diff --git a/stumpwm/patches/patch-wrappers_lisp b/stumpwm/patches/patch-wrappers_lisp
deleted file mode 100644
index 5fe3e4781f..0000000000
--- a/stumpwm/patches/patch-wrappers_lisp
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-wrappers_lisp,v 1.3 2012/01/16 01:35:57 dukzcry Exp $
-
-DragonFly is FreeBSD-derived. Use FreeBSD OS-dependant features on DF.
---- wrappers.lisp.orig	2010-05-18 19:09:32.000000000 +0000
-+++ wrappers.lisp
-@@ -275,6 +275,7 @@ they should be windows. So use this func
-     (cond
-       ((string= osname "Linux") (pushnew :linux *features*))
-       ((string= osname "FreeBSD") (pushnew :freebsd *features*))
-+      ((string= osname "DragonFly") (pushnew :freebsd *features*))
-       (t (warn "Your operating system is not recognized.")))))
- 
- ;;; On GNU/Linux some contribs use sysfs to figure out useful info for


Home | Main Index | Thread Index | Old Index