From 1fd7249c7e3f90ecdc94992d395b625b786dad27 Mon Sep 17 00:00:00 2001 From: drochner Date: Sat, 2 Jun 2012 16:31:29 +0000 Subject: update to 1.9.1 changes: bugfixes approved by The Maintainer pkgsrc note: bumped ABI requirement in bl3 file due to geos shlib name change --- geography/gdal-lib/Makefile | 5 ++--- geography/gdal-lib/buildlink3.mk | 4 ++-- geography/gdal-lib/distinfo | 9 ++++----- geography/gdal-lib/patches/patch-configure | 16 ---------------- 4 files changed, 8 insertions(+), 26 deletions(-) delete mode 100644 geography/gdal-lib/patches/patch-configure (limited to 'geography') diff --git a/geography/gdal-lib/Makefile b/geography/gdal-lib/Makefile index 265d2aeece6..cc492ffd96b 100644 --- a/geography/gdal-lib/Makefile +++ b/geography/gdal-lib/Makefile @@ -1,9 +1,8 @@ -# $NetBSD: Makefile,v 1.45 2012/04/27 12:31:48 obache Exp $ +# $NetBSD: Makefile,v 1.46 2012/06/02 16:31:29 drochner Exp $ -VERSION= 1.9.0 +VERSION= 1.9.1 DISTNAME= gdal-${VERSION} PKGNAME= gdal-lib-${VERSION} -PKGREVISION= 1 CATEGORIES= geography MASTER_SITES= http://download.osgeo.org/gdal/ diff --git a/geography/gdal-lib/buildlink3.mk b/geography/gdal-lib/buildlink3.mk index 38162e26a3e..e3117cb0f00 100644 --- a/geography/gdal-lib/buildlink3.mk +++ b/geography/gdal-lib/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.25 2012/03/07 16:17:05 adam Exp $ +# $NetBSD: buildlink3.mk,v 1.26 2012/06/02 16:31:29 drochner 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.9.0 +BUILDLINK_ABI_DEPENDS.gdal-lib+= gdal-lib>=1.9.1 BUILDLINK_PKGSRCDIR.gdal-lib?= ../../geography/gdal-lib pkgbase := gdal-lib diff --git a/geography/gdal-lib/distinfo b/geography/gdal-lib/distinfo index 959aed005af..86311cab421 100644 --- a/geography/gdal-lib/distinfo +++ b/geography/gdal-lib/distinfo @@ -1,7 +1,6 @@ -$NetBSD: distinfo,v 1.19 2012/05/04 13:27:23 hans Exp $ +$NetBSD: distinfo,v 1.20 2012/06/02 16:31:29 drochner Exp $ -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 +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 diff --git a/geography/gdal-lib/patches/patch-configure b/geography/gdal-lib/patches/patch-configure deleted file mode 100644 index edbde7e67a8..00000000000 --- a/geography/gdal-lib/patches/patch-configure +++ /dev/null @@ -1,16 +0,0 @@ -$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 -- cgit v1.2.3