py-proj: Update to 2.6.0 prior to moving to pkgsrc

[Greg Troxel <gdt%lexort.com@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Greg Troxel <gdt%lexort.com@localhost>
Pushed By:	gdt
Date:		Wed Mar 18 15:35:28 2020 -0400
Changeset:	4c256c2db42b4569561c80d7ee07a21a136a5592

Modified Files:
	py-proj/Makefile
	py-proj/PLIST
	py-proj/distinfo
Removed Files:
	py-proj/TODO

Log Message:
py-proj: Update to 2.6.0 prior to moving to pkgsrc

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

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

diffstat:
 py-proj/Makefile |  6 ++--
 py-proj/PLIST    | 99 ++++++++++++++++++++++++++++++++------------------------
 py-proj/TODO     |  5 ---
 py-proj/distinfo |  8 ++---
 4 files changed, 64 insertions(+), 54 deletions(-)

diffs:
diff --git a/py-proj/Makefile b/py-proj/Makefile
index e371d2d695..f2da0261d2 100644
--- a/py-proj/Makefile
+++ b/py-proj/Makefile
@@ -1,14 +1,16 @@
 # $NetBSD$
 
-DISTNAME=	pyproj-1.9.5.1
+DISTNAME=	pyproj-2.6.0
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	geography
 MASTER_SITES=	${MASTER_SITE_PYPI:=p/pyproj/}
 
-#MAINTAINER=	jihbed.research%gmail.com@localhost
 MAINTAINER=	gdt%NetBSD.org@localhost
 HOMEPAGE=	https://github.com/pyproj4/pyproj
 COMMENT=	Python interface to PROJ.4 library
 
+LICENSE=	mit
+
+.include "../../geography/proj/buildlink3.mk"
 .include "../../lang/python/egg.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/py-proj/PLIST b/py-proj/PLIST
index 8b868a7f4b..dc405b8cfa 100644
--- a/py-proj/PLIST
+++ b/py-proj/PLIST
@@ -4,49 +4,62 @@ ${PYSITELIB}/${EGG_INFODIR}/SOURCES.txt
 ${PYSITELIB}/${EGG_INFODIR}/dependency_links.txt
 ${PYSITELIB}/${EGG_INFODIR}/top_level.txt
 ${PYSITELIB}/pyproj/__init__.py
-${PYSITELIB}/pyproj/__init__.pyc
+${PYSITELIB}/pyproj/__main__.py
 ${PYSITELIB}/pyproj/__init__.pyo
+${PYSITELIB}/pyproj/__init__.pyc
+${PYSITELIB}/pyproj/__main__.pyo
+${PYSITELIB}/pyproj/__main__.pyc
+${PYSITELIB}/pyproj/_show_versions.pyo
+${PYSITELIB}/pyproj/_show_versions.pyc
+${PYSITELIB}/pyproj/compat.pyo
+${PYSITELIB}/pyproj/compat.pyc
+${PYSITELIB}/pyproj/datadir.pyo
+${PYSITELIB}/pyproj/datadir.pyc
+${PYSITELIB}/pyproj/enums.pyo
+${PYSITELIB}/pyproj/enums.pyc
+${PYSITELIB}/pyproj/exceptions.pyo
+${PYSITELIB}/pyproj/exceptions.pyc
+${PYSITELIB}/pyproj/geod.pyo
+${PYSITELIB}/pyproj/geod.pyc
+${PYSITELIB}/pyproj/proj.pyo
+${PYSITELIB}/pyproj/proj.pyc
+${PYSITELIB}/pyproj/transformer.pyo
+${PYSITELIB}/pyproj/transformer.pyc
+${PYSITELIB}/pyproj/utils.pyo
+${PYSITELIB}/pyproj/utils.pyc
+${PYSITELIB}/pyproj/_crs.so
+${PYSITELIB}/pyproj/_datadir.so
+${PYSITELIB}/pyproj/_geod.so
+${PYSITELIB}/pyproj/_list.so
 ${PYSITELIB}/pyproj/_proj.so
-${PYSITELIB}/pyproj/data/FL
-${PYSITELIB}/pyproj/data/GL27
-${PYSITELIB}/pyproj/data/IGNF
-${PYSITELIB}/pyproj/data/MD
-${PYSITELIB}/pyproj/data/README
-${PYSITELIB}/pyproj/data/TN
-${PYSITELIB}/pyproj/data/WI
-${PYSITELIB}/pyproj/data/WO
-${PYSITELIB}/pyproj/data/alaska
-${PYSITELIB}/pyproj/data/conus
-${PYSITELIB}/pyproj/data/epsg
-${PYSITELIB}/pyproj/data/esri
-${PYSITELIB}/pyproj/data/esri.extra
-${PYSITELIB}/pyproj/data/hawaii
-${PYSITELIB}/pyproj/data/nad.lst
-${PYSITELIB}/pyproj/data/nad27
-${PYSITELIB}/pyproj/data/nad83
-${PYSITELIB}/pyproj/data/ntf_r93.gsb
-${PYSITELIB}/pyproj/data/ntv1_can.dat
-${PYSITELIB}/pyproj/data/ntv2_out.dist
-${PYSITELIB}/pyproj/data/null
-${PYSITELIB}/pyproj/data/nzgd2kgrid0005.gsb
-${PYSITELIB}/pyproj/data/other.extra
-${PYSITELIB}/pyproj/data/pj_out27.dist
-${PYSITELIB}/pyproj/data/pj_out83.dist
-${PYSITELIB}/pyproj/data/proj_def.dat
-${PYSITELIB}/pyproj/data/proj_outIGNF.dist
-${PYSITELIB}/pyproj/data/prvi
-${PYSITELIB}/pyproj/data/stgeorge
-${PYSITELIB}/pyproj/data/stlrnc
-${PYSITELIB}/pyproj/data/stpaul
-${PYSITELIB}/pyproj/data/td_out.dist
-${PYSITELIB}/pyproj/data/test27
-${PYSITELIB}/pyproj/data/test83
-${PYSITELIB}/pyproj/data/testIGNF
-${PYSITELIB}/pyproj/data/testdatumfile
-${PYSITELIB}/pyproj/data/testntv2
-${PYSITELIB}/pyproj/data/testvarious
-${PYSITELIB}/pyproj/data/tv_out.dist
-${PYSITELIB}/pyproj/data/world
+${PYSITELIB}/pyproj/_show_versions.py
+${PYSITELIB}/pyproj/_transformer.so
+${PYSITELIB}/pyproj/compat.py
+${PYSITELIB}/pyproj/crs/__init__.py
+${PYSITELIB}/pyproj/crs/__init__.pyo
+${PYSITELIB}/pyproj/crs/__init__.pyc
+${PYSITELIB}/pyproj/crs/_cf1x8.pyo
+${PYSITELIB}/pyproj/crs/_cf1x8.pyc
+${PYSITELIB}/pyproj/crs/coordinate_operation.pyo
+${PYSITELIB}/pyproj/crs/coordinate_operation.pyc
+${PYSITELIB}/pyproj/crs/coordinate_system.pyo
+${PYSITELIB}/pyproj/crs/coordinate_system.pyc
+${PYSITELIB}/pyproj/crs/crs.pyo
+${PYSITELIB}/pyproj/crs/crs.pyc
+${PYSITELIB}/pyproj/crs/datum.pyo
+${PYSITELIB}/pyproj/crs/datum.pyc
+${PYSITELIB}/pyproj/crs/enums.pyo
+${PYSITELIB}/pyproj/crs/enums.pyc
+${PYSITELIB}/pyproj/crs/_cf1x8.py
+${PYSITELIB}/pyproj/crs/coordinate_operation.py
+${PYSITELIB}/pyproj/crs/coordinate_system.py
+${PYSITELIB}/pyproj/crs/crs.py
+${PYSITELIB}/pyproj/crs/datum.py
+${PYSITELIB}/pyproj/crs/enums.py
 ${PYSITELIB}/pyproj/datadir.py
-${PYSITELIB}/pyproj/datadir.pyc
-${PYSITELIB}/pyproj/datadir.pyo
+${PYSITELIB}/pyproj/enums.py
+${PYSITELIB}/pyproj/exceptions.py
+${PYSITELIB}/pyproj/geod.py
+${PYSITELIB}/pyproj/proj.py
+${PYSITELIB}/pyproj/transformer.py
+${PYSITELIB}/pyproj/utils.py
diff --git a/py-proj/TODO b/py-proj/TODO
deleted file mode 100644
index 99fbd99bcb..0000000000
--- a/py-proj/TODO
+++ /dev/null
@@ -1,5 +0,0 @@
-Confirm that this is an update to geography/py-proj.
-
-Update this to 2.4.1 or later.
-
-Wait for proj 6 to appear in pkgsrc.
diff --git a/py-proj/distinfo b/py-proj/distinfo
index 11f5268565..9d17efdff6 100644
--- a/py-proj/distinfo
+++ b/py-proj/distinfo
@@ -1,6 +1,6 @@
 $NetBSD$
 
-SHA1 (pyproj-1.9.5.1.tar.gz) = 096036401e070d9368682e7ebd244fb7bd5cd2c3
-RMD160 (pyproj-1.9.5.1.tar.gz) = f1f3008fb452ac106310f8d4c73d7143f25690a3
-SHA512 (pyproj-1.9.5.1.tar.gz) = b0e0f85be01a3399cb41c4bf29d1a63ecb519fd45d6092a3558060d93c715afafd12f7532c8665839225ad7243e739a117677f6747bf34a0ccbde5e75c85f324
-Size (pyproj-1.9.5.1.tar.gz) = 4424543 bytes
+SHA1 (pyproj-2.6.0.tar.gz) = 58919d2a5fdee9bb77b961c840fb085672e3bc59
+RMD160 (pyproj-2.6.0.tar.gz) = 13a70c3e767598b95a0833074a3ae8643acf2228
+SHA512 (pyproj-2.6.0.tar.gz) = b2e5273a84618f43ea30fae7a903df49b78895e4db8f9d81d8e6d81db1b360ed78b3feb420ad644017a5054859f29c416c1d74496a44c3215f1316f2e56dc11d
+Size (pyproj-2.6.0.tar.gz) = 524241 bytes