FreeBSD Bugzilla – Attachment 228668 Details for
Bug 259139
print/miktex: Update to 21.8
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
Remember
[x]
|
Forgot Password
Login:
[x]
[patch]
v0
miktex.diff (text/plain), 7.53 KB, created by
Mikael Urankar
on 2021-10-13 15:02:22 UTC
(
hide
)
Description:
v0
Filename:
MIME Type:
Creator:
Mikael Urankar
Created:
2021-10-13 15:02:22 UTC
Size:
7.53 KB
patch
obsolete
>diff --git a/print/miktex/Makefile b/print/miktex/Makefile >index dc03be59057c..eec83fdcf76b 100644 >--- a/print/miktex/Makefile >+++ b/print/miktex/Makefile >@@ -1,6 +1,5 @@ > PORTNAME= miktex >-DISTVERSION= 21.2 >-PORTREVISION= 2 >+DISTVERSION= 21.8 > CATEGORIES= print > MASTER_SITES= LOCAL/arrowd/miktex:bootstrap > DISTFILES= miktex-zzdb1-2.9.tar.lzma:bootstrap \ >diff --git a/print/miktex/distinfo b/print/miktex/distinfo >index 3d94b533d800..99bcda3dafab 100644 >--- a/print/miktex/distinfo >+++ b/print/miktex/distinfo >@@ -1,4 +1,4 @@ >-TIMESTAMP = 1614101307 >+TIMESTAMP = 1634128834 > SHA256 (miktex/miktex-zzdb1-2.9.tar.lzma) = 3cd30066ddf921a7843e51360b30ee8953f9226adc179339c5ed4b7a7b188753 > SIZE (miktex/miktex-zzdb1-2.9.tar.lzma) = 204473 > SHA256 (miktex/miktex-zzdb3-2.9.tar.lzma) = 1e853940b44c10c29c86d1c00ee68fa1c260ca3c376a65524290a8c0619a0d2c >@@ -13,5 +13,5 @@ SHA256 (miktex/miktex-misc.tar.lzma) = dc31fe9b7cd17cad3eddc3fc4c86650eb0f5c66d9 > SIZE (miktex/miktex-misc.tar.lzma) = 22719 > SHA256 (miktex/tetex.tar.lzma) = 0c4d68ebaaf6485c71c6e61e091b859fa2f5b819f6e881678def5bfea79597a4 > SIZE (miktex/tetex.tar.lzma) = 13084 >-SHA256 (miktex/MiKTeX-miktex-21.2_GH0.tar.gz) = be28b283d7134a1ab658e7861cd0910877bf170a9c9c2c5622601defd7d22656 >-SIZE (miktex/MiKTeX-miktex-21.2_GH0.tar.gz) = 41835415 >+SHA256 (miktex/MiKTeX-miktex-21.8_GH0.tar.gz) = e2755b05cfeb5f7c27cffd9a0befbdbcc1d58863cb2e9a69161c39bb71981656 >+SIZE (miktex/MiKTeX-miktex-21.8_GH0.tar.gz) = 42075522 >diff --git a/print/miktex/files/patch-CMakeLists.txt b/print/miktex/files/patch-CMakeLists.txt >new file mode 100644 >index 000000000000..19adf0979a84 >--- /dev/null >+++ b/print/miktex/files/patch-CMakeLists.txt >@@ -0,0 +1,13 @@ >+--- 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() >diff --git a/print/miktex/files/patch-Libraries_MiKTeX_Core_Session_init.cpp b/print/miktex/files/patch-Libraries_MiKTeX_Core_Session_init.cpp >deleted file mode 100644 >index f7376ac32c55..000000000000 >--- a/print/miktex/files/patch-Libraries_MiKTeX_Core_Session_init.cpp >+++ /dev/null >@@ -1,10 +0,0 @@ >---- Libraries/MiKTeX/Core/Session/init.cpp.orig 2021-02-20 10:38:14 UTC >-+++ Libraries/MiKTeX/Core/Session/init.cpp >-@@ -23,6 +23,7 @@ >- >- #if defined(MIKTEX_UNIX) >- # include <unistd.h> >-+extern char** environ; >- #endif >- >- #if defined(MIKTEX_MACOS_BUNDLE) >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 >new file mode 100644 >index 000000000000..c4bc2a957322 >--- /dev/null >+++ b/print/miktex/files/patch-Libraries_MiKTeX_Core_Utils_unx_unxUtils.cpp >@@ -0,0 +1,37 @@ >+--- 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")); >diff --git a/print/miktex/files/patch-Libraries_MiKTeX_Core_shared_CMakeLists.txt b/print/miktex/files/patch-Libraries_MiKTeX_Core_shared_CMakeLists.txt >new file mode 100644 >index 000000000000..0a696b799a32 >--- /dev/null >+++ b/print/miktex/files/patch-Libraries_MiKTeX_Core_shared_CMakeLists.txt >@@ -0,0 +1,10 @@ >+--- Libraries/MiKTeX/Core/shared/CMakeLists.txt.orig 2021-08-06 15:45:04 UTC >++++ Libraries/MiKTeX/Core/shared/CMakeLists.txt >+@@ -148,6 +148,7 @@ if(MIKTEX_FREEBSD) >+ PRIVATE >+ kvm >+ procstat >++ ${Inotify_LIBRARIES} >+ ) >+ endif() >+ >diff --git a/print/miktex/files/patch-Libraries_MiKTeX_Core_static_CMakeLists.txt b/print/miktex/files/patch-Libraries_MiKTeX_Core_static_CMakeLists.txt >new file mode 100644 >index 000000000000..128b6594d3cd >--- /dev/null >+++ b/print/miktex/files/patch-Libraries_MiKTeX_Core_static_CMakeLists.txt >@@ -0,0 +1,10 @@ >+--- Libraries/MiKTeX/Core/static/CMakeLists.txt.orig 2021-08-06 15:45:04 UTC >++++ Libraries/MiKTeX/Core/static/CMakeLists.txt >+@@ -114,6 +114,7 @@ if(MIKTEX_FREEBSD) >+ PUBLIC >+ kvm >+ procstat >++ ${Inotify_LIBRARIES} >+ ) >+ endif() >+ >diff --git a/print/miktex/files/patch-cmake_modules_FindInotify.cmake b/print/miktex/files/patch-cmake_modules_FindInotify.cmake >new file mode 100644 >index 000000000000..5e97fe64231b >--- /dev/null >+++ b/print/miktex/files/patch-cmake_modules_FindInotify.cmake >@@ -0,0 +1,64 @@ >+--- 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)
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 259139
:
228668
|
228876