Attachment #228668 for bug #259139

Lines 1-6 Link Here

(-)b/print/miktex/Makefile (-2 / +1 lines)
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 1-4 Link Here

(-)b/print/miktex/distinfo (-3 / +3 lines)
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




--- CMakeLists.txt.orig	2021-08-06 15:45:04 UTC
+++ CMakeLists.txt
@@ -1228,6 +1228,10 @@ if(USE_SYSTEM_ZZIP)
   find_package(ZZIP REQUIRED)
 endif()
 
+if(MIKTEX_FREEBSD)
+  find_package(Inotify REQUIRED)
+endif()
+
 if(MSVC)
   set(HAVE_PRAGMA_ONCE TRUE)
 endif()

Removed Link Here

(-)a/print/miktex/files/patch-Libraries_MiKTeX_Core_Session_init.cpp (-10 lines)
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)




--- Libraries/MiKTeX/Core/Utils/unx/unxUtils.cpp.orig	2021-08-06 15:45:04 UTC
+++ Libraries/MiKTeX/Core/Utils/unx/unxUtils.cpp
@@ -26,6 +26,8 @@
 #if defined(__APPLE__)
 #  include <mach-o/dyld.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()
         }
     }
     return PathName(buf.GetData());
+#elif defined(__FreeBSD__)
+        int mib[4];
+        mib[0] = CTL_KERN;
+        mib[1] = KERN_PROC;
+        mib[2] = KERN_PROC_PATHNAME;
+        mib[3] = -1;
+        char buf[1024];
+        size_t cb = sizeof(buf);
+        sysctl(mib, 4, buf, &cb, NULL, 0);
+    return PathName(buf);
 #else
     return File::ReadSymbolicLink(PathName("/proc/self/exe"));
 #endif
@@ -186,7 +198,7 @@ PathName Utils::GetExe()
 
 string Utils::GetExeName()
 {
-#if defined(__APPLE__)
+#if defined(__APPLE__) || defined (__FreeBSD__)
     return GetExe().GetFileNameWithoutExtension().ToString();
 #else
     ifstream cmdline = File::CreateInputStream(PathName("/proc/self/comm"));

Added Link Here

(-)b/print/miktex/files/patch-Libraries_MiKTeX_Core_shared_CMakeLists.txt (+10 lines)
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

Added Link Here

(-)b/print/miktex/files/patch-Libraries_MiKTeX_Core_static_CMakeLists.txt (+10 lines)
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




--- cmake/modules/FindInotify.cmake.orig	2021-10-13 14:58:23 UTC
+++ cmake/modules/FindInotify.cmake
@@ -0,0 +1,61 @@
+# SPDX-FileCopyrightText: 2016 Tobias C. Berner <tcberner@FreeBSD.org>
+# SPDX-FileCopyrightText: 2017 Adriaan de Groot <groot@kde.org>
+#
+# SPDX-License-Identifier: BSD-2-Clause
+
+#[=======================================================================[.rst:
+FindInotify
+--------------
+
+Try to find inotify on this system. This finds:
+ - libinotify on Unix like systems, or
+ - the kernel's inotify on Linux systems.
+
+This will define the following variables:
+
+``Inotify_FOUND``
+   True if inotify is available
+``Inotify_LIBRARIES``
+   This has to be passed to target_link_libraries()
+``Inotify_INCLUDE_DIRS``
+   This has to be passed to target_include_directories()
+
+On Linux, the libraries and include directories are empty,
+even though ``Inotify_FOUND`` may be set to TRUE. This is because
+no special includes or libraries are needed. On other systems
+these may be needed to use inotify.
+
+Since 5.32.0.
+#]=======================================================================]
+
+find_path(Inotify_INCLUDE_DIRS sys/inotify.h)
+
+if(Inotify_INCLUDE_DIRS)
+# On Linux there is no library to link against, on the BSDs there is.
+# On the BSD's, inotify is implemented through a library, libinotify.
+    if( CMAKE_SYSTEM_NAME MATCHES "Linux")
+        set(Inotify_FOUND TRUE)
+        set(Inotify_LIBRARIES "")
+        set(Inotify_INCLUDE_DIRS "")
+    else()
+        find_library(Inotify_LIBRARIES NAMES inotify)
+        include(FindPackageHandleStandardArgs)
+        find_package_handle_standard_args(Inotify
+            FOUND_VAR
+                Inotify_FOUND
+            REQUIRED_VARS
+                Inotify_LIBRARIES
+                Inotify_INCLUDE_DIRS
+        )
+        mark_as_advanced(Inotify_LIBRARIES Inotify_INCLUDE_DIRS)
+        include(FeatureSummary)
+        set_package_properties(Inotify PROPERTIES
+            URL "https://github.com/libinotify-kqueue/"
+            DESCRIPTION "inotify API on the *BSD family of operating systems."
+        )
+    endif()
+else()
+   set(Inotify_FOUND FALSE)
+endif()
+
+mark_as_advanced(Inotify_LIBRARIES Inotify_INCLUDE_DIRS) 

Return to bug 259139

Added Link Here

(-)b/print/miktex/files/patch-CMakeLists.txt (+13 lines)
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()

Added Link Here

(-)b/print/miktex/files/patch-Libraries_MiKTeX_Core_Utils_unx_unxUtils.cpp (+37 lines)
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"));

Added Link Here

(-)b/print/miktex/files/patch-cmake_modules_FindInotify.cmake (+64 lines)
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)