Ticket #43678: gdal.diff

Portfile

@@ -4 +4 @@
 PortSystem          1.0
 
 name                gdal
-version             1.10.1
-revision            4
+version             1.11.0
+revision            1
 categories          gis
 license             MIT BSD
 platforms           darwin
@@ -27 +27 @@
                     http://download.osgeo.org/gdal/ \
                     http://download.osgeo.org/gdal/CURRENT/
 
-checksums           rmd160  b06cbd0f34a6dad99768d5f75a9856e4e027d3bc \
-                    sha256  9984f0314c0bd831eb59fb646c2bc5e13cf1378be4f51499045166cbe62be6ea
+checksums           rmd160  0a522a145131b65103d0e6c02e52651069005e48\
+                    sha256  989db33ff411e2c888348e71edec5ad06c74ed68781ebfbc4e85179b9d65aafe 
 
 depends_lib-append  port:zlib \
                     port:libpng \
@@ -96 +96 @@
 # Patch to ensure that the python installation respects DESTDIR
 patchfiles          patch-swig_python_GNUmakefile \
                     patch-gdalwarpkernel_opencl_c.diff \
-                    patch-gdalwarpkernel_opencl_c_2.diff \
                     patch-gdalwarpkernel_opencl_h.diff
 
-# Upstream fix for "Undefined symbols: _environ"
-patchfiles-append   patch-port-cpl_spawn.cpp.diff
-
 # Patches for universal build
 post-configure {
     reinplace -E "s|(INST_PYMOD).*|\\1\t=\t${PYINST}|" \
@@ -139 +135 @@
     configure.args-append       --with-mrsid=${prefix}/share/Geo_DSDK/Raster_DSDK
 }
 
+variant ecw description {Enable ECW file format} {
+    configure.args-delete   --without-ecw
+    configure.args-append   --with-ecw=/Intergraph/ERDASEcwJpeg2000SDK5.1
+
+    pre-configure {
+        if {(![file exists /Intergraph/ERDASEcwJpeg2000SDK5.1]) && \
+            (![file exists /Intergraph/ERDASEcwJpeg2000SDK5.1.1/Desktop_Read-Only])} {
+            ui_error "
+****
+* The Intergraph ECW SDK with version 5.1 or 5.1.1 is needed to 
+* compile gdal with the ecw variant.
+* Please download and install the Mac OS X version of the SDK 
+* 'ERDAS ECW/JP2 SDK v5.1 (MacOSX)' from 
+* http://download.intergraph.com/
+* If you use the version 5.1.1 of the SDK the following commands 
+* should be executed before installing gdal with the ecw variant:
+sudo ln -s /Intergraph/ERDASEcwJpeg2000SDK5.1.1/Desktop_Read-Only /Intergraph/ERDASEcwJpeg2000SDK5.1
+sudo ln -s /Intergraph/ERDASEcwJpeg2000SDK5.1/lib/libNCSEcw.a /Intergraph/ERDASEcwJpeg2000SDK5.1/lib/libEcwJp2SDK.a
+****"       
+            error "ECW SDK 5.1 not installed."
+            }
+        if {(![file exists /Intergraph/ERDASEcwJpeg2000SDK5.1]) && \
+            ([file exists /Intergraph/ERDASEcwJpeg2000SDK5.1.1/Desktop_Read-Only])} {
+            ui_error "
+****
+* You are using the version 5.1.1 of the SDK.
+* Please execute the following commands to allow the 
+* installation of qdal with the ecw variant:
+sudo ln -s /Intergraph/ERDASEcwJpeg2000SDK5.1.1/Desktop_Read-Only /Intergraph/ERDASEcwJpeg2000SDK5.1
+sudo ln -s /Intergraph/ERDASEcwJpeg2000SDK5.1/lib/libNCSEcw.a /Intergraph/ERDASEcwJpeg2000SDK5.1/lib/libEcwJp2SDK.a
+****"
+            error "Symbolic links to the SDK not created yet."
+            }
+        if {(![file exists /Intergraph/ERDASEcwJpeg2000SDK5.1/lib/libEcwJp2SDK.a]) && \
+            ([file exists /Intergraph/ERDASEcwJpeg2000SDK5.1/lib/libNCSEcw.a])} {
+            ui_error "
+****
+* Please execute the following command to allow the 
+* installation of qdal with the ecw variant:
+sudo ln -s /Intergraph/ERDASEcwJpeg2000SDK5.1/lib/libNCSEcw.a /Intergraph/ERDASEcwJpeg2000SDK5.1/lib/libEcwJp2SDK.a
+****"
+            error "Symbolic link to the SDK library not created yet."
+            }
+        
+    }
+
+}
+
 variant hdf4 description {Enable HDF4 file format} {
     depends_lib-append      port:hdf4
     configure.args-delete   --without-hdf4
@@ -342 +386 @@
             bin/nearblack \
             bin/ogr2ogr \
             bin/ogrinfo \
+            bin/ogrlineref \
             bin/ogrtindex \
             bin/testepsg \
             lib/libgdal.1.dylib] \