Ticket #36496: gdal2.diff

Portfile

@@ -5 +5 @@
 
 name                gdal
 version             1.10.1
-revision            2
+revision            4
 categories          gis
 license             MIT BSD
 platforms           darwin
@@ -135 +135 @@
 variant mrsid description {Enable MrSID file format} {
     depends_lib-append      port:geoexpress-sdk
     configure.args-delete   --without-mrsid
-    configure.args-append       --with-mrsid=${prefix}/share/Geo_DSDK
-
-    # Fixes for Geo_DSDK 7.x - http://trac.osgeo.org/gdal/ticket/2410
-    patchfiles-append       patch-frmts_mrsid_mrsiddataset.cpp \
-                            patch-mrsid-configure
+    configure.args-append       --with-mrsid=${prefix}/share/Geo_DSDK/Raster_DSDK
 }
 
 variant hdf4 description {Enable HDF4 file format} {
@@ -323 +319 @@
     xinstall -m 755 -d ${destroot}${prefix}/share/doc/${name}
     xinstall -m 644 -W ${worksrcpath} HOWTO-RELEASE NEWS VERSION \
         ${destroot}${prefix}/share/doc/${name}
+
+    if {[variant_isset mrsid]} {
+         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/ogrtindex \
+            bin/testepsg \
+            lib/libgdal.1.dylib] \
+            {
+                exec install_name_tool -change libltidsdk.9.dylib ${prefix}/share/Geo_DSDK/Raster_DSDK/lib/libltidsdk.9.dylib ${destroot}${prefix}/${f}
+            }
+    }
+
 }
 
 livecheck.type  regex