Bump freetype2 and fontconfig dependencies to current pkgsrc versions,

to address issues with NetBSD-6(and earlier)'s fontconfig not being
new enough for pango.

While doing that, also bump freetype2 dependency to current pkgsrc
version.

Suggested by tron in PR 47882

14 files changed, 28 insertions, 28 deletions

diff --git a/geography/emerillon/Makefile b/geography/emerillon/Makefile
index 90e665b73ca..d07bd011e26 100644
--- a/geography/emerillon/Makefile
+++ b/geography/emerillon/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.19 2013/05/24 18:23:36 wiz Exp $
+# $NetBSD: Makefile,v 1.20 2013/06/03 10:05:06 wiz Exp $
 #
 
 DISTNAME=	emerillon-0.1.2
-PKGREVISION=	15
+PKGREVISION=	16
 CATEGORIES=	geography
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/emerillon/0.1/}
 EXTRACT_SUFX=	.tar.bz2
diff --git a/geography/geoclue/Makefile b/geography/geoclue/Makefile
index 654f0a80047..762e023df94 100644
--- a/geography/geoclue/Makefile
+++ b/geography/geoclue/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.18 2013/02/16 11:21:31 wiz Exp $
+# $NetBSD: Makefile,v 1.19 2013/06/03 10:05:06 wiz Exp $
 #
 
 DISTNAME=	geoclue-0.12.0
-PKGREVISION=	13
+PKGREVISION=	14
 CATEGORIES=	geography
 MASTER_SITES=	http://folks.o-hand.com/jku/geoclue-releases/
 
diff --git a/geography/libchamplain04/Makefile b/geography/libchamplain04/Makefile
index 1304f2fdc24..325c90e5b76 100644
--- a/geography/libchamplain04/Makefile
+++ b/geography/libchamplain04/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.21 2013/05/24 18:23:33 wiz Exp $
+# $NetBSD: Makefile,v 1.22 2013/06/03 10:05:06 wiz Exp $
 #
 
 DISTNAME=	libchamplain-0.4.7
 PKGNAME=	libchamplain04-0.4.7
-PKGREVISION=	12
+PKGREVISION=	13
 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 d21a2bf1e3d..89bb6228ec4 100644
--- a/geography/libchamplain04/buildlink3.mk
+++ b/geography/libchamplain04/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.19 2013/05/24 18:23:33 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.20 2013/06/03 10:05:06 wiz Exp $
 
 BUILDLINK_TREE+=	libchamplain
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=	libchamplain
 LIBCHAMPLAIN_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.libchamplain+=	libchamplain04>=0.4.6
-BUILDLINK_ABI_DEPENDS.libchamplain+=	libchamplain04>=0.4.7nb12
+BUILDLINK_ABI_DEPENDS.libchamplain+=	libchamplain04>=0.4.7nb13
 BUILDLINK_PKGSRCDIR.libchamplain?=	../../geography/libchamplain04
 
 .include "../../devel/glib2/buildlink3.mk"
diff --git a/geography/libchamplain06/Makefile b/geography/libchamplain06/Makefile
index 0d7f70a6d16..6d30f22eca1 100644
--- a/geography/libchamplain06/Makefile
+++ b/geography/libchamplain06/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.20 2013/05/24 18:23:32 wiz Exp $
+# $NetBSD: Makefile,v 1.21 2013/06/03 10:05:06 wiz Exp $
 #
 
 DISTNAME=	libchamplain-0.6.1
 PKGNAME=	libchamplain06-0.6.1
-PKGREVISION=	18
+PKGREVISION=	19
 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 d5606032c1b..e8c0fc99ee3 100644
--- a/geography/libchamplain06/buildlink3.mk
+++ b/geography/libchamplain06/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.19 2013/05/24 18:23:32 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.20 2013/06/03 10:05:06 wiz Exp $
 
 BUILDLINK_TREE+=	libchamplain06
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=	libchamplain06
 LIBCHAMPLAIN06_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.libchamplain06+=	libchamplain06>=0.6.1
-BUILDLINK_ABI_DEPENDS.libchamplain06+=	libchamplain06>=0.6.1nb18
+BUILDLINK_ABI_DEPENDS.libchamplain06+=	libchamplain06>=0.6.1nb19
 BUILDLINK_PKGSRCDIR.libchamplain06?=	../../geography/libchamplain06
 
 .include "../../devel/glib2/buildlink3.mk"
diff --git a/geography/libchamplain08/Makefile b/geography/libchamplain08/Makefile
index 8c8c30e90c7..da39dae622c 100644
--- a/geography/libchamplain08/Makefile
+++ b/geography/libchamplain08/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.16 2013/05/24 18:23:32 wiz Exp $
+# $NetBSD: Makefile,v 1.17 2013/06/03 10:05:06 wiz Exp $
 #
 
 DISTNAME=	libchamplain-0.8.3
 PKGNAME=	libchamplain08-0.8.3
-PKGREVISION=	14
+PKGREVISION=	15
 CATEGORIES=	geography
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/libchamplain/0.8/}
 EXTRACT_SUFX=	.tar.bz2
diff --git a/geography/libchamplain08/buildlink3.mk b/geography/libchamplain08/buildlink3.mk
index 67c4b4848c0..2057e161375 100644
--- a/geography/libchamplain08/buildlink3.mk
+++ b/geography/libchamplain08/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.15 2013/05/24 18:23:32 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.16 2013/06/03 10:05:06 wiz Exp $
 
 BUILDLINK_TREE+=	libchamplain08
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=	libchamplain08
 LIBCHAMPLAIN08_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.libchamplain08+=	libchamplain08>=0.8.3
-BUILDLINK_ABI_DEPENDS.libchamplain08+=	libchamplain08>=0.8.3nb14
+BUILDLINK_ABI_DEPENDS.libchamplain08+=	libchamplain08>=0.8.3nb15
 BUILDLINK_PKGSRCDIR.libchamplain08?=	../../geography/libchamplain08
 
 .include "../../devel/glib2/buildlink3.mk"
diff --git a/geography/mapserver/Makefile b/geography/mapserver/Makefile
index 0505e198680..d70be0ace02 100644
--- a/geography/mapserver/Makefile
+++ b/geography/mapserver/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.44 2013/02/16 11:21:32 wiz Exp $
+# $NetBSD: Makefile,v 1.45 2013/06/03 10:05:06 wiz Exp $
 
 DISTNAME=	mapserver-5.6.8
-PKGREVISION=	9
+PKGREVISION=	10
 CATEGORIES=	geography www
 MASTER_SITES=	http://download.osgeo.org/mapserver/
 
diff --git a/geography/merkaartor/Makefile b/geography/merkaartor/Makefile
index 607c7e06e2b..0fcdc36d334 100644
--- a/geography/merkaartor/Makefile
+++ b/geography/merkaartor/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.41 2013/02/26 11:15:18 joerg Exp $
+# $NetBSD: Makefile,v 1.42 2013/06/03 10:05:06 wiz Exp $
 #
 
 DISTNAME=	merkaartor-0.17.2
-PKGREVISION=	17
+PKGREVISION=	18
 CATEGORIES=	geography
 MASTER_SITES=	http://merkaartor.be/attachments/download/253/
 EXTRACT_SUFX=	.tar.bz2
diff --git a/geography/qgis/Makefile b/geography/qgis/Makefile
index b37e742584f..5aac0894eeb 100644
--- a/geography/qgis/Makefile
+++ b/geography/qgis/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.29 2013/05/31 12:41:04 wiz Exp $
+# $NetBSD: Makefile,v 1.30 2013/06/03 10:05:06 wiz Exp $
 
 DISTNAME=	qgis-1.7.4
-PKGREVISION=	14
+PKGREVISION=	15
 CATEGORIES=	geography
 MASTER_SITES=	http://qgis.org/downloads/
 EXTRACT_SUFX=	.tar.bz2
diff --git a/geography/qlandkartegt/Makefile b/geography/qlandkartegt/Makefile
index 6b3dc74781f..bb7ad304b88 100644
--- a/geography/qlandkartegt/Makefile
+++ b/geography/qlandkartegt/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.29 2013/02/16 11:21:34 wiz Exp $
+# $NetBSD: Makefile,v 1.30 2013/06/03 10:05:06 wiz Exp $
 #
 
 DISTNAME=	qlandkartegt-1.4.2
-PKGREVISION=	9
+PKGREVISION=	10
 CATEGORIES=	geography
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=qlandkartegt/}
 
diff --git a/geography/qlandkartem/Makefile b/geography/qlandkartem/Makefile
index abf61411eaa..6727051ba44 100644
--- a/geography/qlandkartem/Makefile
+++ b/geography/qlandkartem/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.25 2013/02/16 11:21:34 wiz Exp $
+# $NetBSD: Makefile,v 1.26 2013/06/03 10:05:06 wiz Exp $
 #
 
 DISTNAME=	QLandkarteM.0.2.0
 PKGNAME=	qlandkartem-0.2.0
-PKGREVISION=	20
+PKGREVISION=	21
 CATEGORIES=	geography
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=qlandkartegt/}
 
diff --git a/geography/viking/Makefile b/geography/viking/Makefile
index 483586f5ce1..d1eac6eb64d 100644
--- a/geography/viking/Makefile
+++ b/geography/viking/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.48 2013/05/31 12:41:04 wiz Exp $
+# $NetBSD: Makefile,v 1.49 2013/06/03 10:05:06 wiz Exp $
 #
 
 DISTNAME=		viking-1.4.1
-PKGREVISION=		1
+PKGREVISION=		2
 CATEGORIES=		geography
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=viking/}