<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[119187] trunk/dports/graphics/freeimage/Portfile</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="https://trac.macports.org/changeset/119187">119187</a></dd>
<dt>Author</dt> <dd>mcalhoun@macports.org</dd>
<dt>Date</dt> <dd>2014-04-19 06:57:03 -0700 (Sat, 19 Apr 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>*) FreeImage uses two different Makefiles
Use portbuild::build_main and portdestroot::destroot_main for both of them.
This allows the use of environmental variables like MACOSX_DEPLOYMENT_TARGET.
*) Implement options from configure in the build phase.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportsgraphicsfreeimagePortfile">trunk/dports/graphics/freeimage/Portfile</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportsgraphicsfreeimagePortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/graphics/freeimage/Portfile (119186 => 119187)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/graphics/freeimage/Portfile 2014-04-19 11:52:52 UTC (rev 119186)
+++ trunk/dports/graphics/freeimage/Portfile 2014-04-19 13:57:03 UTC (rev 119187)
</span><span class="lines">@@ -5,7 +5,7 @@
</span><span class="cx">
</span><span class="cx"> name freeimage
</span><span class="cx"> version 3.16.0
</span><del>-revision 0
</del><ins>+revision 1
</ins><span class="cx"> set major [lindex [split ${version} .] 0]
</span><span class="cx"> categories graphics
</span><span class="cx"> platforms macosx
</span><span class="lines">@@ -30,9 +30,6 @@
</span><span class="cx"> checksums rmd160 f0dcfb1514a288bbb2bc182130469b91d575e6cd \
</span><span class="cx"> sha256 03af32dd60140d07515ddfe7b4f467baa3b888a72ea78828811aded7adb42f60
</span><span class="cx">
</span><del>-set libfreeimage libfreeimage.${major}.dylib
-set libfreeimageplus libfreeimageplus.${major}.dylib
-
</del><span class="cx"> patchfiles patch-Makefile.fip.diff
</span><span class="cx">
</span><span class="cx"> post-patch {
</span><span class="lines">@@ -63,41 +60,75 @@
</span><span class="cx">
</span><span class="cx"> use_configure no
</span><span class="cx">
</span><ins>+# In the future, implement in the build phase?
+#configure.pipe no
+#configure.ccache no
+#configure.distcc no
+
+# FreeImage uses -O3
+configure.cflags-delete -Os
+configure.cxxflags-delete -Os
+
</ins><span class="cx"> variant universal {}
</span><span class="cx">
</span><del>-build.args -f Makefile.gnu \
- PREFIX=${prefix} \
- VERLIBNAME=${libfreeimage} \
- CC="${configure.cc} ${configure.cflags} [get_canonical_archflags cc]" \
- CXX="${configure.cxx} ${configure.cxxflags} [get_canonical_archflags cxx]" \
- LDFLAGS="${configure.ldflags}"
</del><ins>+# Reimplement parts of portconfigure.tcl
+if {[info exists configure.cxx_stdlib] &&
+ ${configure.cxx_stdlib} ne {} &&
+ [string match *clang* ${configure.cxx}]
+} then {
+ configure.cxxflags-append -stdlib=${configure.cxx_stdlib}
+ configure.ldflags-append -stdlib=${configure.cxx_stdlib}
+}
</ins><span class="cx">
</span><del>-post-build {
- # build FreeImagePlus
- system -W ${worksrcpath} "${build.cmd} -f Makefile.fip \
- PREFIX=${prefix} \
- VERLIBNAME=${libfreeimageplus} \
- CC='${configure.cc} ${configure.cflags} [get_canonical_archflags cc]' \
- CXX='${configure.cxx} ${configure.cxxflags} [get_canonical_archflags cxx]' \
- LDFLAGS='${configure.ldflags}'"
</del><ins>+if {${configure.sdkroot} ne ""} {
+ configure.ldflags-append "-Wl,-syslibroot,${configure.sdkroot}"
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-destroot.args -f Makefile.gnu \
- INCDIR=${destroot}${prefix}/include \
- INSTALLDIR=${destroot}${prefix}/lib \
- PREFIX=${prefix} \
- VERLIBNAME=${libfreeimage}
</del><ins>+foreach flags {cflags cxxflags} compiler {cc cxx} {
+ eval configure.${flags}-append [get_canonical_archflags ${compiler}]
+
+ if {${configure.sdkroot} ne ""} {
+ configure.${flags}-append -isysroot${configure.sdkroot}
+ }
+
+ if {${configure.march} ne "" } {
+ configure.${flags}-append "-march=${configure.march}"
+ }
+
+ if {${configure.mtune} ne "" } {
+ configure.${flags}-append "-mtune=${configure.mtune}"
+ }
+}
</ins><span class="cx">
</span><ins>+# running build_main and destroot_main makes use of environmental variables like MACOSX_DEPLOYMENT_TARGET
+
+build {
+ foreach makefile {Makefile.gnu Makefile.fip} libname {libfreeimage libfreeimageplus} {
+ # Makefile overrides CFLAGS and CXXFLAGS, so append options to CC and CXX
+ build.args -f ${makefile} \
+ PREFIX=${prefix} \
+ VERLIBNAME=${libname}.${major}.dylib \
+ CC="${configure.cc} ${configure.cflags}" \
+ CXX="${configure.cxx} ${configure.cxxflags}" \
+ LDFLAGS="${configure.ldflags}"
+
+ portbuild::build_main
+ }
+}
+
+destroot {
+ foreach makefile {Makefile.gnu Makefile.fip} libname {libfreeimage libfreeimageplus} {
+ destroot.args -f ${makefile} \
+ PREFIX="${prefix}" \
+ VERLIBNAME=${libname}.${major}.dylib \
+ INCDIR="${destroot}${prefix}/include" \
+ INSTALLDIR="${destroot}${prefix}/lib"
+
+ portdestroot::destroot_main
+ }
+}
+
</ins><span class="cx"> post-destroot {
</span><del>- # install FreeImagePlus
- system -W ${worksrcpath} "${destroot.cmd} -f Makefile.fip install \
- VERLIBNAME=${libfreeimageplus} \
- CC='${configure.cc} ${configure.cflags} [get_canonical_archflags cc]' \
- CXX='${configure.cxx} ${configure.cxxflags} [get_canonical_archflags cxx]' \
- LDFLAGS='${configure.ldflags}' \
- INCDIR='${destroot}${prefix}/include' \
- INSTALLDIR='${destroot}${prefix}/lib'"
-
</del><span class="cx"> set docdir ${prefix}/share/doc/${name}
</span><span class="cx"> xinstall -d ${destroot}${docdir}
</span><span class="cx"> xinstall -m 644 -W ${worksrcpath} Whatsnew.txt license-fi.txt \
</span><span class="lines">@@ -106,16 +137,13 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> test.run yes
</span><del>-test.cmd ./testAPI
</del><ins>+test.cmd "${build.cmd} && ./testAPI"
</ins><span class="cx"> test.dir ${worksrcpath}/TestAPI
</span><span class="cx"> test.target
</span><span class="cx">
</span><del>-pre-test {
</del><ins>+post-patch {
</ins><span class="cx"> # Use correct compiler and flags when compiling test
</span><del>- reinplace "s:g++:${configure.cxx} ${configure.cxxflags} [get_canonical_archflags cxx]:" ${test.dir}/Makefile
-
- # Build the test
- system "make -C ${test.dir}"
</del><ins>+ reinplace "s:g++:${configure.cxx} ${configure.cxxflags}:" ${test.dir}/Makefile
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> livecheck.type regex
</span></span></pre>
</div>
</div>
</body>
</html>