proj: Update to 6.3.0

[Greg Troxel <gdt%lexort.com@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Greg Troxel <gdt%lexort.com@localhost>
Pushed By:	gdt
Date:		Sun Jan 5 14:01:42 2020 -0500
Changeset:	1f4eeb29adf8e2ed79ec92e6c73137c240eedd00

Modified Files:
	proj/Makefile
	proj/PLIST
	proj/TODO
	proj/distinfo
	proj/options.mk

Log Message:
proj: Update to 6.3.0

Also update 3 of the 5 datumgrid files.

Upstream NEWS (omitting bugfixes):

  Upstream withdrew include/proj_json_streaming_writer.hpp but this is
  not mentioned in NEWS.

6.3.0 Release Notes
-------------------

 Updates
 -------

 o Database: tune accuracy of Canadian NTv1 file w.r.t NTv2 (#1812)

 o Modify verbosity level of some debug/trace messages (#1811)

 o projinfo: no longer call createBoundCRSToWGS84IfPossible() for WKT1:GDAL
   (#1810)

 o proj_trans: add retry logic to select other transformation if the best one
   fails. (#1809)

 o BoundCRS::identify(): improvements to discard CRS that aren't relevant
   (#1802)

 o Database: update to IGNF v3.1.0 (#1785)

 o Build: Only export symbols if building DLL (#1773)

 o Database: update ESRI entries with ArcGIS Desktop version 10.8.0 database
   (#1762)

 o createOperations(): chain operations whose middle CRSs are not identical but
   have the same datum (#1734)

 o import/export PROJJSON: support a interpolation_crs key to geoid_model
   (#1732)

 o Database: update to EPSG v9.8.4 (#1725)

 o Build: require SQLite 3.11 (#1721)

 o Add support for GEOIDMODEL (#1710)

 o Better filtering based on extent and performance improvements (#1709)

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=1f4eeb29adf8e2ed79ec92e6c73137c240eedd00

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 proj/Makefile   |  5 +++-
 proj/PLIST      | 81 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++-
 proj/TODO       |  3 ---
 proj/distinfo   | 33 ++++++++++++-----------
 proj/options.mk |  6 ++---
 5 files changed, 103 insertions(+), 25 deletions(-)

diffs:
diff --git a/proj/Makefile b/proj/Makefile
index 36950ce8aa..2bf081d9d8 100644
--- a/proj/Makefile
+++ b/proj/Makefile
@@ -2,7 +2,7 @@
 
 # I have an update to 6 ready, but it is on hold pending an assessment
 # of projects.h removal fallout - gdt.
-VERSION_BASE=	6.2.1
+VERSION_BASE=	6.3.0
 VERSION_RC=
 VERSION=	${VERSION_BASE}${VERSION_RC}
 #PKGREVISION=	0
@@ -34,6 +34,9 @@ USE_TOOLS+=		gmake pkg-config
 GNU_CONFIGURE=		yes
 
 .if !empty(PKG_OPTIONS:Mproj-grids)
+# Ideally, upstream would have an approach which enables testing with
+# the grids that users ought to have.  Until then, fail if test
+# preconditions are not met.
 do-test:
 	${ECHO} "Tests assume extra grids are not installed."
 	${FALSE}
diff --git a/proj/PLIST b/proj/PLIST
index 2ce56228f1..d3c77117c7 100644
--- a/proj/PLIST
+++ b/proj/PLIST
@@ -22,7 +22,6 @@ include/proj/util.hpp
 include/proj_api.h
 include/proj_constants.h
 include/proj_experimental.h
-include/proj_json_streaming_writer.hpp
 include/proj_symbol_rename.h
 lib/libproj.la
 lib/pkgconfig/proj.pc
@@ -34,19 +33,45 @@ man/man1/proj.1
 man/man1/projinfo.1
 man/man3/geodesic.3
 man/man3/pj_init.3
+${PLIST.grids}share/proj/100800401.gsb
 ${PLIST.grids}share/proj/A66_National_13_09_01.gsb
+${PLIST.grids}share/proj/AT_GIS_GRID.gsb
+${PLIST.grids}share/proj/AUSGeoid09_V1.01.gtx
+${PLIST.grids}share/proj/AUSGeoid2020_20180201.gtx
+${PLIST.grids}share/proj/AUSGeoid98.gtx
 ${PLIST.grids}share/proj/BETA2007.gsb
+${PLIST.grids}share/proj/BWTA2017.gsb
+${PLIST.grids}share/proj/CGG2013ai08.gtx
+${PLIST.grids}share/proj/CGG2013an83.gtx
+${PLIST.grids}share/proj/CGG2013i08.gtx
+${PLIST.grids}share/proj/CGG2013n83.gtx
+${PLIST.grids}share/proj/CGVD2013RGSPM06.gtx
 share/proj/CH
 ${PLIST.grids}share/proj/CHENyx06_ETRS.gsb
 ${PLIST.grids}share/proj/CHENyx06a.gsb
+${PLIST.grids}share/proj/D73_ETRS89_geo.gsb
+${PLIST.grids}share/proj/DLx_ETRS89_geo.gsb
 ${PLIST.grids}share/proj/FL
 ${PLIST.grids}share/proj/GDA94_GDA2020_conformal.gsb
 ${PLIST.grids}share/proj/GDA94_GDA2020_conformal_and_distortion.gsb
+${PLIST.grids}share/proj/GDA94_GDA2020_conformal_christmas_island.gsb
+${PLIST.grids}share/proj/GDA94_GDA2020_conformal_cocos_island.gsb
 share/proj/GL27
+${PLIST.grids}share/proj/HT2_2010v70.gtx
+${PLIST.grids}share/proj/ISN2004_ISN2016.gsb
+${PLIST.grids}share/proj/ISN2004_ISN2016.gtx
+${PLIST.grids}share/proj/ISN93_ISN2016.gsb
+${PLIST.grids}share/proj/ISN93_ISN2016.gtx
+${PLIST.grids}share/proj/ISN_vel_beta.gtx
 share/proj/ITRF2000
 share/proj/ITRF2008
 share/proj/ITRF2014
+${PLIST.grids}share/proj/Icegeoid_ISN2004.gtx
+${PLIST.grids}share/proj/Icegeoid_ISN2016.gtx
+${PLIST.grids}share/proj/Icegeoid_ISN93.gtx
+${PLIST.grids}share/proj/MAY76V20.gsb
 ${PLIST.grids}share/proj/MD
+${PLIST.grids}share/proj/NTv2_SN.gsb
 ${PLIST.grids}share/proj/National_84_02_07_01.gsb
 ${PLIST.grids}share/proj/OSGM15_Belfast.gtx
 ${PLIST.grids}share/proj/OSGM15_Malin.gtx
@@ -61,35 +86,74 @@ ${PLIST.grids}share/proj/RALS2016.gtx
 ${PLIST.grids}share/proj/RAMART2016.gtx
 ${PLIST.grids}share/proj/RAMG2016.gtx
 ${PLIST.grids}share/proj/RAR07_bl.gtx
+${PLIST.grids}share/proj/RASPM2018.gtx
 ${PLIST.grids}share/proj/SWEN17_RH2000.gtx
+${PLIST.grids}share/proj/SeTa2016.gsb
 ${PLIST.grids}share/proj/TN
 ${PLIST.grids}share/proj/WI
 ${PLIST.grids}share/proj/WO
 ${PLIST.grids}share/proj/alaska
 ${PLIST.grids}share/proj/alhpgn.gsb
 ${PLIST.grids}share/proj/arhpgn.gsb
+${PLIST.grids}share/proj/auckht1946-nzvd2016.gtx
 ${PLIST.grids}share/proj/azhpgn.gsb
 ${PLIST.grids}share/proj/bd72lb72_etrs89lb08.gsb
+${PLIST.grids}share/proj/blufht1955-nzvd2016.gtx
 ${PLIST.grids}share/proj/c1hpgn.gsb
 ${PLIST.grids}share/proj/c2hpgn.gsb
 ${PLIST.grids}share/proj/cnhpgn.gsb
 ${PLIST.grids}share/proj/cohpgn.gsb
 ${PLIST.grids}share/proj/conus
+${PLIST.grids}share/proj/cq77na83.gsb
+${PLIST.grids}share/proj/cshpgn.gsb
 ${PLIST.grids}share/proj/dnn.gtx
+${PLIST.grids}share/proj/dublht1960-nzvd2016.gtx
+${PLIST.grids}share/proj/duneht1958-nzvd2016.gtx
 ${PLIST.grids}share/proj/dvr90.gtx
 ${PLIST.grids}share/proj/egm08_25.gtx
 ${PLIST.grids}share/proj/egm96_15.gtx
 ${PLIST.grids}share/proj/emhpgn.gsb
+${PLIST.grids}share/proj/eshpgn.gsb
 ${PLIST.grids}share/proj/ethpgn.gsb
 ${PLIST.grids}share/proj/flhpgn.gsb
 ${PLIST.grids}share/proj/fvr09.gtx
+${PLIST.grids}share/proj/g1999a01.gtx
+${PLIST.grids}share/proj/g1999a02.gtx
+${PLIST.grids}share/proj/g1999a03.gtx
+${PLIST.grids}share/proj/g1999a04.gtx
+${PLIST.grids}share/proj/g1999h01.gtx
+${PLIST.grids}share/proj/g1999p01.gtx
+${PLIST.grids}share/proj/g1999u01.gtx
+${PLIST.grids}share/proj/g1999u02.gtx
+${PLIST.grids}share/proj/g1999u03.gtx
+${PLIST.grids}share/proj/g1999u04.gtx
+${PLIST.grids}share/proj/g1999u05.gtx
+${PLIST.grids}share/proj/g1999u06.gtx
+${PLIST.grids}share/proj/g1999u07.gtx
+${PLIST.grids}share/proj/g1999u08.gtx
+${PLIST.grids}share/proj/g2003a01.gtx
+${PLIST.grids}share/proj/g2003a02.gtx
+${PLIST.grids}share/proj/g2003a03.gtx
+${PLIST.grids}share/proj/g2003a04.gtx
+${PLIST.grids}share/proj/g2003h01.gtx
+${PLIST.grids}share/proj/g2003p01.gtx
+${PLIST.grids}share/proj/g2009g01.gtx
+${PLIST.grids}share/proj/g2009h01.gtx
+${PLIST.grids}share/proj/g2009p01.gtx
+${PLIST.grids}share/proj/g2009s01.gtx
 ${PLIST.grids}share/proj/g2012ba0.gtx
 ${PLIST.grids}share/proj/g2012bg0.gtx
 ${PLIST.grids}share/proj/g2012bh0.gtx
 ${PLIST.grids}share/proj/g2012bp0.gtx
 ${PLIST.grids}share/proj/g2012bs0.gtx
 ${PLIST.grids}share/proj/g2012bu0.gtx
+${PLIST.grids}share/proj/g2018p0.gtx
+${PLIST.grids}share/proj/g2018u0.gtx
 ${PLIST.grids}share/proj/gahpgn.gsb
+${PLIST.grids}share/proj/geoid03_conus.gtx
+${PLIST.grids}share/proj/geoid06_ak.gtx
+${PLIST.grids}share/proj/geoid09_ak.gtx
+${PLIST.grids}share/proj/geoid09_conus.gtx
 ${PLIST.grids}share/proj/gg10_sbv2.gtx
 ${PLIST.grids}share/proj/gg10_smv2.gtx
 ${PLIST.grids}share/proj/ggg00_lsv2.gtx
@@ -122,6 +186,7 @@ ${PLIST.grids}share/proj/ggpf08-Tubuai.gtx
 ${PLIST.grids}share/proj/ggpf10-Moorea.gtx
 ${PLIST.grids}share/proj/ggpf10-Tahiti.gtx
 ${PLIST.grids}share/proj/ggspm06v1.gtx
+${PLIST.grids}share/proj/gisbht1926-nzvd2016.gtx
 ${PLIST.grids}share/proj/guhpgn.gsb
 ${PLIST.grids}share/proj/gvr2000.gtx
 ${PLIST.grids}share/proj/gvr2016.gtx
@@ -130,20 +195,27 @@ ${PLIST.grids}share/proj/hihpgn.gsb
 ${PLIST.grids}share/proj/iahpgn.gsb
 ${PLIST.grids}share/proj/ilhpgn.gsb
 ${PLIST.grids}share/proj/inhpgn.gsb
+${PLIST.grids}share/proj/kshpgn.gsb
 ${PLIST.grids}share/proj/kyhpgn.gsb
 ${PLIST.grids}share/proj/lahpgn.gsb
+${PLIST.grids}share/proj/lyttht1937-nzvd2016.gtx
 ${PLIST.grids}share/proj/mdhpgn.gsb
 ${PLIST.grids}share/proj/mehpgn.gsb
 ${PLIST.grids}share/proj/mihpgn.gsb
 ${PLIST.grids}share/proj/mnhpgn.gsb
 ${PLIST.grids}share/proj/mohpgn.gsb
+${PLIST.grids}share/proj/motuht1953-nzvd2016.gtx
+${PLIST.grids}share/proj/mshpgn.gsb
+${PLIST.grids}share/proj/na27na83.gsb
 share/proj/nad.lst
 share/proj/nad27
 share/proj/nad83
+${PLIST.grids}share/proj/napiht1962-nzvd2016.gtx
 ${PLIST.grids}share/proj/nbhpgn.gsb
 ${PLIST.grids}share/proj/nchpgn.gsb
 ${PLIST.grids}share/proj/ndhpgn.gsb
 ${PLIST.grids}share/proj/nehpgn.gsb
+${PLIST.grids}share/proj/nelsht1955-nzvd2016.gtx
 ${PLIST.grids}share/proj/njhpgn.gsb
 ${PLIST.grids}share/proj/nkgrf03vel_realigned_z.gtx
 ${PLIST.grids}share/proj/nmhpgn.gsb
@@ -154,8 +226,11 @@ share/proj/null
 ${PLIST.grids}share/proj/nvhpgn.gsb
 ${PLIST.grids}share/proj/nyhpgn.gsb
 ${PLIST.grids}share/proj/nzgd2kgrid0005.gsb
+${PLIST.grids}share/proj/nzgeoid2009.gtx
+${PLIST.grids}share/proj/nzgeoid2016.gtx
 ${PLIST.grids}share/proj/ohhpgn.gsb
 ${PLIST.grids}share/proj/okhpgn.gsb
+${PLIST.grids}share/proj/ontpht1964-nzvd2016.gtx
 share/proj/other.extra
 ${PLIST.grids}share/proj/pahpgn.gsb
 share/proj/proj.db
@@ -165,18 +240,22 @@ ${PLIST.grids}share/proj/pvhpgn.gsb
 ${PLIST.grids}share/proj/schpgn.gsb
 ${PLIST.grids}share/proj/sdhpgn.gsb
 ${PLIST.grids}share/proj/stgeorge
+${PLIST.grids}share/proj/stisht1977-nzvd2016.gtx
 ${PLIST.grids}share/proj/stlrnc
 ${PLIST.grids}share/proj/stpaul
+${PLIST.grids}share/proj/taraht1970-nzvd2016.gtx
 ${PLIST.grids}share/proj/tnhpgn.gsb
 ${PLIST.grids}share/proj/uthpgn.gsb
 ${PLIST.grids}share/proj/vahpgn.gsb
 ${PLIST.grids}share/proj/vertconc.gtx
 ${PLIST.grids}share/proj/vertcone.gtx
 ${PLIST.grids}share/proj/vertconw.gtx
+${PLIST.grids}share/proj/wellht1953-nzvd2016.gtx
 ${PLIST.grids}share/proj/wihpgn.gsb
 ${PLIST.grids}share/proj/wmhpgn.gsb
 ${PLIST.grids}share/proj/wohpgn.gsb
 share/proj/world
+${PLIST.grids}share/proj/wshpgn.gsb
 ${PLIST.grids}share/proj/wthpgn.gsb
 ${PLIST.grids}share/proj/wvhpgn.gsb
 ${PLIST.grids}share/proj/wyhpgn.gsb
diff --git a/proj/TODO b/proj/TODO
index eb9093b1bc..a8c77dca6f 100644
--- a/proj/TODO
+++ b/proj/TODO
@@ -2,6 +2,3 @@ Do not bring into pkgsrc proper yet, because too many depending
 packages will break. -gdt
 
 Add manual.  Howver, it is not at the same MASTER_SITE.
-
-Decide how to deal with tests, which break if the grids are installed
--- but without the grids, users get worse results.
diff --git a/proj/distinfo b/proj/distinfo
index bd86b78503..ab66644d55 100644
--- a/proj/distinfo
+++ b/proj/distinfo
@@ -1,27 +1,26 @@
 $NetBSD: distinfo,v 1.13 2019/02/21 00:55:04 gdt Exp $
 
-SHA1 (proj-6.2.1.tar.gz) = 8aa3aebe620f472020c9b515267e95d2e89b9906
-RMD160 (proj-6.2.1.tar.gz) = d0f5586419eb3642d762be4c4d796a15884e9229
-SHA512 (proj-6.2.1.tar.gz) = 1e8632a9c6fa00c0354473f60d81e4644f173b42f6613856ba03e2404f429864fd5052aacba945ccd265173397bed2abdbe325320b54bc7b1c4a75ad95395a89
-Size (proj-6.2.1.tar.gz) = 2698759 bytes
+SHA1 (proj-6.3.0.tar.gz) = d56b265cee08d6e77fdec178949375e51afc9761
+RMD160 (proj-6.3.0.tar.gz) = e99eda095cecc33e5f0fc530154260d2e0e8b055
+SHA512 (proj-6.3.0.tar.gz) = 679fd2e57f27feeb956d2a8843cb9028895a78f0dac104c920cc9060afade434b953fb381fed350e5c8ac15cd796f795220e0f1ad276a4f7482d6e7f5681d06e
+Size (proj-6.3.0.tar.gz) = 2758388 bytes
 SHA1 (proj-datumgrid-1.8.tar.gz) = ede1c255adebb903f9ec33c5760ecb0df7b3b03c
 RMD160 (proj-datumgrid-1.8.tar.gz) = 074fcfba2e41cbe81e5be45eddc0e38683d891ef
 SHA512 (proj-datumgrid-1.8.tar.gz) = 23153f5b57d210e37cd6e9e0fced23bdabb1c67476e9fb50eb83a68ae066a5c3675822472f5d558d10ddf36ac1d73d538b75304d112a1bfcd8d0bbd26c6481a5
 Size (proj-datumgrid-1.8.tar.gz) = 6604329 bytes
-SHA1 (proj-datumgrid-europe-1.4.tar.gz) = b191d6ad053c40c48c4bf990a151c7a321bd28be
-RMD160 (proj-datumgrid-europe-1.4.tar.gz) = 96b3ccf6a8a44b45615b44aa7536d2ac0a308390
-SHA512 (proj-datumgrid-europe-1.4.tar.gz) = 4043c0791af086541a3e08f7ad667b25968ed25e6595c1f047e1272f52838d28ab4010a076f9524882f97d7aa9104769c0b9cdf17394915c5b70b0dc13e019ee
-Size (proj-datumgrid-europe-1.4.tar.gz) = 26115747 bytes
-SHA1 (proj-datumgrid-north-america-1.2.tar.gz) = c4d858cd584b33c846536ef75fb007168fb0b3a7
-RMD160 (proj-datumgrid-north-america-1.2.tar.gz) = a95ab90d3fb1379770f28bd31c7f70a73895721f
-SHA512 (proj-datumgrid-north-america-1.2.tar.gz) = cd6f934faa0172713880c35184cf8ad75127d19f0e7656d9bef6c97dee049eede27d9e3c6f0d7a1592a6a60088d219bd5c0e1209f35143b17debb0125f030596
-Size (proj-datumgrid-north-america-1.2.tar.gz) = 73655751 bytes
-SHA1 (proj-datumgrid-oceania-1.0.tar.gz) = 42970835b4932e5e96a630759c28b75502f4b382
-RMD160 (proj-datumgrid-oceania-1.0.tar.gz) = fcafe24982a1cd40c97137d42f2438fc48938c27
-SHA512 (proj-datumgrid-oceania-1.0.tar.gz) = a079fdb0ab22e591e55efa003ecd0ca1d65ce84ac0eb1b74456c1d3d62e601e3639b551aab1a0c2e77ca580d0c96cf69284e6591b80cffd18efdaada47d13e64
-Size (proj-datumgrid-oceania-1.0.tar.gz) = 96908713 bytes
+SHA1 (proj-datumgrid-europe-1.5.tar.gz) = 96556de773628a1fd312d49211a687b5f2299e39
+RMD160 (proj-datumgrid-europe-1.5.tar.gz) = d48f3599ae8881022203316d9ad4ae43921282f0
+SHA512 (proj-datumgrid-europe-1.5.tar.gz) = 456a8c27dad7ef8fc1790ef822e7e8dcbc69b79e0a28df8c6b58d24b0ef4a3221cebd8e911a0d84b7f00694247b0fb8f4361a38d7369f921da000c838812f389
+Size (proj-datumgrid-europe-1.5.tar.gz) = 187195036 bytes
+SHA1 (proj-datumgrid-north-america-1.3.tar.gz) = 386a7043a1ed786d0b766b9766daaa7d1c18d658
+RMD160 (proj-datumgrid-north-america-1.3.tar.gz) = 5db05ceebed69f732119a6c047c036c742308fc5
+SHA512 (proj-datumgrid-north-america-1.3.tar.gz) = d79b44b2a20aef4ef41ba4d2f91146b54fa94978ef9b7512931ee78bdd373bbbe2c89a6748cef77c3b0e912a5b937ddecb31fd7a9e9fe04e36b9907184830a19
+Size (proj-datumgrid-north-america-1.3.tar.gz) = 452401850 bytes
+SHA1 (proj-datumgrid-oceania-1.1.tar.gz) = a45190c74e7e89828582c304a9d7bc7c63882f29
+RMD160 (proj-datumgrid-oceania-1.1.tar.gz) = 73c802e8438b8a79cf1667b40f6b1baf44bdea58
+SHA512 (proj-datumgrid-oceania-1.1.tar.gz) = 8ecd31470305c1433b3ce5e26f44e0a1e2131c6d8a76b2318c1a1cf9241a4f70ca6e8638ff64315d1061e2aa3046a4ca8c4f4336ad682ce18362ee2c956aed6b
+Size (proj-datumgrid-oceania-1.1.tar.gz) = 144248108 bytes
 SHA1 (proj-datumgrid-world-1.0.tar.gz) = b66863826b2387f28c860abf2c6ee2366b967088
 RMD160 (proj-datumgrid-world-1.0.tar.gz) = a21a6320eb7da3bbf72b7ad685a08255b8f9663d
 SHA512 (proj-datumgrid-world-1.0.tar.gz) = 9f79f4c24f1a4a472f2747e4bb147c7140a92f3043b283f2a0326775393ebb39f634f2715a4d085dc33eabbbed4c3fb1871753ecf6c238c179ac0bbe83b9ca3e
 Size (proj-datumgrid-world-1.0.tar.gz) = 134373680 bytes
-SHA1 (patch-configure) = 07a7f8fcef069cc2f4680f72c296da91371bd71e
diff --git a/proj/options.mk b/proj/options.mk
index 268d3b6fb1..4eecdcfa4f 100644
--- a/proj/options.mk
+++ b/proj/options.mk
@@ -11,9 +11,9 @@ PLIST_VARS+=		grids
 
 .if !empty(PKG_OPTIONS:Mproj-grids)
 DISTFILES+=	proj-datumgrid-1.8${EXTRACT_SUFX}
-DISTFILES+=	proj-datumgrid-europe-1.4${EXTRACT_SUFX}
-DISTFILES+=	proj-datumgrid-north-america-1.2${EXTRACT_SUFX}
-DISTFILES+=	proj-datumgrid-oceania-1.0${EXTRACT_SUFX}
+DISTFILES+=	proj-datumgrid-europe-1.5${EXTRACT_SUFX}
+DISTFILES+=	proj-datumgrid-north-america-1.3${EXTRACT_SUFX}
+DISTFILES+=	proj-datumgrid-oceania-1.1${EXTRACT_SUFX}
 DISTFILES+=	proj-datumgrid-world-1.0${EXTRACT_SUFX}
 
 PLIST.grids=		yes