<!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>[147620] trunk/dports/gis/gdal/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/147620">147620</a></dd>
<dt>Author</dt> <dd>mcalhoun@macports.org</dd>
<dt>Date</dt> <dd>2016-04-10 07:16:41 -0700 (Sun, 10 Apr 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>gdal: remove trailing whitespace</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportsgisgdalPortfile">trunk/dports/gis/gdal/Portfile</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportsgisgdalPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/gis/gdal/Portfile (147619 => 147620)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/gis/gdal/Portfile 2016-04-10 14:05:55 UTC (rev 147619)
+++ trunk/dports/gis/gdal/Portfile 2016-04-10 14:16:41 UTC (rev 147620)
</span><span class="lines">@@ -153,7 +153,7 @@
</span><span class="cx"> configure.args-delete --without-ecw
</span><span class="cx"> configure.args-append --with-ecw=${prefix}/lib/ECW
</span><span class="cx">
</span><del>- if {${configure.cxx_stdlib} == "libc++" } {
</del><ins>+ if {${configure.cxx_stdlib} == "libc++" } {
</ins><span class="cx"> patchfiles-append patch-configure-ecw-libcxx.diff
</span><span class="cx"> } else {
</span><span class="cx"> patchfiles-append patch-configure-ecw-libstdcxx.diff
</span><span class="lines">@@ -164,23 +164,23 @@
</span><span class="cx"> (![file exists /Intergraph/ERDASEcwJpeg2000SDK5.1.1/Desktop_Read-Only])} {
</span><span class="cx"> ui_error "
</span><span class="cx"> ****
</span><del>-* The Intergraph ECW SDK version 5.1.1 is needed to
</del><ins>+* The Intergraph ECW SDK version 5.1.1 is needed to
</ins><span class="cx"> * compile gdal with the ecw variant. It must be installed separately.
</span><del>-* Please download the Mac OS X version of the SDK
-* 'ERDAS ECW/JP2 SDK v5.1.1 (MacOSX)' from
</del><ins>+* Please download the Mac OS X version of the SDK
+* 'ERDAS ECW/JP2 SDK v5.1.1 (MacOSX)' from
</ins><span class="cx"> * http://download.intergraph.com/
</span><span class="cx"> * Choose to install it in ${prefix}/lib/ECW.
</span><span class="cx"> * Then try to install GDAL again.
</span><del>-****"
</del><ins>+****"
</ins><span class="cx"> return -code error "ECW SDK 5.1.1 not installed."
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> if {(![file exists ${prefix}/lib/ECW]) && \
</span><span class="cx"> ([file exists /Intergraph/ERDASEcwJpeg2000SDK5.1.1/Desktop_Read-Only])} {
</span><span class="cx">
</span><span class="cx"> ui_error "
</span><span class="cx"> ****
</span><del>-* Please create symbolic links from the /Intergraph directory to
</del><ins>+* Please create symbolic links from the /Intergraph directory to
</ins><span class="cx"> * ${prefix}/lib/ECW, by executing at the prompt:
</span><span class="cx"> * sudo ln -s /Intergraph/ERDASEcwJpeg2000SDK5.1.1/Desktop_Read-Only \
</span><span class="cx"> ${prefix}/lib/ECW
</span><span class="lines">@@ -325,7 +325,7 @@
</span><span class="cx"> foreach makefile [glob -dir $FRMT_PATH */GNUmakefile] {
</span><span class="cx"> reinplace "s|\$\(EXPAT_INCLUDE\)||" $makefile
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> reinplace -E "s|(GEOS_CFLAGS.*=).*|\\1|" ${worksrcpath}/GDALmake.opt
</span><span class="cx"> reinplace -E "s|^CPPFLAGS.*|CPPFLAGS = -I\$(GDAL_ROOT)/port -I${prefix} -I${prefix}/include|" ${worksrcpath}/GDALmake.opt
</span><span class="cx"> }
</span><span class="lines">@@ -399,7 +399,7 @@
</span><span class="cx"> exec install_name_tool -change \
</span><span class="cx"> /Users/jenkins/hudson/workspace/RL_5.1.1_ECWJP2SDK_OSX/Master/libNCSEcw.dylib ${prefix}/lib/ECW/redistributable/libstdc++/libNCSEcw.dylib \
</span><span class="cx"> ${destroot}${prefix}/${f}
</span><del>- }
</del><ins>+ }
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>