Here is an inline diff for editors/TeXmacs 2.1.5. changelog: https://www.texmacs.org/tmweb/about/changes.en.html port-wise it does the following: - removes the subversion versioning suffix from WRKDIST - adds security/gnutls to WANTLIB and LIB_DEPENDS for the new online collaboration feature - fixes common lisp plugin by replacing #!/bin/bash with #!/bin/sh like in x11/remmina - garbage collects patches - QTMPipeLink.cpp uses wordexp which is not on openbsd. instead patch it out and fall through to the #else and use QProcess::splitCommand instead - new patch to avoid including malloc.h - regens socket_notifier.cpp patch - removes R from README because it is broken I tested the other plugins and they work other than R. I tested the online collaboration feature described in Help > Manual > Remote tools. I tested both remote files and live documents between two accounts. This diff was getting long so I left off adding RUN_DEPENDS for textproc/{hunspell,aspell} for a future discussion once this update lands. Feedback and tests are welcome. OK? Index: Makefile =================================================================== RCS file: /cvs/ports/editors/TeXmacs/Makefile,v diff -u -p -r1.36 Makefile --- Makefile 3 Dec 2025 12:43:32 -0000 1.36 +++ Makefile 14 Aug 2026 11:22:27 -0000 @@ -1,8 +1,10 @@ COMMENT= wysiwyw (what you see is what you want) editing platform -DISTNAME= TeXmacs-2.1.2-src +V= 2.1.5 +SVNREV= 15315 +DISTNAME= TeXmacs-${V}-src PKGNAME= ${DISTNAME:S/-src//} -REVISION= 5 +WRKDIST= ${WRKDIR}/${DISTNAME:S/-src/.${SVNREV}/} CATEGORIES= editors print x11 @@ -16,7 +18,7 @@ SITES= http://texmacs.org/Download/ftp/ PERMIT_PACKAGE= Yes WANTLIB += ${COMPILER_LIBCXX} Qt5Core Qt5Gui Qt5PrintSupport Qt5Svg -WANTLIB += Qt5Widgets c execinfo freetype gmp guile jpeg ltdl +WANTLIB += Qt5Widgets c execinfo freetype gmp gnutls guile jpeg ltdl WANTLIB += m png sqlite3 util z # needs c++ and python @@ -38,6 +40,7 @@ LIB_DEPENDS= databases/sqlite3 \ graphics/jpeg \ graphics/png \ lang/guile \ + security/gnutls \ x11/qt5/qtsvg,-main MODCMAKE_LDFLAGS = -L${LOCALBASE}/lib @@ -53,5 +56,6 @@ post-extract: post-install: ${MODPY_COMPILEALL} ${PREFIX}/share/TeXmacs/plugins/tmpy + sed -i '1s,/bash,/sh,' ${PREFIX}/share/TeXmacs/plugins/lisp/bin/tm_lisp .include <bsd.port.mk> Index: distinfo =================================================================== RCS file: /cvs/ports/editors/TeXmacs/distinfo,v diff -u -p -r1.7 distinfo --- distinfo 6 Feb 2023 22:33:45 -0000 1.7 +++ distinfo 14 Aug 2026 11:22:27 -0000 @@ -1,2 +1,2 @@ -SHA256 (TeXmacs-2.1.2-src.tar.gz) = Ds9gxOwMYSttEWrawgxLHGxHyMBvt8WmyPIwBP2g/CM= -SIZE (TeXmacs-2.1.2-src.tar.gz) = 36224939 +SHA256 (TeXmacs-2.1.5-src.tar.gz) = s6EnvbqOeQELI5KRQVy+NDEzNSHiRHeoFLWG4bQCc2A= +SIZE (TeXmacs-2.1.5-src.tar.gz) = 95945496 Index: patches/patch-CMakeLists_txt =================================================================== RCS file: /cvs/ports/editors/TeXmacs/patches/patch-CMakeLists_txt,v diff -u -p -r1.6 patch-CMakeLists_txt --- patches/patch-CMakeLists_txt 11 Mar 2022 18:58:26 -0000 1.6 +++ patches/patch-CMakeLists_txt 14 Aug 2026 11:22:27 -0000 @@ -1,7 +1,7 @@ Index: CMakeLists.txt --- CMakeLists.txt.orig +++ CMakeLists.txt -@@ -644,7 +644,7 @@ if (TEXMACS_GUI MATCHES "Qt.*") +@@ -682,7 +682,7 @@ if (TEXMACS_GUI MATCHES "Qt.*") set (TeXmacs_All_SRCS ${TeXmacs_All_SRCS} ${TeXmacs_Qt_SRCS} ${TeXmacs_Qt_Moc_HDRS}) set (TeXmacs_Include_Dirs ${TeXmacs_Include_Dirs} ${QT_INCLUDES}) Index: patches/patch-src_Kernel_Containers_hashtree_cpp =================================================================== RCS file: patches/patch-src_Kernel_Containers_hashtree_cpp diff -N patches/patch-src_Kernel_Containers_hashtree_cpp --- patches/patch-src_Kernel_Containers_hashtree_cpp 5 Feb 2025 05:06:32 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,14 +0,0 @@ -https://svn.savannah.gnu.org/viewvc/texmacs/trunk/src/src/Kernel/Containers/hashtree.cpp?r1=2717&r2=14566&diff_format=u - -Index: src/Kernel/Containers/hashtree.cpp ---- src/Kernel/Containers/hashtree.cpp.orig -+++ src/Kernel/Containers/hashtree.cpp -@@ -94,7 +94,7 @@ hashtree<K,V>::operator-> (void) { - - template<class K, class V> inline hashtree<K,V> - hashtree<K,V>::operator[] (K key) { -- if (*this->contains (key)) return *this->children (key); -+ if ((*this)->contains (key)) return (*this)->children (key); - else FAILED ("read-access to non-existent node requested"); - } - Index: patches/patch-src_Plugins_Qt_QTMPipeLink_cpp =================================================================== RCS file: patches/patch-src_Plugins_Qt_QTMPipeLink_cpp diff -N patches/patch-src_Plugins_Qt_QTMPipeLink_cpp --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ patches/patch-src_Plugins_Qt_QTMPipeLink_cpp 14 Aug 2026 11:22:27 -0000 @@ -0,0 +1,23 @@ +remove wordexp and use QProcess::splitCommand instead + +Index: src/Plugins/Qt/QTMPipeLink.cpp +--- src/Plugins/Qt/QTMPipeLink.cpp.orig ++++ src/Plugins/Qt/QTMPipeLink.cpp +@@ -17,7 +17,7 @@ + + #ifdef OS_MINGW + #include <windows.h> +-#elif !defined(OS_ANDROID) ++#elif !defined(OS_ANDROID) && !defined(__OpenBSD__) + #include <wordexp.h> +
Friday, August 14, 2026
Re: UPDATE net/samba-4.24.6
Hi, Thanks for the update. OK for current and -stable. Builds and test fine. Ian McWilliam > On 14 Aug 2026, at 07:30, Bjorn Ketelaars <bket@openbsd.org> wrote: > > Diff below updates samba to 4.24.6. Changes: > https://www.samba.org/samba/history/samba-4.24.6.html. > > Minor of libndr needs a minor bump. > > Run tested on -current and -stable on amd64. > > OK for both -current and -stable? > > > diff --git Makefile Makefile > index 69489b8ec97..3680c63844c 100644 > --- Makefile > +++ Makefile > @@ -1,4 +1,4 @@ > -VERSION = 4.24.5 > +VERSION = 4.24.6 > DISTNAME = samba-${VERSION} > EPOCH = 0 > > @@ -15,7 +15,7 @@ SHARED_LIBS = dcerpc 3.0 \ > dcerpc-samr 1.0 \ > dcerpc-server-core 3.2 \ > ldb 2.4 \ > - ndr 4.0 \ > + ndr 4.1 \ > ndr-krb5pac 1.4 \ > ndr-nbt 2.1 \ > ndr-standard 6.2 \ > diff --git distinfo distinfo > index 6347e588b8e..635797b8057 100644 > --- distinfo > +++ distinfo > @@ -1,2 +1,2 @@ > -SHA256 (samba-4.24.5.tar.gz) = bV1+6C9c6dpBNQhsmxhOR6WLSwI1ZfWKu7H4yKkiMGs= > -SIZE (samba-4.24.5.tar.gz) = 43445051 > +SHA256 (samba-4.24.6.tar.gz) = gQzJVayzZ+m95Vbcz7UNsXegK3xVOqFimguQX6dhYmc= > +SIZE (samba-4.24.6.tar.gz) = 43449390