[148353] trunk/dports/gis/gdal

5 May 2016

Revision: 148353
          https://trac.macports.org/changeset/148353
Author:   vince@macports.org
Date:     2016-05-05 03:04:02 -0700 (Thu, 05 May 2016)
Log Message:
-----------
gdal: bump to 2.1.0

Modified Paths:
--------------
    trunk/dports/gis/gdal/Portfile
    trunk/dports/gis/gdal/files/patch-apps_GNUmakefile.diff
    trunk/dports/gis/gdal/files/patch-configure-ecw-libcxx.diff
    trunk/dports/gis/gdal/files/patch-configure-ecw-libstdcxx.diff
    trunk/dports/gis/gdal/files/patch-ogr_api_cpp.diff

Removed Paths:
-------------
    trunk/dports/gis/gdal/files/patch-pdfcreatecopy_cpp.diff
    trunk/dports/gis/gdal/files/patch-pdfcreatecopy_h.diff
    trunk/dports/gis/gdal/files/patch-swig_python_GNUmakefile

Modified: trunk/dports/gis/gdal/Portfile
===================================================================

--- 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)
@@ -6,8 +6,8 @@
 PortGroup           muniversal 1.0
 
 name                gdal
-version             2.0.2
-revision            1
+version             2.1.0
+#revision            1
 categories          gis
 license             MIT BSD
 platforms           darwin
@@ -29,8 +29,8 @@
                     http://download.osgeo.org/gdal/ \
                     http://download.osgeo.org/gdal/CURRENT/
 
-checksums           rmd160  9939eed3061602410f0d234328e20c3df18b0bc1 \
-                    sha256  db7722caf8d9dd798ec18012b9cacf40a518918466126a88b9fd277bd7d40cc4
+checksums           rmd160  58105379a4331762eaa8c213b96c142c79b7e3cd \
+                    sha256  eb499b18e5c5262a803bb7530ae56e95c3293be7b26c74bcadf67489203bf2cd
 
 compilers.choose    cc cxx
 mpi.setup
@@ -101,16 +101,16 @@
 configure.args-append   --with-libjson-c=internal
 
 # Patch to ensure that the python installation respects DESTDIR
-patchfiles          patch-swig_python_GNUmakefile \
-                    patch-gdalwarpkernel_opencl_c.diff \
+patchfiles          patch-gdalwarpkernel_opencl_c.diff \
                     patch-gdalwarpkernel_opencl_h.diff \
-                    patch-pdfcreatecopy_h.diff \
-                    patch-pdfcreatecopy_cpp.diff \
                     patch-alg_GNUmakefile.diff \
                     patch-apps_GNUmakefile.diff \
                     patch-ogr_p_h.diff \
                     patch-ogr_api_cpp.diff \
                     patch-nawk.diff
+#                   patch-swig_python_GNUmakefile \
+                    patch-pdfcreatecopy_h.diff \
+                    patch-pdfcreatecopy_cpp.diff \
 
 
 pre-configure {

Modified: trunk/dports/gis/gdal/files/patch-apps_GNUmakefile.diff
===================================================================
--- 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)
@@ -1,10 +1,11 @@
---- 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) \
+--- 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 @@
  		testepsg$(EXE) \
  		gdalbuildvrt$(EXE)
-+CPPFLAGS 	:=	-DOGR_ENABLED $(CPPFLAGS)
- endif
  
- ifeq ($(HAVE_GEOS),yes)
++CPPFLAGS :=     -DOGR_ENABLED $(CPPFLAGS)
++
+ ifeq ($(GNM_ENABLED),yes)
+ BIN_LIST += 	gnmmanage$(EXE) gnmanalyse$(EXE)
+ CPPFLAGS +=	-I$(GDAL_ROOT)/gnm

Modified: trunk/dports/gis/gdal/files/patch-configure-ecw-libcxx.diff
===================================================================
--- 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)
@@ -1,28 +1,11 @@
---- 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"
+--- configure.old	2015-07-19 11:54:14.000000000 +0200
++++ configure	2015-07-19 11:56:22.000000000 +0200
+@@ -22951,7 +22951,7 @@
      { $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
+   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; }
+     { $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/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

Modified: trunk/dports/gis/gdal/files/patch-configure-ecw-libstdcxx.diff
===================================================================
--- 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)
@@ -1,28 +1,11 @@
---- 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"
+--- configure.old	2015-07-19 11:54:14.000000000 +0200
++++ configure	2015-07-19 11:56:22.000000000 +0200
+@@ -22951,7 +22951,7 @@
      { $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
+   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; }
+     { $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/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

Modified: trunk/dports/gis/gdal/files/patch-ogr_api_cpp.diff
===================================================================
--- 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)
@@ -1,11 +1,11 @@
---- 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
+--- 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
 @@ -33,6 +33,8 @@
  #include "ogr_api.h"
  #include "cpl_error.h"
  
 +#define OGR_ENABLED
 +
- static int bNonLinearGeometriesEnabled = TRUE;
+ static bool bNonLinearGeometriesEnabled = true;
  
  /************************************************************************/

Deleted: trunk/dports/gis/gdal/files/patch-pdfcreatecopy_cpp.diff
===================================================================
--- 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)
@@ -1,20 +0,0 @@
---- 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()                              */
- /************************************************************************/

Deleted: trunk/dports/gis/gdal/files/patch-pdfcreatecopy_h.diff
===================================================================
--- 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)
@@ -1,28 +0,0 @@
---- 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);

Deleted: trunk/dports/gis/gdal/files/patch-swig_python_GNUmakefile
===================================================================
--- 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)
@@ -1,16 +0,0 @@
---- 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
-

    

vince＠macports.org

tags

participants (1)