Upgrade to gdal v1.8.0 (and bump revision of packages that depend on it).

The changes are fully described at

     http://trac.osgeo.org/gdal/wiki/Release/1.8.0-News

However, the following are the highlights.

In a nutshell:

    * New GDAL drivers : GTX, HF2, JPEGLS, JP2OpenJPEG, JPIPKAK,
      KMLSUPEROVERLAY, LOS/LAS, MG4Lidar, NTv2, OZI, PDF, RASDAMAN,
      XYZ
    * New OGR drivers : AeronavFAA, ArcObjects, GPSBabel, HTF, LIBKML,
      MSSQLSpatial, NAS, OpenAir, PDS, PGDump, SOSI, SUA, WFS
    * Significantly improved OGR drivers : DXF, GML
    * New implemented RFCs:
      o RFC 7: Use VSILFILE for VSI*L Functions
      o RFC 24: Progressive data support in GDAL
      o RFC 28: OGR SQL Generalized Expressions
      o RFC 29: OGR Set Ignored Fields
      o RFC 30: Unicode Filenames
      o RFC 33: GTIFF - Corrected !PixelIsPoint Interpretation
    * New utility : gdallocationinfo

Backward compatibility issues:

    * MITAB driver: use "," for the OGR Feature Style id: parameter
      delimiter, not "." as per the spec. Known impacted application:
      MapServer?
    * RFC 33 changes the way PixelIsPoint? is handled for GeoTIFF
    * GML driver: write valid <gml:MultiGeometry> element instead of
      the non-conformant <gml:GeometryCollection>. For backward
      compatibility, recognize both syntax for the reading part

6 files changed, 42 insertions, 52 deletions

diff --git a/geography/gdal-lib/Makefile b/geography/gdal-lib/Makefile
index 27ee7097542..2f24b71dd2d 100644
--- a/geography/gdal-lib/Makefile
+++ b/geography/gdal-lib/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.34 2011/01/18 09:01:29 wiz Exp $
+# $NetBSD: Makefile,v 1.35 2011/02/10 03:45:09 brook Exp $
 
-DISTNAME=	gdal-1.7.3
-PKGNAME=	gdal-lib-1.7.3
-PKGREVISION=	2
+DISTNAME=	gdal-1.8.0
+PKGNAME=	gdal-lib-1.8.0
 CATEGORIES=	geography
 MASTER_SITES=	http://download.osgeo.org/gdal/
 
@@ -19,6 +18,11 @@ USE_PKGLOCALEDIR=	yes
 USE_TOOLS+=		gmake
 GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--with-geos
+# This version of gdal requires the TIFF function TIFFUnsetField,
+# which apparently is not part of the tiff v3.9.4 API.  That, however,
+# is the most recent stable release of tiff.  Consequently, for the
+# time being the internal tiff library will be used.
+CONFIGURE_ARGS+=	--with-libtiff=internal
 CONFIGURE_ARGS+=	--with-libz=${BUILDLINK_PREFIX.zlib}/include
 CONFIGURE_ARGS+=	--with-xerces
 CONFIGURE_ARGS+=	--with-xerces-inc=${BUILDLINK_PREFIX.xerces-c}/include
@@ -39,7 +43,8 @@ INSTALLATION_DIRS=	bin include lib ${PKGMANDIR}/man1 share/gdal
 .include "../../graphics/jasper/buildlink3.mk"
 .include "../../graphics/libungif/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
-.include "../../graphics/tiff/buildlink3.mk"
+# See the comment above about using the internal tiff library
+# .include "../../graphics/tiff/buildlink3.mk"
 .include "../../textproc/xerces-c/buildlink3.mk"
 .include "../../www/curl/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/geography/gdal-lib/PLIST b/geography/gdal-lib/PLIST
index 710ea61e367..ca6a94e346b 100644
--- a/geography/gdal-lib/PLIST
+++ b/geography/gdal-lib/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.8 2010/03/10 11:45:26 adam Exp $
+@comment $NetBSD: PLIST,v 1.9 2011/02/10 03:45:09 brook Exp $
 bin/gdal-config
 bin/gdal_contour
 bin/gdal_grid
@@ -9,6 +9,7 @@ bin/gdalbuildvrt
 bin/gdaldem
 bin/gdalenhance
 bin/gdalinfo
+bin/gdallocationinfo
 bin/gdalmanage
 bin/gdaltindex
 bin/gdaltransform
@@ -19,6 +20,7 @@ bin/ogrinfo
 bin/ogrtindex
 bin/testepsg
 include/cpl_atomic_ops.h
+include/cpl_base64.h
 include/cpl_config.h
 include/cpl_config_extras.h
 include/cpl_conv.h
@@ -30,6 +32,7 @@ include/cpl_list.h
 include/cpl_minixml.h
 include/cpl_minizip_ioapi.h
 include/cpl_minizip_unzip.h
+include/cpl_minizip_zip.h
 include/cpl_multiproc.h
 include/cpl_odbc.h
 include/cpl_port.h
@@ -44,6 +47,7 @@ include/cplkeywordparser.h
 include/gdal.h
 include/gdal_alg.h
 include/gdal_alg_priv.h
+include/gdal_csv.h
 include/gdal_frmts.h
 include/gdal_pam.h
 include/gdal_priv.h
@@ -54,6 +58,7 @@ include/gdal_vrt.h
 include/gdalgrid.h
 include/gdaljp2metadata.h
 include/gdalwarper.h
+include/gdalwarpkernel_opencl.h
 include/gvgcpfit.h
 include/memdataset.h
 include/ogr_api.h
@@ -73,8 +78,10 @@ share/gdal/GDALLogoBW.svg
 share/gdal/GDALLogoColor.svg
 share/gdal/GDALLogoGS.svg
 share/gdal/LICENSE.TXT
+share/gdal/compdcs.csv
 share/gdal/coordinate_axis.csv
 share/gdal/cubewerx_extra.wkt
+share/gdal/datum_shift.csv
 share/gdal/ecw_cs.wkt
 share/gdal/ellipsoid.csv
 share/gdal/epsg.wkt
@@ -86,6 +93,8 @@ share/gdal/gdalicon.png
 share/gdal/gt_datum.csv
 share/gdal/gt_ellips.csv
 share/gdal/header.dxf
+share/gdal/pci_datum.txt
+share/gdal/pci_ellips.txt
 share/gdal/pcs.csv
 share/gdal/pcs.override.csv
 share/gdal/prime_meridian.csv
@@ -103,3 +112,5 @@ share/gdal/seed_3d.dgn
 share/gdal/stateplane.csv
 share/gdal/trailer.dxf
 share/gdal/unit_of_measure.csv
+share/gdal/vertcs.csv
+share/gdal/vertcs.override.csv
diff --git a/geography/gdal-lib/buildlink3.mk b/geography/gdal-lib/buildlink3.mk
index e0daa95d02b..d48a7229c52 100644
--- a/geography/gdal-lib/buildlink3.mk
+++ b/geography/gdal-lib/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.19 2011/01/13 13:36:08 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.20 2011/02/10 03:45:09 brook Exp $
 
 BUILDLINK_TREE+=	gdal-lib
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=	gdal-lib
 GDAL_LIB_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.gdal-lib+=	gdal-lib>=1.6.1
-BUILDLINK_ABI_DEPENDS.gdal-lib+=	gdal-lib>=1.7.3nb1
+BUILDLINK_ABI_DEPENDS.gdal-lib+=	gdal-lib>=1.8.0
 BUILDLINK_PKGSRCDIR.gdal-lib?=	../../geography/gdal-lib
 
 pkgbase := gdal-lib
diff --git a/geography/gdal-lib/distinfo b/geography/gdal-lib/distinfo
index 090863156c7..37028fb3575 100644
--- a/geography/gdal-lib/distinfo
+++ b/geography/gdal-lib/distinfo
@@ -1,7 +1,6 @@
-$NetBSD: distinfo,v 1.13 2011/01/24 16:26:16 wiz Exp $
+$NetBSD: distinfo,v 1.14 2011/02/10 03:45:09 brook Exp $
 
-SHA1 (gdal-1.7.3.tar.gz) = 58d4355fe792ad618bb74605dc1a084a0aeb7cb1
-RMD160 (gdal-1.7.3.tar.gz) = ce84a12d48c85a58c56a17381aee1c4f2ba08b57
-Size (gdal-1.7.3.tar.gz) = 7757684 bytes
-SHA1 (patch-aa) = 2c017bda45d4ed4fb10f7e70d33b707ca33149d1
-SHA1 (patch-ab) = d551e277108c4dbbde595a7797b3c3ceaa39a058
+SHA1 (gdal-1.8.0.tar.gz) = e5a2802933054050c6fb0b0a0e1f46b5dd195b0a
+RMD160 (gdal-1.8.0.tar.gz) = 0e116f41b23ff5b44c692f56459facab332c6201
+Size (gdal-1.8.0.tar.gz) = 8837824 bytes
+SHA1 (patch-ab) = 2d13b396a79883d41751148762ad10839e6e18dc
diff --git a/geography/gdal-lib/patches/patch-aa b/geography/gdal-lib/patches/patch-aa
deleted file mode 100644
index 641631481e0..00000000000
--- a/geography/gdal-lib/patches/patch-aa
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-aa,v 1.4 2010/03/10 11:45:26 adam Exp $
-
---- GNUmakefile.orig	2010-02-08 19:52:34.000000000 +0000
-+++ GNUmakefile
-@@ -132,7 +132,7 @@ man:
- # Generate man pages
- 	(cat Doxyfile ; echo "ENABLED_SECTIONS=man"; echo "INPUT=apps swig/python/scripts"; echo "FILE_PATTERNS=*.cpp *.dox"; echo "GENERATE_HTML=NO"; echo "GENERATE_MAN=YES") | doxygen -
- 
--all:	default ogr-all
-+all:	default ogr-all man
- 
- install-docs:
- 	(cd ogr; $(MAKE) install-docs)
-@@ -147,7 +147,7 @@ web-update:	docs
- 	cp html/*.* $(INST_HTML)
- 	(cd ogr; make web-update)
- 
--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 55490a91c1c..16966b2eed9 100644
--- a/geography/gdal-lib/patches/patch-ab
+++ b/geography/gdal-lib/patches/patch-ab
@@ -1,38 +1,38 @@
-$NetBSD: patch-ab,v 1.8 2011/01/24 16:26:16 wiz Exp $
+$NetBSD: patch-ab,v 1.9 2011/02/10 03:45:09 brook Exp $
 
 Fix build with png-1.5.
 http://trac.osgeo.org/gdal/ticket/3914
 
---- frmts/png/pngdataset.cpp.orig	2010-11-07 18:28:47.000000000 +0000
-+++ frmts/png/pngdataset.cpp
-@@ -1296,7 +1296,7 @@ png_vsi_read_data(png_structp png_ptr, p
+--- frmts/png/pngdataset.cpp.orig	2011-01-13 22:19:04.000000000 -0700
++++ frmts/png/pngdataset.cpp	2011-02-06 12:43:09.000000000 -0700
+@@ -1315,7 +1315,7 @@
      * instead of an int, which is what fread() actually returns.
      */
     check = (png_size_t)VSIFReadL(data, (png_size_t)1, length,
--                                 (png_FILE_p)png_ptr->io_ptr);
-+                                 (png_FILE_p)png_get_io_ptr(png_ptr));
+-                                 (VSILFILE*)png_ptr->io_ptr);
++                                 (VSILFILE*)png_get_io_ptr(png_ptr));
  
     if (check != length)
        png_error(png_ptr, "Read Error");
-@@ -1311,7 +1311,7 @@ png_vsi_write_data(png_structp png_ptr, 
+@@ -1330,7 +1330,7 @@
  {
     png_uint_32 check;
  
--   check = VSIFWriteL(data, 1, length, (png_FILE_p)(png_ptr->io_ptr));
-+   check = VSIFWriteL(data, 1, length, (png_FILE_p)(png_get_io_ptr(png_ptr)));
+-   check = VSIFWriteL(data, 1, length, (VSILFILE*)(png_ptr->io_ptr));
++   check = VSIFWriteL(data, 1, length, (VSILFILE*)(png_get_io_ptr(png_ptr)));
  
     if (check != length)
        png_error(png_ptr, "Write Error");
-@@ -1322,7 +1322,7 @@ png_vsi_write_data(png_structp png_ptr, 
+@@ -1341,7 +1341,7 @@
  /************************************************************************/
  static void png_vsi_flush(png_structp png_ptr)
  {
--    VSIFFlushL( (png_FILE_p)(png_ptr->io_ptr) );
-+    VSIFFlushL( (png_FILE_p)(png_get_io_ptr(png_ptr)) );
+-    VSIFFlushL( (VSILFILE*)(png_ptr->io_ptr) );
++    VSIFFlushL( (VSILFILE*)(png_get_io_ptr(png_ptr)) );
  }
  
  /************************************************************************/
-@@ -1338,10 +1338,10 @@ static void png_gdal_error( png_structp 
+@@ -1357,7 +1357,7 @@
      // libpng is generally not built as C++ and so won't honour unwind
      // semantics.  Ugg. 
  
@@ -41,6 +41,3 @@ http://trac.osgeo.org/gdal/ticket/3914
      if (psSetJmpContext)
      {
          longjmp( *psSetJmpContext, 1 );
-     }
- }
-