<!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>[127794] 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/127794">127794</a></dd>
<dt>Author</dt> <dd>vince@macports.org</dd>
<dt>Date</dt> <dd>2014-11-04 02:05:58 -0800 (Tue, 04 Nov 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Correct various bugs. Bump to <a href="https://trac.macports.org/changeset/1">revision 1</a>.</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 (127793 => 127794)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/gis/gdal/Portfile 2014-11-04 07:34:19 UTC (rev 127793)
+++ trunk/dports/gis/gdal/Portfile 2014-11-04 10:05:58 UTC (rev 127794)
</span><span class="lines">@@ -5,6 +5,7 @@
</span><span class="cx">
</span><span class="cx"> name gdal
</span><span class="cx"> version 1.11.1
</span><ins>+revision 1
</ins><span class="cx"> categories gis
</span><span class="cx"> license MIT BSD
</span><span class="cx"> platforms darwin
</span><span class="lines">@@ -104,22 +105,24 @@
</span><span class="cx">
</span><span class="cx"> # local cpl_port.h is masked by ${prefix} one
</span><span class="cx">
</span><del>-# Fix disabled: does not work for case-insensitive filesystems, see #45755
-# Issue regarding including the wrong header files version, needs other solution
-#
-#post-extract {
-# file copy ${worksrcpath}/port/cpl_port.h ${worksrcpath}/port/Cpl_port.h
-# set files_to_patch [exec find ${worksrcpath} -type f -exec grep -l "cpl_port.h" \{\} \;]
-# foreach file ${files_to_patch} {
-# puts ${file}
-# reinplace -locale C "s|cpl_port.h|Cpl_port.h|" ${file}
-# }
-#}
</del><ins>+post-extract {
+ file copy -force ${worksrcpath}/port/cpl_port.h ${worksrcpath}/port/lcpl_port.h
+ set files_to_patch [exec find ${worksrcpath} -type f -exec grep -l "cpl_port.h" \{\} \;]
+ foreach file ${files_to_patch} {
+ reinplace -locale C "s|cpl_port.h|lcpl_port.h|" ${file}
+ }
+}
</ins><span class="cx">
</span><del>-#post-build {
-# file delete ${worksrcpath}/port/Cpl_port.h
-#}
</del><ins>+# Undo after build (otherwise the headers files installed are corrupt)
</ins><span class="cx">
</span><ins>+post-build {
+ file delete ${worksrcpath}/port/lcpl_port.h
+ set files_to_patch [exec find ${worksrcpath} -name "*.h" -exec grep -l "lcpl_port.h" \{\} \;]
+ foreach file ${files_to_patch} {
+ reinplace -locale C "s|lcpl_port.h|cpl_port.h|" ${file}
+ }
+}
+
</ins><span class="cx"> # Patches for universal build
</span><span class="cx"> post-configure {
</span><span class="cx"> reinplace -E "s|(INST_PYMOD).*|\\1\t=\t${PYINST}|" \
</span><span class="lines">@@ -344,7 +347,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> reinplace -E "s|(GEOS_CFLAGS.*=).*|\\1|" ${worksrcpath}/GDALmake.opt
</span><del>- reinplace -E "s|^CPPFLAGS.*|CPPFLAGS = -I\$(GDAL_ROOT)/port -I/opt/local -I/opt/local/include|" ${worksrcpath}/GDALmake.opt
</del><ins>+ reinplace -E "s|^CPPFLAGS.*|CPPFLAGS = -I\$(GDAL_ROOT)/port -I${prefix} -I${prefix}/include|" ${worksrcpath}/GDALmake.opt
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> post-destroot {
</span></span></pre>
</div>
</div>
</body>
</html>