proj*: Set up for testing/staging next update

[Greg Troxel (via pkgsrc-wip) <commit-notify%pkgsrc.org@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Greg Troxel <gdt%lexort.com@localhost>
Pushed By:	gdt
Date:		Sun Dec 1 18:45:20 2024 -0500
Changeset:	b6af1345ce7b1b30bde91a723b4f55749bde9a41

Modified Files:
	proj-data/COMMIT_MSG
	proj-data/Makefile
	proj-data/PLIST
	proj-data/TODO
	proj-data/distinfo
	proj/COMMIT_MSG
	proj/Makefile
	proj/PLIST
	proj/TODO
	proj/buildlink3.mk
	proj/distinfo

Log Message:
proj*: Set up for testing/staging next update

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

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

diffstat:
 proj-data/COMMIT_MSG | 2 +-
 proj-data/Makefile   | 2 +-
 proj-data/PLIST      | 2 +-
 proj-data/TODO       | 2 ++
 proj-data/distinfo   | 2 +-
 proj/COMMIT_MSG      | 7 +------
 proj/Makefile        | 2 +-
 proj/PLIST           | 2 +-
 proj/TODO            | 2 ++
 proj/buildlink3.mk   | 2 +-
 proj/distinfo        | 2 +-
 11 files changed, 13 insertions(+), 14 deletions(-)

diffs:
diff --git a/proj-data/COMMIT_MSG b/proj-data/COMMIT_MSG
index f7d0f188d4..77f7ce206a 100644
--- a/proj-data/COMMIT_MSG
+++ b/proj-data/COMMIT_MSG
@@ -1,4 +1,4 @@
-geography/proj-data: Update to 1.20
+geography/proj-data: Update to 1.21 (probably)
 
 Upstream changes are more data files and bug fixes.
 (The distribution lacks NEWS.)
diff --git a/proj-data/Makefile b/proj-data/Makefile
index faff67b889..b2afb0112f 100644
--- a/proj-data/Makefile
+++ b/proj-data/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2024/09/15 13:54:50 gdt Exp $
+# $NetBSD: Makefile,v 1.5 2024/12/01 23:41:18 gdt Exp $
 
 VERSION_BASE=	1.20
 #VERSION_RC=	RC1
diff --git a/proj-data/PLIST b/proj-data/PLIST
index 34cef221cb..80d0de8c67 100644
--- a/proj-data/PLIST
+++ b/proj-data/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2024/09/15 13:54:50 gdt Exp $
+@comment $NetBSD: PLIST,v 1.5 2024/12/01 23:41:18 gdt Exp $
 share/proj/DK
 share/proj/FO
 share/proj/ISL
diff --git a/proj-data/TODO b/proj-data/TODO
index 9a9527c13f..cbcc455710 100644
--- a/proj-data/TODO
+++ b/proj-data/TODO
@@ -1,3 +1,5 @@
+update to 1.21 (or next release)
+
 eventually: 
 
   Update LICENSE from license list.
diff --git a/proj-data/distinfo b/proj-data/distinfo
index 78d73722de..80489618dd 100644
--- a/proj-data/distinfo
+++ b/proj-data/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.4 2024/09/15 13:54:50 gdt Exp $
+$NetBSD: distinfo,v 1.5 2024/12/01 23:41:18 gdt Exp $
 
 BLAKE2s (proj-data-1.20.tar.gz) = e8d44ec7c1a3dad0492721f4426b79210c5ee6772827f46eaebfcf13d81e54b1
 SHA512 (proj-data-1.20.tar.gz) = 1a667a6096473ae0a3c0dc946d5832f393a447514f8a4251ed97004759534168871623342399ae9571e934c973c137b20ed15d1714569fc5b5ea26737235d907
diff --git a/proj/COMMIT_MSG b/proj/COMMIT_MSG
index 1f19db5654..d31abc4a34 100644
--- a/proj/COMMIT_MSG
+++ b/proj/COMMIT_MSG
@@ -1,10 +1,5 @@
-geography/proj: Update to 9.5.1
+geography/proj: Update to 9.x
 
 Upstream NEWS, less housekeeping, bugfixes, minor improvements
 follows.
 
-* Database: update to EPSG v11.021 (#4254, #4275, #4297)
-
-* Speed-up dramatically proj.db build time (#4280)
-
-* Database: ingest deprecated ESRI names to be able to better import old WKT ESRI (#4282)
diff --git a/proj/Makefile b/proj/Makefile
index fd5de67de6..55daf71827 100644
--- a/proj/Makefile
+++ b/proj/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.45 2024/11/14 22:20:02 wiz Exp $
+# $NetBSD: Makefile,v 1.46 2024/12/01 23:29:17 gdt Exp $
 
 VERSION_BASE=	9.5.1
 # Accommodate testing RCs (names like 9.0RC1, unpacking to 9.0).
diff --git a/proj/PLIST b/proj/PLIST
index eb5fe64ecb..74bb31d6b0 100644
--- a/proj/PLIST
+++ b/proj/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD$
+@comment $NetBSD: PLIST,v 1.14 2024/12/01 23:29:17 gdt Exp $
 bin/cct
 bin/cs2cs
 bin/geod
diff --git a/proj/TODO b/proj/TODO
index 7d0e5afea3..f739867be5 100644
--- a/proj/TODO
+++ b/proj/TODO
@@ -1,3 +1,5 @@
+update to 9.6.0 or 9.5.2
+
 eventually:
 
   Figure out CDN location/permission issues.  This is likely just an
diff --git a/proj/buildlink3.mk b/proj/buildlink3.mk
index 0900719f7d..12ca79b8bf 100644
--- a/proj/buildlink3.mk
+++ b/proj/buildlink3.mk
@@ -8,7 +8,7 @@ PROJ_BUILDLINK3_MK:=
 # Proj withdrew the old API with 8.0.0.
 BUILDLINK_API_DEPENDS.proj+=	proj>=8.0.0
 BUILDLINK_ABI_DEPENDS.proj+=	proj>=9.5.0nb3
-BUILDLINK_PKGSRCDIR.proj?=	../../geography/proj
+BUILDLINK_PKGSRCDIR.proj?=	../../wip/proj
 
 .include "../../databases/sqlite3/buildlink3.mk"
 .include "../../graphics/tiff/buildlink3.mk"
diff --git a/proj/distinfo b/proj/distinfo
index 828d3faf7a..221dd776f4 100644
--- a/proj/distinfo
+++ b/proj/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.24 2024/09/15 12:53:31 gdt Exp $
+$NetBSD: distinfo,v 1.25 2024/12/01 23:29:17 gdt Exp $
 
 BLAKE2s (proj-9.5.1.tar.gz) = 23a3e511a9496dc39ebbf0a8d6e821b64930aea5d5017fafc76d646e85edd1f6
 SHA512 (proj-9.5.1.tar.gz) = 1b2a874f3b2e1343d2cbfff1e81c269cccac6c4a227b159f2d4063ebc4400bc968ed0c5bf66fe4d297b313e917087c8bfd1aa33345a5131ed53254b7130c9e86