Bump dependency on pixman to 0.18.4 because cairo-1.10 needs that

version, and bump all depends.

Per discussion on pkgsrc-changes.

11 files changed, 22 insertions, 14 deletions

diff --git a/geography/geoclue/Makefile b/geography/geoclue/Makefile
index a0ede35a932..cf94b579e89 100644
--- a/geography/geoclue/Makefile
+++ b/geography/geoclue/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.2 2010/08/05 08:39:30 drochner Exp $
+# $NetBSD: Makefile,v 1.3 2010/09/14 11:01:52 wiz Exp $
 #
 
 DISTNAME=	geoclue-0.12.0
+PKGREVISION=	1
 CATEGORIES=	geography
 MASTER_SITES=	http://folks.o-hand.com/jku/geoclue-releases/
 
diff --git a/geography/libchamplain04/Makefile b/geography/libchamplain04/Makefile
index 51bb2af8379..6695f5e6266 100644
--- a/geography/libchamplain04/Makefile
+++ b/geography/libchamplain04/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.1.1.1 2010/07/26 11:05:26 drochner Exp $
+# $NetBSD: Makefile,v 1.2 2010/09/14 11:00:53 wiz Exp $
 #
 
 DISTNAME=	libchamplain-0.4.6
 PKGNAME=	libchamplain04-0.4.6
+PKGREVISION=	1
 CATEGORIES=	geography
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/libchamplain/0.4/}
 EXTRACT_SUFX=	.tar.bz2
diff --git a/geography/libchamplain04/buildlink3.mk b/geography/libchamplain04/buildlink3.mk
index 4457320cf4d..369ccf977ba 100644
--- a/geography/libchamplain04/buildlink3.mk
+++ b/geography/libchamplain04/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1.1.1 2010/07/26 11:05:26 drochner Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2010/09/14 11:00:53 wiz Exp $
 
 BUILDLINK_TREE+=	libchamplain
 
@@ -6,6 +6,7 @@ BUILDLINK_TREE+=	libchamplain
 LIBCHAMPLAIN_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.libchamplain+=	libchamplain04>=0.4.6
+BUILDLINK_ABI_DEPENDS.libchamplain?=	libchamplain04>=0.4.6nb1
 BUILDLINK_PKGSRCDIR.libchamplain?=	../../geography/libchamplain04
 
 .include "../../devel/glib2/buildlink3.mk"
diff --git a/geography/libchamplain06/Makefile b/geography/libchamplain06/Makefile
index ba1458e85f1..c53dc589131 100644
--- a/geography/libchamplain06/Makefile
+++ b/geography/libchamplain06/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.1.1.1 2010/07/26 11:07:18 drochner Exp $
+# $NetBSD: Makefile,v 1.2 2010/09/14 11:00:53 wiz Exp $
 #
 
 DISTNAME=	libchamplain-0.6.1
 PKGNAME=	libchamplain06-0.6.1
+PKGREVISION=	1
 CATEGORIES=	geography
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/libchamplain/0.6/}
 EXTRACT_SUFX=	.tar.bz2
diff --git a/geography/libchamplain06/buildlink3.mk b/geography/libchamplain06/buildlink3.mk
index 2aecba84ac5..75fe700d944 100644
--- a/geography/libchamplain06/buildlink3.mk
+++ b/geography/libchamplain06/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1.1.1 2010/07/26 11:07:18 drochner Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2010/09/14 11:00:53 wiz Exp $
 
 BUILDLINK_TREE+=	libchamplain06
 
@@ -6,6 +6,7 @@ BUILDLINK_TREE+=	libchamplain06
 LIBCHAMPLAIN06_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.libchamplain06+=	libchamplain06>=0.6.1
+BUILDLINK_ABI_DEPENDS.libchamplain06?=	libchamplain06>=0.6.1nb1
 BUILDLINK_PKGSRCDIR.libchamplain06?=	../../geography/libchamplain06
 
 .include "../../devel/glib2/buildlink3.mk"
diff --git a/geography/mapserver/Makefile b/geography/mapserver/Makefile
index e1e618e6a05..12563821238 100644
--- a/geography/mapserver/Makefile
+++ b/geography/mapserver/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.27 2010/07/30 12:51:22 adam Exp $
+# $NetBSD: Makefile,v 1.28 2010/09/14 11:01:52 wiz Exp $
 
 DISTNAME=	mapserver-5.6.5
+PKGREVISION=	1
 CATEGORIES=	geography www
 MASTER_SITES=	http://download.osgeo.org/mapserver/
 
diff --git a/geography/merkaartor/Makefile b/geography/merkaartor/Makefile
index a783f99478b..710a8ae0fd1 100644
--- a/geography/merkaartor/Makefile
+++ b/geography/merkaartor/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.13 2010/06/16 19:43:52 drochner Exp $
+# $NetBSD: Makefile,v 1.14 2010/09/14 11:01:53 wiz Exp $
 #
 
 DISTNAME=	merkaartor-0.16.1
+PKGREVISION=	1
 CATEGORIES=	geography
 MASTER_SITES=	http://www.merkaartor.org/downloads/source/
 EXTRACT_SUFX=	.tar.bz2
diff --git a/geography/qgis/Makefile b/geography/qgis/Makefile
index c5cc9d85c4a..d5054cccbf7 100644
--- a/geography/qgis/Makefile
+++ b/geography/qgis/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.1.1.1 2010/08/27 11:42:58 adam Exp $
+# $NetBSD: Makefile,v 1.2 2010/09/14 11:01:53 wiz Exp $
 
 DISTNAME=	qgis_1.5.0
 PKGNAME=	qgis-1.5.0
+PKGREVISION=	1
 CATEGORIES=	geography
 MASTER_SITES=	http://download.osgeo.org/qgis/src/
 
diff --git a/geography/qlandkartegt/Makefile b/geography/qlandkartegt/Makefile
index 862817de0bb..7044abd7111 100644
--- a/geography/qlandkartegt/Makefile
+++ b/geography/qlandkartegt/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.4 2010/06/13 22:44:25 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2010/09/14 11:01:53 wiz Exp $
 #
 
 DISTNAME=	qlandkartegt-0.18.0
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	geography
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=qlandkartegt/}
 
diff --git a/geography/qlandkartem/Makefile b/geography/qlandkartem/Makefile
index 2b6a924ef5d..494f05eec75 100644
--- a/geography/qlandkartem/Makefile
+++ b/geography/qlandkartem/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.4 2010/06/13 22:44:25 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2010/09/14 11:01:53 wiz Exp $
 #
 
 DISTNAME=	QLandkarteM.0.2.0
 PKGNAME=	qlandkartem-0.2.0
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	geography
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=qlandkartegt/}
 
diff --git a/geography/viking/Makefile b/geography/viking/Makefile
index 6ba8c7ec9e4..fe7f425401b 100644
--- a/geography/viking/Makefile
+++ b/geography/viking/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.15 2010/08/21 16:34:54 seb Exp $
+# $NetBSD: Makefile,v 1.16 2010/09/14 11:01:53 wiz Exp $
 #
 
 DISTNAME=		viking-0.9.94
-PKGREVISION=		1
+PKGREVISION=		2
 CATEGORIES=		geography
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=viking/}