<!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>[127765] 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/127765">127765</a></dd>
<dt>Author</dt> <dd>vince@macports.org</dd>
<dt>Date</dt> <dd>2014-11-03 08:57:05 -0800 (Mon, 03 Nov 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Bump to 1.11.1</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="#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>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportsgisgdalPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/gis/gdal/Portfile (127764 => 127765)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/gis/gdal/Portfile 2014-11-03 14:01:21 UTC (rev 127764)
+++ trunk/dports/gis/gdal/Portfile 2014-11-03 16:57:05 UTC (rev 127765)
</span><span class="lines">@@ -4,8 +4,8 @@
</span><span class="cx"> PortSystem 1.0
</span><span class="cx">
</span><span class="cx"> name gdal
</span><del>-version 1.11.0
-revision 1
</del><ins>+version 1.11.1
+#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">@@ -27,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 0a522a145131b65103d0e6c02e52651069005e48 \
- sha256 989db33ff411e2c888348e71edec5ad06c74ed68781ebfbc4e85179b9d65aafe
</del><ins>+checksums rmd160 9ebfbebeaff99a533bb4f4cf33b3f747e1ced9b4 \
+ sha256 f46b5944a8cabc8516673f231f466131cdfd2cdc6677dbee5d96ec7fc58a3340
</ins><span class="cx">
</span><span class="cx"> depends_lib-append port:zlib \
</span><span class="cx"> port:libpng \
</span><span class="lines">@@ -99,8 +99,25 @@
</span><span class="cx"> # Patch to ensure that the python installation respects DESTDIR
</span><span class="cx"> patchfiles patch-swig_python_GNUmakefile \
</span><span class="cx"> patch-gdalwarpkernel_opencl_c.diff \
</span><del>- patch-gdalwarpkernel_opencl_h.diff
</del><ins>+ patch-gdalwarpkernel_opencl_h.diff \
+ patch-pdfcreatecopy_h.diff \
+ patch-pdfcreatecopy_cpp.diff
</ins><span class="cx">
</span><ins>+# local cpl_port.h is masked by ${prefix} one
+
+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}
+ }
+}
+
+post-build {
+ file delete ${worksrcpath}/port/Cpl_port.h
+}
+
</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">@@ -227,18 +244,7 @@
</span><span class="cx"> configure.args-append --with-expat=${prefix}
</span><span class="cx"> }
</span><span class="cx">
</span><del>-# Python variants
-variant python26 conflicts python27 \
- description {Enable Python 2.6 support} {
- depends_lib-append port:python26 \
- port:py26-numpy
- configure.args-delete --without-python
- configure.args-append --with-python
- set PYINST ${frameworks_dir}/Python.framework/Versions/2.6
- build.args-append PYTHON=python2.6
- use_parallel_build no
-}
-
</del><ins>+# Python variant
</ins><span class="cx"> variant python27 conflicts python26 \
</span><span class="cx"> description {Enable Python 2.7 support} {
</span><span class="cx"> depends_lib-append port:python27 \
</span><span class="lines">@@ -321,7 +327,6 @@
</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.compiler macports-clang-3.4
</del><span class="cx"> configure.cflags -O3 -pipe -march=native
</span><span class="cx"> configure.cxxflags -O3 -pipe -march=native
</span><span class="cx"> }
</span><span class="lines">@@ -337,6 +342,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> reinplace -E "s|(GEOS_CFLAGS.*=).*|\\1|" ${worksrcpath}/GDALmake.opt
</span><ins>+ reinplace -E "s|^CPPFLAGS.*|CPPFLAGS = -I\$(GDAL_ROOT)/port -I/opt/local -I/opt/local/include|" ${worksrcpath}/GDALmake.opt
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> post-destroot {
</span></span></pre></div>
<a id="trunkdportsgisgdalfilespatchpdfcreatecopy_cppdiff"></a>
<div class="addfile"><h4>Added: trunk/dports/gis/gdal/files/patch-pdfcreatecopy_cpp.diff (0 => 127765)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/gis/gdal/files/patch-pdfcreatecopy_cpp.diff (rev 0)
+++ trunk/dports/gis/gdal/files/patch-pdfcreatecopy_cpp.diff 2014-11-03 16:57:05 UTC (rev 127765)
</span><span class="lines">@@ -0,0 +1,20 @@
</span><ins>+--- 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() */
+ /************************************************************************/
</ins></span></pre></div>
<a id="trunkdportsgisgdalfilespatchpdfcreatecopy_hdiff"></a>
<div class="addfile"><h4>Added: trunk/dports/gis/gdal/files/patch-pdfcreatecopy_h.diff (0 => 127765)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/gis/gdal/files/patch-pdfcreatecopy_h.diff (rev 0)
+++ trunk/dports/gis/gdal/files/patch-pdfcreatecopy_h.diff 2014-11-03 16:57:05 UTC (rev 127765)
</span><span class="lines">@@ -0,0 +1,28 @@
</span><ins>+--- 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);
</ins></span></pre>
</div>
</div>
</body>
</html>