proj: Update to 7.0.0

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

Module Name:	pkgsrc-wip
Committed By:	Greg Troxel <gdt%lexort.com@localhost>
Pushed By:	gdt
Date:		Tue Mar 10 13:24:53 2020 -0400
Changeset:	b263d8464a9dcec4157ddd7650087593c00a9655

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

Log Message:
proj: Update to 7.0.0

Not tested.

This drops the grid option, and needs to be adapted to the new world
order.

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

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

diffstat:
 proj/Makefile   |  9 ++++++---
 proj/PLIST      |  8 ++++----
 proj/distinfo   | 28 ++++------------------------
 proj/options.mk |  3 ++-
 4 files changed, 16 insertions(+), 32 deletions(-)

diffs:
diff --git a/proj/Makefile b/proj/Makefile
index 2f7888726f..dab896f007 100644
--- a/proj/Makefile
+++ b/proj/Makefile
@@ -1,8 +1,8 @@
 # $NetBSD: Makefile,v 1.17 2019/02/27 14:29:58 gdt Exp $
 
-# I have an update to 6 ready, but it is on hold pending an assessment
-# of projects.h removal fallout - gdt.
-VERSION_BASE=	6.3.1
+# Do not merge to pkgsrc without gdt approval; I have not yet
+# evaluated how much this will break.
+VERSION_BASE=	7.0.0
 VERSION_RC=
 VERSION=	${VERSION_BASE}${VERSION_RC}
 #PKGREVISION=	0
@@ -20,6 +20,7 @@ COMMENT=	Cartographic projection software
 
 # \todo: Add pdf manual.
 
+# \todo Think about how this works with the new grid CDN.
 # Grid files also have the following "cc-by ish" licenses:
 # cc-by, 2-clause-bsd,  License Ouverte, cc0 (eu)
 # open-government, cc-by, public-domain (na)
@@ -61,5 +62,7 @@ post-extract:
 	cd ${WRKDIR} && for f in *; do if [ $$f != ${WRKFINAL} ]; then mv $$f ${WRKFINAL}/data; fi; done
 
 .include "../../databases/sqlite3/buildlink3.mk"
+.include "../../graphics/tiff/buildlink3.mk"
+.include "../../www/curl/buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/proj/PLIST b/proj/PLIST
index d3c77117c7..be208e34f6 100644
--- a/proj/PLIST
+++ b/proj/PLIST
@@ -7,8 +7,8 @@ bin/invgeod
 bin/invproj
 bin/proj
 bin/projinfo
+bin/projsync
 include/geodesic.h
-include/org_proj4_PJ.h
 include/proj.h
 include/proj/common.hpp
 include/proj/coordinateoperation.hpp
@@ -31,8 +31,7 @@ man/man1/geod.1
 man/man1/gie.1
 man/man1/proj.1
 man/man1/projinfo.1
-man/man3/geodesic.3
-man/man3/pj_init.3
+man/man1/projsync.1
 ${PLIST.grids}share/proj/100800401.gsb
 ${PLIST.grids}share/proj/A66_National_13_09_01.gsb
 ${PLIST.grids}share/proj/AT_GIS_GRID.gsb
@@ -222,7 +221,7 @@ ${PLIST.grids}share/proj/nmhpgn.gsb
 ${PLIST.grids}share/proj/ntf_r93.gsb
 ${PLIST.grids}share/proj/ntv1_can.dat
 ${PLIST.grids}share/proj/ntv2_0.gsb
-share/proj/null
+@comment share/proj/null
 ${PLIST.grids}share/proj/nvhpgn.gsb
 ${PLIST.grids}share/proj/nyhpgn.gsb
 ${PLIST.grids}share/proj/nzgd2kgrid0005.gsb
@@ -234,6 +233,7 @@ ${PLIST.grids}share/proj/ontpht1964-nzvd2016.gtx
 share/proj/other.extra
 ${PLIST.grids}share/proj/pahpgn.gsb
 share/proj/proj.db
+share/proj/proj.ini
 share/proj/projjson.schema.json
 ${PLIST.grids}share/proj/prvi
 ${PLIST.grids}share/proj/pvhpgn.gsb
diff --git a/proj/distinfo b/proj/distinfo
index 42f0b2fdd2..577fa73492 100644
--- a/proj/distinfo
+++ b/proj/distinfo
@@ -1,27 +1,7 @@
 $NetBSD: distinfo,v 1.13 2019/02/21 00:55:04 gdt Exp $
 
-SHA1 (proj-6.3.1.tar.gz) = bc6baa7c494bc30992aaa5e3bd4dc4f443ece635
-RMD160 (proj-6.3.1.tar.gz) = 67394c6fc3382449de61fc7a4dba29e3508deb84
-SHA512 (proj-6.3.1.tar.gz) = 669b752f491bd99e320b0750c7129251a562a303e008e3d89c8e71baefd7f6d4ccb08234b3039c03694e2cc93b8dde81771cd7ffd981ff8045d855240a480a5e
-Size (proj-6.3.1.tar.gz) = 2823891 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.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 (proj-7.0.0.tar.gz) = f6bf56a1d9b92de1d20cf0c88d66665b0b324708
+RMD160 (proj-7.0.0.tar.gz) = e6c894b27e8185451131da35fe05c321fd567b39
+SHA512 (proj-7.0.0.tar.gz) = fd92937656c85c7f6969947323fa2752df0c931dd9c942b11c67dcae132f61f404c8da57ed7e7177aaa82f579e42b1c3611e6c2cc34d70454e548ad8afece243
+Size (proj-7.0.0.tar.gz) = 2893700 bytes
 SHA1 (patch-data_Makefile.in) = 41d5e2a9abbe1fef5036a427c45c4b838c4c373a
diff --git a/proj/options.mk b/proj/options.mk
index 4eecdcfa4f..e23ffe95a5 100644
--- a/proj/options.mk
+++ b/proj/options.mk
@@ -3,7 +3,8 @@
 PKG_OPTIONS_VAR=	PKG_OPTIONS.proj
 
 PKG_SUPPORTED_OPTIONS=	proj-grids
-PKG_SUGGESTED_OPTIONS=	proj-grids
+# \todo Convert to the proj7 new world order.
+#PKG_SUGGESTED_OPTIONS=	proj-grids
 
 .include "../../mk/bsd.options.mk"