4 files changed, 44 insertions, 23 deletions
diff --git a/geography/py-proj/Makefile b/geography/py-proj/Makefile
index 0f61ab436a8..b30c9703b5d 100644
--- a/geography/py-proj/Makefile
+++ b/geography/py-proj/Makefile
@@ -1,10 +1,8 @@
-# $NetBSD: Makefile,v 1.34 2022/11/27 13:55:51 gdt Exp $
+# $NetBSD: Makefile,v 1.35 2022/12/10 13:19:38 gdt Exp $
 
-DISTNAME=		pyproj-2.6.1
-# After proj is >= 7
-#DISTNAME=		pyproj-3.0.1
+DISTNAME=		pyproj-3.2.1
+# 3.3.0 requires proj 8
 PKGNAME=		${PYPKGPREFIX}-${DISTNAME}
-PKGREVISION=		8
 CATEGORIES=		geography
 MASTER_SITES=		${MASTER_SITE_PYPI:=p/pyproj/}
 
diff --git a/geography/py-proj/PLIST b/geography/py-proj/PLIST
index 645b8b9c7c1..a4c97d37b4e 100644
--- a/geography/py-proj/PLIST
+++ b/geography/py-proj/PLIST
@@ -1,7 +1,11 @@
-@comment $NetBSD: PLIST,v 1.7 2020/03/18 20:11:12 gdt Exp $
+@comment $NetBSD: PLIST,v 1.8 2022/12/10 13:19:38 gdt Exp $
+bin/pyproj
 ${PYSITELIB}/${EGG_INFODIR}/PKG-INFO
 ${PYSITELIB}/${EGG_INFODIR}/SOURCES.txt
 ${PYSITELIB}/${EGG_INFODIR}/dependency_links.txt
+${PYSITELIB}/${EGG_INFODIR}/entry_points.txt
+${PYSITELIB}/${EGG_INFODIR}/not-zip-safe
+${PYSITELIB}/${EGG_INFODIR}/requires.txt
 ${PYSITELIB}/${EGG_INFODIR}/top_level.txt
 ${PYSITELIB}/pyproj/__init__.py
 ${PYSITELIB}/pyproj/__init__.pyc
@@ -9,18 +13,26 @@ ${PYSITELIB}/pyproj/__init__.pyo
 ${PYSITELIB}/pyproj/__main__.py
 ${PYSITELIB}/pyproj/__main__.pyc
 ${PYSITELIB}/pyproj/__main__.pyo
+${PYSITELIB}/pyproj/_compat.pyi
+${PYSITELIB}/pyproj/_compat.so
+${PYSITELIB}/pyproj/_crs.pyi
 ${PYSITELIB}/pyproj/_crs.so
+${PYSITELIB}/pyproj/_datadir.pyi
 ${PYSITELIB}/pyproj/_datadir.so
+${PYSITELIB}/pyproj/_geod.pyi
 ${PYSITELIB}/pyproj/_geod.so
-${PYSITELIB}/pyproj/_list.so
-${PYSITELIB}/pyproj/_proj.so
+${PYSITELIB}/pyproj/_network.pyi
+${PYSITELIB}/pyproj/_network.so
 ${PYSITELIB}/pyproj/_show_versions.py
 ${PYSITELIB}/pyproj/_show_versions.pyc
 ${PYSITELIB}/pyproj/_show_versions.pyo
+${PYSITELIB}/pyproj/_sync.pyi
+${PYSITELIB}/pyproj/_sync.so
+${PYSITELIB}/pyproj/_transformer.pyi
 ${PYSITELIB}/pyproj/_transformer.so
-${PYSITELIB}/pyproj/compat.py
-${PYSITELIB}/pyproj/compat.pyc
-${PYSITELIB}/pyproj/compat.pyo
+${PYSITELIB}/pyproj/aoi.py
+${PYSITELIB}/pyproj/aoi.pyc
+${PYSITELIB}/pyproj/aoi.pyo
 ${PYSITELIB}/pyproj/crs/__init__.py
 ${PYSITELIB}/pyproj/crs/__init__.pyc
 ${PYSITELIB}/pyproj/crs/__init__.pyo
@@ -42,6 +54,8 @@ ${PYSITELIB}/pyproj/crs/datum.pyo
 ${PYSITELIB}/pyproj/crs/enums.py
 ${PYSITELIB}/pyproj/crs/enums.pyc
 ${PYSITELIB}/pyproj/crs/enums.pyo
+${PYSITELIB}/pyproj/database.pyi
+${PYSITELIB}/pyproj/database.so
 ${PYSITELIB}/pyproj/datadir.py
 ${PYSITELIB}/pyproj/datadir.pyc
 ${PYSITELIB}/pyproj/datadir.pyo
@@ -54,9 +68,18 @@ ${PYSITELIB}/pyproj/exceptions.pyo
 ${PYSITELIB}/pyproj/geod.py
 ${PYSITELIB}/pyproj/geod.pyc
 ${PYSITELIB}/pyproj/geod.pyo
+${PYSITELIB}/pyproj/list.pyi
+${PYSITELIB}/pyproj/list.so
+${PYSITELIB}/pyproj/network.py
+${PYSITELIB}/pyproj/network.pyc
+${PYSITELIB}/pyproj/network.pyo
 ${PYSITELIB}/pyproj/proj.py
 ${PYSITELIB}/pyproj/proj.pyc
 ${PYSITELIB}/pyproj/proj.pyo
+${PYSITELIB}/pyproj/py.typed
+${PYSITELIB}/pyproj/sync.py
+${PYSITELIB}/pyproj/sync.pyc
+${PYSITELIB}/pyproj/sync.pyo
 ${PYSITELIB}/pyproj/transformer.py
 ${PYSITELIB}/pyproj/transformer.pyc
 ${PYSITELIB}/pyproj/transformer.pyo
diff --git a/geography/py-proj/distinfo b/geography/py-proj/distinfo
index a13fb75a6ff..f2199b4e452 100644
--- a/geography/py-proj/distinfo
+++ b/geography/py-proj/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.10 2022/01/27 08:24:51 wiz Exp $
+$NetBSD: distinfo,v 1.11 2022/12/10 13:19:38 gdt Exp $
 
-BLAKE2s (pyproj-2.6.1.tar.gz) = 94000486db4227c8b26fa88e594363801a61c75bb34f9363df67dd4550854600
-SHA512 (pyproj-2.6.1.tar.gz) = d6bf6b77eb95bb630c41ac7737538c015e2724277f37975b106a4386887c6193c3172dfc9309d1fc8af0b95c86486f359a18a0ca443bcdac9573df6da39935e0
-Size (pyproj-2.6.1.tar.gz) = 528171 bytes
-SHA1 (patch-setup.py) = 7aa563bcd6120b7ca7d0743da9657262b783474d
+BLAKE2s (pyproj-3.2.1.tar.gz) = 762d7d912e45401c845afa34698d58635182657b731aac93d21be9234b406ec5
+SHA512 (pyproj-3.2.1.tar.gz) = 4ba5bd2d2356c06b711e53581665bdcad3faeb420258c7d4bbb5639784948842a3a6ee0f1f0f50363878c183c38a27063071f25594576eccca146ceb33107761
+Size (pyproj-3.2.1.tar.gz) = 213342 bytes
+SHA1 (patch-setup.py) = 229bfab067c535eca6ecb862527b4945bc3aa0e6
diff --git a/geography/py-proj/patches/patch-setup.py b/geography/py-proj/patches/patch-setup.py
index 34709054c1b..350e6268917 100644
--- a/geography/py-proj/patches/patch-setup.py
+++ b/geography/py-proj/patches/patch-setup.py
@@ -1,14 +1,14 @@
-$NetBSD: patch-setup.py,v 1.1 2022/01/27 08:24:51 wiz Exp $
+$NetBSD: patch-setup.py,v 1.2 2022/12/10 13:19:38 gdt Exp $
 
 Force running cythonize, to fix build with python 3.10.
 
---- setup.py.orig	2020-05-04 02:03:06.000000000 +0000
+--- setup.py.orig	2021-03-05 04:25:28.000000000 +0000
 +++ setup.py
-@@ -168,6 +168,7 @@ def get_extension_modules():
-             Extension("pyproj._list", ["pyproj/_list.pyx"], **ext_options),
+@@ -179,6 +179,7 @@ def get_extension_modules():
+             Extension("pyproj._sync", ["pyproj/_sync.pyx"], **ext_options),
          ],
          quiet=True,
 +        force=True,
-         **get_cythonize_options()
-     )
- 
+         compile_time_env={
+             "CTE_PROJ_VERSION_MAJOR": int(proj_version_major),
+             "CTE_PROJ_VERSION_MINOR": int(proj_version_minor),