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.
author: wiz <wiz@pkgsrc.org> 2010-06-13 22:43:46 +0000
committer: wiz <wiz@pkgsrc.org> 2010-06-13 22:43:46 +0000
commit: 92e0cb52cb783546e352182244f761180817e141 (patch)
tree: 4a9b97c2969a25f1eeb6596ee96fc25429cef7d5 /x11
parent: 01bd00f60b043c603cfe4fa796bf28af3a849cca (diff)
download: pkgsrc-92e0cb52cb783546e352182244f761180817e141.tar.gz
299 files changed, 794 insertions, 550 deletions
diff --git a/x11/XaoS/Makefile b/x11/XaoS/Makefile
index b6830369ecf..e1d4cd038a7 100644
--- a/x11/XaoS/Makefile
+++ b/x11/XaoS/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.26 2010/03/21 16:29:44 wiz Exp $
+# $NetBSD: Makefile,v 1.27 2010/06/13 22:45:35 wiz Exp $
 #
 
 DISTNAME=		XaoS-3.4
+PKGREVISION=		1
 CATEGORIES=		x11
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=xaos/}
 
diff --git a/x11/XmHTML/Makefile b/x11/XmHTML/Makefile
index bf1ae64a5d8..0f2359593bd 100644
--- a/x11/XmHTML/Makefile
+++ b/x11/XmHTML/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.46 2010/01/18 09:59:32 wiz Exp $
+# $NetBSD: Makefile,v 1.47 2010/06/13 22:45:35 wiz Exp $
 #
 
 DISTNAME=	XmHTML-1.1.7
-PKGREVISION=	8
+PKGREVISION=	9
 CATEGORIES=	x11
 MASTER_SITES=	http://www.xs4all.nl/~ripley/XmHTML/dist/
 
diff --git a/x11/XmHTML/buildlink3.mk b/x11/XmHTML/buildlink3.mk
index 527b0384053..a326b7c6672 100644
--- a/x11/XmHTML/buildlink3.mk
+++ b/x11/XmHTML/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.12 2010/01/18 09:59:32 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.13 2010/06/13 22:45:35 wiz Exp $
 
 BUILDLINK_TREE+=	XmHTML
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=	XmHTML
 XMHTML_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.XmHTML+=	XmHTML>=1.1.7nb2
-BUILDLINK_ABI_DEPENDS.XmHTML+=	XmHTML>=1.1.7nb8
+BUILDLINK_ABI_DEPENDS.XmHTML+=	XmHTML>=1.1.7nb9
 BUILDLINK_PKGSRCDIR.XmHTML?=	../../x11/XmHTML
 
 .include "../../graphics/jpeg/buildlink3.mk"
diff --git a/x11/acidlaunch/Makefile b/x11/acidlaunch/Makefile
index 8e2dbe8a9ac..1526d34a41b 100644
--- a/x11/acidlaunch/Makefile
+++ b/x11/acidlaunch/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.20 2010/01/18 09:59:33 wiz Exp $
+# $NetBSD: Makefile,v 1.21 2010/06/13 22:45:35 wiz Exp $
 #
 
 DISTNAME=	acidlaunch-0.5
-PKGREVISION=	12
+PKGREVISION=	13
 CATEGORIES=	x11
 MASTER_SITES=	http://linuxgamers.net/download/
 
diff --git a/x11/alacarte/Makefile b/x11/alacarte/Makefile
index 99717905ce4..91d902f5f78 100644
--- a/x11/alacarte/Makefile
+++ b/x11/alacarte/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.24 2010/02/10 19:17:48 joerg Exp $
+# $NetBSD: Makefile,v 1.25 2010/06/13 22:45:35 wiz Exp $
 #
 
 DISTNAME=	alacarte-0.12.3
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/alacarte/0.12/}
 EXTRACT_SUFX=	.tar.bz2
diff --git a/x11/antiright/Makefile b/x11/antiright/Makefile
index de510c87b56..4a721daa165 100644
--- a/x11/antiright/Makefile
+++ b/x11/antiright/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.9 2009/08/26 19:58:28 sno Exp $
+# $NetBSD: Makefile,v 1.10 2010/06/13 22:45:35 wiz Exp $
 #
 
 DISTNAME=	antiright-3.4
-PKGREVISION=	4
+PKGREVISION=	5
 CATEGORIES=	x11
 MASTER_SITES=	http://download.savannah.nongnu.org/releases/antiright/
 EXTRACT_SUFX=	.tar.bz2
diff --git a/x11/aterm/Makefile b/x11/aterm/Makefile
index 1fc7530426f..c8099fe1125 100644
--- a/x11/aterm/Makefile
+++ b/x11/aterm/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.39 2010/01/18 09:59:33 wiz Exp $
+# $NetBSD: Makefile,v 1.40 2010/06/13 22:45:35 wiz Exp $
 #
 
 DISTNAME=	aterm-1.0.0
-PKGREVISION=	7
+PKGREVISION=	8
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=aterm/}
 EXTRACT_SUFX=	.tar.bz2
diff --git a/x11/deskmenu/Makefile b/x11/deskmenu/Makefile
index 2623cf645ea..64aeaa64ec7 100644
--- a/x11/deskmenu/Makefile
+++ b/x11/deskmenu/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.4 2009/08/26 19:58:28 sno Exp $
+# $NetBSD: Makefile,v 1.5 2010/06/13 22:45:35 wiz Exp $
 #
 
 VERSION=	1.4.2
 DISTNAME=	deskmenu_${VERSION}
 PKGNAME=	deskmenu-${VERSION}
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	x11
 MASTER_SITES=	http://www.oroborus.org/debian/dists/sid/main/source/x11/
 
diff --git a/x11/devilspie/Makefile b/x11/devilspie/Makefile
index aa16239376c..b9d3a81238f 100644
--- a/x11/devilspie/Makefile
+++ b/x11/devilspie/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.36 2009/08/26 19:58:29 sno Exp $
+# $NetBSD: Makefile,v 1.37 2010/06/13 22:45:35 wiz Exp $
 
 DISTNAME=		devilspie-0.22
-PKGREVISION=		1
+PKGREVISION=		2
 CATEGORIES=		x11
 MASTER_SITES=		http://www.burtonini.com/computing/
 
diff --git a/x11/dfm/Makefile b/x11/dfm/Makefile
index 47edd1d9a20..57a1c840a1c 100644
--- a/x11/dfm/Makefile
+++ b/x11/dfm/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.17 2010/01/18 09:59:33 wiz Exp $
+# $NetBSD: Makefile,v 1.18 2010/06/13 22:45:36 wiz Exp $
 #
 
-PKGREVISION=	8
+PKGREVISION=	9
 CATEGORIES=	x11
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
diff --git a/x11/driconf/Makefile b/x11/driconf/Makefile
index 98bfbaefd3b..c59e5eeca4f 100644
--- a/x11/driconf/Makefile
+++ b/x11/driconf/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.9 2010/01/27 08:46:24 wiz Exp $
+# $NetBSD: Makefile,v 1.10 2010/06/13 22:45:36 wiz Exp $
 #
 
 DISTNAME=	driconf-0.9.1
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_LOCAL}
 
diff --git a/x11/ede/Makefile b/x11/ede/Makefile
index 77b1fe45cbc..e6dd5942c15 100644
--- a/x11/ede/Makefile
+++ b/x11/ede/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.10 2010/01/18 09:59:33 wiz Exp $
+# $NetBSD: Makefile,v 1.11 2010/06/13 22:45:36 wiz Exp $
 #
 
 DISTNAME=	ede-1.0.4
-PKGREVISION=	5
+PKGREVISION=	6
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=ede/}
 EXTRACT_SUFX=	.tar.bz2
diff --git a/x11/efltk/Makefile b/x11/efltk/Makefile
index 8442c9fab54..5519c4fb59d 100644
--- a/x11/efltk/Makefile
+++ b/x11/efltk/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.16 2010/01/18 09:59:33 wiz Exp $
+# $NetBSD: Makefile,v 1.17 2010/06/13 22:45:36 wiz Exp $
 #
 
 DISTNAME=	efltk-2.0.5
-PKGREVISION=	9
+PKGREVISION=	10
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=ede/}
 EXTRACT_SUFX=	.tar.bz2
diff --git a/x11/efltk/buildlink3.mk b/x11/efltk/buildlink3.mk
index 6a9867ab4f6..5ae31347152 100644
--- a/x11/efltk/buildlink3.mk
+++ b/x11/efltk/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.14 2010/01/18 09:59:33 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.15 2010/06/13 22:45:36 wiz Exp $
 
 BUILDLINK_TREE+=	efltk
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=	efltk
 EFLTK_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.efltk+=	efltk>=2.0.5nb1
-BUILDLINK_ABI_DEPENDS.efltk?=	efltk>=2.0.5nb9
+BUILDLINK_ABI_DEPENDS.efltk?=	efltk>=2.0.5nb10
 BUILDLINK_PKGSRCDIR.efltk?=	../../x11/efltk
 
 .include "../../devel/gettext-lib/buildlink3.mk"
diff --git a/x11/eterm/Makefile b/x11/eterm/Makefile
index a80b427f9e0..0e4bdba088e 100644
--- a/x11/eterm/Makefile
+++ b/x11/eterm/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.61 2010/01/18 09:59:33 wiz Exp $
+# $NetBSD: Makefile,v 1.62 2010/06/13 22:45:36 wiz Exp $
 
 DISTNAME=	Eterm-0.9.5
 PKGNAME=	${DISTNAME:S/^E/e/}
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=eterm/}
 DISTFILES=	${DEFAULT_DISTFILES} ${DEFAULT_DISTFILES:S/Eterm-/Eterm-bg-/}
diff --git a/x11/fast-user-switch-applet/Makefile b/x11/fast-user-switch-applet/Makefile
index a33a9fb8683..80a3c90cee4 100644
--- a/x11/fast-user-switch-applet/Makefile
+++ b/x11/fast-user-switch-applet/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.26 2010/01/18 09:59:33 wiz Exp $
+# $NetBSD: Makefile,v 1.27 2010/06/13 22:45:36 wiz Exp $
 #
 
 DISTNAME=	fast-user-switch-applet-2.24.0
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	misc gnome
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/fast-user-switch-applet/2.24/}
 EXTRACT_SUFX=	.tar.bz2
diff --git a/x11/fbdesk/Makefile b/x11/fbdesk/Makefile
index 8af6f1cb296..b6c3414ae53 100644
--- a/x11/fbdesk/Makefile
+++ b/x11/fbdesk/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.27 2010/01/18 09:59:33 wiz Exp $
+# $NetBSD: Makefile,v 1.28 2010/06/13 22:45:36 wiz Exp $
 #
 
 DISTNAME=	fbdesk-1.4.1
-PKGREVISION=	3
+PKGREVISION=	4
 CATEGORIES=	x11 wm
 MASTER_SITES=	http://fluxbox.sourceforge.net/download/
 
diff --git a/x11/fltk/Makefile b/x11/fltk/Makefile
index 5fac5d641e3..929ca9890e1 100644
--- a/x11/fltk/Makefile
+++ b/x11/fltk/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.71 2010/04/09 13:35:41 obache Exp $
+# $NetBSD: Makefile,v 1.72 2010/06/13 22:45:36 wiz Exp $
 
 DISTNAME=	fltk-1.1.10-source
 PKGNAME=	${DISTNAME:S/-source//}
 VERS=		${DISTNAME:S/fltk-//:S/-source//}
+PKGREVISION=	1
 CATEGORIES=	x11
 MASTER_SITES=	http://ftp.easysw.com/pub/fltk/${VERS}/ \
 		ftp://ftp.funet.fi/pub/mirrors/ftp.easysw.com/pub/fltk/${VERS}/ \
diff --git a/x11/fltk/buildlink3.mk b/x11/fltk/buildlink3.mk
index f3c277560a8..94f7265a085 100644
--- a/x11/fltk/buildlink3.mk
+++ b/x11/fltk/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.18 2010/03/12 09:23:41 obache Exp $
+# $NetBSD: buildlink3.mk,v 1.19 2010/06/13 22:45:36 wiz Exp $
 
 BUILDLINK_TREE+=	fltk
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=	fltk
 FLTK_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.fltk+=	fltk>=1.1.5rc1
-BUILDLINK_ABI_DEPENDS.fltk+=	fltk>=1.1.7nb1
+BUILDLINK_ABI_DEPENDS.fltk+=	fltk>=1.1.10nb1
 BUILDLINK_PKGSRCDIR.fltk?=	../../x11/fltk
 BUILDLINK_FILES.fltk+=		include/Fl/*
 
diff --git a/x11/fltk2/Makefile b/x11/fltk2/Makefile
index 4b573255b12..b41bc1c65bb 100644
--- a/x11/fltk2/Makefile
+++ b/x11/fltk2/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.5 2010/01/18 09:59:33 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2010/06/13 22:45:36 wiz Exp $
 
 VERS=		6129
-PKGREVISION=	3
+PKGREVISION=	4
 DISTNAME=	fltk-2.0.x-r${VERS}
 PKGNAME=	fltk2-2.0pre${VERS}
 CATEGORIES=	x11
diff --git a/x11/fltk2/buildlink3.mk b/x11/fltk2/buildlink3.mk
index 64b0fd4c0a8..c747c02a271 100644
--- a/x11/fltk2/buildlink3.mk
+++ b/x11/fltk2/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2010/01/18 09:59:33 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2010/06/13 22:45:36 wiz Exp $
 
 BUILDLINK_TREE+=	fltk2
 
@@ -7,7 +7,7 @@ FLTK2_BUILDLINK3_MK:=
 
 BUILDLINK_DEPMETHOD.fltk2?=	build
 BUILDLINK_API_DEPENDS.fltk2+=	fltk2>=2.0pre6129
-BUILDLINK_ABI_DEPENDS.fltk2?=	fltk2>=2.0pre6129nb3
+BUILDLINK_ABI_DEPENDS.fltk2?=	fltk2>=2.0pre6129nb4
 BUILDLINK_PKGSRCDIR.fltk2?=	../../x11/fltk2
 
 .include "../../graphics/MesaLib/buildlink3.mk"
diff --git a/x11/fox/Makefile b/x11/fox/Makefile
index dfb1b9c1cc2..0ce8a777e9c 100644
--- a/x11/fox/Makefile
+++ b/x11/fox/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.42 2010/01/18 09:59:33 wiz Exp $
+# $NetBSD: Makefile,v 1.43 2010/06/13 22:45:36 wiz Exp $
 
 DISTNAME=	fox-1.6.33
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	x11
 MASTER_SITES=	http://www.fox-toolkit.org/ftp/
 
diff --git a/x11/fox/buildlink3.mk b/x11/fox/buildlink3.mk
index ed437b50305..6f7fe3c69d5 100644
--- a/x11/fox/buildlink3.mk
+++ b/x11/fox/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.19 2010/01/18 09:59:33 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.20 2010/06/13 22:45:36 wiz Exp $
 
 BUILDLINK_TREE+=	fox
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=	fox
 FOX_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.fox+=	fox>=1.6.25
-BUILDLINK_ABI_DEPENDS.fox?=	fox>=1.6.33nb2
+BUILDLINK_ABI_DEPENDS.fox?=	fox>=1.6.33nb3
 BUILDLINK_PKGSRCDIR.fox?=	../../x11/fox
 BUILDLINK_INCDIRS.fox?=		include/fox-1.6
 
diff --git a/x11/ftmenu/Makefile b/x11/ftmenu/Makefile
index 9c92407a5c7..565ee41a769 100644
--- a/x11/ftmenu/Makefile
+++ b/x11/ftmenu/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.5 2009/08/26 19:58:29 sno Exp $
+# $NetBSD: Makefile,v 1.6 2010/06/13 22:45:36 wiz Exp $
 #
 
 DISTNAME=	ftmenu-0.3
 
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=ftmenu/}
 
diff --git a/x11/gdm/Makefile b/x11/gdm/Makefile
index 483684724ca..36afbdda553 100644
--- a/x11/gdm/Makefile
+++ b/x11/gdm/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.156 2010/02/08 09:47:06 tnn Exp $
+# $NetBSD: Makefile,v 1.157 2010/06/13 22:45:37 wiz Exp $
 #
 
 DISTNAME=	gdm-2.20.10
-PKGREVISION=	3
+PKGREVISION=	4
 CATEGORIES=	x11 gnome
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/gdm/2.20/}
 EXTRACT_SUFX=	.tar.bz2
diff --git a/x11/gnome-applets/Makefile b/x11/gnome-applets/Makefile
index 457347d727d..16ac40e680c 100644
--- a/x11/gnome-applets/Makefile
+++ b/x11/gnome-applets/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.81 2010/02/16 13:35:40 wiz Exp $
+# $NetBSD: Makefile,v 1.82 2010/06/13 22:45:37 wiz Exp $
 #
 
 DISTNAME=		gnome-applets-2.28.0
-PKGREVISION=		4
+PKGREVISION=		5
 CATEGORIES=		x11 gnome
 MASTER_SITES=		${MASTER_SITE_GNOME:=sources/gnome-applets/2.28/}
 EXTRACT_SUFX=		.tar.bz2
diff --git a/x11/gnome-control-center/Makefile b/x11/gnome-control-center/Makefile
index 4336e5fcc01..3337169713e 100644
--- a/x11/gnome-control-center/Makefile
+++ b/x11/gnome-control-center/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.31 2010/02/16 13:35:40 wiz Exp $
+# $NetBSD: Makefile,v 1.32 2010/06/13 22:45:37 wiz Exp $
 #
 
 DISTNAME=	gnome-control-center-2.28.1
-PKGREVISION=	3
+PKGREVISION=	4
 CATEGORIES=	x11 gnome
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/gnome-control-center/2.28/}
 EXTRACT_SUFX=	.tar.bz2
diff --git a/x11/gnome-control-center/buildlink3.mk b/x11/gnome-control-center/buildlink3.mk
index d570715a621..d014cb493d2 100644
--- a/x11/gnome-control-center/buildlink3.mk
+++ b/x11/gnome-control-center/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.7 2010/01/18 09:59:34 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.8 2010/06/13 22:45:37 wiz Exp $
 
 BUILDLINK_TREE+=	gnome-control-center
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=	gnome-control-center
 GNOME_CONTROL_CENTER_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.gnome-control-center+=	gnome-control-center>=2.20.0.1
-BUILDLINK_ABI_DEPENDS.gnome-control-center?=	gnome-control-center>=2.28.1nb2
+BUILDLINK_ABI_DEPENDS.gnome-control-center?=	gnome-control-center>=2.28.1nb4
 BUILDLINK_PKGSRCDIR.gnome-control-center?=	../../x11/gnome-control-center
 
 .include "../../sysutils/gnome-menus/buildlink3.mk"
diff --git a/x11/gnome-desktop-sharp/Makefile b/x11/gnome-desktop-sharp/Makefile
index 46828b4a1c6..f1832b271ee 100644
--- a/x11/gnome-desktop-sharp/Makefile
+++ b/x11/gnome-desktop-sharp/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.17 2010/01/18 09:59:34 wiz Exp $
+# $NetBSD: Makefile,v 1.18 2010/06/13 22:45:37 wiz Exp $
 #
 
 DISTNAME=	gnome-desktop-sharp-2.26.0
-PKGREVISION=	11
+PKGREVISION=	12
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/gnome-desktop-sharp/2.26/}
 
diff --git a/x11/gnome-desktop-sharp/buildlink3.mk b/x11/gnome-desktop-sharp/buildlink3.mk
index 0f72bee1f77..c33080c7776 100644
--- a/x11/gnome-desktop-sharp/buildlink3.mk
+++ b/x11/gnome-desktop-sharp/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.10 2010/01/18 09:59:34 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.11 2010/06/13 22:45:37 wiz Exp $
 
 BUILDLINK_TREE+=	gnome-desktop-sharp
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=	gnome-desktop-sharp
 GNOME_DESKTOP_SHARP_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.gnome-desktop-sharp+=	gnome-desktop-sharp>=2.24.0
-BUILDLINK_ABI_DEPENDS.gnome-desktop-sharp?=	gnome-desktop-sharp>=2.26.0nb11
+BUILDLINK_ABI_DEPENDS.gnome-desktop-sharp?=	gnome-desktop-sharp>=2.26.0nb12
 BUILDLINK_PKGSRCDIR.gnome-desktop-sharp?=	../../x11/gnome-desktop-sharp
 
 .include "../../devel/libwnck/buildlink3.mk"
diff --git a/x11/gnome-desktop/Makefile b/x11/gnome-desktop/Makefile
index 656543d239e..3baea25d981 100644
--- a/x11/gnome-desktop/Makefile
+++ b/x11/gnome-desktop/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.99 2010/02/10 19:17:48 joerg Exp $
+# $NetBSD: Makefile,v 1.100 2010/06/13 22:45:37 wiz Exp $
 #
 
 DISTNAME=		gnome-desktop-2.28.2
-PKGREVISION=		1
+PKGREVISION=		2
 CATEGORIES=		x11 gnome
 MASTER_SITES=		${MASTER_SITE_GNOME:=sources/gnome-desktop/2.28/}
 EXTRACT_SUFX=		.tar.bz2
diff --git a/x11/gnome-desktop/buildlink3.mk b/x11/gnome-desktop/buildlink3.mk
index de613596abc..214edc9eaa6 100644
--- a/x11/gnome-desktop/buildlink3.mk
+++ b/x11/gnome-desktop/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.29 2009/08/26 19:56:57 sno Exp $
+# $NetBSD: buildlink3.mk,v 1.30 2010/06/13 22:45:37 wiz Exp $
 
 BUILDLINK_TREE+=	gnome-desktop
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=	gnome-desktop
 GNOME_DESKTOP_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.gnome-desktop+=	gnome-desktop>=2.25.3
-BUILDLINK_ABI_DEPENDS.gnome-desktop?=	gnome-desktop>=2.26.3nb1
+BUILDLINK_ABI_DEPENDS.gnome-desktop?=	gnome-desktop>=2.28.2nb2
 BUILDLINK_PKGSRCDIR.gnome-desktop?=	../../x11/gnome-desktop
 
 .include "../../devel/gettext-lib/buildlink3.mk"
diff --git a/x11/gnome-mag/Makefile b/x11/gnome-mag/Makefile
index fabfa8f3da0..c64faf0651f 100644
--- a/x11/gnome-mag/Makefile
+++ b/x11/gnome-mag/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.55 2010/06/05 11:17:40 wiz Exp $
+# $NetBSD: Makefile,v 1.56 2010/06/13 22:45:37 wiz Exp $
 #
 
 DISTNAME=		gnome-mag-0.16.1
+PKGREVISION=		1
 CATEGORIES=		x11 gnome
 MASTER_SITES=		${MASTER_SITE_GNOME:=sources/gnome-mag/0.16/}
 EXTRACT_SUFX=		.tar.bz2
diff --git a/x11/gnome-mag/buildlink3.mk b/x11/gnome-mag/buildlink3.mk
index 2ddb0d8292e..e969e9cf802 100644
--- a/x11/gnome-mag/buildlink3.mk
+++ b/x11/gnome-mag/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.18 2009/08/26 19:56:59 sno Exp $
+# $NetBSD: buildlink3.mk,v 1.19 2010/06/13 22:45:37 wiz Exp $
 
 BUILDLINK_TREE+=	gnome-mag
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=	gnome-mag
 GNOME_MAG_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.gnome-mag+=	gnome-mag>=0.12.0
-BUILDLINK_ABI_DEPENDS.gnome-mag?=	gnome-mag>=0.15.8nb1
+BUILDLINK_ABI_DEPENDS.gnome-mag?=	gnome-mag>=0.16.1nb1
 BUILDLINK_PKGSRCDIR.gnome-mag?=	../../x11/gnome-mag
 
 .include "../../devel/gettext-lib/buildlink3.mk"
diff --git a/x11/gnome-panel/Makefile b/x11/gnome-panel/Makefile
index 36ef8c38f17..d1d3bd7dc0f 100644
--- a/x11/gnome-panel/Makefile
+++ b/x11/gnome-panel/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.119 2010/02/14 11:12:21 drochner Exp $
+# $NetBSD: Makefile,v 1.120 2010/06/13 22:45:37 wiz Exp $
 #
 
 DISTNAME=		gnome-panel-2.28.0
-PKGREVISION=		2
+PKGREVISION=		3
 CATEGORIES=		x11 gnome
 MASTER_SITES=		${MASTER_SITE_GNOME:=sources/gnome-panel/2.28/}
 EXTRACT_SUFX=		.tar.bz2
diff --git a/x11/gnome-panel/buildlink3.mk b/x11/gnome-panel/buildlink3.mk
index cd433041cfc..4a8e1edeb77 100644
--- a/x11/gnome-panel/buildlink3.mk
+++ b/x11/gnome-panel/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.33 2010/01/18 09:59:34 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.34 2010/06/13 22:45:37 wiz Exp $
 
 BUILDLINK_TREE+=	gnome-panel
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=	gnome-panel
 GNOME_PANEL_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.gnome-panel+=		gnome-panel>=2.12.1nb3
-BUILDLINK_ABI_DEPENDS.gnome-panel?=	gnome-panel>=2.28.0nb1
+BUILDLINK_ABI_DEPENDS.gnome-panel?=	gnome-panel>=2.28.0nb3
 BUILDLINK_PKGSRCDIR.gnome-panel?=	../../x11/gnome-panel
 
 pkgbase:= gnome-panel
diff --git a/x11/gnome-screensaver/Makefile b/x11/gnome-screensaver/Makefile
index 069fb7a1ba6..a66cec32103 100644
--- a/x11/gnome-screensaver/Makefile
+++ b/x11/gnome-screensaver/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.42 2010/02/18 20:44:19 drochner Exp $
+# $NetBSD: Makefile,v 1.43 2010/06/13 22:45:37 wiz Exp $
 #
 
 DISTNAME=	gnome-screensaver-2.28.3
+PKGREVISION=	1
 CATEGORIES=	x11 gnome
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/gnome-screensaver/2.28/}
 EXTRACT_SUFX=	.tar.bz2
diff --git a/x11/gnome-session/Makefile b/x11/gnome-session/Makefile
index b46dc8a6aea..12c557a8e13 100644
--- a/x11/gnome-session/Makefile
+++ b/x11/gnome-session/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.117 2010/01/18 09:59:34 wiz Exp $
+# $NetBSD: Makefile,v 1.118 2010/06/13 22:45:37 wiz Exp $
 #
 
 DISTNAME=		gnome-session-2.26.2
-PKGREVISION=		2
+PKGREVISION=		3
 CATEGORIES=		x11 gnome
 MASTER_SITES=		${MASTER_SITE_GNOME:=sources/gnome-session/2.26/}
 SITES.gnome-splash-2.16.0.png=	${MASTER_SITE_LOCAL:=gnome-splash/}
diff --git a/x11/gnome-sharp/Makefile b/x11/gnome-sharp/Makefile
index f6ebe7675f6..3306fb8cac0 100644
--- a/x11/gnome-sharp/Makefile
+++ b/x11/gnome-sharp/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.17 2010/01/18 09:59:34 wiz Exp $
+# $NetBSD: Makefile,v 1.18 2010/06/13 22:45:37 wiz Exp $
 #
 
 DISTNAME=	gnome-sharp-2.24.1
-PKGREVISION=	6
+PKGREVISION=	7
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/gnome-sharp/2.24/}
 
diff --git a/x11/gnome-sharp/buildlink3.mk b/x11/gnome-sharp/buildlink3.mk
index 6a0b6a802b3..d9cbbea9638 100644
--- a/x11/gnome-sharp/buildlink3.mk
+++ b/x11/gnome-sharp/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.13 2010/01/18 09:59:34 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.14 2010/06/13 22:45:37 wiz Exp $
 
 BUILDLINK_TREE+=	gnome-sharp
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=	gnome-sharp
 GNOME_SHARP_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.gnome-sharp+=	gnome-sharp>=2.24.0
-BUILDLINK_ABI_DEPENDS.gnome-sharp?=	gnome-sharp>=2.24.1nb6
+BUILDLINK_ABI_DEPENDS.gnome-sharp?=	gnome-sharp>=2.24.1nb7
 BUILDLINK_PKGSRCDIR.gnome-sharp?=	../../x11/gnome-sharp
 
 .include "../../devel/libgnomeui/buildlink3.mk"
diff --git a/x11/gnome-terminal/Makefile b/x11/gnome-terminal/Makefile
index 839d82d0596..30395301cc5 100644
--- a/x11/gnome-terminal/Makefile
+++ b/x11/gnome-terminal/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.31 2010/06/12 12:50:44 drochner Exp $
+# $NetBSD: Makefile,v 1.32 2010/06/13 22:45:38 wiz Exp $
 #
 
 DISTNAME=		gnome-terminal-2.28.2
-PKGREVISION=		1
+PKGREVISION=		2
 CATEGORIES=		x11 gnome
 MASTER_SITES=		${MASTER_SITE_GNOME:=sources/gnome-terminal/2.28/}
 EXTRACT_SUFX=		.tar.bz2
diff --git a/x11/gnome-themes-extras/Makefile b/x11/gnome-themes-extras/Makefile
index ae1e1dc71b3..781bdec6a04 100644
--- a/x11/gnome-themes-extras/Makefile
+++ b/x11/gnome-themes-extras/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.42 2010/01/18 09:59:34 wiz Exp $
+# $NetBSD: Makefile,v 1.43 2010/06/13 22:45:38 wiz Exp $
 #
 
 DISTNAME=	gnome-themes-extras-2.22.0
-PKGREVISION=	3
+PKGREVISION=	4
 CATEGORIES=	x11 gnome
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/gnome-themes-extras/2.22/}
 EXTRACT_SUFX=	.tar.bz2
diff --git a/x11/gnome-themes/Makefile b/x11/gnome-themes/Makefile
index 312b2fd6dde..1eb5b598671 100644
--- a/x11/gnome-themes/Makefile
+++ b/x11/gnome-themes/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.75 2009/10/24 12:52:32 drochner Exp $
+# $NetBSD: Makefile,v 1.76 2010/06/13 22:45:38 wiz Exp $
 #
 
 DISTNAME=		gnome-themes-2.28.1
+PKGREVISION=		1
 CATEGORIES=		x11
 MASTER_SITES=		${MASTER_SITE_GNOME:=sources/gnome-themes/2.28/}
 EXTRACT_SUFX=		.tar.bz2
diff --git a/x11/gnopernicus/Makefile b/x11/gnopernicus/Makefile
index a2a67918c6c..d44c6b1417e 100644
--- a/x11/gnopernicus/Makefile
+++ b/x11/gnopernicus/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.61 2010/01/18 09:59:34 wiz Exp $
+# $NetBSD: Makefile,v 1.62 2010/06/13 22:45:38 wiz Exp $
 #
 
 DISTNAME=		gnopernicus-1.1.1
-PKGREVISION=		9
+PKGREVISION=		10
 CATEGORIES=		x11
 MASTER_SITES=		${MASTER_SITE_GNOME:=sources/gnopernicus/1.1/}
 EXTRACT_SUFX=		.tar.bz2
diff --git a/x11/gnustep-gui/Makefile b/x11/gnustep-gui/Makefile
index 71335f76788..8f8adf75def 100644
--- a/x11/gnustep-gui/Makefile
+++ b/x11/gnustep-gui/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.44 2010/01/18 09:59:34 wiz Exp $
+# $NetBSD: Makefile,v 1.45 2010/06/13 22:45:38 wiz Exp $
 
 DISTNAME=	gnustep-gui-0.16.0
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	x11 gnustep
 MASTER_SITES=	${MASTER_SITE_GNUSTEP:=core/}
 
diff --git a/x11/grandr_applet/Makefile b/x11/grandr_applet/Makefile
index 23bc3cd0cae..066ba2b01ae 100644
--- a/x11/grandr_applet/Makefile
+++ b/x11/grandr_applet/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.8 2010/01/18 09:59:34 wiz Exp $
+# $NetBSD: Makefile,v 1.9 2010/06/13 22:45:38 wiz Exp $
 #
 
 DISTNAME=	grandr_applet-0.4
-PKGREVISION=	4
+PKGREVISION=	5
 CATEGORIES=	x11
 MASTER_SITES=	http://dekorte.homeip.net/download/grandr-applet/
 
diff --git a/x11/gromit/Makefile b/x11/gromit/Makefile
index 43b94f84bf1..98f7246b3cd 100644
--- a/x11/gromit/Makefile
+++ b/x11/gromit/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.12 2009/08/26 19:58:30 sno Exp $
+# $NetBSD: Makefile,v 1.13 2010/06/13 22:45:38 wiz Exp $
 #
 
 DISTNAME=		gromit-20041213
-PKGREVISION=		4
+PKGREVISION=		5
 CATEGORIES=		x11
 MASTER_SITES=		http://www.home.unix-ag.org/simon/gromit/
 
diff --git a/x11/gselt/Makefile b/x11/gselt/Makefile
index fa0188b276c..88665595fa5 100644
--- a/x11/gselt/Makefile
+++ b/x11/gselt/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.1.1.1 2009/10/22 22:30:40 wiz Exp $
+# $NetBSD: Makefile,v 1.2 2010/06/13 22:45:38 wiz Exp $
 #
 
 DISTNAME=	gselt-1.2
+PKGREVISION=	1
 CATEGORIES=	x11
 MASTER_SITES=	http://offog.org/files/
 
diff --git a/x11/gtk-engines/Makefile b/x11/gtk-engines/Makefile
index 9a80198e5eb..6831ef226d4 100644
--- a/x11/gtk-engines/Makefile
+++ b/x11/gtk-engines/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.35 2010/01/18 09:59:34 wiz Exp $
+# $NetBSD: Makefile,v 1.36 2010/06/13 22:45:38 wiz Exp $
 
 DISTNAME=		gtk-engines-0.12
-PKGREVISION=		11
+PKGREVISION=		12
 CATEGORIES=		x11
 MASTER_SITES=		${MASTER_SITE_GNOME:=sources/gtk-engines/0.12/}
 
diff --git a/x11/gtk-sharp/Makefile b/x11/gtk-sharp/Makefile
index c23f04ab2bd..89212765630 100644
--- a/x11/gtk-sharp/Makefile
+++ b/x11/gtk-sharp/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.16 2010/03/16 19:33:37 wiz Exp $
+# $NetBSD: Makefile,v 1.17 2010/06/13 22:45:38 wiz Exp $
 #
 
 DISTNAME=		gtk-sharp-2.12.10
+PKGREVISION=		1
 CATEGORIES=		x11
 MASTER_SITES=		${MASTER_SITE_GNOME:=sources/gtk-sharp/2.12/}
 EXTRACT_SUFX=		.tar.bz2
diff --git a/x11/gtk2+extra/Makefile b/x11/gtk2+extra/Makefile
index f9f6493bca7..59ef6a72cc2 100644
--- a/x11/gtk2+extra/Makefile
+++ b/x11/gtk2+extra/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.8 2010/04/13 17:44:30 drochner Exp $
+# $NetBSD: Makefile,v 1.9 2010/06/13 22:45:39 wiz Exp $
 #
 
 DISTNAME=	gtk+extra-2.1.2
 PKGNAME=	${DISTNAME:S/gtk/gtk2/}
+PKGREVISION=	1
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=gtkextra/}
 
diff --git a/x11/gtk2+extra/buildlink3.mk b/x11/gtk2+extra/buildlink3.mk
index fb2a61b983a..b9ee2446fa7 100644
--- a/x11/gtk2+extra/buildlink3.mk
+++ b/x11/gtk2+extra/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.11 2009/08/26 19:56:57 sno Exp $
+# $NetBSD: buildlink3.mk,v 1.12 2010/06/13 22:45:39 wiz Exp $
 
 BUILDLINK_TREE+=	gtk2+extra
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=	gtk2+extra
 GTK2_EXTRA_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.gtk2+extra+=	gtk2+extra>=2.1.1
-BUILDLINK_ABI_DEPENDS.gtk2+extra?=	gtk2+extra>=2.1.1nb4
+BUILDLINK_ABI_DEPENDS.gtk2+extra?=	gtk2+extra>=2.1.2nb1
 BUILDLINK_PKGSRCDIR.gtk2+extra?=	../../x11/gtk2+extra
 
 .include "../../x11/gtk2/buildlink3.mk"
diff --git a/x11/gtk2-chtheme/Makefile b/x11/gtk2-chtheme/Makefile
index c58b0751bf8..605ebaebad7 100644
--- a/x11/gtk2-chtheme/Makefile
+++ b/x11/gtk2-chtheme/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.12 2009/08/26 19:58:31 sno Exp $
+# $NetBSD: Makefile,v 1.13 2010/06/13 22:45:39 wiz Exp $
 #
 
 DISTNAME=		gtk-chtheme-0.3.1
 PKGNAME=		gtk2-chtheme-0.3.1
-PKGREVISION=		4
+PKGREVISION=		5
 CATEGORIES=		x11
 MASTER_SITES=		http://plasmasturm.org/code/gtk-chtheme/
 EXTRACT_SUFX=		.tar.bz2
diff --git a/x11/gtk2-engines-bluecurve/Makefile b/x11/gtk2-engines-bluecurve/Makefile
index 78cbed3acd4..ece043350a0 100644
--- a/x11/gtk2-engines-bluecurve/Makefile
+++ b/x11/gtk2-engines-bluecurve/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.20 2009/08/26 19:58:31 sno Exp $
+# $NetBSD: Makefile,v 1.21 2010/06/13 22:45:39 wiz Exp $
 #
 
 DISTNAME=	GTK2-Wonderland-Engine-1.0
 PKGNAME=	gtk2-engines-bluecurve-1.0
-PKGREVISION=	7
+PKGREVISION=	8
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_GNOME:=teams/art.gnome.org/themes/gtk2/}
 EXTRACT_SUFX=	.tar.bz2
diff --git a/x11/gtk2-engines-murrine/Makefile b/x11/gtk2-engines-murrine/Makefile
index 81c19a3a6cd..e09fcaae9b0 100644
--- a/x11/gtk2-engines-murrine/Makefile
+++ b/x11/gtk2-engines-murrine/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.6 2009/09/08 14:39:27 ahoka Exp $
+# $NetBSD: Makefile,v 1.7 2010/06/13 22:45:39 wiz Exp $
 
 DISTNAME=	murrine-0.90.3
 PKGNAME=	${DISTNAME:S/^/gtk2-engines-/}
+PKGREVISION=	1
 CATEGORIES=	x11 gnome
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/murrine/0.90/}
 EXTRACT_SUFX=	.tar.bz2
diff --git a/x11/gtk2-engines/Makefile b/x11/gtk2-engines/Makefile
index 287899c9e47..0cce9c2066a 100644
--- a/x11/gtk2-engines/Makefile
+++ b/x11/gtk2-engines/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.64 2010/01/18 18:31:09 drochner Exp $
+# $NetBSD: Makefile,v 1.65 2010/06/13 22:45:39 wiz Exp $
 
 DISTNAME=		gtk-engines-2.18.5
 PKGNAME=		${DISTNAME:S/gtk/gtk2/}
+PKGREVISION=		1
 CATEGORIES=		x11
 MASTER_SITES=		${MASTER_SITE_GNOME:=sources/gtk-engines/2.18/}
 EXTRACT_SUFX=		.tar.bz2
diff --git a/x11/gtk2-engines/buildlink3.mk b/x11/gtk2-engines/buildlink3.mk
index 599813007a8..b4c86fc1818 100644
--- a/x11/gtk2-engines/buildlink3.mk
+++ b/x11/gtk2-engines/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.14 2009/08/26 19:56:55 sno Exp $
+# $NetBSD: buildlink3.mk,v 1.15 2010/06/13 22:45:39 wiz Exp $
 
 BUILDLINK_TREE+=	gtk2-engines
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=	gtk2-engines
 GTK2_ENGINES_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.gtk2-engines+=	gtk2-engines>=2.6.0
-BUILDLINK_ABI_DEPENDS.gtk2-engines?=	gtk2-engines>=2.18.2nb2
+BUILDLINK_ABI_DEPENDS.gtk2-engines?=	gtk2-engines>=2.18.5nb1
 BUILDLINK_PKGSRCDIR.gtk2-engines?=	../../x11/gtk2-engines
 
 .include "../../x11/gtk2/buildlink3.mk"
diff --git a/x11/gtk2-theme-switch/Makefile b/x11/gtk2-theme-switch/Makefile
index afe6a9645f4..cdd3d30881a 100644
--- a/x11/gtk2-theme-switch/Makefile
+++ b/x11/gtk2-theme-switch/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.21 2009/08/26 19:58:31 sno Exp $
+# $NetBSD: Makefile,v 1.22 2010/06/13 22:45:39 wiz Exp $
 #
 
 DISTNAME=		gtk-theme-switch-2.0.0rc2
 PKGNAME=		${DISTNAME:S/gtk/gtk2/}
-PKGREVISION=		7
+PKGREVISION=		8
 CATEGORIES=		x11
 MASTER_SITES=		http://www.muhri.net/
 
diff --git a/x11/gtk2/Makefile b/x11/gtk2/Makefile
index dd6702ec987..7b59ccab583 100644
--- a/x11/gtk2/Makefile
+++ b/x11/gtk2/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.202 2010/06/01 13:26:31 drochner Exp $
+# $NetBSD: Makefile,v 1.203 2010/06/13 22:45:39 wiz Exp $
 
 DISTNAME=		gtk+-2.20.1
 PKGNAME=		${DISTNAME:S/gtk/gtk2/}
+PKGREVISION=		1
 CATEGORIES=		x11
 MASTER_SITES=		ftp://ftp.gtk.org/pub/gtk/2.20/ \
 			${MASTER_SITE_GNOME:=sources/gtk+/2.20/}
diff --git a/x11/gtk2/buildlink3.mk b/x11/gtk2/buildlink3.mk
index 544405470f2..7297994d816 100644
--- a/x11/gtk2/buildlink3.mk
+++ b/x11/gtk2/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.43 2009/09/07 18:42:39 drochner Exp $
+# $NetBSD: buildlink3.mk,v 1.44 2010/06/13 22:45:39 wiz Exp $
 
 BUILDLINK_TREE+=	gtk2
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=	gtk2
 GTK2_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.gtk2+=	gtk2+>=2.4.0
-BUILDLINK_ABI_DEPENDS.gtk2+=	gtk2+>=2.16.5nb1
+BUILDLINK_ABI_DEPENDS.gtk2+=	gtk2+>=2.20.1nb1
 BUILDLINK_PKGSRCDIR.gtk2?=	../../x11/gtk2
 
 .include "../../mk/bsd.fast.prefs.mk"
diff --git a/x11/gtk2/distinfo b/x11/gtk2/distinfo
index eee7b1f0df1..3d449b6693a 100644
--- a/x11/gtk2/distinfo
+++ b/x11/gtk2/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.128 2010/05/31 18:32:41 wiz Exp $
+$NetBSD: distinfo,v 1.129 2010/06/13 22:45:39 wiz Exp $
 
 SHA1 (gtk+-2.20.1.tar.bz2) = a80953b4e81c6a5bc2a986852f7fe60c8704cc02
 RMD160 (gtk+-2.20.1.tar.bz2) = bcd5f20f9e3f8d4e6f9bd91388de2fe9851ef361
 Size (gtk+-2.20.1.tar.bz2) = 19089076 bytes
 SHA1 (patch-aa) = 105a5b9d0bad708bcceb6f9a801207f0eff96eb3
 SHA1 (patch-ab) = 9c82cc60f3825d377a197c876fcc6faa379cbde3
-SHA1 (patch-af) = 54408034519f752de662567ea9d65056f2d27d95
+SHA1 (patch-af) = eb3eb3033d7fb3b8fba92a965072786da2f18e19
 SHA1 (patch-aj) = 40d91c8698981662e6926a27e39006b5ec413133
diff --git a/x11/gtk2/patches/patch-af b/x11/gtk2/patches/patch-af
index 1f5d063fdda..21b35e6fa94 100644
--- a/x11/gtk2/patches/patch-af
+++ b/x11/gtk2/patches/patch-af
@@ -1,8 +1,28 @@
-$NetBSD: patch-af,v 1.17 2010/03/16 08:40:15 wiz Exp $
+$NetBSD: patch-af,v 1.18 2010/06/13 22:45:39 wiz Exp $
 
---- configure.orig	2010-03-15 22:37:29.000000000 +0000
+--- configure.orig	2010-05-02 23:55:05.000000000 +0000
 +++ configure
-@@ -23073,7 +23073,7 @@ _ACEOF
+@@ -21748,14 +21748,14 @@ $as_echo "$as_me: WARNING: *** JPEG load
+ fi
+ 
+   if test x$with_libpng != xno && test -z "$LIBPNG"; then
+-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libpng12" >&5
+-$as_echo_n "checking for libpng12... " >&6; }
+-    if $PKG_CONFIG --exists libpng12 ; then
++    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libpng" >&5
++$as_echo_n "checking for libpng... " >&6; }
++    if $PKG_CONFIG --exists libpng ; then
+         { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+ $as_echo "yes" >&6; }
+         PNG='png'
+-	PNG_DEP_CFLAGS_PACKAGES=libpng12
+-	LIBPNG=`$PKG_CONFIG --libs libpng12`
++	PNG_DEP_CFLAGS_PACKAGES=libpng
++	LIBPNG=`$PKG_CONFIG --libs libpng`
+     else
+       { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+@@ -23098,7 +23098,7 @@ _ACEOF
  if ac_fn_c_try_link "$LINENO"; then :
    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
  $as_echo "no" >&6; }
diff --git a/x11/gtkmm-utils/Makefile b/x11/gtkmm-utils/Makefile
index 1658b92eaa6..a33b2a98568 100644
--- a/x11/gtkmm-utils/Makefile
+++ b/x11/gtkmm-utils/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.1.1.1 2010/04/30 10:17:46 wiz Exp $
+# $NetBSD: Makefile,v 1.2 2010/06/13 22:45:39 wiz Exp $
 #
 
 DISTNAME=	gtkmm-utils-0.4.1
+PKGREVISION=	1
 CATEGORIES=	x11
 MASTER_SITES=	http://gtkmm-utils.googlecode.com/files/
 
diff --git a/x11/gtkmm-utils/buildlink3.mk b/x11/gtkmm-utils/buildlink3.mk
index 60809d54dc9..22363893c63 100644
--- a/x11/gtkmm-utils/buildlink3.mk
+++ b/x11/gtkmm-utils/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2010/04/30 10:18:18 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2010/06/13 22:45:39 wiz Exp $
 
 BUILDLINK_TREE+=	gtkmm-utils
 
@@ -6,6 +6,7 @@ BUILDLINK_TREE+=	gtkmm-utils
 GTKMM_UTILS_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.gtkmm-utils+=	gtkmm-utils>=0.4.1
+BUILDLINK_ABI_DEPENDS.gtkmm-utils?=	gtkmm-utils>=0.4.1nb1
 BUILDLINK_PKGSRCDIR.gtkmm-utils?=	../../x11/gtkmm-utils
 
 .include "../../devel/glib2/buildlink3.mk"
diff --git a/x11/gtkmm/Makefile b/x11/gtkmm/Makefile
index b6ef368ec99..773306f614a 100644
--- a/x11/gtkmm/Makefile
+++ b/x11/gtkmm/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.68 2010/06/02 16:45:41 adam Exp $
+# $NetBSD: Makefile,v 1.69 2010/06/13 22:45:39 wiz Exp $
 
 DISTNAME=	gtkmm-2.20.3
+PKGREVISION=	1
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/gtkmm/2.20/}
 EXTRACT_SUFX=	.tar.bz2
diff --git a/x11/gtkmm/buildlink3.mk b/x11/gtkmm/buildlink3.mk
index c93e0968cc4..44ae17e1e9a 100644
--- a/x11/gtkmm/buildlink3.mk
+++ b/x11/gtkmm/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.20 2010/06/02 16:45:41 adam Exp $
+# $NetBSD: buildlink3.mk,v 1.21 2010/06/13 22:45:39 wiz Exp $
 
 BUILDLINK_TREE+=	gtkmm
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=	gtkmm
 GTKMM_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.gtkmm+=	gtkmm>=2.20.3
-BUILDLINK_ABI_DEPENDS.gtkmm+=	gtkmm>=2.20.3
+BUILDLINK_ABI_DEPENDS.gtkmm+=	gtkmm>=2.20.3nb1
 BUILDLINK_PKGSRCDIR.gtkmm?=	../../x11/gtkmm
 
 .include "../../devel/pangomm/buildlink3.mk"
diff --git a/x11/gtksourceview-sharp2/Makefile b/x11/gtksourceview-sharp2/Makefile
index 904a300c47b..09fb6f9ceac 100644
--- a/x11/gtksourceview-sharp2/Makefile
+++ b/x11/gtksourceview-sharp2/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.16 2010/01/18 09:59:35 wiz Exp $
+# $NetBSD: Makefile,v 1.17 2010/06/13 22:45:40 wiz Exp $
 
 DISTNAME=	gtksourceview-sharp-2.0-0.12
 PKGNAME=	${DISTNAME:S/-2.0-/2-/}
-PKGREVISION=	10
+PKGREVISION=	11
 CATEGORIES=	x11
 MASTER_SITES=	http://ftp.novell.com/pub/mono/sources/gtksourceview-sharp2/
 EXTRACT_SUFX=	.tar.bz2
diff --git a/x11/gtksourceview/Makefile b/x11/gtksourceview/Makefile
index aeda548dba1..a7ddeb80d4e 100644
--- a/x11/gtksourceview/Makefile
+++ b/x11/gtksourceview/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.50 2010/01/18 09:59:34 wiz Exp $
+# $NetBSD: Makefile,v 1.51 2010/06/13 22:45:40 wiz Exp $
 #
 
 DISTNAME=	gtksourceview-1.8.5
 #PKGREVISION=	1
-PKGREVISION=	3
+PKGREVISION=	4
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/gtksourceview/1.8/}
 EXTRACT_SUFX=	.tar.bz2
diff --git a/x11/gtksourceview/buildlink3.mk b/x11/gtksourceview/buildlink3.mk
index 7351edac7cd..caad4e65662 100644
--- a/x11/gtksourceview/buildlink3.mk
+++ b/x11/gtksourceview/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.19 2010/01/18 09:59:34 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.20 2010/06/13 22:45:40 wiz Exp $
 
 BUILDLINK_TREE+=	gtksourceview
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=	gtksourceview
 GTKSOURCEVIEW_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.gtksourceview+=	gtksourceview>=1.8.5
-BUILDLINK_ABI_DEPENDS.gtksourceview?=	gtksourceview>=1.8.5nb3
+BUILDLINK_ABI_DEPENDS.gtksourceview?=	gtksourceview>=1.8.5nb4
 BUILDLINK_PKGSRCDIR.gtksourceview?=	../../x11/gtksourceview
 
 .include "../../devel/gettext-lib/buildlink3.mk"
diff --git a/x11/gtksourceview2/Makefile b/x11/gtksourceview2/Makefile
index 6c9fe16b53c..234e1a9b57d 100644
--- a/x11/gtksourceview2/Makefile
+++ b/x11/gtksourceview2/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.18 2010/01/18 18:26:42 drochner Exp $
+# $NetBSD: Makefile,v 1.19 2010/06/13 22:45:40 wiz Exp $
 #
 
 DISTNAME=	gtksourceview-${DISTVER}
 PKGNAME=	gtksourceview2-${DISTVER}
+PKGREVISION=	1
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/gtksourceview/2.8/}
 EXTRACT_SUFX=	.tar.bz2
diff --git a/x11/gtksourceview2/buildlink3.mk b/x11/gtksourceview2/buildlink3.mk
index 823f87fdaf3..60ca948b1c1 100644
--- a/x11/gtksourceview2/buildlink3.mk
+++ b/x11/gtksourceview2/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.6 2009/08/26 19:56:57 sno Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2010/06/13 22:45:40 wiz Exp $
 
 BUILDLINK_TREE+=	gtksourceview2
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=	gtksourceview2
 GTKSOURCEVIEW2_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.gtksourceview2+=	gtksourceview2>=2.0.2
-BUILDLINK_ABI_DEPENDS.gtksourceview2?=	gtksourceview2>=2.6.2nb1
+BUILDLINK_ABI_DEPENDS.gtksourceview2?=	gtksourceview2>=2.8.2nb1
 BUILDLINK_PKGSRCDIR.gtksourceview2?=	../../x11/gtksourceview2
 
 .include "../../devel/gettext-lib/buildlink3.mk"
diff --git a/x11/gtkterm2/Makefile b/x11/gtkterm2/Makefile
index 73466801256..8efa7b2ff46 100644
--- a/x11/gtkterm2/Makefile
+++ b/x11/gtkterm2/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.16 2009/08/26 19:58:31 sno Exp $
+# $NetBSD: Makefile,v 1.17 2010/06/13 22:45:40 wiz Exp $
 
 DISTNAME=	gtkterm2-0.2.3
-PKGREVISION=	7
+PKGREVISION=	8
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=gtkterm/}
 
diff --git a/x11/hot-babe/Makefile b/x11/hot-babe/Makefile
index 6e16a0f25a0..1311b1ef9c1 100644
--- a/x11/hot-babe/Makefile
+++ b/x11/hot-babe/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.22 2010/01/18 09:59:35 wiz Exp $
+# $NetBSD: Makefile,v 1.23 2010/06/13 22:45:40 wiz Exp $
 
 DISTNAME=	hot-babe-0.2.2
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	x11
 MASTER_SITES=	http://dindinx.net/hotbabe/downloads/
 
diff --git a/x11/hsetroot/Makefile b/x11/hsetroot/Makefile
index a3ce3c88bf0..3846f0765f4 100644
--- a/x11/hsetroot/Makefile
+++ b/x11/hsetroot/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.12 2010/01/18 09:59:35 wiz Exp $
+# $NetBSD: Makefile,v 1.13 2010/06/13 22:45:40 wiz Exp $
 #
 
 DISTNAME=	hsetroot-1.0.2
-PKGREVISION=	5
+PKGREVISION=	6
 CATEGORIES=	x11
 MASTER_SITES=	http://thegraveyard.org/files/
 
diff --git a/x11/kde3-i18n-af/Makefile b/x11/kde3-i18n-af/Makefile
index 2254501c58d..8eec549f1c5 100644
--- a/x11/kde3-i18n-af/Makefile
+++ b/x11/kde3-i18n-af/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.34 2010/01/18 09:59:35 wiz Exp $
+# $NetBSD: Makefile,v 1.35 2010/06/13 22:45:40 wiz Exp $
 
 DISTNAME=	kde-i18n-af-${_KDE_VERSION}
-PKGREVISION=	3
+PKGREVISION=	4
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_KDE_I18N}
 
diff --git a/x11/kde3-i18n-ar/Makefile b/x11/kde3-i18n-ar/Makefile
index b3cde9d5d23..d3e98d37935 100644
--- a/x11/kde3-i18n-ar/Makefile
+++ b/x11/kde3-i18n-ar/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.36 2010/01/18 09:59:35 wiz Exp $
+# $NetBSD: Makefile,v 1.37 2010/06/13 22:45:40 wiz Exp $
 
 DISTNAME=	kde-i18n-ar-${_KDE_VERSION}
-PKGREVISION=	3
+PKGREVISION=	4
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_KDE_I18N}
 
diff --git a/x11/kde3-i18n-az/Makefile b/x11/kde3-i18n-az/Makefile
index 9ffeee1f24f..93de287e0fa 100644
--- a/x11/kde3-i18n-az/Makefile
+++ b/x11/kde3-i18n-az/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.23 2010/01/18 09:59:35 wiz Exp $
+# $NetBSD: Makefile,v 1.24 2010/06/13 22:45:40 wiz Exp $
 
 DISTNAME=	kde-i18n-az-${_KDE_VERSION}
-PKGREVISION=	3
+PKGREVISION=	4
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_KDE_I18N}
 
diff --git a/x11/kde3-i18n-bg/Makefile b/x11/kde3-i18n-bg/Makefile
index 7344afd5f70..6af0e2786dd 100644
--- a/x11/kde3-i18n-bg/Makefile
+++ b/x11/kde3-i18n-bg/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.37 2010/01/18 09:59:35 wiz Exp $
+# $NetBSD: Makefile,v 1.38 2010/06/13 22:45:40 wiz Exp $
 
 DISTNAME=	kde-i18n-bg-${_KDE_VERSION}
-PKGREVISION=	3
+PKGREVISION=	4
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_KDE_I18N}
 
diff --git a/x11/kde3-i18n-bn/Makefile b/x11/kde3-i18n-bn/Makefile
index c436c9636c4..10681b0cd0e 100644
--- a/x11/kde3-i18n-bn/Makefile
+++ b/x11/kde3-i18n-bn/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.25 2010/01/18 09:59:35 wiz Exp $
+# $NetBSD: Makefile,v 1.26 2010/06/13 22:45:40 wiz Exp $
 
 DISTNAME=	kde-i18n-bn-${_KDE_VERSION}
-PKGREVISION=	3
+PKGREVISION=	4
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_KDE_I18N}
 
diff --git a/x11/kde3-i18n-br/Makefile b/x11/kde3-i18n-br/Makefile
index cfa3e5af0ca..b57caa576b5 100644
--- a/x11/kde3-i18n-br/Makefile
+++ b/x11/kde3-i18n-br/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.21 2010/01/18 09:59:35 wiz Exp $
+# $NetBSD: Makefile,v 1.22 2010/06/13 22:45:41 wiz Exp $
 
 DISTNAME=	kde-i18n-br-${_KDE_VERSION}
-PKGREVISION=	3
+PKGREVISION=	4
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_KDE_I18N}
 
diff --git a/x11/kde3-i18n-bs/Makefile b/x11/kde3-i18n-bs/Makefile
index 8a33731c1ef..576870404ea 100644
--- a/x11/kde3-i18n-bs/Makefile
+++ b/x11/kde3-i18n-bs/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.37 2010/01/18 09:59:35 wiz Exp $
+# $NetBSD: Makefile,v 1.38 2010/06/13 22:45:41 wiz Exp $
 
 DISTNAME=	kde-i18n-bs-${_KDE_VERSION}
-PKGREVISION=	3
+PKGREVISION=	4
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_KDE_I18N}
 
diff --git a/x11/kde3-i18n-ca/Makefile b/x11/kde3-i18n-ca/Makefile
index adce046227c..d43f59fe63d 100644
--- a/x11/kde3-i18n-ca/Makefile
+++ b/x11/kde3-i18n-ca/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.38 2010/01/18 09:59:35 wiz Exp $
+# $NetBSD: Makefile,v 1.39 2010/06/13 22:45:41 wiz Exp $
 
 DISTNAME=	kde-i18n-ca-${_KDE_VERSION}
-PKGREVISION=	3
+PKGREVISION=	4
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_KDE_I18N}
 
diff --git a/x11/kde3-i18n-cs/Makefile b/x11/kde3-i18n-cs/Makefile
index 15da406a2b1..e2289f361c7 100644
--- a/x11/kde3-i18n-cs/Makefile
+++ b/x11/kde3-i18n-cs/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.37 2010/01/18 09:59:35 wiz Exp $
+# $NetBSD: Makefile,v 1.38 2010/06/13 22:45:41 wiz Exp $
 
 DISTNAME=	kde-i18n-cs-${_KDE_VERSION}
-PKGREVISION=	3
+PKGREVISION=	4
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_KDE_I18N}
 
diff --git a/x11/kde3-i18n-cy/Makefile b/x11/kde3-i18n-cy/Makefile
index 7903b0640ac..c1af1a11438 100644
--- a/x11/kde3-i18n-cy/Makefile
+++ b/x11/kde3-i18n-cy/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.25 2010/01/18 09:59:35 wiz Exp $
+# $NetBSD: Makefile,v 1.26 2010/06/13 22:45:41 wiz Exp $
 
 DISTNAME=	kde-i18n-cy-${_KDE_VERSION}
-PKGREVISION=	3
+PKGREVISION=	4
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_KDE_I18N}
 
diff --git a/x11/kde3-i18n-da/Makefile b/x11/kde3-i18n-da/Makefile
index f0e9950aa86..1a7302b7d4d 100644
--- a/x11/kde3-i18n-da/Makefile
+++ b/x11/kde3-i18n-da/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.37 2010/01/18 09:59:36 wiz Exp $
+# $NetBSD: Makefile,v 1.38 2010/06/13 22:45:41 wiz Exp $
 
 DISTNAME=	kde-i18n-da-${_KDE_VERSION}
-PKGREVISION=	3
+PKGREVISION=	4
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_KDE_I18N}
 
diff --git a/x11/kde3-i18n-de/Makefile b/x11/kde3-i18n-de/Makefile
index 00e3a68af8e..2944fbd424d 100644
--- a/x11/kde3-i18n-de/Makefile
+++ b/x11/kde3-i18n-de/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.37 2010/01/18 09:59:36 wiz Exp $
+# $NetBSD: Makefile,v 1.38 2010/06/13 22:45:41 wiz Exp $
 
 DISTNAME=	kde-i18n-de-${_KDE_VERSION}
-PKGREVISION=	3
+PKGREVISION=	4
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_KDE_I18N}
 
diff --git a/x11/kde3-i18n-el/Makefile b/x11/kde3-i18n-el/Makefile
index 9e28801f5b4..b5dadfc20b8 100644
--- a/x11/kde3-i18n-el/Makefile
+++ b/x11/kde3-i18n-el/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.38 2010/01/18 09:59:36 wiz Exp $
+# $NetBSD: Makefile,v 1.39 2010/06/13 22:45:41 wiz Exp $
 
 DISTNAME=	kde-i18n-el-${_KDE_VERSION}
-PKGREVISION=	3
+PKGREVISION=	4
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_KDE_I18N}
 
diff --git a/x11/kde3-i18n-en_GB/Makefile b/x11/kde3-i18n-en_GB/Makefile
index 789c7149d95..4a100951c52 100644
--- a/x11/kde3-i18n-en_GB/Makefile
+++ b/x11/kde3-i18n-en_GB/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.37 2010/01/18 09:59:36 wiz Exp $
+# $NetBSD: Makefile,v 1.38 2010/06/13 22:45:41 wiz Exp $
 
 DISTNAME=	kde-i18n-en_GB-${_KDE_VERSION}
-PKGREVISION=	3
+PKGREVISION=	4
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_KDE_I18N}
 
diff --git a/x11/kde3-i18n-eo/Makefile b/x11/kde3-i18n-eo/Makefile
index 889957a81bb..60a7f2a8508 100644
--- a/x11/kde3-i18n-eo/Makefile
+++ b/x11/kde3-i18n-eo/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.36 2010/01/18 09:59:36 wiz Exp $
+# $NetBSD: Makefile,v 1.37 2010/06/13 22:45:41 wiz Exp $
 
 DISTNAME=	kde-i18n-eo-${_KDE_VERSION}
-PKGREVISION=	3
+PKGREVISION=	4
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_KDE_I18N}
 
diff --git a/x11/kde3-i18n-es/Makefile b/x11/kde3-i18n-es/Makefile
index 09f7cd55de2..736879359a1 100644
--- a/x11/kde3-i18n-es/Makefile
+++ b/x11/kde3-i18n-es/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.37 2010/01/18 09:59:36 wiz Exp $
+# $NetBSD: Makefile,v 1.38 2010/06/13 22:45:41 wiz Exp $
 
 DISTNAME=	kde-i18n-es-${_KDE_VERSION}
-PKGREVISION=	3
+PKGREVISION=	4
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_KDE_I18N}
 
diff --git a/x11/kde3-i18n-et/Makefile b/x11/kde3-i18n-et/Makefile
index 39dc775fe70..f0e6314cd52 100644
--- a/x11/kde3-i18n-et/Makefile
+++ b/x11/kde3-i18n-et/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.37 2010/01/18 09:59:36 wiz Exp $
+# $NetBSD: Makefile,v 1.38 2010/06/13 22:45:42 wiz Exp $
 
 DISTNAME=	kde-i18n-et-${_KDE_VERSION}
-PKGREVISION=	3
+PKGREVISION=	4
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_KDE_I18N}
 
diff --git a/x11/kde3-i18n-eu/Makefile b/x11/kde3-i18n-eu/Makefile
index fb19f240b53..051f9e66fa3 100644
--- a/x11/kde3-i18n-eu/Makefile
+++ b/x11/kde3-i18n-eu/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.37 2010/01/18 09:59:36 wiz Exp $
+# $NetBSD: Makefile,v 1.38 2010/06/13 22:45:42 wiz Exp $
 
 DISTNAME=	kde-i18n-eu-${_KDE_VERSION}
-PKGREVISION=	3
+PKGREVISION=	4
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_KDE_I18N}
 
diff --git a/x11/kde3-i18n-fa/Makefile b/x11/kde3-i18n-fa/Makefile
index 09838e4b1d3..8dcf80fe88e 100644
--- a/x11/kde3-i18n-fa/Makefile
+++ b/x11/kde3-i18n-fa/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.37 2010/01/18 09:59:36 wiz Exp $
+# $NetBSD: Makefile,v 1.38 2010/06/13 22:45:42 wiz Exp $
 
 DISTNAME=	kde-i18n-fa-${_KDE_VERSION}
-PKGREVISION=	3
+PKGREVISION=	4
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_KDE_I18N}
 
diff --git a/x11/kde3-i18n-fi/Makefile b/x11/kde3-i18n-fi/Makefile
index b80905f2189..9770a506842 100644
--- a/x11/kde3-i18n-fi/Makefile
+++ b/x11/kde3-i18n-fi/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.37 2010/01/18 09:59:36 wiz Exp $
+# $NetBSD: Makefile,v 1.38 2010/06/13 22:45:42 wiz Exp $
 
 DISTNAME=	kde-i18n-fi-${_KDE_VERSION}
-PKGREVISION=	3
+PKGREVISION=	4
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_KDE_I18N}
 
diff --git a/x11/kde3-i18n-fr/Makefile b/x11/kde3-i18n-fr/Makefile
index 5002cbe645e..819b84f67ab 100644
--- a/x11/kde3-i18n-fr/Makefile
+++ b/x11/kde3-i18n-fr/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.37 2010/01/18 09:59:37 wiz Exp $
+# $NetBSD: Makefile,v 1.38 2010/06/13 22:45:42 wiz Exp $
 
 DISTNAME=	kde-i18n-fr-${_KDE_VERSION}
-PKGREVISION=	3
+PKGREVISION=	4
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_KDE_I18N}
 
diff --git a/x11/kde3-i18n-fy/Makefile b/x11/kde3-i18n-fy/Makefile
index c54aa258263..45ed9632f75 100644
--- a/x11/kde3-i18n-fy/Makefile
+++ b/x11/kde3-i18n-fy/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.21 2010/01/18 09:59:37 wiz Exp $
+# $NetBSD: Makefile,v 1.22 2010/06/13 22:45:42 wiz Exp $
 
 DISTNAME=	kde-i18n-fy-${_KDE_VERSION}
-PKGREVISION=	3
+PKGREVISION=	4
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_KDE_I18N}
 
diff --git a/x11/kde3-i18n-ga/Makefile b/x11/kde3-i18n-ga/Makefile
index 2ca2d219fd5..83392483013 100644
--- a/x11/kde3-i18n-ga/Makefile
+++ b/x11/kde3-i18n-ga/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.21 2010/01/18 09:59:37 wiz Exp $
+# $NetBSD: Makefile,v 1.22 2010/06/13 22:45:42 wiz Exp $
 
 DISTNAME=	kde-i18n-ga-${_KDE_VERSION}
-PKGREVISION=	3
+PKGREVISION=	4
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_KDE_I18N}
 
diff --git a/x11/kde3-i18n-gl/Makefile b/x11/kde3-i18n-gl/Makefile
index e40acad54a5..c8c5902e5a2 100644
--- a/x11/kde3-i18n-gl/Makefile
+++ b/x11/kde3-i18n-gl/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.25 2010/01/18 09:59:37 wiz Exp $
+# $NetBSD: Makefile,v 1.26 2010/06/13 22:45:42 wiz Exp $
 
 DISTNAME=	kde-i18n-gl-${_KDE_VERSION}
-PKGREVISION=	3
+PKGREVISION=	4
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_KDE_I18N}
 
diff --git a/x11/kde3-i18n-he/Makefile b/x11/kde3-i18n-he/Makefile
index 31c89c963fd..e1fce843683 100644
--- a/x11/kde3-i18n-he/Makefile
+++ b/x11/kde3-i18n-he/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.37 2010/01/18 09:59:37 wiz Exp $
+# $NetBSD: Makefile,v 1.38 2010/06/13 22:45:42 wiz Exp $
 
 DISTNAME=	kde-i18n-he-${_KDE_VERSION}
-PKGREVISION=	3
+PKGREVISION=	4
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_KDE_I18N}
 
diff --git a/x11/kde3-i18n-hi/Makefile b/x11/kde3-i18n-hi/Makefile
index 4ac09d61807..bd0087092c5 100644
--- a/x11/kde3-i18n-hi/Makefile
+++ b/x11/kde3-i18n-hi/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.25 2010/01/18 09:59:37 wiz Exp $
+# $NetBSD: Makefile,v 1.26 2010/06/13 22:45:42 wiz Exp $
 
 DISTNAME=	kde-i18n-hi-${_KDE_VERSION}
-PKGREVISION=	3
+PKGREVISION=	4
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_KDE_I18N}
 
diff --git a/x11/kde3-i18n-hr/Makefile b/x11/kde3-i18n-hr/Makefile
index c4c809c33a6..c4d1f5e8cd8 100644
--- a/x11/kde3-i18n-hr/Makefile
+++ b/x11/kde3-i18n-hr/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.29 2010/01/18 09:59:37 wiz Exp $
+# $NetBSD: Makefile,v 1.30 2010/06/13 22:45:42 wiz Exp $
 
 DISTNAME=	kde-i18n-hr-${_KDE_VERSION}
-PKGREVISION=	3
+PKGREVISION=	4
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_KDE_I18N}
 
diff --git a/x11/kde3-i18n-hu/Makefile b/x11/kde3-i18n-hu/Makefile
index 75142238b22..0d62e186dfe 100644
--- a/x11/kde3-i18n-hu/Makefile
+++ b/x11/kde3-i18n-hu/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.37 2010/01/18 09:59:37 wiz Exp $
+# $NetBSD: Makefile,v 1.38 2010/06/13 22:45:43 wiz Exp $
 
 DISTNAME=	kde-i18n-hu-${_KDE_VERSION}
-PKGREVISION=	3
+PKGREVISION=	4
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_KDE_I18N}
 
diff --git a/x11/kde3-i18n-is/Makefile b/x11/kde3-i18n-is/Makefile
index 229538a989b..b03dbd8c65e 100644
--- a/x11/kde3-i18n-is/Makefile
+++ b/x11/kde3-i18n-is/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.32 2010/01/18 09:59:37 wiz Exp $
+# $NetBSD: Makefile,v 1.33 2010/06/13 22:45:43 wiz Exp $
 
 DISTNAME=	kde-i18n-is-${_KDE_VERSION}
-PKGREVISION=	3
+PKGREVISION=	4
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_KDE_I18N}
 
diff --git a/x11/kde3-i18n-it/Makefile b/x11/kde3-i18n-it/Makefile
index 35e5e153efd..822e19dc3c5 100644
--- a/x11/kde3-i18n-it/Makefile
+++ b/x11/kde3-i18n-it/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.37 2010/01/18 09:59:37 wiz Exp $
+# $NetBSD: Makefile,v 1.38 2010/06/13 22:45:43 wiz Exp $
 
 DISTNAME=	kde-i18n-it-${_KDE_VERSION}
-PKGREVISION=	3
+PKGREVISION=	4
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_KDE_I18N}
 
diff --git a/x11/kde3-i18n-ja/Makefile b/x11/kde3-i18n-ja/Makefile
index a07bf1a72a7..2b93913c858 100644
--- a/x11/kde3-i18n-ja/Makefile
+++ b/x11/kde3-i18n-ja/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.38 2010/01/18 09:59:37 wiz Exp $
+# $NetBSD: Makefile,v 1.39 2010/06/13 22:45:43 wiz Exp $
 
 DISTNAME=	kde-i18n-ja-${_KDE_VERSION}
-PKGREVISION=	3
+PKGREVISION=	4
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_KDE_I18N}
 
diff --git a/x11/kde3-i18n-kk/Makefile b/x11/kde3-i18n-kk/Makefile
index daee90e7da2..8be3c34d024 100644
--- a/x11/kde3-i18n-kk/Makefile
+++ b/x11/kde3-i18n-kk/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.11 2010/01/18 09:59:37 wiz Exp $
+# $NetBSD: Makefile,v 1.12 2010/06/13 22:45:43 wiz Exp $
 
 DISTNAME=	kde-i18n-kk-${_KDE_VERSION}
-PKGREVISION=	3
+PKGREVISION=	4
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_KDE_I18N}
 
diff --git a/x11/kde3-i18n-km/Makefile b/x11/kde3-i18n-km/Makefile
index 13327e3e28c..cb3d2736e45 100644
--- a/x11/kde3-i18n-km/Makefile
+++ b/x11/kde3-i18n-km/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.19 2010/01/18 09:59:37 wiz Exp $
+# $NetBSD: Makefile,v 1.20 2010/06/13 22:45:43 wiz Exp $
 
 DISTNAME=	kde-i18n-km-${_KDE_VERSION}
-PKGREVISION=	3
+PKGREVISION=	4
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_KDE_I18N}
 
diff --git a/x11/kde3-i18n-ko/Makefile b/x11/kde3-i18n-ko/Makefile
index 707512a334b..b5bfb13d542 100644
--- a/x11/kde3-i18n-ko/Makefile
+++ b/x11/kde3-i18n-ko/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.19 2010/01/18 09:59:38 wiz Exp $
+# $NetBSD: Makefile,v 1.20 2010/06/13 22:45:43 wiz Exp $
 
 DISTNAME=	kde-i18n-ko-${_KDE_VERSION}
-PKGREVISION=	3
+PKGREVISION=	4
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_KDE_I18N}
 
diff --git a/x11/kde3-i18n-lt/Makefile b/x11/kde3-i18n-lt/Makefile
index 504a80e3bf1..a608446e959 100644
--- a/x11/kde3-i18n-lt/Makefile
+++ b/x11/kde3-i18n-lt/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.38 2010/01/18 09:59:38 wiz Exp $
+# $NetBSD: Makefile,v 1.39 2010/06/13 22:45:43 wiz Exp $
 
 DISTNAME=	kde-i18n-lt-${_KDE_VERSION}
-PKGREVISION=	3
+PKGREVISION=	4
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_KDE_I18N}
 
diff --git a/x11/kde3-i18n-lv/Makefile b/x11/kde3-i18n-lv/Makefile
index ae7a3980fd2..7f9c5f95e7b 100644
--- a/x11/kde3-i18n-lv/Makefile
+++ b/x11/kde3-i18n-lv/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.19 2010/01/18 09:59:38 wiz Exp $
+# $NetBSD: Makefile,v 1.20 2010/06/13 22:45:43 wiz Exp $
 
 DISTNAME=	kde-i18n-lv-${_KDE_VERSION}
-PKGREVISION=	3
+PKGREVISION=	4
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_KDE_I18N}
 
diff --git a/x11/kde3-i18n-mk/Makefile b/x11/kde3-i18n-mk/Makefile
index 2c1bd9f44e4..e8f8390abf6 100644
--- a/x11/kde3-i18n-mk/Makefile
+++ b/x11/kde3-i18n-mk/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.27 2010/01/18 09:59:38 wiz Exp $
+# $NetBSD: Makefile,v 1.28 2010/06/13 22:45:43 wiz Exp $
 
 DISTNAME=	kde-i18n-mk-${_KDE_VERSION}
-PKGREVISION=	3
+PKGREVISION=	4
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_KDE_I18N}
 
diff --git a/x11/kde3-i18n-mn/Makefile b/x11/kde3-i18n-mn/Makefile
index a3ab14dc95d..2b26889ddb3 100644
--- a/x11/kde3-i18n-mn/Makefile
+++ b/x11/kde3-i18n-mn/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.25 2010/01/18 09:59:38 wiz Exp $
+# $NetBSD: Makefile,v 1.26 2010/06/13 22:45:43 wiz Exp $
 
 DISTNAME=	kde-i18n-mn-${_KDE_VERSION}
-PKGREVISION=	3
+PKGREVISION=	4
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_KDE_I18N}
 
diff --git a/x11/kde3-i18n-ms/Makefile b/x11/kde3-i18n-ms/Makefile
index b3df14edec1..12c4ccd4b03 100644
--- a/x11/kde3-i18n-ms/Makefile
+++ b/x11/kde3-i18n-ms/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.25 2010/01/18 09:59:38 wiz Exp $
+# $NetBSD: Makefile,v 1.26 2010/06/13 22:45:44 wiz Exp $
 
 DISTNAME=	kde-i18n-ms-${_KDE_VERSION}
-PKGREVISION=	3
+PKGREVISION=	4
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_KDE_I18N}
 
diff --git a/x11/kde3-i18n-nb/Makefile b/x11/kde3-i18n-nb/Makefile
index 62a6758ae02..7879f28d737 100644
--- a/x11/kde3-i18n-nb/Makefile
+++ b/x11/kde3-i18n-nb/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.37 2010/01/18 09:59:38 wiz Exp $
+# $NetBSD: Makefile,v 1.38 2010/06/13 22:45:44 wiz Exp $
 
 DISTNAME=	kde-i18n-nb-${_KDE_VERSION}
-PKGREVISION=	3
+PKGREVISION=	4
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_KDE_I18N}
 
diff --git a/x11/kde3-i18n-nds/Makefile b/x11/kde3-i18n-nds/Makefile
index 7a7be6ccc94..bfd1f46c8cb 100644
--- a/x11/kde3-i18n-nds/Makefile
+++ b/x11/kde3-i18n-nds/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.25 2010/01/18 09:59:38 wiz Exp $
+# $NetBSD: Makefile,v 1.26 2010/06/13 22:45:44 wiz Exp $
 
 DISTNAME=	kde-i18n-nds-${_KDE_VERSION}
-PKGREVISION=	3
+PKGREVISION=	4
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_KDE_I18N}
 
diff --git a/x11/kde3-i18n-nl/Makefile b/x11/kde3-i18n-nl/Makefile
index c91b048e099..91499af8720 100644
--- a/x11/kde3-i18n-nl/Makefile
+++ b/x11/kde3-i18n-nl/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.37 2010/01/18 09:59:38 wiz Exp $
+# $NetBSD: Makefile,v 1.38 2010/06/13 22:45:44 wiz Exp $
 
 DISTNAME=	kde-i18n-nl-${_KDE_VERSION}
-PKGREVISION=	3
+PKGREVISION=	4
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_KDE_I18N}
 
diff --git a/x11/kde3-i18n-nn/Makefile b/x11/kde3-i18n-nn/Makefile
index e43e66cd2c4..c911a5c25d5 100644
--- a/x11/kde3-i18n-nn/Makefile
+++ b/x11/kde3-i18n-nn/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.37 2010/01/18 09:59:38 wiz Exp $
+# $NetBSD: Makefile,v 1.38 2010/06/13 22:45:44 wiz Exp $
 
 DISTNAME=	kde-i18n-nn-${_KDE_VERSION}
-PKGREVISION=	3
+PKGREVISION=	4
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_KDE_I18N}
 
diff --git a/x11/kde3-i18n-pa/Makefile b/x11/kde3-i18n-pa/Makefile
index 2ea2e9bda4a..bd2cd318180 100644
--- a/x11/kde3-i18n-pa/Makefile
+++ b/x11/kde3-i18n-pa/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.23 2010/01/18 09:59:38 wiz Exp $
+# $NetBSD: Makefile,v 1.24 2010/06/13 22:45:44 wiz Exp $
 
 DISTNAME=	kde-i18n-pa-${_KDE_VERSION}
-PKGREVISION=	3
+PKGREVISION=	4
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_KDE_I18N}
 
diff --git a/x11/kde3-i18n-pl/Makefile b/x11/kde3-i18n-pl/Makefile
index 6ed49a2ac19..88b61817abc 100644
--- a/x11/kde3-i18n-pl/Makefile
+++ b/x11/kde3-i18n-pl/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.37 2010/01/18 09:59:38 wiz Exp $
+# $NetBSD: Makefile,v 1.38 2010/06/13 22:45:44 wiz Exp $
 
 DISTNAME=	kde-i18n-pl-${_KDE_VERSION}
-PKGREVISION=	3
+PKGREVISION=	4
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_KDE_I18N}
 
diff --git a/x11/kde3-i18n-pt/Makefile b/x11/kde3-i18n-pt/Makefile
index 98e0ac04965..7dd3539b1e6 100644
--- a/x11/kde3-i18n-pt/Makefile
+++ b/x11/kde3-i18n-pt/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.37 2010/01/18 09:59:38 wiz Exp $
+# $NetBSD: Makefile,v 1.38 2010/06/13 22:45:44 wiz Exp $
 
 DISTNAME=	kde-i18n-pt-${_KDE_VERSION}
-PKGREVISION=	3
+PKGREVISION=	4
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_KDE_I18N}
 
diff --git a/x11/kde3-i18n-pt_BR/Makefile b/x11/kde3-i18n-pt_BR/Makefile
index 975017e442b..dffd31c0311 100644
--- a/x11/kde3-i18n-pt_BR/Makefile
+++ b/x11/kde3-i18n-pt_BR/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.37 2010/01/18 09:59:39 wiz Exp $
+# $NetBSD: Makefile,v 1.38 2010/06/13 22:45:44 wiz Exp $
 
 DISTNAME=	kde-i18n-pt_BR-${_KDE_VERSION}
-PKGREVISION=	3
+PKGREVISION=	4
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_KDE_I18N}
 
diff --git a/x11/kde3-i18n-ro/Makefile b/x11/kde3-i18n-ro/Makefile
index d8264100307..8b817c2c131 100644
--- a/x11/kde3-i18n-ro/Makefile
+++ b/x11/kde3-i18n-ro/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.38 2010/01/18 09:59:39 wiz Exp $
+# $NetBSD: Makefile,v 1.39 2010/06/13 22:45:44 wiz Exp $
 
 DISTNAME=	kde-i18n-ro-${_KDE_VERSION}
-PKGREVISION=	3
+PKGREVISION=	4
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_KDE_I18N}
 
diff --git a/x11/kde3-i18n-ru/Makefile b/x11/kde3-i18n-ru/Makefile
index e6bea423351..fa9a8ecd1a9 100644
--- a/x11/kde3-i18n-ru/Makefile
+++ b/x11/kde3-i18n-ru/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.37 2010/01/18 09:59:39 wiz Exp $
+# $NetBSD: Makefile,v 1.38 2010/06/13 22:45:44 wiz Exp $
 
 DISTNAME=	kde-i18n-ru-${_KDE_VERSION}
-PKGREVISION=	3
+PKGREVISION=	4
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_KDE_I18N}
 
diff --git a/x11/kde3-i18n-rw/Makefile b/x11/kde3-i18n-rw/Makefile
index 49a638df8e8..1ba599be343 100644
--- a/x11/kde3-i18n-rw/Makefile
+++ b/x11/kde3-i18n-rw/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.19 2010/01/18 09:59:39 wiz Exp $
+# $NetBSD: Makefile,v 1.20 2010/06/13 22:45:44 wiz Exp $
 
 DISTNAME=	kde-i18n-rw-${_KDE_VERSION}
-PKGREVISION=	3
+PKGREVISION=	4
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_KDE_I18N}
 
diff --git a/x11/kde3-i18n-se/Makefile b/x11/kde3-i18n-se/Makefile
index c28207b6bd6..65d1cd5f31a 100644
--- a/x11/kde3-i18n-se/Makefile
+++ b/x11/kde3-i18n-se/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.30 2010/01/18 09:59:39 wiz Exp $
+# $NetBSD: Makefile,v 1.31 2010/06/13 22:45:45 wiz Exp $
 
 DISTNAME=	kde-i18n-se-${_KDE_VERSION}
-PKGREVISION=	3
+PKGREVISION=	4
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_KDE_I18N}
 
diff --git a/x11/kde3-i18n-sk/Makefile b/x11/kde3-i18n-sk/Makefile
index 9fafb898929..a899e790e32 100644
--- a/x11/kde3-i18n-sk/Makefile
+++ b/x11/kde3-i18n-sk/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.37 2010/01/18 09:59:39 wiz Exp $
+# $NetBSD: Makefile,v 1.38 2010/06/13 22:45:45 wiz Exp $
 
 DISTNAME=	kde-i18n-sk-${_KDE_VERSION}
-PKGREVISION=	3
+PKGREVISION=	4
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_KDE_I18N}
 
diff --git a/x11/kde3-i18n-sl/Makefile b/x11/kde3-i18n-sl/Makefile
index d793c014a7b..b393a53f51b 100644
--- a/x11/kde3-i18n-sl/Makefile
+++ b/x11/kde3-i18n-sl/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.37 2010/01/18 09:59:39 wiz Exp $
+# $NetBSD: Makefile,v 1.38 2010/06/13 22:45:45 wiz Exp $
 
 DISTNAME=	kde-i18n-sl-${_KDE_VERSION}
-PKGREVISION=	3
+PKGREVISION=	4
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_KDE_I18N}
 
diff --git a/x11/kde3-i18n-sr/Makefile b/x11/kde3-i18n-sr/Makefile
index 5b7c93c0a42..1f46db18ffe 100644
--- a/x11/kde3-i18n-sr/Makefile
+++ b/x11/kde3-i18n-sr/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.37 2010/01/18 09:59:39 wiz Exp $
+# $NetBSD: Makefile,v 1.38 2010/06/13 22:45:45 wiz Exp $
 
 DISTNAME=	kde-i18n-sr-${_KDE_VERSION}
-PKGREVISION=	3
+PKGREVISION=	4
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_KDE_I18N}
 
diff --git a/x11/kde3-i18n-sr_Latn/Makefile b/x11/kde3-i18n-sr_Latn/Makefile
index c778a4bf9d7..b291c6b0838 100644
--- a/x11/kde3-i18n-sr_Latn/Makefile
+++ b/x11/kde3-i18n-sr_Latn/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.26 2010/01/18 09:59:39 wiz Exp $
+# $NetBSD: Makefile,v 1.27 2010/06/13 22:45:45 wiz Exp $
 
 DISTNAME=	kde-i18n-sr@Latn-${_KDE_VERSION}
 PKGNAME=	${DISTNAME:S/@/_/}
-PKGREVISION=	3
+PKGREVISION=	4
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_KDE_I18N}
 
diff --git a/x11/kde3-i18n-ss/Makefile b/x11/kde3-i18n-ss/Makefile
index b8345168003..68d80a729d6 100644
--- a/x11/kde3-i18n-ss/Makefile
+++ b/x11/kde3-i18n-ss/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.25 2010/01/18 09:59:39 wiz Exp $
+# $NetBSD: Makefile,v 1.26 2010/06/13 22:45:45 wiz Exp $
 
 DISTNAME=	kde-i18n-ss-${_KDE_VERSION}
-PKGREVISION=	3
+PKGREVISION=	4
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_KDE_I18N}
 
diff --git a/x11/kde3-i18n-sv/Makefile b/x11/kde3-i18n-sv/Makefile
index f3741f010bb..164d94457c9 100644
--- a/x11/kde3-i18n-sv/Makefile
+++ b/x11/kde3-i18n-sv/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.37 2010/01/18 09:59:39 wiz Exp $
+# $NetBSD: Makefile,v 1.38 2010/06/13 22:45:45 wiz Exp $
 
 DISTNAME=	kde-i18n-sv-${_KDE_VERSION}
-PKGREVISION=	3
+PKGREVISION=	4
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_KDE_I18N}
 
diff --git a/x11/kde3-i18n-ta/Makefile b/x11/kde3-i18n-ta/Makefile
index ad609784bdb..993918d60ed 100644
--- a/x11/kde3-i18n-ta/Makefile
+++ b/x11/kde3-i18n-ta/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.37 2010/01/18 09:59:39 wiz Exp $
+# $NetBSD: Makefile,v 1.38 2010/06/13 22:45:45 wiz Exp $
 
 DISTNAME=	kde-i18n-ta-${_KDE_VERSION}
-PKGREVISION=	3
+PKGREVISION=	4
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_KDE_I18N}
 
diff --git a/x11/kde3-i18n-tg/Makefile b/x11/kde3-i18n-tg/Makefile
index 94f6d476f9e..e5cc6ababfb 100644
--- a/x11/kde3-i18n-tg/Makefile
+++ b/x11/kde3-i18n-tg/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.25 2010/01/18 09:59:39 wiz Exp $
+# $NetBSD: Makefile,v 1.26 2010/06/13 22:45:45 wiz Exp $
 
 DISTNAME=	kde-i18n-tg-${_KDE_VERSION}
-PKGREVISION=	3
+PKGREVISION=	4
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_KDE_I18N}
 
diff --git a/x11/kde3-i18n-tr/Makefile b/x11/kde3-i18n-tr/Makefile
index 7c371e33f36..69762237318 100644
--- a/x11/kde3-i18n-tr/Makefile
+++ b/x11/kde3-i18n-tr/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.37 2010/01/18 09:59:40 wiz Exp $
+# $NetBSD: Makefile,v 1.38 2010/06/13 22:45:45 wiz Exp $
 
 DISTNAME=	kde-i18n-tr-${_KDE_VERSION}
-PKGREVISION=	3
+PKGREVISION=	4
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_KDE_I18N}
 
diff --git a/x11/kde3-i18n-uk/Makefile b/x11/kde3-i18n-uk/Makefile
index 7b9c1b1f8a4..21577e8092e 100644
--- a/x11/kde3-i18n-uk/Makefile
+++ b/x11/kde3-i18n-uk/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.37 2010/01/18 09:59:40 wiz Exp $
+# $NetBSD: Makefile,v 1.38 2010/06/13 22:45:45 wiz Exp $
 
 DISTNAME=	kde-i18n-uk-${_KDE_VERSION}
-PKGREVISION=	3
+PKGREVISION=	4
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_KDE_I18N}
 
diff --git a/x11/kde3-i18n-uz/Makefile b/x11/kde3-i18n-uz/Makefile
index 7f141183c27..d561ed74d4c 100644
--- a/x11/kde3-i18n-uz/Makefile
+++ b/x11/kde3-i18n-uz/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.27 2010/01/18 09:59:40 wiz Exp $
+# $NetBSD: Makefile,v 1.28 2010/06/13 22:45:46 wiz Exp $
 
 DISTNAME=	kde-i18n-uz-${_KDE_VERSION}
-PKGREVISION=	3
+PKGREVISION=	4
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_KDE_I18N}
 
diff --git a/x11/kde3-i18n-vi/Makefile b/x11/kde3-i18n-vi/Makefile
index 7d9efadef6a..d098cf31d27 100644
--- a/x11/kde3-i18n-vi/Makefile
+++ b/x11/kde3-i18n-vi/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.24 2010/01/18 09:59:40 wiz Exp $
+# $NetBSD: Makefile,v 1.25 2010/06/13 22:45:46 wiz Exp $
 
 DISTNAME=	kde-i18n-vi-${_KDE_VERSION}
-PKGREVISION=	3
+PKGREVISION=	4
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_KDE_I18N}
 
diff --git a/x11/kde3-i18n-zh_CN/Makefile b/x11/kde3-i18n-zh_CN/Makefile
index ef9b44a5b5d..84643c8146b 100644
--- a/x11/kde3-i18n-zh_CN/Makefile
+++ b/x11/kde3-i18n-zh_CN/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.37 2010/01/18 09:59:40 wiz Exp $
+# $NetBSD: Makefile,v 1.38 2010/06/13 22:45:46 wiz Exp $
 
 DISTNAME=	kde-i18n-zh_CN-${_KDE_VERSION}
-PKGREVISION=	3
+PKGREVISION=	4
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_KDE_I18N}
 
diff --git a/x11/kde3-i18n-zh_TW/Makefile b/x11/kde3-i18n-zh_TW/Makefile
index 52d9dbceabf..6fb238760d6 100644
--- a/x11/kde3-i18n-zh_TW/Makefile
+++ b/x11/kde3-i18n-zh_TW/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.37 2010/01/18 09:59:40 wiz Exp $
+# $NetBSD: Makefile,v 1.38 2010/06/13 22:45:46 wiz Exp $
 
 DISTNAME=	kde-i18n-zh_TW-${_KDE_VERSION}
-PKGREVISION=	3
+PKGREVISION=	4
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_KDE_I18N}
 
diff --git a/x11/kdebase-runtime4/Makefile b/x11/kdebase-runtime4/Makefile
index 6fa91a92472..1a253aac9f2 100644
--- a/x11/kdebase-runtime4/Makefile
+++ b/x11/kdebase-runtime4/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.8 2010/05/08 22:13:58 markd Exp $
+# $NetBSD: Makefile,v 1.9 2010/06/13 22:45:46 wiz Exp $
 
 DISTNAME=	kdebase-runtime-${_KDE_VERSION}
+PKGREVISION=	1
 CATEGORIES=	x11
 COMMENT=	Runtime requirements for the KDE integrated X11 desktop
 
diff --git a/x11/kdebase-runtime4/buildlink3.mk b/x11/kdebase-runtime4/buildlink3.mk
index edcddc97307..7a0ea07cd10 100644
--- a/x11/kdebase-runtime4/buildlink3.mk
+++ b/x11/kdebase-runtime4/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2010/01/18 09:59:40 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2010/06/13 22:45:46 wiz Exp $
 
 BUILDLINK_TREE+=	kdebase-runtime
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=	kdebase-runtime
 KDEBASE_RUNTIME_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.kdebase-runtime+=	kdebase-runtime4>=4.0.0
-BUILDLINK_ABI_DEPENDS.kdebase-runtime?=	kdebase-runtime4>=4.3.4nb2
+BUILDLINK_ABI_DEPENDS.kdebase-runtime?=	kdebase-runtime4>=4.4.4nb1
 BUILDLINK_PKGSRCDIR.kdebase-runtime?=	../../x11/kdebase-runtime4
 
 .include "../../x11/kdelibs4/buildlink3.mk"
diff --git a/x11/kdebase-workspace4/Makefile b/x11/kdebase-workspace4/Makefile
index 9158e2bf727..f66b5e17a48 100644
--- a/x11/kdebase-workspace4/Makefile
+++ b/x11/kdebase-workspace4/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.14 2010/05/08 22:13:58 markd Exp $
+# $NetBSD: Makefile,v 1.15 2010/06/13 22:45:46 wiz Exp $
 
 DISTNAME=	kdebase-workspace-${_KDE_VERSION}
+PKGREVISION=	1
 CATEGORIES=	x11
 COMMENT=	base workspace for the KDE 4 integrated X11 desktop
 
diff --git a/x11/kdebase-workspace4/buildlink3.mk b/x11/kdebase-workspace4/buildlink3.mk
index 3afcf6f8781..c8d82d09a0b 100644
--- a/x11/kdebase-workspace4/buildlink3.mk
+++ b/x11/kdebase-workspace4/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2010/01/18 09:59:40 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2010/06/13 22:45:46 wiz Exp $
 
 BUILDLINK_TREE+=	kdebase-workspace
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=	kdebase-workspace
 KDEBASE_WORKSPACE_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.kdebase-workspace+=	kdebase-workspace4>=4.0.0
-BUILDLINK_ABI_DEPENDS.kdebase-workspace?=	kdebase-workspace4>=4.3.4nb2
+BUILDLINK_ABI_DEPENDS.kdebase-workspace?=	kdebase-workspace4>=4.4.4nb1
 BUILDLINK_PKGSRCDIR.kdebase-workspace?=	../../x11/kdebase-workspace4
 
 .include "../../graphics/qimageblitz/buildlink3.mk"
diff --git a/x11/kdebase3/Makefile b/x11/kdebase3/Makefile
index 7242913cf09..0a45f8e2240 100644
--- a/x11/kdebase3/Makefile
+++ b/x11/kdebase3/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.156 2010/02/19 20:23:01 joerg Exp $
+# $NetBSD: Makefile,v 1.157 2010/06/13 22:45:46 wiz Exp $
 
 DISTNAME=	kdebase-${_KDE_VERSION}
-PKGREVISION=	9
+PKGREVISION=	10
 CATEGORIES=	x11
 COMMENT=	Base modules for the KDE 3 integrated X11 desktop
 
diff --git a/x11/kdebase3/buildlink3.mk b/x11/kdebase3/buildlink3.mk
index 36437c2cb3c..39432f75502 100644
--- a/x11/kdebase3/buildlink3.mk
+++ b/x11/kdebase3/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.33 2010/01/18 09:59:40 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.34 2010/06/13 22:45:46 wiz Exp $
 
 BUILDLINK_TREE+=	kdebase
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=	kdebase
 KDEBASE_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.kdebase+=	kdebase>=3.5.0nb2
-BUILDLINK_ABI_DEPENDS.kdebase+=	kdebase>=3.5.10nb8
+BUILDLINK_ABI_DEPENDS.kdebase+=	kdebase>=3.5.10nb10
 BUILDLINK_PKGSRCDIR.kdebase?=	../../x11/kdebase3
 
 pkgbase := kdebase
diff --git a/x11/kdebase4/Makefile b/x11/kdebase4/Makefile
index 62b277bd3a4..c22f5b55691 100644
--- a/x11/kdebase4/Makefile
+++ b/x11/kdebase4/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.7 2010/01/27 10:38:41 markd Exp $
+# $NetBSD: Makefile,v 1.8 2010/06/13 22:45:46 wiz Exp $
 
 DISTNAME=	kdebase-${_KDE_VERSION}
+PKGREVISION=	1
 CATEGORIES=	x11
 COMMENT=	Base modules for the KDE 4 integrated X11 desktop
 
diff --git a/x11/kdebindings-ruby/Makefile b/x11/kdebindings-ruby/Makefile
index 5eeb1df8509..d3494846825 100644
--- a/x11/kdebindings-ruby/Makefile
+++ b/x11/kdebindings-ruby/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.16 2010/01/18 09:59:40 wiz Exp $
+# $NetBSD: Makefile,v 1.17 2010/06/13 22:45:46 wiz Exp $
 
 DISTNAME=	kdebindings-${_KDE_VERSION}
 PKGNAME=	kdebindings-ruby-${_KDE_VERSION}
-PKGREVISION=	4
+PKGREVISION=	5
 CATEGORIES=	x11
 COMMENT=	Ruby bindings for the KDE integrated X11 desktop
 
diff --git a/x11/kdebindings-ruby/buildlink3.mk b/x11/kdebindings-ruby/buildlink3.mk
index 411bc726ed7..8e7aab664a1 100644
--- a/x11/kdebindings-ruby/buildlink3.mk
+++ b/x11/kdebindings-ruby/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.9 2010/01/18 09:59:40 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.10 2010/06/13 22:45:46 wiz Exp $
 
 BUILDLINK_TREE+=	kdebindings-ruby
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=	kdebindings-ruby
 KDEBINDINGS_RUBY_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.kdebindings-ruby+=	kdebindings-ruby>=3.5.5
-BUILDLINK_ABI_DEPENDS.kdebindings-ruby?=	kdebindings-ruby>=3.5.10nb4
+BUILDLINK_ABI_DEPENDS.kdebindings-ruby?=	kdebindings-ruby>=3.5.10nb5
 BUILDLINK_PKGSRCDIR.kdebindings-ruby?=	../../x11/kdebindings-ruby
 
 .include "../../lang/ruby/buildlink3.mk"
diff --git a/x11/kdebindings4-python/Makefile b/x11/kdebindings4-python/Makefile
index dfa4cd6f28f..dc902f5bffb 100644
--- a/x11/kdebindings4-python/Makefile
+++ b/x11/kdebindings4-python/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.12 2010/05/08 22:13:58 markd Exp $
+# $NetBSD: Makefile,v 1.13 2010/06/13 22:45:46 wiz Exp $
 
 PKGNAME=	kdebindings4-python-${_KDE_VERSION}
 DISTNAME=	kdebindings-${_KDE_VERSION}
+PKGREVISION=	1
 CATEGORIES=	misc
 COMMENT=	Python bindings for the KDE integrated X11 desktop
 
diff --git a/x11/kdelibdocs3/Makefile b/x11/kdelibdocs3/Makefile
index 33288d4dde4..a2bd2519547 100644
--- a/x11/kdelibdocs3/Makefile
+++ b/x11/kdelibdocs3/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.57 2010/01/18 09:59:41 wiz Exp $
+# $NetBSD: Makefile,v 1.58 2010/06/13 22:45:46 wiz Exp $
 
 DISTNAME=	kdelibs-${_KDE_VERSION}
 PKGNAME=	kdelibdocs-${_KDE_VERSION}
-PKGREVISION=	3
+PKGREVISION=	4
 CATEGORIES=	x11 devel
 
 COMMENT=	KDE library documentation
diff --git a/x11/kdelibs4/Makefile b/x11/kdelibs4/Makefile
index dc20236f2a7..422d76f7c27 100644
--- a/x11/kdelibs4/Makefile
+++ b/x11/kdelibs4/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.9 2010/05/08 22:13:58 markd Exp $
+# $NetBSD: Makefile,v 1.10 2010/06/13 22:45:47 wiz Exp $
 
 DISTNAME=	kdelibs-${_KDE_VERSION}
+PKGREVISION=	1
 CATEGORIES=	x11
 COMMENT=	Support libraries for the KDE integrated X11 desktop
 
diff --git a/x11/kdelibs4/buildlink3.mk b/x11/kdelibs4/buildlink3.mk
index 6d1b9b4dfb0..6d6405526ef 100644
--- a/x11/kdelibs4/buildlink3.mk
+++ b/x11/kdelibs4/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2010/01/18 09:59:41 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2010/06/13 22:45:47 wiz Exp $
 
 BUILDLINK_TREE+=	kdelibs
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=	kdelibs
 KDELIBS_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.kdelibs+=	kdelibs4>=4.0.0
-BUILDLINK_ABI_DEPENDS.kdelibs?=	kdelibs4>=4.3.4nb2
+BUILDLINK_ABI_DEPENDS.kdelibs?=	kdelibs4>=4.4.4nb1
 BUILDLINK_PKGSRCDIR.kdelibs?=	../../x11/kdelibs4
 
 .include "../../archivers/bzip2/buildlink3.mk"
diff --git a/x11/kkbswitch/Makefile b/x11/kkbswitch/Makefile
index 97530a4294a..ef22b613903 100644
--- a/x11/kkbswitch/Makefile
+++ b/x11/kkbswitch/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.19 2010/01/18 09:59:41 wiz Exp $
+# $NetBSD: Makefile,v 1.20 2010/06/13 22:45:47 wiz Exp $
 #
 
 DISTNAME=		kkbswitch-1.4.3
-PKGREVISION=		10
+PKGREVISION=		11
 CATEGORIES=		kde x11
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=kkbswitch/}
 
diff --git a/x11/kmessage/Makefile b/x11/kmessage/Makefile
index e406e08ae86..f8a7e788c07 100644
--- a/x11/kmessage/Makefile
+++ b/x11/kmessage/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.27 2010/01/18 09:59:41 wiz Exp $
+# $NetBSD: Makefile,v 1.28 2010/06/13 22:45:47 wiz Exp $
 
 DISTNAME=	kmessage-0.1
-PKGREVISION=	16
+PKGREVISION=	17
 CATEGORIES=	x11 kde
 MASTER_SITES=	http://soliton.wins.uva.nl/~wijnhout/kmessage/
 
diff --git a/x11/kterm/Makefile b/x11/kterm/Makefile
index 05eb67aac17..de4dd82f801 100644
--- a/x11/kterm/Makefile
+++ b/x11/kterm/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.47 2010/02/21 15:39:12 wiz Exp $
+# $NetBSD: Makefile,v 1.48 2010/06/13 22:45:47 wiz Exp $
 
 DISTNAME=	kterm-6.2.0
-PKGREVISION=	13
+PKGREVISION=	14
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_XCONTRIB:=applications/}
 
diff --git a/x11/lablgtk/Makefile b/x11/lablgtk/Makefile
index 480b070b8e4..97d0c849222 100644
--- a/x11/lablgtk/Makefile
+++ b/x11/lablgtk/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.37 2009/12/17 19:20:05 abs Exp $
+# $NetBSD: Makefile,v 1.38 2010/06/13 22:45:47 wiz Exp $
 #
 
 DISTNAME=	lablgtk-2.12.0
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	x11
 MASTER_SITES=	http://wwwfun.kurims.kyoto-u.ac.jp/soft/olabl/dist/
 
diff --git a/x11/libgnomekbd/Makefile b/x11/libgnomekbd/Makefile
index ad4c40f8916..73acc08b337 100644
--- a/x11/libgnomekbd/Makefile
+++ b/x11/libgnomekbd/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.21 2010/02/16 13:35:40 wiz Exp $
+# $NetBSD: Makefile,v 1.22 2010/06/13 22:45:47 wiz Exp $
 #
 
 DISTNAME=	libgnomekbd-2.28.2
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/libgnomekbd/2.28/}
 EXTRACT_SUFX=	.tar.bz2
diff --git a/x11/libunique/Makefile b/x11/libunique/Makefile
index 05870672c3b..6abe3e7cfe5 100644
--- a/x11/libunique/Makefile
+++ b/x11/libunique/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.8 2010/05/07 08:34:23 ahoka Exp $
+# $NetBSD: Makefile,v 1.9 2010/06/13 22:45:47 wiz Exp $
 #
 
 DISTNAME=	libunique-1.1.6
+PKGREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/libunique/1.1/}
 
diff --git a/x11/libunique/buildlink3.mk b/x11/libunique/buildlink3.mk
index 9c03f57e713..97df9dd52c8 100644
--- a/x11/libunique/buildlink3.mk
+++ b/x11/libunique/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2009/08/26 19:56:56 sno Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2010/06/13 22:45:47 wiz Exp $
 
 BUILDLINK_TREE+=	libunique
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=	libunique
 LIBUNIQUE_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.libunique+=	libunique>=1.0.4
-BUILDLINK_ABI_DEPENDS.libunique?=	libunique>=1.0.8nb1
+BUILDLINK_ABI_DEPENDS.libunique?=	libunique>=1.1.6nb1
 BUILDLINK_PKGSRCDIR.libunique?=	../../x11/libunique
 
 pkgbase := libunique
diff --git a/x11/libxfce4gui/Makefile b/x11/libxfce4gui/Makefile
index ab203188af0..ae70caffab4 100644
--- a/x11/libxfce4gui/Makefile
+++ b/x11/libxfce4gui/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.28 2009/09/16 01:15:34 reed Exp $
+# $NetBSD: Makefile,v 1.29 2010/06/13 22:45:47 wiz Exp $
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
@@ -6,6 +6,7 @@ PKG_DESTDIR_SUPPORT=	user-destdir
 
 DISTNAME=	libxfcegui4-${XFCE4_VERSION}
 PKGNAME=	libxfce4gui-${XFCE4_VERSION}
+PKGREVISION=	1
 CATEGORIES=	x11
 COMMENT=	Xfce widget library
 
diff --git a/x11/libxfce4gui/buildlink3.mk b/x11/libxfce4gui/buildlink3.mk
index 7f7d2b6c3c5..1173a1ab18f 100644
--- a/x11/libxfce4gui/buildlink3.mk
+++ b/x11/libxfce4gui/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.27 2009/09/16 01:15:34 reed Exp $
+# $NetBSD: buildlink3.mk,v 1.28 2010/06/13 22:45:47 wiz Exp $
 
 BUILDLINK_TREE+=	libxfce4gui
 
@@ -6,6 +6,7 @@ BUILDLINK_TREE+=	libxfce4gui
 LIBXFCE4GUI_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.libxfce4gui+=	libxfce4gui>=4.6.0
+BUILDLINK_ABI_DEPENDS.libxfce4gui?=	libxfce4gui>=4.6.1nb1
 BUILDLINK_PKGSRCDIR.libxfce4gui?=	../../x11/libxfce4gui
 
 .include "../../devel/glib2/buildlink3.mk"
diff --git a/x11/libxfce4menu/buildlink3.mk b/x11/libxfce4menu/buildlink3.mk
index 4b7ef1c1b9b..600ee0980b2 100644
--- a/x11/libxfce4menu/buildlink3.mk
+++ b/x11/libxfce4menu/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1.1.1 2009/09/16 01:05:31 reed Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2010/06/13 22:45:47 wiz Exp $
 
 BUILDLINK_TREE+=	libxfce4menu
 
@@ -6,6 +6,7 @@ BUILDLINK_TREE+=	libxfce4menu
 LIBXFCE4MENU_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.libxfce4menu+=	libxfce4menu>=4.6.0
+BUILDLINK_ABI_DEPENDS.libxfce4menu?=	libxfce4menu>=4.6.1
 BUILDLINK_PKGSRCDIR.libxfce4menu?=	../../x11/libxfce4menu
 
 .include "../../devel/glib2/buildlink3.mk"
diff --git a/x11/matchbox-common/Makefile b/x11/matchbox-common/Makefile
index 49a618e8466..b74c9c232bb 100644
--- a/x11/matchbox-common/Makefile
+++ b/x11/matchbox-common/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.10 2009/07/16 21:39:51 zafer Exp $
+# $NetBSD: Makefile,v 1.11 2010/06/13 22:45:47 wiz Exp $
 #
 
 DISTNAME=		matchbox-common-0.9.1
-PKGREVISION=		3
+PKGREVISION=		4
 CATEGORIES=		x11
 MASTER_SITES=		http://matchbox-project.org/sources/matchbox-common/0.9/
 EXTRACT_SUFX=		.tar.bz2
diff --git a/x11/matchbox-desktop/Makefile b/x11/matchbox-desktop/Makefile
index bda3a155cdf..4c72097a394 100644
--- a/x11/matchbox-desktop/Makefile
+++ b/x11/matchbox-desktop/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.9 2009/07/16 21:41:24 zafer Exp $
+# $NetBSD: Makefile,v 1.10 2010/06/13 22:45:48 wiz Exp $
 #
 
 DISTNAME=		matchbox-desktop-0.9.1
-PKGREVISION=		3
+PKGREVISION=		4
 CATEGORIES=		x11
 MASTER_SITES=		http://matchbox-project.org/sources/matchbox-desktop/0.9/
 EXTRACT_SUFX=		.tar.bz2
diff --git a/x11/matchbox-nest/Makefile b/x11/matchbox-nest/Makefile
index c6d5556bcc0..f82e8923518 100644
--- a/x11/matchbox-nest/Makefile
+++ b/x11/matchbox-nest/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.9 2009/07/16 21:42:53 zafer Exp $
+# $NetBSD: Makefile,v 1.10 2010/06/13 22:45:48 wiz Exp $
 #
 
 DISTNAME=	matchbox-nest-0.3
-PKGREVISION=	3
+PKGREVISION=	4
 CATEGORIES=	x11
 MASTER_SITES=	http://matchbox-project.org/sources/matchbox-nest/0.3/
 EXTRACT_SUFX=	.tar.bz2
diff --git a/x11/matchbox-panel-manager/Makefile b/x11/matchbox-panel-manager/Makefile
index cd7f735abc8..e38100612c0 100644
--- a/x11/matchbox-panel-manager/Makefile
+++ b/x11/matchbox-panel-manager/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.11 2009/08/26 19:58:39 sno Exp $
+# $NetBSD: Makefile,v 1.12 2010/06/13 22:45:48 wiz Exp $
 #
 
 DISTNAME=	matchbox-panel-manager-0.1
-PKGREVISION=	4
+PKGREVISION=	5
 CATEGORIES=	x11
 MASTER_SITES=	http://matchbox-project.org/sources/matchbox-panel-manager/0.1/
 EXTRACT_SUFX=	.tar.bz2
diff --git a/x11/matchbox-panel/Makefile b/x11/matchbox-panel/Makefile
index 98e027e7337..1b0fc0d33a0 100644
--- a/x11/matchbox-panel/Makefile
+++ b/x11/matchbox-panel/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.19 2009/12/17 18:29:05 abs Exp $
+# $NetBSD: Makefile,v 1.20 2010/06/13 22:45:48 wiz Exp $
 #
 
 DISTNAME=		matchbox-panel-0.9.2
-PKGREVISION=		3
+PKGREVISION=		4
 CATEGORIES=		x11
 MASTER_SITES=		http://matchbox-project.org/sources/matchbox-panel/0.9/
 EXTRACT_SUFX=		.tar.bz2
diff --git a/x11/mlterm/Makefile b/x11/mlterm/Makefile
index 592fc0ff7a9..0a506504ec7 100644
--- a/x11/mlterm/Makefile
+++ b/x11/mlterm/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.54 2009/08/26 19:58:39 sno Exp $
+# $NetBSD: Makefile,v 1.55 2010/06/13 22:45:48 wiz Exp $
 
 DISTNAME=	mlterm-2.9.3
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=mlterm/}
 
diff --git a/x11/mrxvt/Makefile b/x11/mrxvt/Makefile
index a74228f1851..5efc04f1667 100644
--- a/x11/mrxvt/Makefile
+++ b/x11/mrxvt/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.20 2010/01/18 09:59:41 wiz Exp $
+# $NetBSD: Makefile,v 1.21 2010/06/13 22:45:48 wiz Exp $
 #
 
 DISTNAME=	mrxvt-0.5.4
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=materm/}
 PATCH_SITES=	${MASTER_SITES}
diff --git a/x11/nucleo/Makefile b/x11/nucleo/Makefile
index 309728ae72f..cda7a4d09f7 100644
--- a/x11/nucleo/Makefile
+++ b/x11/nucleo/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.12 2010/02/10 19:17:48 joerg Exp $
+# $NetBSD: Makefile,v 1.13 2010/06/13 22:45:48 wiz Exp $
 #
 
 DISTNAME=	nucleo-0.7.5
-PKGREVISION=	3
+PKGREVISION=	4
 CATEGORIES=	x11
 MASTER_SITES=	http://insitu.lri.fr/metisse/download/nucleo/
 EXTRACT_SUFX=	.tar.bz2
diff --git a/x11/nucleo/buildlink3.mk b/x11/nucleo/buildlink3.mk
index 7736ae6360b..3d8d8d8ef77 100644
--- a/x11/nucleo/buildlink3.mk
+++ b/x11/nucleo/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.8 2010/01/18 09:59:42 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.9 2010/06/13 22:45:48 wiz Exp $
 
 BUILDLINK_TREE+=	nucleo
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=	nucleo
 NUCLEO_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.nucleo+=	nucleo>=0.6
-BUILDLINK_ABI_DEPENDS.nucleo?=	nucleo>=0.7.5nb2
+BUILDLINK_ABI_DEPENDS.nucleo?=	nucleo>=0.7.5nb4
 BUILDLINK_PKGSRCDIR.nucleo?=	../../x11/nucleo
 pkgbase:=nucleo
 .  include "../../mk/pkg-build-options.mk"
diff --git a/x11/nucleo/distinfo b/x11/nucleo/distinfo
index 0263fe29671..0fc62784459 100644
--- a/x11/nucleo/distinfo
+++ b/x11/nucleo/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.5 2009/07/14 20:23:16 hasso Exp $
+$NetBSD: distinfo,v 1.6 2010/06/13 22:45:48 wiz Exp $
 
 SHA1 (nucleo-0.7.5.tar.bz2) = 9a32d7dd1c6ad6348efa6bdc691cb46207a148c0
 RMD160 (nucleo-0.7.5.tar.bz2) = e997d319a425434b9aa32cc472d33e0d68917f8c
@@ -16,3 +16,4 @@ SHA1 (patch-aj) = f627182b2feec55f5d8fc60ac8c6e32b846e658a
 SHA1 (patch-ak) = b88dcb5d6cbc7e23a9b299c6e41e8e605f0bb96f
 SHA1 (patch-al) = 6684c1b1a3b85defaed2a7457fe4ef1f7c79c117
 SHA1 (patch-am) = 1abd0f40ffe2c9ea42fde983bc784d3a10d1ec02
+SHA1 (patch-an) = 8f9c71660f4a4763a60b00eb6347d8e97d306e8a
diff --git a/x11/nucleo/patches/patch-an b/x11/nucleo/patches/patch-an
new file mode 100644
index 00000000000..6183b522c6b
--- /dev/null
+++ b/x11/nucleo/patches/patch-an
@@ -0,0 +1,13 @@
+$NetBSD: patch-an,v 1.3 2010/06/13 22:45:48 wiz Exp $
+
+--- nucleo/image/encoding/PNGenc.cxx.orig	2008-06-05 12:52:33.000000000 +0000
++++ nucleo/image/encoding/PNGenc.cxx
+@@ -170,7 +170,7 @@ namespace nucleo {
+ 			  &compression_type, &filter_type) ;
+ 
+     if (color_type == PNG_COLOR_TYPE_GRAY && bit_depth < 8)
+-	 png_set_gray_1_2_4_to_8(png_ptr);
++	 png_set_expand_gray_1_2_4_to_8(png_ptr);
+ 
+     if (png_get_valid(png_ptr, info_ptr, PNG_INFO_tRNS))
+ 	 png_set_tRNS_to_alpha(png_ptr);
diff --git a/x11/openmotif/Makefile b/x11/openmotif/Makefile
index a355ee5ef81..3bb943d8c86 100644
--- a/x11/openmotif/Makefile
+++ b/x11/openmotif/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.64 2010/01/18 09:59:42 wiz Exp $
+# $NetBSD: Makefile,v 1.65 2010/06/13 22:45:48 wiz Exp $
 
 PKGVER=		2.3.1
 DISTNAME=	openmotif-${PKGVER}
-PKGREVISION=	3
+PKGREVISION=	4
 CATEGORIES=	x11
 MASTER_SITES=	http://ftp.ics.com/openmotif/2.3/2.3.1/
 MASTER_SITES+=	ftp://ftp.ics.com/openmotif/2.3/2.3.1/
diff --git a/x11/openmotif/buildlink3.mk b/x11/openmotif/buildlink3.mk
index 66176fbd250..45ae625b333 100644
--- a/x11/openmotif/buildlink3.mk
+++ b/x11/openmotif/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.14 2010/01/18 09:59:42 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.15 2010/06/13 22:45:48 wiz Exp $
 
 BUILDLINK_TREE+=	openmotif
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=	openmotif
 OPENMOTIF_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.openmotif+=	openmotif>=2.3.1
-BUILDLINK_ABI_DEPENDS.openmotif?=	openmotif>=2.3.1nb3
+BUILDLINK_ABI_DEPENDS.openmotif?=	openmotif>=2.3.1nb4
 BUILDLINK_PKGSRCDIR.openmotif?=	../../x11/openmotif
 
 .include "../../graphics/jpeg/buildlink3.mk"
diff --git a/x11/p5-Alien-wxWidgets/Makefile b/x11/p5-Alien-wxWidgets/Makefile
index 74ca8e1f540..72bc15e83e0 100644
--- a/x11/p5-Alien-wxWidgets/Makefile
+++ b/x11/p5-Alien-wxWidgets/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.3 2010/01/18 09:59:42 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2010/06/13 22:45:48 wiz Exp $
 #
 
 DISTNAME=	Alien-wxWidgets-0.50
 PKGNAME=	p5-${DISTNAME}
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	x11 perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=Alien/}
 
diff --git a/x11/p5-Tk/Makefile b/x11/p5-Tk/Makefile
index 631d6911404..5e86ed9584b 100644
--- a/x11/p5-Tk/Makefile
+++ b/x11/p5-Tk/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.65 2010/02/16 15:22:45 sno Exp $
+# $NetBSD: Makefile,v 1.66 2010/06/13 22:45:48 wiz Exp $
 
 DISTNAME=	Tk-804.028
 PKGNAME=	p5-Tk-804.028
-PKGREVISION=	4
+PKGREVISION=	5
 SVR4_PKGNAME=	p5tk
 CATEGORIES=	x11 tk perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=Tk/}
diff --git a/x11/p5-Wx-Perl-ProcessStream/Makefile b/x11/p5-Wx-Perl-ProcessStream/Makefile
index 8ee7721d56a..3b37b4b169e 100644
--- a/x11/p5-Wx-Perl-ProcessStream/Makefile
+++ b/x11/p5-Wx-Perl-ProcessStream/Makefile
@@ -1,9 +1,10 @@
-# $NetBSD: Makefile,v 1.3 2010/03/02 14:27:25 sno Exp $
+# $NetBSD: Makefile,v 1.4 2010/06/13 22:45:49 wiz Exp $
 #
 
 DISTNAME=	Wx-Perl-ProcessStream-0.27
 PKGNAME=	p5-${DISTNAME}
 #PKGREVISION=	1
+PKGREVISION=	1
 CATEGORIES=	x11 perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=Wx/}
 
diff --git a/x11/p5-Wx/Makefile b/x11/p5-Wx/Makefile
index c953ed21e02..cc9d11464e6 100644
--- a/x11/p5-Wx/Makefile
+++ b/x11/p5-Wx/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.6 2010/02/25 13:26:01 sno Exp $
+# $NetBSD: Makefile,v 1.7 2010/06/13 22:45:49 wiz Exp $
 #
 
 DISTNAME=	Wx-0.9701
 PKGNAME=	p5-${DISTNAME:S/9701/97.01/}
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	x11 perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=Wx/}
 
diff --git a/x11/p5-Wx/buildlink3.mk b/x11/p5-Wx/buildlink3.mk
index 0ca683b23a4..a4fdcfd7ab0 100644
--- a/x11/p5-Wx/buildlink3.mk
+++ b/x11/p5-Wx/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2010/02/03 11:12:22 sno Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2010/06/13 22:45:49 wiz Exp $
 
 BUILDLINK_TREE+=        p5-Wx
 
@@ -6,6 +6,7 @@ BUILDLINK_TREE+=        p5-Wx
 P5_WX_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.p5-Wx+=  p5-Wx>=0.91
+BUILDLINK_ABI_DEPENDS.p5-Wx?=    p5-Wx>=0.97.01nb2
 BUILDLINK_PKGSRCDIR.p5-Wx?=    ../../x11/p5-Wx
 BUILDLINK_INCDIRS.p5-Wx?=      ${PERL5_SUB_INSTALLVENDORARCH}/auto/Wx
 
diff --git a/x11/p5-gtk2/Makefile b/x11/p5-gtk2/Makefile
index 4f882b5afd2..07731aa5df8 100644
--- a/x11/p5-gtk2/Makefile
+++ b/x11/p5-gtk2/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.31 2009/08/26 19:56:59 sno Exp $
+# $NetBSD: Makefile,v 1.32 2010/06/13 22:45:49 wiz Exp $
 
 DISTNAME=	Gtk2-${DIST_VER}
 PKGNAME=	p5-gtk2-${DIST_VER}
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	x11 perl5
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=gtk2-perl/}
 
diff --git a/x11/p5-gtk2/buildlink3.mk b/x11/p5-gtk2/buildlink3.mk
index 58b04b9feda..7194b3c3d0e 100644
--- a/x11/p5-gtk2/buildlink3.mk
+++ b/x11/p5-gtk2/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2009/08/26 19:56:59 sno Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2010/06/13 22:45:49 wiz Exp $
 
 BUILDLINK_TREE+=	p5-gtk2
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=	p5-gtk2
 P5_GTK2_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.p5-gtk2+=	p5-gtk2>=1.182
-BUILDLINK_ABI_DEPENDS.p5-gtk2?=	p5-gtk2>=1.220nb1
+BUILDLINK_ABI_DEPENDS.p5-gtk2?=	p5-gtk2>=1.220nb2
 BUILDLINK_PKGSRCDIR.p5-gtk2?=	../../x11/p5-gtk2
 
 .include "../../devel/p5-glib2/buildlink3.mk"
diff --git a/x11/paragui/Makefile b/x11/paragui/Makefile
index e25215dbe96..d31a7479782 100644
--- a/x11/paragui/Makefile
+++ b/x11/paragui/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.28 2010/01/18 09:59:42 wiz Exp $
+# $NetBSD: Makefile,v 1.29 2010/06/13 22:45:49 wiz Exp $
 #
 
 DISTNAME=		paragui-1.0.4
-PKGREVISION=		15
+PKGREVISION=		16
 CATEGORIES=		x11
 MASTER_SITES=		http://savannah.nongnu.org/download/paragui/
 
diff --git a/x11/paragui/buildlink3.mk b/x11/paragui/buildlink3.mk
index 8030b8d72d4..78e12d39b37 100644
--- a/x11/paragui/buildlink3.mk
+++ b/x11/paragui/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.20 2010/01/18 09:59:42 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.21 2010/06/13 22:45:49 wiz Exp $
 
 BUILDLINK_TREE+=	paragui
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=	paragui
 PARAGUI_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.paragui+=	paragui>=1.0.4nb3
-BUILDLINK_ABI_DEPENDS.paragui+=	paragui>=1.0.4nb15
+BUILDLINK_ABI_DEPENDS.paragui+=	paragui>=1.0.4nb16
 BUILDLINK_PKGSRCDIR.paragui?=	../../x11/paragui
 
 .include "../../devel/SDL/buildlink3.mk"
diff --git a/x11/py-gnome2-desktop/Makefile b/x11/py-gnome2-desktop/Makefile
index 3dc99e14706..add65e798d1 100644
--- a/x11/py-gnome2-desktop/Makefile
+++ b/x11/py-gnome2-desktop/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.35 2010/03/20 12:43:29 wiz Exp $
+# $NetBSD: Makefile,v 1.36 2010/06/13 22:45:49 wiz Exp $
 #
 
 DISTNAME=	gnome-python-desktop-2.28.0
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME:S/-python/2/}
-PKGREVISION=	3
+PKGREVISION=	4
 CATEGORIES=	sysutils gnome
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/gnome-python-desktop/2.28/}
 EXTRACT_SUFX=	.tar.bz2
diff --git a/x11/py-gnome2-desktop/buildlink3.mk b/x11/py-gnome2-desktop/buildlink3.mk
index 9870f171c59..a71530bebd6 100644
--- a/x11/py-gnome2-desktop/buildlink3.mk
+++ b/x11/py-gnome2-desktop/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2009/08/27 18:53:37 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2010/06/13 22:45:49 wiz Exp $
 
 BUILDLINK_TREE+=	py-gnome2-desktop
 
@@ -8,7 +8,7 @@ PY_GNOME2_DESKTOP_BUILDLINK3_MK:=
 .include "../../lang/python/pyversion.mk"
 
 BUILDLINK_API_DEPENDS.py-gnome2-desktop+=	${PYPKGPREFIX}-gnome2-desktop>=2.16.0
-BUILDLINK_ABI_DEPENDS.py-gnome2-desktop?=		${PYPKGPREFIX}-gnome2-desktop>=2.26.0nb3
+BUILDLINK_ABI_DEPENDS.py-gnome2-desktop?=	${PYPKGPREFIX}-gnome2-desktop>=2.28.0nb4
 BUILDLINK_PKGSRCDIR.py-gnome2-desktop?=		../../x11/py-gnome2-desktop
 
 .include "../../x11/py-gnome2/buildlink3.mk"
diff --git a/x11/py-gnome2-extras/Makefile b/x11/py-gnome2-extras/Makefile
index b816ece07cb..4131673c6b0 100644
--- a/x11/py-gnome2-extras/Makefile
+++ b/x11/py-gnome2-extras/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.35 2010/01/18 09:59:42 wiz Exp $
+# $NetBSD: Makefile,v 1.36 2010/06/13 22:45:49 wiz Exp $
 #
 
 DISTNAME=	gnome-python-extras-2.14.3
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME:S/gnome-python/gnome2/}
-PKGREVISION=	7
+PKGREVISION=	8
 CATEGORIES=	x11 python
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/gnome-python-extras/2.14/}
 EXTRACT_SUFX=	.tar.bz2
diff --git a/x11/py-gnome2-extras/buildlink3.mk b/x11/py-gnome2-extras/buildlink3.mk
index 793a571144b..93e4b98478c 100644
--- a/x11/py-gnome2-extras/buildlink3.mk
+++ b/x11/py-gnome2-extras/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.16 2009/08/27 18:53:37 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.17 2010/06/13 22:45:49 wiz Exp $
 
 BUILDLINK_TREE+=	pygnome2ex
 
@@ -8,7 +8,7 @@ PYGNOME2EX_BUILDLINK3_MK:=
 .include "../../lang/python/pyversion.mk"
 
 BUILDLINK_API_DEPENDS.pygnome2ex+=	${PYPKGPREFIX}-gnome2-extras>=2.12.0nb3
-BUILDLINK_ABI_DEPENDS.pygnome2ex+=	${PYPKGPREFIX}-gnome2-extras>=2.14.3nb5
+BUILDLINK_ABI_DEPENDS.pygnome2ex+=	${PYPKGPREFIX}-gnome2-extras>=2.14.3nb8
 BUILDLINK_PKGSRCDIR.pygnome2ex?=	../../x11/py-gnome2-extras
 
 .include "../../x11/py-gnome2/buildlink3.mk"
diff --git a/x11/py-gnome2/Makefile b/x11/py-gnome2/Makefile
index e4fd0fe3ef4..79f1cf5afd1 100644
--- a/x11/py-gnome2/Makefile
+++ b/x11/py-gnome2/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.67 2010/04/13 17:46:03 drochner Exp $
+# $NetBSD: Makefile,v 1.68 2010/06/13 22:45:49 wiz Exp $
 #
 
 DISTNAME=	gnome-python-2.28.1
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME:S/gnome-python/gnome2/}
+PKGREVISION=	1
 CATEGORIES=	x11 python
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/gnome-python/2.28/}
 EXTRACT_SUFX=	.tar.bz2
diff --git a/x11/py-gnome2/buildlink3.mk b/x11/py-gnome2/buildlink3.mk
index a3b66bf3b0b..6f2e3145532 100644
--- a/x11/py-gnome2/buildlink3.mk
+++ b/x11/py-gnome2/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.25 2009/08/27 18:53:38 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.26 2010/06/13 22:45:49 wiz Exp $
 
 BUILDLINK_TREE+=	pygnome2
 
@@ -8,7 +8,7 @@ PYGNOME2_BUILDLINK3_MK:=
 .include "../../lang/python/pyversion.mk"
 
 BUILDLINK_API_DEPENDS.pygnome2+=	${PYPKGPREFIX}-gnome2>=2.10.0
-BUILDLINK_ABI_DEPENDS.pygnome2+=	${PYPKGPREFIX}-gnome2>=2.26.1nb1
+BUILDLINK_ABI_DEPENDS.pygnome2+=	${PYPKGPREFIX}-gnome2>=2.28.1nb1
 BUILDLINK_PKGSRCDIR.pygnome2?=	../../x11/py-gnome2
 
 .include "../../net/py-ORBit/buildlink3.mk"
diff --git a/x11/py-gtk2/Makefile b/x11/py-gtk2/Makefile
index 29a16c1e062..dc910afb860 100644
--- a/x11/py-gtk2/Makefile
+++ b/x11/py-gtk2/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.69 2010/01/30 16:27:59 heinz Exp $
+# $NetBSD: Makefile,v 1.70 2010/06/13 22:45:49 wiz Exp $
 #
 
 DISTNAME=	pygtk-2.16.0
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME:S/pygtk/gtk2/}
+PKGREVISION=	1
 CATEGORIES=	x11 python
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/pygtk/2.16/}
 EXTRACT_SUFX=	.tar.bz2
diff --git a/x11/py-gtk2/buildlink3.mk b/x11/py-gtk2/buildlink3.mk
index 97830b7a5e1..c73f869593e 100644
--- a/x11/py-gtk2/buildlink3.mk
+++ b/x11/py-gtk2/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.25 2009/08/27 18:53:38 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.26 2010/06/13 22:45:49 wiz Exp $
 
 BUILDLINK_TREE+=	pygtk2
 
@@ -8,7 +8,7 @@ PYGTK2_BUILDLINK3_MK:=
 .include "../../lang/python/pyversion.mk"
 
 BUILDLINK_API_DEPENDS.pygtk2+=	${PYPKGPREFIX}-gtk2>=2.8.4
-BUILDLINK_ABI_DEPENDS.pygtk2+=	${PYPKGPREFIX}-gtk2>=2.14.1nb2
+BUILDLINK_ABI_DEPENDS.pygtk2+=	${PYPKGPREFIX}-gtk2>=2.16.0nb1
 BUILDLINK_PKGSRCDIR.pygtk2?=	../../x11/py-gtk2
 
 .include "../../devel/py-gobject/buildlink3.mk"
diff --git a/x11/py-gtksourceview/Makefile b/x11/py-gtksourceview/Makefile
index 3f4a27194ac..0223df3b223 100644
--- a/x11/py-gtksourceview/Makefile
+++ b/x11/py-gtksourceview/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.9 2009/11/17 17:08:01 wiz Exp $
+# $NetBSD: Makefile,v 1.10 2010/06/13 22:45:49 wiz Exp $
 
 DISTNAME=	pygtksourceview-2.8.0
 PKGNAME=	${DISTNAME:S/py/${PYPKGPREFIX}-/}
+PKGREVISION=	1
 CATEGORIES=	x11 python
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/pygtksourceview/2.8/}
 EXTRACT_SUFX=	.tar.bz2
diff --git a/x11/py-kiwi/Makefile b/x11/py-kiwi/Makefile
index ab2ffe75a61..8923a229ed8 100644
--- a/x11/py-kiwi/Makefile
+++ b/x11/py-kiwi/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.6 2009/08/26 19:57:05 sno Exp $
+# $NetBSD: Makefile,v 1.7 2010/06/13 22:45:49 wiz Exp $
 #
 
 DISTNAME=	kiwi-1.9.22
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	x11 python
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/kiwi/1.9/}
 
diff --git a/x11/py-kiwi/buildlink3.mk b/x11/py-kiwi/buildlink3.mk
index fc032c66fa0..b7ea5711b08 100644
--- a/x11/py-kiwi/buildlink3.mk
+++ b/x11/py-kiwi/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2009/08/27 18:53:38 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2010/06/13 22:45:49 wiz Exp $
 
 BUILDLINK_TREE+=	py-kiwi
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=	py-kiwi
 PY_KIWI_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.py-kiwi+=	${PYPKGPREFIX}-kiwi>=1.9.22
-BUILDLINK_ABI_DEPENDS.py-kiwi?=	${PYPKGPREFIX}-kiwi>=1.9.22nb1
+BUILDLINK_ABI_DEPENDS.py-kiwi?=	${PYPKGPREFIX}-kiwi>=1.9.22nb2
 BUILDLINK_PKGSRCDIR.py-kiwi?=	../../x11/py-kiwi
 
 .include "../../x11/py-gtk2/buildlink3.mk"
diff --git a/x11/py-qt3-base/Makefile b/x11/py-qt3-base/Makefile
index 8611ec9ad2b..20de2e876b2 100644
--- a/x11/py-qt3-base/Makefile
+++ b/x11/py-qt3-base/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.31 2010/02/04 18:44:23 drochner Exp $
+# $NetBSD: Makefile,v 1.32 2010/06/13 22:45:50 wiz Exp $
 #
 
 PKG_DESTDIR_SUPPORT=	user-destdir
@@ -6,7 +6,7 @@ PKG_DESTDIR_SUPPORT=	user-destdir
 .include "../../x11/py-qt3-base/Makefile.common"
 
 PKGNAME=		${PYPKGPREFIX}-qt3-base-${PYQT_VERSION}
-PKGREVISION=		4
+PKGREVISION=		5
 
 COMMENT=		Python binding for Qt3
 
diff --git a/x11/py-qt3-base/buildlink3.mk b/x11/py-qt3-base/buildlink3.mk
index 116c71c6e00..ac13c8559c3 100644
--- a/x11/py-qt3-base/buildlink3.mk
+++ b/x11/py-qt3-base/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.15 2010/01/18 09:59:42 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.16 2010/06/13 22:45:50 wiz Exp $
 
 BUILDLINK_TREE+=	pyqt3-base
 
@@ -8,7 +8,7 @@ PYQT3_BASE_BUILDLINK3_MK:=
 .include "../../lang/python/pyversion.mk"
 
 BUILDLINK_API_DEPENDS.pyqt3-base+=	${PYPKGPREFIX}-qt3-base>=3.11
-BUILDLINK_ABI_DEPENDS.pyqt3-base?=	${PYPKGPREFIX}-qt3-base>=3.18.1nb3
+BUILDLINK_ABI_DEPENDS.pyqt3-base?=	${PYPKGPREFIX}-qt3-base>=3.18.1nb5
 BUILDLINK_PKGSRCDIR.pyqt3-base?=	../../x11/py-qt3-base
 
 BUILDLINK_LIBDIRS.pyqt3-base+=	${PYSITELIB}
diff --git a/x11/py-qt3-modules/Makefile b/x11/py-qt3-modules/Makefile
index e06feb593dc..ad8d8c3e234 100644
--- a/x11/py-qt3-modules/Makefile
+++ b/x11/py-qt3-modules/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.30 2010/02/04 18:44:23 drochner Exp $
+# $NetBSD: Makefile,v 1.31 2010/06/13 22:45:50 wiz Exp $
 #
 
 PKG_DESTDIR_SUPPORT=	user-destdir
@@ -6,7 +6,7 @@ PKG_DESTDIR_SUPPORT=	user-destdir
 .include "../../x11/py-qt3-base/Makefile.common"
 
 PKGNAME=		${PYPKGPREFIX}-qt3-modules-${PYQT_VERSION}
-PKGREVISION=		4
+PKGREVISION=		5
 
 COMMENT=		Various Python modules for Qt3
 
diff --git a/x11/py-qt3-modules/buildlink3.mk b/x11/py-qt3-modules/buildlink3.mk
index 8b7025a3700..1dc6630e0ba 100644
--- a/x11/py-qt3-modules/buildlink3.mk
+++ b/x11/py-qt3-modules/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.15 2010/01/18 09:59:42 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.16 2010/06/13 22:45:50 wiz Exp $
 
 BUILDLINK_TREE+=	pyqt3-mod
 
@@ -8,7 +8,7 @@ PYQT3_MOD_BUILDLINK3_MK:=
 .include "../../lang/python/pyversion.mk"
 
 BUILDLINK_API_DEPENDS.pyqt3-mod+=	${PYPKGPREFIX}-qt3-modules>=3.11
-BUILDLINK_ABI_DEPENDS.pyqt3-mod+=	${PYPKGPREFIX}-qt3-modules>=3.18.1nb3
+BUILDLINK_ABI_DEPENDS.pyqt3-mod+=	${PYPKGPREFIX}-qt3-modules>=3.18.1nb5
 BUILDLINK_PKGSRCDIR.pyqt3-mod?=	../../x11/py-qt3-modules
 
 BUILDLINK_LIBDIRS.pyqt3-mod+=	${PYSITELIB}
diff --git a/x11/py-qt3-qscintilla/Makefile b/x11/py-qt3-qscintilla/Makefile
index b25f1c9cf36..7b894608bcf 100644
--- a/x11/py-qt3-qscintilla/Makefile
+++ b/x11/py-qt3-qscintilla/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.28 2010/02/04 18:44:23 drochner Exp $
+# $NetBSD: Makefile,v 1.29 2010/06/13 22:45:50 wiz Exp $
 #
 
 PKG_DESTDIR_SUPPORT=	user-destdir
@@ -6,7 +6,7 @@ PKG_DESTDIR_SUPPORT=	user-destdir
 .include "../../x11/py-qt3-base/Makefile.common"
 
 PKGNAME=		${PYPKGPREFIX}-qt3-qscintilla-${PYQT_VERSION}
-PKGREVISION=		4
+PKGREVISION=		5
 
 COMMENT=		Python binding for QScintilla
 
diff --git a/x11/py-qt4-qscintilla/Makefile b/x11/py-qt4-qscintilla/Makefile
index e579bc9746a..9a5f249438a 100644
--- a/x11/py-qt4-qscintilla/Makefile
+++ b/x11/py-qt4-qscintilla/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.1.1.1 2010/05/08 15:34:02 drochner Exp $
+# $NetBSD: Makefile,v 1.2 2010/06/13 22:45:50 wiz Exp $
 #
 
 DISTNAME=	QScintilla-gpl-2.4.3
 PKGNAME=	${PYPKGPREFIX}-qt4-${DISTNAME:tl:S/-gpl-/-/}
+PKGREVISION=	1
 CATEGORIES=	x11
 MASTER_SITES=	http://www.riverbankcomputing.com/static/Downloads/QScintilla2/
 
diff --git a/x11/py-qt4-qscintilla/buildlink3.mk b/x11/py-qt4-qscintilla/buildlink3.mk
index 46bd285d079..ca7c598ff4f 100644
--- a/x11/py-qt4-qscintilla/buildlink3.mk
+++ b/x11/py-qt4-qscintilla/buildlink3.mk
@@ -1,17 +1,18 @@
-# $NetBSD: buildlink3.mk,v 1.1.1.1 2010/05/08 15:34:02 drochner Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2010/06/13 22:45:50 wiz Exp $
 
-BUILDLINK_TREE+=	py26-qt4-qscintilla
+BUILDLINK_TREE+=	py-qt4-qscintilla
 
-.if !defined(PY26_QT4_QSCINTILLA_BUILDLINK3_MK)
-PY26_QT4_QSCINTILLA_BUILDLINK3_MK:=
+.if !defined(PY_QT4_QSCINTILLA_BUILDLINK3_MK)
+PY_QT4_QSCINTILLA_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.py26-qt4-qscintilla+=	${PYPKGPREFIX}-qt4-qscintilla>=2.4.3
-BUILDLINK_PKGSRCDIR.py26-qt4-qscintilla?=	../../x11/py-qt4-qscintilla
+BUILDLINK_API_DEPENDS.py-qt4-qscintilla+=	${PYPKGPREFIX}-qt4-qscintilla>=2.4.3
+BUILDLINK_ABI_DEPENDS.py-qt4-qscintilla?=	${PYPKGPREFIX}-qt4-qscintilla>=2.4.3nb1
+BUILDLINK_PKGSRCDIR.py-qt4-qscintilla?=	../../x11/py-qt4-qscintilla
 
 .include "../../x11/py-sip/buildlink3.mk"
 .include "../../x11/py-qt4/buildlink3.mk"
 .include "../../x11/qt4-qscintilla/buildlink3.mk"
 .include "../../x11/qt4-libs/buildlink3.mk"
-.endif	# PY26_QT4_QSCINTILLA_BUILDLINK3_MK
+.endif	# PY_QT4_QSCINTILLA_BUILDLINK3_MK
 
-BUILDLINK_TREE+=	-py26-qt4-qscintilla
+BUILDLINK_TREE+=	-py-qt4-qscintilla
diff --git a/x11/py-qt4/Makefile b/x11/py-qt4/Makefile
index e5f8cfc0a12..e9f40c51ba4 100644
--- a/x11/py-qt4/Makefile
+++ b/x11/py-qt4/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.24 2010/04/22 16:47:31 drochner Exp $
+# $NetBSD: Makefile,v 1.25 2010/06/13 22:45:50 wiz Exp $
 #
 
 PKGNAME=		${PYPKGPREFIX}-qt4-${PYQT_VERSION}
 PYQT_VERSION=		4.7.3
+PKGREVISION=		1
 CATEGORIES=		x11 python
 MASTER_SITES=		http://www.riverbankcomputing.com/static/Downloads/PyQt4/
 
diff --git a/x11/py-wxWidgets/Makefile b/x11/py-wxWidgets/Makefile
index aab19fa87ee..8c7f0ff2473 100644
--- a/x11/py-wxWidgets/Makefile
+++ b/x11/py-wxWidgets/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.26 2010/01/18 09:59:43 wiz Exp $
+# $NetBSD: Makefile,v 1.27 2010/06/13 22:45:50 wiz Exp $
 #
 
 VERSION=	2.8.10.1
 DISTNAME=	wxPython-src-${VERSION}
 PKGNAME=	${PYPKGPREFIX}-wxWidgets-${VERSION}
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	x11 python
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=wxpython/}
 EXTRACT_SUFX=	.tar.bz2
diff --git a/x11/py-wxWidgets/buildlink3.mk b/x11/py-wxWidgets/buildlink3.mk
index 508223aaccf..c5fae9f9812 100644
--- a/x11/py-wxWidgets/buildlink3.mk
+++ b/x11/py-wxWidgets/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.18 2010/01/18 09:59:43 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.19 2010/06/13 22:45:50 wiz Exp $
 
 BUILDLINK_TREE+=	${PYPKGPREFIX}-wxWidgets
 
@@ -8,7 +8,7 @@ PY_WXWIDGETS_BUILDLINK3_MK:=
 .include "../../lang/python/pyversion.mk"
 
 BUILDLINK_API_DEPENDS.${PYPKGPREFIX}-wxWidgets+=	${PYPKGPREFIX}-wxWidgets>=2.6.1.0
-BUILDLINK_ABI_DEPENDS.${PYPKGPREFIX}-wxWidgets?=	${PYPKGPREFIX}-wxWidgets>=2.8.10.1nb2
+BUILDLINK_ABI_DEPENDS.${PYPKGPREFIX}-wxWidgets?=	${PYPKGPREFIX}-wxWidgets>=2.8.10.1nb3
 BUILDLINK_PKGSRCDIR.${PYPKGPREFIX}-wxWidgets?=	../../x11/py-wxWidgets
 
 .include "../../x11/wxGTK28/buildlink3.mk"
diff --git a/x11/qt3-docs/Makefile b/x11/qt3-docs/Makefile
index a9d0a74cfd2..20f6fa9acb1 100644
--- a/x11/qt3-docs/Makefile
+++ b/x11/qt3-docs/Makefile
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.27 2010/01/18 09:59:43 wiz Exp $
+# $NetBSD: Makefile,v 1.28 2010/06/13 22:45:50 wiz Exp $
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
 .include "../../x11/qt3-libs/Makefile.common"
 
 PKGNAME=	qt3-docs-${QTVERSION}
-PKGREVISION=	2
+PKGREVISION=	3
 COMMENT=	Documentation for the QT C++ X GUI toolkit
 
 BUILD_QT3=	yes
diff --git a/x11/qt3-libs/Makefile b/x11/qt3-libs/Makefile
index 444c510e02b..10e6818f19a 100644
--- a/x11/qt3-libs/Makefile
+++ b/x11/qt3-libs/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.74 2010/01/18 09:59:43 wiz Exp $
+# $NetBSD: Makefile,v 1.75 2010/06/13 22:45:50 wiz Exp $
 
 PKGNAME=	qt3-libs-${QTVERSION}
-PKGREVISION=	12
+PKGREVISION=	14
 MAINTAINER=	adam@NetBSD.org
 COMMENT=	C++ X GUI toolkit
 
diff --git a/x11/qt3-libs/buildlink3.mk b/x11/qt3-libs/buildlink3.mk
index 6fbd7ad65f1..caef5d397bd 100644
--- a/x11/qt3-libs/buildlink3.mk
+++ b/x11/qt3-libs/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.24 2010/01/18 09:59:43 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.25 2010/06/13 22:45:50 wiz Exp $
 
 BUILDLINK_TREE+=	qt3-libs
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=	qt3-libs
 QT3_LIBS_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.qt3-libs+=	qt3-libs>=3.2.3
-BUILDLINK_ABI_DEPENDS.qt3-libs?=	qt3-libs>=3.3.8nb12
+BUILDLINK_ABI_DEPENDS.qt3-libs?=	qt3-libs>=3.3.8nb14
 BUILDLINK_PKGSRCDIR.qt3-libs?=	../../x11/qt3-libs
 
 BUILDLINK_INCDIRS.qt3-libs+=	qt3/include
diff --git a/x11/qt3-libs/distinfo b/x11/qt3-libs/distinfo
index ca430337abe..ef822cfa610 100644
--- a/x11/qt3-libs/distinfo
+++ b/x11/qt3-libs/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.51 2009/07/11 09:11:13 rillig Exp $
+$NetBSD: distinfo,v 1.52 2010/06/13 22:45:50 wiz Exp $
 
 SHA1 (qt-x11-free-3.3.8.tar.bz2) = 91b192cb8e80679607d24ae35d6e20ed68d149d7
 RMD160 (qt-x11-free-3.3.8.tar.bz2) = 7b8e4e35f49014eac4fcfe91b7ec0a45c5569cf4
@@ -21,6 +21,7 @@ SHA1 (patch-ao) = 3aacba05b27314cadab7dceba3c21d65bab608d3
 SHA1 (patch-ap) = 5040628324d271abfc662c5a6eeb4f1ecf0d4758
 SHA1 (patch-aq) = c17ff8b42901ae9a3cc51c33cffe4cffa64b4e4d
 SHA1 (patch-ar) = 84c0d7153feabcab6558ba84fbaa723f1c238e40
+SHA1 (patch-as) = 4d173ad8adfe40845653e8309fe2fee7c8ac7897
 SHA1 (patch-bb) = b6a15a4b2b7b83b89bd3610cf2e48c242dbce2e5
 SHA1 (patch-bc) = d8a84e1b66bf1953b53df57ae81d2c98cce69c41
 SHA1 (patch-bd) = a116ecf305ee5b5338bf84cb908d695f3baea830
diff --git a/x11/qt3-libs/patches/patch-as b/x11/qt3-libs/patches/patch-as
new file mode 100644
index 00000000000..212103a9dc3
--- /dev/null
+++ b/x11/qt3-libs/patches/patch-as
@@ -0,0 +1,22 @@
+$NetBSD: patch-as,v 1.1 2010/06/13 22:45:50 wiz Exp $
+
+--- src/kernel/qpngio.cpp.orig	2007-02-02 14:01:15.000000000 +0000
++++ src/kernel/qpngio.cpp
+@@ -159,7 +159,7 @@ void setup_qt( QImage& image, png_struct
+ 		image.setColor( i, qRgba(c,c,c,0xff) );
+ 	    }
+ 	    if ( png_get_valid(png_ptr, info_ptr, PNG_INFO_tRNS) ) {
+-		const int g = info_ptr->trans_values.gray;
++		const int g = info_ptr->trans_color.gray;
+ 		if (g < ncols) {
+ 		    image.setAlphaBuffer(TRUE);
+ 		    image.setColor(g, image.color(g) & RGB_MASK);
+@@ -187,7 +187,7 @@ void setup_qt( QImage& image, png_struct
+ 		    info_ptr->palette[i].red,
+ 		    info_ptr->palette[i].green,
+ 		    info_ptr->palette[i].blue,
+-		    info_ptr->trans[i]
++		    info_ptr->trans_alpha[i]
+ 		    )
+ 		);
+ 		i++;
diff --git a/x11/qt3-mysql/Makefile b/x11/qt3-mysql/Makefile
index da2f9084af5..e0a5dace64a 100644
--- a/x11/qt3-mysql/Makefile
+++ b/x11/qt3-mysql/Makefile
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.27 2010/01/18 09:59:43 wiz Exp $
+# $NetBSD: Makefile,v 1.28 2010/06/13 22:45:50 wiz Exp $
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
 .include "../../x11/qt3-libs/Makefile.common"
 
 PKGNAME=		qt3-mysql-${QTVERSION}
-PKGREVISION=		3
+PKGREVISION=		4
 COMMENT=		QT mysql driver
 
 CONFIGURE_ARGS+=	-I${QTDIR}/include \
diff --git a/x11/qt3-pgsql/Makefile b/x11/qt3-pgsql/Makefile
index 573e6967f2e..14d3c1bd99e 100644
--- a/x11/qt3-pgsql/Makefile
+++ b/x11/qt3-pgsql/Makefile
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.9 2010/02/10 19:34:08 joerg Exp $
+# $NetBSD: Makefile,v 1.10 2010/06/13 22:45:51 wiz Exp $
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
 .include "../../x11/qt3-libs/Makefile.common"
 
 PKGNAME=	qt3-psql-${QTVERSION}
-PKGREVISION=	6
+PKGREVISION=	7
 COMMENT=	QT postgresql driver
 
 CONFIGURE_ARGS+=	-I${QTDIR}/include \
diff --git a/x11/qt3-qscintilla/Makefile b/x11/qt3-qscintilla/Makefile
index 57d1fc390ec..e9055083f5d 100644
--- a/x11/qt3-qscintilla/Makefile
+++ b/x11/qt3-qscintilla/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.23 2010/01/18 09:59:43 wiz Exp $
+# $NetBSD: Makefile,v 1.24 2010/06/13 22:45:51 wiz Exp $
 #
 
 DISTNAME=		qscintilla-1.65-gpl-1.6
 PKGNAME=		qt3-qscintilla-1.6
-PKGREVISION=		5
+PKGREVISION=		6
 CATEGORIES=		x11
 MASTER_SITES=		http://www.river-bank.demon.co.uk/download/QScintilla/
 
diff --git a/x11/qt3-qscintilla/buildlink3.mk b/x11/qt3-qscintilla/buildlink3.mk
index a2ccf87236e..baa8277d0a3 100644
--- a/x11/qt3-qscintilla/buildlink3.mk
+++ b/x11/qt3-qscintilla/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.12 2010/01/18 09:59:43 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.13 2010/06/13 22:45:51 wiz Exp $
 
 BUILDLINK_TREE+=	qt3-qscintilla
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=	qt3-qscintilla
 QT3_QSCINTILLA_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.qt3-qscintilla+=	qt3-qscintilla>=1.2
-BUILDLINK_ABI_DEPENDS.qt3-qscintilla+=	qt3-qscintilla>=1.6nb5
+BUILDLINK_ABI_DEPENDS.qt3-qscintilla+=	qt3-qscintilla>=1.6nb6
 BUILDLINK_PKGSRCDIR.qt3-qscintilla?=	../../x11/qt3-qscintilla
 
 .include "../../x11/qt3-libs/buildlink3.mk"
diff --git a/x11/qt3-tools/Makefile b/x11/qt3-tools/Makefile
index f1764ecfdcb..51ccad21497 100644
--- a/x11/qt3-tools/Makefile
+++ b/x11/qt3-tools/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.60 2010/01/18 09:59:43 wiz Exp $
+# $NetBSD: Makefile,v 1.61 2010/06/13 22:45:51 wiz Exp $
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
@@ -11,7 +11,7 @@ GCC_REQD+=		3.4
 .include "../../x11/qt3-libs/Makefile.common"
 
 PKGNAME=	qt3-tools-${QTVERSION}
-PKGREVISION=	5
+PKGREVISION=	6
 COMMENT=	QT GUI (WYSIWYG) builder and other tools
 
 DEPENDS+=	libtool-base-[0-9]*:../../devel/libtool-base
diff --git a/x11/qt3-tools/buildlink3.mk b/x11/qt3-tools/buildlink3.mk
index 8746a773e87..358bb0a48ea 100644
--- a/x11/qt3-tools/buildlink3.mk
+++ b/x11/qt3-tools/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.17 2010/01/18 09:59:43 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.18 2010/06/13 22:45:51 wiz Exp $
 
 BUILDLINK_TREE+=	qt3-tools
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=	qt3-tools
 QT3_TOOLS_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.qt3-tools+=	qt3-tools>=3.1.2nb3
-BUILDLINK_ABI_DEPENDS.qt3-tools+=	qt3-tools>=3.3.8nb5
+BUILDLINK_ABI_DEPENDS.qt3-tools+=	qt3-tools>=3.3.8nb6
 BUILDLINK_PKGSRCDIR.qt3-tools?=	../../x11/qt3-tools
 BUILDLINK_DEPMETHOD.qt3-tools?=	build
 
diff --git a/x11/qt4-creator/Makefile b/x11/qt4-creator/Makefile
index d0e0a1c5ae8..a432f81905d 100644
--- a/x11/qt4-creator/Makefile
+++ b/x11/qt4-creator/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.2 2010/05/19 17:51:22 drochner Exp $
+# $NetBSD: Makefile,v 1.3 2010/06/13 22:45:51 wiz Exp $
 #
 
 DISTNAME=	qt-creator-1.3.1-src
 PKGNAME=	qt4-creator-1.3.1
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	devel
 MASTER_SITES=	http://get.qt.nokia.com/qtcreator/
 
diff --git a/x11/qt4-docs/Makefile b/x11/qt4-docs/Makefile
index 0d9c8e7613d..8f2667e7635 100644
--- a/x11/qt4-docs/Makefile
+++ b/x11/qt4-docs/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.7 2009/10/11 09:14:52 adam Exp $
+# $NetBSD: Makefile,v 1.8 2010/06/13 22:45:51 wiz Exp $
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
 .include "../../x11/qt4-libs/Makefile.common"
+PKGREVISION=	1
 
 PKGNAME=	qt4-docs-${QTVERSION}
 COMMENT=	Documentation for the QT C++ X GUI toolkit
diff --git a/x11/qt4-libs/Makefile b/x11/qt4-libs/Makefile
index 7802c8d4f59..08890c9f277 100644
--- a/x11/qt4-libs/Makefile
+++ b/x11/qt4-libs/Makefile
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.47 2010/05/29 17:10:31 adam Exp $
+# $NetBSD: Makefile,v 1.48 2010/06/13 22:45:51 wiz Exp $
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
 .include "../../x11/qt4-libs/Makefile.common"
 
 PKGNAME=	qt4-libs-${QTVERSION}
-PKGREVISION=	2
+PKGREVISION=	3
 COMMENT=	C++ X GUI toolkit
 
 # XXX this is to test what really gets installed when 'do-install' is disabled
diff --git a/x11/qt4-libs/buildlink3.mk b/x11/qt4-libs/buildlink3.mk
index 2c9b619676b..b748761cbb3 100644
--- a/x11/qt4-libs/buildlink3.mk
+++ b/x11/qt4-libs/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.17 2010/02/02 14:05:59 adam Exp $
+# $NetBSD: buildlink3.mk,v 1.18 2010/06/13 22:45:51 wiz Exp $
 
 BUILDLINK_TREE+=	qt4-libs
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=	qt4-libs
 QT4_LIBS_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.qt4-libs+=	qt4-libs>=4.6.1nb2
-BUILDLINK_ABI_DEPENDS.qt4-libs+=	qt4-libs>=4.6.1nb2
+BUILDLINK_ABI_DEPENDS.qt4-libs+=	qt4-libs>=4.6.2nb3
 BUILDLINK_PKGSRCDIR.qt4-libs?=	../../x11/qt4-libs
 
 BUILDLINK_INCDIRS.qt4-libs+=	qt4/include
diff --git a/x11/qt4-mng/Makefile b/x11/qt4-mng/Makefile
index 45ac74840c0..d2460ffd4c4 100644
--- a/x11/qt4-mng/Makefile
+++ b/x11/qt4-mng/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.1.1.1 2010/02/02 14:07:18 adam Exp $
+# $NetBSD: Makefile,v 1.2 2010/06/13 22:45:51 wiz Exp $
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
 .include "../../x11/qt4-libs/Makefile.common"
+PKGREVISION=	1
 
 PKGNAME=	qt4-mng-${QTVERSION}
 COMMENT=	QT MNG image format plugin
diff --git a/x11/qt4-mysql/Makefile b/x11/qt4-mysql/Makefile
index 63b9ded8a97..f1d1f162b54 100644
--- a/x11/qt4-mysql/Makefile
+++ b/x11/qt4-mysql/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.8 2010/01/29 18:19:09 adam Exp $
+# $NetBSD: Makefile,v 1.9 2010/06/13 22:45:51 wiz Exp $
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
 .include "../../x11/qt4-libs/Makefile.common"
+PKGREVISION=	1
 
 PKGNAME=	qt4-mysql-${QTVERSION}
 COMMENT=	QT mysql driver
diff --git a/x11/qt4-pgsql/Makefile b/x11/qt4-pgsql/Makefile
index 4223ca5e9e2..680be049a1a 100644
--- a/x11/qt4-pgsql/Makefile
+++ b/x11/qt4-pgsql/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.15 2010/02/16 13:08:09 adam Exp $
+# $NetBSD: Makefile,v 1.16 2010/06/13 22:45:51 wiz Exp $
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
 .include "../../x11/qt4-libs/Makefile.common"
+PKGREVISION=	1
 
 PKGNAME=	qt4-pgsql-${QTVERSION}
 COMMENT=	QT postgresql driver
diff --git a/x11/qt4-qdbus/Makefile b/x11/qt4-qdbus/Makefile
index 120b8ad23d7..19eab57ba65 100644
--- a/x11/qt4-qdbus/Makefile
+++ b/x11/qt4-qdbus/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.11 2010/01/29 18:19:09 adam Exp $
+# $NetBSD: Makefile,v 1.12 2010/06/13 22:45:51 wiz Exp $
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
 .include "../../x11/qt4-libs/Makefile.common"
+PKGREVISION=	1
 
 PKGNAME=	qt4-qdbus-${QTVERSION}
 COMMENT=	QT DBus support
diff --git a/x11/qt4-qdbus/buildlink3.mk b/x11/qt4-qdbus/buildlink3.mk
index 6608f6a26ab..461ef3c8ed0 100644
--- a/x11/qt4-qdbus/buildlink3.mk
+++ b/x11/qt4-qdbus/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2010/01/18 09:59:43 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2010/06/13 22:45:51 wiz Exp $
 
 BUILDLINK_TREE+=	qt4-qdbus
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=	qt4-qdbus
 QT4_QDBUS_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.qt4-qdbus+=	qt4-qdbus>=4.3.2
-BUILDLINK_ABI_DEPENDS.qt4-qdbus?=	qt4-qdbus>=4.5.3nb2
+BUILDLINK_ABI_DEPENDS.qt4-qdbus?=	qt4-qdbus>=4.6.2nb1
 BUILDLINK_PKGSRCDIR.qt4-qdbus?=	../../x11/qt4-qdbus
 
 .include "../../x11/qt4-libs/buildlink3.mk"
diff --git a/x11/qt4-qscintilla/Makefile b/x11/qt4-qscintilla/Makefile
index a5a949d3b59..8015fa46ded 100644
--- a/x11/qt4-qscintilla/Makefile
+++ b/x11/qt4-qscintilla/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.1.1.1 2010/05/08 15:32:13 drochner Exp $
+# $NetBSD: Makefile,v 1.2 2010/06/13 22:45:51 wiz Exp $
 #
 
 DISTNAME=	QScintilla-gpl-2.4.3
 PKGNAME=	qt4-${DISTNAME:tl:S/-gpl-/-/}
+PKGREVISION=	1
 CATEGORIES=	x11
 MASTER_SITES=	http://www.riverbankcomputing.com/static/Downloads/QScintilla2/
 
diff --git a/x11/qt4-qscintilla/buildlink3.mk b/x11/qt4-qscintilla/buildlink3.mk
index 7965fc188f8..a7965b66c73 100644
--- a/x11/qt4-qscintilla/buildlink3.mk
+++ b/x11/qt4-qscintilla/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1.1.1 2010/05/08 15:32:13 drochner Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2010/06/13 22:45:51 wiz Exp $
 
 BUILDLINK_TREE+=	qt4-qscintilla
 
@@ -6,6 +6,7 @@ BUILDLINK_TREE+=	qt4-qscintilla
 QT4_QSCINTILLA_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.qt4-qscintilla+=	qt4-qscintilla>=2.4.3
+BUILDLINK_ABI_DEPENDS.qt4-qscintilla?=	qt4-qscintilla>=2.4.3nb1
 BUILDLINK_PKGSRCDIR.qt4-qscintilla?=	../../x11/qt4-qscintilla
 
 .include "../../x11/qt4-libs/buildlink3.mk"
diff --git a/x11/qt4-sqlite3/Makefile b/x11/qt4-sqlite3/Makefile
index 9dc06c338d1..862ddd23dce 100644
--- a/x11/qt4-sqlite3/Makefile
+++ b/x11/qt4-sqlite3/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.9 2010/01/29 18:19:09 adam Exp $
+# $NetBSD: Makefile,v 1.10 2010/06/13 22:45:52 wiz Exp $
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
 .include "../../x11/qt4-libs/Makefile.common"
+PKGREVISION=	1
 
 PKGNAME=	qt4-sqlite3-${QTVERSION}
 COMMENT=	QT sqlite3 driver
diff --git a/x11/qt4-tiff/Makefile b/x11/qt4-tiff/Makefile
index e810b4ca83a..6d6d2e63f45 100644
--- a/x11/qt4-tiff/Makefile
+++ b/x11/qt4-tiff/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.8 2010/01/29 18:19:09 adam Exp $
+# $NetBSD: Makefile,v 1.9 2010/06/13 22:45:52 wiz Exp $
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
 .include "../../x11/qt4-libs/Makefile.common"
+PKGREVISION=	1
 
 PKGNAME=	qt4-tiff-${QTVERSION}
 COMMENT=	QT TIFF image format plugin
diff --git a/x11/qt4-tools/Makefile b/x11/qt4-tools/Makefile
index b239d629dda..6ac8c38924d 100644
--- a/x11/qt4-tools/Makefile
+++ b/x11/qt4-tools/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.31 2010/02/16 13:08:09 adam Exp $
+# $NetBSD: Makefile,v 1.32 2010/06/13 22:45:52 wiz Exp $
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
 .include "../../x11/qt4-libs/Makefile.common"
+PKGREVISION=	1
 
 PKGNAME=	qt4-tools-${QTVERSION}
 COMMENT=	QT GUI (WYSIWYG) builder and other tools
diff --git a/x11/qt4-tools/buildlink3.mk b/x11/qt4-tools/buildlink3.mk
index e778fd845ea..d4724d43258 100644
--- a/x11/qt4-tools/buildlink3.mk
+++ b/x11/qt4-tools/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.12 2010/01/18 09:59:44 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.13 2010/06/13 22:45:52 wiz Exp $
 
 BUILDLINK_TREE+=	qt4-tools
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=	qt4-tools
 QT4_TOOLS_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.qt4-tools+=	qt4-tools>=4.1.0
-BUILDLINK_ABI_DEPENDS.qt4-tools+=	qt4-tools>=4.5.3nb2
+BUILDLINK_ABI_DEPENDS.qt4-tools+=	qt4-tools>=4.6.2nb1
 BUILDLINK_PKGSRCDIR.qt4-tools?=	../../x11/qt4-tools
 BUILDLINK_DEPMETHOD.qt4-tools?=	build
 
diff --git a/x11/qwt-qt4/Makefile b/x11/qwt-qt4/Makefile
index 79c6d6c13d8..6972bc1ebae 100644
--- a/x11/qwt-qt4/Makefile
+++ b/x11/qwt-qt4/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.2 2010/01/18 09:59:44 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2010/06/13 22:45:52 wiz Exp $
 
 DISTNAME=	qwt-5.2.0
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=qwt/}
 EXTRACT_SUFX=	.tar.bz2
diff --git a/x11/qwt-qt4/buildlink3.mk b/x11/qwt-qt4/buildlink3.mk
index 74e8377b49f..49f4080f2cc 100644
--- a/x11/qwt-qt4/buildlink3.mk
+++ b/x11/qwt-qt4/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2010/01/18 09:59:44 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2010/06/13 22:45:52 wiz Exp $
 
 BUILDLINK_TREE+=	qwt
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=	qwt
 QWT_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.qwt+=	qwt>=5.2.0
-BUILDLINK_ABI_DEPENDS.qwt?=	qwt>=5.2.0nb1
+BUILDLINK_ABI_DEPENDS.qwt?=	qwt>=5.2.0nb2
 BUILDLINK_PKGSRCDIR.qwt?=	../../x11/qwt-qt4
 
 .include "../../x11/qt4-libs/buildlink3.mk"
diff --git a/x11/qwtplot3d-qt4/Makefile b/x11/qwtplot3d-qt4/Makefile
index d216a1918fe..d411fd3b550 100644
--- a/x11/qwtplot3d-qt4/Makefile
+++ b/x11/qwtplot3d-qt4/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.2 2010/01/18 09:59:44 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2010/06/13 22:45:52 wiz Exp $
 #
 
 DISTNAME=	qwtplot3d-0.2.7
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=qwtplot3d/}
 EXTRACT_SUFX=	.tgz
diff --git a/x11/qwtplot3d-qt4/buildlink3.mk b/x11/qwtplot3d-qt4/buildlink3.mk
index 7d8a9869d3e..a804933c6d4 100644
--- a/x11/qwtplot3d-qt4/buildlink3.mk
+++ b/x11/qwtplot3d-qt4/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2010/01/18 09:59:44 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2010/06/13 22:45:52 wiz Exp $
 
 BUILDLINK_TREE+=	qwtplot3d
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=	qwtplot3d
 QWTPLOT3D_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.qwtplot3d+=	qwtplot3d>=0.2.7
-BUILDLINK_ABI_DEPENDS.qwtplot3d?=	qwtplot3d>=0.2.7nb1
+BUILDLINK_ABI_DEPENDS.qwtplot3d?=	qwtplot3d>=0.2.7nb2
 BUILDLINK_PKGSRCDIR.qwtplot3d?=	../../x11/qwtplot3d-qt4
 
 .include "../../x11/qt4-libs/buildlink3.mk"
diff --git a/x11/rep-gtk2/Makefile b/x11/rep-gtk2/Makefile
index 535cd875039..67cf804e991 100644
--- a/x11/rep-gtk2/Makefile
+++ b/x11/rep-gtk2/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.9 2010/03/24 19:43:29 asau Exp $
+# $NetBSD: Makefile,v 1.10 2010/06/13 22:45:52 wiz Exp $
 
 DISTNAME=		rep-gtk-0.18.6r2
 PKGNAME=		${DISTNAME:S/gtk/gtk2/}
-PKGREVISION=		2
+PKGREVISION=		3
 CATEGORIES=		x11 lang
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=rep-gtk/}
 EXTRACT_SUFX=		.tar.bz2
diff --git a/x11/rox-session/Makefile b/x11/rox-session/Makefile
index 29c8eb2a01c..68a4b3dc9e6 100644
--- a/x11/rox-session/Makefile
+++ b/x11/rox-session/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.18 2010/02/10 19:17:48 joerg Exp $
+# $NetBSD: Makefile,v 1.19 2010/06/13 22:45:52 wiz Exp $
 #
 
 DISTNAME=	rox-session-0.28
-PKGREVISION=	6
+PKGREVISION=	7
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=rox/}
 EXTRACT_SUFX=	.tar.bz2
diff --git a/x11/ruby-gnome2-gnome/Makefile b/x11/ruby-gnome2-gnome/Makefile
index 39540dd2517..624fd5ca9d7 100644
--- a/x11/ruby-gnome2-gnome/Makefile
+++ b/x11/ruby-gnome2-gnome/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.19 2010/01/18 09:59:44 wiz Exp $
+# $NetBSD: Makefile,v 1.20 2010/06/13 22:45:52 wiz Exp $
 #
 
 PKGNAME=		${RUBY_PKGPREFIX}-gnome2-gnome-${VERSION}
-PKGREVISION=		1
+PKGREVISION=		2
 CATEGORIES=		gnome x11
 COMMENT=		Ruby binding of libgnome/libgnomeui-2.x
 
diff --git a/x11/ruby-gnome2-gtk/Makefile b/x11/ruby-gnome2-gtk/Makefile
index e79d4ce0c4d..f3e82ec60e0 100644
--- a/x11/ruby-gnome2-gtk/Makefile
+++ b/x11/ruby-gnome2-gtk/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.16 2009/10/12 03:09:33 obache Exp $
+# $NetBSD: Makefile,v 1.17 2010/06/13 22:45:52 wiz Exp $
 #
 
 PKGNAME=		${RUBY_PKGPREFIX}-gnome2-gtk-${VERSION}
+PKGREVISION=		1
 CATEGORIES=		x11
 COMMENT=		Ruby binding of GTK+-2.x
 
diff --git a/x11/ruby-gnome2-gtk/buildlink3.mk b/x11/ruby-gnome2-gtk/buildlink3.mk
index dde667e7901..7338e18fa88 100644
--- a/x11/ruby-gnome2-gtk/buildlink3.mk
+++ b/x11/ruby-gnome2-gtk/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2009/08/26 19:56:57 sno Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2010/06/13 22:45:52 wiz Exp $
 #
 
 BUILDLINK_TREE+=	ruby-gnome2-gtk
@@ -7,7 +7,7 @@ BUILDLINK_TREE+=	ruby-gnome2-gtk
 RUBY_GNOME2_GTK_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.ruby-gnome2-gtk+=	${RUBY_PKGPREFIX}-gnome2-gtk>=0.17.0
-BUILDLINK_ABI_DEPENDS.ruby-gnome2-gtk?=	ruby18-gnome2-gtk>=0.19.1nb1
+BUILDLINK_ABI_DEPENDS.ruby-gnome2-gtk?=	ruby18-gnome2-gtk>=0.19.4nb1
 BUILDLINK_PKGSRCDIR.ruby-gnome2-gtk?=	../../x11/ruby-gnome2-gtk
 
 .include "../../devel/ruby-gnome2-glib/buildlink3.mk"
diff --git a/x11/ruby-gnome2-gtksourceview/Makefile b/x11/ruby-gnome2-gtksourceview/Makefile
index 177abcea098..b3a1289dee6 100644
--- a/x11/ruby-gnome2-gtksourceview/Makefile
+++ b/x11/ruby-gnome2-gtksourceview/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.6 2010/01/18 09:59:44 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2010/06/13 22:45:52 wiz Exp $
 #
 
 PKGNAME=		${RUBY_PKGPREFIX}-gnome2-gtksourceview-${VERSION}
 COMMENT=		Ruby binding of gtksourceview
-PKGREVISION=		2
+PKGREVISION=		3
 CATEGORIES=		x11
 
 PKG_DESTDIR_SUPPORT=	user-destdir
diff --git a/x11/ruby-gnome2-gtksourceview2/Makefile b/x11/ruby-gnome2-gtksourceview2/Makefile
index 65b347406f4..8eac514dfbd 100644
--- a/x11/ruby-gnome2-gtksourceview2/Makefile
+++ b/x11/ruby-gnome2-gtksourceview2/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.3 2009/10/12 03:09:33 obache Exp $
+# $NetBSD: Makefile,v 1.4 2010/06/13 22:45:53 wiz Exp $
 #
 
 PKGNAME=		${RUBY_PKGPREFIX}-gnome2-gtksourceview2-${VERSION}
 COMMENT=		Ruby binding of gtksourceview2
+PKGREVISION=		1
 CATEGORIES=		x11
 
 PKG_DESTDIR_SUPPORT=	user-destdir
diff --git a/x11/ruby-gnome2-panelapplet/Makefile b/x11/ruby-gnome2-panelapplet/Makefile
index ab5472a4c66..cdf9f810c20 100644
--- a/x11/ruby-gnome2-panelapplet/Makefile
+++ b/x11/ruby-gnome2-panelapplet/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.20 2010/01/18 09:59:44 wiz Exp $
+# $NetBSD: Makefile,v 1.21 2010/06/13 22:45:53 wiz Exp $
 #
 
 PKGNAME=		${RUBY_PKGPREFIX}-gnome2-panelapplet-${VERSION}
 COMMENT=		Ruby binding of libpanel-applet-2.6.x
-PKGREVISION=		1
+PKGREVISION=		2
 CATEGORIES=		x11 gnome
 
 CONFLICTS+=		ruby-gnome2-panelapplet-[0-9]*
diff --git a/x11/ruby-gnome2-vte/Makefile b/x11/ruby-gnome2-vte/Makefile
index 2e4cc3d4f7e..99ed9e01917 100644
--- a/x11/ruby-gnome2-vte/Makefile
+++ b/x11/ruby-gnome2-vte/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.7 2009/10/12 03:09:33 obache Exp $
+# $NetBSD: Makefile,v 1.8 2010/06/13 22:45:53 wiz Exp $
 #
 
 PKGNAME=		${RUBY_PKGPREFIX}-gnome2-vte-${VERSION}
 COMMENT=		Ruby binding of vte
+PKGREVISION=		1
 CATEGORIES=		x11
 
 PKG_DESTDIR_SUPPORT=	user-destdir
diff --git a/x11/ruby-gtk/Makefile b/x11/ruby-gtk/Makefile
index d8d9b2d419b..47801d28319 100644
--- a/x11/ruby-gtk/Makefile
+++ b/x11/ruby-gtk/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.43 2010/01/18 09:59:44 wiz Exp $
+# $NetBSD: Makefile,v 1.44 2010/06/13 22:45:53 wiz Exp $
 
 DISTNAME=	ruby-gtk-${VERSION}
 PKGNAME=	${RUBY_PKGPREFIX}-gtk-${VERSION}
-PKGREVISION=	11
+PKGREVISION=	12
 CATEGORIES=	x11 ruby
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=ruby-gnome/}
 
diff --git a/x11/tint2/Makefile b/x11/tint2/Makefile
index f7a882dd044..8cd3574c6b6 100644
--- a/x11/tint2/Makefile
+++ b/x11/tint2/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.5 2010/05/07 20:53:45 gls Exp $
+# $NetBSD: Makefile,v 1.6 2010/06/13 22:45:53 wiz Exp $
 
 DISTNAME=		tint2-0.9
-PKGREVISION=		1
+PKGREVISION=		2
 CATEGORIES=		x11
 MASTER_SITES=		http://tint2.googlecode.com/files/
 
diff --git a/x11/vte/Makefile b/x11/vte/Makefile
index f657dc99cfc..14ff107141f 100644
--- a/x11/vte/Makefile
+++ b/x11/vte/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.74 2010/06/11 11:50:39 drochner Exp $
+# $NetBSD: Makefile,v 1.75 2010/06/13 22:45:53 wiz Exp $
 #
 
 DISTNAME=	vte-0.22.5
+PKGREVISION=	1
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/vte/0.22/}
 EXTRACT_SUFX=	.tar.bz2
@@ -25,16 +26,13 @@ CONFIGURE_ARGS+=	--disable-deprecation
 PKGCONFIG_OVERRIDE+=	vte.pc.in
 
 BUILDLINK_API_DEPENDS.glib2+=		glib2>=2.10.0
-BUILDLINK_API_DEPENDS.gtk2+=		gtk2+>=2.10.0
-# for FC_WIDTH
-BUILDLINK_API_DEPENDS.fontconfig+=	fontconfig>=2.1.93
-
-BUILDLINK_DEPMETHOD.libXt?=	build
-
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../devel/pango/buildlink3.mk"
+# for FC_WIDTH
+BUILDLINK_API_DEPENDS.fontconfig+=	fontconfig>=2.1.93
 .include "../../fonts/fontconfig/buildlink3.mk"
 .include "../../graphics/freetype2/buildlink3.mk"
+BUILDLINK_API_DEPENDS.gtk2+=		gtk2+>=2.10.0
 .include "../../x11/gtk2/buildlink3.mk"
 .include "../../x11/libSM/buildlink3.mk"
 .include "../../x11/libX11/buildlink3.mk"
diff --git a/x11/vte/buildlink3.mk b/x11/vte/buildlink3.mk
index 348697a5dc3..0b24f58f469 100644
--- a/x11/vte/buildlink3.mk
+++ b/x11/vte/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.21 2009/08/26 19:56:58 sno Exp $
+# $NetBSD: buildlink3.mk,v 1.22 2010/06/13 22:45:53 wiz Exp $
 
 BUILDLINK_TREE+=	vte
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=	vte
 VTE_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.vte+=	vte>=0.14.0
-BUILDLINK_ABI_DEPENDS.vte?=	vte>=0.20.5nb1
+BUILDLINK_ABI_DEPENDS.vte?=	vte>=0.22.5nb1
 BUILDLINK_PKGSRCDIR.vte?=	../../x11/vte
 
 .include "../../devel/glib2/buildlink3.mk"
diff --git a/x11/wdm/Makefile b/x11/wdm/Makefile
index 4b517836720..31e497079fe 100644
--- a/x11/wdm/Makefile
+++ b/x11/wdm/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.39 2010/02/08 09:47:44 tnn Exp $
+# $NetBSD: Makefile,v 1.40 2010/06/13 22:45:53 wiz Exp $
 
 DISTNAME=		wdm-1.28
-PKGREVISION=		3
+PKGREVISION=		4
 CATEGORIES=		x11 windowmaker
 MASTER_SITES=		http://voins.program.ru/wdm/
 
diff --git a/x11/wterm/Makefile b/x11/wterm/Makefile
index 87c344a8b99..5bdbc7b79b8 100644
--- a/x11/wterm/Makefile
+++ b/x11/wterm/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.40 2010/01/18 09:59:44 wiz Exp $
+# $NetBSD: Makefile,v 1.41 2010/06/13 22:45:53 wiz Exp $
 
 DISTNAME=	wterm-6.2.9
-PKGREVISION=	11
+PKGREVISION=	12
 CATEGORIES=	x11 windowmaker
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=wterm/}
 
diff --git a/x11/wxGTK24/Makefile b/x11/wxGTK24/Makefile
index 398ffc9aa35..6566584a056 100644
--- a/x11/wxGTK24/Makefile
+++ b/x11/wxGTK24/Makefile
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.11 2010/02/16 17:33:39 taca Exp $
+# $NetBSD: Makefile,v 1.12 2010/06/13 22:45:53 wiz Exp $
 #
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
 .include "Makefile.common"
 
-PKGREVISION=		16
+PKGREVISION=		17
 COMMENT=		GTK-based implementation of the wxWidgets GUI library
 CONFLICTS+=		wxGTK<=2.4.2nb5
 
@@ -14,5 +14,6 @@ INSTALLATION_DIRS=	${DOCDIR}
 post-install:
 	${INSTALL_DATA} ${WRKSRC}/LICENCE.txt ${DESTDIR}${DOCDIR}/LICENSE
 
+.include "../../graphics/MesaLib/buildlink3.mk"
 .include "../../graphics/glu/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/wxGTK24/buildlink3.mk b/x11/wxGTK24/buildlink3.mk
index 20135617c98..ca93208ab47 100644
--- a/x11/wxGTK24/buildlink3.mk
+++ b/x11/wxGTK24/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.12 2010/01/18 09:59:45 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.13 2010/06/13 22:45:53 wiz Exp $
 
 .include "../../mk/bsd.fast.prefs.mk"
 
@@ -8,7 +8,7 @@ BUILDLINK_TREE+=	wxGTK24
 WXGTK24_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.wxGTK24+=	wxGTK24>=2.4.2
-BUILDLINK_ABI_DEPENDS.wxGTK24?=	wxGTK24>=2.4.2nb15
+BUILDLINK_ABI_DEPENDS.wxGTK24?=	wxGTK24>=2.4.2nb17
 BUILDLINK_PKGSRCDIR.wxGTK24?=	../../x11/wxGTK24
 
 .include "../../devel/zlib/buildlink3.mk"
diff --git a/x11/wxGTK24/distinfo b/x11/wxGTK24/distinfo
index c13939e0045..517fbae3217 100644
--- a/x11/wxGTK24/distinfo
+++ b/x11/wxGTK24/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.10 2010/02/16 17:33:39 taca Exp $
+$NetBSD: distinfo,v 1.11 2010/06/13 22:45:53 wiz Exp $
 
 SHA1 (wxGTK-2.4.2.tar.bz2) = 3f1ebacaaf8eb5510c14ee10bafbc5f225be842c
 RMD160 (wxGTK-2.4.2.tar.bz2) = 8076d1ba31c9b23becb241cbad5a83763fee776e
 Size (wxGTK-2.4.2.tar.bz2) = 5381935 bytes
-SHA1 (patch-aa) = 1d6b86da5e7a1fd3a13805465e9059d21dbbfc7a
+SHA1 (patch-aa) = f7510b2dafd73da3c79808b141fee6a60cd47269
 SHA1 (patch-ab) = bab52051778a93439cfd3144f052bdbcc7024e30
 SHA1 (patch-ac) = 06a047a28260d30516b87d85a4dd4d5a6c18cfc4
 SHA1 (patch-ad) = 809a12f89b018373910b31442dfd315276cafbdf
diff --git a/x11/wxGTK24/patches/patch-aa b/x11/wxGTK24/patches/patch-aa
index 2ac91d155a9..bb14e9ee7f1 100644
--- a/x11/wxGTK24/patches/patch-aa
+++ b/x11/wxGTK24/patches/patch-aa
@@ -1,6 +1,6 @@
-$NetBSD: patch-aa,v 1.4 2009/11/29 20:16:20 joerg Exp $
+$NetBSD: patch-aa,v 1.5 2010/06/13 22:45:53 wiz Exp $
 
---- configure.orig	2003-09-21 13:31:30.000000000 +0200
+--- configure.orig	2003-09-21 11:31:30.000000000 +0000
 +++ configure
 @@ -1247,7 +1247,7 @@ EOF
  
@@ -24,6 +24,32 @@ $NetBSD: patch-aa,v 1.4 2009/11/29 20:16:20 joerg Exp $
  
  
  cat > confcache <<\EOF
+@@ -11972,9 +11973,9 @@ fi
+ echo "$ac_t""$ac_cv_header_png_h" 1>&6
+ 
+             if test "$ac_cv_header_png_h" = "yes"; then
+-                echo $ac_n "checking for png_check_sig in -lpng""... $ac_c" 1>&6
+-echo "configure:11977: checking for png_check_sig in -lpng" >&5
+-ac_lib_var=`echo png'_'png_check_sig | sed 'y%./+-%__p_%'`
++                echo $ac_n "checking for png_sig_cmp in -lpng""... $ac_c" 1>&6
++echo "configure:11977: checking for png_sig_cmp in -lpng" >&5
++ac_lib_var=`echo png'_'png_sig_cmp | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -11986,10 +11987,10 @@ cat > conftest.$ac_ext <<EOF
+ /* Override any gcc2 internal prototype to avoid an error.  */
+ /* We use char because int might match the return type of a gcc2
+     builtin and then its argument prototype would still apply.  */
+-char png_check_sig();
++char png_sig_cmp();
+ 
+ int main() {
+-png_check_sig()
++png_sig_cmp()
+ ; return 0; }
+ EOF
+ if { (eval echo configure:11996: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
 @@ -13381,6 +13382,101 @@ echo "configure:13351: checking PANGOFT2
    fi
  
diff --git a/x11/wxGTK26-contrib/Makefile b/x11/wxGTK26-contrib/Makefile
index 7c1a3696db6..6bd5d43d5ec 100644
--- a/x11/wxGTK26-contrib/Makefile
+++ b/x11/wxGTK26-contrib/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.4 2010/01/18 09:59:45 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2010/06/13 22:45:54 wiz Exp $
 #
 
 .include "../../x11/wxGTK26/Makefile.common"
 
 PKGNAME=		${DISTNAME:S/wxGTK/wxGTK-contrib/}
-PKGREVISION=		4
+PKGREVISION=		6
 MAINTAINER=		pkgsrc-users@NetBSD.org
 COMMENT=		GTK-based implementation of the wxWidgets GUI library (contrib libraries)
 
diff --git a/x11/wxGTK26-contrib/buildlink3.mk b/x11/wxGTK26-contrib/buildlink3.mk
index 5eb298bd3e7..ae124290bc3 100644
--- a/x11/wxGTK26-contrib/buildlink3.mk
+++ b/x11/wxGTK26-contrib/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2010/01/18 09:59:45 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2010/06/13 22:45:54 wiz Exp $
 
 BUILDLINK_TREE+=	wxGTK-contrib
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=	wxGTK-contrib
 WXGTK_CONTRIB_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.wxGTK-contrib+=	wxGTK-contrib>=2.6.0nb2
-BUILDLINK_ABI_DEPENDS.wxGTK-contrib?=	wxGTK-contrib>=2.6.3nb4
+BUILDLINK_ABI_DEPENDS.wxGTK-contrib?=	wxGTK-contrib>=2.6.3nb6
 BUILDLINK_PKGSRCDIR.wxGTK-contrib?=	../../x11/wxGTK26-contrib
 
 .include "../../devel/zlib/buildlink3.mk"
diff --git a/x11/wxGTK26/Makefile b/x11/wxGTK26/Makefile
index 4d1afe935e7..76018af0735 100644
--- a/x11/wxGTK26/Makefile
+++ b/x11/wxGTK26/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.5 2010/02/16 17:35:34 taca Exp $
+# $NetBSD: Makefile,v 1.6 2010/06/13 22:45:53 wiz Exp $
 #
 
 .include "Makefile.common"
 
-PKGREVISION=		6
+PKGREVISION=		7
 COMMENT=		GTK-based implementation of the wxWidgets GUI library
 
 post-build:
diff --git a/x11/wxGTK26/buildlink3.mk b/x11/wxGTK26/buildlink3.mk
index fbf039552e2..25ab8665c0a 100644
--- a/x11/wxGTK26/buildlink3.mk
+++ b/x11/wxGTK26/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2010/01/18 09:59:45 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2010/06/13 22:45:54 wiz Exp $
 
 BUILDLINK_TREE+=	wxGTK
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=	wxGTK
 WXGTK_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.wxGTK+=	wxGTK>=2.6.0nb2
-BUILDLINK_ABI_DEPENDS.wxGTK+=	wxGTK>=2.6.3nb5
+BUILDLINK_ABI_DEPENDS.wxGTK+=	wxGTK>=2.6.3nb7
 BUILDLINK_PKGSRCDIR.wxGTK?=	../../x11/wxGTK26
 
 .include "../../devel/zlib/buildlink3.mk"
diff --git a/x11/wxGTK26/distinfo b/x11/wxGTK26/distinfo
index 04b6f3fea91..92a523b5ff6 100644
--- a/x11/wxGTK26/distinfo
+++ b/x11/wxGTK26/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.4 2010/02/16 17:35:34 taca Exp $
+$NetBSD: distinfo,v 1.5 2010/06/13 22:45:54 wiz Exp $
 
 SHA1 (wxGTK-2.6.3-libtool.diff3.bz2) = 657566a9384a4bc160dffd26678b5e0c6a1cb5b2
 RMD160 (wxGTK-2.6.3-libtool.diff3.bz2) = 233af8dd61317ed1771c1862c6cec65f131b6de0
@@ -6,7 +6,7 @@ Size (wxGTK-2.6.3-libtool.diff3.bz2) = 136446 bytes
 SHA1 (wxGTK-2.6.3.tar.bz2) = 7c2dfe27a56aa99b4ea557a436bf84a13a579a9d
 RMD160 (wxGTK-2.6.3.tar.bz2) = d7465860d7c07b42d299d4b4c5d015b25f96a9dd
 Size (wxGTK-2.6.3.tar.bz2) = 7213119 bytes
-SHA1 (patch-aa) = 0ef5ae28b70a3290e37363193248365f4cf03cec
+SHA1 (patch-aa) = ea46005e47f33a9e3d76f23b463b474fd0691e32
 SHA1 (patch-ab) = 3e9c6bc0df33e466390a4f6483b1c84e2eb9257b
 SHA1 (patch-ac) = 50bd7d4291e44dac1d2bbbae1b12167177f5ef01
 SHA1 (patch-ad) = fb51bb80451d39ba2bba53d42722327888b4a0be
diff --git a/x11/wxGTK26/patches/patch-aa b/x11/wxGTK26/patches/patch-aa
index 8d48d044b7b..f69325c83e1 100644
--- a/x11/wxGTK26/patches/patch-aa
+++ b/x11/wxGTK26/patches/patch-aa
@@ -1,7 +1,7 @@
-$NetBSD: patch-aa,v 1.1.1.1 2008/09/22 19:44:05 joerg Exp $
+$NetBSD: patch-aa,v 1.2 2010/06/13 22:45:54 wiz Exp $
 
---- configure.orig	2006-03-22 00:42:05.000000000 +0100
-+++ configure	2006-10-08 06:26:28.000000000 +0200
+--- configure.orig	2006-03-21 23:42:05.000000000 +0000
++++ configure
 @@ -1820,7 +1820,7 @@ _ACEOF
  
      DEFAULT_DEFAULT_wxUSE_MOTIF=1
@@ -21,6 +21,59 @@ $NetBSD: patch-aa,v 1.1.1.1 2008/09/22 19:44:05 joerg Exp $
  
  echo "$as_me:$LINENO: checking for libraries directory" >&5
  echo $ECHO_N "checking for libraries directory... $ECHO_C" >&6
+@@ -24519,9 +24520,9 @@ fi
+ 
+ 
+             if test "$ac_cv_header_png_h" = "yes"; then
+-                echo "$as_me:$LINENO: checking for png_check_sig in -lpng" >&5
+-echo $ECHO_N "checking for png_check_sig in -lpng... $ECHO_C" >&6
+-if test "${ac_cv_lib_png_png_check_sig+set}" = set; then
++                echo "$as_me:$LINENO: checking for png_sig_cmp in -lpng" >&5
++echo $ECHO_N "checking for png_sig_cmp in -lpng... $ECHO_C" >&6
++if test "${ac_cv_lib_png_png_sig_cmp+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+@@ -24539,11 +24540,11 @@ extern "C"
+ #endif
+ /* We use char because int might match the return type of a gcc2
+    builtin and then its argument prototype would still apply.  */
+-char png_check_sig ();
++char png_sig_cmp ();
+ int
+ main ()
+ {
+-png_check_sig ();
++png_sig_cmp ();
+   ;
+   return 0;
+ }
+@@ -24570,20 +24571,20 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+-  ac_cv_lib_png_png_check_sig=yes
++  ac_cv_lib_png_png_sig_cmp=yes
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_cv_lib_png_png_check_sig=no
++ac_cv_lib_png_png_sig_cmp=no
+ fi
+ rm -f conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_lib_png_png_check_sig" >&5
+-echo "${ECHO_T}$ac_cv_lib_png_png_check_sig" >&6
+-if test $ac_cv_lib_png_png_check_sig = yes; then
++echo "$as_me:$LINENO: result: $ac_cv_lib_png_png_sig_cmp" >&5
++echo "${ECHO_T}$ac_cv_lib_png_png_sig_cmp" >&6
++if test $ac_cv_lib_png_png_sig_cmp = yes; then
+   PNG_LINK=" -lpng -lz"
+ fi
+ 
 @@ -36663,6 +36664,9 @@ echo "$as_me: WARNING: BeOS threads are 
                      THREAD_OPTS="-mt $THREAD_OPTS"
                  fi
diff --git a/x11/wxGTK28-contrib/Makefile b/x11/wxGTK28-contrib/Makefile
index 911f6d320dc..c0e235c0c6c 100644
--- a/x11/wxGTK28-contrib/Makefile
+++ b/x11/wxGTK28-contrib/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.5 2010/01/18 09:59:45 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2010/06/13 22:45:54 wiz Exp $
 #
 
 .include "../../x11/wxGTK28/Makefile.common"
 
 PKGNAME=		${DISTNAME:S/wxGTK/wxGTK28-contrib/}
-PKGREVISION=		2
+PKGREVISION=		4
 COMMENT=		GTK-based implementation of the wxWidgets GUI library (contrib libraries)
 
 USE_TOOLS+=		gmake
diff --git a/x11/wxGTK28-contrib/buildlink3.mk b/x11/wxGTK28-contrib/buildlink3.mk
index 9d9e062226e..5d1b2c09605 100644
--- a/x11/wxGTK28-contrib/buildlink3.mk
+++ b/x11/wxGTK28-contrib/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2010/01/18 09:59:45 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2010/06/13 22:45:54 wiz Exp $
 
 BUILDLINK_TREE+=	wxGTK28-contrib
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=	wxGTK28-contrib
 WXGTK28_CONTRIB_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.wxGTK28-contrib+=	wxGTK28-contrib>=2.8.10
-BUILDLINK_ABI_DEPENDS.wxGTK28-contrib?=	wxGTK28-contrib>=2.8.10nb2
+BUILDLINK_ABI_DEPENDS.wxGTK28-contrib?=	wxGTK28-contrib>=2.8.10nb4
 BUILDLINK_PKGSRCDIR.wxGTK28-contrib?=	../../x11/wxGTK28-contrib
 
 .include "../../x11/wxGTK28/buildlink3.mk"
diff --git a/x11/wxGTK28/Makefile b/x11/wxGTK28/Makefile
index b5be9cef99c..94deddf7ac8 100644
--- a/x11/wxGTK28/Makefile
+++ b/x11/wxGTK28/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.9 2010/02/19 17:34:41 sno Exp $
+# $NetBSD: Makefile,v 1.10 2010/06/13 22:45:54 wiz Exp $
 #
 
 .include "../../x11/wxGTK28/Makefile.common"
 
-PKGREVISION=	6
+PKGREVISION=	7
 
 PKGNAME=		${DISTNAME:S/wxGTK/wxGTK28/}
 COMMENT=		GTK-based implementation of the wxWidgets GUI library
diff --git a/x11/wxGTK28/buildlink3.mk b/x11/wxGTK28/buildlink3.mk
index c61c80258b9..81a777d47e4 100644
--- a/x11/wxGTK28/buildlink3.mk
+++ b/x11/wxGTK28/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.6 2010/01/18 09:59:45 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2010/06/13 22:45:54 wiz Exp $
 
 BUILDLINK_TREE+=	wxGTK28
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=	wxGTK28
 WXGTK28_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.wxGTK28+=	wxGTK28>=2.8.10
-BUILDLINK_ABI_DEPENDS.wxGTK28?=	wxGTK28>=2.8.10nb4
+BUILDLINK_ABI_DEPENDS.wxGTK28?=	wxGTK28>=2.8.10nb7
 BUILDLINK_PKGSRCDIR.wxGTK28?=	../../x11/wxGTK28
 
 .include "../../devel/gettext-lib/buildlink3.mk"
diff --git a/x11/wxGTK28/distinfo b/x11/wxGTK28/distinfo
index 2c8863243a4..794d0e516ad 100644
--- a/x11/wxGTK28/distinfo
+++ b/x11/wxGTK28/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.8 2010/02/16 17:38:14 taca Exp $
+$NetBSD: distinfo,v 1.9 2010/06/13 22:45:54 wiz Exp $
 
 SHA1 (wxGTK-2.8.10-libtool.diff.bz2) = 62ff30c26efdd73252bed2d07b82a9b9d3ef890f
 RMD160 (wxGTK-2.8.10-libtool.diff.bz2) = 64e1c32caa4bd6a0503bce4764e3ddc1cba68f8a
@@ -6,7 +6,7 @@ Size (wxGTK-2.8.10-libtool.diff.bz2) = 154573 bytes
 SHA1 (wxGTK-2.8.10.tar.bz2) = 1e4bee16a423efeef665ed70e82b6e7dc5468cf4
 RMD160 (wxGTK-2.8.10.tar.bz2) = b007de9b19ef4830d9f484c0d12595a14e66d432
 Size (wxGTK-2.8.10.tar.bz2) = 9365627 bytes
-SHA1 (patch-aa) = 1a30c79f07ea8ea5dff02fad9b5e1ba8dadde01a
+SHA1 (patch-aa) = fbcfd8e6abaabab393f24dc368c1c6b8447a75be
 SHA1 (patch-ab) = 82960daef0616824718f3c04929871aeb0e258a2
 SHA1 (patch-ac) = 50cf253797f2dee8b9dab08d138d0070e25e7a8c
 SHA1 (patch-ad) = b07a55257347633edb8997201c82f83619d1d650
diff --git a/x11/wxGTK28/patches/patch-aa b/x11/wxGTK28/patches/patch-aa
index 27b2277c308..0379533ebc8 100644
--- a/x11/wxGTK28/patches/patch-aa
+++ b/x11/wxGTK28/patches/patch-aa
@@ -1,6 +1,6 @@
-$NetBSD: patch-aa,v 1.2 2009/05/15 07:09:00 adam Exp $
+$NetBSD: patch-aa,v 1.3 2010/06/13 22:45:54 wiz Exp $
 
---- configure.orig	2009-03-06 13:17:38.000000000 +0100
+--- configure.orig	2009-03-06 12:17:38.000000000 +0000
 +++ configure
 @@ -1962,7 +1962,7 @@ _ACEOF
  
@@ -37,6 +37,59 @@ $NetBSD: patch-aa,v 1.2 2009/05/15 07:09:00 adam Exp $
      /usr/X11R6/include        \
      /usr/X11R6.4/include      \
                                \
+@@ -26379,9 +26380,9 @@ echo "${ECHO_T}$ac_cv_header_png_h" >&6
+ 
+ 
+             if test "$ac_cv_header_png_h" = "yes"; then
+-                echo "$as_me:$LINENO: checking for png_check_sig in -lpng" >&5
+-echo $ECHO_N "checking for png_check_sig in -lpng... $ECHO_C" >&6
+-if test "${ac_cv_lib_png_png_check_sig+set}" = set; then
++                echo "$as_me:$LINENO: checking for png_sig_cmp in -lpng" >&5
++echo $ECHO_N "checking for png_sig_cmp in -lpng... $ECHO_C" >&6
++if test "${ac_cv_lib_png_png_sig_cmp+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+@@ -26399,11 +26400,11 @@ extern "C"
+ #endif
+ /* We use char because int might match the return type of a gcc2
+    builtin and then its argument prototype would still apply.  */
+-char png_check_sig ();
++char png_sig_cmp ();
+ int
+ main ()
+ {
+-png_check_sig ();
++png_sig_cmp ();
+   ;
+   return 0;
+ }
+@@ -26429,20 +26430,20 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+-  ac_cv_lib_png_png_check_sig=yes
++  ac_cv_lib_png_png_sig_cmp=yes
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_cv_lib_png_png_check_sig=no
++ac_cv_lib_png_png_sig_cmp=no
+ fi
+ rm -f conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_lib_png_png_check_sig" >&5
+-echo "${ECHO_T}$ac_cv_lib_png_png_check_sig" >&6
+-if test $ac_cv_lib_png_png_check_sig = yes; then
++echo "$as_me:$LINENO: result: $ac_cv_lib_png_png_sig_cmp" >&5
++echo "${ECHO_T}$ac_cv_lib_png_png_sig_cmp" >&6
++if test $ac_cv_lib_png_png_sig_cmp = yes; then
+   PNG_LINK=" -lpng -lz"
+ fi
+ 
 @@ -39478,6 +39479,9 @@ echo "$as_me: WARNING: BeOS threads are 
                      THREAD_OPTS="-mt $THREAD_OPTS"
                  fi
diff --git a/x11/wxhaskell/Makefile b/x11/wxhaskell/Makefile
index 0516cf8010d..8cd521b4e08 100644
--- a/x11/wxhaskell/Makefile
+++ b/x11/wxhaskell/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.26 2010/03/24 19:43:29 asau Exp $
+# $NetBSD: Makefile,v 1.27 2010/06/13 22:45:54 wiz Exp $
 
 DISTNAME=		wxhaskell-src-0.9.4
 PKGNAME=		${DISTNAME:S/-src//}
-PKGREVISION=		11
+PKGREVISION=		12
 CATEGORIES=		x11
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=wxhaskell/}
 EXTRACT_SUFX=		.zip
diff --git a/x11/xcursorgen/Makefile b/x11/xcursorgen/Makefile
index ff19170e4af..171e0b12cd2 100644
--- a/x11/xcursorgen/Makefile
+++ b/x11/xcursorgen/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.20 2009/06/30 00:07:25 joerg Exp $
+# $NetBSD: Makefile,v 1.21 2010/06/13 22:45:54 wiz Exp $
 
 DISTNAME=	xcursorgen-4.3.0
-PKGREVISION=	4
+PKGREVISION=	5
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_LOCAL}
 EXTRACT_SUFX=	.tar.bz2
diff --git a/x11/xfce4-clipman-plugin/Makefile b/x11/xfce4-clipman-plugin/Makefile
index 4520bb25460..5f2e3315cde 100644
--- a/x11/xfce4-clipman-plugin/Makefile
+++ b/x11/xfce4-clipman-plugin/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2009/08/26 19:57:04 sno Exp $
+# $NetBSD: Makefile,v 1.16 2010/06/13 22:45:54 wiz Exp $
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
@@ -8,7 +8,7 @@ XFCE4_VERSION=	0.8.0
 
 DISTNAME=	xfce4-clipman-plugin-${XFCE4_VERSION}
 #PKGREVISION=	1
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	sysutils
 MASTER_SITES=	http://goodies.xfce.org/releases/xfce4-clipman-plugin/
 COMMENT=	Xfce clipboard plugin
diff --git a/x11/xfce4-clipman-plugin/buildlink3.mk b/x11/xfce4-clipman-plugin/buildlink3.mk
index e4fc7694611..82e02f9e0f9 100644
--- a/x11/xfce4-clipman-plugin/buildlink3.mk
+++ b/x11/xfce4-clipman-plugin/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.18 2009/09/16 01:31:13 reed Exp $
+# $NetBSD: buildlink3.mk,v 1.19 2010/06/13 22:45:54 wiz Exp $
 
 BUILDLINK_TREE+=	xfce4-clipman-plugin
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=	xfce4-clipman-plugin
 XFCE4_CLIPMAN_PLUGIN_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.xfce4-clipman-plugin+=	xfce4-clipman-plugin>=0.8.0
-BUILDLINK_ABI_DEPENDS.xfce4-clipman-plugin?=	xfce4-clipman-plugin>=0.8.0nb1
+BUILDLINK_ABI_DEPENDS.xfce4-clipman-plugin?=	xfce4-clipman-plugin>=0.8.0nb2
 BUILDLINK_PKGSRCDIR.xfce4-clipman-plugin?=	../../x11/xfce4-clipman-plugin
 
 .include "../../x11/xfce4-panel/buildlink3.mk"
diff --git a/x11/xfce4-desktop/Makefile b/x11/xfce4-desktop/Makefile
index 9e258078dcb..5c9d1ce8883 100644
--- a/x11/xfce4-desktop/Makefile
+++ b/x11/xfce4-desktop/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.34 2009/09/16 01:15:35 reed Exp $
+# $NetBSD: Makefile,v 1.35 2010/06/13 22:45:54 wiz Exp $
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
@@ -6,6 +6,7 @@ PKG_DESTDIR_SUPPORT=	user-destdir
 
 DISTNAME=	xfdesktop-${XFCE4_VERSION}
 PKGNAME=	xfce4-desktop-${XFCE4_VERSION}
+PKGREVISION=	1
 CATEGORIES=	x11
 COMMENT=	Xfce desktop background manager
 
diff --git a/x11/xfce4-exo/Makefile b/x11/xfce4-exo/Makefile
index 8456ed196b8..af349fa766f 100644
--- a/x11/xfce4-exo/Makefile
+++ b/x11/xfce4-exo/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2010/01/25 13:55:53 drochner Exp $
+# $NetBSD: Makefile,v 1.12 2010/06/13 22:45:54 wiz Exp $
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
@@ -8,7 +8,7 @@ XFCE4_VERSION=	0.3.101
 
 DISTNAME=	exo-${XFCE4_VERSION}
 PKGNAME=	xfce4-exo-${XFCE4_VERSION}
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	x11
 COMMENT=	Xfce extension library
 
diff --git a/x11/xfce4-exo/buildlink3.mk b/x11/xfce4-exo/buildlink3.mk
index 78327c2545d..3219789b792 100644
--- a/x11/xfce4-exo/buildlink3.mk
+++ b/x11/xfce4-exo/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.6 2009/09/16 01:15:35 reed Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2010/06/13 22:45:55 wiz Exp $
 
 BUILDLINK_TREE+=	xfce4-exo
 
@@ -6,6 +6,7 @@ BUILDLINK_TREE+=	xfce4-exo
 XFCE4_EXO_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.xfce4-exo+=	xfce4-exo>=0.3.100
+BUILDLINK_ABI_DEPENDS.xfce4-exo?=	xfce4-exo>=0.3.101nb2
 BUILDLINK_PKGSRCDIR.xfce4-exo?=	../../x11/xfce4-exo
 
 pkgbase := xfce4-exo
diff --git a/x11/xfce4-eyes-plugin/Makefile b/x11/xfce4-eyes-plugin/Makefile
index fd4f1a43098..c2c5d644852 100644
--- a/x11/xfce4-eyes-plugin/Makefile
+++ b/x11/xfce4-eyes-plugin/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2009/08/26 19:56:56 sno Exp $
+# $NetBSD: Makefile,v 1.4 2010/06/13 22:45:55 wiz Exp $
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
@@ -7,7 +7,7 @@ PKG_DESTDIR_SUPPORT=	user-destdir
 XFCE4_VERSION=	4.4.0
 
 DISTNAME=	xfce4-eyes-plugin-${XFCE4_VERSION}
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	x11
 MASTER_SITES=	http://goodies.xfce.org/releases/xfce4-eyes-plugin/
 COMMENT=	Xfce eyes plugin
diff --git a/x11/xfce4-eyes-plugin/buildlink3.mk b/x11/xfce4-eyes-plugin/buildlink3.mk
index cb3d71be8b9..c78540aaf47 100644
--- a/x11/xfce4-eyes-plugin/buildlink3.mk
+++ b/x11/xfce4-eyes-plugin/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2009/09/16 01:31:13 reed Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2010/06/13 22:45:55 wiz Exp $
 
 BUILDLINK_TREE+=	xfce4-eyes-plugin
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=	xfce4-eyes-plugin
 XFCE4_EYES_PLUGIN_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.xfce4-eyes-plugin+=	xfce4-eyes-plugin>=4.4.0
-BUILDLINK_ABI_DEPENDS.xfce4-eyes-plugin?=	xfce4-eyes-plugin>=4.4.0nb1
+BUILDLINK_ABI_DEPENDS.xfce4-eyes-plugin?=	xfce4-eyes-plugin>=4.4.0nb2
 BUILDLINK_PKGSRCDIR.xfce4-eyes-plugin?=	../../x11/xfce4-eyes-plugin
 
 .include "../../x11/xfce4-panel/buildlink3.mk"
diff --git a/x11/xfce4-gtk2-engine/Makefile b/x11/xfce4-gtk2-engine/Makefile
index 627b1d3d758..2ee56184673 100644
--- a/x11/xfce4-gtk2-engine/Makefile
+++ b/x11/xfce4-gtk2-engine/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2009/09/16 01:15:35 reed Exp $
+# $NetBSD: Makefile,v 1.14 2010/06/13 22:45:55 wiz Exp $
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
@@ -8,6 +8,7 @@ XFCE4_VERSION=	2.6.0
 
 DISTNAME=	gtk-xfce-engine-${XFCE4_VERSION}
 PKGNAME=	xfce4-gtk2-engine-${XFCE4_VERSION}
+PKGREVISION=	1
 CATEGORIES=	x11
 COMMENT=	Xfce GTK2 themes
 
diff --git a/x11/xfce4-notes-plugin/Makefile b/x11/xfce4-notes-plugin/Makefile
index c470be6b80b..9af6f0fc9dd 100644
--- a/x11/xfce4-notes-plugin/Makefile
+++ b/x11/xfce4-notes-plugin/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2009/08/26 19:57:04 sno Exp $
+# $NetBSD: Makefile,v 1.17 2010/06/13 22:45:55 wiz Exp $
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
@@ -8,7 +8,7 @@ XFCE4_VERSION=	1.6.0
 
 DISTNAME=	xfce4-notes-plugin-${XFCE4_VERSION}
 #PKGREVISION=	1
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	sysutils
 MASTER_SITES=	http://goodies.xfce.org/releases/xfce4-notes-plugin/
 COMMENT=	Xfce notes plugin
diff --git a/x11/xfce4-notes-plugin/buildlink3.mk b/x11/xfce4-notes-plugin/buildlink3.mk
index a666d9bda57..b4399b518de 100644
--- a/x11/xfce4-notes-plugin/buildlink3.mk
+++ b/x11/xfce4-notes-plugin/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.20 2009/09/16 01:31:13 reed Exp $
+# $NetBSD: buildlink3.mk,v 1.21 2010/06/13 22:45:55 wiz Exp $
 
 BUILDLINK_TREE+=	xfce4-notes-plugin
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=	xfce4-notes-plugin
 XFCE4_NOTES_PLUGIN_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.xfce4-notes-plugin+=	xfce4-notes-plugin>=1.6.0
-BUILDLINK_ABI_DEPENDS.xfce4-notes-plugin?=	xfce4-notes-plugin>=1.6.0nb1
+BUILDLINK_ABI_DEPENDS.xfce4-notes-plugin?=	xfce4-notes-plugin>=1.6.0nb2
 BUILDLINK_PKGSRCDIR.xfce4-notes-plugin?=	../../x11/xfce4-notes-plugin
 
 .include "../../x11/xfce4-panel/buildlink3.mk"
diff --git a/x11/xfce4-panel/Makefile b/x11/xfce4-panel/Makefile
index c69cc44e386..86a77f7166f 100644
--- a/x11/xfce4-panel/Makefile
+++ b/x11/xfce4-panel/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.37 2010/05/30 19:34:46 drochner Exp $
+# $NetBSD: Makefile,v 1.38 2010/06/13 22:45:55 wiz Exp $
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
 .include "../../meta-pkgs/xfce4/Makefile.common"
 
-PKGREVISION=		1
+PKGREVISION=		2
 
 XFCE4_VERSION=		4.6.2
 
diff --git a/x11/xfce4-panel/buildlink3.mk b/x11/xfce4-panel/buildlink3.mk
index 5d06fc723ef..1c050c4422c 100644
--- a/x11/xfce4-panel/buildlink3.mk
+++ b/x11/xfce4-panel/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.25 2009/09/16 01:15:35 reed Exp $
+# $NetBSD: buildlink3.mk,v 1.26 2010/06/13 22:45:55 wiz Exp $
 
 BUILDLINK_TREE+=	xfce4-panel
 
@@ -6,6 +6,7 @@ BUILDLINK_TREE+=	xfce4-panel
 XFCE4_PANEL_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.xfce4-panel+=	xfce4-panel>=4.6.0
+BUILDLINK_ABI_DEPENDS.xfce4-panel?=	xfce4-panel>=4.6.2nb2
 BUILDLINK_PKGSRCDIR.xfce4-panel?=	../../x11/xfce4-panel
 
 .include "../../devel/glib2/buildlink3.mk"
diff --git a/x11/xfce4-places-plugin/Makefile b/x11/xfce4-places-plugin/Makefile
index 784c290293c..a1a5576292c 100644
--- a/x11/xfce4-places-plugin/Makefile
+++ b/x11/xfce4-places-plugin/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2009/08/26 19:57:02 sno Exp $
+# $NetBSD: Makefile,v 1.5 2010/06/13 22:45:55 wiz Exp $
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
@@ -7,7 +7,7 @@ PKG_DESTDIR_SUPPORT=	user-destdir
 XFCE4_VERSION=	1.0.0
 
 DISTNAME=	xfce4-places-plugin-${XFCE4_VERSION}
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	x11
 MASTER_SITES=	http://goodies.xfce.org/releases/xfce4-places-plugin/
 COMMENT=	Xfce Places plugin
diff --git a/x11/xfce4-places-plugin/buildlink3.mk b/x11/xfce4-places-plugin/buildlink3.mk
index 2931ef979c9..0cb09560e70 100644
--- a/x11/xfce4-places-plugin/buildlink3.mk
+++ b/x11/xfce4-places-plugin/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2009/09/16 01:31:13 reed Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2010/06/13 22:45:55 wiz Exp $
 
 BUILDLINK_TREE+=	xfce4-places-plugin
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=	xfce4-places-plugin
 XFCE4_PLACES_PLUGIN_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.xfce4-places-plugin+=	xfce4-places-plugin>=1.0.0
-BUILDLINK_ABI_DEPENDS.xfce4-places-plugin?=	xfce4-places-plugin>=1.0.0nb1
+BUILDLINK_ABI_DEPENDS.xfce4-places-plugin?=	xfce4-places-plugin>=1.0.0nb2
 BUILDLINK_PKGSRCDIR.xfce4-places-plugin?=	../../x11/xfce4-places-plugin
 
 .include "../../sysutils/xfce4-thunar/buildlink3.mk"
diff --git a/x11/xfce4-screenshooter-plugin/Makefile b/x11/xfce4-screenshooter-plugin/Makefile
index 38058b48a2e..60f194c1162 100644
--- a/x11/xfce4-screenshooter-plugin/Makefile
+++ b/x11/xfce4-screenshooter-plugin/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2009/08/26 19:57:00 sno Exp $
+# $NetBSD: Makefile,v 1.4 2010/06/13 22:45:55 wiz Exp $
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
@@ -7,7 +7,7 @@ PKG_DESTDIR_SUPPORT=	user-destdir
 XFCE4_VERSION=	1.0.0
 
 DISTNAME=	xfce4-screenshooter-plugin-${XFCE4_VERSION}
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	x11
 MASTER_SITES=	http://goodies.xfce.org/releases/xfce4-screenshooter-plugin/
 COMMENT=	Xfce screenshot plugin
diff --git a/x11/xfce4-screenshooter-plugin/buildlink3.mk b/x11/xfce4-screenshooter-plugin/buildlink3.mk
index 0613334137f..b7eac607ee8 100644
--- a/x11/xfce4-screenshooter-plugin/buildlink3.mk
+++ b/x11/xfce4-screenshooter-plugin/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2009/09/16 01:31:14 reed Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2010/06/13 22:45:55 wiz Exp $
 
 BUILDLINK_TREE+=	xfce4-screenshooter-plugin
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=	xfce4-screenshooter-plugin
 XFCE4_SCREENSHOOTER_PLUGIN_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.xfce4-screenshooter-plugin+=	xfce4-screenshooter-plugin>=1.0.0
-BUILDLINK_ABI_DEPENDS.xfce4-screenshooter-plugin?=	xfce4-screenshooter-plugin>=1.0.0nb1
+BUILDLINK_ABI_DEPENDS.xfce4-screenshooter-plugin?=	xfce4-screenshooter-plugin>=1.0.0nb2
 BUILDLINK_PKGSRCDIR.xfce4-screenshooter-plugin?=	../../x11/xfce4-screenshooter-plugin
 
 .include "../../x11/xfce4-panel/buildlink3.mk"
diff --git a/x11/xfce4-session/Makefile b/x11/xfce4-session/Makefile
index cb3af8daa3a..b4d54a7f492 100644
--- a/x11/xfce4-session/Makefile
+++ b/x11/xfce4-session/Makefile
@@ -1,10 +1,11 @@
-# $NetBSD: Makefile,v 1.26 2009/09/16 01:15:35 reed Exp $
+# $NetBSD: Makefile,v 1.27 2010/06/13 22:45:55 wiz Exp $
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
 .include "../../meta-pkgs/xfce4/Makefile.common"
 
 DISTNAME=		xfce4-session-${XFCE4_VERSION}
+PKGREVISION=		1
 CATEGORIES=		x11
 COMMENT=		Xfce session manager
 
diff --git a/x11/xfce4-session/buildlink3.mk b/x11/xfce4-session/buildlink3.mk
index 3ffbd0c7986..8cfb9c73455 100644
--- a/x11/xfce4-session/buildlink3.mk
+++ b/x11/xfce4-session/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.21 2009/09/16 01:15:36 reed Exp $
+# $NetBSD: buildlink3.mk,v 1.22 2010/06/13 22:45:55 wiz Exp $
 
 BUILDLINK_TREE+=	xfce4-session
 
@@ -6,6 +6,7 @@ BUILDLINK_TREE+=	xfce4-session
 XFCE4_SESSION_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.xfce4-session+=	xfce4-session>=4.6.0
+BUILDLINK_ABI_DEPENDS.xfce4-session?=	xfce4-session>=4.6.1nb1
 BUILDLINK_PKGSRCDIR.xfce4-session?=	../../x11/xfce4-session
 
 .include "../../devel/glib2/buildlink3.mk"
diff --git a/x11/xfce4-settings/Makefile b/x11/xfce4-settings/Makefile
index 709d952e7db..659adf2ecb2 100644
--- a/x11/xfce4-settings/Makefile
+++ b/x11/xfce4-settings/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2010/02/16 13:35:40 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2010/06/13 22:45:56 wiz Exp $
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
@@ -7,7 +7,7 @@ PKG_DESTDIR_SUPPORT=	user-destdir
 XFCE4_VERSION=		4.6.3
 
 DISTNAME=		xfce4-settings-${XFCE4_VERSION}
-PKGREVISION=		1
+PKGREVISION=		2
 CATEGORIES=		x11
 COMMENT=		Xfce settings manager
 
diff --git a/x11/xfce4-terminal/Makefile b/x11/xfce4-terminal/Makefile
index bb3ea111d0d..7c0794be81c 100644
--- a/x11/xfce4-terminal/Makefile
+++ b/x11/xfce4-terminal/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2009/11/29 22:16:34 snj Exp $
+# $NetBSD: Makefile,v 1.13 2010/06/13 22:45:56 wiz Exp $
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
@@ -8,6 +8,7 @@ XFCE4_VERSION=	0.4.2
 
 DISTNAME=	Terminal-${XFCE4_VERSION}
 PKGNAME=	xfce4-terminal-${XFCE4_VERSION}
+PKGREVISION=	1
 CATEGORIES=	x11
 COMMENT=	Xfce terminal emulator
 
diff --git a/x11/xfce4-utils/Makefile b/x11/xfce4-utils/Makefile
index 6aef2a64997..552b44f5529 100644
--- a/x11/xfce4-utils/Makefile
+++ b/x11/xfce4-utils/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.34 2009/09/16 01:15:36 reed Exp $
+# $NetBSD: Makefile,v 1.35 2010/06/13 22:45:56 wiz Exp $
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
@@ -6,6 +6,7 @@ PKG_DESTDIR_SUPPORT=	user-destdir
 
 DISTNAME=	xfce-utils-${XFCE4_VERSION}
 PKGNAME=	xfce4-utils-${XFCE4_VERSION}
+PKGREVISION=	1
 CATEGORIES=	x11
 COMMENT=	Xfce utilities
 
diff --git a/x11/xglobe/Makefile b/x11/xglobe/Makefile
index fac9fe5b316..3f0cb065f8c 100644
--- a/x11/xglobe/Makefile
+++ b/x11/xglobe/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.35 2010/01/18 09:59:45 wiz Exp $
+# $NetBSD: Makefile,v 1.36 2010/06/13 22:45:56 wiz Exp $
 #
 
 DISTNAME=	xglobe-0.5
-PKGREVISION=	7
+PKGREVISION=	8
 CATEGORIES=	x11
 #
 # The original MASTER_SITE for the program responds "200 OK"
diff --git a/x11/xlockmore/Makefile b/x11/xlockmore/Makefile
index 221c226fcc0..d654bf8213d 100644
--- a/x11/xlockmore/Makefile
+++ b/x11/xlockmore/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.81 2009/10/25 22:54:03 tron Exp $
+# $NetBSD: Makefile,v 1.82 2010/06/13 22:45:56 wiz Exp $
 
 .include "Makefile.common"
+PKGREVISION=	1
 
 COMMENT=	Like the XLock session-locker/screensaver, but with more
 
diff --git a/x11/xmms-osd/Makefile b/x11/xmms-osd/Makefile
index 9d549de3b60..902db4441c9 100644
--- a/x11/xmms-osd/Makefile
+++ b/x11/xmms-osd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2010/01/18 09:59:45 wiz Exp $
+# $NetBSD: Makefile,v 1.19 2010/06/13 22:45:56 wiz Exp $
 #
 
 PKG_DESTDIR_SUPPORT=	user-destdir
@@ -6,7 +6,7 @@ PKG_DESTDIR_SUPPORT=	user-destdir
 .include "../../x11/xosd/Makefile.common"
 
 PKGNAME=		${DISTNAME:S/xosd/xmms-osd/}
-PKGREVISION=		2
+PKGREVISION=		3
 
 COMMENT=		XMMS plugin that shows current status on your desktop
 CONFLICTS=		xosd<=2.2.0
diff --git a/x11/xpad/Makefile b/x11/xpad/Makefile
index ee51a096323..12791557057 100644
--- a/x11/xpad/Makefile
+++ b/x11/xpad/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.29 2009/08/26 19:58:42 sno Exp $
+# $NetBSD: Makefile,v 1.30 2010/06/13 22:45:56 wiz Exp $
 #
 
 DISTNAME=	xpad-1.12
-PKGREVISION=	9
+PKGREVISION=	10
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=xpad/}
 EXTRACT_SUFX=	.tar.bz2
diff --git a/x11/xplanet/Makefile b/x11/xplanet/Makefile
index a7128bf68af..f480dc5cb1f 100644
--- a/x11/xplanet/Makefile
+++ b/x11/xplanet/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.45 2010/03/21 16:29:44 wiz Exp $
+# $NetBSD: Makefile,v 1.46 2010/06/13 22:45:56 wiz Exp $
 
 DISTNAME=	xplanet-1.2.1
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=xplanet/}
 
diff --git a/x11/xscreensaver-demo/Makefile b/x11/xscreensaver-demo/Makefile
index badf32f7888..de6e2a50686 100644
--- a/x11/xscreensaver-demo/Makefile
+++ b/x11/xscreensaver-demo/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.33 2010/05/17 16:35:03 drochner Exp $
+# $NetBSD: Makefile,v 1.34 2010/06/13 22:45:56 wiz Exp $
 #
 
 PKGNAME=	${DISTNAME:S/-/-demo-/}
+PKGREVISION=	1
 COMMENT=	Demo viewer and configuration tool for xscreensaver
 
 PKG_DESTDIR_SUPPORT=	user-destdir
diff --git a/x11/xteddy2/Makefile b/x11/xteddy2/Makefile
index 56a1586bc07..f43f590e115 100644
--- a/x11/xteddy2/Makefile
+++ b/x11/xteddy2/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.31 2010/01/18 09:59:45 wiz Exp $
+# $NetBSD: Makefile,v 1.32 2010/06/13 22:45:56 wiz Exp $
 
 DISTNAME=	xteddy-2.0.1
-PKGREVISION=	12
+PKGREVISION=	13
 CATEGORIES=	x11 games
 MASTER_SITES=	http://staffwww.itn.liu.se/~stegu/xteddy/
 
diff --git a/x11/xvidcap-gtk2/Makefile b/x11/xvidcap-gtk2/Makefile
index 4f308f7a12a..591d17714d7 100644
--- a/x11/xvidcap-gtk2/Makefile
+++ b/x11/xvidcap-gtk2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2010/01/24 13:26:13 wiz Exp $
+# $NetBSD: Makefile,v 1.10 2010/06/13 22:45:57 wiz Exp $
 #
 
 PKG_DESTDIR_SUPPORT=	user-destdir
@@ -6,7 +6,7 @@ PKG_DESTDIR_SUPPORT=	user-destdir
 .include "../../x11/xvidcap/Makefile.common"
 
 PKGNAME=		${DISTNAME:S/-/-gtk2-/}
-PKGREVISION=		6
+PKGREVISION=		7
 COMMENT=		Capture X display to individual frames or MPEG video (GTK2 version)
 
 CONFLICTS+=		xvidcap<1.1.3nb3
diff --git a/x11/xvidcap/Makefile b/x11/xvidcap/Makefile
index 1d2a78f15c8..32f6c6cd94f 100644
--- a/x11/xvidcap/Makefile
+++ b/x11/xvidcap/Makefile
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.15 2010/01/24 13:26:13 wiz Exp $
+# $NetBSD: Makefile,v 1.16 2010/06/13 22:45:56 wiz Exp $
 #
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
 .include "Makefile.common"
 
-PKGREVISION=		9
+PKGREVISION=		10
 COMMENT=		Capture X display to individual frames or MPEG video
 
 CONFIGURE_ARGS+=	--without-gtk2
diff --git a/x11/zenity/Makefile b/x11/zenity/Makefile
index b8172dd7b57..c8a41ea11c3 100644
--- a/x11/zenity/Makefile
+++ b/x11/zenity/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.58 2009/10/22 17:21:34 drochner Exp $
+# $NetBSD: Makefile,v 1.59 2010/06/13 22:45:57 wiz Exp $
 #
 
 DISTNAME=	zenity-2.28.0
+PKGREVISION=	1
 CATEGORIES=	x11 gnome
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/zenity/2.28/}
 EXTRACT_SUFX=	.tar.bz2
author	wiz <wiz@pkgsrc.org>	2010-06-13 22:43:46 +0000
committer	wiz <wiz@pkgsrc.org>	2010-06-13 22:43:46 +0000
commit	92e0cb52cb783546e352182244f761180817e141 (patch)
tree	4a9b97c2969a25f1eeb6596ee96fc25429cef7d5 /x11
parent	01bd00f60b043c603cfe4fa796bf28af3a849cca (diff)
download	pkgsrc-92e0cb52cb783546e352182244f761180817e141.tar.gz