geography/proj: Update to 6.3.2

(pkgsrc note: Update to 7.0.1 is on hold due to concerns about
breaking depending packages.)

Upstream changes: bug fixes

3 files changed, 7 insertions, 30 deletions

diff --git a/geography/proj/Makefile b/geography/proj/Makefile
index f077471ed05..23c78e67b6a 100644
--- a/geography/proj/Makefile
+++ b/geography/proj/Makefile
@@ -1,16 +1,14 @@
-# $NetBSD: Makefile,v 1.20 2020/04/12 08:27:56 adam Exp $
+# $NetBSD: Makefile,v 1.21 2020/05/03 18:05:10 gdt Exp $
 
 # An update to 7 is on hold because I have not yet assessed how much
 # trouble it will cause.  -gdt
-VERSION_BASE=	6.3.1
+VERSION_BASE=	6.3.2
 VERSION_RC=
 VERSION=	${VERSION_BASE}${VERSION_RC}
-#PKGREVISION=	0
 # proj RCs have names like 5.1.0RC1 but unpack to 5.1.0
 WRKFINAL=	proj-${VERSION_BASE}
 WRKSRC=		${WRKDIR}/${WRKFINAL}
 DISTNAME=	proj-${VERSION}
-PKGREVISION=	1
 CATEGORIES=	geography
 MASTER_SITES=	https://download.osgeo.org/proj/
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX}
diff --git a/geography/proj/distinfo b/geography/proj/distinfo
index efba90fbc4a..14860a9c809 100644
--- a/geography/proj/distinfo
+++ b/geography/proj/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.14 2020/03/10 16:17:38 gdt Exp $
+$NetBSD: distinfo,v 1.15 2020/05/03 18:05:10 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-6.3.2.tar.gz) = 5eebf75406b21826eb632ea94acf4907ddccad29
+RMD160 (proj-6.3.2.tar.gz) = 921b822868362fd1a81158542d540fd34a0c44c7
+SHA512 (proj-6.3.2.tar.gz) = 6fcaf037fe2895686184b2bf668e48d882afe8245cd6cd625d3fb66ebc34c066738fbe683889a3085bd8fe91f2c3b829064aa2318fa592ff7374cee153617b22
+Size (proj-6.3.2.tar.gz) = 2827685 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
@@ -24,4 +24,3 @@ SHA1 (proj-datumgrid-world-1.0.tar.gz) = b66863826b2387f28c860abf2c6ee2366b96708
 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-data_Makefile.in) = 41d5e2a9abbe1fef5036a427c45c4b838c4c373a
diff --git a/geography/proj/patches/patch-data_Makefile.in b/geography/proj/patches/patch-data_Makefile.in
deleted file mode 100644
index cfbe25010e1..00000000000
--- a/geography/proj/patches/patch-data_Makefile.in
+++ /dev/null
@@ -1,20 +0,0 @@
-$NetBSD: patch-data_Makefile.in,v 1.1 2020/03/10 16:17:38 gdt Exp $
-
-Remediate bashism.
-
-Posted about on mailing list 20200310.
-\todo File bug and pull request to fix.
-\todo File pull request to adjust upstream standards.
-\todo File bug that CI doesn't detect bashisms.
-
---- data/Makefile.in.orig	2020-02-10 10:16:34.000000000 +0000
-+++ data/Makefile.in
-@@ -594,7 +594,7 @@ proj.db: $(DATAPATH)/sql/*.sql
- 	echo "" | head -c1; \
-         if [ $$? -eq 0 ] ; then \
-          echo "Running foreign_key_check"; \
--	 if [[ $$(echo "pragma foreign_key_check;" | sqlite3 proj.db | head -c1 | wc -c) -ne 0 ]]; then \
-+	 if [ $$(echo "pragma foreign_key_check;" | sqlite3 proj.db | head -c1 | wc -c) -ne 0 ]; then \
- 		echo "Foreign key check failed"; \
- 		$(RM) proj.db; \
- 		exit 1; \