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

16 files changed, 32 insertions, 28 deletions

diff --git a/lang/basic256/Makefile b/lang/basic256/Makefile
index a572441a9ec..6b74daf1b05 100644
--- a/lang/basic256/Makefile
+++ b/lang/basic256/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.18 2013/05/09 07:40:01 adam Exp $
+# $NetBSD: Makefile,v 1.19 2013/06/03 10:05:26 wiz Exp $
 #
 
 DISTNAME=	basic256_0.9.6.71
 PKGNAME=	${DISTNAME:S/_/-/}
-PKGREVISION=	8
+PKGREVISION=	9
 CATEGORIES=	lang
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=kidbasic/}
 EXTRACT_SUFX=	.tgz
diff --git a/lang/classpath-gui/Makefile b/lang/classpath-gui/Makefile
index a57d336dcb9..fbca2eb6664 100644
--- a/lang/classpath-gui/Makefile
+++ b/lang/classpath-gui/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.31 2013/02/16 11:22:51 wiz Exp $
+# $NetBSD: Makefile,v 1.32 2013/06/03 10:05:27 wiz Exp $
 
 .include "../../lang/classpath/Makefile.common"
 
 PKGNAME=	${DISTNAME:S/classpath/classpath-gui/}
-PKGREVISION=	16
+PKGREVISION=	17
 COMMENT+=	(GUI libraries)
 
 DEPENDS+=	classpath>=0.93:../../lang/classpath
diff --git a/lang/clisp/Makefile b/lang/clisp/Makefile
index 8914a50c925..584a4fd1406 100644
--- a/lang/clisp/Makefile
+++ b/lang/clisp/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.96 2013/04/24 10:06:50 sbd Exp $
+# $NetBSD: Makefile,v 1.97 2013/06/03 10:05:27 wiz Exp $
 #
 
 DISTNAME=		clisp-2.49
-PKGREVISION=		15
+PKGREVISION=		16
 CATEGORIES=		lang
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=clisp/}
 #EXTRACT_SUFX=		.tar.bz2
diff --git a/lang/coq/Makefile b/lang/coq/Makefile
index dd672a16cde..c2491fdc989 100644
--- a/lang/coq/Makefile
+++ b/lang/coq/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.61 2013/05/24 18:23:36 wiz Exp $
+# $NetBSD: Makefile,v 1.62 2013/06/03 10:05:27 wiz Exp $
 #
 
 DISTNAME=	coq-8.4pl2
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	lang math
 MASTER_SITES=	http://coq.inria.fr/distrib/V${PKGVERSION_NOREV}/files/
 
diff --git a/lang/kaffe-x11/Makefile b/lang/kaffe-x11/Makefile
index 887a3fba099..5f87b304e00 100644
--- a/lang/kaffe-x11/Makefile
+++ b/lang/kaffe-x11/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.36 2013/02/16 11:22:51 wiz Exp $
+# $NetBSD: Makefile,v 1.37 2013/06/03 10:05:27 wiz Exp $
 #
 
 .include "../../lang/kaffe/Makefile.common"
 
 PKGNAME=    	${DISTNAME:S/kaffe/kaffe-x11/}
-PKGREVISION=	20
+PKGREVISION=	21
 
 COMMENT+=   (AWT support through X11)
 
diff --git a/lang/openjdk7/Makefile b/lang/openjdk7/Makefile
index a404a3cfd47..4f3049ed01a 100644
--- a/lang/openjdk7/Makefile
+++ b/lang/openjdk7/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.47 2013/06/02 06:12:28 ryoon Exp $
+# $NetBSD: Makefile,v 1.48 2013/06/03 10:05:27 wiz Exp $
 
 DISTNAME=	openjdk-7u6-fcs-src-b24-09_aug_2012
 PKGNAME=	openjdk7-1.7.21
+PKGREVISION=	1
 CATEGORIES=	lang
 MASTER_SITES=	${MASTER_SITE_LOCAL:=openjdk7/}
 EXTRACT_SUFX=	.zip
diff --git a/lang/racket/Makefile b/lang/racket/Makefile
index 25aaa01b3a3..412c13ba519 100644
--- a/lang/racket/Makefile
+++ b/lang/racket/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.28 2013/04/06 14:09:33 rodent Exp $
+# $NetBSD: Makefile,v 1.29 2013/06/03 10:05:27 wiz Exp $
 
 PKGNAME=	racket-5.3.3
 DISTNAME=	$(PKGNAME_NOREV)-src-unix
+PKGREVISION=	1
 CATEGORIES=	lang
 MASTER_SITES_PLT=	http://download.racket-lang.org/installers/$(PKGVERSION_NOREV)/ \
 		http://www.eecs.northwestern.edu/racket/$(PKGVERSION_NOREV)/ \
diff --git a/lang/sablevm-classpath-gui/Makefile b/lang/sablevm-classpath-gui/Makefile
index 4ae516603a2..98e45ed0ff8 100644
--- a/lang/sablevm-classpath-gui/Makefile
+++ b/lang/sablevm-classpath-gui/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.31 2013/02/16 11:22:52 wiz Exp $
+# $NetBSD: Makefile,v 1.32 2013/06/03 10:05:27 wiz Exp $
 #
 
 .include "../../lang/sablevm-classpath/Makefile.common"
 
 PKGNAME=	${DISTNAME:S/classpath/classpath-gui/}
-PKGREVISION=	16
+PKGREVISION=	17
 COMMENT+=	(GUI libraries)
 
 DEPENDS+=	sablevm-classpath>=1.13nb1:../../lang/sablevm-classpath
diff --git a/lang/sather/Makefile b/lang/sather/Makefile
index 2e9ad304031..1c21c54baed 100644
--- a/lang/sather/Makefile
+++ b/lang/sather/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.49 2013/05/31 12:41:12 wiz Exp $
+# $NetBSD: Makefile,v 1.50 2013/06/03 10:05:27 wiz Exp $
 
 DISTNAME=		sather-1.2.3
-PKGREVISION=		3
+PKGREVISION=		4
 CATEGORIES=		lang
 MASTER_SITES=		${MASTER_SITE_GNU:=sather/}
 
diff --git a/lang/smalltalk/Makefile b/lang/smalltalk/Makefile
index f97f29296bf..942b3461715 100644
--- a/lang/smalltalk/Makefile
+++ b/lang/smalltalk/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.74 2013/03/24 16:54:59 joerg Exp $
+# $NetBSD: Makefile,v 1.75 2013/06/03 10:05:27 wiz Exp $
 
 DISTNAME=	smalltalk-3.2.4
-PKGREVISION=	12
+PKGREVISION=	13
 CATEGORIES=	lang
 MASTER_SITES=	${MASTER_SITE_GNU:=smalltalk/}
 
diff --git a/lang/squeak-vm/Makefile b/lang/squeak-vm/Makefile
index dea5dcfd03a..66b5c77e50e 100644
--- a/lang/squeak-vm/Makefile
+++ b/lang/squeak-vm/Makefile
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.26 2013/04/09 06:07:35 wiz Exp $
+# $NetBSD: Makefile,v 1.27 2013/06/03 10:05:27 wiz Exp $
 #
 
 SQUEAK_VERSION=	4.10.2.2614
 
 DISTNAME=	Squeak-${SQUEAK_VERSION}-src
 PKGNAME=	squeak-vm-${SQUEAK_VERSION:C/-/./}
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	lang
 MASTER_SITES=	http://squeakvm.org/unix/release/ \
 		http://ftp.squeak.org/3.10/unix-linux/
diff --git a/lang/swi-prolog-packages/Makefile b/lang/swi-prolog-packages/Makefile
index c3d4ed26762..a64831cf76e 100644
--- a/lang/swi-prolog-packages/Makefile
+++ b/lang/swi-prolog-packages/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.36 2013/04/06 14:58:20 rodent Exp $
+# $NetBSD: Makefile,v 1.37 2013/06/03 10:05:27 wiz Exp $
 
 .include "../../lang/swi-prolog-lite/Makefile.common"
 
 PKGNAME=		swi-prolog-packages-${SWIPLVERS}
-PKGREVISION=		4
+PKGREVISION=		5
 
 MAINTAINER=		pkgsrc-users@NetBSD.org
 COMMENT=		Packages for SWI Prolog
diff --git a/lang/tcl-itcl/Makefile b/lang/tcl-itcl/Makefile
index da37a1afb94..3da7cdff8a3 100644
--- a/lang/tcl-itcl/Makefile
+++ b/lang/tcl-itcl/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.25 2013/01/07 13:26:41 wiz Exp $
+# $NetBSD: Makefile,v 1.26 2013/06/03 10:05:27 wiz Exp $
 #
 
 DISTNAME=	itcl3.4.1
 PKGNAME=	${DISTNAME:S/itcl/tcl-itcl-/}
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=incrtcl/}
 
diff --git a/lang/tcl-itcl/buildlink3.mk b/lang/tcl-itcl/buildlink3.mk
index 7155df019f8..950323e0f53 100644
--- a/lang/tcl-itcl/buildlink3.mk
+++ b/lang/tcl-itcl/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.12 2013/01/07 13:26:41 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.13 2013/06/03 10:05:27 wiz Exp $
 
 BUILDLINK_TREE+=	tcl-itcl
 
@@ -6,6 +6,7 @@ BUILDLINK_TREE+=	tcl-itcl
 TCL_ITCL_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.tcl-itcl+=	tcl-itcl>=3.4.1
+BUILDLINK_ABI_DEPENDS.tcl-itcl?=	tcl-itcl>=3.4.1nb2
 BUILDLINK_PKGSRCDIR.tcl-itcl?=	../../lang/tcl-itcl
 
 .include "../../x11/tk/buildlink3.mk"
diff --git a/lang/tcl-otcl/Makefile b/lang/tcl-otcl/Makefile
index 5e058c09dfd..39782b2e096 100644
--- a/lang/tcl-otcl/Makefile
+++ b/lang/tcl-otcl/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.24 2012/10/02 20:11:55 asau Exp $
+# $NetBSD: Makefile,v 1.25 2013/06/03 10:05:27 wiz Exp $
 
 DISTNAME=	otcl-src-1.14
 PKGNAME=	tcl-${DISTNAME:S/-src//}
+PKGREVISION=	1
 CATEGORIES=	lang
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=otcl-tclcl/}
 
diff --git a/lang/tcl-otcl/buildlink3.mk b/lang/tcl-otcl/buildlink3.mk
index a7a42e65a01..55a5cb3e2b7 100644
--- a/lang/tcl-otcl/buildlink3.mk
+++ b/lang/tcl-otcl/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.9 2012/05/07 01:53:43 dholland Exp $
+# $NetBSD: buildlink3.mk,v 1.10 2013/06/03 10:05:27 wiz Exp $
 
 BUILDLINK_TREE+=	tcl-otcl
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=	tcl-otcl
 TCL_OTCL_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.tcl-otcl+=	tcl-otcl>=1.8
-BUILDLINK_ABI_DEPENDS.tcl-otcl+=	tcl-otcl>=1.11nb1
+BUILDLINK_ABI_DEPENDS.tcl-otcl+=	tcl-otcl>=1.14nb1
 BUILDLINK_PKGSRCDIR.tcl-otcl?=	../../lang/tcl-otcl
 
 .include "../../lang/tcl/buildlink3.mk"