Changes 1.9.0:

* New GDAL drivers: ACE2, CTG, E00GRID, ECRGTOC, GRASSASCIIGrid, GTA, NGSGEOID,
  SNODAS, WebP, ZMap
* New OGR drivers:  ARCGEN, CouchDB, DWG, EDIGEO, FileGDB, Geomedia, GFT,
  IDRISI, MDB, SEGUKOOA, SEGY, SVG, XLS
* Significantly improved drivers: NetCDF
* Encoding support for shapefile/dbf
* RFC 35: Delete, reorder and alter field definitions of OGR layers
* RFC 37: Add mechanism to provide user data to CPLErrorHandler
* gdalsrsinfo: new supported utility to report SRS in various form
  (supercedes testepsg)

7 files changed, 38 insertions, 115 deletions

diff --git a/geography/gdal-lib/Makefile b/geography/gdal-lib/Makefile
index d86b0b07d94..2fb27cfd017 100644
--- a/geography/gdal-lib/Makefile
+++ b/geography/gdal-lib/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.43 2012/02/06 12:40:14 wiz Exp $
+# $NetBSD: Makefile,v 1.44 2012/03/07 16:17:04 adam Exp $
 
-VERSION=	1.8.1
+VERSION=	1.9.0
 DISTNAME=	gdal-${VERSION}
 PKGNAME=	gdal-lib-${VERSION}
-PKGREVISION=	1
 CATEGORIES=	geography
 MASTER_SITES=	http://download.osgeo.org/gdal/
 
@@ -25,12 +24,9 @@ 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-libtiff=${BUILDLINK_PREFIX.tiff}
 CONFIGURE_ARGS+=	--with-libz=${BUILDLINK_PREFIX.zlib}/include
+CONFIGURE_ARGS+=	--with-netcdf=${BUILDLINK_PREFIX.netcdf}
 CONFIGURE_ARGS+=	--with-xerces
 CONFIGURE_ARGS+=	--with-xerces-inc=${BUILDLINK_PREFIX.xerces-c}/include
 CONFIGURE_ARGS+=	--with-xerces-lib=-L${BUILDLINK_PREFIX.xerces-c}/lib\ -lxerces-c
@@ -44,15 +40,14 @@ CHECK_PORTABILITY_SKIP+=	mkbindist.sh
 
 INSTALLATION_DIRS=	bin include lib ${PKGMANDIR}/man1 share/gdal
 
+.include "../../devel/netcdf/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../geography/geos/buildlink3.mk"
 .include "../../geography/proj/buildlink3.mk"
 .include "../../graphics/jasper/buildlink3.mk"
 .include "../../mk/giflib.buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
-# See the comment above about using the internal tiff library
-# also re-include in buildlink3.mk when uncommenting it!
-# .include "../../graphics/tiff/buildlink3.mk"
+.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 ca6a94e346b..5fa17275c0a 100644
--- a/geography/gdal-lib/PLIST
+++ b/geography/gdal-lib/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.9 2011/02/10 03:45:09 brook Exp $
+@comment $NetBSD: PLIST,v 1.10 2012/03/07 16:17:05 adam Exp $
 bin/gdal-config
 bin/gdal_contour
 bin/gdal_grid
@@ -11,6 +11,7 @@ bin/gdalenhance
 bin/gdalinfo
 bin/gdallocationinfo
 bin/gdalmanage
+bin/gdalsrsinfo
 bin/gdaltindex
 bin/gdaltransform
 bin/gdalwarp
@@ -20,7 +21,6 @@ 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
@@ -85,14 +85,19 @@ share/gdal/datum_shift.csv
 share/gdal/ecw_cs.wkt
 share/gdal/ellipsoid.csv
 share/gdal/epsg.wkt
+share/gdal/esri_StatePlane_extra.wkt
+share/gdal/esri_Wisconsin_extra.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/geoccs.csv
 share/gdal/gt_datum.csv
 share/gdal/gt_ellips.csv
 share/gdal/header.dxf
+share/gdal/nitf_spec.xml
+share/gdal/nitf_spec.xsd
 share/gdal/pci_datum.txt
 share/gdal/pci_ellips.txt
 share/gdal/pcs.csv
diff --git a/geography/gdal-lib/buildlink3.mk b/geography/gdal-lib/buildlink3.mk
index 51409c401a5..38162e26a3e 100644
--- a/geography/gdal-lib/buildlink3.mk
+++ b/geography/gdal-lib/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.24 2012/02/06 12:40:14 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.25 2012/03/07 16:17:05 adam 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.8.1nb1
+BUILDLINK_ABI_DEPENDS.gdal-lib+=	gdal-lib>=1.9.0
 BUILDLINK_PKGSRCDIR.gdal-lib?=	../../geography/gdal-lib
 
 pkgbase := gdal-lib
@@ -20,14 +20,14 @@ pkgbase := gdal-lib
 .include "../../mk/mysql.buildlink3.mk"
 .endif
 
+.include "../../devel/netcdf/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../geography/geos/buildlink3.mk"
 .include "../../geography/proj/buildlink3.mk"
 .include "../../graphics/jasper/buildlink3.mk"
 .include "../../mk/giflib.buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
-# see Makefile
-#.include "../../graphics/tiff/buildlink3.mk"
+.include "../../graphics/tiff/buildlink3.mk"
 .include "../../textproc/xerces-c/buildlink3.mk"
 .include "../../www/curl/buildlink3.mk"
 .endif # GDAL_LIB_BUILDLINK3_MK
diff --git a/geography/gdal-lib/distinfo b/geography/gdal-lib/distinfo
index 96e1b6314aa..50b1350267f 100644
--- a/geography/gdal-lib/distinfo
+++ b/geography/gdal-lib/distinfo
@@ -1,7 +1,6 @@
-$NetBSD: distinfo,v 1.17 2012/01/24 15:24:49 gdt Exp $
+$NetBSD: distinfo,v 1.18 2012/03/07 16:17:05 adam Exp $
 
-SHA1 (gdal-1.8.1.tar.gz) = b2f8b12ebdd00c05bc7f1ab7b761d9ac335c470c
-RMD160 (gdal-1.8.1.tar.gz) = 4ac1cd59979464bd37b4d2aa588092ee0c34d45c
-Size (gdal-1.8.1.tar.gz) = 8852355 bytes
-SHA1 (patch-CVE-2011-1167) = e402a72a244b8778dc0c445d6c38f7aa1d36cdb6
-SHA1 (patch-SA43593) = 896b39c25d819e40c8d774ae6a04653df1645eea
+SHA1 (gdal-1.9.0.tar.gz) = e2eaaf0fba39137b40c0d3069ac41dfb6f3c76db
+RMD160 (gdal-1.9.0.tar.gz) = 76957dd3f9dfd3b86281250f3be691f38ec4d762
+Size (gdal-1.9.0.tar.gz) = 9435584 bytes
+SHA1 (patch-configure) = 2da57c3b45b82b49d3c08217557c304f794e81ce
diff --git a/geography/gdal-lib/patches/patch-CVE-2011-1167 b/geography/gdal-lib/patches/patch-CVE-2011-1167
deleted file mode 100644
index 1887d3cad35..00000000000
--- a/geography/gdal-lib/patches/patch-CVE-2011-1167
+++ /dev/null
@@ -1,72 +0,0 @@
-$NetBSD: patch-CVE-2011-1167,v 1.1 2011/03/31 11:08:29 drochner Exp $
-
---- frmts/gtiff/libtiff/tif_thunder.c.orig	2011-01-14 05:19:04.000000000 +0000
-+++ frmts/gtiff/libtiff/tif_thunder.c
-@@ -25,6 +25,7 @@
-  */
- 
- #include "tiffiop.h"
-+#include <assert.h>
- #ifdef THUNDER_SUPPORT
- /*
-  * TIFF Library.
-@@ -55,15 +56,35 @@
- static const int twobitdeltas[4] = { 0, 1, 0, -1 };
- static const int threebitdeltas[8] = { 0, 1, 2, 3, 0, -3, -2, -1 };
- 
--#define	SETPIXEL(op, v) { \
--	lastpixel = (v) & 0xf; \
--	if (npixels++ & 1) \
--	    *op++ |= lastpixel; \
--	else \
--	    op[0] = (uint8) (lastpixel << 4); \
-+#define        SETPIXEL(op, v) {                     \
-+       lastpixel = (v) & 0xf;                \
-+        if ( npixels < maxpixels )         \
-+        {                                     \
-+         if (npixels++ & 1)                  \
-+           *op++ |= lastpixel;               \
-+         else                                \
-+            op[0] = (uint8) (lastpixel << 4); \
-+        }                                     \
- }
- 
- static int
-+ThunderSetupDecode(TIFF* tif)
-+{
-+       static const char module[] = "ThunderSetupDecode";
-+
-+        if( tif->tif_dir.td_bitspersample != 4 )
-+        {
-+                TIFFErrorExt(tif->tif_clientdata, module,
-+                             "Wrong bitspersample value (%d), Thunder decoder only supports 4bits per sample.",
-+                             (int) tif->tif_dir.td_bitspersample );
-+                return 0;
-+        }
-+
-+
-+       return (1);
-+ }
-+
-+static int
- ThunderDecode(TIFF* tif, uint8* op, tmsize_t maxpixels)
- {
- 	static const char module[] = "ThunderDecode";
-@@ -160,7 +181,8 @@ ThunderDecodeRow(TIFF* tif, uint8* buf, 
- 		occ -= tif->tif_scanlinesize;
- 		row += tif->tif_scanlinesize;
- 	}
--	return (1);
-+
-+        return (1);
- }
- 
- int
-@@ -169,6 +191,7 @@ TIFFInitThunderScan(TIFF* tif, int schem
- 	(void) scheme;
- 	tif->tif_decoderow = ThunderDecodeRow;
- 	tif->tif_decodestrip = ThunderDecodeRow; 
-+	tif->tif_setupdecode = ThunderSetupDecode;
- 	return (1);
- }
- #endif /* THUNDER_SUPPORT */
diff --git a/geography/gdal-lib/patches/patch-SA43593 b/geography/gdal-lib/patches/patch-SA43593
deleted file mode 100644
index 7172cc0fadd..00000000000
--- a/geography/gdal-lib/patches/patch-SA43593
+++ /dev/null
@@ -1,20 +0,0 @@
-$NetBSD: patch-SA43593,v 1.1 2011/03/30 18:39:05 drochner Exp $
-
-Fix heap-based buffer overflow which causes the vulnerability reported
-in SA43593. Patch taken from the "libtiff" CVS repository.
-
---- frmts/gtiff/libtiff/tif_fax3.h	8 Jun 2010 18:50:42 -0000	1.5.2.1
-+++ frmts/gtiff/libtiff/tif_fax3.h	10 Mar 2011 20:22:33 -0000	1.5.2.3
-@@ -478,6 +478,12 @@
- 	    break;							\
- 	case S_VL:							\
- 	    CHECK_b1;							\
-+	    if (b1 <= (int) (a0 + TabEnt->Param)) {			\
-+		if (b1 < (int) (a0 + TabEnt->Param) || pa != thisrun) {	\
-+		    unexpected("VL", a0);				\
-+		    goto eol2d;						\
-+		}							\
-+	    }								\
- 	    SETVALUE(b1 - a0 - TabEnt->Param);				\
- 	    b1 -= *--pb;						\
- 	    break;							\
diff --git a/geography/gdal-lib/patches/patch-configure b/geography/gdal-lib/patches/patch-configure
new file mode 100644
index 00000000000..edbde7e67a8
--- /dev/null
+++ b/geography/gdal-lib/patches/patch-configure
@@ -0,0 +1,16 @@
+$NetBSD: patch-configure,v 1.1 2012/03/07 16:17:05 adam Exp $
+
+Avoid bad substitution.
+
+--- configure.orig	2012-03-07 12:27:50.000000000 +0000
++++ configure
+@@ -21235,9 +21235,7 @@ $as_echo_n "checking libnetcdf version w
+       netcdf_version=`$ncdump 2>&1 | grep "netcdf library version" | awk '{gsub(/"/,"");print $4}'`
+       { $as_echo "$as_me:${as_lineno-$LINENO}: result: got $netcdf_version" >&5
+ $as_echo "got $netcdf_version" >&6; }
+-      if test "$netcdf_version" != "" -a "${netcdf_version:0:1}" == "4" ; then
+           nc_config=$NETCDF_ROOT"/bin/nc-config"
+-      fi
+     fi
+ 
+         if { test -x "$nc_config"; }; then