geography/py-proj: Update to 2.6.0

This is a version which requires proj 6, vs a version that cannot work
with proj 6.  It is likely quite different as the old package was old.

Upstream NEWS is missing.

Summary is:

  many minor enhancements and bugfixes

  adapt to changes in proj (if you don't understand proj, this is hard
  to use anyway)

  add Geod class

4 files changed, 79 insertions, 76 deletions

diff --git a/geography/py-proj/DESCR b/geography/py-proj/DESCR
index 7979e882ec7..d3dcd6e15f3 100644
--- a/geography/py-proj/DESCR
+++ b/geography/py-proj/DESCR
@@ -1,3 +1,10 @@
-This package provides a Pyrex wrapper to provide python interfaces to
-PROJ.4 (http://proj.maptools.org) functions for coordinate
-transformation.
+The Proj class can convert from geographic (longitude,latitude) to native
+map projection (x,y) coordinates and vice versa, or from one map projection
+coordinate system directly to another.
+
+The Geod class can perform forward and inverse geodetic, or Great Circle,
+computations. The forward computation involves determining latitude,
+longitude and back azimuth of a terminus point given the latitude and
+longitude of an initial point, plus azimuth and distance. The inverse
+computation involves determining the forward and back azimuths and
+distance given the latitudes and longitudes of an initial and terminus point
diff --git a/geography/py-proj/Makefile b/geography/py-proj/Makefile
index 4836aa78e6a..e742c55e552 100644
--- a/geography/py-proj/Makefile
+++ b/geography/py-proj/Makefile
@@ -1,34 +1,15 @@
-# $NetBSD: Makefile,v 1.19 2019/11/24 14:51:20 gdt Exp $
+# $NetBSD: Makefile,v 1.20 2020/03/18 20:11:12 gdt Exp $
 
-VERSION=		1.9.4
-PKGNAMEBASE=		pyproj
-DISTNAME=		v${VERSION}rel
-DIST_SUBDIR=		pyproj
-EGG_NAME=		${PKGNAMEBASE}-${VERSION}
-PKGNAME=		${PYPKGPREFIX}-${PKGNAMEBASE:S/pyproj/proj/}-${VERSION}
-PKGREVISION=		2
+DISTNAME=		pyproj-2.6.0
+PKGNAME=		${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=		geography
-MASTER_SITES=		${MASTER_SITE_GITHUB:=jswhit/pyproj/archive/}
+MASTER_SITES=		${MASTER_SITE_PYPI:=p/pyproj/}
 
 MAINTAINER=		gdt@NetBSD.org
 HOMEPAGE=		https://github.com/pyproj4/pyproj
-COMMENT=		Python wrapper for proj
+COMMENT=		Python interface to PROJ.4 library
 LICENSE=		mit
 
-WRKSRC=			${WRKDIR}/${PKGNAMEBASE}-${VERSION}rel
-
-INSTALLATION_DIRS=	share/doc/${PKGNAME_NOREV}
-
-# Horrible kludge: the package has a private copy of projects.h, which
-# proj used to not install, and the private copy has RCSID-type macros
-# which are needed.  Until this is fixed upstream, avoid the
-# proj-provided projects.h.
-pre-build:
-	rm ${WRKDIR}/.buildlink/include/projects.h
-
-post-install:
-	${INSTALL} ${WRKSRC}/README.md ${DESTDIR}${PREFIX}/share/doc/${PKGNAME_NOREV}
-
-.include "../../lang/python/distutils.mk"
 .include "../../geography/proj/buildlink3.mk"
+.include "../../lang/python/egg.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/geography/py-proj/PLIST b/geography/py-proj/PLIST
index ca0aa01b3cb..645b8b9c7c1 100644
--- a/geography/py-proj/PLIST
+++ b/geography/py-proj/PLIST
@@ -1,50 +1,65 @@
-@comment $NetBSD: PLIST,v 1.6 2015/03/19 16:16:58 gdt Exp $
-${PYSITELIB}/${EGG_FILE}
+@comment $NetBSD: PLIST,v 1.7 2020/03/18 20:11:12 gdt Exp $
+${PYSITELIB}/${EGG_INFODIR}/PKG-INFO
+${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/__init__.pyo
+${PYSITELIB}/pyproj/__main__.py
+${PYSITELIB}/pyproj/__main__.pyc
+${PYSITELIB}/pyproj/__main__.pyo
+${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/_show_versions.pyc
+${PYSITELIB}/pyproj/_show_versions.pyo
+${PYSITELIB}/pyproj/_transformer.so
+${PYSITELIB}/pyproj/compat.py
+${PYSITELIB}/pyproj/compat.pyc
+${PYSITELIB}/pyproj/compat.pyo
+${PYSITELIB}/pyproj/crs/__init__.py
+${PYSITELIB}/pyproj/crs/__init__.pyc
+${PYSITELIB}/pyproj/crs/__init__.pyo
+${PYSITELIB}/pyproj/crs/_cf1x8.py
+${PYSITELIB}/pyproj/crs/_cf1x8.pyc
+${PYSITELIB}/pyproj/crs/_cf1x8.pyo
+${PYSITELIB}/pyproj/crs/coordinate_operation.py
+${PYSITELIB}/pyproj/crs/coordinate_operation.pyc
+${PYSITELIB}/pyproj/crs/coordinate_operation.pyo
+${PYSITELIB}/pyproj/crs/coordinate_system.py
+${PYSITELIB}/pyproj/crs/coordinate_system.pyc
+${PYSITELIB}/pyproj/crs/coordinate_system.pyo
+${PYSITELIB}/pyproj/crs/crs.py
+${PYSITELIB}/pyproj/crs/crs.pyc
+${PYSITELIB}/pyproj/crs/crs.pyo
+${PYSITELIB}/pyproj/crs/datum.py
+${PYSITELIB}/pyproj/crs/datum.pyc
+${PYSITELIB}/pyproj/crs/datum.pyo
+${PYSITELIB}/pyproj/crs/enums.py
+${PYSITELIB}/pyproj/crs/enums.pyc
+${PYSITELIB}/pyproj/crs/enums.pyo
 ${PYSITELIB}/pyproj/datadir.py
 ${PYSITELIB}/pyproj/datadir.pyc
 ${PYSITELIB}/pyproj/datadir.pyo
-share/doc/${PKGNAME}/README.md
+${PYSITELIB}/pyproj/enums.py
+${PYSITELIB}/pyproj/enums.pyc
+${PYSITELIB}/pyproj/enums.pyo
+${PYSITELIB}/pyproj/exceptions.py
+${PYSITELIB}/pyproj/exceptions.pyc
+${PYSITELIB}/pyproj/exceptions.pyo
+${PYSITELIB}/pyproj/geod.py
+${PYSITELIB}/pyproj/geod.pyc
+${PYSITELIB}/pyproj/geod.pyo
+${PYSITELIB}/pyproj/proj.py
+${PYSITELIB}/pyproj/proj.pyc
+${PYSITELIB}/pyproj/proj.pyo
+${PYSITELIB}/pyproj/transformer.py
+${PYSITELIB}/pyproj/transformer.pyc
+${PYSITELIB}/pyproj/transformer.pyo
+${PYSITELIB}/pyproj/utils.py
+${PYSITELIB}/pyproj/utils.pyc
+${PYSITELIB}/pyproj/utils.pyo
diff --git a/geography/py-proj/distinfo b/geography/py-proj/distinfo
index bbf38242494..aa03a56461b 100644
--- a/geography/py-proj/distinfo
+++ b/geography/py-proj/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.5 2015/11/03 00:08:45 agc Exp $
+$NetBSD: distinfo,v 1.6 2020/03/18 20:11:12 gdt Exp $
 
-SHA1 (pyproj/v1.9.4rel.tar.gz) = 31f4c64c2d41d4b77d71725cd963c4160e42ac6f
-RMD160 (pyproj/v1.9.4rel.tar.gz) = 65a176a1ca4c38cfe915532260e46e64f79c3afd
-SHA512 (pyproj/v1.9.4rel.tar.gz) = 1af15c2dcdf897b028bf65a358426950c5110524df5d5417e22d22bb34dad2a818960bf0498cb9cd180ac96393cae79fac45e3182b03a0d407bf7794811c66f3
-Size (pyproj/v1.9.4rel.tar.gz) = 2744881 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