Update to 2.0.3

Upstream changes for 2.0.0 follow.  (2.0.[123] are bugfixes)

 * New GDAL drivers:
    - BPG: read-only driver for Better Portable Graphics format (experimental, no build support)
    - GPKG: read/write/update capabilities in the unified raster/vector driver
    - KEA: read/write driver for KEA format
    - PLMosaic: read-only driver for Planet Labs Mosaics API
    - ROI_PAC: read/write driver for image formats of JPL's ROI_PAC project (#5776)
    - VICAR: read-only driver for VICAR format
 * New OGR drivers:
    - Cloudant: read/write driver for Cloudant service
    - CSW: read-only driver for OGC CSW (Catalog Service for the Web) protocol
    - JML: read/write driver for OpenJUMP .jml format
    - PLScenes: read-only driver for Planet Labs Scenes API
    - Selaphin: read/write driver for the Selaphin/Seraphin format (#5442)
 * Significantly improved drivers: CSV, GPKG, GTiff, JP2OpenJPEG, MapInfo file, PG, SQLite
 * RFC 31: OGR 64bit Integer Fields and FIDs (trac.osgeo.org/gdal/wiki/rfc31_ogr_64)
   In OGR core, OGR SQL, Shapefile, PG, PGDump, GeoJSON, CSV, GPKG, SQLite, MySQL,
   OCI, MEM, VRT, JML, GML, WFS, CartoDB, XLSX, ODS, MSSQLSpatial, OSM, LIBKML, MITAB
 * RFC 46: GDAL/OGR unification ( http://trac.osgeo.org/gdal/wiki/rfc46_gdal_ogr_unification)
     - GDAL and OGR PDF drivers are unified into a single one
     - GDAL and OGR PCIDSK drivers are unified into a single one
 * RFC 49: Add support for curve geometries (http://trac.osgeo.org/gdal/wiki/rfc49_curve_geometries)
   In OGR core, and GML, NAS, PostgreSQL, PGDUMP, GPKG, SQLite, VFK, VRT, Interlis drivers
 * RFC 50: Add support for OGR field subtypes (http://trac.osgeo.org/gdal/wiki/rfc50_ogr_field_subtype)
   In OGR core, OGR SQL, swig bindings, CSV, FileGDB, GeoJSON, GML, GPKG, OpenFileGDB, PG, PGDump, SQLite, VRT
 * RFC 51: RasterIO() improvements : resampling and progress callback (http://trac.osgeo.org/gdal/wiki/rfc51_rasterio_resampling_progress)
 * RFC 52: Stricter SQL quoting (http://trac.osgeo.org/gdal/wiki/rfc52_strict_sql_quoting)
 * RFC 53: OGR not-null constraints and default values (http://trac.osgeo.org/gdal/wiki/rfc53_ogr_notnull_default)
   In OGR core, OGR SQL, PG, PGDump, CartoDB, GPKG, SQLite, MySQL, OCI, VRT, GML, WFS, FileGDB, OpenFileGDB and MSSQLSpatial
 * RFC 54: Dataset transactions (https://trac.osgeo.org/gdal/wiki/rfc54_dataset_transactions)
   In PG, GPKG, SQLite, FileGDB and MSSQLSpatial
 * RFC 55: refined SetFeature() and DeleteFeature() semantics.
   In GPKG, Shape, MySQL, OCI, SQLite, FileGDB, PG, CartoDB, MITAB and MSSQL
 * RFC 56: OFTTime/OFTDateTime millisecond accuracy ( https://trac.osgeo.org/gdal/wiki/rfc56_millisecond_precision )
 * RFC 57: 64bit histogram bucket count ( https://trac.osgeo.org/gdal/wiki/rfc57_histogram_64bit_count )
 * Upgrade to EPSG v8.5 database
 * Fix locale related issues when formatting or reading floating point numbers (#5731)

4 files changed, 20 insertions, 14 deletions

diff --git a/geography/gdal-lib/Makefile b/geography/gdal-lib/Makefile
index a2f49a6d56b..82c95a9928e 100644
--- a/geography/gdal-lib/Makefile
+++ b/geography/gdal-lib/Makefile
@@ -1,11 +1,12 @@
-# $NetBSD: Makefile,v 1.87 2017/01/13 02:26:04 gdt Exp $
+# $NetBSD: Makefile,v 1.88 2017/01/13 14:48:26 gdt Exp $
 
-DISTNAME=	gdal-1.11.5
+DISTNAME=	gdal-2.0.3
 PKGNAME=	${DISTNAME:S/gdal/gdal-lib/}
 CATEGORIES=	geography
 MASTER_SITES=	http://download.osgeo.org/gdal/${PKGVERSION_NOREV}/
 
 MAINTAINER=	brook@nmsu.edu
+#MAINTAINER+=	gdt@NetBSD.org
 HOMEPAGE=	http://www.gdal.org/
 COMMENT=	Translator library for raster geospatial data formats
 LICENSE=	mit
diff --git a/geography/gdal-lib/PLIST b/geography/gdal-lib/PLIST
index 780b49ed3d0..ac8de0966d5 100644
--- a/geography/gdal-lib/PLIST
+++ b/geography/gdal-lib/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.12 2015/11/26 13:37:30 adam Exp $
+@comment $NetBSD: PLIST,v 1.13 2017/01/13 14:48:26 gdt Exp $
 bin/gdal-config
 bin/gdal_contour
 bin/gdal_grid
@@ -55,6 +55,7 @@ include/gdal_alg.h
 include/gdal_alg_priv.h
 include/gdal_csv.h
 include/gdal_frmts.h
+include/gdal_mdreader.h
 include/gdal_pam.h
 include/gdal_priv.h
 include/gdal_proxy.h
@@ -68,6 +69,8 @@ include/gdalgrid.h
 include/gdalgrid_priv.h
 include/gdaljp2abstractdataset.h
 include/gdaljp2metadata.h
+include/gdaljp2metadatagenerator.h
+include/gdalsse_priv.h
 include/gdalwarper.h
 include/gdalwarpkernel_opencl.h
 include/gvgcpfit.h
@@ -105,6 +108,7 @@ share/gdal/gcs.csv
 share/gdal/gcs.override.csv
 share/gdal/gdal_datum.csv
 share/gdal/gdalicon.png
+share/gdal/gdalvrt.xsd
 share/gdal/geoccs.csv
 share/gdal/gml_registry.xml
 share/gdal/gt_datum.csv
@@ -145,4 +149,5 @@ share/gdal/trailer.dxf
 share/gdal/unit_of_measure.csv
 share/gdal/vertcs.csv
 share/gdal/vertcs.override.csv
+@pkgdir man/man1
 @pkgdir lib/gdalplugins
diff --git a/geography/gdal-lib/distinfo b/geography/gdal-lib/distinfo
index 5c3cc6eabd5..0908d7e47f9 100644
--- a/geography/gdal-lib/distinfo
+++ b/geography/gdal-lib/distinfo
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.30 2017/01/13 02:26:04 gdt Exp $
+$NetBSD: distinfo,v 1.31 2017/01/13 14:48:26 gdt Exp $
 
-SHA1 (gdal-1.11.5.tar.gz) = b510f3852e696cffe25c13ab0f8cb06805121c0a
-RMD160 (gdal-1.11.5.tar.gz) = a23f1303802df730563aceee8b4a673abf22ddba
-SHA512 (gdal-1.11.5.tar.gz) = 30d2982a64a243ba662ba7f64e86f927063ec91fdba124837a47d286602a0d55852ace92d7f722ffd2183c32e6cd61f0f7e826101ee19e58b50ed7fa671b80a4
-Size (gdal-1.11.5.tar.gz) = 10748545 bytes
-SHA1 (patch-GDALmake.opt.in) = f8096596d1b808d0c0a02e95ad5d0664b1c895eb
+SHA1 (gdal-2.0.3.tar.gz) = e2d8612c341d5be1229dd966d5c43d4bb1afe834
+RMD160 (gdal-2.0.3.tar.gz) = 7795300853c7f0880c6418f5b067e3ab3b06c28a
+SHA512 (gdal-2.0.3.tar.gz) = 3ed2a084fa146fab8d5f5e039480ab935edaefebe9e55f85bf637a4487a3f56951c93055395850e7bf35d5a6d6e901f741ae01ad64be87597aabfad52f1c5e90
+Size (gdal-2.0.3.tar.gz) = 11589011 bytes
+SHA1 (patch-GDALmake.opt.in) = ed84a6553772f07d4d2935311b85a01b156de6f7
 SHA1 (patch-dist__docs_install__unx.sh) = 359b90c592e002b4b9a8dc0fe6b07300c39c9bf6
 SHA1 (patch-frmts_grib_degrib18_degrib_myutil.c) = 6179ba75d77607cefa6f2413c50443054308cdd3
 SHA1 (patch-frmts_jpeg2000_jpeg2000__vsil__io.cpp) = 89d5d3d8e1604c76cc22ed931a170dfe61ad6880
diff --git a/geography/gdal-lib/patches/patch-GDALmake.opt.in b/geography/gdal-lib/patches/patch-GDALmake.opt.in
index 3fc589add18..560a672a6dc 100644
--- a/geography/gdal-lib/patches/patch-GDALmake.opt.in
+++ b/geography/gdal-lib/patches/patch-GDALmake.opt.in
@@ -1,17 +1,17 @@
-$NetBSD: patch-GDALmake.opt.in,v 1.2 2015/11/26 13:37:30 adam Exp $
+$NetBSD: patch-GDALmake.opt.in,v 1.3 2017/01/13 14:48:26 gdt Exp $
 
 Fix occasional paralell build failure:
   ogr/ogr_core.h:34:26: fatal error: gdal_version.h: No such file or directory
 by ensuring we have the correct includes.
 
---- GDALmake.opt.in.orig	2012-10-09 00:58:28.000000000 +0000
+--- GDALmake.opt.in.orig	2016-07-01 10:22:10.000000000 +0000
 +++ GDALmake.opt.in
-@@ -67,7 +67,7 @@ INST_DOCS	=	@exec_prefix@/doc
+@@ -66,7 +66,7 @@ INST_DOCS	=	@exec_prefix@/doc
  INST_MAN	=	@mandir@
  INST_HTML	=	$(HOME)/www/gdal
  
--CPPFLAGS	= @CPPFLAGS@ -I$(GDAL_ROOT)/port @EXTRA_INCLUDES@
-+CPPFLAGS	= @CPPFLAGS@ -I$(GDAL_ROOT)/port -I$(GDAL_ROOT)/gcore @EXTRA_INCLUDES@
+-CPPFLAGS	= @CPPFLAGS@ -I$(GDAL_ROOT)/port @EXTRA_INCLUDES@ -DGDAL_COMPILATION
++CPPFLAGS	= @CPPFLAGS@ -I$(GDAL_ROOT)/port -I$(GDAL_ROOT)/gcore @EXTRA_INCLUDES@ -DGDAL_COMPILATION
  CFLAGS		= @CFLAGS@ @C_WFLAGS@ $(USER_DEFS)
  CXXFLAGS	= @CXXFLAGS@ @CXX_WFLAGS@ $(USER_DEFS)
  LDFLAGS     = @LDFLAGS@