<!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>[138789] trunk/dports/gis/gdal</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/138789">138789</a></dd>
<dt>Author</dt> <dd>vince@macports.org</dd>
<dt>Date</dt> <dd>2015-07-19 05:23:00 -0700 (Sun, 19 Jul 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>gdal: bump to 2.0.0</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportsgisgdalPortfile">trunk/dports/gis/gdal/Portfile</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkdportsgisgdalfilespatchogr_api_cppdiff">trunk/dports/gis/gdal/files/patch-ogr_api_cpp.diff</a></li>
<li><a href="#trunkdportsgisgdalfilespatchogr_p_hdiff">trunk/dports/gis/gdal/files/patch-ogr_p_h.diff</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportsgisgdalPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/gis/gdal/Portfile (138788 => 138789)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/gis/gdal/Portfile 2015-07-19 08:27:57 UTC (rev 138788)
+++ trunk/dports/gis/gdal/Portfile 2015-07-19 12:23:00 UTC (rev 138789)
</span><span class="lines">@@ -5,8 +5,7 @@
</span><span class="cx"> PortGroup mpi 1.0
</span><span class="cx">
</span><span class="cx"> name gdal
</span><del>-version 1.11.2
-revision 2
</del><ins>+version 2.0.0
</ins><span class="cx"> categories gis
</span><span class="cx"> license MIT BSD
</span><span class="cx"> platforms darwin
</span><span class="lines">@@ -28,8 +27,8 @@
</span><span class="cx"> http://download.osgeo.org/gdal/ \
</span><span class="cx"> http://download.osgeo.org/gdal/CURRENT/
</span><span class="cx">
</span><del>-checksums rmd160 25e2f52e287d22830098fc45c7e8ac7023180de1 \
- sha256 66bc8192d24e314a66ed69285186d46e6999beb44fc97eeb9c76d82a117c0845
</del><ins>+checksums rmd160 9cd43eb416d05373d505d5739d76a369c96df045 \
+ sha256 53761563ff53c5bf27bff7c4d6cab8bb1634baccefda05348e0f3b7acaf4c9e6
</ins><span class="cx">
</span><span class="cx"> compilers.choose cc cxx
</span><span class="cx"> mpi.setup
</span><span class="lines">@@ -107,7 +106,9 @@
</span><span class="cx"> patch-pdfcreatecopy_h.diff \
</span><span class="cx"> patch-pdfcreatecopy_cpp.diff \
</span><span class="cx"> patch-alg_GNUmakefile.diff \
</span><del>- patch-apps_GNUmakefile.diff
</del><ins>+ patch-apps_GNUmakefile.diff \
+ patch-ogr_p_h.diff \
+ patch-ogr_api_cpp.diff
</ins><span class="cx">
</span><span class="cx"> # Patches for universal build
</span><span class="cx"> post-configure {
</span><span class="lines">@@ -312,8 +313,8 @@
</span><span class="cx">
</span><span class="cx"> # Perf variant to optimize code
</span><span class="cx"> variant perf description {Optimize for speed} {
</span><del>- configure.cflags -O3 -pipe -march=native
- configure.cxxflags -O3 -pipe -march=native
</del><ins>+ configure.cflags -O3 -pipe -march=native -DGDAL_COMPILATION
+ configure.cxxflags -O3 -pipe -march=native -DGDAL_COMPILATION
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> default_variants +expat
</span><span class="lines">@@ -359,7 +360,7 @@
</span><span class="cx"> bin/ogrlineref \
</span><span class="cx"> bin/ogrtindex \
</span><span class="cx"> bin/testepsg \
</span><del>- lib/libgdal.1.dylib] \
</del><ins>+ lib/libgdal.20.dylib] \
</ins><span class="cx"> {
</span><span class="cx"> exec install_name_tool -change libltidsdk.9.dylib ${prefix}/share/Geo_DSDK/Raster_DSDK/lib/libltidsdk.9.dylib ${destroot}${prefix}/${f}
</span><span class="cx"> }
</span><span class="lines">@@ -389,7 +390,7 @@
</span><span class="cx"> bin/ogrlineref \
</span><span class="cx"> bin/ogrtindex \
</span><span class="cx"> bin/testepsg \
</span><del>- lib/libgdal.1.dylib] \
</del><ins>+ lib/libgdal.20.dylib] \
</ins><span class="cx"> {
</span><span class="cx"> if {${configure.cxx_stdlib} == "libc++"} {
</span><span class="cx"> exec install_name_tool -change \
</span></span></pre></div>
<a id="trunkdportsgisgdalfilespatchogr_api_cppdiff"></a>
<div class="addfile"><h4>Added: trunk/dports/gis/gdal/files/patch-ogr_api_cpp.diff (0 => 138789)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/gis/gdal/files/patch-ogr_api_cpp.diff (rev 0)
+++ trunk/dports/gis/gdal/files/patch-ogr_api_cpp.diff 2015-07-19 12:23:00 UTC (rev 138789)
</span><span class="lines">@@ -0,0 +1,11 @@
</span><ins>+--- ogr/ogr_api.cpp.old 2015-07-19 13:37:31.000000000 +0200
++++ ogr/ogr_api.cpp 2015-07-19 13:36:10.000000000 +0200
+@@ -33,6 +33,8 @@
+ #include "ogr_api.h"
+ #include "cpl_error.h"
+
++#define OGR_ENABLED
++
+ static int bNonLinearGeometriesEnabled = TRUE;
+
+ /************************************************************************/
</ins></span></pre></div>
<a id="trunkdportsgisgdalfilespatchogr_p_hdiff"></a>
<div class="addfile"><h4>Added: trunk/dports/gis/gdal/files/patch-ogr_p_h.diff (0 => 138789)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/gis/gdal/files/patch-ogr_p_h.diff (rev 0)
+++ trunk/dports/gis/gdal/files/patch-ogr_p_h.diff 2015-07-19 12:23:00 UTC (rev 138789)
</span><span class="lines">@@ -0,0 +1,11 @@
</span><ins>+--- ogr/ogr_p.h.old 2015-07-19 12:42:55.000000000 +0200
++++ ogr/ogr_p.h 2015-07-19 12:26:52.000000000 +0200
+@@ -31,6 +31,8 @@
+ #ifndef OGR_P_H_INCLUDED
+ #define OGR_P_H_INCLUDED
+
++#include "gdal.h"
++
+ /* -------------------------------------------------------------------- */
+ /* Include the common portability library ... lets us do lots */
+ /* of stuff easily. */
</ins></span></pre>
</div>
</div>
</body>
</html>