From 33a88aa05b322cc5a774051ebeba0d847e973e0d Mon Sep 17 00:00:00 2001
From: gdt <gdt>
Date: Thu, 19 Mar 2015 16:16:58 +0000
Subject: Update to 1.9.4 (leaf).

This required a fairly massive rototill of the PKGNAME/DISTNAME
because of bugs in upstream distfile generation, reported at
https://github.com/jswhit/pyproj/issues/7
But there are no signficant changes in packaging other than coping with the
distfile naming bug.

1.9.4 (git tag v1.9.4rel)
 * migrate to github from googlecode.
 * update proj4 source code from svn r2595 (version 4.9.0RC2).
 * include runtime_library_dirs in setup-proj.py.
 * added to_latlong method (issue 51).
 * fix back azimuth when lon1 and lon2 are identical.
---
 geography/py-proj/Makefile | 20 +++++++++++++-------
 geography/py-proj/PLIST    |  4 ++--
 geography/py-proj/distinfo |  8 ++++----
 3 files changed, 19 insertions(+), 13 deletions(-)

(limited to 'geography/py-proj')

diff --git a/geography/py-proj/Makefile b/geography/py-proj/Makefile
index 2922360f286..b951775ee50 100644
--- a/geography/py-proj/Makefile
+++ b/geography/py-proj/Makefile
@@ -1,20 +1,26 @@
-# $NetBSD: Makefile,v 1.15 2015/03/14 18:46:12 gdt Exp $
+# $NetBSD: Makefile,v 1.16 2015/03/19 16:16:58 gdt Exp $
 
-DISTNAME=		pyproj-1.9.3
-PKGNAME=		${PYPKGPREFIX}-${DISTNAME:S/pyproj/proj/}
-PKGREVISION=		1
+VERSION=		1.9.4
+PKGNAMEBASE=		pyproj
+DISTNAME=		v${VERSION}rel
+DIST_SUBDIR=		pyproj
+EGG_NAME=		${PKGNAMEBASE}-${VERSION}
+PKGNAME=		${PYPKGPREFIX}-${PKGNAMEBASE:S/pyproj/proj/}-${VERSION}
 CATEGORIES=		geography
-MASTER_SITES=		http://pyproj.googlecode.com/files/
+MASTER_SITES=		${MASTER_SITE_GITHUB:=jswhit/pyproj/archive/}
 
 MAINTAINER=		gdt@NetBSD.org
-HOMEPAGE=		http://code.google.com/p/pyproj/
+HOMEPAGE=		http://jswhit.github.io/pyproj/
+#			https://github.com/jswhit/pyproj
 COMMENT=		Python wrapper for proj
 LICENSE=		mit
 
+WRKSRC=			${WRKDIR}/${PKGNAMEBASE}-${VERSION}rel
+
 INSTALLATION_DIRS=	share/doc/${PKGNAME_NOREV}
 
 post-install:
-	${INSTALL} ${WRKSRC}/README ${DESTDIR}${PREFIX}/share/doc/${PKGNAME_NOREV}
+	${INSTALL} ${WRKSRC}/README.md ${DESTDIR}${PREFIX}/share/doc/${PKGNAME_NOREV}
 
 .include "../../lang/python/distutils.mk"
 .include "../../geography/proj/buildlink3.mk"
diff --git a/geography/py-proj/PLIST b/geography/py-proj/PLIST
index ba89fd955c4..ca0aa01b3cb 100644
--- a/geography/py-proj/PLIST
+++ b/geography/py-proj/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2014/01/19 20:00:29 wiz Exp $
+@comment $NetBSD: PLIST,v 1.6 2015/03/19 16:16:58 gdt Exp $
 ${PYSITELIB}/${EGG_FILE}
 ${PYSITELIB}/pyproj/__init__.py
 ${PYSITELIB}/pyproj/__init__.pyc
@@ -47,4 +47,4 @@ ${PYSITELIB}/pyproj/data/world
 ${PYSITELIB}/pyproj/datadir.py
 ${PYSITELIB}/pyproj/datadir.pyc
 ${PYSITELIB}/pyproj/datadir.pyo
-share/doc/${PKGNAME}/README
+share/doc/${PKGNAME}/README.md
diff --git a/geography/py-proj/distinfo b/geography/py-proj/distinfo
index 0bdd560d6ce..631bf3ccfa4 100644
--- a/geography/py-proj/distinfo
+++ b/geography/py-proj/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.3 2014/01/19 20:00:29 wiz Exp $
+$NetBSD: distinfo,v 1.4 2015/03/19 16:16:58 gdt Exp $
 
-SHA1 (pyproj-1.9.3.tar.gz) = 3f290241e113ea63d0487a48e7e054cc1c3e19f8
-RMD160 (pyproj-1.9.3.tar.gz) = 5bcc667a24d3697cfcaf54d0eb9fff9193ffbfb7
-Size (pyproj-1.9.3.tar.gz) = 2687498 bytes
+SHA1 (pyproj/v1.9.4rel.tar.gz) = 31f4c64c2d41d4b77d71725cd963c4160e42ac6f
+RMD160 (pyproj/v1.9.4rel.tar.gz) = 65a176a1ca4c38cfe915532260e46e64f79c3afd
+Size (pyproj/v1.9.4rel.tar.gz) = 2744881 bytes
-- 
cgit v1.2.3