Update to 1.6.1. Upstream changes are too massive to list here (it's more

than two years of development). http://trac.osgeo.org/gdal/wiki/DownloadSource
has full changelogs.

6 files changed, 72 insertions, 43 deletions

diff --git a/geography/gdal-lib/Makefile b/geography/gdal-lib/Makefile
index 9cdac156a2f..155e36cc1d7 100644
--- a/geography/gdal-lib/Makefile
+++ b/geography/gdal-lib/Makefile
@@ -1,11 +1,10 @@
-# $NetBSD: Makefile,v 1.14 2008/03/13 17:38:48 joerg Exp $
+# $NetBSD: Makefile,v 1.15 2009/06/03 17:28:30 hasso Exp $
 #
 
-DISTNAME=		gdal-1.4.0
-PKGNAME=		gdal-lib-1.4.0
-PKGREVISION=		5
+DISTNAME=		gdal-1.6.1
+PKGNAME=		gdal-lib-1.6.1
 CATEGORIES=		geography
-MASTER_SITES=		http://www.gdal.org/dl/
+MASTER_SITES=		http://download.osgeo.org/gdal/
 
 MAINTAINER=		brook@nmsu.edu
 HOMEPAGE=		http://www.gdal.org/
diff --git a/geography/gdal-lib/PLIST b/geography/gdal-lib/PLIST
index b89657c681d..6816acde97d 100644
--- a/geography/gdal-lib/PLIST
+++ b/geography/gdal-lib/PLIST
@@ -1,36 +1,53 @@
-@comment $NetBSD: PLIST,v 1.5 2007/03/24 00:19:29 joerg Exp $
+@comment $NetBSD: PLIST,v 1.6 2009/06/03 17:28:30 hasso Exp $
 bin/gdal-config
 bin/gdal_contour
+bin/gdal_grid
 bin/gdal_rasterize
 bin/gdal_translate
 bin/gdaladdo
+bin/gdalbuildvrt
+bin/gdalenhance
 bin/gdalinfo
+bin/gdalmanage
 bin/gdaltindex
+bin/gdaltransform
 bin/gdalwarp
+bin/nearblack
 bin/ogr2ogr
 bin/ogrinfo
 bin/ogrtindex
+bin/testepsg
 include/cpl_config.h
 include/cpl_conv.h
 include/cpl_csv.h
 include/cpl_error.h
+include/cpl_hash_set.h
+include/cpl_http.h
 include/cpl_list.h
 include/cpl_minixml.h
+include/cpl_minizip_ioapi.h
+include/cpl_minizip_unzip.h
 include/cpl_multiproc.h
 include/cpl_odbc.h
 include/cpl_port.h
+include/cpl_quad_tree.h
 include/cpl_string.h
 include/cpl_vsi.h
-include/cpl_vsi_private.h
+include/cpl_vsi_virtual.h
 include/cpl_win32ce_api.h
 include/cpl_wince.h
+include/cplkeywordparser.h
 include/gdal.h
 include/gdal_alg.h
+include/gdal_alg_priv.h
 include/gdal_frmts.h
 include/gdal_pam.h
 include/gdal_priv.h
+include/gdal_proxy.h
 include/gdal_rat.h
 include/gdal_version.h
+include/gdal_vrt.h
+include/gdalgrid.h
 include/gdaljp2metadata.h
 include/gdalwarper.h
 include/gvgcpfit.h
@@ -49,15 +66,20 @@ include/thinplatespline.h
 include/vrtdataset.h
 lib/libgdal.la
 man/man1/gdal-config.1
+man/man1/gdal2tiles.1
 man/man1/gdal_contour.1
+man/man1/gdal_grid.1
 man/man1/gdal_merge.1
 man/man1/gdal_rasterize.1
+man/man1/gdal_retile.1
 man/man1/gdal_translate.1
 man/man1/gdal_utilities.1
 man/man1/gdaladdo.1
+man/man1/gdalbuildvrt.1
 man/man1/gdalinfo.1
 man/man1/gdaltindex.1
-man/man1/gdalwarp.1
+man/man1/gdaltransform.1
+man/man1/nearblack.1
 man/man1/ogr2ogr.1
 man/man1/ogr_utilities.1
 man/man1/ogrinfo.1
@@ -67,15 +89,21 @@ man/man1/rgb2pct.1
 share/gdal/GDALLogoBW.svg
 share/gdal/GDALLogoColor.svg
 share/gdal/GDALLogoGS.svg
+share/gdal/LICENSE.TXT
+share/gdal/coordinate_axis.csv
 share/gdal/cubewerx_extra.wkt
-share/gdal/ecw_cs.dat
+share/gdal/ecw_cs.wkt
 share/gdal/ellipsoid.csv
 share/gdal/epsg.wkt
 share/gdal/esri_extra.wkt
 share/gdal/gcs.csv
+share/gdal/gcs.override.csv
 share/gdal/gdal_datum.csv
 share/gdal/gdalicon.png
+share/gdal/gt_datum.csv
+share/gdal/gt_ellips.csv
 share/gdal/pcs.csv
+share/gdal/pcs.override.csv
 share/gdal/prime_meridian.csv
 share/gdal/projop_wparm.csv
 share/gdal/s57agencies.csv
diff --git a/geography/gdal-lib/buildlink3.mk b/geography/gdal-lib/buildlink3.mk
index 0a170566c51..44d206974d4 100644
--- a/geography/gdal-lib/buildlink3.mk
+++ b/geography/gdal-lib/buildlink3.mk
@@ -1,12 +1,12 @@
-# $NetBSD: buildlink3.mk,v 1.10 2009/03/20 19:24:35 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.11 2009/06/03 17:28:30 hasso Exp $
 
 BUILDLINK_TREE+=	gdal-lib
 
 .if !defined(GDAL_LIB_BUILDLINK3_MK)
 GDAL_LIB_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.gdal-lib+=	gdal-lib>=1.3.1
-BUILDLINK_ABI_DEPENDS.gdal-lib?=	gdal-lib>=1.4.0nb4
+BUILDLINK_API_DEPENDS.gdal-lib+=	gdal-lib>=1.6.1
+BUILDLINK_ABI_DEPENDS.gdal-lib?=	gdal-lib>=1.6.1
 BUILDLINK_PKGSRCDIR.gdal-lib?=	../../geography/gdal-lib
 
 pkgbase := gdal-lib
diff --git a/geography/gdal-lib/distinfo b/geography/gdal-lib/distinfo
index d5545469c68..810aee3c80f 100644
--- a/geography/gdal-lib/distinfo
+++ b/geography/gdal-lib/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.5 2007/03/07 16:04:25 joerg Exp $
+$NetBSD: distinfo,v 1.6 2009/06/03 17:28:30 hasso Exp $
 
-SHA1 (gdal-1.4.0.tar.gz) = fde8f5dbcd32f608b1c740aa2e6425e5febefca1
-RMD160 (gdal-1.4.0.tar.gz) = 18c2b0e60d5089b9b64b14a1b82fb4573430f473
-Size (gdal-1.4.0.tar.gz) = 7458051 bytes
-SHA1 (patch-aa) = 649f72dcf0fbc78f1486b843817500db2d454c8c
-SHA1 (patch-ab) = c593faf6d0682c0ff229b5891c8f2d3f1981957c
+SHA1 (gdal-1.6.1.tar.gz) = b2091a3830d8230a97aa0ced429935e7caef00ee
+RMD160 (gdal-1.6.1.tar.gz) = 64955b4940675475bfaf0cc8fd5f0b264b56b0bb
+Size (gdal-1.6.1.tar.gz) = 6999411 bytes
+SHA1 (patch-aa) = 8403f7314a5529e0e47877329578a1c94528f326
+SHA1 (patch-ab) = 748a3d1e226f9fb1e6a5ddfc954396cfbd481358
diff --git a/geography/gdal-lib/patches/patch-aa b/geography/gdal-lib/patches/patch-aa
index 3b847d6e54e..4cd9d1fb664 100644
--- a/geography/gdal-lib/patches/patch-aa
+++ b/geography/gdal-lib/patches/patch-aa
@@ -1,20 +1,22 @@
-$NetBSD: patch-aa,v 1.2 2007/02/23 22:22:38 gdt Exp $
+$NetBSD: patch-aa,v 1.3 2009/06/03 17:28:31 hasso Exp $
 
---- configure.orig	2007-02-16 08:57:36.000000000 -0700
-+++ configure
-@@ -28245,13 +28245,13 @@ fi
+--- GNUmakefile.orig	2009-06-03 16:37:58 +0300
++++ GNUmakefile	2009-06-03 16:38:31 +0300
+@@ -148,7 +148,7 @@ man:
+ # Generate man pages
+ 	(cat Doxyfile ; echo "ENABLED_SECTIONS=man"; echo "INPUT=doc ogr apps"; echo "FILE_PATTERNS=*utilities.dox gdalwarp.cpp"; echo "GENERATE_HTML=NO"; echo "GENERATE_MAN=YES") | doxygen -
  
- echo "$as_me:$LINENO: checking for special pymod link hacks" >&5
- echo $ECHO_N "checking for special pymod link hacks... $ECHO_C" >&6
--if test ! -z "`uname | grep Darwin`" -a ${with_libtool} == no ; then
-+if test ! -z "`uname | grep Darwin`" -a ${with_libtool} = no ; then
-     echo "$as_me:$LINENO: result: darwin-nonlibtool" >&5
- echo "${ECHO_T}darwin-nonlibtool" >&6
+-all:	default ogr-all
++all:	default ogr-all man
  
-     PY_LD_SHARED='g++ -bundle -framework Python'
-     PY_SO_EXT='so'
--elif test ! -z "`uname | grep Darwin`" -a ${with_libtool} == yes ; then
-+elif test ! -z "`uname | grep Darwin`" -a ${with_libtool} = yes ; then
-     echo "$as_me:$LINENO: result: darwin-libtool" >&5
- echo "${ECHO_T}darwin-libtool" >&6
+ install-docs:
+ 	(cd ogr; $(MAKE) install-docs)
+@@ -162,7 +162,7 @@ install-man:
+ web-update:	docs
+ 	cp html/*.* $(WEB_DIR)
  
+-install:	default install-actions
++install:	default install-actions install-man
+ 
+ install-actions: install-lib
+ 	$(INSTALL_DIR) $(DESTDIR)$(INST_BIN)
diff --git a/geography/gdal-lib/patches/patch-ab b/geography/gdal-lib/patches/patch-ab
index 643eedfdc78..75240e29489 100644
--- a/geography/gdal-lib/patches/patch-ab
+++ b/geography/gdal-lib/patches/patch-ab
@@ -1,13 +1,13 @@
-$NetBSD: patch-ab,v 1.3 2007/03/07 16:04:56 joerg Exp $
+$NetBSD: patch-ab,v 1.4 2009/06/03 17:28:31 hasso Exp $
 
---- ogr/GNUmakefile.orig	2007-03-07 15:23:10.000000000 +0000
-+++ ogr/GNUmakefile
-@@ -15,7 +15,7 @@ CPPFLAGS	:=	-Iogrsf_frmts -I. $(GDAL_INC
+--- ogr/GNUmakefile.orig	2009-06-03 16:27:45 +0300
++++ ogr/GNUmakefile	2009-06-03 16:27:55 +0300
+@@ -19,7 +19,7 @@ CPPFLAGS	:=	-Iogrsf_frmts -I. $(GDAL_INC
  
- default:	lib apps
+ default:	lib
  
--all:	sublibs apps test_ogrsf$(EXE) docs
-+all:	sublibs apps test_ogrsf$(EXE)
- 
- ifeq ($(OGR_ENABLED),yes)
+-all:	sublibs apps test_ogrsf$(EXE) 
++all:	sublibs
  
+ clean:
+ 	rm -f html/*