Bump PKGREVISION for libpng shlib name change.

Also add some patches to remove use of deprecated symbols and fix other
problems when looking for or compiling against libpng-1.4.x.

9 files changed, 18 insertions, 12 deletions

diff --git a/geography/gdal-lib/Makefile b/geography/gdal-lib/Makefile
index 621b22fcf7d..5e2c616284a 100644
--- a/geography/gdal-lib/Makefile
+++ b/geography/gdal-lib/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.26 2010/03/14 16:32:15 wiz Exp $
+# $NetBSD: Makefile,v 1.27 2010/06/13 22:44:25 wiz Exp $
 
 DISTNAME=	gdal-1.7.1
 PKGNAME=	gdal-lib-1.7.1
+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 44c279343f7..49620712289 100644
--- a/geography/gdal-lib/buildlink3.mk
+++ b/geography/gdal-lib/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.17 2010/03/14 16:32:15 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.18 2010/06/13 22:44:25 wiz 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.3nb1
+BUILDLINK_ABI_DEPENDS.gdal-lib+=	gdal-lib>=1.7.1nb1
 BUILDLINK_PKGSRCDIR.gdal-lib?=	../../geography/gdal-lib
 
 pkgbase := gdal-lib
diff --git a/geography/gipfel/Makefile b/geography/gipfel/Makefile
index 0f0dcff757c..05858beeaa7 100644
--- a/geography/gipfel/Makefile
+++ b/geography/gipfel/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.1.1.1 2010/04/11 08:10:56 obache Exp $
+# $NetBSD: Makefile,v 1.2 2010/06/13 22:44:25 wiz Exp $
 #
 
 DISTNAME=	gipfel-0.3.2
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	geography graphics
 MASTER_SITES=	http://www.ecademix.com/JohannesHofmann/
 
diff --git a/geography/gpsdrive/Makefile b/geography/gpsdrive/Makefile
index 4e34466131a..87be63bcff9 100644
--- a/geography/gpsdrive/Makefile
+++ b/geography/gpsdrive/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.16 2010/01/18 09:58:55 wiz Exp $
+# $NetBSD: Makefile,v 1.17 2010/06/13 22:44:25 wiz Exp $
 
 DISTNAME=	gpsdrive-1.31
-PKGREVISION=	13
+PKGREVISION=	14
 CATEGORIES=	geography
 MASTER_SITES=	http://gpsdrive.kraftvoll.at/
 
diff --git a/geography/mapserver/Makefile b/geography/mapserver/Makefile
index 9af87a7033b..a0828244549 100644
--- a/geography/mapserver/Makefile
+++ b/geography/mapserver/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.25 2010/04/27 14:24:14 matthias Exp $
+# $NetBSD: Makefile,v 1.26 2010/06/13 22:44:25 wiz Exp $
 
 DISTNAME=	mapserver-5.6.3
+PKGREVISION=	1
 CATEGORIES=	geography www
 MASTER_SITES=	http://download.osgeo.org/mapserver/
 
diff --git a/geography/merkaartor/Makefile b/geography/merkaartor/Makefile
index 0f4bb04aeed..98f9cac8d30 100644
--- a/geography/merkaartor/Makefile
+++ b/geography/merkaartor/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.11 2010/03/14 16:32:15 wiz Exp $
+# $NetBSD: Makefile,v 1.12 2010/06/13 22:44:25 wiz Exp $
 #
 
 DISTNAME=	merkaartor-0.15.2
+PKGREVISION=	1
 CATEGORIES=	geography
 MASTER_SITES=	http://www.merkaartor.org/downloads/source/
 EXTRACT_SUFX=	.tar.bz2
diff --git a/geography/qlandkartegt/Makefile b/geography/qlandkartegt/Makefile
index 22f07ac0e87..862817de0bb 100644
--- a/geography/qlandkartegt/Makefile
+++ b/geography/qlandkartegt/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.3 2010/03/14 16:32:15 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2010/06/13 22:44:25 wiz Exp $
 #
 
 DISTNAME=	qlandkartegt-0.18.0
+PKGREVISION=	1
 CATEGORIES=	geography
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=qlandkartegt/}
 
diff --git a/geography/qlandkartem/Makefile b/geography/qlandkartem/Makefile
index 279a5e08b9e..2b6a924ef5d 100644
--- a/geography/qlandkartem/Makefile
+++ b/geography/qlandkartem/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.3 2010/03/29 13:34:39 joerg Exp $
+# $NetBSD: Makefile,v 1.4 2010/06/13 22:44:25 wiz Exp $
 #
 
 DISTNAME=	QLandkarteM.0.2.0
 PKGNAME=	qlandkartem-0.2.0
+PKGREVISION=	1
 CATEGORIES=	geography
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=qlandkartegt/}
 
diff --git a/geography/viking/Makefile b/geography/viking/Makefile
index f33da36a2d0..55d1c088cf6 100644
--- a/geography/viking/Makefile
+++ b/geography/viking/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.12 2010/04/12 01:06:40 gdt Exp $
+# $NetBSD: Makefile,v 1.13 2010/06/13 22:44:25 wiz Exp $
 #
 
 DISTNAME=		viking-0.9.93
+PKGREVISION=		1
 CATEGORIES=		geography
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=viking/}