Update to 1.9.3:

1.9.3 (svn revision 327)
 * Geod now uses C code adapted from geographiclib now included in proj4 source,
   instead of pure python code directly from geographiclib.
 * make radians=True work with Geod.npts (issue 47).
 * allow PROJ_DIR env var to control location of proj data (issue 40).
1.9.2 (svn revision 301)
 * updated proj4 src to 4.8.0 - includes two new map projections (natearth and
   isea).
1.9.1 (svn revision 285)
 * restore compatibility with python 2.4/2.5, which was broken by the addition
   of the geographiclib geodesic module (issue 36).
1.9.0 (svn revision 282)
 * use pure python geographiclib for geodesic computation codes instead of
 proj4.
 * don't use global variable pj_errno for return codes, use pj_ctx_get_errno
   instead.
 * use new projCtx structure for thread safety in proj lib.
 * update C source and data from proj4 svn (r2140).
 * add pj_list and pj_ellps module level variables (a dict mapping short
   names to longer descriptions, e.g.
   pyproj.pj_list['aea'] = 'Albers Equal Area').
1.8.9 (svn revision 222)
 * Python 3 now supported.
 * allow 'EPSG' init (as well as 'epsg'). This only worked on case-insensitive
   filesystems previously. Fixes issue 6.
 * added inverse to Hammer projection.
 * updated src/pj_mutex.c from proj4 svn to fix a threading issue on windows
   (issue 25). Windows binary installers updated (version 1.8.8-1), courtesy
   Christoph Gohlke.
 * if inputs are NaNs, return huge number (1.e30).
1.8.8 (svn revision 196)
 * add extra datum shift files, added test/test_datum.py (fixes issue 22).
   datum shifts now work correctly in transform function.
1.8.7 (svn revision 175)
 * reverted pj_init.c to old version (from proj4 4.6.1) because version in
   4.7.0 includes caching code that can cause segfaults in pyproj (issue 19).
 * added 'preserve_units' keyword to Proj.__init__ to suppress conversion
   to meters.
1.8.6 (svn revision 169)
 * now works with ms vs2008, vs2003 (fixed missing isnan).
 * updated to proj 4.7.0 (fixes a problem coexisting with pyqt).
 * allow Geod instance to be initialized using a proj4 string
1.8.5 (svn revision 155)
 * allow Proj instance to be initialized using a proj4 string
   (instead of just a dict or kwargs).
1.8.4 (svn revision 151)
 * updated proj4 sources to version 4.6.0

3 files changed, 31 insertions, 11 deletions

diff --git a/geography/py-proj/Makefile b/geography/py-proj/Makefile
index d9ed2834e4b..aeaa3c92969 100644
--- a/geography/py-proj/Makefile
+++ b/geography/py-proj/Makefile
@@ -1,9 +1,7 @@
-# $NetBSD: Makefile,v 1.13 2012/10/04 09:19:20 asau Exp $
-#
+# $NetBSD: Makefile,v 1.14 2014/01/19 20:00:29 wiz Exp $
 
-DISTNAME=		pyproj-1.8.3
+DISTNAME=		pyproj-1.9.3
 PKGNAME=		${PYPKGPREFIX}-${DISTNAME:S/pyproj/proj/}
-PKGREVISION=		1
 CATEGORIES=		geography
 MASTER_SITES=		http://pyproj.googlecode.com/files/
 
@@ -18,6 +16,5 @@ post-install:
 	${INSTALL} ${WRKSRC}/README ${DESTDIR}${PREFIX}/share/doc/${PKGNAME_NOREV}
 
 .include "../../lang/python/distutils.mk"
-
 .include "../../geography/proj/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/geography/py-proj/PLIST b/geography/py-proj/PLIST
index 4058ffc4e44..ba89fd955c4 100644
--- a/geography/py-proj/PLIST
+++ b/geography/py-proj/PLIST
@@ -1,27 +1,50 @@
-@comment $NetBSD: PLIST,v 1.4 2012/04/08 20:21:48 wiz Exp $
+@comment $NetBSD: PLIST,v 1.5 2014/01/19 20:00:29 wiz Exp $
 ${PYSITELIB}/${EGG_FILE}
 ${PYSITELIB}/pyproj/__init__.py
 ${PYSITELIB}/pyproj/__init__.pyc
 ${PYSITELIB}/pyproj/__init__.pyo
-${PYSITELIB}/pyproj/_geod.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/datadir.py
+${PYSITELIB}/pyproj/datadir.pyc
+${PYSITELIB}/pyproj/datadir.pyo
 share/doc/${PKGNAME}/README
diff --git a/geography/py-proj/distinfo b/geography/py-proj/distinfo
index 5dc10f51f92..0bdd560d6ce 100644
--- a/geography/py-proj/distinfo
+++ b/geography/py-proj/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.2 2008/01/03 13:40:45 gdt Exp $
+$NetBSD: distinfo,v 1.3 2014/01/19 20:00:29 wiz Exp $
 
-SHA1 (pyproj-1.8.3.tar.gz) = 5fef90288135708fc22b6a1b89e35b4f9116ada4
-RMD160 (pyproj-1.8.3.tar.gz) = d1f1fb47bffbf223e30e4e545d6adf38481e8fb5
-Size (pyproj-1.8.3.tar.gz) = 317072 bytes
+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