<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/0b5f3f7d1131b7384ef805b762709517ab01d303">https://github.com/macports/macports-ports/commit/0b5f3f7d1131b7384ef805b762709517ab01d303</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 0b5f3f7 scribus: update to version 1.4.7, dependencies
</span>0b5f3f7 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 0b5f3f7d1131b7384ef805b762709517ab01d303
</span>Author: David B. Evans <devans@macports.org>
AuthorDate: Thu Aug 30 10:34:27 2018 -0700
<span style='display:block; white-space:pre;color:#404040;'> scribus: update to version 1.4.7, dependencies
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> * update to cmake 1.1 Portgroup
</span><span style='display:block; white-space:pre;color:#404040;'> * patch configuration to add macOS 10.11 thru 10.13
</span><span style='display:block; white-space:pre;color:#404040;'> to list of known systems
</span><span style='display:block; white-space:pre;color:#404040;'> * update compiler blacklisting to include compilers
</span><span style='display:block; white-space:pre;color:#404040;'> with known problems on older systems
</span>---
print/scribus/Portfile | 22 ++++++++-------
print/scribus/files/patch-CMakeLists.txt.diff | 40 +++++++++++++++++++++++++++
2 files changed, 52 insertions(+), 10 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/print/scribus/Portfile b/print/scribus/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 2369593..14bbe21 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/print/scribus/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/print/scribus/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,13 +1,13 @@
</span> # -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
PortSystem 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-PortGroup cmake 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup compiler_blacklist_versions 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup cmake 1.1
</span> PortGroup qt4 1.0
name scribus
epoch 1
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 1.4.6
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 1.4.7
</span> categories print
license GPL-2+
platforms darwin
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -24,19 +24,21 @@ homepage http://www.scribus.net/
</span> master_sites sourceforge:project/scribus/scribus/${version}
use_xz yes
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 71e72699e8f85624598aa887458fcc21f1a065fb \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 21e336500d9edc9c90ccf73087e5ef3df59ec3e4a3cbfec15367bcd8d078a19a
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 e748a7d180b53f1716dfa0e876b61fdab5fecbff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 42d335b4a59c26c8ae1e3f601676baa3c42b035b8cde326d195f7a30078e5fec \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 72763748
</span>
# Builds forever with llvm-gcc-4.2. https://trac.macports.org/ticket/30835
<span style='display:block; white-space:pre;background:#ffe0e0;'>-compiler.blacklist-append llvm-gcc-4.2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# blacklist compilers with known problems on older systems
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+compiler.blacklist-append *gcc-3.* *gcc-4.* {clang < 300}
</span>
depends_build-append \
path:bin/perl:perl5
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_lib-append port:aspell \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:aspell-dict-en \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_lib-append port:hunspell \
</span> port:fontconfig \
port:ghostscript \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:hyphen \
</span> path:lib/pkgconfig/cairo.pc:cairo \
port:boost \
port:expat \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -51,9 +53,9 @@ depends_lib-append port:aspell \
</span> port:tiff \
port:zlib
<span style='display:block; white-space:pre;background:#ffe0e0;'>-set PyFRM ${frameworks_dir}/Python.framework/Versions
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles patch-CMakeLists.txt.diff
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-cmake.out_of_source yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set PyFRM ${frameworks_dir}/Python.framework/Versions
</span>
configure.args-append \
-DCMAKE_INSTALL_PREFIX="${applications_dir}/[string toupper ${name} 0].app" \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/print/scribus/files/patch-CMakeLists.txt.diff b/print/scribus/files/patch-CMakeLists.txt.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..45453a1
</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/files/patch-CMakeLists.txt.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,40 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- CMakeLists.txt.orig 2018-03-06 14:53:24.000000000 -0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ CMakeLists.txt 2018-09-02 10:13:20.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -123,6 +123,18 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</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 "17")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ MESSAGE(STATUS "Found OSX 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;'>++ ENDIF (_apple_ver EQUAL "17")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ IF (_apple_ver EQUAL "16")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ MESSAGE(STATUS "Found OSX Sierra Target: Apple, 64 bit, X86")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ SET(APPLE_10_12_X 1 CACHE TYPE BOOL)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ENDIF (_apple_ver EQUAL "16")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ IF (_apple_ver EQUAL "15")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ MESSAGE(STATUS "Found OSX El Capitan Target: Apple, 64 bit, X86")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ SET(APPLE_10_11_X 1 CACHE TYPE BOOL)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ENDIF (_apple_ver EQUAL "15")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ IF (_apple_ver EQUAL "14")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ MESSAGE(STATUS "Found OSX Yosemite Target: Apple, 64 bit, X86")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ SET(APPLE_10_10_X 1 CACHE TYPE BOOL)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -496,15 +508,15 @@
</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 (WANT_OSX_SDK)
</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)
</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;'>+ 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><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ELSE(APPLE_10_6_X OR APPLE_10_7_X OR APPLE_10_8_X OR APPLE_10_9_X OR APPLE_10_10_X)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ELSE(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;'>+ MESSAGE("Setting i386 Architecture for OSX Build/Bundle")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ SET(CMAKE_OSX_ARCHITECTURES "i386" )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ SET(CMAKE_TRY_COMPILE_OSX_ARCHITECTURES "i386" )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ENDIF(APPLE_10_6_X OR APPLE_10_7_X OR APPLE_10_8_X OR APPLE_10_9_X OR APPLE_10_10_X)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ENDIF(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;'>+ ENDIF(ARCH_PPC OR ARCH_PPC_64)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ENDIF(WANT_UNIVERSAL_BUNDLE)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ MESSAGE(STATUS "${CMAKE_OSX_ARCHITECTURES} ${CMAKE_OSX_SYSROOT}")
</span></pre><pre style='margin:0'>
</pre>