git: 4a2e243ffb19 - main - print/miktex: update to 26.5

Go to: [ bottom of page ] [ top of archives ] [ this month ]
From: Piotr Kubaj <pkubaj_at_FreeBSD.org>
Date: Mon, 12 Oct 2026 07:54:36 UTC
The branch main has been updated by pkubaj:

URL: https://cgit.FreeBSD.org/ports/commit/?id=4a2e243ffb1916615f3d0c39b73c7e1d84e10ff6

commit 4a2e243ffb1916615f3d0c39b73c7e1d84e10ff6
Author:     Piotr Kubaj <pkubaj@FreeBSD.org>
AuthorDate: 2026-10-12 00:02:14 +0000
Commit:     Piotr Kubaj <pkubaj@FreeBSD.org>
CommitDate: 2026-10-12 07:54:30 +0000

    print/miktex: update to 26.5
    
    Build with -fsigned-char: the Pascal-to-C++ translation assumes a signed
    char and corrupts its output on aarch64, armv7 and powerpc64le, which is
    what NOT_FOR_ARCHS was hiding. hitex and luahbtex need libharfbuzz-subset
    when built against the system HarfBuzz.
---
 print/miktex/Makefile                              | 18 +-----------
 print/miktex/distinfo                              | 18 ++++++------
 print/miktex/files/patch-CMakeLists.txt            | 34 ++++++++++++++++++++++
 ...ch-Libraries_MiKTeX_Core_Utils_unx_unxUtils.cpp | 16 +++++-----
 ...tch-Programs_TeXAndFriends_hitex_CMakeLists.txt | 19 ++++++++++++
 ...ms_TeXAndFriends_luatex_luaharfbuzzsubset.cmake | 10 +++++++
 print/miktex/pkg-plist                             | 34 +++++++++++-----------
 7 files changed, 98 insertions(+), 51 deletions(-)

diff --git a/print/miktex/Makefile b/print/miktex/Makefile
index 2d87c36ebd05..570128a4ed7c 100644
--- a/print/miktex/Makefile
+++ b/print/miktex/Makefile
@@ -1,6 +1,5 @@
 PORTNAME=	miktex
-DISTVERSION=	25.4
-PORTREVISION=	4
+DISTVERSION=	26.5
 CATEGORIES=	print
 MASTER_SITES=	https://miktex.org/download/ctan/systems/win32/miktex/source/ \
 		https://ctan.org/tex-archive/systems/win32/miktex/tm/packages/:bootstrap
@@ -24,11 +23,6 @@ LICENSE_NAME=	Multiple
 LICENSE_TEXT=	This is a collection of many independent packages and does not have a single license
 LICENSE_PERMS=	dist-mirror no-dist-sell pkg-mirror no-pkg-sell auto-accept
 
-NOT_FOR_ARCHS=	aarch64 armv7
-NOT_FOR_ARCHS_REASON=	Programs/TeXAndFriends/Knuth/web/tangle.p:1: parse error before `û'
-
-WRKSRC=	${WRKDIR}/${PORTNAME}.${DISTVERSION}
-
 LIB_DEPENDS=	libapr-1.so:devel/apr1 \
 		libboost_locale.so:devel/boost-libs \
 		libcurl.so:ftp/curl \
@@ -88,16 +82,6 @@ post-extract:
 	${CP} ${DISTDIR}/${DIST_SUBDIR}/${f:S/:bootstrap//} ${BUILD_WRKSRC}
 .endfor
 
-post-patch:
-	${REINPLACE_CMD} 's|log4cxx/rollingfileappender.h|log4cxx/rolling/rollingfileappender.h|g' \
-		${WRKSRC}/Libraries/MiKTeX/App/app.cpp \
-		${WRKSRC}/Programs/Editors/TeXworks/miktex/miktex-texworks.cpp \
-		${WRKSRC}/Programs/MiKTeX/Console/Qt/main.cpp \
-		${WRKSRC}/Programs/MiKTeX/PackageManager/mpm/mpm.cpp \
-		${WRKSRC}/Programs/MiKTeX/Yap/MFC/StdAfx.h \
-		${WRKSRC}/Programs/MiKTeX/initexmf/initexmf.cpp \
-		${WRKSRC}/Programs/MiKTeX/miktex/miktex.cpp
-
 post-install:
 	${RM} ${STAGEDIR}${PREFIX}/share/miktex-texmf/miktex/config/*.log
 	${MV} ${STAGEDIR}${PREFIX}/bin/mpc ${STAGEDIR}${PREFIX}/bin/mpc-miktex
diff --git a/print/miktex/distinfo b/print/miktex/distinfo
index 15ac1a4e0cec..2eaa0a262ade 100644
--- a/print/miktex/distinfo
+++ b/print/miktex/distinfo
@@ -1,17 +1,17 @@
-TIMESTAMP = 1746886166
-SHA256 (miktex/miktex-zzdb1-2.9.tar.lzma) = 5d885b2a5c615523a509c9b420eb3675d16002dfc259726863a22e2d2c3be32e
-SIZE (miktex/miktex-zzdb1-2.9.tar.lzma) = 380434
-SHA256 (miktex/miktex-zzdb3-2.9.tar.lzma) = e6f2ee1b08dd76ab49e45fc3b552ae45546a80635b906171445e35717c2c788b
-SIZE (miktex/miktex-zzdb3-2.9.tar.lzma) = 1849325
+TIMESTAMP = 1791721287
+SHA256 (miktex/miktex-zzdb1-2.9.tar.lzma) = 5fadf393bed367db2bd977bcd0c1f5a015b23d99e2736ccfe3882de5ca05a412
+SIZE (miktex/miktex-zzdb1-2.9.tar.lzma) = 436155
+SHA256 (miktex/miktex-zzdb3-2.9.tar.lzma) = 32cf38594080afc5177dd637ce2f4ee3633a3f3a3f30dcb9a87ee7d6f04494c7
+SIZE (miktex/miktex-zzdb3-2.9.tar.lzma) = 2010153
 SHA256 (miktex/miktex-config-2.9.tar.lzma) = 7e487928bf8153e825f128a1f3104b8b50cec76bccb927e55e54937218e51964
 SIZE (miktex/miktex-config-2.9.tar.lzma) = 5262
 SHA256 (miktex/miktex-dvips.tar.lzma) = 78941d2e161eb4d957032ca2183fc94430377efd016c02f05ed35f47190b33ba
 SIZE (miktex/miktex-dvips.tar.lzma) = 4195
 SHA256 (miktex/miktex-fontconfig.tar.lzma) = 7711ffd2220bdd29e30925cb18070d4dbe5c1896f9010995fc96c7e4270f1dd9
 SIZE (miktex/miktex-fontconfig.tar.lzma) = 3555
-SHA256 (miktex/miktex-misc.tar.lzma) = cac35112f9ca5ac7aaa8de7d730373955db552671c6e34861729e8f25bf61fe3
-SIZE (miktex/miktex-misc.tar.lzma) = 23382
+SHA256 (miktex/miktex-misc.tar.lzma) = 4493f4ebe179a76b9aa24bb237632a8176d788efb65d00debc528e1e16290592
+SIZE (miktex/miktex-misc.tar.lzma) = 23556
 SHA256 (miktex/tetex.tar.lzma) = 0c4d68ebaaf6485c71c6e61e091b859fa2f5b819f6e881678def5bfea79597a4
 SIZE (miktex/tetex.tar.lzma) = 13084
-SHA256 (miktex/miktex-25.4.tar.xz) = 63ce9c683da2729e8d584bf7381b96c92a19663b323d684ae91439ab1964ed66
-SIZE (miktex/miktex-25.4.tar.xz) = 28995984
+SHA256 (miktex/miktex-26.5.tar.xz) = a1fd2223ef04a0268b0718536f7b55a04b5c9d1f0f721d1c0b2749b3af95115d
+SIZE (miktex/miktex-26.5.tar.xz) = 29580052
diff --git a/print/miktex/files/patch-CMakeLists.txt b/print/miktex/files/patch-CMakeLists.txt
new file mode 100644
index 000000000000..45895c746d1b
--- /dev/null
+++ b/print/miktex/files/patch-CMakeLists.txt
@@ -0,0 +1,34 @@
+--- CMakeLists.txt.orig	2026-05-13 12:29:06 UTC
++++ CMakeLists.txt
+@@ -87,6 +87,11 @@ endif()
+     endforeach()
+ endif()
+ 
++if(CMAKE_CXX_COMPILER_ID MATCHES "GNU|Clang")
++    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fsigned-char")
++    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fsigned-char")
++endif()
++
+ ###############################################################################
+ ## system type
+ 
+@@ -1206,6 +1211,7 @@ if(USE_SYSTEM_HARFBUZZ)
+ 
+ if(USE_SYSTEM_HARFBUZZ)
+     find_package(HARFBUZZ REQUIRED)
++    find_library(HARFBUZZ_SUBSET_LIBRARY NAMES harfbuzz-subset REQUIRED)
+ endif()
+ 
+ if(USE_SYSTEM_HARFBUZZ_ICU)
+@@ -1890,6 +1896,11 @@ if(USE_SYSTEM_HARFBUZZ)
+         PROPERTIES
+         IMPORTED_LOCATION "${HARFBUZZ_LIBRARY}"
+         INTERFACE_INCLUDE_DIRECTORIES "${HARFBUZZ_INCLUDE_DIRS}"
++    )
++    add_library(MiKTeX::Imported::HARFBUZZ_SUBSET UNKNOWN IMPORTED)
++    set_target_properties(MiKTeX::Imported::HARFBUZZ_SUBSET
++        PROPERTIES
++        IMPORTED_LOCATION "${HARFBUZZ_SUBSET_LIBRARY}"
+     )
+ else()
+     add_subdirectory(${MIKTEX_REL_HARFBUZZ_DIR})
diff --git a/print/miktex/files/patch-Libraries_MiKTeX_Core_Utils_unx_unxUtils.cpp b/print/miktex/files/patch-Libraries_MiKTeX_Core_Utils_unx_unxUtils.cpp
index c4bc2a957322..494970c714a2 100644
--- a/print/miktex/files/patch-Libraries_MiKTeX_Core_Utils_unx_unxUtils.cpp
+++ b/print/miktex/files/patch-Libraries_MiKTeX_Core_Utils_unx_unxUtils.cpp
@@ -1,15 +1,15 @@
---- Libraries/MiKTeX/Core/Utils/unx/unxUtils.cpp.orig	2021-08-06 15:45:04 UTC
+--- Libraries/MiKTeX/Core/Utils/unx/unxUtils.cpp.orig	2026-05-13 12:29:06 UTC
 +++ Libraries/MiKTeX/Core/Utils/unx/unxUtils.cpp
-@@ -26,6 +26,8 @@
- #if defined(__APPLE__)
- #  include <mach-o/dyld.h>
+@@ -22,6 +22,8 @@
+ #if defined(HAVE_SYS_UTSNAME_H)
+ #include <sys/utsname.h>
  #endif
 +#include <sys/types.h>
 +#include <sys/sysctl.h>
  
- #if defined(HAVE_SYS_UTSNAME_H)
- #  include <sys/utsname.h>
-@@ -179,6 +181,16 @@ PathName Utils::GetExe()
+ #include <fmt/format.h>
+ #include <fmt/ostream.h>
+@@ -171,6 +173,16 @@ PathName Utils::GetExe()
          }
      }
      return PathName(buf.GetData());
@@ -26,7 +26,7 @@
  #else
      return File::ReadSymbolicLink(PathName("/proc/self/exe"));
  #endif
-@@ -186,7 +198,7 @@ PathName Utils::GetExe()
+@@ -178,7 +190,7 @@ string Utils::GetExeName()
  
  string Utils::GetExeName()
  {
diff --git a/print/miktex/files/patch-Programs_TeXAndFriends_hitex_CMakeLists.txt b/print/miktex/files/patch-Programs_TeXAndFriends_hitex_CMakeLists.txt
new file mode 100644
index 000000000000..287ec3e465d0
--- /dev/null
+++ b/print/miktex/files/patch-Programs_TeXAndFriends_hitex_CMakeLists.txt
@@ -0,0 +1,19 @@
+--- Programs/TeXAndFriends/hitex/CMakeLists.txt.orig	2026-10-11 18:26:49 UTC
++++ Programs/TeXAndFriends/hitex/CMakeLists.txt
+@@ -124,10 +124,15 @@ target_link_libraries(${MIKTEX_PREFIX}hitex
+ target_link_libraries(${MIKTEX_PREFIX}hitex
+     ${app_dll_name}
+     ${core_dll_name}
+-    ${harfbuzz_dll_name}
+     ${kpsemu_dll_name}
+     ${w2cemu_dll_name}
+ )
++
++if(USE_SYSTEM_HARFBUZZ)
++    target_link_libraries(${MIKTEX_PREFIX}hitex MiKTeX::Imported::HARFBUZZ MiKTeX::Imported::HARFBUZZ_SUBSET)
++else()
++    target_link_libraries(${MIKTEX_PREFIX}hitex ${harfbuzz_dll_name})
++endif()
+ 
+ if(USE_SYSTEM_FMT)
+     target_link_libraries(${MIKTEX_PREFIX}hitex MiKTeX::Imported::FMT)
diff --git a/print/miktex/files/patch-Programs_TeXAndFriends_luatex_luaharfbuzzsubset.cmake b/print/miktex/files/patch-Programs_TeXAndFriends_luatex_luaharfbuzzsubset.cmake
new file mode 100644
index 000000000000..6129524b34b0
--- /dev/null
+++ b/print/miktex/files/patch-Programs_TeXAndFriends_luatex_luaharfbuzzsubset.cmake
@@ -0,0 +1,10 @@
+--- Programs/TeXAndFriends/luatex/luaharfbuzzsubset.cmake.orig	2026-10-11 18:56:17 UTC
++++ Programs/TeXAndFriends/luatex/luaharfbuzzsubset.cmake
+@@ -24,6 +24,7 @@ if(USE_SYSTEM_HARFBUZZ_ICU)
+ if(USE_SYSTEM_HARFBUZZ_ICU)
+     target_link_libraries(luahbtex-luaharfbuzzsubset-objects PUBLIC MiKTeX::Imported::HARFBUZZ_ICU)
+     target_link_libraries(luahbtex-luaharfbuzzsubset-objects PUBLIC MiKTeX::Imported::HARFBUZZ)
++    target_link_libraries(luahbtex-luaharfbuzzsubset-objects PUBLIC MiKTeX::Imported::HARFBUZZ_SUBSET)
+ else()
+     target_link_libraries(luahbtex-luaharfbuzzsubset-objects PUBLIC ${harfbuzz_dll_name})
+ endif()
diff --git a/print/miktex/pkg-plist b/print/miktex/pkg-plist
index 5da9194036eb..4a292ba8be1b 100644
--- a/print/miktex/pkg-plist
+++ b/print/miktex/pkg-plist
@@ -146,12 +146,12 @@ lib/libmetapost-util-static.a
 lib/libmiktex-app.so
 lib/libmiktex-app.so.4.8.0
 lib/libmiktex-app.so.6
+lib/libmiktex-archive.so
+lib/libmiktex-archive.so.3
+lib/libmiktex-archive.so.5.0.0
 lib/libmiktex-core.so
 lib/libmiktex-core.so.30
-lib/libmiktex-core.so.4.24.0
-lib/libmiktex-extractor.so
-lib/libmiktex-extractor.so.2
-lib/libmiktex-extractor.so.4.1.0
+lib/libmiktex-core.so.4.25.0
 lib/libmiktex-fmt.so
 lib/libmiktex-fmt.so.4
 lib/libmiktex-fmt.so.4.3.0
@@ -165,12 +165,12 @@ lib/libmiktex-lua53.so
 lib/libmiktex-lua53.so.1
 lib/libmiktex-lua53.so.4.1.1
 lib/libmiktex-md5.so
-lib/libmiktex-md5.so.%%GTK4_VERSION%%
-lib/libmiktex-md5.so.%%GTK4_VERSION%%.0.1
+lib/libmiktex-md5.so.4.0.0
+lib/libmiktex-md5.so.4.0.0.0.1
 lib/libmiktex-metapost.so
 lib/libmiktex-packagemanager.so
 lib/libmiktex-packagemanager.so.11
-lib/libmiktex-packagemanager.so.4.10.0
+lib/libmiktex-packagemanager.so.4.11.0
 %%UIQT%%lib/libmiktex-poppler-Qt.so
 %%UIQT%%lib/libmiktex-poppler-Qt.so.4
 %%UIQT%%lib/libmiktex-poppler-Qt.so.4.1.0
@@ -178,14 +178,14 @@ lib/libmiktex-poppler.so
 lib/libmiktex-poppler.so.4
 lib/libmiktex-poppler.so.4.1.0
 lib/libmiktex-ptexenc.so
-lib/libmiktex-ptexenc.so.1.10.0
+lib/libmiktex-ptexenc.so.1.11.0
 lib/libmiktex-ptexenc.so.6
 lib/libmiktex-res.so
 lib/libmiktex-res.so.1
 lib/libmiktex-res.so.1.0.0
 lib/libmiktex-setup.so
-lib/libmiktex-setup.so.5.5.0
-lib/libmiktex-setup.so.6
+lib/libmiktex-setup.so.5.6.0
+lib/libmiktex-setup.so.7
 lib/libmiktex-teckit.so
 lib/libmiktex-teckit.so.2
 lib/libmiktex-teckit.so.4.1.0
@@ -202,8 +202,8 @@ lib/libmiktex-util.so
 lib/libmiktex-util.so.4.4.0
 lib/libmiktex-util.so.5
 lib/libmiktex-web2c.so
-lib/libmiktex-web2c.so.2
-lib/libmiktex-web2c.so.4.2.0
+lib/libmiktex-web2c.so.3
+lib/libmiktex-web2c.so.4.3.0
 libexec/miktex/runexe
 libexec/miktex/runjava
 libexec/miktex/runperl
@@ -211,6 +211,9 @@ libexec/miktex/runpython
 libexec/miktex/runsh
 libexec/miktex/runtexlua
 libexec/miktex/tex2xindy
+%%UIQT%%share/applications/icons/hicolor/128x128/apps/miktex-console.png
+%%UIQT%%share/applications/icons/hicolor/32x32/apps/miktex-console.png
+%%UIQT%%share/applications/miktex-console.desktop
 share/man/man1/findtexmf.1.gz
 share/man/man1/initexmf.1.gz
 share/man/man1/miktex-bibtex.1.gz
@@ -235,11 +238,6 @@ share/man/man1/mpm.1.gz
 share/man/man1/mthelp.1.gz
 share/man/man1/texify.1.gz
 share/man/man5/pdftex.cfg.5.gz
-%%UIQT%%share/applications/icons/hicolor/128x128/apps/miktex-console.png
-%%UIQT%%share/applications/icons/hicolor/32x32/apps/miktex-console.png
-%%UIQT%%share/applications/miktex-console.desktop
-%%UIQT%%share/pixmaps/miktex-console.png
-%%UIQT%%share/polkit-1/actions/miktex-console.policy
 %%DATADIR%%-texmf/miktex/bootstrapping/miktex-config-2.9.tar.lzma
 %%DATADIR%%-texmf/miktex/bootstrapping/miktex-dvips.tar.lzma
 %%DATADIR%%-texmf/miktex/bootstrapping/miktex-fontconfig.tar.lzma
@@ -247,3 +245,5 @@ share/man/man5/pdftex.cfg.5.gz
 %%DATADIR%%-texmf/miktex/bootstrapping/miktex-zzdb1-2.9.tar.lzma
 %%DATADIR%%-texmf/miktex/bootstrapping/miktex-zzdb3-2.9.tar.lzma
 %%DATADIR%%-texmf/miktex/bootstrapping/tetex.tar.lzma
+%%UIQT%%share/pixmaps/miktex-console.png
+%%UIQT%%share/polkit-1/actions/miktex-console.policy