<pre style='margin:0'>
Ryan Schmidt (ryandesign) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/cd64dd0cdd9042a38afd1bb82127db32e04eb666">https://github.com/macports/macports-ports/commit/cd64dd0cdd9042a38afd1bb82127db32e04eb666</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 cd64dd0 freeimage: Update to 3.18.0
</span>cd64dd0 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit cd64dd0cdd9042a38afd1bb82127db32e04eb666
</span>Author: Ryan Schmidt <ryandesign@macports.org>
AuthorDate: Tue Nov 6 11:22:24 2018 -0600
<span style='display:block; white-space:pre;color:#404040;'> freeimage: Update to 3.18.0
</span>---
graphics/freeimage/Portfile | 43 +++++++++++++++++++++++--------------------
1 file changed, 23 insertions(+), 20 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/freeimage/Portfile b/graphics/freeimage/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index e8a9f7d..5c5f40e 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/freeimage/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/freeimage/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -3,8 +3,11 @@
</span> PortSystem 1.0
name freeimage
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 3.17.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 3.18.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 b791715fccf49355a3cb27b6250d8ed809c2454e \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 f41379682f9ada94ea7b34fe86bf9ee00935a3147be41b6569c9605a53e438fd \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 7415716
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> set major [lindex [split ${version} .] 0]
categories graphics
platforms macosx
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -26,32 +29,32 @@ distname FreeImage[strsed ${version} {g/\.//}]
</span> use_zip yes
worksrcdir FreeImage
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 c4e87846098327ee346c49ae81b6036f6d9ab36d \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 fbfc65e39b3d4e2cb108c4ffa8c41fd02c07d4d436c594fff8dab1a6d5297f89
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> post-patch {
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ set makefiles "${worksrcpath}/Makefile.fip ${worksrcpath}/Makefile.gnu"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> # Libraries extension is ".dylib" on Darwin, not ".so"
<span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace {s/\.so/.dylib/} ${worksrcpath}/Makefile.gnu \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${worksrcpath}/Makefile.fip
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace {s/\.so/.dylib/} {*}${makefiles}
</span>
# A dot separates the library name from its version on Darwin
<span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace /^SHAREDLIB/s/-/./ ${worksrcpath}/Makefile.gnu \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${worksrcpath}/Makefile.fip
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace /^SHAREDLIB/s/-/./ {*}${makefiles}
</span>
# Use libtool(1) instead of ar(1)
<span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace {s/\$(AR) r/libtool -o/} ${worksrcpath}/Makefile.gnu \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${worksrcpath}/Makefile.fip
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace {s/\$(AR) r/libtool -o/} {*}${makefiles}
</span>
# Do not force installation as root
<span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace {s/-o root -g root//} ${worksrcpath}/Makefile.gnu \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${worksrcpath}/Makefile.fip
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace {s/-o root -g root//} {*}${makefiles}
</span>
# Darwin requires different arguments to build dynamic libraries
<span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|-Wl,-soname,\$(VERLIBNAME)|-dynamiclib -install_name \$(PREFIX)/lib/\$(VERLIBNAME) -compatibility_version \$(VER_MAJOR) -current_version \$(VER_MAJOR).\$(VER_MINOR)|g" ${worksrcpath}/Makefile.gnu \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${worksrcpath}/Makefile.fip
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace {s|-shared -Wl,-soname,$(VERLIBNAME)|-dynamiclib -install_name $(PREFIX)/lib/$(VERLIBNAME) -compatibility_version $(VER_MAJOR) -current_version $(VER_MAJOR).$(VER_MINOR)|} {*}${makefiles}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Use CXX not CC to link the library, since it is made up of C++ code.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace {/\$(LIBRARIES)/s/$(CC)/$(CXX)/} {*}${makefiles}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Do not hardcode a C++ library name. We set this later in CXX.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace /^LIBRARIES/s/-lstdc++// {*}${makefiles}
</span>
# Darwin does not have a command ldconfig
<span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|ldconfig||g" ${worksrcpath}/Makefile.gnu
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace s/ldconfig// ${worksrcpath}/Makefile.gnu
</span> # FreeImagePlus doesn't use ldconfig
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -74,7 +77,7 @@ if {[string match *clang* ${configure.cxx}]} {
</span> }
if {${configure.sdkroot} ne ""} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.ldflags-append "-Wl,-syslibroot,${configure.sdkroot}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.ldflags-append -Wl,-syslibroot,${configure.sdkroot}
</span> }
foreach flags {cflags cxxflags} compiler {cc cxx} {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -85,11 +88,11 @@ foreach flags {cflags cxxflags} compiler {cc cxx} {
</span> }
if {${configure.march} ne "" } {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.${flags}-append "-march=${configure.march}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.${flags}-append -march=${configure.march}
</span> }
if {${configure.mtune} ne "" } {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.${flags}-append "-mtune=${configure.mtune}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.${flags}-append -mtune=${configure.mtune}
</span> }
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -130,7 +133,7 @@ post-destroot {
</span> }
test.run yes
<span style='display:block; white-space:pre;background:#ffe0e0;'>-test.cmd "${build.cmd} && ./testAPI"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+test.cmd ${build.cmd} && ./testAPI
</span> test.dir ${worksrcpath}/TestAPI
test.target
</pre><pre style='margin:0'>
</pre>