<!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>[121188] 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/121188">121188</a></dd>
<dt>Author</dt> <dd>vince@macports.org</dd>
<dt>Date</dt> <dd>2014-06-19 10:19:48 -0700 (Thu, 19 Jun 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Bump to 1.11.0. Also enable ECW via manual installation of the SDK.
More to come…</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="#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>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportsgisgdalPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/gis/gdal/Portfile (121187 => 121188)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/gis/gdal/Portfile 2014-06-19 16:11:39 UTC (rev 121187)
+++ trunk/dports/gis/gdal/Portfile 2014-06-19 17:19:48 UTC (rev 121188)
</span><span class="lines">@@ -4,8 +4,7 @@
</span><span class="cx"> PortSystem 1.0
</span><span class="cx">
</span><span class="cx"> name gdal
</span><del>-version 1.10.1
-revision 5
</del><ins>+version 1.11.0
</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 +26,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 b06cbd0f34a6dad99768d5f75a9856e4e027d3bc \
- sha256 9984f0314c0bd831eb59fb646c2bc5e13cf1378be4f51499045166cbe62be6ea
</del><ins>+checksums rmd160 0a522a145131b65103d0e6c02e52651069005e48 \
+ sha256 989db33ff411e2c888348e71edec5ad06c74ed68781ebfbc4e85179b9d65aafe
</ins><span class="cx">
</span><span class="cx"> depends_lib-append port:zlib \
</span><span class="cx"> port:libpng \
</span><span class="lines">@@ -96,12 +95,8 @@
</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_c_2.diff \
</del><span class="cx"> patch-gdalwarpkernel_opencl_h.diff
</span><span class="cx">
</span><del>-# Upstream fix for "Undefined symbols: _environ"
-patchfiles-append patch-port-cpl_spawn.cpp.diff
-
</del><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">@@ -139,6 +134,49 @@
</span><span class="cx"> configure.args-append --with-mrsid=${prefix}/share/Geo_DSDK/Raster_DSDK
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+variant ecw description {Enable ECW file format} {
+ configure.args-delete --without-ecw
+ configure.args-append --with-ecw=${prefix}/lib/ECW
+
+ if {${configure.cxx_stdlib} == "libc++" } {
+ patchfiles-append patch-configure-ecw-libcxx.diff
+ } else {
+ patchfiles-append patch-configure-ecw-libstdcxx.diff
+ }
+
+ pre-configure {
+ if {(![file exists ${prefix}/lib/ECW]) && \
+ (![file exists /Intergraph/ERDASEcwJpeg2000SDK5.1.1/Desktop_Read-Only])} {
+ ui_error "
+****
+* The Intergraph ECW SDK version 5.1.1 is needed to
+* compile gdal with the ecw variant. It must be installed separately.
+* Please download the Mac OS X version of the SDK
+* 'ERDAS ECW/JP2 SDK v5.1.1 (MacOSX)' from
+* http://download.intergraph.com/
+* Choose to install it in ${prefix}/lib/ECW.
+* Then try to install GDAL again.
+****"
+ return -code error "ECW SDK 5.1.1 not installed."
+ }
+
+ if {(![file exists ${prefix}/lib/ECW]) && \
+ ([file exists /Intergraph/ERDASEcwJpeg2000SDK5.1.1/Desktop_Read-Only])} {
+
+ ui_error "
+****
+* Please create symbolic links from the /Intergraph directory to
+* ${prefix}/lib/ECW, by executing at the prompt:
+* sudo ln -s /Intergraph/ERDASEcwJpeg2000SDK5.1.1/Desktop_Read-Only \
+ ${prefix}/lib/ECW"
+* Or reinstall the ECW SDK in ${prefix}/lib/ECW directly.
+* Then try again.
+****"
+ return -code error "Symlinks missing."
+ }
+ }
+}
+
</ins><span class="cx"> variant hdf4 description {Enable HDF4 file format} {
</span><span class="cx"> depends_lib-append port:hdf4
</span><span class="cx"> configure.args-delete --without-hdf4
</span><span class="lines">@@ -314,6 +352,8 @@
</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><ins>+
+ reinplace -E "s|(GEOS_CFLAGS.*=).*|\\1|" ${worksrcpath}/GDALmake.opt
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> post-destroot {
</span><span class="lines">@@ -342,6 +382,7 @@
</span><span class="cx"> bin/nearblack \
</span><span class="cx"> bin/ogr2ogr \
</span><span class="cx"> bin/ogrinfo \
</span><ins>+ bin/ogrlineref \
</ins><span class="cx"> bin/ogrtindex \
</span><span class="cx"> bin/testepsg \
</span><span class="cx"> lib/libgdal.1.dylib] \
</span><span class="lines">@@ -350,6 +391,44 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ if {[variant_isset ecw]} {
+ foreach f [list \
+ bin/gdal_contour \
+ bin/gdal_grid \
+ bin/gdal_rasterize \
+ bin/gdal_translate \
+ bin/gdaladdo \
+ bin/gdalbuildvrt \
+ bin/gdaldem \
+ bin/gdalenhance \
+ bin/gdalinfo \
+ bin/gdallocationinfo \
+ bin/gdalmanage \
+ bin/gdalserver \
+ bin/gdalsrsinfo \
+ bin/gdaltindex \
+ bin/gdaltransform \
+ bin/gdalwarp \
+ bin/nearblack \
+ bin/ogr2ogr \
+ bin/ogrinfo \
+ bin/ogrlineref \
+ bin/ogrtindex \
+ bin/testepsg \
+ lib/libgdal.1.dylib] \
+ {
+ if {${configure.cxx_stdlib} == "libc++"} {
+ exec install_name_tool -change \
+ /Users/jenkins/hudson/workspace/RL_5.1.1_ECWJP2SDK_OSX/Master/libNCSEcw.dylib ${prefix}/lib/ECW/redistributable/libc++/libNCSEcw.dylib \
+ ${destroot}${prefix}/${f}
+ } else {
+ exec install_name_tool -change \
+ /Users/jenkins/hudson/workspace/RL_5.1.1_ECWJP2SDK_OSX/Master/libNCSEcw.dylib ${prefix}/lib/ECW/redistributable/libstdc++/libNCSEcw.dylib \
+ ${destroot}${prefix}/${f}
+ }
+ }
+ }
+
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> livecheck.type regex
</span></span></pre></div>
<a id="trunkdportsgisgdalfilespatchconfigureecwlibcxxdiff"></a>
<div class="addfile"><h4>Added: trunk/dports/gis/gdal/files/patch-configure-ecw-libcxx.diff (0 => 121188)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/gis/gdal/files/patch-configure-ecw-libcxx.diff (rev 0)
+++ trunk/dports/gis/gdal/files/patch-configure-ecw-libcxx.diff 2014-06-19 17:19:48 UTC (rev 121188)
</span><span class="lines">@@ -0,0 +1,28 @@
</span><ins>+--- 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"
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: found in $with_ecw/lib." >&5
+ $as_echo "found in $with_ecw/lib." >&6; }
+- elif test -r $with_ecw/bin/libNCSEcw.so -o -r $with_ecw/bin/libNCSEcw.dylib ; then
+- ECW_LIBS="-L$with_ecw/bin -lNCSEcw -lNCSEcwC -lNCSCnet -lNCSUtil"
+- { $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
++ ECW_LIBS="-L$with_ecw/redistributable/libc++ -lNCSEcw"
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: found in $with_ecw/redistributable/libc++." >&5
++$as_echo "found in $with_ecw/redistributable/libc++." >&6; }
+ elif test -r $with_ecw/lib/libecwj2.dylib ; then
+ ECW_LIBS="-L$with_ecw/lib -lecwj2 $CARBON_FRAMEWORK"
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: found libecwj2 in $with_ecw/lib." >&5
</ins></span></pre></div>
<a id="trunkdportsgisgdalfilespatchconfigureecwlibstdcxxdiff"></a>
<div class="addfile"><h4>Added: trunk/dports/gis/gdal/files/patch-configure-ecw-libstdcxx.diff (0 => 121188)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/gis/gdal/files/patch-configure-ecw-libstdcxx.diff (rev 0)
+++ trunk/dports/gis/gdal/files/patch-configure-ecw-libstdcxx.diff 2014-06-19 17:19:48 UTC (rev 121188)
</span><span class="lines">@@ -0,0 +1,28 @@
</span><ins>+--- 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"
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: found in $with_ecw/lib." >&5
+ $as_echo "found in $with_ecw/lib." >&6; }
+- elif test -r $with_ecw/bin/libNCSEcw.so -o -r $with_ecw/bin/libNCSEcw.dylib ; then
+- ECW_LIBS="-L$with_ecw/bin -lNCSEcw -lNCSEcwC -lNCSCnet -lNCSUtil"
+- { $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
++ ECW_LIBS="-L$with_ecw/redistributable/libstdc++ -lNCSEcw"
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: found in $with_ecw/redistributable/libstdc++." >&5
++$as_echo "found in $with_ecw/redistributable/libstdc++." >&6; }
+ elif test -r $with_ecw/lib/libecwj2.dylib ; then
+ ECW_LIBS="-L$with_ecw/lib -lecwj2 $CARBON_FRAMEWORK"
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: found libecwj2 in $with_ecw/lib." >&5
</ins></span></pre>
</div>
</div>
</body>
</html>