git: 65f4c599404e - main - print/miktex: Update to 24.4

Go to: [ bottom of page ] [ top of archives ] [ this month ]
From: Zsolt Udvari <uzsolt_at_FreeBSD.org>
Date: Sat, 16 Nov 2024 19:53:54 UTC
The branch main has been updated by uzsolt:

URL: https://cgit.FreeBSD.org/ports/commit/?id=65f4c599404ed08306c90e7ff99bc7c49c9d660d

commit 65f4c599404ed08306c90e7ff99bc7c49c9d660d
Author:     Zsolt Udvari <uzsolt@FreeBSD.org>
AuthorDate: 2024-11-16 19:49:29 +0000
Commit:     Zsolt Udvari <uzsolt@FreeBSD.org>
CommitDate: 2024-11-16 19:53:38 +0000

    print/miktex: Update to 24.4
    
    Use Qt6 instead of Qt5.
    Remove MANPAGES option, install manual pages.
    Take maintainership.
    Pet portlint, portfmt.
    
    Changelog: https://github.com/MiKTeX/miktex/blob/next/CHANGELOG.md
---
 print/miktex/Makefile                   | 37 ++++++++-------
 print/miktex/distinfo                   | 18 ++++----
 print/miktex/files/patch-CMakeLists.txt | 73 -----------------------------
 print/miktex/pkg-plist                  | 81 +++++++++++++++++----------------
 4 files changed, 71 insertions(+), 138 deletions(-)

diff --git a/print/miktex/Makefile b/print/miktex/Makefile
index 6cd99745cac8..82585f4ced1b 100644
--- a/print/miktex/Makefile
+++ b/print/miktex/Makefile
@@ -1,9 +1,8 @@
 PORTNAME=	miktex
-DISTVERSION=	23.9
-PORTREVISION=	4
+DISTVERSION=	24.4
 CATEGORIES=	print
 MASTER_SITES=	https://miktex.org/download/ctan/systems/win32/miktex/source/ \
-	https://ctan.org/tex-archive/systems/win32/miktex/tm/packages/:bootstrap
+		https://ctan.org/tex-archive/systems/win32/miktex/tm/packages/:bootstrap
 DISTFILES=	miktex-zzdb1-2.9.tar.lzma:bootstrap \
 		miktex-zzdb3-2.9.tar.lzma:bootstrap \
 		miktex-config-2.9.tar.lzma:bootstrap \
@@ -15,7 +14,7 @@ DISTFILES=	miktex-zzdb1-2.9.tar.lzma:bootstrap \
 DIST_SUBDIR=	miktex
 EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	uzsolt@FreeBSD.org
 COMMENT=	Implementation of TeX/LaTeX
 WWW=		https://miktex.org
 
@@ -28,27 +27,30 @@ LIB_DEPENDS=	libapr-1.so:devel/apr1 \
 		libboost_locale.so:devel/boost-libs \
 		libcurl.so:ftp/curl \
 		libexpat.so:textproc/expat2 \
-		libfreetype.so:print/freetype2 \
 		libfontconfig.so:x11-fonts/fontconfig \
+		libfreetype.so:print/freetype2 \
 		libfribidi.so:converters/fribidi \
 		libgd.so:graphics/gd \
 		libgmp.so:math/gmp \
 		libgraphite2.so:graphics/graphite2 \
-		libharfbuzz.so:print/harfbuzz \
 		libharfbuzz-icu.so:print/harfbuzz-icu \
+		libharfbuzz.so:print/harfbuzz \
 		libhunspell-1.7.so:textproc/hunspell \
 		libicui18n.so:devel/icu \
 		libicuuc.so:devel/icu \
 		libinotify.so:devel/libinotify \
 		liblog4cxx.so:devel/log4cxx \
+		libmpfi.so:math/mpfi \
 		libmpfr.so:math/mpfr \
 		libmspack.so:archivers/libmspack \
 		libpng.so:graphics/png \
 		libpopt.so:devel/popt \
+		libQt6Widgets.so:devel/qt6-base \
 		liburiparser.so:net/uriparser \
 		libzzip.so:devel/zziplib
 
-USES=		bison cmake:noninja gettext-tools gmake gnome jpeg pkgconfig ssl tar:xz xorg
+USES=		bison cmake:noninja gettext-tools gmake gnome jpeg \
+		localbase:ldflags pkgconfig ssl tar:xz xorg
 USE_GNOME=	cairo libxslt
 USE_LDCONFIG=	yes
 USE_XORG=	pixman
@@ -56,26 +58,29 @@ USE_XORG=	pixman
 CMAKE_ARGS=	-DMIKTEX_SYSTEM_ETC_FONTS_CONFD_DIR=${LOCALBASE}/etc/fonts/conf.d \
 		-DMIKTEX_SYSTEM_VAR_CACHE_DIR=${DATADIR}/cache \
 		-DMIKTEX_SYSTEM_VAR_LIB_DIR=${DATADIR}/lib
+CMAKE_ON=	WITH_MAN_PAGES
 
 MAKE_JOBS_UNSAFE=	yes
 
-OPTIONS_DEFINE=		MANPAGES UIQT
-OPTIONS_DEFAULT=	MANPAGES UIQT
+LDFLAGS+=	-linotify
+
+OPTIONS_DEFINE=		UIQT
+OPTIONS_DEFAULT=	UIQT
 OPTIONS_SUB=		yes
 
 UIQT_DESC=	Build Qt components
 
-MANPAGES_CMAKE_BOOL=	WITH_MAN_PAGES
-UIQT_USES=	gl
-UIQT_USES=	desktop-file-utils qt:5
-UIQT_USE=	qt=buildtools:build,concurrent,core,dbus,declarative,gui,linguisttools,network,printsupport,qmake:build,script,scripttools,uitools,widgets,xml gl=gl
+UIQT_USES=		desktop-file-utils gl qt:6
+UIQT_USE=		GL=gl,opengl \
+			qmake:build \
+			QT=5compat,declarative,tools
 UIQT_CMAKE_BOOL=	WITH_UI_QT
 
 post-extract:
 	${MKDIR} ${BUILD_WRKSRC}
-.	for f in ${DISTFILES:M*bootstrap}
-		${CP} ${DISTDIR}/${DIST_SUBDIR}/${f:S/:bootstrap//} ${BUILD_WRKSRC}
-.	endfor
+.for f in ${DISTFILES:M*bootstrap}
+	${CP} ${DISTDIR}/${DIST_SUBDIR}/${f:S/:bootstrap//} ${BUILD_WRKSRC}
+.endfor
 
 post-patch:
 	${REINPLACE_CMD} 's|log4cxx/rollingfileappender.h|log4cxx/rolling/rollingfileappender.h|g' \
diff --git a/print/miktex/distinfo b/print/miktex/distinfo
index 9172aa9a254b..fb6998a787f0 100644
--- a/print/miktex/distinfo
+++ b/print/miktex/distinfo
@@ -1,17 +1,17 @@
-TIMESTAMP = 1698605120
-SHA256 (miktex/miktex-zzdb1-2.9.tar.lzma) = 84977944c965b8a77e65236ffdee74bbacf1a4b7a2ac183b338ff75eba8e545a
-SIZE (miktex/miktex-zzdb1-2.9.tar.lzma) = 335737
-SHA256 (miktex/miktex-zzdb3-2.9.tar.lzma) = b584c96ca21a10a95b4f70a1b3bc64bc742c682296486a10e039da87d9693e90
-SIZE (miktex/miktex-zzdb3-2.9.tar.lzma) = 1690161
+TIMESTAMP = 1731694034
+SHA256 (miktex/miktex-zzdb1-2.9.tar.lzma) = 1a3f6ea028f0d525ac01d48fb9f5717814326f16f469ca794e975dfa1b3cfda6
+SIZE (miktex/miktex-zzdb1-2.9.tar.lzma) = 369576
+SHA256 (miktex/miktex-zzdb3-2.9.tar.lzma) = 7bd99933f3ef78fad867686fca13622aea92a1bba4d1de3f4f7534ac3f80b8e1
+SIZE (miktex/miktex-zzdb3-2.9.tar.lzma) = 1816676
 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) = bfb4261f59da6b03df31b871894dfda32975582f19477a81cea843d28b921ece
-SIZE (miktex/miktex-misc.tar.lzma) = 23293
+SHA256 (miktex/miktex-misc.tar.lzma) = 5d7af3933b24f13de10a874f7f27ce465da30a824f8b383fc9ffee553b77952a
+SIZE (miktex/miktex-misc.tar.lzma) = 23417
 SHA256 (miktex/tetex.tar.lzma) = 0c4d68ebaaf6485c71c6e61e091b859fa2f5b819f6e881678def5bfea79597a4
 SIZE (miktex/tetex.tar.lzma) = 13084
-SHA256 (miktex/miktex-23.9.tar.xz) = 698d4b9c5a8358781fcefc19774d5223ed2cd8afebe3f7d1080baae9387a2225
-SIZE (miktex/miktex-23.9.tar.xz) = 29125780
+SHA256 (miktex/miktex-24.4.tar.xz) = d645b049a546ecd52397db5c883f4140885b201f5bb4ac401885cb2cc5219805
+SIZE (miktex/miktex-24.4.tar.xz) = 29351280
diff --git a/print/miktex/files/patch-CMakeLists.txt b/print/miktex/files/patch-CMakeLists.txt
deleted file mode 100644
index 2d1300097fbc..000000000000
--- a/print/miktex/files/patch-CMakeLists.txt
+++ /dev/null
@@ -1,73 +0,0 @@
-Fix build with CMake >= 3.28.0. FREETYPE_LIBRARY has not officially been
-part of the user-facing interface of the FindFreetype module since CMake
-2.6.0 [1] and has only been coincidentally defined up until this point.
-
-[1] https://gitlab.kitware.com/cmake/cmake/-/commit/d18fb61c76c720ec5b1ac2cc4f30a5beaf071c33
-
---- CMakeLists.txt.orig	2023-09-17 19:36:53 UTC
-+++ CMakeLists.txt
-@@ -1,7 +1,7 @@
- ## CMakeLists.txt
- ##
- ## Copyright (C) 2006-2022 Christian Schenk
--## 
-+##
- ## This file is free software; the copyright holder gives
- ## unlimited permission to copy and/or distribute it, with or
- ## without modifications, as long as this notice is preserved.
-@@ -598,7 +598,7 @@ set(QT_SERIES "5" CACHE STRING "The Qt series to be us
- endif()
- 
- set(QT_SERIES "5" CACHE STRING "The Qt series to be used.")
--  
-+
- ###############################################################################
- ## fixed values
- 
-@@ -655,7 +655,7 @@ elseif(MIKTEX_MONTH_VERSION EQUAL 12)
-     set(MIKTEX_MONTH_NAME_VERSION "November")
- elseif(MIKTEX_MONTH_VERSION EQUAL 12)
-     set(MIKTEX_MONTH_NAME_VERSION "December")
--endif()  
-+endif()
- 
- if(MIKTEX_LINUX)
-     set(MIKTEX_LINUX_DIST
-@@ -1249,6 +1249,10 @@ endif()
-     find_package(ZZIP REQUIRED)
- endif()
- 
-+if(MIKTEX_FREEBSD)
-+  find_package(Inotify REQUIRED)
-+endif()
-+
- if(MSVC)
-     set(HAVE_PRAGMA_ONCE TRUE)
- endif()
-@@ -1600,7 +1604,7 @@ if(USE_SYSTEM_BZIP2)
-         IMPORTED_LOCATION "${BZIP2_LIBRARY}"
-         INTERFACE_INCLUDE_DIRECTORIES "${BZIP2_INCLUDE_DIR}"
-     )
--else()  
-+else()
-     add_subdirectory(${MIKTEX_REL_BZIP2_DIR})
- endif()
- 
-@@ -1609,7 +1613,7 @@ if(USE_SYSTEM_FREETYPE2)
- endif()
- 
- if(USE_SYSTEM_FREETYPE2)
--    get_filename_component(suffix ${FREETYPE_LIBRARY} EXT)
-+    get_filename_component(suffix ${FREETYPE_LIBRARIES} EXT)
-     if (suffix STREQUAL CMAKE_SHARED_LIBRARY_SUFFIX)
-         add_library(MiKTeX::Imported::FREETYPE2 SHARED IMPORTED)
-     else()
-@@ -1617,7 +1621,7 @@ if(USE_SYSTEM_FREETYPE2)
-     endif()
-     set_target_properties(MiKTeX::Imported::FREETYPE2
-         PROPERTIES
--        IMPORTED_LOCATION "${FREETYPE_LIBRARY}"
-+        IMPORTED_LOCATION "${FREETYPE_LIBRARIES}"
-         INTERFACE_COMPILE_DEFINITIONS "HAVE_FT2BUILD_H=1;HAVE_LIBFREETYPE=1"
-         INTERFACE_INCLUDE_DIRECTORIES "${FREETYPE_INCLUDE_DIRS}"
-     )
diff --git a/print/miktex/pkg-plist b/print/miktex/pkg-plist
index 4d688118a7f2..1a77b67245ef 100644
--- a/print/miktex/pkg-plist
+++ b/print/miktex/pkg-plist
@@ -99,6 +99,7 @@ bin/miktex-psnup
 bin/miktex-psresize
 bin/miktex-psselect
 bin/miktex-pstops
+bin/miktex-ptekf
 bin/miktex-rebar
 bin/miktex-rungs
 bin/miktex-scor2prt
@@ -144,19 +145,19 @@ lib/libmetapost-core-static.a
 lib/libmetapost-extramath-static.a
 lib/libmetapost-util-static.a
 lib/libmiktex-app.so
-lib/libmiktex-app.so.4.7.0
+lib/libmiktex-app.so.4.8.0
 lib/libmiktex-app.so.6
 lib/libmiktex-core.so
 lib/libmiktex-core.so.30
-lib/libmiktex-core.so.4.20.0
+lib/libmiktex-core.so.4.24.0
 lib/libmiktex-extractor.so
 lib/libmiktex-extractor.so.2
-lib/libmiktex-extractor.so.4.0.0
+lib/libmiktex-extractor.so.4.1.0
 lib/libmiktex-fmt.so
-lib/libmiktex-fmt.so.3
-lib/libmiktex-fmt.so.4.2.0
+lib/libmiktex-fmt.so.4
+lib/libmiktex-fmt.so.4.3.0
 lib/libmiktex-kpathsea.so
-lib/libmiktex-kpathsea.so.4.2.0
+lib/libmiktex-kpathsea.so.4.4.0
 lib/libmiktex-kpathsea.so.5
 lib/libmiktex-loc.so
 lib/libmiktex-loc.so.1
@@ -170,16 +171,16 @@ lib/libmiktex-md5.so.%%GTK4_VERSION%%.0.1
 lib/libmiktex-metapost.so
 lib/libmiktex-packagemanager.so
 lib/libmiktex-packagemanager.so.11
-lib/libmiktex-packagemanager.so.4.9.0
+lib/libmiktex-packagemanager.so.4.10.0
 %%UIQT%%lib/libmiktex-poppler-Qt.so
-%%UIQT%%lib/libmiktex-poppler-Qt.so.3
-%%UIQT%%lib/libmiktex-poppler-Qt.so.4.0.0
+%%UIQT%%lib/libmiktex-poppler-Qt.so.4
+%%UIQT%%lib/libmiktex-poppler-Qt.so.4.1.0
 lib/libmiktex-poppler.so
-lib/libmiktex-poppler.so.3
-lib/libmiktex-poppler.so.4.0.0
+lib/libmiktex-poppler.so.4
+lib/libmiktex-poppler.so.4.1.0
 lib/libmiktex-ptexenc.so
-lib/libmiktex-ptexenc.so.1.7.0
-lib/libmiktex-ptexenc.so.3
+lib/libmiktex-ptexenc.so.1.8.0
+lib/libmiktex-ptexenc.so.4
 lib/libmiktex-res.so
 lib/libmiktex-res.so.1
 lib/libmiktex-res.so.1.0.0
@@ -197,13 +198,13 @@ lib/libmiktex-trace.so.4.0.0
 lib/libmiktex-trace.so.5
 %%UIQT%%lib/libmiktex-ui-Qt.so
 %%UIQT%%lib/libmiktex-ui-Qt.so.2
-%%UIQT%%lib/libmiktex-ui-Qt.so.4.2.0
+%%UIQT%%lib/libmiktex-ui-Qt.so.4.5.0
 lib/libmiktex-util.so
-lib/libmiktex-util.so.4.2.0
+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.1.0
+lib/libmiktex-web2c.so.4.2.0
 libexec/miktex/runexe
 libexec/miktex/runjava
 libexec/miktex/runperl
@@ -211,30 +212,30 @@ libexec/miktex/runpython
 libexec/miktex/runsh
 libexec/miktex/runtexlua
 libexec/miktex/tex2xindy
-%%MANPAGES%%share/man/man1/findtexmf.1.gz
-%%MANPAGES%%share/man/man1/initexmf.1.gz
-%%MANPAGES%%share/man/man1/miktex-bibtex.1.gz
-%%MANPAGES%%share/man/man1/miktex-dvicopy.1.gz
-%%MANPAGES%%share/man/man1/miktex-dvips.1.gz
-%%MANPAGES%%share/man/man1/miktex-filesystem.1.gz
-%%MANPAGES%%share/man/man1/miktex-filetypes.1.gz
-%%MANPAGES%%share/man/man1/miktex-fndb.1.gz
-%%MANPAGES%%share/man/man1/miktex-fontmaps.1.gz
-%%MANPAGES%%share/man/man1/miktex-formats.1.gz
-%%MANPAGES%%share/man/man1/miktex-gftodvi.1.gz
-%%MANPAGES%%share/man/man1/miktex-languages.1.gz
-%%MANPAGES%%share/man/man1/miktex-links.1.gz
-%%MANPAGES%%share/man/man1/miktex-luatex.1.gz
-%%MANPAGES%%share/man/man1/miktex-mf.1.gz
-%%MANPAGES%%share/man/man1/miktex-mpost.1.gz
-%%MANPAGES%%share/man/man1/miktex-pdftex.1.gz
-%%MANPAGES%%share/man/man1/miktex-tex.1.gz
-%%MANPAGES%%share/man/man1/miktex-xetex.1.gz
-%%MANPAGES%%share/man/man1/miktex.1.gz
-%%MANPAGES%%share/man/man1/mpm.1.gz
-%%MANPAGES%%share/man/man1/mthelp.1.gz
-%%MANPAGES%%share/man/man1/texify.1.gz
-%%MANPAGES%%share/man/man5/pdftex.cfg.5.gz
+share/man/man1/findtexmf.1.gz
+share/man/man1/initexmf.1.gz
+share/man/man1/miktex-bibtex.1.gz
+share/man/man1/miktex-dvicopy.1.gz
+share/man/man1/miktex-dvips.1.gz
+share/man/man1/miktex-filesystem.1.gz
+share/man/man1/miktex-filetypes.1.gz
+share/man/man1/miktex-fndb.1.gz
+share/man/man1/miktex-fontmaps.1.gz
+share/man/man1/miktex-formats.1.gz
+share/man/man1/miktex-gftodvi.1.gz
+share/man/man1/miktex-languages.1.gz
+share/man/man1/miktex-links.1.gz
+share/man/man1/miktex-luatex.1.gz
+share/man/man1/miktex-mf.1.gz
+share/man/man1/miktex-mpost.1.gz
+share/man/man1/miktex-pdftex.1.gz
+share/man/man1/miktex-tex.1.gz
+share/man/man1/miktex-xetex.1.gz
+share/man/man1/miktex.1.gz
+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