x11/notion update

this updates to a newer version of notion, unbreaking build with llvm 22. lua version detection was changed a bit upstream, rather than yet more hacks to cope (a common theme with ports using lua) I've just committed a change to the lua ports to install links to the binaries under names that are more commonly used in other OS, so this diff requires either rebuilding lua from brand new ports, or temporarily adding them locally: # cd /usr/local/bin # ln lua54 lua5.4 # ln luac54 luac5.4 ok? Index: Makefile =================================================================== RCS file: /cvs/ports/x11/notion/Makefile,v diff -u -p -r1.3 Makefile --- Makefile 10 Dec 2023 20:14:33 -0000 1.3 +++ Makefile 8 Jun 2026 21:07:48 -0000 @@ -1,7 +1,6 @@ COMMENT= light, keyboard friendly static tiling window manager -DIST_TUPLE= github raboof notion 4.0.2 . -REVISION= 0 +DIST_TUPLE= github raboof notion 4.0.5 . CATEGORIES= x11 @@ -14,8 +13,8 @@ PERMIT_PACKAGE= Yes MODULES= lang/lua -# works with lua 5.1-5.3 -MODLUA_VERSION= 5.3 +# works with lua 5.1-5.4 +MODLUA_VERSION= 5.4 WANTLIB += ICE SM X11 Xext Xft Xinerama Xrandr c intl WANTLIB += m readline ${MODLUA_WANTLIB} @@ -29,7 +28,8 @@ USE_GMAKE= Yes MAKE_FLAGS= ETCDIR=$(SYSCONFDIR)/notion \ LOCALBASE=${LOCALBASE} \ - NOTION_RELEASE=${GH_TAGNAME} + NOTION_RELEASE=${GH_TAGNAME} \ + LUA_VERSION=${MODLUA_VERSION} FAKE_FLAGS= ETCDIR=$(PREFIX)/share/examples/notion \ MANDIR=$(PREFIX)/man \ PREFIX=${TRUEPREFIX} @@ -39,12 +39,5 @@ LDFLAGS+= -L${LOCALBASE}/lib -L$(MODLUA_ NOTION_DIR= ${SYSCONFDIR}/notion SUBST_VARS+= NOTION_DIR - -# XXX should set LUA_VERSION in MAKE_FLAGS instead, but that doesn't work -# with our non-standard lua binary/pkg-config naming scheme - -pre-configure: - sed -e 's/5\.3\ 5\.2 5\.1/$(MODLUA_DEP_VERSION)/g' -i \ - $(WRKSRC)/build/lua-detect.mk .include <bsd.port.mk> Index: distinfo =================================================================== RCS file: /cvs/ports/x11/notion/distinfo,v diff -u -p -r1.2 distinfo --- distinfo 10 Dec 2023 20:14:33 -0000 1.2 +++ distinfo 8 Jun 2026 21:07:48 -0000 @@ -1,2 +1,2 @@ -SHA256 (raboof-notion-4.0.2.tar.gz) = 3O/WINAo9lQcFYecPbIY3ggd986NLpy0/H3dm5JTtpg= -SIZE (raboof-notion-4.0.2.tar.gz) = 790842 +SHA256 (raboof-notion-4.0.5.tar.gz) = Wpn5ZH/af1NUvuZhctQGq3CKcZccEZbzmJ6Nt0QhQUQ= +SIZE (raboof-notion-4.0.5.tar.gz) = 794165 Index: patches/patch-build_libs_mk =================================================================== RCS file: /cvs/ports/x11/notion/patches/patch-build_libs_mk,v diff -u -p -r1.2 patch-build_libs_mk --- patches/patch-build_libs_mk 11 Mar 2022 20:16:49 -0000 1.2 +++ patches/patch-build_libs_mk 8 Jun 2026 21:07:48 -0000 @@ -3,7 +3,7 @@ libtu,libext need want gettext Index: build/libs.mk --- build/libs.mk.orig +++ build/libs.mk -@@ -19,8 +19,8 @@ else +@@ -10,14 +10,14 @@ CFLAGS += -DNOTION_RELEASE='"$(NOTION_RELEASE)"' LIBS_SUBDIRS += libtu LIBTU_DIR = $(TOPDIR)/libtu @@ -12,9 +12,7 @@ Index: build/libs.mk +LIBTU_INCLUDES = -I$(TOPDIR) -I${LOCALBASE}/include +LIBTU_LIBS = -L$(LIBTU_DIR) -L${LOCALBASE}/lib -lintl -liconv -ltu - endif - -@@ -39,8 +39,8 @@ else + #libextl LIBS_SUBDIRS += libextl LIBEXTL_DIR = $(TOPDIR)/libextl @@ -24,4 +22,3 @@ Index: build/libs.mk +LIBEXTL_LIBS = -L$(LIBEXTL_DIR) -L${LOCALBASE}/lib -lintl -liconv -lextl MKEXPORTS = $(LUA) $(LIBEXTL_DIR)/libextl-mkexports - Index: patches/patch-libtu_test_Makefile =================================================================== RCS file: patches/patch-libtu_test_Makefile diff -N patches/patch-libtu_test_Makefile --- patches/patch-libtu_test_Makefile 11 Mar 2022 20:16:49 -0000 1.2 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,21 +0,0 @@ -Index: libtu/test/Makefile ---- libtu/test/Makefile.orig -+++ libtu/test/Makefile -@@ -6,7 +6,7 @@ include $(TOPDIR)/build/system-inc.mk - - SOURCES=../misc.c ../tokenizer.c ../util.c ../output.c - --LIBS += $(LUA_LIBS) $(DL_LIBS) -lm -+LIBS += $(LUA_LIBS) $(DL_LIBS) $(LIBTU_LIBS) -lm - INCLUDES += $(LIBTU_INCLUDES) - CFLAGS += $(XOPEN_SOURCE) $(C99_SOURCE) - -@@ -17,6 +17,6 @@ include $(TOPDIR)/build/rules.mk - ###################################### - - test: $(SOURCES) -- $(CC) $(CFLAGS) -o tutest $(SOURCES) tutest.c $(LIBS) -+ $(CC) $(CFLAGS) $(INCLUDES) -o tutest $(SOURCES) tutest.c $(LIBS) - ./tutest - $(RM) ./tutest -\ No newline at end of file Index: patches/patch-man_Makefile =================================================================== RCS file: /cvs/ports/x11/notion/patches/patch-man_Makefile,v diff -u -p -r1.2 patch-man_Makefile --- patches/patch-man_Makefile 11 Mar 2022 20:16:49 -0000 1.2 +++ patches/patch-man_Makefile 8 Jun 2026 21:07:48 -0000 @@ -1,13 +1,7 @@ Index: man/Makefile --- man/Makefile.orig +++ man/Makefile -@@ -8,12 +8,12 @@ include $(TOPDIR)/build/system-inc.mk - - ###################################### - --SHELL=bash -o pipefail -+SHELL=sh -o pipefail - +@@ -13,7 +13,7 @@ SHELL=sh -e TARGETS=notion.1 notionflux.1 welcome.txt MKMAN=$(LUA) ../build/mkman.lua Index: patches/patch-mod_notionflux_mod_notionflux_c =================================================================== RCS file: patches/patch-mod_notionflux_mod_notionflux_c diff -N patches/patch-mod_notionflux_mod_notionflux_c --- patches/patch-mod_notionflux_mod_notionflux_c 11 Mar 2022 20:16:49 -0000 1.2 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,80 +0,0 @@ -stdio is defined already in stdio.h - -Index: mod_notionflux/mod_notionflux.c ---- mod_notionflux/mod_notionflux.c.orig -+++ mod_notionflux/mod_notionflux.c -@@ -36,7 +36,7 @@ - - typedef struct{ - int fd; -- FILE *stdout; -+ FILE *stdoutput; - int ndata; - char *data; - } Buf; -@@ -64,9 +64,9 @@ static void close_conn(Buf *buf) - close(buf->fd); - buf->fd=-1; - buf->ndata=0; -- if(buf->stdout!=NULL){ -- fclose(buf->stdout); -- buf->stdout=NULL; -+ if(buf->stdoutput!=NULL){ -+ fclose(buf->stdoutput); -+ buf->stdoutput=NULL; - } - if(buf->data!=NULL){ - free(buf->data); -@@ -147,11 +147,11 @@ static void receive_data(int fd, void *buf_) - bool success=FALSE; - int idx=buf-bufs; - -- if(buf->stdout==NULL){ /* no fd received yet, must be the very beginning */ -- int stdout_fd=unix_recv_fd(fd); -- if(stdout_fd==-2) -+ if(buf->stdoutput==NULL){ /* no fd received yet, must be the very beginning */ -+ int stdoutput_fd=unix_recv_fd(fd); -+ if(stdoutput_fd==-2) - goto closefd; -- if(stdout_fd==-3){ -+ if(stdoutput_fd==-3){ - char const *err="Magic number mismatch on notionflux socket - " - "is notionflux the same version as notion?"; - writes(fd, "E"); -@@ -160,13 +160,13 @@ static void receive_data(int fd, void *buf_) - goto closefd; - } - -- if(stdout_fd==-1) { -+ if(stdoutput_fd==-1) { - if(errno==EWOULDBLOCK || errno==EAGAIN) - return; /* try again later */ - warn("No file descriptor received from notionflux, closing."); - goto closefd; - } -- if((buf->stdout=fdopen(stdout_fd, "w"))==NULL) { -+ if((buf->stdoutput=fdopen(stdoutput_fd, "w"))==NULL) { - warn("fdopen() failed on fd from notionflux"); - goto closefd; - } -@@ -239,9 +239,9 @@ EXTL_SAFE - EXTL_EXPORT - bool mod_notionflux_xwrite(int idx, const char *str) - { -- if (idx<0 || idx>=MAX_SERVED || bufs[idx].stdout==NULL) -+ if (idx<0 || idx>=MAX_SERVED || bufs[idx].stdoutput==NULL) - return FALSE; -- return fputs(str, bufs[idx].stdout)!=EOF; -+ return fputs(str, bufs[idx].stdoutput)!=EOF; - } - - static void connection_attempt(int lfd, void *UNUSED(data)) -@@ -410,7 +410,7 @@ bool mod_notionflux_init() - - for(i=0; i<MAX_SERVED; i++){ - bufs[i].fd=-1; -- bufs[i].stdout=NULL; -+ bufs[i].stdoutput=NULL; - bufs[i].data=NULL; - bufs[i].ndata=0; - } Index: patches/patch-system-autodetect_mk =================================================================== RCS file: /cvs/ports/x11/notion/patches/patch-system-autodetect_mk,v diff -u -p -r1.4 patch-system-autodetect_mk --- patches/patch-system-autodetect_mk 23 Mar 2026 19:02:41 -0000 1.4 +++ patches/patch-system-autodetect_mk 8 Jun 2026 21:07:48 -0000 @@ -16,7 +16,7 @@ Index: system-autodetect.mk ## -@@ -84,7 +84,7 @@ X11_INCLUDES:=$(shell $(PKG_CONFIG) --cflags-only-I x1 +@@ -79,7 +79,7 @@ X11_INCLUDES:=$(shell $(PKG_CONFIG) --cflags-only-I x1 # XFree86 libraries up to 4.3.0 have a bug that can cause a segfault. # The following setting should work around that situation. @@ -25,16 +25,16 @@ Index: system-autodetect.mk # Use the Xutf8 routines (XFree86 extension) instead of the Xmb routines # in an UTF-8 locale. (No, you don't need this in UTF-8 locales, and -@@ -158,7 +158,7 @@ HAS_SYSTEM_ASPRINTF ?= 1 +@@ -153,7 +153,7 @@ HAS_SYSTEM_ASPRINTF ?= 1 # The following setting is needed with GNU libc for clock_gettime and the # monotonic clock. Other systems may not need it, or may not provide a # monotonic clock at all (which Ion can live with, and usually detect). --EXTRA_LIBS += -lrt -+#EXTRA_LIBS += -lrt +-LIBS += -lrt ++#LIBS += -lrt # Cygwin needs this. Also when you disable _BSD_SOURCE you may need it. #DEFINES += -DCF_NO_GETLOADAVG -@@ -201,11 +201,11 @@ EXPORT_DYNAMIC=-Xlinker --export-dynamic +@@ -195,11 +195,11 @@ EXPORT_DYNAMIC=-Xlinker --export-dynamic #C89_SOURCE=-ansi Index: patches/patch-utils_ion-completefile_Makefile =================================================================== RCS file: patches/patch-utils_ion-completefile_Makefile diff -N patches/patch-utils_ion-completefile_Makefile --- patches/patch-utils_ion-completefile_Makefile 11 Mar 2022 20:16:49 -0000 1.2 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,24 +0,0 @@ -Use includes/libs constructed earlier. -Fixe sparc64 compilation - -Index: utils/ion-completefile/Makefile ---- utils/ion-completefile/Makefile.orig -+++ utils/ion-completefile/Makefile -@@ -10,7 +10,7 @@ include $(TOPDIR)/build/system-inc.mk - - LIBS += $(LIBTU_LIBS) - INCLUDES += $(LIBTU_INCLUDES) --CFLAGS += $(XOPEN_SOURCE) -+CFLAGS += $(XOPEN_SOURCE) $(INCLUDES) - - SOURCES=ion-completefile.c - -@@ -23,7 +23,7 @@ include $(TOPDIR)/build/rules.mk - ###################################### - - ion-completefile: $(SOURCES) -- $(CC) $< $(CFLAGS) $(LDFLAGS) -o $@ -+ $(CC) $< $(CFLAGS) $(LDFLAGS) -o $@ $(LIBS) - - _install: - $(INSTALLDIR) $(DESTDIR)$(EXTRABINDIR)