View | Details | Raw Unified | Return to bug 259139 | Differences between
and this patch

Collapse All | Expand All

(-)b/print/miktex/Makefile (-3 / +3 lines)
Lines 1-6 Link Here
1
PORTNAME=	miktex
1
PORTNAME=	miktex
2
DISTVERSION=	21.2
2
DISTVERSION=	21.8
3
PORTREVISION=	2
4
CATEGORIES=	print
3
CATEGORIES=	print
5
MASTER_SITES=	LOCAL/arrowd/miktex:bootstrap
4
MASTER_SITES=	LOCAL/arrowd/miktex:bootstrap
6
DISTFILES=	miktex-zzdb1-2.9.tar.lzma:bootstrap \
5
DISTFILES=	miktex-zzdb1-2.9.tar.lzma:bootstrap \
Lines 38-43 LIB_DEPENDS= libapr-1.so:devel/apr1 \ Link Here
38
		liblog4cxx.so:devel/log4cxx \
37
		liblog4cxx.so:devel/log4cxx \
39
		libmpfr.so:math/mpfr \
38
		libmpfr.so:math/mpfr \
40
		libmspack.so:archivers/libmspack \
39
		libmspack.so:archivers/libmspack \
40
		libinotify.so:devel/libinotify \
41
		libpng.so:graphics/png \
41
		libpng.so:graphics/png \
42
		libpopt.so:devel/popt \
42
		libpopt.so:devel/popt \
43
		liburiparser.so:net/uriparser \
43
		liburiparser.so:net/uriparser \
Lines 62-68 MANPAGES_CMAKE_BOOL= WITH_MAN_PAGES Link Here
62
UIQT_CMAKE_BOOL=	WITH_UI_QT
62
UIQT_CMAKE_BOOL=	WITH_UI_QT
63
63
64
UIQT_USES=	qt:5 gl
64
UIQT_USES=	qt:5 gl
65
UIQT_USE=	qt=core,concurrent,dbus,gui,linguisttools,printsupport,script,scripttools,uitools,widgets,xml,buildtools_build,qmake_build gl=gl
65
UIQT_USE=	qt=core,concurrent,declarative,dbus,gui,linguisttools,network,printsupport,script,scripttools,uitools,widgets,xml,buildtools_build,qmake_build gl=gl
66
66
67
CMAKE_ARGS=	-DMIKTEX_SYSTEM_ETC_FONTS_CONFD_DIR=${LOCALBASE}/etc/fonts/conf.d \
67
CMAKE_ARGS=	-DMIKTEX_SYSTEM_ETC_FONTS_CONFD_DIR=${LOCALBASE}/etc/fonts/conf.d \
68
		-DMIKTEX_SYSTEM_VAR_CACHE_DIR=${DATADIR}/cache \
68
		-DMIKTEX_SYSTEM_VAR_CACHE_DIR=${DATADIR}/cache \
(-)b/print/miktex/distinfo (-3 / +3 lines)
Lines 1-4 Link Here
1
TIMESTAMP = 1614101307
1
TIMESTAMP = 1634128834
2
SHA256 (miktex/miktex-zzdb1-2.9.tar.lzma) = 3cd30066ddf921a7843e51360b30ee8953f9226adc179339c5ed4b7a7b188753
2
SHA256 (miktex/miktex-zzdb1-2.9.tar.lzma) = 3cd30066ddf921a7843e51360b30ee8953f9226adc179339c5ed4b7a7b188753
3
SIZE (miktex/miktex-zzdb1-2.9.tar.lzma) = 204473
3
SIZE (miktex/miktex-zzdb1-2.9.tar.lzma) = 204473
4
SHA256 (miktex/miktex-zzdb3-2.9.tar.lzma) = 1e853940b44c10c29c86d1c00ee68fa1c260ca3c376a65524290a8c0619a0d2c
4
SHA256 (miktex/miktex-zzdb3-2.9.tar.lzma) = 1e853940b44c10c29c86d1c00ee68fa1c260ca3c376a65524290a8c0619a0d2c
Lines 13-17 SHA256 (miktex/miktex-misc.tar.lzma) = dc31fe9b7cd17cad3eddc3fc4c86650eb0f5c66d9 Link Here
13
SIZE (miktex/miktex-misc.tar.lzma) = 22719
13
SIZE (miktex/miktex-misc.tar.lzma) = 22719
14
SHA256 (miktex/tetex.tar.lzma) = 0c4d68ebaaf6485c71c6e61e091b859fa2f5b819f6e881678def5bfea79597a4
14
SHA256 (miktex/tetex.tar.lzma) = 0c4d68ebaaf6485c71c6e61e091b859fa2f5b819f6e881678def5bfea79597a4
15
SIZE (miktex/tetex.tar.lzma) = 13084
15
SIZE (miktex/tetex.tar.lzma) = 13084
16
SHA256 (miktex/MiKTeX-miktex-21.2_GH0.tar.gz) = be28b283d7134a1ab658e7861cd0910877bf170a9c9c2c5622601defd7d22656
16
SHA256 (miktex/MiKTeX-miktex-21.8_GH0.tar.gz) = e2755b05cfeb5f7c27cffd9a0befbdbcc1d58863cb2e9a69161c39bb71981656
17
SIZE (miktex/MiKTeX-miktex-21.2_GH0.tar.gz) = 41835415
17
SIZE (miktex/MiKTeX-miktex-21.8_GH0.tar.gz) = 42075522
(-)b/print/miktex/files/patch-CMakeLists.txt (+13 lines)
Added Link Here
1
--- CMakeLists.txt.orig	2021-08-06 15:45:04 UTC
2
+++ CMakeLists.txt
3
@@ -1228,6 +1228,10 @@ if(USE_SYSTEM_ZZIP)
4
   find_package(ZZIP REQUIRED)
5
 endif()
6
 
7
+if(MIKTEX_FREEBSD)
8
+  find_package(Inotify REQUIRED)
9
+endif()
10
+
11
 if(MSVC)
12
   set(HAVE_PRAGMA_ONCE TRUE)
13
 endif()
(-)a/print/miktex/files/patch-Libraries_MiKTeX_Core_Session_init.cpp (-10 lines)
Removed Link Here
1
--- Libraries/MiKTeX/Core/Session/init.cpp.orig	2021-02-20 10:38:14 UTC
2
+++ Libraries/MiKTeX/Core/Session/init.cpp
3
@@ -23,6 +23,7 @@
4
 
5
 #if defined(MIKTEX_UNIX)
6
 #  include <unistd.h>
7
+extern char** environ;
8
 #endif
9
 
10
 #if defined(MIKTEX_MACOS_BUNDLE)
(-)b/print/miktex/files/patch-Libraries_MiKTeX_Core_Utils_unx_unxUtils.cpp (+37 lines)
Added Link Here
1
--- Libraries/MiKTeX/Core/Utils/unx/unxUtils.cpp.orig	2021-08-06 15:45:04 UTC
2
+++ Libraries/MiKTeX/Core/Utils/unx/unxUtils.cpp
3
@@ -26,6 +26,8 @@
4
 #if defined(__APPLE__)
5
 #  include <mach-o/dyld.h>
6
 #endif
7
+#include <sys/types.h>
8
+#include <sys/sysctl.h>
9
 
10
 #if defined(HAVE_SYS_UTSNAME_H)
11
 #  include <sys/utsname.h>
12
@@ -179,6 +181,16 @@ PathName Utils::GetExe()
13
         }
14
     }
15
     return PathName(buf.GetData());
16
+#elif defined(__FreeBSD__)
17
+        int mib[4];
18
+        mib[0] = CTL_KERN;
19
+        mib[1] = KERN_PROC;
20
+        mib[2] = KERN_PROC_PATHNAME;
21
+        mib[3] = -1;
22
+        char buf[1024];
23
+        size_t cb = sizeof(buf);
24
+        sysctl(mib, 4, buf, &cb, NULL, 0);
25
+    return PathName(buf);
26
 #else
27
     return File::ReadSymbolicLink(PathName("/proc/self/exe"));
28
 #endif
29
@@ -186,7 +198,7 @@ PathName Utils::GetExe()
30
 
31
 string Utils::GetExeName()
32
 {
33
-#if defined(__APPLE__)
34
+#if defined(__APPLE__) || defined (__FreeBSD__)
35
     return GetExe().GetFileNameWithoutExtension().ToString();
36
 #else
37
     ifstream cmdline = File::CreateInputStream(PathName("/proc/self/comm"));
(-)b/print/miktex/files/patch-Libraries_MiKTeX_Core_shared_CMakeLists.txt (+10 lines)
Added Link Here
1
--- Libraries/MiKTeX/Core/shared/CMakeLists.txt.orig	2021-08-06 15:45:04 UTC
2
+++ Libraries/MiKTeX/Core/shared/CMakeLists.txt
3
@@ -148,6 +148,7 @@ if(MIKTEX_FREEBSD)
4
     PRIVATE
5
       kvm
6
       procstat
7
+      ${Inotify_LIBRARIES}
8
   )
9
 endif()
10
 
(-)b/print/miktex/files/patch-Libraries_MiKTeX_Core_static_CMakeLists.txt (+10 lines)
Added Link Here
1
--- Libraries/MiKTeX/Core/static/CMakeLists.txt.orig	2021-08-06 15:45:04 UTC
2
+++ Libraries/MiKTeX/Core/static/CMakeLists.txt
3
@@ -114,6 +114,7 @@ if(MIKTEX_FREEBSD)
4
     PUBLIC
5
       kvm
6
       procstat
7
+      ${Inotify_LIBRARIES}
8
   )
9
 endif()
10
 
(-)b/print/miktex/files/patch-cmake_modules_FindInotify.cmake (+64 lines)
Added Link Here
1
--- cmake/modules/FindInotify.cmake.orig	2021-10-13 14:58:23 UTC
2
+++ cmake/modules/FindInotify.cmake
3
@@ -0,0 +1,61 @@
4
+# SPDX-FileCopyrightText: 2016 Tobias C. Berner <tcberner@FreeBSD.org>
5
+# SPDX-FileCopyrightText: 2017 Adriaan de Groot <groot@kde.org>
6
+#
7
+# SPDX-License-Identifier: BSD-2-Clause
8
+
9
+#[=======================================================================[.rst:
10
+FindInotify
11
+--------------
12
+
13
+Try to find inotify on this system. This finds:
14
+ - libinotify on Unix like systems, or
15
+ - the kernel's inotify on Linux systems.
16
+
17
+This will define the following variables:
18
+
19
+``Inotify_FOUND``
20
+   True if inotify is available
21
+``Inotify_LIBRARIES``
22
+   This has to be passed to target_link_libraries()
23
+``Inotify_INCLUDE_DIRS``
24
+   This has to be passed to target_include_directories()
25
+
26
+On Linux, the libraries and include directories are empty,
27
+even though ``Inotify_FOUND`` may be set to TRUE. This is because
28
+no special includes or libraries are needed. On other systems
29
+these may be needed to use inotify.
30
+
31
+Since 5.32.0.
32
+#]=======================================================================]
33
+
34
+find_path(Inotify_INCLUDE_DIRS sys/inotify.h)
35
+
36
+if(Inotify_INCLUDE_DIRS)
37
+# On Linux there is no library to link against, on the BSDs there is.
38
+# On the BSD's, inotify is implemented through a library, libinotify.
39
+    if( CMAKE_SYSTEM_NAME MATCHES "Linux")
40
+        set(Inotify_FOUND TRUE)
41
+        set(Inotify_LIBRARIES "")
42
+        set(Inotify_INCLUDE_DIRS "")
43
+    else()
44
+        find_library(Inotify_LIBRARIES NAMES inotify)
45
+        include(FindPackageHandleStandardArgs)
46
+        find_package_handle_standard_args(Inotify
47
+            FOUND_VAR
48
+                Inotify_FOUND
49
+            REQUIRED_VARS
50
+                Inotify_LIBRARIES
51
+                Inotify_INCLUDE_DIRS
52
+        )
53
+        mark_as_advanced(Inotify_LIBRARIES Inotify_INCLUDE_DIRS)
54
+        include(FeatureSummary)
55
+        set_package_properties(Inotify PROPERTIES
56
+            URL "https://github.com/libinotify-kqueue/"
57
+            DESCRIPTION "inotify API on the *BSD family of operating systems."
58
+        )
59
+    endif()
60
+else()
61
+   set(Inotify_FOUND FALSE)
62
+endif()
63
+
64
+mark_as_advanced(Inotify_LIBRARIES Inotify_INCLUDE_DIRS) 
(-)b/print/miktex/pkg-plist (-11 / +12 lines)
Lines 3-8 bin/findtexmf Link Here
3
bin/gsf2pk
3
bin/gsf2pk
4
bin/initexmf
4
bin/initexmf
5
bin/md5walk
5
bin/md5walk
6
bin/miktex
6
bin/miktex-afm2tfm
7
bin/miktex-afm2tfm
7
bin/miktex-autosp
8
bin/miktex-autosp
8
bin/miktex-axohelp
9
bin/miktex-axohelp
Lines 131-141 lib/libmetapost-core-static.a Link Here
131
lib/libmetapost-extramath-static.a
132
lib/libmetapost-extramath-static.a
132
lib/libmetapost-util-static.a
133
lib/libmetapost-util-static.a
133
lib/libmiktex-app.so
134
lib/libmiktex-app.so
134
lib/libmiktex-app.so.4.1.0
135
lib/libmiktex-app.so.4.2.0
135
lib/libmiktex-app.so.6
136
lib/libmiktex-app.so.6
136
lib/libmiktex-core.so
137
lib/libmiktex-core.so
137
lib/libmiktex-core.so.23
138
lib/libmiktex-core.so.26
138
lib/libmiktex-core.so.4.4.1
139
lib/libmiktex-core.so.4.9.0
139
lib/libmiktex-extractor.so
140
lib/libmiktex-extractor.so
140
lib/libmiktex-extractor.so.2
141
lib/libmiktex-extractor.so.2
141
lib/libmiktex-extractor.so.4.0.0
142
lib/libmiktex-extractor.so.4.0.0
Lines 143-163 lib/libmiktex-fmt.so Link Here
143
lib/libmiktex-fmt.so.2
144
lib/libmiktex-fmt.so.2
144
lib/libmiktex-fmt.so.4.0.0
145
lib/libmiktex-fmt.so.4.0.0
145
lib/libmiktex-kpathsea.so
146
lib/libmiktex-kpathsea.so
146
lib/libmiktex-kpathsea.so.4.1.0
147
lib/libmiktex-kpathsea.so.4.2.0
147
lib/libmiktex-kpathsea.so.5
148
lib/libmiktex-kpathsea.so.5
148
lib/libmiktex-loc.so
149
lib/libmiktex-loc.so
149
lib/libmiktex-loc.so.1
150
lib/libmiktex-loc.so.1
150
lib/libmiktex-loc.so.1.0.0
151
lib/libmiktex-loc.so.1.0.0
151
lib/libmiktex-lua53.so
152
lib/libmiktex-lua53.so
152
lib/libmiktex-lua53.so.1
153
lib/libmiktex-lua53.so.1
153
lib/libmiktex-lua53.so.4.1.0
154
lib/libmiktex-lua53.so.4.1.1
154
lib/libmiktex-md5.so
155
lib/libmiktex-md5.so
155
lib/libmiktex-md5.so.1
156
lib/libmiktex-md5.so.1
156
lib/libmiktex-md5.so.1.24.156
157
lib/libmiktex-md5.so.1.24.156
157
lib/libmiktex-metapost.so
158
lib/libmiktex-metapost.so
158
lib/libmiktex-packagemanager.so
159
lib/libmiktex-packagemanager.so
159
lib/libmiktex-packagemanager.so.10
160
lib/libmiktex-packagemanager.so.10
160
lib/libmiktex-packagemanager.so.4.2.1
161
lib/libmiktex-packagemanager.so.4.5.0
161
%%UIQT%%lib/libmiktex-poppler-Qt.so
162
%%UIQT%%lib/libmiktex-poppler-Qt.so
162
%%UIQT%%lib/libmiktex-poppler-Qt.so.3
163
%%UIQT%%lib/libmiktex-poppler-Qt.so.3
163
%%UIQT%%lib/libmiktex-poppler-Qt.so.4.0.0
164
%%UIQT%%lib/libmiktex-poppler-Qt.so.4.0.0
Lines 168-193 lib/libmiktex-res.so Link Here
168
lib/libmiktex-res.so.1
169
lib/libmiktex-res.so.1
169
lib/libmiktex-res.so.1.0.0
170
lib/libmiktex-res.so.1.0.0
170
lib/libmiktex-setup.so
171
lib/libmiktex-setup.so
171
lib/libmiktex-setup.so.4.2.0
172
lib/libmiktex-setup.so.4.3.0
172
lib/libmiktex-setup.so.6
173
lib/libmiktex-setup.so.6
173
lib/libmiktex-teckit.so
174
lib/libmiktex-teckit.so
174
lib/libmiktex-teckit.so.2
175
lib/libmiktex-teckit.so.2
175
lib/libmiktex-teckit.so.4.0.0
176
lib/libmiktex-teckit.so.4.0.0
176
lib/libmiktex-texmf.so
177
lib/libmiktex-texmf.so
177
lib/libmiktex-texmf.so.4.3.0
178
lib/libmiktex-texmf.so.4.5.1
178
lib/libmiktex-texmf.so.6
179
lib/libmiktex-texmf.so.6
179
lib/libmiktex-trace.so
180
lib/libmiktex-trace.so
180
lib/libmiktex-trace.so.4.0.0
181
lib/libmiktex-trace.so.4.0.0
181
lib/libmiktex-trace.so.5
182
lib/libmiktex-trace.so.5
182
%%UIQT%%lib/libmiktex-ui-Qt.so
183
%%UIQT%%lib/libmiktex-ui-Qt.so
183
%%UIQT%%lib/libmiktex-ui-Qt.so.2
184
%%UIQT%%lib/libmiktex-ui-Qt.so.2
184
%%UIQT%%lib/libmiktex-ui-Qt.so.4.1.0
185
%%UIQT%%lib/libmiktex-ui-Qt.so.4.2.0
185
lib/libmiktex-util.so
186
lib/libmiktex-util.so
186
lib/libmiktex-util.so.5
187
lib/libmiktex-util.so.4.1.0
187
lib/libmiktex-util.so.4.1.0
188
lib/libmiktex-util.so.5
188
lib/libmiktex-web2c.so
189
lib/libmiktex-web2c.so
189
lib/libmiktex-web2c.so.2
190
lib/libmiktex-web2c.so.2
190
lib/libmiktex-web2c.so.4.0.0
191
lib/libmiktex-web2c.so.4.1.0
191
libexec/miktex/runexe
192
libexec/miktex/runexe
192
libexec/miktex/runjava
193
libexec/miktex/runjava
193
libexec/miktex/runperl
194
libexec/miktex/runperl

Return to bug 259139