From ffecdbbb4dca47078df2363b6524529227a38445 Mon Sep 17 00:00:00 2001
From: landry <landry@openbsd.org>
Date: Tue, 7 Feb 2017 08:16:45 +0000
Subject: [PATCH] Update to gdal 2.1.3.

See https://trac.osgeo.org/gdal/wiki/Release/2.1.3-News
---
 geo/gdal/Makefile                           |  8 +++-----
 geo/gdal/distinfo                           |  8 ++++----
 geo/gdal/patches/patch-configure            | 10 +++++-----
 geo/gdal/patches/patch-swig_python_setup_py |  8 ++++----
 4 files changed, 16 insertions(+), 18 deletions(-)

diff --git a/geo/gdal/Makefile b/geo/gdal/Makefile
index 63004104e83..23c4315a7ff 100644
--- a/geo/gdal/Makefile
+++ b/geo/gdal/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.54 2017/02/06 20:20:23 sthen Exp $
+# $OpenBSD: Makefile,v 1.55 2017/02/07 08:16:45 landry Exp $
 
 COMMENT-main =	translator library for geospatial data formats
 COMMENT-python =python bindings and utilities for GDAL
 COMMENT-perl =	perl bindings for GDAL
 
-V =		2.1.2
+V =		2.1.3
 DISTNAME =	gdal-${V}
 DISTFILES =	${DISTNAME}${EXTRACT_SUFX} \
 		gdalautotest-${V}${EXTRACT_SUFX}
@@ -12,10 +12,8 @@ DISTFILES =	${DISTNAME}${EXTRACT_SUFX} \
 PKGNAME-main =	${DISTNAME}
 PKGNAME-python =py-${DISTNAME}
 PKGNAME-perl =	p5-Geo-GDAL-${V}
-REVISION-main =	0
-REVISION-perl =	0
 
-SHARED_LIBS =	gdal 27.0 #21.2
+SHARED_LIBS =	gdal 28.0 #21.3
 CATEGORIES =	geo devel
 
 HOMEPAGE =	http://www.gdal.org/
diff --git a/geo/gdal/distinfo b/geo/gdal/distinfo
index 7548842b1e7..967ea463fd6 100644
--- a/geo/gdal/distinfo
+++ b/geo/gdal/distinfo
@@ -1,4 +1,4 @@
-SHA256 (gdal-2.1.2.tar.gz) = aXYcOKysjG0+pxMENB9pgrXWYSWhqA2QiLa/0gGRJck=
-SHA256 (gdalautotest-2.1.2.tar.gz) = U5/KKI63mARcRGnHdc2EnGAI4BtDR7onP00U8aAAdPE=
-SIZE (gdal-2.1.2.tar.gz) = 12878051
-SIZE (gdalautotest-2.1.2.tar.gz) = 6005662
+SHA256 (gdal-2.1.3.tar.gz) = rmoKDcbrRamBpG2yfj3+FsZE/PBHMlV+LLMVd2l0B0o=
+SHA256 (gdalautotest-2.1.3.tar.gz) = se1OlzwTab06FXYafCDcBItAErZjVri05ZT5hN5zr5c=
+SIZE (gdal-2.1.3.tar.gz) = 12890278
+SIZE (gdalautotest-2.1.3.tar.gz) = 6016292
diff --git a/geo/gdal/patches/patch-configure b/geo/gdal/patches/patch-configure
index 3490d1a045b..e0579f1cced 100644
--- a/geo/gdal/patches/patch-configure
+++ b/geo/gdal/patches/patch-configure
@@ -1,10 +1,10 @@
-$OpenBSD: patch-configure,v 1.14 2016/08/01 08:56:40 landry Exp $
+$OpenBSD: patch-configure,v 1.15 2017/02/07 08:16:45 landry Exp $
 
 chunk 1&2: adapt paths for our openjp2 install
 
---- configure.orig	Mon Apr 25 19:35:51 2016
-+++ configure	Sun May 22 21:15:52 2016
-@@ -23677,9 +23677,9 @@ fi
+--- configure.orig	Fri Jan 20 09:20:46 2017
++++ configure	Mon Feb  6 11:22:35 2017
+@@ -23700,9 +23700,9 @@ fi
          LIBS="-lopenjp2 $LIBS"
      fi
    else
@@ -16,7 +16,7 @@ chunk 1&2: adapt paths for our openjp2 install
  if test "x$ac_cv_header_openjpeg_2_1_openjpeg_h" = xyes; then :
    cat >>confdefs.h <<_ACEOF
  #define HAVE_OPENJPEG_2_1_OPENJPEG_H 1
-@@ -23743,7 +23743,7 @@ else
+@@ -23766,7 +23766,7 @@ else
    HAVE_OPENJPEG=yes
    if test -r $with_openjpeg/include/openjpeg-2.0/openjpeg.h ; then
      EXTRA_INCLUDES="-I$with_openjpeg/include $EXTRA_INCLUDES"
diff --git a/geo/gdal/patches/patch-swig_python_setup_py b/geo/gdal/patches/patch-swig_python_setup_py
index 3a985164da8..ae05476a662 100644
--- a/geo/gdal/patches/patch-swig_python_setup_py
+++ b/geo/gdal/patches/patch-swig_python_setup_py
@@ -1,7 +1,7 @@
-$OpenBSD: patch-swig_python_setup_py,v 1.6 2016/05/15 12:18:26 landry Exp $
---- swig/python/setup.py.orig	Mon Apr 25 19:35:56 2016
-+++ swig/python/setup.py	Fri May 13 09:46:30 2016
-@@ -197,7 +197,7 @@ class gdal_ext(build_ext):
+$OpenBSD: patch-swig_python_setup_py,v 1.7 2017/02/07 08:16:45 landry Exp $
+--- swig/python/setup.py.orig	Fri Jan 20 09:20:59 2017
++++ swig/python/setup.py	Mon Feb  6 11:22:35 2017
+@@ -210,7 +210,7 @@ class gdal_ext(build_ext):
          self.include_dirs.append(os.path.join(self.gdaldir,'include'))