Update to 4.8.0. As a byproduct, update proj-datumgrid to 1.5, which

has an additional grid shift file.  Add a test target; regression
tests now pass at least on NetBSD/i386 5.1_STABLE.

4.8.0 Release Notes
-------------------

 o Added the Natural Earth projection.

 o Added HEALPIX, rHEALPIX and Icosahedral Snyder Equal Area projections.

 o nad2bin now produces "CTable2" format grid shift files by default which
   are platform independent.

 o nad2nad removed, use cs2cs for datum shift operations.

 o projects.h no longer installed as a public include file.  Please try to
   only use proj_api.h.

 o Add pj_get_spheroid_defn() accessor.

 o Added an alternate version of pj_init() that takes a projCtx (execution
   context) structure to address multithreading issues with error management
   and to provide a support for application hookable error reporting and
   logging.

 o Upgrade to EPSG 7.9.  Some changes in ideal datum selection.

 o JNI bindings reworked, org.proj4.Projections deprecated in favor of
   org.proj4.PJ.

 o Added preliminary vertical datum support.

 o Fix various multithreading issues, particular in datum grid handling code.

 o Added support for the +axis= option for alternate axis orientations as
   part of a coordinate system (used for TM South Orientated support).

 o +proj=omerc implementatioin replaced with code from libproj4.  +rot_conv
   flag no longer works, and some coordinate systems (ie. Malaysian) will
   need to use +gamma instead.  "epsg" init file updated accordingly.

4 files changed, 44 insertions, 18 deletions

diff --git a/geography/proj/Makefile b/geography/proj/Makefile
index 434c1a81d75..2e33651d1b6 100644
--- a/geography/proj/Makefile
+++ b/geography/proj/Makefile
@@ -1,28 +1,35 @@
-# $NetBSD: Makefile,v 1.1.1.1 2010/03/14 16:26:22 wiz Exp $
+# $NetBSD: Makefile,v 1.2 2012/03/14 23:36:06 gdt Exp $
 
-DISTNAME=	proj-4.7.0
+VERSION=	4.8.0
+DISTNAME=	proj-${VERSION}
 CATEGORIES=	geography
 MASTER_SITES=	http://download.osgeo.org/proj/
-DISTFILES=	${DISTNAME}${EXTRACT_SUFX} proj-datumgrid-1.4${EXTRACT_SUFX}
+DISTFILES=	${DISTNAME}${EXTRACT_SUFX} proj-datumgrid-1.5${EXTRACT_SUFX}
 
 MAINTAINER=	gdt@NetBSD.org
 HOMEPAGE=	http://trac.osgeo.org/proj/
 COMMENT=	Cartographic projection software
 
+LICENSE=	mit
+
+PREV_PKGPATH=		misc/proj
+
 PKG_DESTDIR_SUPPORT=	user-destdir
 
 USE_LIBTOOL=		yes
 USE_TOOLS+=		gmake
 GNU_CONFIGURE=		yes
 
-PREV_PKGPATH=		misc/proj
+TEST_TARGET=		check
 
+# The last file is out of order to avoid reordering the whole list
+# from datumgrid-1.4 to datumgrid-1.5
 DATUMGRID_FILES= 							\
 	FL.lla MD.lla README.NADUS TN.lla WI.lla WO.lla alaska.lla	\
 	conus.lla hawaii.lla ntv1_can.dat null.lla nzgd2kgrid0005.gsb	\
-	prvi.lla stgeorge.lla stlrnc.lla stpaul.lla
+	prvi.lla stgeorge.lla stlrnc.lla stpaul.lla ntf_r93.gsb
 
 post-extract:
-	cd ${WRKDIR} &&	${LN} ${DATUMGRID_FILES} ${WRKDIR}/${DISTNAME}/nad
+	cd ${WRKDIR} &&	${LN} ${DATUMGRID_FILES} ${WRKDIR}/${PKGNAME}/nad
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/geography/proj/PLIST b/geography/proj/PLIST
index 4efb292fd1b..9c1c0c8c93b 100644
--- a/geography/proj/PLIST
+++ b/geography/proj/PLIST
@@ -1,19 +1,16 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2010/03/14 16:26:22 wiz Exp $
+@comment $NetBSD: PLIST,v 1.2 2012/03/14 23:36:06 gdt Exp $
 bin/cs2cs
 bin/geod
 bin/invgeod
 bin/invproj
 bin/nad2bin
-bin/nad2nad
 bin/proj
-include/nad_list.h
 include/org_proj4_Projections.h
 include/proj_api.h
-include/projects.h
 lib/libproj.la
+lib/pkgconfig/proj.pc
 man/man1/cs2cs.1
 man/man1/geod.1
-man/man1/nad2nad.1
 man/man1/proj.1
 man/man3/pj_init.3
 share/proj/FL
@@ -32,6 +29,7 @@ share/proj/hawaii
 share/proj/nad.lst
 share/proj/nad27
 share/proj/nad83
+share/proj/ntf_r93.gsb
 share/proj/ntv1_can.dat
 share/proj/null
 share/proj/nzgd2kgrid0005.gsb
diff --git a/geography/proj/distinfo b/geography/proj/distinfo
index f2a36c5d196..d832592aa7f 100644
--- a/geography/proj/distinfo
+++ b/geography/proj/distinfo
@@ -1,8 +1,9 @@
-$NetBSD: distinfo,v 1.1.1.1 2010/03/14 16:26:22 wiz Exp $
+$NetBSD: distinfo,v 1.2 2012/03/14 23:36:06 gdt Exp $
 
-SHA1 (proj-4.7.0.tar.gz) = bfe59b8dc1ea0c57e1426c37ff2b238fea66acd7
-RMD160 (proj-4.7.0.tar.gz) = cd96c09906b99d2ad205cc087e2863910d1124e1
-Size (proj-4.7.0.tar.gz) = 684923 bytes
-SHA1 (proj-datumgrid-1.4.tar.gz) = 1ef8262271daabed37db1816a4796f06ea5e1ba9
-RMD160 (proj-datumgrid-1.4.tar.gz) = f8b7f866ad8d7e148a81f746d66e2c5dfa914045
-Size (proj-datumgrid-1.4.tar.gz) = 2252273 bytes
+SHA1 (proj-4.8.0.tar.gz) = 5c8d6769a791c390c873fef92134bf20bb20e82a
+RMD160 (proj-4.8.0.tar.gz) = a2a20159b333aeef9f6322ccc97a0a14cc38fe89
+Size (proj-4.8.0.tar.gz) = 785279 bytes
+SHA1 (proj-datumgrid-1.5.tar.gz) = 38385e05f50445fe1b72243e54875360c4426a30
+RMD160 (proj-datumgrid-1.5.tar.gz) = 9a75d4c1652c6b1a614ee5e90c77138a2af34025
+Size (proj-datumgrid-1.5.tar.gz) = 2252308 bytes
+SHA1 (patch-README) = f8b38e806254135314f00f2583a744b39d38c527
diff --git a/geography/proj/patches/patch-README b/geography/proj/patches/patch-README
new file mode 100644
index 00000000000..b30a0551846
--- /dev/null
+++ b/geography/proj/patches/patch-README
@@ -0,0 +1,20 @@
+$NetBSD: patch-README,v 1.1 2012/03/14 23:36:06 gdt Exp $
+
+Sent upstream by email 20120309.
+
+--- README.orig	2010-12-05 16:06:32.000000000 +0000
++++ README
+@@ -40,6 +40,13 @@ After executing configure, execute:
+ 
+ The install target will create, if necessary, all required sub-directories.
+ 
++To test, execute:
++
++	make check
++
++Note that you must have installed proj-datumgrid-1.5 in nad prior to
++building; the test suite includes grid shift tests.
++
+ Windows Build
+ -------------
+