Update to 4.4.7. The documentation is being split into a

separate package.

4.4.7 Release Notes
-------------------

 o Added NTv2 (.gsb) grid shift file support.

 o Modified datum shift support so that data file data is only loaded if
   needed.  Also added 'null' grid as a fallback option, and support for
   making grids optional (prefix with '@' in +nadgrids).

 o Regenerated nad/epsg file with towgs84 parameters for non-greenwich prime
   meridians.

 o Updated nad/esri file with better generated form from Paul Ramsey.

 o Various bug fixes.


4.4.6 Release Notes
-------------------

 o Incorporated new lcca (Lambert Conformal Conic Alternate) projection from
   Gerald.

 o Updated 'espg' translation file for EPSG 6.2.2 with better support for
   prime meridians.

 o Added Prime Meridians via +pm command switch to cs2cs (and pj_transform).

 o Fixed bug with 7 parameter transforms.

 o Added 'esri' pseudo-epsg coordinate system file.

 o Cleanup so that PROJ.4 compiles clean as C++ code.

 o Added pj_get_def() to expand definitions of stuff like +init clauses.

 o Added a Krovak implementation (proj=krov).  Note this may change again
   in the next release.

3 files changed, 12 insertions, 22 deletions

diff --git a/misc/proj/Makefile b/misc/proj/Makefile
index ec3ac682d5a..9a0203f44b4 100644
--- a/misc/proj/Makefile
+++ b/misc/proj/Makefile
@@ -1,19 +1,19 @@
-# $NetBSD: Makefile,v 1.7 2003/06/02 01:18:08 jschauma Exp $
+# $NetBSD: Makefile,v 1.8 2003/07/12 12:18:10 jtb Exp $
 
-DISTNAME=		proj-4.4.5
+DISTNAME=		proj-4.4.7
 CATEGORIES=		misc
 MASTER_SITES=		ftp://ftp.remotesensing.org/pub/proj/
-DISTFILES=		proj-4.4.5.tar.gz proj-pdf-docs.tar.gz \
-			proj-nad27-1.1.tar.gz
+DISTFILES=		${DISTNAME}${EXTRACT_SUFX} proj-nad27-1.1.tar.gz
 
 MAINTAINER=		tech-pkg@netbsd.org
 HOMEPAGE=		http://www.remotesensing.org/proj/
 COMMENT=		Cartographic projection software
 
+USE_BUILDLINK2=		yes
 GNU_CONFIGURE=		yes
 USE_GMAKE=		yes
 USE_LIBTOOL=		yes
-LTCONFIG_OVERRIDE=	${WRKSRC}/ltconfig
+LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
 
 NAD27_FILES=FL.lla MD.lla README.NADUS TN.lla WI.lla WO.lla alaska.lla	\
 	conus.lla hawaii.lla ntv1_can.dat prvi.lla stgeorge.lla		\
@@ -22,8 +22,4 @@ NAD27_FILES=FL.lla MD.lla README.NADUS TN.lla WI.lla WO.lla alaska.lla	\
 post-extract:
 	cd ${WRKDIR} &&	${LN} ${NAD27_FILES} ${WRKDIR}/${DISTNAME}/nad
 
-post-install:
-	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/proj
-	${INSTALL_DATA} ${WRKDIR}/*.pdf ${PREFIX}/share/doc/proj/
-
 .include "../../mk/bsd.pkg.mk"
diff --git a/misc/proj/PLIST b/misc/proj/PLIST
index d82bb7dd7aa..74773341bbd 100644
--- a/misc/proj/PLIST
+++ b/misc/proj/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2002/05/03 22:20:06 jtb Exp $
+@comment $NetBSD: PLIST,v 1.3 2003/07/12 12:18:10 jtb Exp $
 bin/cs2cs
 bin/geod
 bin/invgeod
@@ -12,17 +12,13 @@ include/projects.h
 lib/libproj.a
 lib/libproj.la
 lib/libproj.so
-lib/libproj.so.3
-lib/libproj.so.3.1
+lib/libproj.so.4
+lib/libproj.so.4.1
 man/man1/cs2cs.1
 man/man1/geod.1
 man/man1/nad2nad.1
 man/man1/proj.1
 man/man3/pj_init.3
-share/doc/proj/OF90-284.pdf
-share/doc/proj/PROJ.4.3.I2.pdf
-share/doc/proj/PROJ.4.3.pdf
-share/doc/proj/SWISS.pdf
 share/proj/FL
 share/proj/GL27
 share/proj/MD
@@ -32,6 +28,7 @@ share/proj/WO
 share/proj/alaska
 share/proj/conus
 share/proj/epsg
+share/proj/esri
 share/proj/hawaii
 share/proj/nad.lst
 share/proj/nad27
@@ -44,4 +41,3 @@ share/proj/stlrnc
 share/proj/stpaul
 share/proj/world
 @dirrm share/doc/proj
-@dirrm share/proj
diff --git a/misc/proj/distinfo b/misc/proj/distinfo
index a4c8233505b..3e0ee29138b 100644
--- a/misc/proj/distinfo
+++ b/misc/proj/distinfo
@@ -1,8 +1,6 @@
-$NetBSD: distinfo,v 1.4 2002/05/03 22:20:06 jtb Exp $
+$NetBSD: distinfo,v 1.5 2003/07/12 12:18:10 jtb Exp $
 
-SHA1 (proj-4.4.5.tar.gz) = a417e0bc3fc8570e803b5ed0ac7e036db00d5b99
-Size (proj-4.4.5.tar.gz) = 286342 bytes
-SHA1 (proj-pdf-docs.tar.gz) = c83a154ac00058fba5097eb39cfc8d27706be4d8
-Size (proj-pdf-docs.tar.gz) = 6918448 bytes
+SHA1 (proj-4.4.7.tar.gz) = 7da5ec181d29ca2628578738632be7843a567e23
+Size (proj-4.4.7.tar.gz) = 459333 bytes
 SHA1 (proj-nad27-1.1.tar.gz) = 0885c8ca5c9311bbe9c99faf8c2c51ded3b7dd23
 Size (proj-nad27-1.1.tar.gz) = 1816642 bytes