Content-Transfer-Encoding: 7bit
Content-Type: multipart/mixed; boundary="_----------=_1700738587185830"
MIME-Version: 1.0
Date: Thu, 23 Nov 2023 11:23:07 +0000
From: "Thomas Klausner" <wiz@netbsd.org>
Subject: CVS commit: pkgsrc/geography/py-proj
To: pkgsrc-changes@NetBSD.org
Approved: commit_and_comment
Reply-To: wiz@netbsd.org
Message-Id: <20231123112307.61387FA3F@cvs.NetBSD.org>

This is a multi-part message in MIME format.

--_----------=_1700738587185830
Content-Disposition: inline
Content-Transfer-Encoding: 8bit
Content-Type: text/plain; charset="US-ASCII"

Module Name:	pkgsrc
Committed By:	wiz
Date:		Thu Nov 23 11:23:07 UTC 2023

Modified Files:
	pkgsrc/geography/py-proj: Makefile PLIST distinfo
Added Files:
	pkgsrc/geography/py-proj/patches: patch-pyproj___datadir.pyx

Log Message:
py-proj: fix build with Cython 3

Add missing dependency.
Convert to wheel.mk.

XXX: this should be updated


To generate a diff of this commit:
cvs rdiff -u -r1.41 -r1.42 pkgsrc/geography/py-proj/Makefile
cvs rdiff -u -r1.8 -r1.9 pkgsrc/geography/py-proj/PLIST
cvs rdiff -u -r1.11 -r1.12 pkgsrc/geography/py-proj/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/geography/py-proj/patches/patch-pyproj___datadir.pyx

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


--_----------=_1700738587185830
Content-Disposition: inline
Content-Length: 4209
Content-Transfer-Encoding: binary
Content-Type: text/x-diff; charset=us-ascii

Modified files:

Index: pkgsrc/geography/py-proj/Makefile
diff -u pkgsrc/geography/py-proj/Makefile:1.41 pkgsrc/geography/py-proj/Makefile:1.42
--- pkgsrc/geography/py-proj/Makefile:1.41	Wed Nov  8 13:19:25 2023
+++ pkgsrc/geography/py-proj/Makefile	Thu Nov 23 11:23:07 2023
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.41 2023/11/08 13:19:25 wiz Exp $
+# $NetBSD: Makefile,v 1.42 2023/11/23 11:23:07 wiz Exp $
 
 DISTNAME=		pyproj-3.2.1
 # 3.3.0 requires proj 8
 PKGNAME=		${PYPKGPREFIX}-${DISTNAME}
-PKGREVISION=		5
+PKGREVISION=		6
 CATEGORIES=		geography
 MASTER_SITES=		${MASTER_SITE_PYPI:=p/pyproj/}
 
@@ -12,10 +12,13 @@ HOMEPAGE=		https://github.com/pyproj4/py
 COMMENT=		Python interface to PROJ.4 library
 LICENSE=		mit
 
-PYTHON_VERSIONS_INCOMPATIBLE=	27
-
 TOOL_DEPENDS+=	${PYPKGPREFIX}-cython>=0:../../devel/py-cython
+TOOL_DEPENDS+=	${PYPKGPREFIX}-setuptools>=0:../../devel/py-setuptools
+TOOL_DEPENDS+=	${PYPKGPREFIX}-wheel>=0:../../devel/py-wheel
+TOOL_DEPENDS+=	${PYPKGPREFIX}-certifi>=0:../../security/py-certifi
+
+PYTHON_VERSIONS_INCOMPATIBLE=	27
 
 .include "../../geography/proj/buildlink3.mk"
-.include "../../lang/python/egg.mk"
+.include "../../lang/python/wheel.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/geography/py-proj/PLIST
diff -u pkgsrc/geography/py-proj/PLIST:1.8 pkgsrc/geography/py-proj/PLIST:1.9
--- pkgsrc/geography/py-proj/PLIST:1.8	Sat Dec 10 13:19:38 2022
+++ pkgsrc/geography/py-proj/PLIST	Thu Nov 23 11:23:07 2023
@@ -1,12 +1,11 @@
-@comment $NetBSD: PLIST,v 1.8 2022/12/10 13:19:38 gdt Exp $
+@comment $NetBSD: PLIST,v 1.9 2023/11/23 11:23:07 wiz 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}/${WHEEL_INFODIR}/LICENSE
+${PYSITELIB}/${WHEEL_INFODIR}/METADATA
+${PYSITELIB}/${WHEEL_INFODIR}/RECORD
+${PYSITELIB}/${WHEEL_INFODIR}/WHEEL
+${PYSITELIB}/${WHEEL_INFODIR}/entry_points.txt
+${PYSITELIB}/${WHEEL_INFODIR}/top_level.txt
 ${PYSITELIB}/pyproj/__init__.py
 ${PYSITELIB}/pyproj/__init__.pyc
 ${PYSITELIB}/pyproj/__init__.pyo

Index: pkgsrc/geography/py-proj/distinfo
diff -u pkgsrc/geography/py-proj/distinfo:1.11 pkgsrc/geography/py-proj/distinfo:1.12
--- pkgsrc/geography/py-proj/distinfo:1.11	Sat Dec 10 13:19:38 2022
+++ pkgsrc/geography/py-proj/distinfo	Thu Nov 23 11:23:07 2023
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.11 2022/12/10 13:19:38 gdt Exp $
+$NetBSD: distinfo,v 1.12 2023/11/23 11:23:07 wiz Exp $
 
 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-pyproj___datadir.pyx) = b5efc92d43974fd851752d728d73a8e40b3fd389
 SHA1 (patch-setup.py) = 229bfab067c535eca6ecb862527b4945bc3aa0e6

Added files:

Index: pkgsrc/geography/py-proj/patches/patch-pyproj___datadir.pyx
diff -u /dev/null pkgsrc/geography/py-proj/patches/patch-pyproj___datadir.pyx:1.1
--- /dev/null	Thu Nov 23 11:23:07 2023
+++ pkgsrc/geography/py-proj/patches/patch-pyproj___datadir.pyx	Thu Nov 23 11:23:07 2023
@@ -0,0 +1,24 @@
+$NetBSD: patch-pyproj___datadir.pyx,v 1.1 2023/11/23 11:23:07 wiz Exp $
+
+Fix build with Cython 3.
+
+--- pyproj/_datadir.pyx.orig	2021-09-16 00:54:55.000000000 +0000
++++ pyproj/_datadir.pyx
+@@ -6,7 +6,7 @@ from libc.stdlib cimport free, malloc
+ 
+ from pyproj._compat cimport cstrencode
+ 
+-from pyproj.exceptions import DataDirError, ProjError
++from pyproj.exceptions import ProjError
+ from pyproj.utils import strtobool
+ 
+ # for logging the internal PROJ messages
+@@ -90,7 +90,7 @@ def get_user_data_dir(create=False):
+     )
+ 
+ 
+-cdef void pyproj_log_function(void *user_data, int level, const char *error_msg) nogil:
++cdef void pyproj_log_function(void *user_data, int level, const char *error_msg) nogil noexcept:
+     """
+     Log function for catching PROJ errors.
+     """


--_----------=_1700738587185830--