Changes 1.6.3:

* r13533 (ogr postgis plugin) have been added to the stable branch only
* GRIB detection not thread safe
* Bug fixes

Changes 1.6.2:
* OGR expression parser causes access violations with large expressions
* OGR cannot open/handle .DBF files > 2 GB
* crash in cpl_vsil_win32.cpp when compiling as x64 under Windows
* create index sql execute problem
* GTiffDataset::FlushCache() cause crashes when used just after dataset creation
* GDALDefaultOverviews::BuildOverviews() causes out-of-bounds writes for a
  1x1 dataset
* gdaladdo crashes on a 16-bit dataset when external overviews are requested
  to have JPEG compression
* Corrupt EXIF info can cause stack buffer overflow in JPEG driver

5 files changed, 46 insertions, 57 deletions

diff --git a/geography/gdal-lib/Makefile b/geography/gdal-lib/Makefile
index e4571514bbb..f81afaba1ef 100644
--- a/geography/gdal-lib/Makefile
+++ b/geography/gdal-lib/Makefile
@@ -1,26 +1,29 @@
-# $NetBSD: Makefile,v 1.20 2010/01/17 12:02:17 wiz Exp $
-#
+# $NetBSD: Makefile,v 1.21 2010/01/18 09:36:09 adam Exp $
 
-DISTNAME=		gdal-1.6.1
-PKGNAME=		gdal-lib-1.6.1
-PKGREVISION=		4
-CATEGORIES=		geography
-MASTER_SITES=		http://download.osgeo.org/gdal/
+DISTNAME=	gdal-1.6.3
+PKGNAME=	gdal-lib-1.6.3
+CATEGORIES=	geography
+MASTER_SITES=	http://download.osgeo.org/gdal/
 
-MAINTAINER=		brook@nmsu.edu
-HOMEPAGE=		http://www.gdal.org/
-COMMENT=		Translator library for raster geospatial data formats
+MAINTAINER=	brook@nmsu.edu
+HOMEPAGE=	http://www.gdal.org/
+COMMENT=	Translator library for raster geospatial data formats
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
-MAKE_JOBS_SAFE=		no
+#MAKE_JOBS_SAFE=		no
 
-USE_PKGLOCALEDIR=	yes
 USE_LANGUAGES=		c c++ fortran
 USE_LIBTOOL=		yes
-
-GNU_CONFIGURE=		yes
+USE_PKGLOCALEDIR=	yes
 USE_TOOLS+=		gmake
+GNU_CONFIGURE=		yes
+CONFIGURE_ARGS+=	--with-geos
+CONFIGURE_ARGS+=	--with-libz=${BUILDLINK_PREFIX.zlib}/include
+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
+CONFIGURE_ARGS+=	--without-python
 
 MAKE_FILE=		GNUmakefile
 
@@ -28,32 +31,11 @@ PKG_OPTIONS_VAR=	PKG_OPTIONS.gdal-lib
 PKG_SUPPORTED_OPTIONS=	pgsql mysql
 PKG_SUGGESTED_OPTIONS=	pgsql
 
-.include "../../mk/bsd.options.mk"
-
-.if !empty(PKG_OPTIONS:Mpgsql)
-. include "../../mk/pgsql.buildlink3.mk"
-CONFIGURE_ARGS+=	--with-pg
-.else
-CONFIGURE_ARGS+=	--without-pg
-.endif
-
-.if !empty(PKG_OPTIONS:Mmysql)
-. include "../../mk/mysql.buildlink3.mk"
-CONFIGURE_ARGS+=	--with-mysql
-.else
-CONFIGURE_ARGS+=	--without-mysql
-.endif
-
-CONFIGURE_ARGS+=	--with-libz=${BUILDLINK_PREFIX.zlib}/include
-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
-CONFIGURE_ARGS+=	--with-geos
-CONFIGURE_ARGS+=	--without-python
+.include "options.mk"
 
 CHECK_PORTABILITY_SKIP+=	mkbindist.sh
 
-INSTALLATION_DIRS=	bin include lib man/man1 share/gdal
+INSTALLATION_DIRS=	bin include lib ${PKGMANDIR}/man1 share/gdal
 
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../graphics/tiff/buildlink3.mk"
diff --git a/geography/gdal-lib/buildlink3.mk b/geography/gdal-lib/buildlink3.mk
index 25864d50563..11e3bff9297 100644
--- a/geography/gdal-lib/buildlink3.mk
+++ b/geography/gdal-lib/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.13 2010/01/17 12:02:18 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.14 2010/01/18 09:36:09 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.6.1nb4
+BUILDLINK_ABI_DEPENDS.gdal-lib+=	gdal-lib>=1.6.1nb4
 BUILDLINK_PKGSRCDIR.gdal-lib?=	../../geography/gdal-lib
 
 pkgbase := gdal-lib
diff --git a/geography/gdal-lib/distinfo b/geography/gdal-lib/distinfo
index 810aee3c80f..8bd58d1509b 100644
--- a/geography/gdal-lib/distinfo
+++ b/geography/gdal-lib/distinfo
@@ -1,7 +1,6 @@
-$NetBSD: distinfo,v 1.6 2009/06/03 17:28:30 hasso Exp $
+$NetBSD: distinfo,v 1.7 2010/01/18 09:36:09 adam Exp $
 
-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 (gdal-1.6.3.tar.gz) = b8fc53f562dd253c0c75e9ea4d4398f9548c1f1f
+RMD160 (gdal-1.6.3.tar.gz) = aab37ae4b7a98f9af6c10511e2ce5205505b9769
+Size (gdal-1.6.3.tar.gz) = 7007613 bytes
 SHA1 (patch-aa) = 8403f7314a5529e0e47877329578a1c94528f326
-SHA1 (patch-ab) = 748a3d1e226f9fb1e6a5ddfc954396cfbd481358
diff --git a/geography/gdal-lib/options.mk b/geography/gdal-lib/options.mk
new file mode 100644
index 00000000000..4ab2e30bf47
--- /dev/null
+++ b/geography/gdal-lib/options.mk
@@ -0,0 +1,21 @@
+# $NetBSD: options.mk,v 1.1 2010/01/18 09:36:09 adam Exp $
+
+PKG_OPTIONS_VAR=	PKG_OPTIONS.gdal-lib
+PKG_SUPPORTED_OPTIONS=	pgsql mysql
+PKG_SUGGESTED_OPTIONS=	pgsql
+
+.include "../../mk/bsd.options.mk"
+
+.if !empty(PKG_OPTIONS:Mpgsql)
+. include "../../mk/pgsql.buildlink3.mk"
+CONFIGURE_ARGS+=	--with-pg
+.else
+CONFIGURE_ARGS+=	--without-pg
+.endif
+
+.if !empty(PKG_OPTIONS:Mmysql)
+. include "../../mk/mysql.buildlink3.mk"
+CONFIGURE_ARGS+=	--with-mysql
+.else
+CONFIGURE_ARGS+=	--without-mysql
+.endif
diff --git a/geography/gdal-lib/patches/patch-ab b/geography/gdal-lib/patches/patch-ab
deleted file mode 100644
index 75240e29489..00000000000
--- a/geography/gdal-lib/patches/patch-ab
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ab,v 1.4 2009/06/03 17:28:31 hasso Exp $
-
---- 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
- 
--all:	sublibs apps test_ogrsf$(EXE) 
-+all:	sublibs
- 
- clean:
- 	rm -f html/*