From 19b2d960697c94652013baf10310b3ed4c5d0195 Mon Sep 17 00:00:00 2001
From: Greg Troxel <gdt@lexort.com>
Date: Sun, 3 May 2020 15:09:36 -0400
Subject: [PATCH] proj: Update to 7.0.1

Upstream changes: bugfixes
---
 proj/Makefile                       |  2 +-
 proj/distinfo                       |  9 ++++-----
 proj/patches/patch-data_Makefile.in | 20 --------------------
 3 files changed, 5 insertions(+), 26 deletions(-)
 delete mode 100644 proj/patches/patch-data_Makefile.in

diff --git a/proj/Makefile b/proj/Makefile
index dab896f007..02b26f0a6b 100644
--- a/proj/Makefile
+++ b/proj/Makefile
@@ -2,7 +2,7 @@
 
 # Do not merge to pkgsrc without gdt approval; I have not yet
 # evaluated how much this will break.
-VERSION_BASE=	7.0.0
+VERSION_BASE=	7.0.1
 VERSION_RC=
 VERSION=	${VERSION_BASE}${VERSION_RC}
 #PKGREVISION=	0
diff --git a/proj/distinfo b/proj/distinfo
index 577fa73492..c7cc1074cc 100644
--- a/proj/distinfo
+++ b/proj/distinfo
@@ -1,7 +1,6 @@
 $NetBSD: distinfo,v 1.13 2019/02/21 00:55:04 gdt Exp $
 
-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
+SHA1 (proj-7.0.1.tar.gz) = e7e8b166a8788414ed039e8d645362d5bf882114
+RMD160 (proj-7.0.1.tar.gz) = 7b947434b0b08c7cce227880b2ccb3dfbef9be78
+SHA512 (proj-7.0.1.tar.gz) = 034d1b916980c80fe9f8e67d2897814e611920af3e852f152fcd9e3fc4ec8cbc39bbd8f8296949a3c3f5e6708bb9d84e61c4cba9c01476a3888448135e97dc33
+Size (proj-7.0.1.tar.gz) = 5312488 bytes
diff --git a/proj/patches/patch-data_Makefile.in b/proj/patches/patch-data_Makefile.in
deleted file mode 100644
index 5da0dcc1fd..0000000000
--- a/proj/patches/patch-data_Makefile.in
+++ /dev/null
@@ -1,20 +0,0 @@
-$NetBSD$
-
-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; \