<pre style='margin:0'>
David B. Evans (dbevans) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/f28e7a53900cb02c2350400ef06cac6a39ecb3b2">https://github.com/macports/macports-ports/commit/f28e7a53900cb02c2350400ef06cac6a39ecb3b2</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new f28e7a5 scribus-devel: patch to properly detect Mojave
</span>f28e7a5 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit f28e7a53900cb02c2350400ef06cac6a39ecb3b2
</span>Author: Arjan van der Velde <vandervelde.ag@gmail.com>
AuthorDate: Fri Nov 16 09:03:30 2018 -0500
<span style='display:block; white-space:pre;color:#404040;'> scribus-devel: patch to properly detect Mojave
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> This patches CMakeLists.txt in order to make it detect
</span><span style='display:block; white-space:pre;color:#404040;'> Mojave. This fix should no longer be necessary once
</span><span style='display:block; white-space:pre;color:#404040;'> scribus 1.5.5 development candidate is released.
</span>---
print/scribus-devel/Portfile | 2 +-
print/scribus-devel/files/CMakeLists.txt.patch | 39 ++++++++++++++++++++++++++
2 files changed, 40 insertions(+), 1 deletion(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/print/scribus-devel/Portfile b/print/scribus-devel/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 8d06b8c..1d5138e 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/print/scribus-devel/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/print/scribus-devel/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -87,7 +87,7 @@ variant bitmap description {Input filters for most GraphicsMagick bitmap formats
</span>
build.env HOME=${worksrcpath}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles poppler.patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles poppler.patch CMakeLists.txt.patch
</span>
# These can be uncommented to livecheck for the devel version
livecheck.url https://www.scribus.net/downloads/unstable-branch/
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/print/scribus-devel/files/CMakeLists.txt.patch b/print/scribus-devel/files/CMakeLists.txt.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..c18a634
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/print/scribus-devel/files/CMakeLists.txt.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,39 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- CMakeLists.txt.orig 2018-04-25 14:42:32.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ CMakeLists.txt 2018-11-16 07:58:11.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -164,6 +164,10 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ## Do our Apple OSX version setup
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (APPLE AND CMAKE_SIZEOF_VOID_P EQUAL 8 AND (ARCH_X86 EQUAL 1 OR ARCH_X86_64 EQUAL 1))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ string(REGEX REPLACE ".*-darwin([0-9]+).*" "\\1" _apple_ver "${MACHINE}")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (_apple_ver EQUAL "18")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ message(STATUS "Found macOS Mojave Target: Apple, 64 bit, X86")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ set(APPLE_10_14_X 1 CACHE TYPE BOOL)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ endif()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (_apple_ver EQUAL "17")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ message(STATUS "Found macOS High Sierra Target: Apple, 64 bit, X86")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set(APPLE_10_13_X 1 CACHE TYPE BOOL)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -452,6 +456,16 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #Based on our build type, setup our build options
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if(APPLE)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if(APPLE_10_14_X)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ set(OSXMINVER "10.14" CACHE TYPE STRING)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (WANT_OSX_SDK)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if(EXISTS("/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.14.sdk"))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ set(CMAKE_OSX_SYSROOT "/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.14.sdk")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ elseif(EXISTS("/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.13.sdk"))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ set(CMAKE_OSX_SYSROOT "/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.13.sdk")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ endif()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ endif()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ endif()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if(APPLE_10_13_X)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set(OSXMINVER "10.13" CACHE TYPE STRING)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (WANT_OSX_SDK)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -542,7 +556,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (WANT_OSX_SDK)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set(CMAKE_OSX_DEPLOYMENT_TARGET "${OSXMINVER}")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if(APPLE_10_6_X OR APPLE_10_7_X OR APPLE_10_8_X OR APPLE_10_9_X OR APPLE_10_10_X OR APPLE_10_11_X OR APPLE_10_12_X OR APPLE_10_13_X)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if(APPLE_10_6_X OR APPLE_10_7_X OR APPLE_10_8_X OR APPLE_10_9_X OR APPLE_10_10_X OR APPLE_10_11_X OR APPLE_10_12_X OR APPLE_10_13_X OR APPLE_10_14_X)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ message("Setting x86_64 Architecture for OSX Build/Bundle")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set(CMAKE_OSX_ARCHITECTURES "x86_64" )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set(CMAKE_TRY_COMPILE_OSX_ARCHITECTURES "x86_64" )
</span></pre><pre style='margin:0'>
</pre>