From 5043316a020f2fc8f9ae28b908a982d68d1f5bf7 Mon Sep 17 00:00:00 2001
From: adam <adam>
Date: Tue, 9 Apr 2013 15:58:54 +0000
Subject: The 1.9.2 release is a bug fix release. * Fix infinite GDALOpen
 recursion with some VRTs (4835) * Avoid destroying existing overviews
 (.aux/.rrd) (4831) * Support recognising NaN better in CPLStrtod() (4799) *
 Fix windows declaration for CPLGetErrorHandlerUserData() (4755) * Fix
 compilation with Gentoo modified zlib 1.2.6 (4723) * Look for libgeotiff
 headers in /usr/include/libgeotiff too (4706) * Improve warning handling in
 CPLClearRecodeStubWarningFlags() (4650) * Fix Solaris compilation bug (4705)
 * MorphFromESRI(): compare SPHEROID/PRIMEM parms, not names (4673) * Avoid
 iffy casting of OGRWkbGeometryType to int (4847) * Fix thread safety issue
 with CPLOpenShared()

---
 geography/gdal-lib/Makefile                                 |  5 ++---
 geography/gdal-lib/distinfo                                 |  9 ++++-----
 .../gdal-lib/patches/patch-frmts_netcdf_netcdfdataset.cpp   | 13 -------------
 3 files changed, 6 insertions(+), 21 deletions(-)
 delete mode 100644 geography/gdal-lib/patches/patch-frmts_netcdf_netcdfdataset.cpp

(limited to 'geography/gdal-lib')

diff --git a/geography/gdal-lib/Makefile b/geography/gdal-lib/Makefile
index 540e4749cad..35e2f379eba 100644
--- a/geography/gdal-lib/Makefile
+++ b/geography/gdal-lib/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.56 2013/03/02 20:33:26 wiz Exp $
+# $NetBSD: Makefile,v 1.57 2013/04/09 15:58:54 adam Exp $
 
-VERSION=	1.9.1
+VERSION=	1.9.2
 DISTNAME=	gdal-${VERSION}
 PKGNAME=	gdal-lib-${VERSION}
-PKGREVISION=	9
 CATEGORIES=	geography
 MASTER_SITES=	http://download.osgeo.org/gdal/
 
diff --git a/geography/gdal-lib/distinfo b/geography/gdal-lib/distinfo
index 86311cab421..0174816a50f 100644
--- a/geography/gdal-lib/distinfo
+++ b/geography/gdal-lib/distinfo
@@ -1,6 +1,5 @@
-$NetBSD: distinfo,v 1.20 2012/06/02 16:31:29 drochner Exp $
+$NetBSD: distinfo,v 1.21 2013/04/09 15:58:54 adam Exp $
 
-SHA1 (gdal-1.9.1.tar.gz) = c1eae556398ff7b9332afe9d3022dcd931130808
-RMD160 (gdal-1.9.1.tar.gz) = c4d77975b753fae75c634662e5e572fc2308456e
-Size (gdal-1.9.1.tar.gz) = 9487505 bytes
-SHA1 (patch-frmts_netcdf_netcdfdataset.cpp) = e7d67936e13177284aa07ac12e534477a1cc26d9
+SHA1 (gdal-1.9.2.tar.gz) = 7eda6a4d735b8d6903740e0acdd702b43515e351
+RMD160 (gdal-1.9.2.tar.gz) = 1ab34a85946bae4313cbd925cdbbf728d23d7b57
+Size (gdal-1.9.2.tar.gz) = 9495381 bytes
diff --git a/geography/gdal-lib/patches/patch-frmts_netcdf_netcdfdataset.cpp b/geography/gdal-lib/patches/patch-frmts_netcdf_netcdfdataset.cpp
deleted file mode 100644
index 20d79da7831..00000000000
--- a/geography/gdal-lib/patches/patch-frmts_netcdf_netcdfdataset.cpp
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-frmts_netcdf_netcdfdataset.cpp,v 1.1 2012/05/04 13:27:23 hans Exp $
-
---- frmts/netcdf/netcdfdataset.cpp.orig	2012-01-04 08:03:37.000000000 +0100
-+++ frmts/netcdf/netcdfdataset.cpp	2012-05-04 15:08:15.080833521 +0200
-@@ -962,7 +962,7 @@ void  netCDFRasterBand::CheckValidData (
-             /* check for nodata and nan */
-             if ( CPLIsEqual( (double) ((T *)pImage)[i], dfNoDataValue ) )
-                 continue;
--            if( bCheckIsNan && CPLIsNan( ( (T *) pImage)[i] ) ) {
-+            if( bCheckIsNan && CPLIsNan( (double) ( (T *) pImage)[i] ) ) {
-                 ( (T *)pImage )[i] = (T)dfNoDataValue;
-                 continue;
-             }
-- 
cgit v1.2.3