<!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>[148353] 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/148353">148353</a></dd>
<dt>Author</dt> <dd>vince@macports.org</dd>
<dt>Date</dt> <dd>2016-05-05 03:04:02 -0700 (Thu, 05 May 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>gdal: bump to 2.1.0</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportsgisgdalPortfile">trunk/dports/gis/gdal/Portfile</a></li>
<li><a href="#trunkdportsgisgdalfilespatchapps_GNUmakefilediff">trunk/dports/gis/gdal/files/patch-apps_GNUmakefile.diff</a></li>
<li><a href="#trunkdportsgisgdalfilespatchconfigureecwlibcxxdiff">trunk/dports/gis/gdal/files/patch-configure-ecw-libcxx.diff</a></li>
<li><a href="#trunkdportsgisgdalfilespatchconfigureecwlibstdcxxdiff">trunk/dports/gis/gdal/files/patch-configure-ecw-libstdcxx.diff</a></li>
<li><a href="#trunkdportsgisgdalfilespatchogr_api_cppdiff">trunk/dports/gis/gdal/files/patch-ogr_api_cpp.diff</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkdportsgisgdalfilespatchpdfcreatecopy_cppdiff">trunk/dports/gis/gdal/files/patch-pdfcreatecopy_cpp.diff</a></li>
<li><a href="#trunkdportsgisgdalfilespatchpdfcreatecopy_hdiff">trunk/dports/gis/gdal/files/patch-pdfcreatecopy_h.diff</a></li>
<li><a href="#trunkdportsgisgdalfilespatchswig_python_GNUmakefile">trunk/dports/gis/gdal/files/patch-swig_python_GNUmakefile</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportsgisgdalPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/gis/gdal/Portfile (148352 => 148353)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/gis/gdal/Portfile 2016-05-05 04:52:39 UTC (rev 148352)
+++ trunk/dports/gis/gdal/Portfile 2016-05-05 10:04:02 UTC (rev 148353)
</span><span class="lines">@@ -6,8 +6,8 @@
</span><span class="cx"> PortGroup muniversal 1.0
</span><span class="cx">
</span><span class="cx"> name gdal
</span><del>-version 2.0.2
-revision 1
</del><ins>+version 2.1.0
+#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">@@ -29,8 +29,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 9939eed3061602410f0d234328e20c3df18b0bc1 \
- sha256 db7722caf8d9dd798ec18012b9cacf40a518918466126a88b9fd277bd7d40cc4
</del><ins>+checksums rmd160 58105379a4331762eaa8c213b96c142c79b7e3cd \
+ sha256 eb499b18e5c5262a803bb7530ae56e95c3293be7b26c74bcadf67489203bf2cd
</ins><span class="cx">
</span><span class="cx"> compilers.choose cc cxx
</span><span class="cx"> mpi.setup
</span><span class="lines">@@ -101,16 +101,16 @@
</span><span class="cx"> configure.args-append --with-libjson-c=internal
</span><span class="cx">
</span><span class="cx"> # Patch to ensure that the python installation respects DESTDIR
</span><del>-patchfiles patch-swig_python_GNUmakefile \
- patch-gdalwarpkernel_opencl_c.diff \
</del><ins>+patchfiles patch-gdalwarpkernel_opencl_c.diff \
</ins><span class="cx"> patch-gdalwarpkernel_opencl_h.diff \
</span><del>- patch-pdfcreatecopy_h.diff \
- patch-pdfcreatecopy_cpp.diff \
</del><span class="cx"> patch-alg_GNUmakefile.diff \
</span><span class="cx"> patch-apps_GNUmakefile.diff \
</span><span class="cx"> patch-ogr_p_h.diff \
</span><span class="cx"> patch-ogr_api_cpp.diff \
</span><span class="cx"> patch-nawk.diff
</span><ins>+# patch-swig_python_GNUmakefile \
+ patch-pdfcreatecopy_h.diff \
+ patch-pdfcreatecopy_cpp.diff \
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx"> pre-configure {
</span></span></pre></div>
<a id="trunkdportsgisgdalfilespatchapps_GNUmakefilediff"></a>
<div class="modfile"><h4>Modified: trunk/dports/gis/gdal/files/patch-apps_GNUmakefile.diff (148352 => 148353)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/gis/gdal/files/patch-apps_GNUmakefile.diff 2016-05-05 04:52:39 UTC (rev 148352)
+++ trunk/dports/gis/gdal/files/patch-apps_GNUmakefile.diff 2016-05-05 10:04:02 UTC (rev 148353)
</span><span class="lines">@@ -1,10 +1,11 @@
</span><del>---- apps/GNUmakefile.old 2015-03-03 20:41:30.000000000 +0100
-+++ apps/GNUmakefile 2015-03-03 20:42:09.000000000 +0100
-@@ -23,6 +23,7 @@
- ogrlineref$(EXE) \
</del><ins>+--- apps/GNUmakefile.old 2016-05-05 11:32:10.000000000 +0200
++++ apps/GNUmakefile 2016-05-05 11:32:58.000000000 +0200
+@@ -27,6 +27,8 @@
</ins><span class="cx"> testepsg$(EXE) \
</span><span class="cx"> gdalbuildvrt$(EXE)
</span><del>-+CPPFLAGS := -DOGR_ENABLED $(CPPFLAGS)
- endif
</del><span class="cx">
</span><del>- ifeq ($(HAVE_GEOS),yes)
</del><ins>++CPPFLAGS := -DOGR_ENABLED $(CPPFLAGS)
++
+ ifeq ($(GNM_ENABLED),yes)
+ BIN_LIST += gnmmanage$(EXE) gnmanalyse$(EXE)
+ CPPFLAGS += -I$(GDAL_ROOT)/gnm
</ins></span></pre></div>
<a id="trunkdportsgisgdalfilespatchconfigureecwlibcxxdiff"></a>
<div class="modfile"><h4>Modified: trunk/dports/gis/gdal/files/patch-configure-ecw-libcxx.diff (148352 => 148353)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/gis/gdal/files/patch-configure-ecw-libcxx.diff 2016-05-05 04:52:39 UTC (rev 148352)
+++ trunk/dports/gis/gdal/files/patch-configure-ecw-libcxx.diff 2016-05-05 10:04:02 UTC (rev 148353)
</span><span class="lines">@@ -1,28 +1,11 @@
</span><del>---- configure.orig 2014-06-19 11:21:05.000000000 +0200
-+++ configure 2014-06-19 11:22:50.000000000 +0200
-@@ -22477,8 +22477,8 @@
- fi
- else
-
-- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libNCSEcw.so or libecwj2" >&5
--$as_echo_n "checking for libNCSEcw.so or libecwj2... " >&6; }
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libNCSEcw.dylib or libecwj2" >&5
-+$as_echo_n "checking for libNCSEcw.dylib or libecwj2... " >&6; }
- ECW_SETTING=yes
- if test -r $with_ecw/lib/libNCSCnet.so -o -r $with_ecw/lib/libNCSCnet.dylib ; then
- ECW_LIBS="-L$with_ecw/lib -lNCSEcw -lNCSEcwC -lNCSCnet -lNCSUtil"
-@@ -22488,10 +22488,10 @@
- ECW_LIBS="-L$with_ecw/lib -lNCSEcw -lNCSEcwC -lNCSCNet -lNCSUtil"
</del><ins>+--- configure.old 2015-07-19 11:54:14.000000000 +0200
++++ configure 2015-07-19 11:56:22.000000000 +0200
+@@ -22951,7 +22951,7 @@
</ins><span class="cx"> { $as_echo "$as_me:${as_lineno-$LINENO}: result: found in $with_ecw/lib." >&5
</span><span class="cx"> $as_echo "found in $with_ecw/lib." >&6; }
</span><del>-- elif test -r $with_ecw/bin/libNCSEcw.so -o -r $with_ecw/bin/libNCSEcw.dylib ; then
</del><ins>+ elif test -r $with_ecw/bin/libNCSEcw.so -o -r $with_ecw/bin/libNCSEcw.dylib ; then
</ins><span class="cx"> - ECW_LIBS="-L$with_ecw/bin -lNCSEcw -lNCSEcwC -lNCSCnet -lNCSUtil"
</span><del>-- { $as_echo "$as_me:${as_lineno-$LINENO}: result: found in $with_ecw/bin." >&5
--$as_echo "found in $with_ecw/bin." >&6; }
-+ elif test -r $with_ecw/bin/libNCSEcw.so -o -r $with_ecw/redistributable/libc++/libNCSEcw.dylib ; then
</del><span class="cx"> + ECW_LIBS="-L$with_ecw/redistributable/libc++ -lNCSEcw"
</span><del>-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: found in $with_ecw/redistributable/libc++." >&5
-+$as_echo "found in $with_ecw/redistributable/libc++." >&6; }
</del><ins>+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: found in $with_ecw/bin." >&5
+ $as_echo "found in $with_ecw/bin." >&6; }
</ins><span class="cx"> elif test -r $with_ecw/lib/libecwj2.dylib ; then
</span><del>- ECW_LIBS="-L$with_ecw/lib -lecwj2 $CARBON_FRAMEWORK"
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: found libecwj2 in $with_ecw/lib." >&5
</del></span></pre></div>
<a id="trunkdportsgisgdalfilespatchconfigureecwlibstdcxxdiff"></a>
<div class="modfile"><h4>Modified: trunk/dports/gis/gdal/files/patch-configure-ecw-libstdcxx.diff (148352 => 148353)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/gis/gdal/files/patch-configure-ecw-libstdcxx.diff 2016-05-05 04:52:39 UTC (rev 148352)
+++ trunk/dports/gis/gdal/files/patch-configure-ecw-libstdcxx.diff 2016-05-05 10:04:02 UTC (rev 148353)
</span><span class="lines">@@ -1,28 +1,11 @@
</span><del>---- configure.orig 2014-06-19 11:21:05.000000000 +0200
-+++ configure 2014-06-19 11:22:50.000000000 +0200
-@@ -22477,8 +22477,8 @@
- fi
- else
-
-- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libNCSEcw.so or libecwj2" >&5
--$as_echo_n "checking for libNCSEcw.so or libecwj2... " >&6; }
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libNCSEcw.dylib or libecwj2" >&5
-+$as_echo_n "checking for libNCSEcw.dylib or libecwj2... " >&6; }
- ECW_SETTING=yes
- if test -r $with_ecw/lib/libNCSCnet.so -o -r $with_ecw/lib/libNCSCnet.dylib ; then
- ECW_LIBS="-L$with_ecw/lib -lNCSEcw -lNCSEcwC -lNCSCnet -lNCSUtil"
-@@ -22488,10 +22488,10 @@
- ECW_LIBS="-L$with_ecw/lib -lNCSEcw -lNCSEcwC -lNCSCNet -lNCSUtil"
</del><ins>+--- configure.old 2015-07-19 11:54:14.000000000 +0200
++++ configure 2015-07-19 11:56:22.000000000 +0200
+@@ -22951,7 +22951,7 @@
</ins><span class="cx"> { $as_echo "$as_me:${as_lineno-$LINENO}: result: found in $with_ecw/lib." >&5
</span><span class="cx"> $as_echo "found in $with_ecw/lib." >&6; }
</span><del>-- elif test -r $with_ecw/bin/libNCSEcw.so -o -r $with_ecw/bin/libNCSEcw.dylib ; then
</del><ins>+ elif test -r $with_ecw/bin/libNCSEcw.so -o -r $with_ecw/bin/libNCSEcw.dylib ; then
</ins><span class="cx"> - ECW_LIBS="-L$with_ecw/bin -lNCSEcw -lNCSEcwC -lNCSCnet -lNCSUtil"
</span><del>-- { $as_echo "$as_me:${as_lineno-$LINENO}: result: found in $with_ecw/bin." >&5
--$as_echo "found in $with_ecw/bin." >&6; }
-+ elif test -r $with_ecw/bin/libNCSEcw.so -o -r $with_ecw/redistributable/libstdc++/libNCSEcw.dylib ; then
</del><span class="cx"> + ECW_LIBS="-L$with_ecw/redistributable/libstdc++ -lNCSEcw"
</span><del>-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: found in $with_ecw/redistributable/libstdc++." >&5
-+$as_echo "found in $with_ecw/redistributable/libstdc++." >&6; }
</del><ins>+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: found in $with_ecw/bin." >&5
+ $as_echo "found in $with_ecw/bin." >&6; }
</ins><span class="cx"> elif test -r $with_ecw/lib/libecwj2.dylib ; then
</span><del>- ECW_LIBS="-L$with_ecw/lib -lecwj2 $CARBON_FRAMEWORK"
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: found libecwj2 in $with_ecw/lib." >&5
</del></span></pre></div>
<a id="trunkdportsgisgdalfilespatchogr_api_cppdiff"></a>
<div class="modfile"><h4>Modified: trunk/dports/gis/gdal/files/patch-ogr_api_cpp.diff (148352 => 148353)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/gis/gdal/files/patch-ogr_api_cpp.diff 2016-05-05 04:52:39 UTC (rev 148352)
+++ trunk/dports/gis/gdal/files/patch-ogr_api_cpp.diff 2016-05-05 10:04:02 UTC (rev 148353)
</span><span class="lines">@@ -1,11 +1,11 @@
</span><del>---- 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
</del><ins>+--- ogr/ogr_api.cpp.old 2016-05-05 11:40:13.000000000 +0200
++++ ogr/ogr_api.cpp 2016-05-05 11:40:37.000000000 +0200
</ins><span class="cx"> @@ -33,6 +33,8 @@
</span><span class="cx"> #include "ogr_api.h"
</span><span class="cx"> #include "cpl_error.h"
</span><span class="cx">
</span><span class="cx"> +#define OGR_ENABLED
</span><span class="cx"> +
</span><del>- static int bNonLinearGeometriesEnabled = TRUE;
</del><ins>+ static bool bNonLinearGeometriesEnabled = true;
</ins><span class="cx">
</span><span class="cx"> /************************************************************************/
</span></span></pre></div>
<a id="trunkdportsgisgdalfilespatchpdfcreatecopy_cppdiff"></a>
<div class="delfile"><h4>Deleted: trunk/dports/gis/gdal/files/patch-pdfcreatecopy_cpp.diff (148352 => 148353)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/gis/gdal/files/patch-pdfcreatecopy_cpp.diff 2016-05-05 04:52:39 UTC (rev 148352)
+++ trunk/dports/gis/gdal/files/patch-pdfcreatecopy_cpp.diff 2016-05-05 10:04:02 UTC (rev 148353)
</span><span class="lines">@@ -1,20 +0,0 @@
</span><del>---- frmts/pdf/pdfcreatecopy.cpp.orig 2014-11-03 16:38:24.000000000 +0100
-+++ frmts/pdf/pdfcreatecopy.cpp 2014-11-03 16:39:00.000000000 +0100
-@@ -1895,8 +1895,6 @@
- return TRUE;
- }
-
--#ifdef OGR_ENABLED
--
- /************************************************************************/
- /* WriteOGRDataSource() */
- /************************************************************************/
-@@ -2960,8 +2958,6 @@
- return TRUE;
- }
-
--#endif
--
- /************************************************************************/
- /* EndPage() */
- /************************************************************************/
</del></span></pre></div>
<a id="trunkdportsgisgdalfilespatchpdfcreatecopy_hdiff"></a>
<div class="delfile"><h4>Deleted: trunk/dports/gis/gdal/files/patch-pdfcreatecopy_h.diff (148352 => 148353)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/gis/gdal/files/patch-pdfcreatecopy_h.diff 2016-05-05 04:52:39 UTC (rev 148352)
+++ trunk/dports/gis/gdal/files/patch-pdfcreatecopy_h.diff 2016-05-05 10:04:02 UTC (rev 148353)
</span><span class="lines">@@ -1,28 +0,0 @@
</span><del>---- frmts/pdf/pdfcreatecopy.h.orig 2014-11-03 16:40:58.000000000 +0100
-+++ frmts/pdf/pdfcreatecopy.h 2014-11-03 16:41:20.000000000 +0100
-@@ -35,9 +35,7 @@
- #include <vector>
- #include <map>
-
--#ifdef OGR_ENABLED
- #include "ogr_api.h"
--#endif
-
- typedef enum
- {
-@@ -235,7 +233,6 @@
- int nBlockXSize, int nBlockYSize,
- GDALProgressFunc pfnProgress,
- void * pProgressData);
--#ifdef OGR_ENABLED
- int WriteOGRDataSource(const char* pszOGRDataSource,
- const char* pszOGRDisplayField,
- const char* pszOGRDisplayLayerNames,
-@@ -262,7 +259,6 @@
- int bWriteOGRAttributes,
- int& iObj,
- int& iObjLayer);
--#endif
-
- int WriteJavascript(const char* pszJavascript);
- int WriteJavascriptFile(const char* pszJavascriptFile);
</del></span></pre></div>
<a id="trunkdportsgisgdalfilespatchswig_python_GNUmakefile"></a>
<div class="delfile"><h4>Deleted: trunk/dports/gis/gdal/files/patch-swig_python_GNUmakefile (148352 => 148353)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/gis/gdal/files/patch-swig_python_GNUmakefile 2016-05-05 04:52:39 UTC (rev 148352)
+++ trunk/dports/gis/gdal/files/patch-swig_python_GNUmakefile 2016-05-05 10:04:02 UTC (rev 148353)
</span><span class="lines">@@ -1,16 +0,0 @@
</span><del>---- swig/python/GNUmakefile.orig 2008-06-29 17:42:00.000000000 -0700
-+++ swig/python/GNUmakefile 2008-06-29 17:42:18.000000000 -0700
-@@ -53,12 +53,7 @@
- $(PYTHON) setup.py bdist_egg
-
- install:
--
--ifeq ($(PY_HAVE_SETUPTOOLS),1)
-- $(PYTHON) setup.py install
--else
-- $(PYTHON) setup.py install --prefix=$(DESTDIR)$(prefix)
--endif
-+ $(PYTHON) setup.py install --root=$(DESTDIR) --prefix=$(INST_PYMOD)
-
- for f in $(SCRIPTS) ; do $(INSTALL) ./scripts/$$f $(DESTDIR)$(INST_BIN) ; done
-
</del></span></pre>
</div>
</div>
</body>
</html>