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

32 files changed, 64 insertions, 58 deletions

diff --git a/math/R-CGIwithR/Makefile b/math/R-CGIwithR/Makefile
index 097ccb293e6..7bbc7ffe25a 100644
--- a/math/R-CGIwithR/Makefile
+++ b/math/R-CGIwithR/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.11 2013/04/25 03:53:11 sbd Exp $
+# $NetBSD: Makefile,v 1.12 2013/06/03 10:05:31 wiz Exp $
 #
 
-PKGREVISION=		6
+PKGREVISION=		7
 CATEGORIES=		math
 MASTER_SITES=		${MASTER_SITE_R_CRAN:=contrib/}
 
diff --git a/math/R/Makefile b/math/R/Makefile
index 6ea7f15e034..ce5b24ab8bf 100644
--- a/math/R/Makefile
+++ b/math/R/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.137 2013/05/31 12:41:21 wiz Exp $
+# $NetBSD: Makefile,v 1.138 2013/06/03 10:05:31 wiz Exp $
 
 DISTNAME=		R-2.15.1
-PKGREVISION=		4
+PKGREVISION=		5
 CATEGORIES=		math
 MASTER_SITES=		${MASTER_SITE_R_CRAN:=base/R-2/}
 
diff --git a/math/analitza/Makefile b/math/analitza/Makefile
index a1b202c8b43..b18fa7c0ba8 100644
--- a/math/analitza/Makefile
+++ b/math/analitza/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.13 2013/05/21 12:49:33 markd Exp $
+# $NetBSD: Makefile,v 1.14 2013/06/03 10:05:31 wiz Exp $
 
 DISTNAME=	analitza-${_KDE_VERSION}
+PKGREVISION=	1
 CATEGORIES=	math
 COMMENT=	KDE library for mathematical features
 
diff --git a/math/analitza/buildlink3.mk b/math/analitza/buildlink3.mk
index dcf7b82cb43..772603216c3 100644
--- a/math/analitza/buildlink3.mk
+++ b/math/analitza/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.10 2013/05/09 07:39:13 adam Exp $
+# $NetBSD: buildlink3.mk,v 1.11 2013/06/03 10:05:31 wiz Exp $
 
 BUILDLINK_TREE+=	analitza
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=	analitza
 ANALITZA_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.analitza+=	analitza>=4.8.0
-BUILDLINK_ABI_DEPENDS.analitza?=	analitza>=4.10.2
+BUILDLINK_ABI_DEPENDS.analitza?=	analitza>=4.10.3nb1
 BUILDLINK_PKGSRCDIR.analitza?=	../../math/analitza
 
 .include "../../x11/kdelibs4/buildlink3.mk"
diff --git a/math/calcoo/Makefile b/math/calcoo/Makefile
index 18fc78e2528..02ea353b4bf 100644
--- a/math/calcoo/Makefile
+++ b/math/calcoo/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.25 2013/02/16 11:23:03 wiz Exp $
+# $NetBSD: Makefile,v 1.26 2013/06/03 10:05:31 wiz Exp $
 #
 
 DISTNAME=		calcoo-1.3.18
-PKGREVISION=		14
+PKGREVISION=		15
 CATEGORIES=		math
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=calcoo/}
 
diff --git a/math/cantor/Makefile b/math/cantor/Makefile
index 597bb8ea6b7..c93b46eb08d 100644
--- a/math/cantor/Makefile
+++ b/math/cantor/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.13 2013/05/21 12:49:33 markd Exp $
+# $NetBSD: Makefile,v 1.14 2013/06/03 10:05:31 wiz Exp $
 
 DISTNAME=	cantor-${_KDE_VERSION}
+PKGREVISION=	1
 CATEGORIES=	math
 COMMENT=	KDE frontend to mathematical software
 
diff --git a/math/cgal/Makefile b/math/cgal/Makefile
index 5d38cfb11aa..6050e02e147 100644
--- a/math/cgal/Makefile
+++ b/math/cgal/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.15 2013/02/16 11:19:47 wiz Exp $
+# $NetBSD: Makefile,v 1.16 2013/06/03 10:05:31 wiz Exp $
 #
 
 PKGNAME=	cgal-3.9
 DISTNAME=	CGAL-3.9
-PKGREVISION=	14
+PKGREVISION=	15
 CATEGORIES=	math
 MASTER_SITES=	https://gforge.inria.fr/frs/download.php/29125/
 
diff --git a/math/cgal/buildlink3.mk b/math/cgal/buildlink3.mk
index 9a8445ccfe0..c05d2e3de23 100644
--- a/math/cgal/buildlink3.mk
+++ b/math/cgal/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.13 2013/02/16 11:19:47 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.14 2013/06/03 10:05:31 wiz Exp $
 
 BUILDLINK_TREE+=	cgal
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=	cgal
 CGAL_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.cgal+=	cgal>=3.9
-BUILDLINK_ABI_DEPENDS.cgal+=	cgal>=3.9nb14
+BUILDLINK_ABI_DEPENDS.cgal+=	cgal>=3.9nb15
 BUILDLINK_PKGSRCDIR.cgal?=	../../math/cgal
 
 .include "../../devel/boost-headers/buildlink3.mk"
diff --git a/math/euler/Makefile b/math/euler/Makefile
index abf1b226e89..ae2f7d0cd1d 100644
--- a/math/euler/Makefile
+++ b/math/euler/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.34 2013/02/16 11:23:03 wiz Exp $
+# $NetBSD: Makefile,v 1.35 2013/06/03 10:05:31 wiz Exp $
 
 DISTNAME=		euler-1.61.0
 PKGNAME=		euler-1.61
 EXTRACT_SUFX=		.tgz
-PKGREVISION=		14
+PKGREVISION=		15
 CATEGORIES=		math
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=euler/}
 
diff --git a/math/extcalc/Makefile b/math/extcalc/Makefile
index dd82c89297c..04d34161c08 100644
--- a/math/extcalc/Makefile
+++ b/math/extcalc/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.21 2013/04/06 03:54:38 rodent Exp $
+# $NetBSD: Makefile,v 1.22 2013/06/03 10:05:31 wiz Exp $
 #
 
 DISTNAME=	extcalc-0.9.3-1
 PKGNAME=	extcalc-0.9.3
-PKGREVISION=	16
+PKGREVISION=	17
 CATEGORIES=	math
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=extcalc-linux/}
 
diff --git a/math/fityk/Makefile b/math/fityk/Makefile
index 6eda432bdcc..2a332c95653 100644
--- a/math/fityk/Makefile
+++ b/math/fityk/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.20 2013/02/16 11:23:04 wiz Exp $
+# $NetBSD: Makefile,v 1.21 2013/06/03 10:05:31 wiz Exp $
 
 DISTNAME=	fityk-0.9.7
-PKGREVISION=	11
+PKGREVISION=	12
 CATEGORIES=	math
 #MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=fityk/}
 MASTER_SITES=	https://cloud.github.com/downloads/wojdyr/fityk/
diff --git a/math/galculator/Makefile b/math/galculator/Makefile
index 3cc83310768..bd547a94744 100644
--- a/math/galculator/Makefile
+++ b/math/galculator/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.35 2013/05/03 16:40:02 drochner Exp $
+# $NetBSD: Makefile,v 1.36 2013/06/03 10:05:31 wiz Exp $
 #
 
 DISTNAME=		galculator-2.1.2
+PKGREVISION=		1
 CATEGORIES=		math
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=galculator/}
 
diff --git a/math/gcalctool-gtk3/Makefile b/math/gcalctool-gtk3/Makefile
index 9f54e78e5ce..7494b1d6a99 100644
--- a/math/gcalctool-gtk3/Makefile
+++ b/math/gcalctool-gtk3/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.15 2013/05/18 23:12:39 prlw1 Exp $
+# $NetBSD: Makefile,v 1.16 2013/06/03 10:05:31 wiz Exp $
 #
 
 DISTNAME=		gcalctool-6.6.2
+PKGREVISION=		1
 CATEGORIES=		math gnome
 MASTER_SITES=		${MASTER_SITE_GNOME:=sources/gcalctool/${PKGVERSION_NOREV:R}/}
 EXTRACT_SUFX=		.tar.xz
diff --git a/math/gcalctool/Makefile b/math/gcalctool/Makefile
index 486d0c65298..1cdb2a11432 100644
--- a/math/gcalctool/Makefile
+++ b/math/gcalctool/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.109 2013/02/16 11:23:04 wiz Exp $
+# $NetBSD: Makefile,v 1.110 2013/06/03 10:05:31 wiz Exp $
 #
 
 DISTNAME=		gcalctool-5.32.2
-PKGREVISION=		12
+PKGREVISION=		13
 CATEGORIES=		math gnome
 MASTER_SITES=		${MASTER_SITE_GNOME:=sources/gcalctool/5.32/}
 EXTRACT_SUFX=		.tar.bz2
diff --git a/math/genius/Makefile b/math/genius/Makefile
index d76a063071e..5d6b74aaef2 100644
--- a/math/genius/Makefile
+++ b/math/genius/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.52 2013/05/31 12:41:22 wiz Exp $
+# $NetBSD: Makefile,v 1.53 2013/06/03 10:05:31 wiz Exp $
 #
 
 DISTNAME=		genius-1.0.16
-PKGREVISION=		1
+PKGREVISION=		2
 CATEGORIES=		math
 MASTER_SITES=		http://ftp.5z.com/pub/genius/
 
diff --git a/math/gnumeric/Makefile b/math/gnumeric/Makefile
index e865a2438ef..03dc55d520f 100644
--- a/math/gnumeric/Makefile
+++ b/math/gnumeric/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.167 2013/05/31 12:41:22 wiz Exp $
+# $NetBSD: Makefile,v 1.168 2013/06/03 10:05:31 wiz Exp $
 #
 
 DISTNAME=		gnumeric-1.8.4
-PKGREVISION=		31
+PKGREVISION=		32
 CATEGORIES=		math gnome
 MASTER_SITES=		${MASTER_SITE_GNOME:=sources/gnumeric/1.8/}
 EXTRACT_SUFX=		.tar.bz2
diff --git a/math/gnumeric110/Makefile b/math/gnumeric110/Makefile
index bf9f2c098c3..fbcd9d81ff1 100644
--- a/math/gnumeric110/Makefile
+++ b/math/gnumeric110/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.45 2013/05/31 12:41:22 wiz Exp $
+# $NetBSD: Makefile,v 1.46 2013/06/03 10:05:32 wiz Exp $
 
 DISTNAME=	gnumeric-1.10.17
-PKGREVISION=	14
+PKGREVISION=	15
 CATEGORIES=	math gnome
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/gnumeric/1.10/}
 EXTRACT_SUFX=	.tar.bz2
diff --git a/math/gnumeric112/Makefile b/math/gnumeric112/Makefile
index 134a55436e9..179e3f47f61 100644
--- a/math/gnumeric112/Makefile
+++ b/math/gnumeric112/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.4 2013/05/31 12:41:22 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2013/06/03 10:05:32 wiz Exp $
 
 DISTNAME=	gnumeric-1.12.2
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	math gnome
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/gnumeric/1.12/}
 EXTRACT_SUFX=	.tar.xz
diff --git a/math/grpn/Makefile b/math/grpn/Makefile
index 962514d46f8..a6db460dea4 100644
--- a/math/grpn/Makefile
+++ b/math/grpn/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.37 2013/02/16 11:23:06 wiz Exp $
+# $NetBSD: Makefile,v 1.38 2013/06/03 10:05:32 wiz Exp $
 #
 
 DISTNAME=	grpn_1.3.3-1
 PKGNAME=	grpn-1.3.3
-PKGREVISION=	8
+PKGREVISION=	9
 CATEGORIES=	math
 #MASTER_SITES=	http://lashwhip.com/grpn/
 MASTER_SITES=	http://www.getreu.net/public/downloads/software/grpn/grpn-1.3.3/
diff --git a/math/gtklife/Makefile b/math/gtklife/Makefile
index 8fe07d6fd13..9e2141cfc95 100644
--- a/math/gtklife/Makefile
+++ b/math/gtklife/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.27 2013/02/16 11:23:07 wiz Exp $
+# $NetBSD: Makefile,v 1.28 2013/06/03 10:05:32 wiz Exp $
 
 DISTNAME=	gtklife-5.1
-PKGREVISION=	14
+PKGREVISION=	15
 CATEGORIES=	math
 MASTER_SITES=	http://ironphoenix.org/tril/gtklife/
 
diff --git a/math/kalgebra/Makefile b/math/kalgebra/Makefile
index a56a510415d..22935723996 100644
--- a/math/kalgebra/Makefile
+++ b/math/kalgebra/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.13 2013/05/21 12:49:33 markd Exp $
+# $NetBSD: Makefile,v 1.14 2013/06/03 10:05:32 wiz Exp $
 
 DISTNAME=	kalgebra-${_KDE_VERSION}
+PKGREVISION=	1
 CATEGORIES=	math
 COMMENT=	KDE graph calculator
 
diff --git a/math/kcalc/Makefile b/math/kcalc/Makefile
index 5234331974a..610dfe132de 100644
--- a/math/kcalc/Makefile
+++ b/math/kcalc/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.13 2013/05/21 12:49:33 markd Exp $
+# $NetBSD: Makefile,v 1.14 2013/06/03 10:05:32 wiz Exp $
 
 DISTNAME=	kcalc-${_KDE_VERSION}
+PKGREVISION=	1
 CATEGORIES=	math
 COMMENT=	KDE scientific calculator
 
diff --git a/math/kseg/Makefile b/math/kseg/Makefile
index 31d972d1ba0..ebeff7f5d87 100644
--- a/math/kseg/Makefile
+++ b/math/kseg/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.8 2013/02/16 11:23:07 wiz Exp $
+# $NetBSD: Makefile,v 1.9 2013/06/03 10:05:32 wiz Exp $
 #
 
 DISTNAME=	kseg-0.403
-PKGREVISION=	5
+PKGREVISION=	6
 CATEGORIES=	math
 MASTER_SITES=	http://www.mit.edu/~ibaran/
 
diff --git a/math/octave/Makefile b/math/octave/Makefile
index 1028b190efd..b94b7652744 100644
--- a/math/octave/Makefile
+++ b/math/octave/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.114 2013/05/31 12:41:22 wiz Exp $
+# $NetBSD: Makefile,v 1.115 2013/06/03 10:05:32 wiz Exp $
 
 DISTNAME=	octave-${OCTAVE_VER}
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	math
 MASTER_SITES=	${MASTER_SITE_GNU:=octave/} \
 		ftp://ftp.octave.org/pub/octave/ \
diff --git a/math/pspp/Makefile b/math/pspp/Makefile
index 9fd6e773d44..1cea334f9c7 100644
--- a/math/pspp/Makefile
+++ b/math/pspp/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.63 2013/05/31 12:41:25 wiz Exp $
+# $NetBSD: Makefile,v 1.64 2013/06/03 10:05:32 wiz Exp $
 #
 
 DISTNAME=	pspp-0.6.2
-PKGREVISION=	18
+PKGREVISION=	19
 CATEGORIES=	math
 MASTER_SITES=	${MASTER_SITE_GNU:=pspp/}
 
diff --git a/math/qalculate-bases/Makefile b/math/qalculate-bases/Makefile
index 1a648d5151a..1700ea36a64 100644
--- a/math/qalculate-bases/Makefile
+++ b/math/qalculate-bases/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.33 2013/02/16 11:23:09 wiz Exp $
+# $NetBSD: Makefile,v 1.34 2013/06/03 10:05:32 wiz Exp $
 
 DISTNAME=	qalculate-bases-0.9.4
-PKGREVISION=	18
+PKGREVISION=	19
 CATEGORIES=	math
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=qalculate/}
 
diff --git a/math/qalculate-currency/Makefile b/math/qalculate-currency/Makefile
index 35064d9f816..bdf245f9299 100644
--- a/math/qalculate-currency/Makefile
+++ b/math/qalculate-currency/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.33 2013/02/16 11:23:09 wiz Exp $
+# $NetBSD: Makefile,v 1.34 2013/06/03 10:05:32 wiz Exp $
 
 DISTNAME=	qalculate-currency-0.9.4
-PKGREVISION=	18
+PKGREVISION=	19
 CATEGORIES=	math
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=qalculate/}
 
diff --git a/math/qalculate-gtk/Makefile b/math/qalculate-gtk/Makefile
index 8054310ccd5..40eee93868f 100644
--- a/math/qalculate-gtk/Makefile
+++ b/math/qalculate-gtk/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.54 2013/02/16 11:23:09 wiz Exp $
+# $NetBSD: Makefile,v 1.55 2013/06/03 10:05:32 wiz Exp $
 
 DISTNAME=	qalculate-gtk-0.9.7
-PKGREVISION=	20
+PKGREVISION=	21
 CATEGORIES=	math
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=qalculate/}
 
diff --git a/math/qalculate-kde/Makefile b/math/qalculate-kde/Makefile
index b9b33ac905f..8779cfad057 100644
--- a/math/qalculate-kde/Makefile
+++ b/math/qalculate-kde/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.43 2013/05/31 12:41:25 wiz Exp $
+# $NetBSD: Makefile,v 1.44 2013/06/03 10:05:32 wiz Exp $
 
 DISTNAME=	qalculate-kde-0.9.5
-PKGREVISION=	26
+PKGREVISION=	27
 CATEGORIES=	math
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=qalculate/}
 
diff --git a/math/qalculate-units/Makefile b/math/qalculate-units/Makefile
index 5a335fe167d..0882f80fe6a 100644
--- a/math/qalculate-units/Makefile
+++ b/math/qalculate-units/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.33 2013/02/16 11:23:10 wiz Exp $
+# $NetBSD: Makefile,v 1.34 2013/06/03 10:05:32 wiz Exp $
 
 DISTNAME=	qalculate-units-0.9.4
-PKGREVISION=	18
+PKGREVISION=	19
 CATEGORIES=	math
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=qalculate/}
 
diff --git a/math/scilab/Makefile b/math/scilab/Makefile
index d23cd2b5628..e055c8ab62d 100644
--- a/math/scilab/Makefile
+++ b/math/scilab/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.87 2012/10/08 15:18:23 jaapb Exp $
+# $NetBSD: Makefile,v 1.88 2013/06/03 10:05:33 wiz Exp $
 #
 
 DISTNAME=	${SCIBASE}-src
-PKGREVISION=	7
+PKGREVISION=	8
 PKGNAME=	${SCIBASE}
 CATEGORIES=	math
 MASTER_SITES=	http://www.scilab.org/download/4.1/
diff --git a/math/speedcrunch/Makefile b/math/speedcrunch/Makefile
index 046df7c7186..c4a7849301e 100644
--- a/math/speedcrunch/Makefile
+++ b/math/speedcrunch/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.18 2013/02/16 11:23:10 wiz Exp $
+# $NetBSD: Makefile,v 1.19 2013/06/03 10:05:33 wiz Exp $
 #
 
 DISTNAME=	speedcrunch-0.10.1
-PKGREVISION=	16
+PKGREVISION=	17
 CATEGORIES=	math
 MASTER_SITES=	http://speedcrunch.googlecode.com/files/