Bump BUILDLINK_RECOMMENDED of textproc/expat to 2.0.0 because

of the shlib major bump.
PKGREVISION++ for the dependencies.

235 files changed, 470 insertions, 311 deletions

diff --git a/x11/Terminal/Makefile b/x11/Terminal/Makefile
index 376d8e7f965..250876e7aec 100644
--- a/x11/Terminal/Makefile
+++ b/x11/Terminal/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.1.1.1 2005/10/15 18:47:39 minskim Exp $
+# $NetBSD: Makefile,v 1.2 2006/01/24 07:32:50 wiz Exp $
 #
 
 DISTNAME=		Terminal-0.2.4
+PKGREVISION=		1
 CATEGORIES=		x11
 MASTER_SITES=		http://download.berlios.de/xfce-goodies/
 EXTRACT_SUFX=		.tar.bz2
diff --git a/x11/XFree86-clients/Makefile b/x11/XFree86-clients/Makefile
index 0451bdc9ee0..060bac85e68 100644
--- a/x11/XFree86-clients/Makefile
+++ b/x11/XFree86-clients/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.19 2005/12/08 09:52:16 rillig Exp $
+# $NetBSD: Makefile,v 1.20 2006/01/24 07:32:50 wiz Exp $
 
 DISTNAME=		${DISTFILES}
 PKGNAME=		XFree86-clients-${XF_VER}
-PKGREVISION=		2
+PKGREVISION=		3
 CATEGORIES=		x11
 MASTER_SITES=		${MASTER_SITE_XFREE}
 DISTFILES=		XFree86-${XF_VER}-src-1.tgz XFree86-${XF_VER}-src-2.tgz \
diff --git a/x11/XFree86-libs/Makefile b/x11/XFree86-libs/Makefile
index e782a3b24cb..901988c7ff6 100644
--- a/x11/XFree86-libs/Makefile
+++ b/x11/XFree86-libs/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.23 2005/12/08 09:52:16 rillig Exp $
+# $NetBSD: Makefile,v 1.24 2006/01/24 07:32:50 wiz Exp $
 
 DISTNAME=		${DISTFILES}
 PKGNAME=		XFree86-libs-${XF_VER}
-PKGREVISION=		5
+PKGREVISION=		6
 CATEGORIES=		x11
 MASTER_SITES=		${MASTER_SITE_XFREE}
 DISTFILES=		XFree86-${XF_VER}-src-1.tgz XFree86-${XF_VER}-src-2.tgz \
diff --git a/x11/XFree86-libs/buildlink3.mk b/x11/XFree86-libs/buildlink3.mk
index 9e5ea05752e..590e1515ce2 100644
--- a/x11/XFree86-libs/buildlink3.mk
+++ b/x11/XFree86-libs/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2005/09/18 19:51:55 xtraeme Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2006/01/24 07:32:50 wiz Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 XFREE86_LIBS_BUILDLINK3_MK:=	${XFREE86_LIBS_BUILDLINK3_MK}+
@@ -19,7 +19,7 @@ BUILDLINK_PACKAGES:=	XFree86-libs ${BUILDLINK_PACKAGES}
 .if !empty(XFREE86_LIBS_BUILDLINK3_MK:M+)
 
 BUILDLINK_DEPENDS.XFree86-libs+=	XFree86-libs>=4.4.0
-BUILDLINK_RECOMMENDED.XFree86-libs+=	XFree86-libs>=4.4.0nb4
+BUILDLINK_RECOMMENDED.XFree86-libs+=	XFree86-libs>=4.4.0nb6
 BUILDLINK_PKGSRCDIR.XFree86-libs?=	../../x11/XFree86-libs
 BUILDLINK_TRANSFORM.XFree86-libs+=	-e "s|/${X11ROOT_PREFIX}/|/|"
 
diff --git a/x11/XFree86-server/Makefile b/x11/XFree86-server/Makefile
index e35194ba271..013727c26eb 100644
--- a/x11/XFree86-server/Makefile
+++ b/x11/XFree86-server/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.19 2005/12/08 09:52:17 rillig Exp $
+# $NetBSD: Makefile,v 1.20 2006/01/24 07:32:50 wiz Exp $
 
 DISTNAME=		${DISTFILES}
 PKGNAME=		XFree86-server-${XF_VER}
-PKGREVISION=		2
+PKGREVISION=		3
 CATEGORIES=		x11
 MASTER_SITES=		${MASTER_SITE_XFREE}
 DISTFILES=		XFree86-${XF_VER}-src-1.tgz XFree86-${XF_VER}-src-2.tgz \
diff --git a/x11/control-center/Makefile b/x11/control-center/Makefile
index 5955bdd6062..312920f1d67 100644
--- a/x11/control-center/Makefile
+++ b/x11/control-center/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.4 2005/12/05 23:55:23 rillig Exp $
+# $NetBSD: Makefile,v 1.5 2006/01/24 07:32:50 wiz Exp $
 
 DISTNAME=		control-center-1.4.0.5
+PKGREVISION=		1
 CATEGORIES=		x11 gnome
 MASTER_SITES=		${MASTER_SITE_GNOME:=sources/control-center/1.4/}
 
diff --git a/x11/control-center/buildlink3.mk b/x11/control-center/buildlink3.mk
index 047805505ec..1fd66c2a973 100644
--- a/x11/control-center/buildlink3.mk
+++ b/x11/control-center/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1.1.1 2005/05/31 22:09:35 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2006/01/24 07:32:50 wiz Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 CONTROL_CENTER_BUILDLINK3_MK:=	${CONTROL_CENTER_BUILDLINK3_MK}+
@@ -12,7 +12,7 @@ BUILDLINK_PACKAGES+=	control-center
 
 .if !empty(CONTROL_CENTER_BUILDLINK3_MK:M+)
 BUILDLINK_DEPENDS.control-center+=	control-center>=1.4.0.4nb9
-BUILDLINK_RECOMMENDED.control-center+=	control-center>=1.4.0.4nb10
+BUILDLINK_RECOMMENDED.control-center+=	control-center>=1.4.0.5nb1
 BUILDLINK_PKGSRCDIR.control-center?=	../../x11/control-center
 .endif	# CONTROL_CENTER_BUILDLINK3_MK
 
diff --git a/x11/devilspie/Makefile b/x11/devilspie/Makefile
index cbfcb26af7c..3a847e461fd 100644
--- a/x11/devilspie/Makefile
+++ b/x11/devilspie/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.20 2005/11/14 18:10:16 wiz Exp $
+# $NetBSD: Makefile,v 1.21 2006/01/24 07:32:50 wiz Exp $
 
 DISTNAME=		devilspie-0.16
+PKGREVISION=		1
 CATEGORIES=		x11
 MASTER_SITES=		http://www.burtonini.com/computing/
 
diff --git a/x11/ebuilder/Makefile b/x11/ebuilder/Makefile
index cc79f574140..e5d4addfce8 100644
--- a/x11/ebuilder/Makefile
+++ b/x11/ebuilder/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.28 2005/12/05 20:51:15 rillig Exp $
+# $NetBSD: Makefile,v 1.29 2006/01/24 07:32:50 wiz Exp $
 #
 
 DISTNAME=	ebuilder-0.56d
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	x11 devel
 MASTER_SITES=	http://web.inter.nl.net/users/eavdmeer/src/
 
diff --git a/x11/ede/Makefile b/x11/ede/Makefile
index 988dc773c12..f1239051fc0 100644
--- a/x11/ede/Makefile
+++ b/x11/ede/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.1.1.1 2005/09/02 14:42:52 xtraeme Exp $
+# $NetBSD: Makefile,v 1.2 2006/01/24 07:32:51 wiz Exp $
 #
 
 DISTNAME=	ede-1.0.4
+PKGREVISION=	1
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=ede/}
 EXTRACT_SUFX=	.tar.bz2
diff --git a/x11/efltk/Makefile b/x11/efltk/Makefile
index 6ededd4db47..95d816929fe 100644
--- a/x11/efltk/Makefile
+++ b/x11/efltk/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.4 2006/01/08 18:35:12 xtraeme Exp $
+# $NetBSD: Makefile,v 1.5 2006/01/24 07:32:51 wiz Exp $
 #
 
 DISTNAME=	efltk-2.0.5
-PKGREVISION=	2
+PKGREVISION=	3
 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 8454a314360..4dd4680f0a9 100644
--- a/x11/efltk/buildlink3.mk
+++ b/x11/efltk/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2005/09/18 21:18:53 minskim Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2006/01/24 07:32:51 wiz Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 EFLTK_BUILDLINK3_MK:=	${EFLTK_BUILDLINK3_MK}+
@@ -12,6 +12,7 @@ BUILDLINK_PACKAGES+=	efltk
 
 .if !empty(EFLTK_BUILDLINK3_MK:M+)
 BUILDLINK_DEPENDS.efltk+=	efltk>=2.0.5nb1
+BUILDLINK_RECOMMENDED.efltk?=	efltk>=2.0.5nb3
 BUILDLINK_PKGSRCDIR.efltk?=	../../x11/efltk
 .endif	# EFLTK_BUILDLINK3_MK
 
diff --git a/x11/fbdesk/Makefile b/x11/fbdesk/Makefile
index fd3435d0696..ac38508ff26 100644
--- a/x11/fbdesk/Makefile
+++ b/x11/fbdesk/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.15 2005/08/10 20:56:26 jlam Exp $
+# $NetBSD: Makefile,v 1.16 2006/01/24 07:32:51 wiz Exp $
 #
 
 DISTNAME=	fbdesk-1.2.1
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	x11 wm
 MASTER_SITES=	http://fluxbox.sourceforge.net/download/
 
diff --git a/x11/fspanel/Makefile b/x11/fspanel/Makefile
index 91ebf73bda1..74759b13758 100644
--- a/x11/fspanel/Makefile
+++ b/x11/fspanel/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.14 2005/08/01 17:10:32 reed Exp $
+# $NetBSD: Makefile,v 1.15 2006/01/24 07:32:51 wiz Exp $
 #
 
 DISTNAME=	fspanel-0.8beta1
 PKGNAME=	${DISTNAME:C/beta/.0./}
-PKGREVISION=	4
+PKGREVISION=	5
 CATEGORIES=	x11
 MASTER_SITES=	http://www.chatjunkies.org/fspanel/
 
diff --git a/x11/gdkxft/Makefile b/x11/gdkxft/Makefile
index c6615de34fd..ffe08c4737f 100644
--- a/x11/gdkxft/Makefile
+++ b/x11/gdkxft/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.29 2005/11/08 15:40:28 joerg Exp $
+# $NetBSD: Makefile,v 1.30 2006/01/24 07:32:51 wiz Exp $
 #
 
 DISTNAME=		gdkxft-1.5
-PKGREVISION=		8
+PKGREVISION=		9
 CATEGORIES=		x11
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=gdkxft/}
 
diff --git a/x11/gdm/Makefile b/x11/gdm/Makefile
index 6cf516b9003..eb7c448bdea 100644
--- a/x11/gdm/Makefile
+++ b/x11/gdm/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.97 2006/01/20 13:33:19 jmmv Exp $
+# $NetBSD: Makefile,v 1.98 2006/01/24 07:32:51 wiz Exp $
 #
 
 DISTNAME=	gdm-2.8.0.7
+PKGREVISION=	1
 CATEGORIES=	x11 gnome
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/gdm/2.8/}
 EXTRACT_SUFX=	.tar.bz2
diff --git a/x11/gnome-desktop/Makefile b/x11/gnome-desktop/Makefile
index ba5fbbb0abf..b71ebabf554 100644
--- a/x11/gnome-desktop/Makefile
+++ b/x11/gnome-desktop/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.45 2006/01/06 17:53:06 wiz Exp $
+# $NetBSD: Makefile,v 1.46 2006/01/24 07:32:51 wiz Exp $
 #
 
 DISTNAME=		gnome-desktop-2.12.2
+PKGREVISION=		1
 CATEGORIES=		x11 gnome
 MASTER_SITES=		${MASTER_SITE_GNOME:=sources/gnome-desktop/2.12/}
 EXTRACT_SUFX=		.tar.bz2
diff --git a/x11/gnome-desktop/buildlink3.mk b/x11/gnome-desktop/buildlink3.mk
index 7711c721446..9d0f5cd9082 100644
--- a/x11/gnome-desktop/buildlink3.mk
+++ b/x11/gnome-desktop/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.12 2005/12/31 12:32:48 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.13 2006/01/24 07:32:51 wiz Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 GNOME_DESKTOP_BUILDLINK3_MK:=	${GNOME_DESKTOP_BUILDLINK3_MK}+
@@ -12,7 +12,7 @@ BUILDLINK_PACKAGES+=	gnome-desktop
 
 .if !empty(GNOME_DESKTOP_BUILDLINK3_MK:M+)
 BUILDLINK_DEPENDS.gnome-desktop+=	gnome-desktop>=2.12.1
-BUILDLINK_RECOMMENDED.gnome-desktop?=	gnome-desktop>=2.12.1nb1
+BUILDLINK_RECOMMENDED.gnome-desktop?=	gnome-desktop>=2.12.2nb1
 BUILDLINK_PKGSRCDIR.gnome-desktop?=	../../x11/gnome-desktop
 .endif	# GNOME_DESKTOP_BUILDLINK3_MK
 
diff --git a/x11/gnome-mag/Makefile b/x11/gnome-mag/Makefile
index b6c89ed793f..65e31fe7519 100644
--- a/x11/gnome-mag/Makefile
+++ b/x11/gnome-mag/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.27 2006/01/20 13:46:46 jmmv Exp $
+# $NetBSD: Makefile,v 1.28 2006/01/24 07:32:51 wiz Exp $
 #
 
 DISTNAME=		gnome-mag-0.12.2
+PKGREVISION=		1
 CATEGORIES=		x11 gnome
 MASTER_SITES=		${MASTER_SITE_GNOME:=sources/gnome-mag/0.12/}
 EXTRACT_SUFX=		.tar.bz2
diff --git a/x11/gnome-mag/buildlink3.mk b/x11/gnome-mag/buildlink3.mk
index a528da0224e..cb769503cc1 100644
--- a/x11/gnome-mag/buildlink3.mk
+++ b/x11/gnome-mag/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.9 2005/03/22 16:32:14 jmmv Exp $
+# $NetBSD: buildlink3.mk,v 1.10 2006/01/24 07:32:51 wiz Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 GNOME_MAG_BUILDLINK3_MK:=	${GNOME_MAG_BUILDLINK3_MK}+
@@ -12,6 +12,7 @@ BUILDLINK_PACKAGES+=	gnome-mag
 
 .if !empty(GNOME_MAG_BUILDLINK3_MK:M+)
 BUILDLINK_DEPENDS.gnome-mag+=	gnome-mag>=0.12.0
+BUILDLINK_RECOMMENDED.gnome-mag?=	gnome-mag>=0.12.2nb1
 BUILDLINK_PKGSRCDIR.gnome-mag?=	../../x11/gnome-mag
 .endif	# GNOME_MAG_BUILDLINK3_MK
 
diff --git a/x11/gnome-panel/Makefile b/x11/gnome-panel/Makefile
index 03db864fb8e..bac59a90704 100644
--- a/x11/gnome-panel/Makefile
+++ b/x11/gnome-panel/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.61 2006/01/20 13:32:01 jmmv Exp $
+# $NetBSD: Makefile,v 1.62 2006/01/24 07:32:51 wiz Exp $
 #
 
 DISTNAME=		gnome-panel-2.12.2
+PKGREVISION=		1
 CATEGORIES=		x11 gnome
 MASTER_SITES=		${MASTER_SITE_GNOME:=sources/gnome-panel/2.12/}
 EXTRACT_SUFX=		.tar.bz2
diff --git a/x11/gnome-panel/buildlink3.mk b/x11/gnome-panel/buildlink3.mk
index 8a0ebedd08b..d44377d0aea 100644
--- a/x11/gnome-panel/buildlink3.mk
+++ b/x11/gnome-panel/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.11 2006/01/06 15:10:08 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.12 2006/01/24 07:32:51 wiz Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 GNOME_PANEL_BUILDLINK3_MK:=	${GNOME_PANEL_BUILDLINK3_MK}+
@@ -12,6 +12,7 @@ BUILDLINK_PACKAGES+=	gnome-panel
 
 .if !empty(GNOME_PANEL_BUILDLINK3_MK:M+)
 BUILDLINK_DEPENDS.gnome-panel+=		gnome-panel>=2.12.1nb3
+BUILDLINK_RECOMMENDED.gnome-panel?=	gnome-panel>=2.12.2nb1
 BUILDLINK_PKGSRCDIR.gnome-panel?=	../../x11/gnome-panel
 .endif	# GNOME_PANEL_BUILDLINK3_MK
 
diff --git a/x11/gnome-session/Makefile b/x11/gnome-session/Makefile
index dc7e66357b7..51a532b47b2 100644
--- a/x11/gnome-session/Makefile
+++ b/x11/gnome-session/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.58 2005/12/31 12:32:48 wiz Exp $
+# $NetBSD: Makefile,v 1.59 2006/01/24 07:32:51 wiz Exp $
 #
 
 DISTNAME=		gnome-session-2.12.0
-PKGREVISION=		2
+PKGREVISION=		3
 CATEGORIES=		x11 gnome
 MASTER_SITES=		${MASTER_SITE_GNOME:=sources/gnome-session/2.12/}
 SITES_gnome-splash-2.12.0.png=	${MASTER_SITE_LOCAL:=gnome-splash/}
diff --git a/x11/gnome-themes-extras/Makefile b/x11/gnome-themes-extras/Makefile
index 7e8b872707a..cff4bd24f87 100644
--- a/x11/gnome-themes-extras/Makefile
+++ b/x11/gnome-themes-extras/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.18 2005/12/31 12:32:49 wiz Exp $
+# $NetBSD: Makefile,v 1.19 2006/01/24 07:32:51 wiz Exp $
 #
 
 DISTNAME=	gnome-themes-extras-0.8.1
-PKGREVISION=	3
+PKGREVISION=	4
 CATEGORIES=	x11 gnome
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/gnome-themes-extras/0.8/}
 EXTRACT_SUFX=	.tar.bz2
diff --git a/x11/gnome-themes/Makefile b/x11/gnome-themes/Makefile
index a9578955cf6..e65cc382cb2 100644
--- a/x11/gnome-themes/Makefile
+++ b/x11/gnome-themes/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.38 2006/01/22 04:13:33 joerg Exp $
+# $NetBSD: Makefile,v 1.39 2006/01/24 07:32:51 wiz Exp $
 #
 
 DISTNAME=		gnome-themes-2.12.1
-PKGREVISION=		2
+PKGREVISION=		3
 CATEGORIES=		x11
 MASTER_SITES=		${MASTER_SITE_GNOME:=sources/gnome-themes/2.12/}
 EXTRACT_SUFX=		.tar.bz2
diff --git a/x11/gnome2-applets/Makefile b/x11/gnome2-applets/Makefile
index 355be4feccf..435cdd3d8ca 100644
--- a/x11/gnome2-applets/Makefile
+++ b/x11/gnome2-applets/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.53 2006/01/20 13:32:21 jmmv Exp $
+# $NetBSD: Makefile,v 1.54 2006/01/24 07:32:52 wiz Exp $
 #
 
 DISTNAME=		gnome-applets-2.12.2
+PKGREVISION=		1
 CATEGORIES=		x11 gnome
 MASTER_SITES=		${MASTER_SITE_GNOME:=sources/gnome-applets/2.12/}
 EXTRACT_SUFX=		.tar.bz2
diff --git a/x11/gnome2-control-center/Makefile b/x11/gnome2-control-center/Makefile
index a561d206765..d31d6d0aba5 100644
--- a/x11/gnome2-control-center/Makefile
+++ b/x11/gnome2-control-center/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.55 2006/01/18 12:55:56 jmmv Exp $
+# $NetBSD: Makefile,v 1.56 2006/01/24 07:32:52 wiz Exp $
 #
 
 DISTNAME=	control-center-2.12.1
 PKGNAME=	gnome2-${DISTNAME}
-PKGREVISION=	3
+PKGREVISION=	4
 CATEGORIES=	x11 gnome
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/control-center/2.12/}
 EXTRACT_SUFX=	.tar.bz2
diff --git a/x11/gnome2-control-center/buildlink3.mk b/x11/gnome2-control-center/buildlink3.mk
index 5e0b8f06957..428c0e0bcc7 100644
--- a/x11/gnome2-control-center/buildlink3.mk
+++ b/x11/gnome2-control-center/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.10 2005/12/31 12:32:49 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.11 2006/01/24 07:32:52 wiz Exp $
 
 BUILDLINK_DEPTH:=			${BUILDLINK_DEPTH}+
 GNOME2_CONTROL_CENTER_BUILDLINK3_MK:=	${GNOME2_CONTROL_CENTER_BUILDLINK3_MK}+
@@ -12,7 +12,7 @@ BUILDLINK_PACKAGES+=	gnome2-control-center
 
 .if !empty(GNOME2_CONTROL_CENTER_BUILDLINK3_MK:M+)
 BUILDLINK_DEPENDS.gnome2-control-center+=	gnome2-control-center>=2.12.1nb1
-BUILDLINK_RECOMMENDED.gnome2-control-center?=	gnome2-control-center>=2.12.1nb2
+BUILDLINK_RECOMMENDED.gnome2-control-center?=	gnome2-control-center>=2.12.1nb4
 BUILDLINK_PKGSRCDIR.gnome2-control-center?=	../../x11/gnome2-control-center
 .endif	# GNOME2_CONTROL_CENTER_BUILDLINK3_MK
 
diff --git a/x11/gnome2-terminal/Makefile b/x11/gnome2-terminal/Makefile
index ff6a77d4502..8ab94c8e5fc 100644
--- a/x11/gnome2-terminal/Makefile
+++ b/x11/gnome2-terminal/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.45 2005/12/31 12:32:49 wiz Exp $
+# $NetBSD: Makefile,v 1.46 2006/01/24 07:32:52 wiz Exp $
 #
 
 DISTNAME=		gnome-terminal-2.12.0
 PKGNAME=		${DISTNAME:S/-/2-/}
-PKGREVISION=		1
+PKGREVISION=		2
 CATEGORIES=		x11 gnome
 MASTER_SITES=		${MASTER_SITE_GNOME:=sources/gnome-terminal/2.12/}
 EXTRACT_SUFX=		.tar.bz2
diff --git a/x11/gnopernicus/Makefile b/x11/gnopernicus/Makefile
index d8c1e3ce97d..438bdf6d7a0 100644
--- a/x11/gnopernicus/Makefile
+++ b/x11/gnopernicus/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.35 2005/12/31 12:32:49 wiz Exp $
+# $NetBSD: Makefile,v 1.36 2006/01/24 07:32:52 wiz Exp $
 #
 
 DISTNAME=		gnopernicus-0.11.7
-PKGREVISION=		1
+PKGREVISION=		2
 CATEGORIES=		x11
 MASTER_SITES=		${MASTER_SITE_GNOME:=sources/gnopernicus/0.11/}
 EXTRACT_SUFX=		.tar.bz2
diff --git a/x11/gnustep-back/Makefile b/x11/gnustep-back/Makefile
index ea579c2972c..03b8d3f8055 100644
--- a/x11/gnustep-back/Makefile
+++ b/x11/gnustep-back/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.30 2006/01/17 07:42:41 adam Exp $
+# $NetBSD: Makefile,v 1.31 2006/01/24 07:32:52 wiz Exp $
 
 DISTNAME=	gnustep-back-0.10.2
+PKGREVISION=	1
 CATEGORIES=	x11 gnustep
 MASTER_SITES=	${MASTER_SITE_GNUSTEP:=core/}
 
diff --git a/x11/gnustep-back/buildlink3.mk b/x11/gnustep-back/buildlink3.mk
index 8ddf9d656ef..0281447fd4c 100644
--- a/x11/gnustep-back/buildlink3.mk
+++ b/x11/gnustep-back/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2006/01/17 07:42:41 adam Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2006/01/24 07:32:52 wiz Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 GNUSTEP_BACK_BUILDLINK3_MK:=	${GNUSTEP_BACK_BUILDLINK3_MK}+
@@ -12,7 +12,7 @@ BUILDLINK_PACKAGES+=	gnustep-back
 
 .if !empty(GNUSTEP_BACK_BUILDLINK3_MK:M+)
 BUILDLINK_DEPENDS.gnustep-back+=	gnustep-back>=0.9.2
-BUILDLINK_RECOMMENDED.gnustep-back+=	gnustep-back>=0.9.3nb1
+BUILDLINK_RECOMMENDED.gnustep-back+=	gnustep-back>=0.10.2nb1
 BUILDLINK_PKGSRCDIR.gnustep-back?=	../../x11/gnustep-back
 .endif	# GNUSTEP_BACK_BUILDLINK3_MK
 
diff --git a/x11/gnustep-preferences/Makefile b/x11/gnustep-preferences/Makefile
index 15fd72ff74f..e624c86bb09 100644
--- a/x11/gnustep-preferences/Makefile
+++ b/x11/gnustep-preferences/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.20 2005/06/01 18:03:29 jlam Exp $
+# $NetBSD: Makefile,v 1.21 2006/01/24 07:32:52 wiz Exp $
 #
 
 DISTNAME=	Preferences-1.2.0
 PKGNAME=	gnustep-${DISTNAME:S/P/p/}
-PKGREVISION=	11
+PKGREVISION=	12
 CATEGORIES=	x11 gnustep
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=prefsapp/}
 EXTRACT_SUFX=	.tar.bz2
diff --git a/x11/gnustep-preferences/buildlink3.mk b/x11/gnustep-preferences/buildlink3.mk
index e712c5187a4..8cd2b521f68 100644
--- a/x11/gnustep-preferences/buildlink3.mk
+++ b/x11/gnustep-preferences/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2005/05/16 09:40:20 rh Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2006/01/24 07:32:52 wiz Exp $
 
 BUILDLINK_DEPTH:=			${BUILDLINK_DEPTH}+
 GNUSTEP_PREFERENCES_BUILDLINK3_MK:=	${GNUSTEP_PREFERENCES_BUILDLINK3_MK}+
@@ -12,6 +12,7 @@ BUILDLINK_PACKAGES+=	gnustep-preferences
 
 .if !empty(GNUSTEP_PREFERENCES_BUILDLINK3_MK:M+)
 BUILDLINK_DEPENDS.gnustep-preferences+=	gnustep-preferences>=1.2.0
+BUILDLINK_RECOMMENDED.gnustep-preferences?=	gnustep-preferences>=1.2.0nb12
 BUILDLINK_PKGSRCDIR.gnustep-preferences?=	../../x11/gnustep-preferences
 .endif	# GNUSTEP_PREFERENCES_BUILDLINK3_MK
 
diff --git a/x11/gromit/Makefile b/x11/gromit/Makefile
index e534b8fb500..d5e8eac33c5 100644
--- a/x11/gromit/Makefile
+++ b/x11/gromit/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.5 2005/08/27 07:30:30 grant Exp $
+# $NetBSD: Makefile,v 1.6 2006/01/24 07:32:52 wiz Exp $
 #
 
 DISTNAME=		gromit-20041213
+PKGREVISION=		1
 CATEGORIES=		x11
 MASTER_SITES=		http://www.home.unix-ag.org/simon/gromit/
 
diff --git a/x11/gtk-thinice-engine/Makefile b/x11/gtk-thinice-engine/Makefile
index 36e1c51c93e..bb66f984041 100644
--- a/x11/gtk-thinice-engine/Makefile
+++ b/x11/gtk-thinice-engine/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.16 2005/08/10 20:56:29 jlam Exp $
+# $NetBSD: Makefile,v 1.17 2006/01/24 07:32:52 wiz Exp $
 #
 
 DISTNAME=	gtk-thinice-engine-2.0.2
-PKGREVISION=	6
+PKGREVISION=	7
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/gtk-thinice-engine/2.0/}
 EXTRACT_SUFX=	.tar.bz2
diff --git a/x11/gtk2+extra/Makefile b/x11/gtk2+extra/Makefile
index 89c7b2d6c28..e0a6a4020c0 100644
--- a/x11/gtk2+extra/Makefile
+++ b/x11/gtk2+extra/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.2 2005/09/08 16:16:24 drochner Exp $
+# $NetBSD: Makefile,v 1.3 2006/01/24 07:32:53 wiz Exp $
 #
 
 DISTNAME=	gtk+extra-2.1.1
 PKGNAME=	${DISTNAME:S/gtk/gtk2/}
+PKGREVISION=	1
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=scigraphica/}
 
diff --git a/x11/gtk2+extra/buildlink3.mk b/x11/gtk2+extra/buildlink3.mk
index 46497cf5da2..0cec84ee073 100644
--- a/x11/gtk2+extra/buildlink3.mk
+++ b/x11/gtk2+extra/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1.1.1 2005/09/08 10:21:20 bouyer Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2006/01/24 07:32:53 wiz Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 GTK2+EXTRA_BUILDLINK3_MK:=	${GTK2+EXTRA_BUILDLINK3_MK}+
@@ -12,6 +12,7 @@ BUILDLINK_PACKAGES+=	gtk2+extra
 
 .if !empty(GTK2+EXTRA_BUILDLINK3_MK:M+)
 BUILDLINK_DEPENDS.gtk2+extra+=	gtk2+extra>=2.1.1
+BUILDLINK_RECOMMENDED.gtk2+extra?=	gtk2+extra>=2.1.1nb1
 BUILDLINK_PKGSRCDIR.gtk2+extra?=	../../x11/gtk2+extra
 .endif	# GTK2+EXTRA_BUILDLINK3_MK
 
diff --git a/x11/gtk2-chtheme/Makefile b/x11/gtk2-chtheme/Makefile
index 501531979da..30591742eec 100644
--- a/x11/gtk2-chtheme/Makefile
+++ b/x11/gtk2-chtheme/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.6 2005/08/10 20:56:29 jlam Exp $
+# $NetBSD: Makefile,v 1.7 2006/01/24 07:32:53 wiz Exp $
 #
 
 DISTNAME=		gtk-chtheme-0.3.1
 PKGNAME=		gtk2-chtheme-0.3.1
+PKGREVISION=		1
 CATEGORIES=		x11
 MASTER_SITES=		http://plasmasturm.org/programs/gtk-chtheme/
 EXTRACT_SUFX=		.tar.bz2
diff --git a/x11/gtk2-engines-bluecurve/Makefile b/x11/gtk2-engines-bluecurve/Makefile
index 93010cd6995..d7af6b74778 100644
--- a/x11/gtk2-engines-bluecurve/Makefile
+++ b/x11/gtk2-engines-bluecurve/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.10 2005/10/02 09:09:31 jmmv Exp $
+# $NetBSD: Makefile,v 1.11 2006/01/24 07:32:54 wiz Exp $
 #
 
 DISTNAME=	GTK2-Wonderland-Engine-1.0
 PKGNAME=	gtk2-engines-bluecurve-1.0
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_GNOME:=teams/art.gnome.org/themes/gtk2/}
 EXTRACT_SUFX=	.tar.bz2
diff --git a/x11/gtk2-engines/Makefile b/x11/gtk2-engines/Makefile
index b27f501856a..0defb4de755 100644
--- a/x11/gtk2-engines/Makefile
+++ b/x11/gtk2-engines/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.35 2006/01/20 13:31:16 jmmv Exp $
+# $NetBSD: Makefile,v 1.36 2006/01/24 07:32:53 wiz Exp $
 
 DISTNAME=		gtk-engines-2.6.6
 PKGNAME=		${DISTNAME:S/gtk/gtk2/}
+PKGREVISION=		1
 CATEGORIES=		x11
 MASTER_SITES=		${MASTER_SITE_GNOME:=sources/gtk-engines/2.6/}
 EXTRACT_SUFX=		.tar.bz2
diff --git a/x11/gtk2-engines/buildlink3.mk b/x11/gtk2-engines/buildlink3.mk
index 44ac994f839..1ed5ffc87b5 100644
--- a/x11/gtk2-engines/buildlink3.mk
+++ b/x11/gtk2-engines/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2004/12/24 10:07:23 jmmv Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2006/01/24 07:32:54 wiz Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 GTK2_ENGINES_BUILDLINK3_MK:=	${GTK2_ENGINES_BUILDLINK3_MK}+
@@ -12,6 +12,7 @@ BUILDLINK_PACKAGES+=	gtk2-engines
 
 .if !empty(GTK2_ENGINES_BUILDLINK3_MK:M+)
 BUILDLINK_DEPENDS.gtk2-engines+=	gtk2-engines>=2.6.0
+BUILDLINK_RECOMMENDED.gtk2-engines?=	gtk2-engines>=2.6.6nb1
 BUILDLINK_PKGSRCDIR.gtk2-engines?=	../../x11/gtk2-engines
 .endif	# GTK2_ENGINES_BUILDLINK3_MK
 
diff --git a/x11/gtk2-theme-switch/Makefile b/x11/gtk2-theme-switch/Makefile
index d9fe1d66ac7..bfd627ac7bf 100644
--- a/x11/gtk2-theme-switch/Makefile
+++ b/x11/gtk2-theme-switch/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.14 2005/08/10 20:56:29 jlam Exp $
+# $NetBSD: Makefile,v 1.15 2006/01/24 07:32:54 wiz Exp $
 #
 
 DISTNAME=		gtk-theme-switch-2.0.0rc2
 PKGNAME=		${DISTNAME:S/gtk/gtk2/}
-PKGREVISION=		3
+PKGREVISION=		4
 CATEGORIES=		x11
 MASTER_SITES=		http://www.muhri.net/
 
diff --git a/x11/gtk2/Makefile b/x11/gtk2/Makefile
index eb7cd64155d..6bb94169c58 100644
--- a/x11/gtk2/Makefile
+++ b/x11/gtk2/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.103 2006/01/12 17:31:03 wiz Exp $
+# $NetBSD: Makefile,v 1.104 2006/01/24 07:32:52 wiz Exp $
 #
 
 DISTNAME=		gtk+-2.8.10
 PKGNAME=		${DISTNAME:S/gtk/gtk2/}
+PKGREVISION=		1
 CATEGORIES=		x11
 MASTER_SITES=		ftp://ftp.gtk.org/pub/gtk/v2.8/ \
 			ftp://ftp.cs.umn.edu/pub/gimp/gtk/v2.8/ \
diff --git a/x11/gtk2/buildlink3.mk b/x11/gtk2/buildlink3.mk
index 7b20a3755d5..d8dfce992a5 100644
--- a/x11/gtk2/buildlink3.mk
+++ b/x11/gtk2/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.20 2005/10/02 13:06:37 hira Exp $
+# $NetBSD: buildlink3.mk,v 1.21 2006/01/24 07:32:53 wiz Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 GTK2_BUILDLINK3_MK:=	${GTK2_BUILDLINK3_MK}+
@@ -12,7 +12,7 @@ BUILDLINK_PACKAGES+=	gtk2
 
 .if !empty(GTK2_BUILDLINK3_MK:M+)
 BUILDLINK_DEPENDS.gtk2+=	gtk2+>=2.4.0
-BUILDLINK_RECOMMENDED.gtk2+=	gtk2+>=2.8.4
+BUILDLINK_RECOMMENDED.gtk2+=	gtk2+>=2.8.10nb1
 BUILDLINK_PKGSRCDIR.gtk2?=	../../x11/gtk2
 
 PRINT_PLIST_AWK+=	/^@dirrm lib\/gtk-2.0$$/ { next; }
diff --git a/x11/gtkglarea2/Makefile b/x11/gtkglarea2/Makefile
index 8ccf01d132e..2392d9b93a2 100644
--- a/x11/gtkglarea2/Makefile
+++ b/x11/gtkglarea2/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.12 2005/08/10 20:56:29 jlam Exp $
+# $NetBSD: Makefile,v 1.13 2006/01/24 07:32:54 wiz Exp $
 #
 
 DISTNAME=	gtkglarea-1.99.0
 PKGNAME=	${DISTNAME:S/-/2-/}
-PKGREVISION=	4
+PKGREVISION=	5
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/gtkglarea/1.99/}
 EXTRACT_SUFX=	.tar.bz2
diff --git a/x11/gtkglarea2/buildlink3.mk b/x11/gtkglarea2/buildlink3.mk
index ba38b45cdf5..2c031659213 100644
--- a/x11/gtkglarea2/buildlink3.mk
+++ b/x11/gtkglarea2/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2004/03/18 09:12:17 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2006/01/24 07:32:54 wiz Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 GTKGLAREA2_BUILDLINK3_MK:=	${GTKGLAREA2_BUILDLINK3_MK}+
@@ -12,6 +12,7 @@ BUILDLINK_PACKAGES+=	gtkglarea2
 
 .if !empty(GTKGLAREA2_BUILDLINK3_MK:M+)
 BUILDLINK_DEPENDS.gtkglarea2+=		gtkglarea2>=1.99.0nb3
+BUILDLINK_RECOMMENDED.gtkglarea2?=	gtkglarea2>=1.99.0nb5
 BUILDLINK_PKGSRCDIR.gtkglarea2?=	../../x11/gtkglarea2
 .endif	# GTKGLAREA2_BUILDLINK3_MK
 
diff --git a/x11/gtkmm/Makefile b/x11/gtkmm/Makefile
index fe530f515f5..70177edb0d9 100644
--- a/x11/gtkmm/Makefile
+++ b/x11/gtkmm/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.31 2006/01/16 14:24:21 adam Exp $
+# $NetBSD: Makefile,v 1.32 2006/01/24 07:32:54 wiz Exp $
 
 DISTNAME=	gtkmm-2.8.2
+PKGREVISION=	1
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/gtkmm/2.8/}
 EXTRACT_SUFX=	.tar.bz2
diff --git a/x11/gtkmm/buildlink3.mk b/x11/gtkmm/buildlink3.mk
index d22fbf476b8..5ae14a9dfd2 100644
--- a/x11/gtkmm/buildlink3.mk
+++ b/x11/gtkmm/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2006/01/16 14:24:21 adam Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2006/01/24 07:32:54 wiz Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 GTKMM_BUILDLINK3_MK:=	${GTKMM_BUILDLINK3_MK}+
@@ -12,6 +12,7 @@ BUILDLINK_PACKAGES+=	gtkmm
 
 .if !empty(GTKMM_BUILDLINK3_MK:M+)
 BUILDLINK_DEPENDS.gtkmm+=	gtkmm>=2.6.3
+BUILDLINK_RECOMMENDED.gtkmm?=	gtkmm>=2.8.2nb1
 BUILDLINK_PKGSRCDIR.gtkmm?=	../../x11/gtkmm
 .endif	# GTKMM_BUILDLINK3_MK
 
diff --git a/x11/gtksourceview/Makefile b/x11/gtksourceview/Makefile
index 78809336a09..01e9b1c5f1c 100644
--- a/x11/gtksourceview/Makefile
+++ b/x11/gtksourceview/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.28 2005/12/05 20:51:17 rillig Exp $
+# $NetBSD: Makefile,v 1.29 2006/01/24 07:32:54 wiz Exp $
 #
 
 DISTNAME=	gtksourceview-1.4.2
+PKGREVISION=	1
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/gtksourceview/1.4/}
 EXTRACT_SUFX=	.tar.bz2
diff --git a/x11/gtksourceview/buildlink3.mk b/x11/gtksourceview/buildlink3.mk
index 49089585ca9..ce69950755b 100644
--- a/x11/gtksourceview/buildlink3.mk
+++ b/x11/gtksourceview/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.6 2005/03/22 16:25:24 jmmv Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2006/01/24 07:32:54 wiz Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 GTKSOURCEVIEW_BUILDLINK3_MK:=	${GTKSOURCEVIEW_BUILDLINK3_MK}+
@@ -12,6 +12,7 @@ BUILDLINK_PACKAGES+=	gtksourceview
 
 .if !empty(GTKSOURCEVIEW_BUILDLINK3_MK:M+)
 BUILDLINK_DEPENDS.gtksourceview+=	gtksourceview>=1.2.0
+BUILDLINK_RECOMMENDED.gtksourceview?=	gtksourceview>=1.4.2nb1
 BUILDLINK_PKGSRCDIR.gtksourceview?=	../../x11/gtksourceview
 .endif	# GTKSOURCEVIEW_BUILDLINK3_MK
 
diff --git a/x11/gtkterm2/Makefile b/x11/gtkterm2/Makefile
index 1836e34dd5a..9e712a65e57 100644
--- a/x11/gtkterm2/Makefile
+++ b/x11/gtkterm2/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.7 2005/08/10 20:56:29 jlam Exp $
+# $NetBSD: Makefile,v 1.8 2006/01/24 07:32:54 wiz Exp $
 
 DISTNAME=	gtkterm2-0.2.3
+PKGREVISION=	1
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=gtkterm/}
 
diff --git a/x11/gtoolkit/Makefile b/x11/gtoolkit/Makefile
index b4c651086a0..01a48dc6667 100644
--- a/x11/gtoolkit/Makefile
+++ b/x11/gtoolkit/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.9 2004/10/03 00:18:34 tv Exp $
+# $NetBSD: Makefile,v 1.10 2006/01/24 07:32:54 wiz Exp $
 #
 .include "Makefile.common"
-PKGREVISION=		7
+PKGREVISION=		8
 
 COMMENT=		Objective-C interface to the GTK+ widget set
 
diff --git a/x11/gtoolkit/buildlink3.mk b/x11/gtoolkit/buildlink3.mk
index 51329182dbc..95b664b8dcf 100644
--- a/x11/gtoolkit/buildlink3.mk
+++ b/x11/gtoolkit/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2004/10/03 00:18:34 tv Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2006/01/24 07:32:54 wiz Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 GTOOLKIT_BUILDLINK3_MK:=	${GTOOLKIT_BUILDLINK3_MK}+
@@ -13,6 +13,7 @@ BUILDLINK_PACKAGES+=	gtoolkit
 .if !empty(GTOOLKIT_BUILDLINK3_MK:M+)
 BUILDLINK_DEPENDS.gtoolkit+=	gtoolkit>=0.9.5nb5
 BUILDLINK_RECOMMENDED.gtoolkit+=gtoolkit>=0.9.5nb7
+BUILDLINK_RECOMMENDED.gtoolkit?=	gtoolkit>=0.9.5nb8
 BUILDLINK_PKGSRCDIR.gtoolkit?=	../../x11/gtoolkit
 .endif	# GTOOLKIT_BUILDLINK3_MK
 
diff --git a/x11/kde3-i18n-af/Makefile b/x11/kde3-i18n-af/Makefile
index 8c002d0cd52..13227eb819b 100644
--- a/x11/kde3-i18n-af/Makefile
+++ b/x11/kde3-i18n-af/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.16 2005/07/30 12:49:22 markd Exp $
+# $NetBSD: Makefile,v 1.17 2006/01/24 07:32:54 wiz Exp $
 
 DISTNAME=	kde-i18n-af-${_KDE_VERSION}
+PKGREVISION=	1
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITES_KDE:=kde-i18n/}
 
diff --git a/x11/kde3-i18n-ar/Makefile b/x11/kde3-i18n-ar/Makefile
index 61cd5c37fb5..96884dda765 100644
--- a/x11/kde3-i18n-ar/Makefile
+++ b/x11/kde3-i18n-ar/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.18 2005/06/18 21:02:20 markd Exp $
+# $NetBSD: Makefile,v 1.19 2006/01/24 07:32:54 wiz Exp $
 
 DISTNAME=	kde-i18n-ar-${_KDE_VERSION}
+PKGREVISION=	1
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITES_KDE:=kde-i18n/}
 
diff --git a/x11/kde3-i18n-az/Makefile b/x11/kde3-i18n-az/Makefile
index 7ca26ff3025..3ea10c39f4c 100644
--- a/x11/kde3-i18n-az/Makefile
+++ b/x11/kde3-i18n-az/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.5 2005/12/11 12:36:14 markd Exp $
+# $NetBSD: Makefile,v 1.6 2006/01/24 07:32:54 wiz Exp $
 
 DISTNAME=	kde-i18n-az-${_KDE_VERSION}
+PKGREVISION=	1
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITES_KDE:=kde-i18n/}
 
diff --git a/x11/kde3-i18n-bg/Makefile b/x11/kde3-i18n-bg/Makefile
index 8040acc3fa4..c75950f65a4 100644
--- a/x11/kde3-i18n-bg/Makefile
+++ b/x11/kde3-i18n-bg/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.19 2005/06/18 21:02:20 markd Exp $
+# $NetBSD: Makefile,v 1.20 2006/01/24 07:32:54 wiz Exp $
 
 DISTNAME=	kde-i18n-bg-${_KDE_VERSION}
+PKGREVISION=	1
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITES_KDE:=kde-i18n/}
 
diff --git a/x11/kde3-i18n-bn/Makefile b/x11/kde3-i18n-bn/Makefile
index 2bc86376a90..9af8da56de1 100644
--- a/x11/kde3-i18n-bn/Makefile
+++ b/x11/kde3-i18n-bn/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.7 2005/06/18 21:02:20 markd Exp $
+# $NetBSD: Makefile,v 1.8 2006/01/24 07:32:54 wiz Exp $
 
 DISTNAME=	kde-i18n-bn-${_KDE_VERSION}
+PKGREVISION=	1
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITES_KDE:=kde-i18n/}
 
diff --git a/x11/kde3-i18n-br/Makefile b/x11/kde3-i18n-br/Makefile
index fbf2ea2ef12..f854aa5f043 100644
--- a/x11/kde3-i18n-br/Makefile
+++ b/x11/kde3-i18n-br/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.3 2005/06/18 21:02:20 markd Exp $
+# $NetBSD: Makefile,v 1.4 2006/01/24 07:32:54 wiz Exp $
 
 DISTNAME=	kde-i18n-br-${_KDE_VERSION}
+PKGREVISION=	1
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITES_KDE:=kde-i18n/}
 
diff --git a/x11/kde3-i18n-bs/Makefile b/x11/kde3-i18n-bs/Makefile
index 4325c7ddffd..4a47e1db052 100644
--- a/x11/kde3-i18n-bs/Makefile
+++ b/x11/kde3-i18n-bs/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.19 2005/06/18 21:02:20 markd Exp $
+# $NetBSD: Makefile,v 1.20 2006/01/24 07:32:54 wiz Exp $
 
 DISTNAME=	kde-i18n-bs-${_KDE_VERSION}
+PKGREVISION=	1
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITES_KDE:=kde-i18n/}
 
diff --git a/x11/kde3-i18n-ca/Makefile b/x11/kde3-i18n-ca/Makefile
index e06291f26b5..5ee3758af51 100644
--- a/x11/kde3-i18n-ca/Makefile
+++ b/x11/kde3-i18n-ca/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.20 2005/12/19 11:12:27 markd Exp $
+# $NetBSD: Makefile,v 1.21 2006/01/24 07:32:54 wiz Exp $
 
 DISTNAME=	kde-i18n-ca-${_KDE_VERSION}
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITES_KDE:=kde-i18n/}
 
diff --git a/x11/kde3-i18n-cs/Makefile b/x11/kde3-i18n-cs/Makefile
index 72abce2e272..4590da4f79e 100644
--- a/x11/kde3-i18n-cs/Makefile
+++ b/x11/kde3-i18n-cs/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.19 2005/06/18 21:02:20 markd Exp $
+# $NetBSD: Makefile,v 1.20 2006/01/24 07:32:55 wiz Exp $
 
 DISTNAME=	kde-i18n-cs-${_KDE_VERSION}
+PKGREVISION=	1
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITES_KDE:=kde-i18n/}
 
diff --git a/x11/kde3-i18n-cy/Makefile b/x11/kde3-i18n-cy/Makefile
index a19cfd70a4c..da88b14d968 100644
--- a/x11/kde3-i18n-cy/Makefile
+++ b/x11/kde3-i18n-cy/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.7 2005/06/18 21:02:20 markd Exp $
+# $NetBSD: Makefile,v 1.8 2006/01/24 07:32:55 wiz Exp $
 
 DISTNAME=	kde-i18n-cy-${_KDE_VERSION}
+PKGREVISION=	1
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITES_KDE:=kde-i18n/}
 
diff --git a/x11/kde3-i18n-da/Makefile b/x11/kde3-i18n-da/Makefile
index 2419c6f6d18..aacbc3f0025 100644
--- a/x11/kde3-i18n-da/Makefile
+++ b/x11/kde3-i18n-da/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.19 2005/06/18 21:02:20 markd Exp $
+# $NetBSD: Makefile,v 1.20 2006/01/24 07:32:55 wiz Exp $
 
 DISTNAME=	kde-i18n-da-${_KDE_VERSION}
+PKGREVISION=	1
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITES_KDE:=kde-i18n/}
 
diff --git a/x11/kde3-i18n-de/Makefile b/x11/kde3-i18n-de/Makefile
index 2cc34a93b4d..87f3c33e9e9 100644
--- a/x11/kde3-i18n-de/Makefile
+++ b/x11/kde3-i18n-de/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.19 2005/06/18 21:02:20 markd Exp $
+# $NetBSD: Makefile,v 1.20 2006/01/24 07:32:55 wiz Exp $
 
 DISTNAME=	kde-i18n-de-${_KDE_VERSION}
+PKGREVISION=	1
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITES_KDE:=kde-i18n/}
 
diff --git a/x11/kde3-i18n-el/Makefile b/x11/kde3-i18n-el/Makefile
index 103162ef241..2bad90abf68 100644
--- a/x11/kde3-i18n-el/Makefile
+++ b/x11/kde3-i18n-el/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.20 2005/06/18 21:02:20 markd Exp $
+# $NetBSD: Makefile,v 1.21 2006/01/24 07:32:55 wiz Exp $
 
 DISTNAME=	kde-i18n-el-${_KDE_VERSION}
+PKGREVISION=	1
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITES_KDE:=kde-i18n/}
 
diff --git a/x11/kde3-i18n-en_GB/Makefile b/x11/kde3-i18n-en_GB/Makefile
index 7a92a072ea3..c6a29420ac7 100644
--- a/x11/kde3-i18n-en_GB/Makefile
+++ b/x11/kde3-i18n-en_GB/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.19 2005/06/18 21:02:20 markd Exp $
+# $NetBSD: Makefile,v 1.20 2006/01/24 07:32:55 wiz Exp $
 
 DISTNAME=	kde-i18n-en_GB-${_KDE_VERSION}
+PKGREVISION=	1
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITES_KDE:=kde-i18n/}
 
diff --git a/x11/kde3-i18n-eo/Makefile b/x11/kde3-i18n-eo/Makefile
index 1dbc62aaec6..9928d476ec0 100644
--- a/x11/kde3-i18n-eo/Makefile
+++ b/x11/kde3-i18n-eo/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.18 2005/06/18 21:02:20 markd Exp $
+# $NetBSD: Makefile,v 1.19 2006/01/24 07:32:55 wiz Exp $
 
 DISTNAME=	kde-i18n-eo-${_KDE_VERSION}
+PKGREVISION=	1
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITES_KDE:=kde-i18n/}
 
diff --git a/x11/kde3-i18n-es/Makefile b/x11/kde3-i18n-es/Makefile
index 8e0a2d662df..a174ed17b9b 100644
--- a/x11/kde3-i18n-es/Makefile
+++ b/x11/kde3-i18n-es/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.19 2005/06/18 21:02:20 markd Exp $
+# $NetBSD: Makefile,v 1.20 2006/01/24 07:32:55 wiz Exp $
 
 DISTNAME=	kde-i18n-es-${_KDE_VERSION}
+PKGREVISION=	1
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITES_KDE:=kde-i18n/}
 
diff --git a/x11/kde3-i18n-et/Makefile b/x11/kde3-i18n-et/Makefile
index 7d97b17066e..ab3121958cd 100644
--- a/x11/kde3-i18n-et/Makefile
+++ b/x11/kde3-i18n-et/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.19 2005/06/18 21:02:20 markd Exp $
+# $NetBSD: Makefile,v 1.20 2006/01/24 07:32:55 wiz Exp $
 
 DISTNAME=	kde-i18n-et-${_KDE_VERSION}
+PKGREVISION=	1
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITES_KDE:=kde-i18n/}
 
diff --git a/x11/kde3-i18n-eu/Makefile b/x11/kde3-i18n-eu/Makefile
index 1fde915348e..26736b9b8db 100644
--- a/x11/kde3-i18n-eu/Makefile
+++ b/x11/kde3-i18n-eu/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.19 2005/06/18 21:02:20 markd Exp $
+# $NetBSD: Makefile,v 1.20 2006/01/24 07:32:55 wiz Exp $
 
 DISTNAME=	kde-i18n-eu-${_KDE_VERSION}
+PKGREVISION=	1
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITES_KDE:=kde-i18n/}
 
diff --git a/x11/kde3-i18n-fa/Makefile b/x11/kde3-i18n-fa/Makefile
index 3e752528ee3..f6f25e3b855 100644
--- a/x11/kde3-i18n-fa/Makefile
+++ b/x11/kde3-i18n-fa/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.19 2005/12/11 12:36:15 markd Exp $
+# $NetBSD: Makefile,v 1.20 2006/01/24 07:32:55 wiz Exp $
 
 DISTNAME=	kde-i18n-fa-${_KDE_VERSION}
+PKGREVISION=	1
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITES_KDE:=kde-i18n/}
 
diff --git a/x11/kde3-i18n-fi/Makefile b/x11/kde3-i18n-fi/Makefile
index 35495da5525..c29760bae4c 100644
--- a/x11/kde3-i18n-fi/Makefile
+++ b/x11/kde3-i18n-fi/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.19 2005/06/18 21:02:20 markd Exp $
+# $NetBSD: Makefile,v 1.20 2006/01/24 07:32:55 wiz Exp $
 
 DISTNAME=	kde-i18n-fi-${_KDE_VERSION}
+PKGREVISION=	1
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITES_KDE:=kde-i18n/}
 
diff --git a/x11/kde3-i18n-fr/Makefile b/x11/kde3-i18n-fr/Makefile
index 903c7484b29..2d8942c2db8 100644
--- a/x11/kde3-i18n-fr/Makefile
+++ b/x11/kde3-i18n-fr/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.19 2005/06/18 21:02:20 markd Exp $
+# $NetBSD: Makefile,v 1.20 2006/01/24 07:32:55 wiz Exp $
 
 DISTNAME=	kde-i18n-fr-${_KDE_VERSION}
+PKGREVISION=	1
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITES_KDE:=kde-i18n/}
 
diff --git a/x11/kde3-i18n-fy/Makefile b/x11/kde3-i18n-fy/Makefile
index bae98a396ef..3636200ee9e 100644
--- a/x11/kde3-i18n-fy/Makefile
+++ b/x11/kde3-i18n-fy/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.3 2005/06/18 21:02:20 markd Exp $
+# $NetBSD: Makefile,v 1.4 2006/01/24 07:32:55 wiz Exp $
 
 DISTNAME=	kde-i18n-fy-${_KDE_VERSION}
+PKGREVISION=	1
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITES_KDE:=kde-i18n/}
 
diff --git a/x11/kde3-i18n-ga/Makefile b/x11/kde3-i18n-ga/Makefile
index 731188198c6..7f67eb2c79d 100644
--- a/x11/kde3-i18n-ga/Makefile
+++ b/x11/kde3-i18n-ga/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.3 2005/06/18 21:02:20 markd Exp $
+# $NetBSD: Makefile,v 1.4 2006/01/24 07:32:55 wiz Exp $
 
 DISTNAME=	kde-i18n-ga-${_KDE_VERSION}
+PKGREVISION=	1
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITES_KDE:=kde-i18n/}
 
diff --git a/x11/kde3-i18n-gl/Makefile b/x11/kde3-i18n-gl/Makefile
index 389310a7ad5..b105d57b639 100644
--- a/x11/kde3-i18n-gl/Makefile
+++ b/x11/kde3-i18n-gl/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.7 2005/12/11 12:36:15 markd Exp $
+# $NetBSD: Makefile,v 1.8 2006/01/24 07:32:55 wiz Exp $
 
 DISTNAME=	kde-i18n-gl-${_KDE_VERSION}
+PKGREVISION=	1
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITES_KDE:=kde-i18n/}
 
diff --git a/x11/kde3-i18n-he/Makefile b/x11/kde3-i18n-he/Makefile
index 6ede6b91bc9..42f73e83008 100644
--- a/x11/kde3-i18n-he/Makefile
+++ b/x11/kde3-i18n-he/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.19 2005/06/18 21:02:20 markd Exp $
+# $NetBSD: Makefile,v 1.20 2006/01/24 07:32:55 wiz Exp $
 
 DISTNAME=	kde-i18n-he-${_KDE_VERSION}
+PKGREVISION=	1
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITES_KDE:=kde-i18n/}
 
diff --git a/x11/kde3-i18n-hi/Makefile b/x11/kde3-i18n-hi/Makefile
index 9740b73e4e1..f458a173275 100644
--- a/x11/kde3-i18n-hi/Makefile
+++ b/x11/kde3-i18n-hi/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.7 2005/06/18 21:02:21 markd Exp $
+# $NetBSD: Makefile,v 1.8 2006/01/24 07:32:55 wiz Exp $
 
 DISTNAME=	kde-i18n-hi-${_KDE_VERSION}
+PKGREVISION=	1
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITES_KDE:=kde-i18n/}
 
diff --git a/x11/kde3-i18n-hr/Makefile b/x11/kde3-i18n-hr/Makefile
index 8bfde7d0f1f..f4651848f6f 100644
--- a/x11/kde3-i18n-hr/Makefile
+++ b/x11/kde3-i18n-hr/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.11 2005/12/11 12:36:16 markd Exp $
+# $NetBSD: Makefile,v 1.12 2006/01/24 07:32:55 wiz Exp $
 
 DISTNAME=	kde-i18n-hr-${_KDE_VERSION}
+PKGREVISION=	1
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITES_KDE:=kde-i18n/}
 
diff --git a/x11/kde3-i18n-hu/Makefile b/x11/kde3-i18n-hu/Makefile
index 4e19b59c21f..3ed3086060c 100644
--- a/x11/kde3-i18n-hu/Makefile
+++ b/x11/kde3-i18n-hu/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.19 2005/06/18 21:02:21 markd Exp $
+# $NetBSD: Makefile,v 1.20 2006/01/24 07:32:55 wiz Exp $
 
 DISTNAME=	kde-i18n-hu-${_KDE_VERSION}
+PKGREVISION=	1
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITES_KDE:=kde-i18n/}
 
diff --git a/x11/kde3-i18n-is/Makefile b/x11/kde3-i18n-is/Makefile
index 8aee8bd1329..9844b1c0012 100644
--- a/x11/kde3-i18n-is/Makefile
+++ b/x11/kde3-i18n-is/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.14 2005/12/19 11:09:51 markd Exp $
+# $NetBSD: Makefile,v 1.15 2006/01/24 07:32:56 wiz Exp $
 
 DISTNAME=	kde-i18n-is-${_KDE_VERSION}
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITES_KDE:=kde-i18n/}
 
diff --git a/x11/kde3-i18n-it/Makefile b/x11/kde3-i18n-it/Makefile
index aa1c9b68eeb..0294e122aee 100644
--- a/x11/kde3-i18n-it/Makefile
+++ b/x11/kde3-i18n-it/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.19 2005/06/18 21:02:21 markd Exp $
+# $NetBSD: Makefile,v 1.20 2006/01/24 07:32:56 wiz Exp $
 
 DISTNAME=	kde-i18n-it-${_KDE_VERSION}
+PKGREVISION=	1
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITES_KDE:=kde-i18n/}
 
diff --git a/x11/kde3-i18n-ja/Makefile b/x11/kde3-i18n-ja/Makefile
index 2250fff147f..d1adffd98e3 100644
--- a/x11/kde3-i18n-ja/Makefile
+++ b/x11/kde3-i18n-ja/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.20 2005/06/18 21:02:21 markd Exp $
+# $NetBSD: Makefile,v 1.21 2006/01/24 07:32:56 wiz Exp $
 
 DISTNAME=	kde-i18n-ja-${_KDE_VERSION}
+PKGREVISION=	1
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITES_KDE:=kde-i18n/}
 
diff --git a/x11/kde3-i18n-km/Makefile b/x11/kde3-i18n-km/Makefile
index 69e8e8a7629..711234e1fd8 100644
--- a/x11/kde3-i18n-km/Makefile
+++ b/x11/kde3-i18n-km/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.1 2005/12/11 12:36:16 markd Exp $
+# $NetBSD: Makefile,v 1.2 2006/01/24 07:32:56 wiz Exp $
 
 DISTNAME=	kde-i18n-km-${_KDE_VERSION}
+PKGREVISION=	1
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITES_KDE:=kde-i18n/}
 
diff --git a/x11/kde3-i18n-ko/Makefile b/x11/kde3-i18n-ko/Makefile
index 1a0a83d182e..28bb20eae59 100644
--- a/x11/kde3-i18n-ko/Makefile
+++ b/x11/kde3-i18n-ko/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.1 2005/12/11 12:36:20 markd Exp $
+# $NetBSD: Makefile,v 1.2 2006/01/24 07:32:56 wiz Exp $
 
 DISTNAME=	kde-i18n-ko-${_KDE_VERSION}
+PKGREVISION=	1
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITES_KDE:=kde-i18n/}
 
diff --git a/x11/kde3-i18n-lt/Makefile b/x11/kde3-i18n-lt/Makefile
index 8bc86360f1e..9b4b4becdd7 100644
--- a/x11/kde3-i18n-lt/Makefile
+++ b/x11/kde3-i18n-lt/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.20 2005/06/18 21:02:21 markd Exp $
+# $NetBSD: Makefile,v 1.21 2006/01/24 07:32:56 wiz Exp $
 
 DISTNAME=	kde-i18n-lt-${_KDE_VERSION}
+PKGREVISION=	1
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITES_KDE:=kde-i18n/}
 
diff --git a/x11/kde3-i18n-lv/Makefile b/x11/kde3-i18n-lv/Makefile
index 7d5bae7d048..913dca5f22d 100644
--- a/x11/kde3-i18n-lv/Makefile
+++ b/x11/kde3-i18n-lv/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.1 2005/12/11 12:36:20 markd Exp $
+# $NetBSD: Makefile,v 1.2 2006/01/24 07:32:56 wiz Exp $
 
 DISTNAME=	kde-i18n-ms-${_KDE_VERSION}
+PKGREVISION=	1
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITES_KDE:=kde-i18n/}
 
diff --git a/x11/kde3-i18n-mk/Makefile b/x11/kde3-i18n-mk/Makefile
index ccdd98cd683..cd8539edf28 100644
--- a/x11/kde3-i18n-mk/Makefile
+++ b/x11/kde3-i18n-mk/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.9 2005/06/18 21:02:21 markd Exp $
+# $NetBSD: Makefile,v 1.10 2006/01/24 07:32:56 wiz Exp $
 
 DISTNAME=	kde-i18n-mk-${_KDE_VERSION}
+PKGREVISION=	1
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITES_KDE:=kde-i18n/}
 
diff --git a/x11/kde3-i18n-mn/Makefile b/x11/kde3-i18n-mn/Makefile
index 3c170c0ed16..95a01bd6eaf 100644
--- a/x11/kde3-i18n-mn/Makefile
+++ b/x11/kde3-i18n-mn/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.7 2005/12/11 12:36:20 markd Exp $
+# $NetBSD: Makefile,v 1.8 2006/01/24 07:32:56 wiz Exp $
 
 DISTNAME=	kde-i18n-lv-${_KDE_VERSION}
+PKGREVISION=	1
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITES_KDE:=kde-i18n/}
 
diff --git a/x11/kde3-i18n-ms/Makefile b/x11/kde3-i18n-ms/Makefile
index 924f9890c07..571fb63316b 100644
--- a/x11/kde3-i18n-ms/Makefile
+++ b/x11/kde3-i18n-ms/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.7 2005/12/11 12:36:20 markd Exp $
+# $NetBSD: Makefile,v 1.8 2006/01/24 07:32:56 wiz Exp $
 
 DISTNAME=	kde-i18n-mn-${_KDE_VERSION}
+PKGREVISION=	1
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITES_KDE:=kde-i18n/}
 
diff --git a/x11/kde3-i18n-nb/Makefile b/x11/kde3-i18n-nb/Makefile
index f132beb2d3e..7f404d91e3b 100644
--- a/x11/kde3-i18n-nb/Makefile
+++ b/x11/kde3-i18n-nb/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.19 2005/06/18 21:02:21 markd Exp $
+# $NetBSD: Makefile,v 1.20 2006/01/24 07:32:56 wiz Exp $
 
 DISTNAME=	kde-i18n-nb-${_KDE_VERSION}
+PKGREVISION=	1
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITES_KDE:=kde-i18n/}
 
diff --git a/x11/kde3-i18n-nds/Makefile b/x11/kde3-i18n-nds/Makefile
index 3d8c6b8c1af..c25d322a6a0 100644
--- a/x11/kde3-i18n-nds/Makefile
+++ b/x11/kde3-i18n-nds/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.7 2005/06/18 21:02:21 markd Exp $
+# $NetBSD: Makefile,v 1.8 2006/01/24 07:32:56 wiz Exp $
 
 DISTNAME=	kde-i18n-nds-${_KDE_VERSION}
+PKGREVISION=	1
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITES_KDE:=kde-i18n/}
 
diff --git a/x11/kde3-i18n-nl/Makefile b/x11/kde3-i18n-nl/Makefile
index 4f8be96b6e4..613d051f0f6 100644
--- a/x11/kde3-i18n-nl/Makefile
+++ b/x11/kde3-i18n-nl/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.19 2005/06/18 21:02:21 markd Exp $
+# $NetBSD: Makefile,v 1.20 2006/01/24 07:32:56 wiz Exp $
 
 DISTNAME=	kde-i18n-nl-${_KDE_VERSION}
+PKGREVISION=	1
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITES_KDE:=kde-i18n/}
 
diff --git a/x11/kde3-i18n-nn/Makefile b/x11/kde3-i18n-nn/Makefile
index 01f2ffe68a0..10c832ef4fb 100644
--- a/x11/kde3-i18n-nn/Makefile
+++ b/x11/kde3-i18n-nn/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.19 2005/06/18 21:02:21 markd Exp $
+# $NetBSD: Makefile,v 1.20 2006/01/24 07:32:56 wiz Exp $
 
 DISTNAME=	kde-i18n-nn-${_KDE_VERSION}
+PKGREVISION=	1
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITES_KDE:=kde-i18n/}
 
diff --git a/x11/kde3-i18n-pa/Makefile b/x11/kde3-i18n-pa/Makefile
index 5ab8e2e8e46..c22705c5499 100644
--- a/x11/kde3-i18n-pa/Makefile
+++ b/x11/kde3-i18n-pa/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.5 2005/06/18 21:02:21 markd Exp $
+# $NetBSD: Makefile,v 1.6 2006/01/24 07:32:56 wiz Exp $
 
 DISTNAME=	kde-i18n-pa-${_KDE_VERSION}
+PKGREVISION=	1
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITES_KDE:=kde-i18n/}
 
diff --git a/x11/kde3-i18n-pl/Makefile b/x11/kde3-i18n-pl/Makefile
index 08ace4fe112..3963e09b8ce 100644
--- a/x11/kde3-i18n-pl/Makefile
+++ b/x11/kde3-i18n-pl/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.19 2005/06/18 21:02:21 markd Exp $
+# $NetBSD: Makefile,v 1.20 2006/01/24 07:32:56 wiz Exp $
 
 DISTNAME=	kde-i18n-pl-${_KDE_VERSION}
+PKGREVISION=	1
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITES_KDE:=kde-i18n/}
 
diff --git a/x11/kde3-i18n-pt/Makefile b/x11/kde3-i18n-pt/Makefile
index 37e59d951c5..3fd1e165ea2 100644
--- a/x11/kde3-i18n-pt/Makefile
+++ b/x11/kde3-i18n-pt/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.19 2005/06/18 21:02:21 markd Exp $
+# $NetBSD: Makefile,v 1.20 2006/01/24 07:32:56 wiz Exp $
 
 DISTNAME=	kde-i18n-pt-${_KDE_VERSION}
+PKGREVISION=	1
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITES_KDE:=kde-i18n/}
 
diff --git a/x11/kde3-i18n-pt_BR/Makefile b/x11/kde3-i18n-pt_BR/Makefile
index 1aa3ee9223f..028e2097a19 100644
--- a/x11/kde3-i18n-pt_BR/Makefile
+++ b/x11/kde3-i18n-pt_BR/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.19 2005/06/18 21:02:21 markd Exp $
+# $NetBSD: Makefile,v 1.20 2006/01/24 07:32:56 wiz Exp $
 
 DISTNAME=	kde-i18n-pt_BR-${_KDE_VERSION}
+PKGREVISION=	1
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITES_KDE:=kde-i18n/}
 
diff --git a/x11/kde3-i18n-ro/Makefile b/x11/kde3-i18n-ro/Makefile
index 0e6169f0cde..d32e25097b0 100644
--- a/x11/kde3-i18n-ro/Makefile
+++ b/x11/kde3-i18n-ro/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.20 2005/06/18 21:02:21 markd Exp $
+# $NetBSD: Makefile,v 1.21 2006/01/24 07:32:56 wiz Exp $
 
 DISTNAME=	kde-i18n-ro-${_KDE_VERSION}
+PKGREVISION=	1
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITES_KDE:=kde-i18n/}
 
diff --git a/x11/kde3-i18n-ru/Makefile b/x11/kde3-i18n-ru/Makefile
index 88c5b30e728..62d335e2b09 100644
--- a/x11/kde3-i18n-ru/Makefile
+++ b/x11/kde3-i18n-ru/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.19 2005/06/18 21:02:21 markd Exp $
+# $NetBSD: Makefile,v 1.20 2006/01/24 07:32:56 wiz Exp $
 
 DISTNAME=	kde-i18n-ru-${_KDE_VERSION}
+PKGREVISION=	1
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITES_KDE:=kde-i18n/}
 
diff --git a/x11/kde3-i18n-rw/Makefile b/x11/kde3-i18n-rw/Makefile
index e3d4d8b080a..51dabffa71f 100644
--- a/x11/kde3-i18n-rw/Makefile
+++ b/x11/kde3-i18n-rw/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.1 2005/12/11 12:36:21 markd Exp $
+# $NetBSD: Makefile,v 1.2 2006/01/24 07:32:57 wiz Exp $
 
 DISTNAME=	kde-i18n-rw-${_KDE_VERSION}
+PKGREVISION=	1
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITES_KDE:=kde-i18n/}
 
diff --git a/x11/kde3-i18n-se/Makefile b/x11/kde3-i18n-se/Makefile
index 5e2baa0e90a..509d05af1e8 100644
--- a/x11/kde3-i18n-se/Makefile
+++ b/x11/kde3-i18n-se/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.12 2005/06/18 21:02:21 markd Exp $
+# $NetBSD: Makefile,v 1.13 2006/01/24 07:32:57 wiz Exp $
 
 DISTNAME=	kde-i18n-se-${_KDE_VERSION}
+PKGREVISION=	1
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITES_KDE:=kde-i18n/}
 
diff --git a/x11/kde3-i18n-sk/Makefile b/x11/kde3-i18n-sk/Makefile
index 67c258711cb..f55d7a31f35 100644
--- a/x11/kde3-i18n-sk/Makefile
+++ b/x11/kde3-i18n-sk/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.19 2005/06/18 21:02:21 markd Exp $
+# $NetBSD: Makefile,v 1.20 2006/01/24 07:32:57 wiz Exp $
 
 DISTNAME=	kde-i18n-sk-${_KDE_VERSION}
+PKGREVISION=	1
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITES_KDE:=kde-i18n/}
 
diff --git a/x11/kde3-i18n-sl/Makefile b/x11/kde3-i18n-sl/Makefile
index 95f87bdf508..b6b49b53b06 100644
--- a/x11/kde3-i18n-sl/Makefile
+++ b/x11/kde3-i18n-sl/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.19 2005/06/18 21:02:21 markd Exp $
+# $NetBSD: Makefile,v 1.20 2006/01/24 07:32:57 wiz Exp $
 
 DISTNAME=	kde-i18n-sl-${_KDE_VERSION}
+PKGREVISION=	1
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITES_KDE:=kde-i18n/}
 
diff --git a/x11/kde3-i18n-sr/Makefile b/x11/kde3-i18n-sr/Makefile
index 8aee2ac50d6..3ea52c2dff7 100644
--- a/x11/kde3-i18n-sr/Makefile
+++ b/x11/kde3-i18n-sr/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.19 2005/06/18 21:02:21 markd Exp $
+# $NetBSD: Makefile,v 1.20 2006/01/24 07:32:57 wiz Exp $
 
 DISTNAME=	kde-i18n-sr-${_KDE_VERSION}
+PKGREVISION=	1
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITES_KDE:=kde-i18n/}
 
diff --git a/x11/kde3-i18n-sr_Latn/Makefile b/x11/kde3-i18n-sr_Latn/Makefile
index 1e8ec114adb..98ca33906e0 100644
--- a/x11/kde3-i18n-sr_Latn/Makefile
+++ b/x11/kde3-i18n-sr_Latn/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.8 2005/06/18 21:02:21 markd Exp $
+# $NetBSD: Makefile,v 1.9 2006/01/24 07:32:57 wiz Exp $
 
 DISTNAME=	kde-i18n-sr@Latn-${_KDE_VERSION}
 PKGNAME=	${DISTNAME:S/@/_/}
+PKGREVISION=	1
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITES_KDE:=kde-i18n/}
 
diff --git a/x11/kde3-i18n-ss/Makefile b/x11/kde3-i18n-ss/Makefile
index 908f864d9d0..af911117ebc 100644
--- a/x11/kde3-i18n-ss/Makefile
+++ b/x11/kde3-i18n-ss/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.7 2005/12/11 12:36:23 markd Exp $
+# $NetBSD: Makefile,v 1.8 2006/01/24 07:32:57 wiz Exp $
 
 DISTNAME=	kde-i18n-ss-${_KDE_VERSION}
+PKGREVISION=	1
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITES_KDE:=kde-i18n/}
 
diff --git a/x11/kde3-i18n-sv/Makefile b/x11/kde3-i18n-sv/Makefile
index 376a4deb90c..ae02d28d4a3 100644
--- a/x11/kde3-i18n-sv/Makefile
+++ b/x11/kde3-i18n-sv/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.19 2005/06/18 21:02:22 markd Exp $
+# $NetBSD: Makefile,v 1.20 2006/01/24 07:32:57 wiz Exp $
 
 DISTNAME=	kde-i18n-sv-${_KDE_VERSION}
+PKGREVISION=	1
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITES_KDE:=kde-i18n/}
 
diff --git a/x11/kde3-i18n-ta/Makefile b/x11/kde3-i18n-ta/Makefile
index 6068edf7082..07692a46041 100644
--- a/x11/kde3-i18n-ta/Makefile
+++ b/x11/kde3-i18n-ta/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.19 2005/06/18 21:02:22 markd Exp $
+# $NetBSD: Makefile,v 1.20 2006/01/24 07:32:57 wiz Exp $
 
 DISTNAME=	kde-i18n-ta-${_KDE_VERSION}
+PKGREVISION=	1
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITES_KDE:=kde-i18n/}
 
diff --git a/x11/kde3-i18n-tg/Makefile b/x11/kde3-i18n-tg/Makefile
index 65227dbd086..090c3848a97 100644
--- a/x11/kde3-i18n-tg/Makefile
+++ b/x11/kde3-i18n-tg/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.7 2005/06/18 21:02:22 markd Exp $
+# $NetBSD: Makefile,v 1.8 2006/01/24 07:32:57 wiz Exp $
 
 DISTNAME=	kde-i18n-tg-${_KDE_VERSION}
+PKGREVISION=	1
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITES_KDE:=kde-i18n/}
 
diff --git a/x11/kde3-i18n-tr/Makefile b/x11/kde3-i18n-tr/Makefile
index fa06b49dcab..a6694a6353c 100644
--- a/x11/kde3-i18n-tr/Makefile
+++ b/x11/kde3-i18n-tr/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.19 2005/06/18 21:02:22 markd Exp $
+# $NetBSD: Makefile,v 1.20 2006/01/24 07:32:57 wiz Exp $
 
 DISTNAME=	kde-i18n-tr-${_KDE_VERSION}
+PKGREVISION=	1
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITES_KDE:=kde-i18n/}
 
diff --git a/x11/kde3-i18n-uk/Makefile b/x11/kde3-i18n-uk/Makefile
index 23cb7de288a..e52d3f9307b 100644
--- a/x11/kde3-i18n-uk/Makefile
+++ b/x11/kde3-i18n-uk/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.19 2005/06/18 21:02:22 markd Exp $
+# $NetBSD: Makefile,v 1.20 2006/01/24 07:32:57 wiz Exp $
 
 DISTNAME=	kde-i18n-uk-${_KDE_VERSION}
+PKGREVISION=	1
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITES_KDE:=kde-i18n/}
 
diff --git a/x11/kde3-i18n-uz/Makefile b/x11/kde3-i18n-uz/Makefile
index a9437d1704b..3ce2457f73a 100644
--- a/x11/kde3-i18n-uz/Makefile
+++ b/x11/kde3-i18n-uz/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.7 2005/12/11 12:36:24 markd Exp $
+# $NetBSD: Makefile,v 1.8 2006/01/24 07:32:57 wiz Exp $
 
 DISTNAME=	kde-i18n-uz-${_KDE_VERSION}
+PKGREVISION=	1
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITES_KDE:=kde-i18n/}
 
diff --git a/x11/kde3-i18n-zh_CN/Makefile b/x11/kde3-i18n-zh_CN/Makefile
index b421225bdb3..4ef3c17b1d3 100644
--- a/x11/kde3-i18n-zh_CN/Makefile
+++ b/x11/kde3-i18n-zh_CN/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.19 2005/06/18 21:02:22 markd Exp $
+# $NetBSD: Makefile,v 1.20 2006/01/24 07:32:57 wiz Exp $
 
 DISTNAME=	kde-i18n-zh_CN-${_KDE_VERSION}
+PKGREVISION=	1
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITES_KDE:=kde-i18n/}
 
diff --git a/x11/kde3-i18n-zh_TW/Makefile b/x11/kde3-i18n-zh_TW/Makefile
index 9775298495d..7cf504487e4 100644
--- a/x11/kde3-i18n-zh_TW/Makefile
+++ b/x11/kde3-i18n-zh_TW/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.19 2005/12/11 12:36:24 markd Exp $
+# $NetBSD: Makefile,v 1.20 2006/01/24 07:32:57 wiz Exp $
 
 DISTNAME=	kde-i18n-zh_TW-${_KDE_VERSION}
+PKGREVISION=	1
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITES_KDE:=kde-i18n/}
 
diff --git a/x11/kdebase3/Makefile b/x11/kdebase3/Makefile
index a8e00fbb4d5..44b4a92fa39 100644
--- a/x11/kdebase3/Makefile
+++ b/x11/kdebase3/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.102 2006/01/20 03:44:09 markd Exp $
+# $NetBSD: Makefile,v 1.103 2006/01/24 07:32:57 wiz Exp $
 
 DISTNAME=	kdebase-${_KDE_VERSION}
-PKGREVISION=	2
+PKGREVISION=	3
 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 d9ad3b3be45..c6c1762d3d4 100644
--- a/x11/kdebase3/buildlink3.mk
+++ b/x11/kdebase3/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.13 2006/01/06 15:10:08 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.14 2006/01/24 07:32:57 wiz Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 KDEBASE_BUILDLINK3_MK:=	${KDEBASE_BUILDLINK3_MK}+
@@ -12,6 +12,7 @@ BUILDLINK_PACKAGES+=	kdebase
 
 .if !empty(KDEBASE_BUILDLINK3_MK:M+)
 BUILDLINK_DEPENDS.kdebase+=	kdebase>=3.5.0nb2
+BUILDLINK_RECOMMENDED.kdebase?=	kdebase>=3.5.0nb3
 BUILDLINK_PKGSRCDIR.kdebase?=	../../x11/kdebase3
 .endif	# KDEBASE_BUILDLINK3_MK
 
diff --git a/x11/kdelibdocs3/Makefile b/x11/kdelibdocs3/Makefile
index 2c432e4a333..bb1abf4e958 100644
--- a/x11/kdelibdocs3/Makefile
+++ b/x11/kdelibdocs3/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.33 2005/12/11 11:06:12 markd Exp $
+# $NetBSD: Makefile,v 1.34 2006/01/24 07:32:57 wiz Exp $
 
 DISTNAME=	kdelibs-${_KDE_VERSION}
 PKGNAME=	kdelibdocs-${_KDE_VERSION}
+PKGREVISION=	1
 CATEGORIES=	x11 devel
 
 COMMENT=	KDE library documentation
diff --git a/x11/kdelibs3/Makefile b/x11/kdelibs3/Makefile
index 799e43cccff..118ad8c09eb 100644
--- a/x11/kdelibs3/Makefile
+++ b/x11/kdelibs3/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.99 2006/01/19 23:22:29 markd Exp $
+# $NetBSD: Makefile,v 1.100 2006/01/24 07:32:57 wiz Exp $
 
 DISTNAME=	kdelibs-${_KDE_VERSION}
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	x11
 COMMENT=	Support libraries for the KDE integrated X11 desktop
 
diff --git a/x11/kdelibs3/buildlink3.mk b/x11/kdelibs3/buildlink3.mk
index af05f93d0f0..1436b978ad2 100644
--- a/x11/kdelibs3/buildlink3.mk
+++ b/x11/kdelibs3/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.14 2005/12/11 10:53:54 markd Exp $
+# $NetBSD: buildlink3.mk,v 1.15 2006/01/24 07:32:57 wiz Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 KDELIBS_BUILDLINK3_MK:=	${KDELIBS_BUILDLINK3_MK}+
@@ -14,7 +14,7 @@ BUILDLINK_PACKAGES+=	kdelibs
 
 .if !empty(KDELIBS_BUILDLINK3_MK:M+)
 BUILDLINK_DEPENDS.kdelibs+=	kdelibs>=3.2.0
-BUILDLINK_RECOMMENDED.kdelibs?=	kdelibs>=3.5.0
+BUILDLINK_RECOMMENDED.kdelibs?=	kdelibs>=3.5.0nb3
 BUILDLINK_PKGSRCDIR.kdelibs?=	../../x11/kdelibs3
 
 .include "../../x11/kdelibs3/dirs.mk"
diff --git a/x11/kkbswitch/Makefile b/x11/kkbswitch/Makefile
index 012238fc67f..9e6fb128ad8 100644
--- a/x11/kkbswitch/Makefile
+++ b/x11/kkbswitch/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.7 2005/05/22 20:08:48 jlam Exp $
+# $NetBSD: Makefile,v 1.8 2006/01/24 07:32:58 wiz Exp $
 #
 
 DISTNAME=		kkbswitch-1.4.3
+PKGREVISION=		1
 CATEGORIES=		kde x11
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=kkbswitch/}
 
diff --git a/x11/kmessage/Makefile b/x11/kmessage/Makefile
index d3434500d72..db494cd127b 100644
--- a/x11/kmessage/Makefile
+++ b/x11/kmessage/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.12 2005/05/22 20:08:48 jlam Exp $
+# $NetBSD: Makefile,v 1.13 2006/01/24 07:32:58 wiz Exp $
 
 DISTNAME=	kmessage-0.1
-PKGREVISION=	5
+PKGREVISION=	6
 CATEGORIES=	x11 kde
 MASTER_SITES=	http://soliton.wins.uva.nl/~wijnhout/kmessage/
 
diff --git a/x11/lablgtk2/Makefile b/x11/lablgtk2/Makefile
index 7a6a64c67b5..b13e8d0fca6 100644
--- a/x11/lablgtk2/Makefile
+++ b/x11/lablgtk2/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.14 2006/01/06 15:10:08 wiz Exp $
+# $NetBSD: Makefile,v 1.15 2006/01/24 07:32:58 wiz Exp $
 #
 
 DISTNAME=	lablgtk-2.6.0
 PKGNAME=	${DISTNAME:S/gtk/gtk2/}
-PKGREVISION=	3
+PKGREVISION=	4
 CATEGORIES=	x11
 MASTER_SITES=	http://wwwfun.kurims.kyoto-u.ac.jp/soft/olabl/dist/
 
diff --git a/x11/lablgtk2/buildlink3.mk b/x11/lablgtk2/buildlink3.mk
index 5a7cd69c472..1306435d69d 100644
--- a/x11/lablgtk2/buildlink3.mk
+++ b/x11/lablgtk2/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2006/01/06 15:10:08 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2006/01/24 07:32:58 wiz Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 LABLGTK2_BUILDLINK3_MK:=	${LABLGTK2_BUILDLINK3_MK}+
@@ -12,6 +12,7 @@ BUILDLINK_PACKAGES+=	lablgtk2
 
 .if !empty(LABLGTK2_BUILDLINK3_MK:M+)
 BUILDLINK_DEPENDS.lablgtk2+=	lablgtk2>=2.6.0nb3
+BUILDLINK_RECOMMENDED.lablgtk2?=	lablgtk2>=2.6.0nb4
 BUILDLINK_PKGSRCDIR.lablgtk2?=	../../x11/lablgtk2
 .endif	# LABLGTK2_BUILDLINK3_MK
 
diff --git a/x11/lesstif/Makefile b/x11/lesstif/Makefile
index e1181e10e26..6dc8907965c 100644
--- a/x11/lesstif/Makefile
+++ b/x11/lesstif/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.85 2006/01/22 01:00:44 joerg Exp $
+# $NetBSD: Makefile,v 1.86 2006/01/24 07:32:58 wiz Exp $
 
 DISTNAME=	lesstif-0.94.4
+PKGREVISION=	1
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=lesstif/}
 EXTRACT_SUFX=	.tar.bz2
diff --git a/x11/lesstif/buildlink3.mk b/x11/lesstif/buildlink3.mk
index dd15ab2777f..7779c45070d 100644
--- a/x11/lesstif/buildlink3.mk
+++ b/x11/lesstif/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2005/03/11 00:34:19 salo Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2006/01/24 07:32:58 wiz Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 LESSTIF_BUILDLINK3_MK:=	${LESSTIF_BUILDLINK3_MK}+
@@ -12,7 +12,7 @@ BUILDLINK_PACKAGES+=	lesstif
 
 .if !empty(LESSTIF_BUILDLINK3_MK:M+)
 BUILDLINK_DEPENDS.lesstif+=	lesstif>=0.91.4
-BUILDLINK_RECOMMENDED.lesstif+=	lesstif>=0.94.0nb1
+BUILDLINK_RECOMMENDED.lesstif+=	lesstif>=0.94.4nb1
 BUILDLINK_PKGSRCDIR.lesstif?=	../../x11/lesstif
 .endif	# LESSTIF_BUILDLINK3_MK
 
diff --git a/x11/libexo/Makefile b/x11/libexo/Makefile
index 79d44cb315f..ced87254dc7 100644
--- a/x11/libexo/Makefile
+++ b/x11/libexo/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.1.1.1 2005/10/03 04:51:33 minskim Exp $
+# $NetBSD: Makefile,v 1.2 2006/01/24 07:32:58 wiz Exp $
 #
 
 DISTNAME=		exo-0.3.0
+PKGREVISION=		1
 CATEGORIES=		x11
 MASTER_SITES=		http://download.berlios.de/xfce-goodies/
 EXTRACT_SUFX=		.tar.bz2
diff --git a/x11/libexo/buildlink3.mk b/x11/libexo/buildlink3.mk
index 5ccb9f1aa7a..d1aff8d279e 100644
--- a/x11/libexo/buildlink3.mk
+++ b/x11/libexo/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2005/10/03 05:10:03 minskim Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2006/01/24 07:32:58 wiz Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 EXO_BUILDLINK3_MK:=	${EXO_BUILDLINK3_MK}+
@@ -12,6 +12,7 @@ BUILDLINK_PACKAGES+=	exo
 
 .if !empty(EXO_BUILDLINK3_MK:M+)
 BUILDLINK_DEPENDS.exo+=		exo>=0.3.0
+BUILDLINK_RECOMMENDED.exo?=	exo>=0.3.0nb1
 BUILDLINK_PKGSRCDIR.exo?=	../../x11/libexo
 .endif	# EXO_BUILDLINK3_MK
 
diff --git a/x11/libxfce4gui/Makefile b/x11/libxfce4gui/Makefile
index cdfe92c7d39..2f9b60dcbab 100644
--- a/x11/libxfce4gui/Makefile
+++ b/x11/libxfce4gui/Makefile
@@ -1,9 +1,10 @@
-# $NetBSD: Makefile,v 1.14 2005/11/09 07:09:05 martti Exp $
+# $NetBSD: Makefile,v 1.15 2006/01/24 07:32:58 wiz Exp $
 
 .include "../../meta-pkgs/xfce4/Makefile.common"
 
 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 50e60e347ef..c924c7a45e3 100644
--- a/x11/libxfce4gui/buildlink3.mk
+++ b/x11/libxfce4gui/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.10 2005/11/09 06:42:58 martti Exp $
+# $NetBSD: buildlink3.mk,v 1.11 2006/01/24 07:32:58 wiz Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 LIBXFCE4GUI_BUILDLINK3_MK:=	${LIBXFCE4GUI_BUILDLINK3_MK}+
@@ -12,6 +12,7 @@ BUILDLINK_PACKAGES+=	libxfce4gui
 
 .if !empty(LIBXFCE4GUI_BUILDLINK3_MK:M+)
 BUILDLINK_DEPENDS.libxfce4gui+=	libxfce4gui>=4.2.3
+BUILDLINK_RECOMMENDED.libxfce4gui?=	libxfce4gui>=4.2.3nb1
 BUILDLINK_PKGSRCDIR.libxfce4gui?=	../../x11/libxfce4gui
 .endif	# LIBXFCE4GUI_BUILDLINK3_MK
 
diff --git a/x11/libzvt/Makefile b/x11/libzvt/Makefile
index 0f80449f521..9dba604137f 100644
--- a/x11/libzvt/Makefile
+++ b/x11/libzvt/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.19 2005/09/23 20:08:05 wiz Exp $
+# $NetBSD: Makefile,v 1.20 2006/01/24 07:32:58 wiz Exp $
 #
 
 DISTNAME=		libzvt-2.0.1
-PKGREVISION=		6
+PKGREVISION=		7
 CATEGORIES=		x11 gnome
 MASTER_SITES=		${MASTER_SITE_GNOME:=sources/libzvt/2.0/}
 EXTRACT_SUFX=		.tar.bz2
diff --git a/x11/libzvt/buildlink3.mk b/x11/libzvt/buildlink3.mk
index 0da9ffec0ea..152940367c7 100644
--- a/x11/libzvt/buildlink3.mk
+++ b/x11/libzvt/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2004/10/03 00:18:36 tv Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2006/01/24 07:32:58 wiz Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 LIBZVT_BUILDLINK3_MK:=	${LIBZVT_BUILDLINK3_MK}+
@@ -12,7 +12,7 @@ BUILDLINK_PACKAGES+=	libzvt
 
 .if !empty(LIBZVT_BUILDLINK3_MK:M+)
 BUILDLINK_DEPENDS.libzvt+=	libzvt>=2.0.1nb5
-BUILDLINK_RECOMMENDED.libzvt+=	libzvt>=2.0.1nb6
+BUILDLINK_RECOMMENDED.libzvt+=	libzvt>=2.0.1nb7
 BUILDLINK_PKGSRCDIR.libzvt?=	../../x11/libzvt
 .endif	# LIBZVT_BUILDLINK3_MK
 
diff --git a/x11/matchbox-common/Makefile b/x11/matchbox-common/Makefile
index fd14d58bbb0..9cf9fbc9ec2 100644
--- a/x11/matchbox-common/Makefile
+++ b/x11/matchbox-common/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.1.1.1 2005/12/31 13:26:20 peter Exp $
+# $NetBSD: Makefile,v 1.2 2006/01/24 07:32:58 wiz Exp $
 #
 
 DISTNAME=		matchbox-common-0.9.1
+PKGREVISION=		1
 CATEGORIES=		x11
 MASTER_SITES=		http://projects.o-hand.com/matchbox/sources/matchbox-common/0.9/
 EXTRACT_SUFX=		.tar.bz2
diff --git a/x11/matchbox-desktop/Makefile b/x11/matchbox-desktop/Makefile
index 8a6683dac59..89bdcc141c2 100644
--- a/x11/matchbox-desktop/Makefile
+++ b/x11/matchbox-desktop/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.1.1.1 2005/12/31 13:29:26 peter Exp $
+# $NetBSD: Makefile,v 1.2 2006/01/24 07:32:58 wiz Exp $
 #
 
 DISTNAME=		matchbox-desktop-0.9.1
+PKGREVISION=		1
 CATEGORIES=		x11
 MASTER_SITES=		http://projects.o-hand.com/matchbox/sources/matchbox-desktop/0.9/
 EXTRACT_SUFX=		.tar.bz2
diff --git a/x11/matchbox-nest/Makefile b/x11/matchbox-nest/Makefile
index 43badf7e72b..d9ec0a87870 100644
--- a/x11/matchbox-nest/Makefile
+++ b/x11/matchbox-nest/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.1.1.1 2005/12/31 13:30:29 peter Exp $
+# $NetBSD: Makefile,v 1.2 2006/01/24 07:32:58 wiz Exp $
 #
 
 DISTNAME=	matchbox-nest-0.3
+PKGREVISION=	1
 CATEGORIES=	x11
 MASTER_SITES=	http://projects.o-hand.com/matchbox/sources/matchbox-nest/0.3/
 EXTRACT_SUFX=	.tar.bz2
diff --git a/x11/matchbox-panel-manager/Makefile b/x11/matchbox-panel-manager/Makefile
index b1ee64c456d..88c4960318e 100644
--- a/x11/matchbox-panel-manager/Makefile
+++ b/x11/matchbox-panel-manager/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.1.1.1 2005/12/31 13:34:26 peter Exp $
+# $NetBSD: Makefile,v 1.2 2006/01/24 07:32:58 wiz Exp $
 #
 
 DISTNAME=	matchbox-panel-manager-0.1
+PKGREVISION=	1
 CATEGORIES=	x11
 MASTER_SITES=	http://projects.o-hand.com/matchbox/sources/matchbox-panel-manager/0.1/
 EXTRACT_SUFX=	.tar.bz2
diff --git a/x11/matchbox-panel/Makefile b/x11/matchbox-panel/Makefile
index bd5bf3878c8..1569340eb20 100644
--- a/x11/matchbox-panel/Makefile
+++ b/x11/matchbox-panel/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.2 2006/01/07 12:47:55 peter Exp $
+# $NetBSD: Makefile,v 1.3 2006/01/24 07:32:58 wiz Exp $
 #
 
 DISTNAME=		matchbox-panel-0.9.2
+PKGREVISION=		1
 CATEGORIES=		x11
 MASTER_SITES=		http://projects.o-hand.com/matchbox/sources/matchbox-panel/0.9/
 EXTRACT_SUFX=		.tar.bz2
diff --git a/x11/mlterm/Makefile b/x11/mlterm/Makefile
index fd468e1689e..17e154f4413 100644
--- a/x11/mlterm/Makefile
+++ b/x11/mlterm/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.39 2005/12/29 06:22:26 jlam Exp $
+# $NetBSD: Makefile,v 1.40 2006/01/24 07:32:58 wiz Exp $
 
 DISTNAME=	mlterm-2.9.2
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=mlterm/}
 
diff --git a/x11/mrxvt/Makefile b/x11/mrxvt/Makefile
index 0ce27bd3b8a..faae76c854d 100644
--- a/x11/mrxvt/Makefile
+++ b/x11/mrxvt/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.4 2005/12/29 06:22:26 jlam Exp $
+# $NetBSD: Makefile,v 1.5 2006/01/24 07:32:58 wiz Exp $
 #
 
 DISTNAME=	mrxvt-0.4.1
+PKGREVISION=	1
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=materm/}
 
diff --git a/x11/multi-gnome-terminal/Makefile b/x11/multi-gnome-terminal/Makefile
index c7d7f4c8e30..a5b9aae0c81 100644
--- a/x11/multi-gnome-terminal/Makefile
+++ b/x11/multi-gnome-terminal/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.26 2005/09/28 20:52:28 rillig Exp $
+# $NetBSD: Makefile,v 1.27 2006/01/24 07:32:58 wiz Exp $
 
 DISTNAME=	multi-gnome-terminal-1.6.1
-PKGREVISION=	7
+PKGREVISION=	8
 CATEGORIES=	gnome x11
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=multignometerm/}
 
diff --git a/x11/p5-gtk/Makefile b/x11/p5-gtk/Makefile
index cd787529afd..613ff55d412 100644
--- a/x11/p5-gtk/Makefile
+++ b/x11/p5-gtk/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.31 2005/08/06 06:19:41 jlam Exp $
+# $NetBSD: Makefile,v 1.32 2006/01/24 07:32:58 wiz Exp $
 #
 
 .include "Makefile.common"
 
 PKGNAME=		p5-gtk-${GTKPERL_VERSION}
-PKGREVISION=		3
+PKGREVISION=		4
 SVR4_PKGNAME=		p5gtk
 
 MAINTAINER=		root@garbled.net
diff --git a/x11/p5-gtk2/Makefile b/x11/p5-gtk2/Makefile
index 59d106ef026..420a547b868 100644
--- a/x11/p5-gtk2/Makefile
+++ b/x11/p5-gtk2/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.10 2005/08/06 06:19:41 jlam Exp $
+# $NetBSD: Makefile,v 1.11 2006/01/24 07:32:59 wiz Exp $
 
 DISTNAME=	Gtk2-1.042
 PKGNAME=	p5-gtk2-1.042
-PKGREVISION=	3
+PKGREVISION=	4
 CATEGORIES=	x11 perl5
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=gtk2-perl/}
 
diff --git a/x11/paragui/Makefile b/x11/paragui/Makefile
index 2e2c1f2737f..31b98d5fdf5 100644
--- a/x11/paragui/Makefile
+++ b/x11/paragui/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.18 2005/12/11 09:40:46 wiz Exp $
+# $NetBSD: Makefile,v 1.19 2006/01/24 07:32:59 wiz Exp $
 #
 
 DISTNAME=		paragui-1.0.4
-PKGREVISION=		8
+PKGREVISION=		9
 CATEGORIES=		x11
 MASTER_SITES=		http://savannah.nongnu.org/download/paragui/
 
diff --git a/x11/paragui/buildlink3.mk b/x11/paragui/buildlink3.mk
index b53091b213e..bbdb6deb610 100644
--- a/x11/paragui/buildlink3.mk
+++ b/x11/paragui/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.8 2005/12/11 09:40:46 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.9 2006/01/24 07:32:59 wiz Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 PARAGUI_BUILDLINK3_MK:=	${PARAGUI_BUILDLINK3_MK}+
@@ -12,7 +12,7 @@ BUILDLINK_PACKAGES+=	paragui
 
 .if !empty(PARAGUI_BUILDLINK3_MK:M+)
 BUILDLINK_DEPENDS.paragui+=	paragui>=1.0.4nb3
-BUILDLINK_RECOMMENDED.paragui+=	paragui>=1.0.4nb8
+BUILDLINK_RECOMMENDED.paragui+=	paragui>=1.0.4nb9
 BUILDLINK_PKGSRCDIR.paragui?=	../../x11/paragui
 .endif	# PARAGUI_BUILDLINK3_MK
 
diff --git a/x11/py-gnome2-extras/Makefile b/x11/py-gnome2-extras/Makefile
index 71f96419a92..accf594e4fc 100644
--- a/x11/py-gnome2-extras/Makefile
+++ b/x11/py-gnome2-extras/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.9 2006/01/06 15:10:08 wiz Exp $
+# $NetBSD: Makefile,v 1.10 2006/01/24 07:32:59 wiz Exp $
 #
 
 DISTNAME=	gnome-python-extras-2.12.0
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME:S/gnome-python/gnome2/}
-PKGREVISION=	3
+PKGREVISION=	4
 CATEGORIES=	x11 python
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/gnome-python-extras/2.12/}
 EXTRACT_SUFX=	.tar.bz2
diff --git a/x11/py-gnome2-extras/buildlink3.mk b/x11/py-gnome2-extras/buildlink3.mk
index 7c49f4ecfd6..16eaeea9562 100644
--- a/x11/py-gnome2-extras/buildlink3.mk
+++ b/x11/py-gnome2-extras/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2006/01/06 15:10:08 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2006/01/24 07:32:59 wiz Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 PY_GNOME2EX_BUILDLINK3_MK:=	${PY_GNOME2EX_BUILDLINK3_MK}+
@@ -14,6 +14,7 @@ BUILDLINK_PACKAGES+=	pygnome2ex
 
 .if !empty(PY_GNOME2EX_BUILDLINK3_MK:M+)
 BUILDLINK_DEPENDS.pygnome2ex+=	${PYPKGPREFIX}-gnome2-extras>=2.12.0nb3
+BUILDLINK_RECOMMENDED.pygnome2ex?=	${PYPKGPREFIX}-gnome2-extras>=2.12.0nb4
 BUILDLINK_PKGSRCDIR.pygnome2ex?=	../../x11/py-gnome2-extras
 .endif	# PY_GNOME2EX_BUILDLINK3_MK
 
diff --git a/x11/py-gnome2/Makefile b/x11/py-gnome2/Makefile
index cf5cf49f3ae..0c62fe84f7b 100644
--- a/x11/py-gnome2/Makefile
+++ b/x11/py-gnome2/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.30 2005/12/31 12:32:49 wiz Exp $
+# $NetBSD: Makefile,v 1.31 2006/01/24 07:32:59 wiz Exp $
 #
 
 DISTNAME=	gnome-python-2.12.1
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME:S/gnome-python/gnome2/}
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	x11 python
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/gnome-python/2.12/}
 EXTRACT_SUFX=	.tar.bz2
diff --git a/x11/py-gnome2/buildlink3.mk b/x11/py-gnome2/buildlink3.mk
index 270a98544ad..533406720ef 100644
--- a/x11/py-gnome2/buildlink3.mk
+++ b/x11/py-gnome2/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.11 2005/12/31 12:32:49 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.12 2006/01/24 07:32:59 wiz Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 PY_GNOME2_BUILDLINK3_MK:=	${PY_GNOME2_BUILDLINK3_MK}+
@@ -14,7 +14,7 @@ BUILDLINK_PACKAGES+=	pygnome2
 
 .if !empty(PY_GNOME2_BUILDLINK3_MK:M+)
 BUILDLINK_DEPENDS.pygnome2+=	${PYPKGPREFIX}-gnome2>=2.10.0
-BUILDLINK_RECOMMENDED.pygnome2?=	${PYPKGPREFIX}-gnome2>=2.12.1nb1
+BUILDLINK_RECOMMENDED.pygnome2?=	${PYPKGPREFIX}-gnome2>=2.12.1nb2
 BUILDLINK_PKGSRCDIR.pygnome2?=	../../x11/py-gnome2
 .endif	# PY_GNOME2_BUILDLINK3_MK
 
diff --git a/x11/py-gtk2/Makefile b/x11/py-gtk2/Makefile
index 005e75be796..1eba7c2775d 100644
--- a/x11/py-gtk2/Makefile
+++ b/x11/py-gtk2/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.30 2005/12/05 20:51:18 rillig Exp $
+# $NetBSD: Makefile,v 1.31 2006/01/24 07:32:59 wiz Exp $
 #
 
 DISTNAME=	pygtk-2.8.2
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME:S/pygtk/gtk2/}
+PKGREVISION=	1
 CATEGORIES=	x11 python
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/pygtk/2.8/}
 EXTRACT_SUFX=	.tar.bz2
diff --git a/x11/py-gtk2/buildlink3.mk b/x11/py-gtk2/buildlink3.mk
index fe6b6a2d8af..2a743c46dda 100644
--- a/x11/py-gtk2/buildlink3.mk
+++ b/x11/py-gtk2/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.10 2005/10/25 11:13:14 drochner Exp $
+# $NetBSD: buildlink3.mk,v 1.11 2006/01/24 07:32:59 wiz Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 PY_GTK2_BUILDLINK3_MK:=	${PY_GTK2_BUILDLINK3_MK}+
@@ -14,7 +14,7 @@ BUILDLINK_PACKAGES+=	pygtk2
 
 .if !empty(PY_GTK2_BUILDLINK3_MK:M+)
 BUILDLINK_DEPENDS.pygtk2+=	${PYPKGPREFIX}-gtk2>=2.4.0
-BUILDLINK_RECOMMENDED.pygtk2+=	${PYPKGPREFIX}-gtk2>=2.4.0
+BUILDLINK_RECOMMENDED.pygtk2+=	${PYPKGPREFIX}-gtk2>=2.8.2nb1
 BUILDLINK_PKGSRCDIR.pygtk2?=	../../x11/py-gtk2
 .endif	# PY_GTK2_BUILDLINK3_MK
 
diff --git a/x11/py-qt2-sip/Makefile b/x11/py-qt2-sip/Makefile
index f391f3f0086..03f9559b711 100644
--- a/x11/py-qt2-sip/Makefile
+++ b/x11/py-qt2-sip/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.14 2005/12/05 23:55:24 rillig Exp $
+# $NetBSD: Makefile,v 1.15 2006/01/24 07:32:59 wiz Exp $
 #
 
 DISTNAME=	sip-3.1
 PKGNAME=	${PYPKGPREFIX}-qt2-sip-3.1
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	x11 devel python
 MASTER_SITES=	http://www.riverbankcomputing.co.uk/download/sip/
 
diff --git a/x11/py-qt2-sip/buildlink3.mk b/x11/py-qt2-sip/buildlink3.mk
index 47490466370..1037d2f40b0 100644
--- a/x11/py-qt2-sip/buildlink3.mk
+++ b/x11/py-qt2-sip/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2004/10/03 00:18:37 tv Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2006/01/24 07:32:59 wiz Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 PY_QT2_SIP_BUILDLINK3_MK:=	${PY_QT2_SIP_BUILDLINK3_MK}+
@@ -14,7 +14,7 @@ BUILDLINK_PACKAGES+=	pyqt2sip
 
 .if !empty(PY_QT2_SIP_BUILDLINK3_MK:M+)
 BUILDLINK_DEPENDS.pyqt2sip+=	${PYPKGPREFIX}-qt2-sip-[0-9]*
-BUILDLINK_RECOMMENDED.pyqt2sip+=	${PYPKGPREFIX}-qt2-sip>=3.1nb1
+BUILDLINK_RECOMMENDED.pyqt2sip+=	${PYPKGPREFIX}-qt2-sip>=3.1nb2
 BUILDLINK_PKGSRCDIR.pyqt2sip?=	../../x11/py-qt2-sip
 .endif	# PY_QT2_SIP_BUILDLINK3_MK
 
diff --git a/x11/py-qt2/Makefile b/x11/py-qt2/Makefile
index 027528a464d..aaf5bce2523 100644
--- a/x11/py-qt2/Makefile
+++ b/x11/py-qt2/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.16 2005/12/05 23:55:24 rillig Exp $
+# $NetBSD: Makefile,v 1.17 2006/01/24 07:32:59 wiz Exp $
 #
 
 DISTNAME=	PyQt-3.1-Qt-2.3.1
 PKGNAME=	${PYPKGPREFIX}-qt2-3.1
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	x11 python
 MASTER_SITES=	http://www.riverbankcomputing.co.uk/download/PyQt/
 
diff --git a/x11/py-qt3-base/Makefile b/x11/py-qt3-base/Makefile
index 0f6cf0110d6..8ce23d01b21 100644
--- a/x11/py-qt3-base/Makefile
+++ b/x11/py-qt3-base/Makefile
@@ -1,9 +1,10 @@
-# $NetBSD: Makefile,v 1.19 2006/01/05 10:08:59 ghen Exp $
+# $NetBSD: Makefile,v 1.20 2006/01/24 07:32:59 wiz Exp $
 #
 
 .include "../../x11/py-qt3-base/Makefile.common"
 
 PKGNAME=		${PYPKGPREFIX}-qt3-base-${PYQT_VERSION}
+PKGREVISION=		1
 
 COMMENT=		Python binding for Qt3
 
diff --git a/x11/py-qt3-base/buildlink3.mk b/x11/py-qt3-base/buildlink3.mk
index 94dd60d248a..86c49fba3be 100644
--- a/x11/py-qt3-base/buildlink3.mk
+++ b/x11/py-qt3-base/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/05/09 17:06:07 recht Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2006/01/24 07:32:59 wiz Exp $
 
 BUILDLINK_DEPTH:=			${BUILDLINK_DEPTH}+
 PYQT3_BASE_BUILDLINK3_MK:=	${PYQT3_BASE_BUILDLINK3_MK}+
@@ -14,6 +14,7 @@ BUILDLINK_PACKAGES+=	pyqt3-base
 
 .if !empty(PYQT3_BASE_BUILDLINK3_MK:M+)
 BUILDLINK_DEPENDS.pyqt3-base+=	${PYPKGPREFIX}-qt3-base>=3.11
+BUILDLINK_RECOMMENDED.pyqt3-base?=	${PYPKGPREFIX}-qt3-base>=3.15.1
 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 09b73325013..d701654a878 100644
--- a/x11/py-qt3-modules/Makefile
+++ b/x11/py-qt3-modules/Makefile
@@ -1,9 +1,10 @@
-# $NetBSD: Makefile,v 1.19 2006/01/05 10:09:00 ghen Exp $
+# $NetBSD: Makefile,v 1.20 2006/01/24 07:32:59 wiz Exp $
 #
 
 .include "../../x11/py-qt3-base/Makefile.common"
 
 PKGNAME=		${PYPKGPREFIX}-qt3-modules-${PYQT_VERSION}
+PKGREVISION=		1
 
 COMMENT=		Various Python modules for Qt3
 
diff --git a/x11/py-qt3-modules/buildlink3.mk b/x11/py-qt3-modules/buildlink3.mk
index 5da42067a94..755cb26af43 100644
--- a/x11/py-qt3-modules/buildlink3.mk
+++ b/x11/py-qt3-modules/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2005/08/08 09:51:15 drochner Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2006/01/24 07:32:59 wiz Exp $
 
 BUILDLINK_DEPTH:=			${BUILDLINK_DEPTH}+
 PYQT3_MOD_BUILDLINK3_MK:=	${PYQT3_MOD_BUILDLINK3_MK}+
@@ -14,6 +14,7 @@ BUILDLINK_PACKAGES+=	pyqt3-mod
 
 .if !empty(PYQT3_MOD_BUILDLINK3_MK:M+)
 BUILDLINK_DEPENDS.pyqt3-mod+=	${PYPKGPREFIX}-qt3-modules>=3.11
+BUILDLINK_RECOMMENDED.pyqt3-mod?=	${PYPKGPREFIX}-qt3-modules>=3.15.1
 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 eac67ce7973..13e6e251052 100644
--- a/x11/py-qt3-qscintilla/Makefile
+++ b/x11/py-qt3-qscintilla/Makefile
@@ -1,9 +1,10 @@
-# $NetBSD: Makefile,v 1.18 2006/01/05 10:09:00 ghen Exp $
+# $NetBSD: Makefile,v 1.19 2006/01/24 07:32:59 wiz Exp $
 #
 
 .include "../../x11/py-qt3-base/Makefile.common"
 
 PKGNAME=		${PYPKGPREFIX}-qt3-qscintilla-${PYQT_VERSION}
+PKGREVISION=		1
 
 COMMENT=		Python binding for QScintilla
 
diff --git a/x11/py-qt3-sip/Makefile b/x11/py-qt3-sip/Makefile
index 3cc5539a4e1..b092572e09b 100644
--- a/x11/py-qt3-sip/Makefile
+++ b/x11/py-qt3-sip/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.25 2006/01/05 12:00:39 ghen Exp $
+# $NetBSD: Makefile,v 1.26 2006/01/24 07:32:59 wiz Exp $
 #
 
 DISTNAME=	sip-4.3.2
 PKGNAME=	${PYPKGPREFIX}-qt3-${DISTNAME}
+PKGREVISION=	1
 CATEGORIES=	x11 devel python
 MASTER_SITES=	http://www.river-bank.demon.co.uk/download/sip/
 
diff --git a/x11/py-qt3-sip/buildlink3.mk b/x11/py-qt3-sip/buildlink3.mk
index 00ec8ec5808..b762f281064 100644
--- a/x11/py-qt3-sip/buildlink3.mk
+++ b/x11/py-qt3-sip/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2005/03/16 22:25:05 rillig Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2006/01/24 07:32:59 wiz Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 PYQT3_SIP_BUILDLINK3_MK:=	${PYQT3_SIP_BUILDLINK3_MK}+
@@ -14,6 +14,7 @@ BUILDLINK_PACKAGES+=	pyqt3-sip
 
 .if !empty(PYQT3_SIP_BUILDLINK3_MK:M+)
 BUILDLINK_DEPENDS.pyqt3-sip+=	${PYPKGPREFIX}-qt3-sip>=4.0rc3
+BUILDLINK_RECOMMENDED.pyqt3-sip?=	${PYPKGPREFIX}-qt3-sip>=4.3.2nb1
 BUILDLINK_PKGSRCDIR.pyqt3-sip?=	../../x11/py-qt3-sip
 
 BUILDLINK_LIBDIRS.pyqt3-sip+=	${PYSITELIB}
diff --git a/x11/py-wxWidgets/Makefile b/x11/py-wxWidgets/Makefile
index f760bc71fb5..c266dc6852a 100644
--- a/x11/py-wxWidgets/Makefile
+++ b/x11/py-wxWidgets/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.12 2005/12/05 20:51:18 rillig Exp $
+# $NetBSD: Makefile,v 1.13 2006/01/24 07:32:59 wiz Exp $
 #
 
 DISTNAME=	wxPython-src-2.6.1.0
 PKGNAME=	${PYPKGPREFIX}-wxWidgets-2.6.1.0
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	x11 python
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=wxpython/}
 
diff --git a/x11/py-wxWidgets/buildlink3.mk b/x11/py-wxWidgets/buildlink3.mk
index eac74f0a619..c31b4622f17 100644
--- a/x11/py-wxWidgets/buildlink3.mk
+++ b/x11/py-wxWidgets/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2005/10/02 15:53:35 minskim Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2006/01/24 07:32:59 wiz Exp $
 
 BUILDLINK_DEPTH:=			${BUILDLINK_DEPTH}+
 PY_WXWIDGETS_BUILDLINK3_MK:=	${PY_WXWIDGETS_BUILDLINK3_MK}+
@@ -14,6 +14,7 @@ BUILDLINK_PACKAGES+=	${PYPKGPREFIX}-wxWidgets
 
 .if !empty(PY_WXWIDGETS_BUILDLINK3_MK:M+)
 BUILDLINK_DEPENDS.${PYPKGPREFIX}-wxWidgets+=	${PYPKGPREFIX}-wxWidgets>=2.6.1.0
+BUILDLINK_RECOMMENDED.${PYPKGPREFIX}-wxWidgets?=	${PYPKGPREFIX}-wxWidgets>=2.6.1.0nb2
 BUILDLINK_PKGSRCDIR.${PYPKGPREFIX}-wxWidgets?=	../../x11/py-wxWidgets
 
 .include "../../x11/wxGTK/buildlink3.mk"
diff --git a/x11/qt2-designer/Makefile b/x11/qt2-designer/Makefile
index 7e2e37b56fa..fe79eff5338 100644
--- a/x11/qt2-designer/Makefile
+++ b/x11/qt2-designer/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.26 2005/12/05 20:51:18 rillig Exp $
+# $NetBSD: Makefile,v 1.27 2006/01/24 07:32:59 wiz Exp $
 
 PKGNAME=		qt2-designer-${QTVERSION}
-PKGREVISION=		3
+PKGREVISION=		4
 COMMENT=		Visual (WYSIWYG) QT GUI builder
 
 CONFLICTS+=		qt2-designer-kde-[0-9]*
diff --git a/x11/qt2-designer/buildlink3.mk b/x11/qt2-designer/buildlink3.mk
index a05186916d0..cf463b17493 100644
--- a/x11/qt2-designer/buildlink3.mk
+++ b/x11/qt2-designer/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2004/10/03 00:18:37 tv Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2006/01/24 07:32:59 wiz Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 QT2_DESIGNER_BUILDLINK3_MK:=	${QT2_DESIGNER_BUILDLINK3_MK}+
@@ -12,7 +12,7 @@ BUILDLINK_PACKAGES+=	qt2-designer
 
 .if !empty(QT2_DESIGNER_BUILDLINK3_MK:M+)
 BUILDLINK_DEPENDS.qt2-designer+=	qt2-designer>=2.3.1nb2
-BUILDLINK_RECOMMENDED.qt2-designer+=	qt2-designer>=2.3.1nb3
+BUILDLINK_RECOMMENDED.qt2-designer+=	qt2-designer>=2.3.1nb4
 BUILDLINK_PKGSRCDIR.qt2-designer?=	../../x11/qt2-designer
 .endif	# QT2_DESIGNER_BUILDLINK3_MK
 
diff --git a/x11/qt2-docs/Makefile b/x11/qt2-docs/Makefile
index 69380d3907e..eb59c1c5797 100644
--- a/x11/qt2-docs/Makefile
+++ b/x11/qt2-docs/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.19 2005/12/05 20:51:18 rillig Exp $
+# $NetBSD: Makefile,v 1.20 2006/01/24 07:32:59 wiz Exp $
 #
 
 PKGNAME=	qt2-docs-${QTVERSION}
-PKGREVISION=	3
+PKGREVISION=	4
 COMMENT=	Documentation for the QT C++ X GUI toolkit
 
 .include "../../x11/qt2-libs/Makefile.common"
diff --git a/x11/qt2-examples/Makefile b/x11/qt2-examples/Makefile
index cbcd929abf0..305cadcd04a 100644
--- a/x11/qt2-examples/Makefile
+++ b/x11/qt2-examples/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.13 2005/12/05 20:51:19 rillig Exp $
+# $NetBSD: Makefile,v 1.14 2006/01/24 07:32:59 wiz Exp $
 #
 
 PKGNAME=	qt2-examples-${QTVERSION}
-PKGREVISION=	3
+PKGREVISION=	4
 COMMENT=	QT2 Tutorial, example code and HTML documentation
 
 
diff --git a/x11/qt2-libs/Makefile b/x11/qt2-libs/Makefile
index 10161768208..82382b3e15f 100644
--- a/x11/qt2-libs/Makefile
+++ b/x11/qt2-libs/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.28 2005/12/05 20:51:19 rillig Exp $
+# $NetBSD: Makefile,v 1.29 2006/01/24 07:33:00 wiz Exp $
 
 PKGNAME=	qt2-libs-${QTVERSION}
-PKGREVISION=	6
+PKGREVISION=	7
 COMMENT=	C++ X GUI toolkit
 
 
diff --git a/x11/qt2-libs/buildlink3.mk b/x11/qt2-libs/buildlink3.mk
index 4d7b9d888a1..a1340b64819 100644
--- a/x11/qt2-libs/buildlink3.mk
+++ b/x11/qt2-libs/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2005/12/05 20:51:19 rillig Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2006/01/24 07:33:00 wiz Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 QT2_LIBS_BUILDLINK3_MK:=	${QT2_LIBS_BUILDLINK3_MK}+
@@ -12,7 +12,7 @@ BUILDLINK_PACKAGES+=	qt2-libs
 
 .if !empty(QT2_LIBS_BUILDLINK3_MK:M+)
 BUILDLINK_DEPENDS.qt2-libs+=	qt2-libs>=2.3.1nb2
-BUILDLINK_RECOMMENDED.qt2-libs+=	qt2-libs>=2.3.1nb6
+BUILDLINK_RECOMMENDED.qt2-libs+=	qt2-libs>=2.3.1nb7
 BUILDLINK_PKGSRCDIR.qt2-libs?=	../../x11/qt2-libs
 BUILDLINK_INCDIRS.qt2-libs=	qt2/include
 BUILDLINK_LIBDIRS.qt2-libs=	qt2/lib
diff --git a/x11/qt2/Makefile b/x11/qt2/Makefile
index 55f1369ddf4..1f8780296ef 100644
--- a/x11/qt2/Makefile
+++ b/x11/qt2/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.16 2004/10/28 11:52:29 wiz Exp $
+# $NetBSD: Makefile,v 1.17 2006/01/24 07:32:59 wiz Exp $
 #
 
 DISTNAME=	qt2-${QTVERSION}
-PKGREVISION=	6
+PKGREVISION=	7
 CATEGORIES=	x11
 MASTER_SITES=	# empty
 DISTFILES=	# empty
diff --git a/x11/qt3-docs/Makefile b/x11/qt3-docs/Makefile
index dcf19fdfd11..2017e450a51 100644
--- a/x11/qt3-docs/Makefile
+++ b/x11/qt3-docs/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.18 2005/12/05 20:51:19 rillig Exp $
+# $NetBSD: Makefile,v 1.19 2006/01/24 07:33:00 wiz Exp $
 
 .include "../../x11/qt3-libs/Makefile.common"
 
 PKGNAME=	qt3-docs-${QTVERSION}
+PKGREVISION=	1
 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 c6d059dc3df..1606bd51177 100644
--- a/x11/qt3-libs/Makefile
+++ b/x11/qt3-libs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.43 2006/01/12 20:59:56 jdc Exp $
+# $NetBSD: Makefile,v 1.44 2006/01/24 07:33:00 wiz Exp $
 
 LIBQT=			${WRKSRC}/lib/libqt-mt.la
 
@@ -11,7 +11,7 @@ GCC_REQD+=		3.4
 .include "../../x11/qt3-libs/Makefile.common"
 
 PKGNAME=		qt3-libs-${QTVERSION}
-PKGREVISION=		1
+PKGREVISION=		2
 MAINTAINER=		adam@NetBSD.org
 COMMENT=		C++ X GUI toolkit
 
diff --git a/x11/qt3-libs/buildlink3.mk b/x11/qt3-libs/buildlink3.mk
index e54f52439ac..5c4cf588a81 100644
--- a/x11/qt3-libs/buildlink3.mk
+++ b/x11/qt3-libs/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.8 2005/12/05 20:51:19 rillig Exp $
+# $NetBSD: buildlink3.mk,v 1.9 2006/01/24 07:33:00 wiz Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 QT3_LIBS_BUILDLINK3_MK:=	${QT3_LIBS_BUILDLINK3_MK}+
@@ -13,6 +13,7 @@ BUILDLINK_PACKAGES+=	qt3-libs
 .if !empty(QT3_LIBS_BUILDLINK3_MK:M+)
 BUILDLINK_DEPENDS.qt3-libs+=	qt3-libs>=3.2.3
 BUILDLINK_RECOMMENDED.qt3-libs+=qt3-libs>=3.3.3nb4
+BUILDLINK_RECOMMENDED.qt3-libs?=	qt3-libs>=3.3.5nb2
 BUILDLINK_PKGSRCDIR.qt3-libs?=	../../x11/qt3-libs
 
 BUILDLINK_INCDIRS.qt3-libs+=	qt3/include
diff --git a/x11/qt3-mysql/Makefile b/x11/qt3-mysql/Makefile
index 4739ab4f9b6..a6672c6e5be 100644
--- a/x11/qt3-mysql/Makefile
+++ b/x11/qt3-mysql/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.16 2006/01/08 18:35:12 xtraeme Exp $
+# $NetBSD: Makefile,v 1.17 2006/01/24 07:33:00 wiz Exp $
 
 .include "../../x11/qt3-libs/Makefile.common"
 
 PKGNAME=		qt3-mysql-${QTVERSION}
-PKGREVISION=		1
+PKGREVISION=		2
 COMMENT=		QT mysql driver
 
 CONFIGURE_ARGS+=	-I${QTDIR}/include \
diff --git a/x11/qt3-psql/Makefile b/x11/qt3-psql/Makefile
index 2a86936bf52..602aa162848 100644
--- a/x11/qt3-psql/Makefile
+++ b/x11/qt3-psql/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.22 2005/12/05 20:51:19 rillig Exp $
+# $NetBSD: Makefile,v 1.23 2006/01/24 07:33:00 wiz Exp $
 
 .include "../../x11/qt3-libs/Makefile.common"
 
 PKGNAME=		qt3-psql-${QTVERSION}
-PKGREVISION=		1
+PKGREVISION=		2
 COMMENT=		QT postgresql driver
 
 CONFIGURE_ARGS+=	-I${QTDIR}/include \
diff --git a/x11/qt3-qscintilla/Makefile b/x11/qt3-qscintilla/Makefile
index ad047ee57d6..0f56effaedd 100644
--- a/x11/qt3-qscintilla/Makefile
+++ b/x11/qt3-qscintilla/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.13 2005/12/05 20:51:19 rillig Exp $
+# $NetBSD: Makefile,v 1.14 2006/01/24 07:33:00 wiz Exp $
 #
 
 DISTNAME=		qscintilla-1.65-gpl-1.6
 PKGNAME=		qt3-qscintilla-1.6
+PKGREVISION=		1
 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 f0aa7c38977..d05663f48c9 100644
--- a/x11/qt3-qscintilla/buildlink3.mk
+++ b/x11/qt3-qscintilla/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2004/10/03 00:18:38 tv Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2006/01/24 07:33:00 wiz Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 QT3_QSCINTILLA_BUILDLINK3_MK:=	${QT3_QSCINTILLA_BUILDLINK3_MK}+
@@ -12,7 +12,7 @@ BUILDLINK_PACKAGES+=	qt3-qscintilla
 
 .if !empty(QT3_QSCINTILLA_BUILDLINK3_MK:M+)
 BUILDLINK_DEPENDS.qt3-qscintilla+=	qt3-qscintilla>=1.2
-BUILDLINK_RECOMMENDED.qt3-qscintilla+=	qt3-qscintilla>=1.2nb1
+BUILDLINK_RECOMMENDED.qt3-qscintilla+=	qt3-qscintilla>=1.6nb1
 BUILDLINK_PKGSRCDIR.qt3-qscintilla?=	../../x11/qt3-qscintilla
 .endif	# QT3_QSCINTILLA_BUILDLINK3_MK
 
diff --git a/x11/qt3-tools/Makefile b/x11/qt3-tools/Makefile
index 55cedc82f55..f8c21fa0072 100644
--- a/x11/qt3-tools/Makefile
+++ b/x11/qt3-tools/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.38 2005/12/05 20:51:19 rillig Exp $
+# $NetBSD: Makefile,v 1.39 2006/01/24 07:33:00 wiz Exp $
 
 .include "../../mk/bsd.prefs.mk"
 # XXX: hack - work round an ICE with GCC 3.3 on sparc
@@ -9,6 +9,7 @@ GCC_REQD+=              3.4
 .include "../../x11/qt3-libs/Makefile.common"
 
 PKGNAME=		qt3-tools-${QTVERSION}
+PKGREVISION=		1
 COMMENT=		QT GUI (WYSIWYG) builder and other tools
 
 CONFIGURE_ARGS+=	-I${QTDIR}/include \
diff --git a/x11/qt3-tools/buildlink3.mk b/x11/qt3-tools/buildlink3.mk
index ec2649ac14a..9ca6676cd6d 100644
--- a/x11/qt3-tools/buildlink3.mk
+++ b/x11/qt3-tools/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.6 2006/01/05 10:08:59 ghen Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2006/01/24 07:33:00 wiz Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 QT3_TOOLS_BUILDLINK3_MK:=	${QT3_TOOLS_BUILDLINK3_MK}+
@@ -12,7 +12,7 @@ BUILDLINK_PACKAGES+=	qt3-tools
 
 .if !empty(QT3_TOOLS_BUILDLINK3_MK:M+)
 BUILDLINK_DEPENDS.qt3-tools+=	qt3-tools>=3.1.2nb3
-BUILDLINK_RECOMMENDED.qt3-tools+=	qt3-tools>=3.3.3nb1
+BUILDLINK_RECOMMENDED.qt3-tools+=	qt3-tools>=3.3.5
 BUILDLINK_PKGSRCDIR.qt3-tools?=	../../x11/qt3-tools
 BUILDLINK_DEPMETHOD.qt3-tools?=	build
 .endif	# QT3_TOOLS_BUILDLINK3_MK
diff --git a/x11/qt3/Makefile b/x11/qt3/Makefile
index a4c2e8aca1f..551149f5683 100644
--- a/x11/qt3/Makefile
+++ b/x11/qt3/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.31 2005/06/01 18:03:30 jlam Exp $
+# $NetBSD: Makefile,v 1.32 2006/01/24 07:33:00 wiz Exp $
 
 DISTNAME=	qt3-${QTVERSION}
+PKGREVISION=	1
 CATEGORIES=	x11
 MASTER_SITES=	# empty
 DISTFILES=	# empty
diff --git a/x11/qtarch/Makefile b/x11/qtarch/Makefile
index 59f3021b552..2f3eca8e61f 100644
--- a/x11/qtarch/Makefile
+++ b/x11/qtarch/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.28 2005/06/17 03:50:44 jlam Exp $
+# $NetBSD: Makefile,v 1.29 2006/01/24 07:33:00 wiz Exp $
 #
 
 DISTNAME=	qtarch-2.2-1
 PKGNAME=	qtarch-2.2
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	x11 devel
 #MASTER_SITES=	ftp://qtarch.sourceforge.net/pub/qtarch/
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=qtarch/}
diff --git a/x11/qwt/Makefile b/x11/qwt/Makefile
index 84518302996..10c2a3832ec 100644
--- a/x11/qwt/Makefile
+++ b/x11/qwt/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.25 2005/12/05 20:51:19 rillig Exp $
+# $NetBSD: Makefile,v 1.26 2006/01/24 07:33:00 wiz Exp $
 
 DISTNAME=	qwt-0.3.0
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	x11
 MASTER_SITES=   ${MASTER_SITE_SOURCEFORGE:=qwt/}
 
diff --git a/x11/ruby-gnome2-gnome/Makefile b/x11/ruby-gnome2-gnome/Makefile
index 7c0fdef3b67..555390d6cb7 100644
--- a/x11/ruby-gnome2-gnome/Makefile
+++ b/x11/ruby-gnome2-gnome/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.1.1.1 2006/01/15 16:35:36 minskim Exp $
+# $NetBSD: Makefile,v 1.2 2006/01/24 07:33:00 wiz Exp $
 #
 
 PKGNAME=		ruby-gnome2-gnome-${VERSION}
 COMMENT=		Ruby binding of libgnome/libgnomeui-2.x
+PKGREVISION=		1
 CATEGORIES=		gnome x11
 
 RUBY_EXTCONF_SUBDIRS=	gnome
diff --git a/x11/ruby-gnome2-gtk/Makefile b/x11/ruby-gnome2-gtk/Makefile
index 48d32ebde2b..fd0651e1ec2 100644
--- a/x11/ruby-gnome2-gtk/Makefile
+++ b/x11/ruby-gnome2-gtk/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.2 2006/01/15 16:20:12 minskim Exp $
+# $NetBSD: Makefile,v 1.3 2006/01/24 07:33:00 wiz Exp $
 #
 
 PKGNAME=		ruby-gnome2-gtk-${VERSION}
-PKGREVISION=		1
+PKGREVISION=		2
 COMMENT=		Ruby binding of GTK+-2.0.x
 CATEGORIES=		x11
 
diff --git a/x11/ruby-gnome2-panelapplet/Makefile b/x11/ruby-gnome2-panelapplet/Makefile
index 3765bef297a..1ea67a2e18e 100644
--- a/x11/ruby-gnome2-panelapplet/Makefile
+++ b/x11/ruby-gnome2-panelapplet/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.1.1.1 2006/01/15 16:44:46 minskim Exp $
+# $NetBSD: Makefile,v 1.2 2006/01/24 07:33:00 wiz Exp $
 #
 
 PKGNAME=		ruby-gnome2-panelapplet-${VERSION}
 COMMENT=		Ruby binding of libpanel-applet-2.6.x
+PKGREVISION=		1
 CATEGORIES=		x11 gnome
 
 RUBY_EXTCONF_SUBDIRS=	panel-applet
diff --git a/x11/rxvt-unicode/Makefile b/x11/rxvt-unicode/Makefile
index b294880f5d9..3610d1a96ec 100644
--- a/x11/rxvt-unicode/Makefile
+++ b/x11/rxvt-unicode/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.3 2006/01/12 22:58:51 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2006/01/24 07:33:00 wiz Exp $
 #
 
 DISTNAME=		rxvt-unicode-6.3
+PKGREVISION=		1
 CATEGORIES=		x11
 MASTER_SITES=		http://dist.schmorp.de/rxvt-unicode/
 EXTRACT_SUFX=		.tar.bz2
diff --git a/x11/vte/Makefile b/x11/vte/Makefile
index b2b3f4fb4ba..c36b17a7dce 100644
--- a/x11/vte/Makefile
+++ b/x11/vte/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.25 2005/08/26 16:37:51 drochner Exp $
+# $NetBSD: Makefile,v 1.26 2006/01/24 07:33:00 wiz Exp $
 #
 
 DISTNAME=	vte-0.11.15
+PKGREVISION=	1
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/vte/0.11/}
 EXTRACT_SUFX=	.tar.bz2
diff --git a/x11/vte/buildlink3.mk b/x11/vte/buildlink3.mk
index b40b590de4c..585dc5c56f2 100644
--- a/x11/vte/buildlink3.mk
+++ b/x11/vte/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.7 2004/11/06 16:52:57 minskim Exp $
+# $NetBSD: buildlink3.mk,v 1.8 2006/01/24 07:33:00 wiz Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 VTE_BUILDLINK3_MK:=	${VTE_BUILDLINK3_MK}+
@@ -12,7 +12,7 @@ BUILDLINK_PACKAGES+=	vte
 
 .if !empty(VTE_BUILDLINK3_MK:M+)
 BUILDLINK_DEPENDS.vte+=		vte>=0.11.11
-BUILDLINK_RECOMMENDED.vte+=	vte>=0.11.11nb1
+BUILDLINK_RECOMMENDED.vte+=	vte>=0.11.15nb1
 BUILDLINK_PKGSRCDIR.vte?=	../../x11/vte
 .endif	# VTE_BUILDLINK3_MK
 
diff --git a/x11/wdm/Makefile b/x11/wdm/Makefile
index e587510a430..b944695065c 100644
--- a/x11/wdm/Makefile
+++ b/x11/wdm/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.27 2005/12/29 06:22:26 jlam Exp $
+# $NetBSD: Makefile,v 1.28 2006/01/24 07:33:00 wiz Exp $
 
 DISTNAME=		wdm-1.25
-PKGREVISION=		6
+PKGREVISION=		7
 CATEGORIES=		x11 windowmaker
 MASTER_SITES=		http://voins.program.ru/wdm/
 
diff --git a/x11/wterm/Makefile b/x11/wterm/Makefile
index 52e203c7260..815f4049452 100644
--- a/x11/wterm/Makefile
+++ b/x11/wterm/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.28 2005/04/11 21:48:14 tv Exp $
+# $NetBSD: Makefile,v 1.29 2006/01/24 07:33:00 wiz Exp $
 
 DISTNAME=	wterm-6.2.9
-PKGREVISION=	4
+PKGREVISION=	5
 CATEGORIES=	x11 windowmaker
 MASTER_SITES=	http://largo.windowmaker.org/files/
 EXTRACT_SUFX=	.tar.bz2
diff --git a/x11/wxGTK-contrib/Makefile b/x11/wxGTK-contrib/Makefile
index a153b00c6bf..dcb60162d8f 100644
--- a/x11/wxGTK-contrib/Makefile
+++ b/x11/wxGTK-contrib/Makefile
@@ -1,9 +1,10 @@
-# $NetBSD: Makefile,v 1.3 2005/08/07 11:26:17 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2006/01/24 07:33:01 wiz Exp $
 #
 
 .include "../../x11/wxGTK/Makefile.common"
 
 PKGNAME=		${DISTNAME:S/wxGTK/wxGTK-contrib/}
+PKGREVISION=		1
 MAINTAINER=		tech-pkg@NetBSD.org
 COMMENT=		GTK-based implementation of the wxWidgets GUI library (contrib libraries)
 
diff --git a/x11/wxGTK-contrib/buildlink3.mk b/x11/wxGTK-contrib/buildlink3.mk
index e4f94b8be7d..4820c68edff 100644
--- a/x11/wxGTK-contrib/buildlink3.mk
+++ b/x11/wxGTK-contrib/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2005/08/07 11:26:17 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2006/01/24 07:33:01 wiz Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 WXGTK_CONTRIB_BUILDLINK3_MK:=	${WXGTK_CONTRIB_BUILDLINK3_MK}+
@@ -12,6 +12,7 @@ BUILDLINK_PACKAGES+=	wxGTK-contrib
 
 .if !empty(WXGTK_CONTRIB_BUILDLINK3_MK:M+)
 BUILDLINK_DEPENDS.wxGTK-contrib+=	wxGTK-contrib>=2.6.0
+BUILDLINK_RECOMMENDED.wxGTK-contrib?=	wxGTK-contrib>=2.6.2
 BUILDLINK_PKGSRCDIR.wxGTK-contrib?=	../../x11/wxGTK-contrib
 
 .include "../../devel/zlib/buildlink3.mk"
diff --git a/x11/wxGTK/Makefile b/x11/wxGTK/Makefile
index ff8f9b06c4e..a825b12c571 100644
--- a/x11/wxGTK/Makefile
+++ b/x11/wxGTK/Makefile
@@ -1,9 +1,10 @@
-# $NetBSD: Makefile,v 1.45 2005/10/04 01:47:32 minskim Exp $
+# $NetBSD: Makefile,v 1.46 2006/01/24 07:33:01 wiz Exp $
 #
 
 .include "Makefile.common"
 
 COMMENT=		GTK-based implementation of the wxWidgets GUI library
+PKGREVISION=		1
 
 post-install:
 	${INSTALL_DATA_DIR} ${DOCDIR}
diff --git a/x11/wxGTK/buildlink3.mk b/x11/wxGTK/buildlink3.mk
index 5f48da83c5e..93ca14f514f 100644
--- a/x11/wxGTK/buildlink3.mk
+++ b/x11/wxGTK/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.8 2006/01/20 23:10:21 adam Exp $
+# $NetBSD: buildlink3.mk,v 1.9 2006/01/24 07:33:01 wiz Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 WXGTK_BUILDLINK3_MK:=	${WXGTK_BUILDLINK3_MK}+
@@ -14,6 +14,7 @@ BUILDLINK_PACKAGES+=	wxGTK
 
 .if !empty(WXGTK_BUILDLINK3_MK:M+)
 BUILDLINK_DEPENDS.wxGTK+=	wxGTK>=2.6.0
+BUILDLINK_RECOMMENDED.wxGTK?=	wxGTK>=2.6.2
 BUILDLINK_PKGSRCDIR.wxGTK?=	../../x11/wxGTK
 .endif	# WXGTK_BUILDLINK3_MK
 
diff --git a/x11/wxGTK24/Makefile b/x11/wxGTK24/Makefile
index 254d3af36d6..9560952c017 100644
--- a/x11/wxGTK24/Makefile
+++ b/x11/wxGTK24/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.2 2005/08/14 18:10:08 veego Exp $
+# $NetBSD: Makefile,v 1.3 2006/01/24 07:33:01 wiz Exp $
 #
 
 .include "Makefile.common"
 
-PKGREVISION=		7
+PKGREVISION=		8
 COMMENT=		GTK-based implementation of the wxWidgets GUI library
 CONFLICTS+=		wxGTK<=2.4.2nb5
 
diff --git a/x11/wxGTK24/buildlink3.mk b/x11/wxGTK24/buildlink3.mk
index aac1477b649..072c697536b 100644
--- a/x11/wxGTK24/buildlink3.mk
+++ b/x11/wxGTK24/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1.1.1 2005/08/07 11:27:29 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2006/01/24 07:33:01 wiz Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 WXGTK24_BUILDLINK3_MK:=	${WXGTK24_BUILDLINK3_MK}+
@@ -14,6 +14,7 @@ BUILDLINK_PACKAGES+=	wxGTK24
 
 .if !empty(WXGTK24_BUILDLINK3_MK:M+)
 BUILDLINK_DEPENDS.wxGTK24+=	wxGTK24>=2.4.2
+BUILDLINK_RECOMMENDED.wxGTK24?=	wxGTK24>=2.4.2nb8
 BUILDLINK_PKGSRCDIR.wxGTK24?=	../../x11/wxGTK24
 .endif	# WXGTK24_BUILDLINK3_MK
 
diff --git a/x11/wxhaskell/Makefile b/x11/wxhaskell/Makefile
index 43e0f79ac4f..2c7078380ff 100644
--- a/x11/wxhaskell/Makefile
+++ b/x11/wxhaskell/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.11 2005/12/05 20:51:19 rillig Exp $
+# $NetBSD: Makefile,v 1.12 2006/01/24 07:33:01 wiz Exp $
 
 DISTNAME=		wxhaskell-src-0.9.4
 PKGNAME=		${DISTNAME:S/-src//}
-PKGREVISION=		2
+PKGREVISION=		3
 CATEGORIES=		x11
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=wxhaskell/}
 EXTRACT_SUFX=		.zip
diff --git a/x11/xfce4-clipman-plugin/Makefile b/x11/xfce4-clipman-plugin/Makefile
index ffd0548899c..d00af6303cb 100644
--- a/x11/xfce4-clipman-plugin/Makefile
+++ b/x11/xfce4-clipman-plugin/Makefile
@@ -1,10 +1,11 @@
-# $NetBSD: Makefile,v 1.9 2005/11/09 07:09:05 martti Exp $
+# $NetBSD: Makefile,v 1.10 2006/01/24 07:33:01 wiz Exp $
 
 .include "../../meta-pkgs/xfce4/Makefile.common"
 
 XFCE4_VERSION=	0.4.1
 
 DISTNAME=	xfce4-clipman-plugin-${XFCE4_VERSION}
+PKGREVISION=	1
 CATEGORIES=	sysutils
 MASTER_SITES=	http://download.berlios.de/xfce-goodies/
 COMMENT=	Xfce clipboard plugin
diff --git a/x11/xfce4-clipman-plugin/buildlink3.mk b/x11/xfce4-clipman-plugin/buildlink3.mk
index c08c0b8699f..0316f595312 100644
--- a/x11/xfce4-clipman-plugin/buildlink3.mk
+++ b/x11/xfce4-clipman-plugin/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2005/03/30 07:04:06 martti Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2006/01/24 07:33:01 wiz Exp $
 
 BUILDLINK_DEPTH:=			${BUILDLINK_DEPTH}+
 XFCE4_CLIPMAN_PLUGIN_BUILDLINK3_MK:=	${XFCE4_CLIPMAN_PLUGIN_BUILDLINK3_MK}+
@@ -12,6 +12,7 @@ BUILDLINK_PACKAGES+=	xfce4-clipman-plugin
 
 .if !empty(XFCE4_CLIPMAN_PLUGIN_BUILDLINK3_MK:M+)
 BUILDLINK_DEPENDS.xfce4-clipman-plugin+=	xfce4-clipman-plugin>=0.4.1
+BUILDLINK_RECOMMENDED.xfce4-clipman-plugin?=	xfce4-clipman-plugin>=0.4.1nb1
 BUILDLINK_PKGSRCDIR.xfce4-clipman-plugin?=	../../x11/xfce4-clipman-plugin
 .endif	# XFCE4_CLIPMAN_PLUGIN_BUILDLINK3_MK
 
diff --git a/x11/xfce4-desktop/Makefile b/x11/xfce4-desktop/Makefile
index c21a938b8cd..c3157d0dda0 100644
--- a/x11/xfce4-desktop/Makefile
+++ b/x11/xfce4-desktop/Makefile
@@ -1,10 +1,11 @@
-# $NetBSD: Makefile,v 1.17 2005/12/29 06:22:26 jlam Exp $
+# $NetBSD: Makefile,v 1.18 2006/01/24 07:33:01 wiz Exp $
 
 .include "../../meta-pkgs/xfce4/Makefile.common"
 
 DISTNAME=	xfdesktop-${XFCE4_VERSION}
 PKGNAME=	xfce4-desktop-${XFCE4_VERSION}
 #PKGREVISION=	1
+PKGREVISION=	1
 CATEGORIES=	x11
 COMMENT=	Xfce desktop background manager
 
diff --git a/x11/xfce4-desktop/buildlink3.mk b/x11/xfce4-desktop/buildlink3.mk
index ce8740dc067..c492af1e257 100644
--- a/x11/xfce4-desktop/buildlink3.mk
+++ b/x11/xfce4-desktop/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.9 2005/11/09 06:42:59 martti Exp $
+# $NetBSD: buildlink3.mk,v 1.10 2006/01/24 07:33:01 wiz Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 XFCE4_DESKTOP_BUILDLINK3_MK:=	${XFCE4_DESKTOP_BUILDLINK3_MK}+
@@ -12,6 +12,7 @@ BUILDLINK_PACKAGES+=	xfce4-desktop
 
 .if !empty(XFCE4_DESKTOP_BUILDLINK3_MK:M+)
 BUILDLINK_DEPENDS.xfce4-desktop+=	xfce4-desktop>=4.2.3
+BUILDLINK_RECOMMENDED.xfce4-desktop?=	xfce4-desktop>=4.2.3nb1
 BUILDLINK_PKGSRCDIR.xfce4-desktop?=	../../x11/xfce4-desktop
 .endif	# XFCE4_DESKTOP_BUILDLINK3_MK
 
diff --git a/x11/xfce4-gtk2-engine/Makefile b/x11/xfce4-gtk2-engine/Makefile
index c739bae8074..778cd9254e4 100644
--- a/x11/xfce4-gtk2-engine/Makefile
+++ b/x11/xfce4-gtk2-engine/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2005/11/09 08:50:31 martti Exp $
+# $NetBSD: Makefile,v 1.2 2006/01/24 07:33:01 wiz Exp $
 #
 
 .include "../../meta-pkgs/xfce4/Makefile.common"
@@ -8,6 +8,7 @@ XFCE4_VERSION=	2.2.8
 DISTNAME=	gtk-xfce-engine-${XFCE4_VERSION}
 PKGNAME=	xfce4-gtk2-engine-${XFCE4_VERSION}
 #PKGREVISION=	1
+PKGREVISION=	1
 CATEGORIES=	x11
 COMMENT=	Xfce GTK2 themes
 
diff --git a/x11/xfce4-gtk2-engine/buildlink3.mk b/x11/xfce4-gtk2-engine/buildlink3.mk
index 23b8efbb160..6372c383ed9 100644
--- a/x11/xfce4-gtk2-engine/buildlink3.mk
+++ b/x11/xfce4-gtk2-engine/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1.1.1 2005/11/09 08:50:31 martti Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2006/01/24 07:33:01 wiz Exp $
 
 BUILDLINK_DEPTH:=			${BUILDLINK_DEPTH}+
 XFCE4_GTK2_ENGINE_BUILDLINK3_MK:=	${XFCE4_GTK2_ENGINE_BUILDLINK3_MK}+
@@ -12,6 +12,7 @@ BUILDLINK_PACKAGES+=	xfce4-gtk2-engine
 
 .if !empty(XFCE4_GTK2_ENGINE_BUILDLINK3_MK:M+)
 BUILDLINK_DEPENDS.xfce4-gtk2-engine+=	xfce4-gtk2-engine>=2.2.8
+BUILDLINK_RECOMMENDED.xfce4-gtk2-engine?=	xfce4-gtk2-engine>=2.2.8nb1
 BUILDLINK_PKGSRCDIR.xfce4-gtk2-engine?=	../../x11/xfce4-gtk2-engine
 .endif	# XFCE4_GTK2_ENGINE_BUILDLINK3_MK
 
diff --git a/x11/xfce4-mcs-manager/Makefile b/x11/xfce4-mcs-manager/Makefile
index 19146eb66de..ca2c956754c 100644
--- a/x11/xfce4-mcs-manager/Makefile
+++ b/x11/xfce4-mcs-manager/Makefile
@@ -1,9 +1,10 @@
-# $NetBSD: Makefile,v 1.12 2005/11/09 07:09:05 martti Exp $
+# $NetBSD: Makefile,v 1.13 2006/01/24 07:33:01 wiz Exp $
 
 .include "../../meta-pkgs/xfce4/Makefile.common"
 
 DISTNAME=	xfce-mcs-manager-${XFCE4_VERSION}
 PKGNAME=	xfce4-mcs-manager-${XFCE4_VERSION}
+PKGREVISION=	1
 CATEGORIES=	x11
 COMMENT=	Xfce settings manager
 
diff --git a/x11/xfce4-mcs-manager/buildlink3.mk b/x11/xfce4-mcs-manager/buildlink3.mk
index 5d1b367cdfd..9ea9bedfcd2 100644
--- a/x11/xfce4-mcs-manager/buildlink3.mk
+++ b/x11/xfce4-mcs-manager/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.8 2005/11/09 06:42:59 martti Exp $
+# $NetBSD: buildlink3.mk,v 1.9 2006/01/24 07:33:01 wiz Exp $
 
 BUILDLINK_DEPTH:=			${BUILDLINK_DEPTH}+
 XFCE4_MCS_MANAGER_BUILDLINK3_MK:=	${XFCE4_MCS_MANAGER_BUILDLINK3_MK}+
@@ -12,6 +12,7 @@ BUILDLINK_PACKAGES+=	xfce4-mcs-manager
 
 .if !empty(XFCE4_MCS_MANAGER_BUILDLINK3_MK:M+)
 BUILDLINK_DEPENDS.xfce4-mcs-manager+=	xfce4-mcs-manager>=4.2.3
+BUILDLINK_RECOMMENDED.xfce4-mcs-manager?=	xfce4-mcs-manager>=4.2.3nb1
 BUILDLINK_PKGSRCDIR.xfce4-mcs-manager?=	../../x11/xfce4-mcs-manager
 .endif	# XFCE4_MCS_MANAGER_BUILDLINK3_MK
 
diff --git a/x11/xfce4-mcs-plugins/Makefile b/x11/xfce4-mcs-plugins/Makefile
index d33084a88c5..ce9306589c7 100644
--- a/x11/xfce4-mcs-plugins/Makefile
+++ b/x11/xfce4-mcs-plugins/Makefile
@@ -1,9 +1,10 @@
-# $NetBSD: Makefile,v 1.9 2005/11/09 07:09:05 martti Exp $
+# $NetBSD: Makefile,v 1.10 2006/01/24 07:33:01 wiz Exp $
 
 .include "../../meta-pkgs/xfce4/Makefile.common"
 
 DISTNAME=	xfce-mcs-plugins-${XFCE4_VERSION}
 PKGNAME=	xfce4-mcs-plugins-${XFCE4_VERSION}
+PKGREVISION=	1
 CATEGORIES=	x11
 COMMENT=	Xfce settings manager plugins
 
diff --git a/x11/xfce4-mcs-plugins/buildlink3.mk b/x11/xfce4-mcs-plugins/buildlink3.mk
index e207cfcf7f3..79c4324760c 100644
--- a/x11/xfce4-mcs-plugins/buildlink3.mk
+++ b/x11/xfce4-mcs-plugins/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.8 2005/11/09 06:42:59 martti Exp $
+# $NetBSD: buildlink3.mk,v 1.9 2006/01/24 07:33:01 wiz Exp $
 
 BUILDLINK_DEPTH:=			${BUILDLINK_DEPTH}+
 XFCE4_MCS_PLUGINS_BUILDLINK3_MK:=	${XFCE4_MCS_PLUGINS_BUILDLINK3_MK}+
@@ -12,6 +12,7 @@ BUILDLINK_PACKAGES+=	xfce4-mcs-plugins
 
 .if !empty(XFCE4_MCS_PLUGINS_BUILDLINK3_MK:M+)
 BUILDLINK_DEPENDS.xfce4-mcs-plugins+=	xfce4-mcs-plugins>=4.2.3
+BUILDLINK_RECOMMENDED.xfce4-mcs-plugins?=	xfce4-mcs-plugins>=4.2.3nb1
 BUILDLINK_PKGSRCDIR.xfce4-mcs-plugins?=	../../x11/xfce4-mcs-plugins
 .endif	# XFCE4_MCS_PLUGINS_BUILDLINK3_MK
 
diff --git a/x11/xfce4-notes-plugin/Makefile b/x11/xfce4-notes-plugin/Makefile
index f90652c3501..c20dea8b206 100644
--- a/x11/xfce4-notes-plugin/Makefile
+++ b/x11/xfce4-notes-plugin/Makefile
@@ -1,10 +1,11 @@
-# $NetBSD: Makefile,v 1.9 2005/11/09 07:09:05 martti Exp $
+# $NetBSD: Makefile,v 1.10 2006/01/24 07:33:01 wiz Exp $
 
 .include "../../meta-pkgs/xfce4/Makefile.common"
 
 XFCE4_VERSION=	0.11.1
 
 DISTNAME=	xfce4-notes-plugin-${XFCE4_VERSION}
+PKGREVISION=	1
 CATEGORIES=	sysutils
 MASTER_SITES=	http://download.berlios.de/xfce-goodies/
 COMMENT=	Xfce notes plugin
diff --git a/x11/xfce4-notes-plugin/buildlink3.mk b/x11/xfce4-notes-plugin/buildlink3.mk
index 0a914619621..c1382500166 100644
--- a/x11/xfce4-notes-plugin/buildlink3.mk
+++ b/x11/xfce4-notes-plugin/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.6 2005/10/28 07:03:31 martti Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2006/01/24 07:33:01 wiz Exp $
 
 BUILDLINK_DEPTH:=			${BUILDLINK_DEPTH}+
 XFCE4_NOTES_PLUGIN_BUILDLINK3_MK:=	${XFCE4_NOTES_PLUGIN_BUILDLINK3_MK}+
@@ -12,6 +12,7 @@ BUILDLINK_PACKAGES+=	xfce4-notes-plugin
 
 .if !empty(XFCE4_NOTES_PLUGIN_BUILDLINK3_MK:M+)
 BUILDLINK_DEPENDS.xfce4-notes-plugin+=	xfce4-notes-plugin>=0.11.1
+BUILDLINK_RECOMMENDED.xfce4-notes-plugin?=	xfce4-notes-plugin>=0.11.1nb1
 BUILDLINK_PKGSRCDIR.xfce4-notes-plugin?=	../../x11/xfce4-notes-plugin
 .endif	# XFCE4_NOTES_PLUGIN_BUILDLINK3_MK
 
diff --git a/x11/xfce4-panel/Makefile b/x11/xfce4-panel/Makefile
index 278f46773e8..35f5b7815ba 100644
--- a/x11/xfce4-panel/Makefile
+++ b/x11/xfce4-panel/Makefile
@@ -1,9 +1,10 @@
-# $NetBSD: Makefile,v 1.22 2005/12/29 06:22:26 jlam Exp $
+# $NetBSD: Makefile,v 1.23 2006/01/24 07:33:01 wiz Exp $
 
 .include "../../meta-pkgs/xfce4/Makefile.common"
 
 DISTNAME=	xfce4-panel-${XFCE4_VERSION}
 #PKGREVISION=	1
+PKGREVISION=	1
 CATEGORIES=	x11
 COMMENT=	Xfce panel
 
diff --git a/x11/xfce4-panel/buildlink3.mk b/x11/xfce4-panel/buildlink3.mk
index 56490a91f38..3e794dac3c2 100644
--- a/x11/xfce4-panel/buildlink3.mk
+++ b/x11/xfce4-panel/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.9 2005/11/09 06:42:59 martti Exp $
+# $NetBSD: buildlink3.mk,v 1.10 2006/01/24 07:33:01 wiz Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 XFCE4_PANEL_BUILDLINK3_MK:=	${XFCE4_PANEL_BUILDLINK3_MK}+
@@ -12,6 +12,7 @@ BUILDLINK_PACKAGES+=	xfce4-panel
 
 .if !empty(XFCE4_PANEL_BUILDLINK3_MK:M+)
 BUILDLINK_DEPENDS.xfce4-panel+=	xfce4-panel>=4.2.3
+BUILDLINK_RECOMMENDED.xfce4-panel?=	xfce4-panel>=4.2.3nb1
 BUILDLINK_PKGSRCDIR.xfce4-panel?=	../../x11/xfce4-panel
 .endif	# XFCE4_PANEL_BUILDLINK3_MK
 
diff --git a/x11/xfce4-session/Makefile b/x11/xfce4-session/Makefile
index 30073c8bb38..ad5996dc405 100644
--- a/x11/xfce4-session/Makefile
+++ b/x11/xfce4-session/Makefile
@@ -1,9 +1,10 @@
-# $NetBSD: Makefile,v 1.10 2005/12/29 06:22:26 jlam Exp $
+# $NetBSD: Makefile,v 1.11 2006/01/24 07:33:01 wiz Exp $
 
 .include "../../meta-pkgs/xfce4/Makefile.common"
 
 DISTNAME=	xfce4-session-${XFCE4_VERSION}
 #PKGREVISION=	1
+PKGREVISION=	1
 CATEGORIES=	x11
 COMMENT=	Xfce session manager
 
diff --git a/x11/xfce4-session/buildlink3.mk b/x11/xfce4-session/buildlink3.mk
index 188ad0ba370..3b7dee623e0 100644
--- a/x11/xfce4-session/buildlink3.mk
+++ b/x11/xfce4-session/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2005/11/09 06:42:59 martti Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2006/01/24 07:33:01 wiz Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 XFCE4_SESSION_BUILDLINK3_MK:=	${XFCE4_SESSION_BUILDLINK3_MK}+
@@ -12,6 +12,7 @@ BUILDLINK_PACKAGES+=	xfce4-session
 
 .if !empty(XFCE4_SESSION_BUILDLINK3_MK:M+)
 BUILDLINK_DEPENDS.xfce4-session+=	xfce4-session>=4.2.3
+BUILDLINK_RECOMMENDED.xfce4-session?=	xfce4-session>=4.2.3nb1
 BUILDLINK_PKGSRCDIR.xfce4-session?=	../../x11/xfce4-session
 .endif	# XFCE4_SESSION_BUILDLINK3_MK
 
diff --git a/x11/xfce4-taskbar-plugin/Makefile b/x11/xfce4-taskbar-plugin/Makefile
index 125ebe9c4b0..72c54734cf4 100644
--- a/x11/xfce4-taskbar-plugin/Makefile
+++ b/x11/xfce4-taskbar-plugin/Makefile
@@ -1,10 +1,11 @@
-# $NetBSD: Makefile,v 1.6 2005/11/09 07:09:05 martti Exp $
+# $NetBSD: Makefile,v 1.7 2006/01/24 07:33:01 wiz Exp $
 
 .include "../../meta-pkgs/xfce4/Makefile.common"
 
 XFCE4_VERSION=	0.2.2
 
 DISTNAME=	xfce4-taskbar-plugin-${XFCE4_VERSION}
+PKGREVISION=	1
 CATEGORIES=	sysutils
 MASTER_SITES=	http://download.berlios.de/xfce-goodies/
 COMMENT=	Xfce taskbar plugin
diff --git a/x11/xfce4-taskbar-plugin/buildlink3.mk b/x11/xfce4-taskbar-plugin/buildlink3.mk
index 8c3ca0329b1..70b2830ccdb 100644
--- a/x11/xfce4-taskbar-plugin/buildlink3.mk
+++ b/x11/xfce4-taskbar-plugin/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2005/01/17 13:20:22 martti Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2006/01/24 07:33:01 wiz Exp $
 
 BUILDLINK_DEPTH:=			${BUILDLINK_DEPTH}+
 XFCE4_TASKBAR_PLUGIN_BUILDLINK3_MK:=	${XFCE4_TASKBAR_PLUGIN_BUILDLINK3_MK}+
@@ -12,6 +12,7 @@ BUILDLINK_PACKAGES+=	xfce4-taskbar-plugin
 
 .if !empty(XFCE4_TASKBAR_PLUGIN_BUILDLINK3_MK:M+)
 BUILDLINK_DEPENDS.xfce4-taskbar-plugin+=	xfce4-taskbar-plugin>=0.2.2
+BUILDLINK_RECOMMENDED.xfce4-taskbar-plugin?=	xfce4-taskbar-plugin>=0.2.2nb1
 BUILDLINK_PKGSRCDIR.xfce4-taskbar-plugin?=	../../x11/xfce4-taskbar-plugin
 .endif	# XFCE4_TASKBAR_PLUGIN_BUILDLINK3_MK
 
diff --git a/x11/xfce4-toys/Makefile b/x11/xfce4-toys/Makefile
index 0374b68d17b..946acec17a2 100644
--- a/x11/xfce4-toys/Makefile
+++ b/x11/xfce4-toys/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.12 2005/11/09 07:09:05 martti Exp $
+# $NetBSD: Makefile,v 1.13 2006/01/24 07:33:01 wiz Exp $
 
 .include "../../meta-pkgs/xfce4/Makefile.common"
 
 DISTNAME=	xfce4-toys-${XFCE4_VERSION}
+PKGREVISION=	1
 CATEGORIES=	x11
 COMMENT=	Xfce toys
 
diff --git a/x11/xfce4-toys/buildlink3.mk b/x11/xfce4-toys/buildlink3.mk
index 9460fbe91a1..f7ce1f549fa 100644
--- a/x11/xfce4-toys/buildlink3.mk
+++ b/x11/xfce4-toys/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.8 2005/11/09 06:42:59 martti Exp $
+# $NetBSD: buildlink3.mk,v 1.9 2006/01/24 07:33:01 wiz Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 XFCE4_TOYS_BUILDLINK3_MK:=	${XFCE4_TOYS_BUILDLINK3_MK}+
@@ -12,6 +12,7 @@ BUILDLINK_PACKAGES+=	xfce4-toys
 
 .if !empty(XFCE4_TOYS_BUILDLINK3_MK:M+)
 BUILDLINK_DEPENDS.xfce4-toys+=	xfce4-toys>=4.2.3
+BUILDLINK_RECOMMENDED.xfce4-toys?=	xfce4-toys>=4.2.3nb1
 BUILDLINK_PKGSRCDIR.xfce4-toys?=	../../x11/xfce4-toys
 .endif	# XFCE4_TOYS_BUILDLINK3_MK
 
diff --git a/x11/xfce4-trigger-launcher/Makefile b/x11/xfce4-trigger-launcher/Makefile
index 8257d3a8e67..9e61280fbcb 100644
--- a/x11/xfce4-trigger-launcher/Makefile
+++ b/x11/xfce4-trigger-launcher/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.12 2005/11/09 07:09:05 martti Exp $
+# $NetBSD: Makefile,v 1.13 2006/01/24 07:33:02 wiz Exp $
 
 .include "../../meta-pkgs/xfce4/Makefile.common"
 
 DISTNAME=	xfce4-trigger-launcher-${XFCE4_VERSION}
+PKGREVISION=	1
 CATEGORIES=	x11
 COMMENT=	Xfce trigger-launcher
 
diff --git a/x11/xfce4-trigger-launcher/buildlink3.mk b/x11/xfce4-trigger-launcher/buildlink3.mk
index a58a70f7a03..a90fecad19c 100644
--- a/x11/xfce4-trigger-launcher/buildlink3.mk
+++ b/x11/xfce4-trigger-launcher/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.9 2005/11/09 06:42:59 martti Exp $
+# $NetBSD: buildlink3.mk,v 1.10 2006/01/24 07:33:02 wiz Exp $
 
 BUILDLINK_DEPTH:=			${BUILDLINK_DEPTH}+
 XFCE4_TRIGGER_LAUNCHER_BUILDLINK3_MK:=	${XFCE4_TRIGGER_LAUNCHER_BUILDLINK3_MK}+
@@ -12,6 +12,7 @@ BUILDLINK_PACKAGES+=	xfce4-trigger-launcher
 
 .if !empty(XFCE4_TRIGGER_LAUNCHER_BUILDLINK3_MK:M+)
 BUILDLINK_DEPENDS.xfce4-trigger-launcher+=	xfce4-trigger-launcher>=4.2.3
+BUILDLINK_RECOMMENDED.xfce4-trigger-launcher?=	xfce4-trigger-launcher>=4.2.3nb1
 BUILDLINK_PKGSRCDIR.xfce4-trigger-launcher?=	../../x11/xfce4-trigger-launcher
 .endif	# XFCE4_TRIGGER_LAUNCHER_BUILDLINK3_MK
 
diff --git a/x11/xfce4-utils/Makefile b/x11/xfce4-utils/Makefile
index 01faa5a37fa..f1ede0535a2 100644
--- a/x11/xfce4-utils/Makefile
+++ b/x11/xfce4-utils/Makefile
@@ -1,10 +1,11 @@
-# $NetBSD: Makefile,v 1.19 2005/12/29 06:22:26 jlam Exp $
+# $NetBSD: Makefile,v 1.20 2006/01/24 07:33:02 wiz Exp $
 
 .include "../../meta-pkgs/xfce4/Makefile.common"
 
 DISTNAME=	xfce-utils-${XFCE4_VERSION}
 PKGNAME=	xfce4-utils-${XFCE4_VERSION}
 #PKGREVISION=	1
+PKGREVISION=	1
 CATEGORIES=	x11
 COMMENT=	Xfce utilities
 
diff --git a/x11/xfce4-utils/buildlink3.mk b/x11/xfce4-utils/buildlink3.mk
index 2147ac741ce..30987935f72 100644
--- a/x11/xfce4-utils/buildlink3.mk
+++ b/x11/xfce4-utils/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.10 2005/11/09 06:42:59 martti Exp $
+# $NetBSD: buildlink3.mk,v 1.11 2006/01/24 07:33:02 wiz Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 XFCE4_UTILS_BUILDLINK3_MK:=	${XFCE4_UTILS_BUILDLINK3_MK}+
@@ -12,6 +12,7 @@ BUILDLINK_PACKAGES+=	xfce4-utils
 
 .if !empty(XFCE4_UTILS_BUILDLINK3_MK:M+)
 BUILDLINK_DEPENDS.xfce4-utils+=	xfce4-utils>=4.2.3
+BUILDLINK_RECOMMENDED.xfce4-utils?=	xfce4-utils>=4.2.3nb1
 BUILDLINK_PKGSRCDIR.xfce4-utils?=	../../x11/xfce4-utils
 .endif	# XFCE4_UTILS_BUILDLINK3_MK
 
diff --git a/x11/xfce4-windowlist-plugin/Makefile b/x11/xfce4-windowlist-plugin/Makefile
index 8106f2e19fd..90b621dde32 100644
--- a/x11/xfce4-windowlist-plugin/Makefile
+++ b/x11/xfce4-windowlist-plugin/Makefile
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.3 2005/11/09 07:09:06 martti Exp $
+# $NetBSD: Makefile,v 1.4 2006/01/24 07:33:02 wiz Exp $
 
 .include "../../meta-pkgs/xfce4/Makefile.common"
 
 XFCE4_VERSION=	0.1.0
 
 DISTNAME=	xfce4-windowlist-plugin-${XFCE4_VERSION}
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	x11
 MASTER_SITES=	http://download.berlios.de/xfce-goodies/
 COMMENT=	Xfce window list plugin
diff --git a/x11/xfce4-windowlist-plugin/buildlink3.mk b/x11/xfce4-windowlist-plugin/buildlink3.mk
index ffb591671da..86345ebb551 100644
--- a/x11/xfce4-windowlist-plugin/buildlink3.mk
+++ b/x11/xfce4-windowlist-plugin/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2005/03/30 07:04:06 martti Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2006/01/24 07:33:02 wiz Exp $
 
 BUILDLINK_DEPTH:=			${BUILDLINK_DEPTH}+
 XFCE4_WINDOWLIST_PLUGIN_BUILDLINK3_MK:=	${XFCE4_WINDOWLIST_PLUGIN_BUILDLINK3_MK}+
@@ -12,6 +12,7 @@ BUILDLINK_PACKAGES+=	xfce4-windowlist-plugin
 
 .if !empty(XFCE4_WINDOWLIST_PLUGIN_BUILDLINK3_MK:M+)
 BUILDLINK_DEPENDS.xfce4-windowlist-plugin+=	xfce4-windowlist-plugin>=0.1.0nb1
+BUILDLINK_RECOMMENDED.xfce4-windowlist-plugin?=	xfce4-windowlist-plugin>=0.1.0nb2
 BUILDLINK_PKGSRCDIR.xfce4-windowlist-plugin?=	../../x11/xfce4-windowlist-plugin
 .endif	# XFCE4_WINDOWLIST_PLUGIN_BUILDLINK3_MK
 
diff --git a/x11/xglobe/Makefile b/x11/xglobe/Makefile
index 93ac32cc71b..e13b71b66af 100644
--- a/x11/xglobe/Makefile
+++ b/x11/xglobe/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.26 2006/01/04 14:54:17 joerg Exp $
+# $NetBSD: Makefile,v 1.27 2006/01/24 07:33:02 wiz Exp $
 #
 
 DISTNAME=	xglobe-0.5
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	x11
 #
 # The original MASTER_SITE for the program responds "200 OK"
diff --git a/x11/xlockmore/Makefile b/x11/xlockmore/Makefile
index b8ec95d25de..432ca83e576 100644
--- a/x11/xlockmore/Makefile
+++ b/x11/xlockmore/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.71 2006/01/21 05:05:15 tron Exp $
+# $NetBSD: Makefile,v 1.72 2006/01/24 07:33:02 wiz Exp $
 
 .include "Makefile.common"
 
-PKGREVISION=	1
+PKGREVISION=	2
 
 COMMENT=	Like the XLock session-locker/screensaver, but with more
 
diff --git a/x11/xorg-clients/Makefile b/x11/xorg-clients/Makefile
index 6122f4e34f5..f3a86218364 100644
--- a/x11/xorg-clients/Makefile
+++ b/x11/xorg-clients/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.20 2006/01/21 04:13:07 hira Exp $
+# $NetBSD: Makefile,v 1.21 2006/01/24 07:33:02 wiz Exp $
 
 DISTNAME=	${DISTFILES}
 PKGNAME=	xorg-clients-${XORG_VER}
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_XORG}
 DISTFILES=	X11R${XORG_VER}-src1.tar.gz \
diff --git a/x11/xorg-libs/Makefile b/x11/xorg-libs/Makefile
index cbd61e779e2..0ba3da11088 100644
--- a/x11/xorg-libs/Makefile
+++ b/x11/xorg-libs/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.30 2006/01/18 23:53:06 xtraeme Exp $
+# $NetBSD: Makefile,v 1.31 2006/01/24 07:33:02 wiz Exp $
 
 DISTNAME=		${DISTFILES}
 PKGNAME=		xorg-libs-${XORG_VER}
+PKGREVISION=		1
 CATEGORIES=		x11
 MASTER_SITES=		${MASTER_SITE_XORG}
 DISTFILES=		X11R${XORG_VER}-src1.tar.gz X11R${XORG_VER}-src2.tar.gz \
diff --git a/x11/xorg-libs/buildlink3.mk b/x11/xorg-libs/buildlink3.mk
index 0dbed424bd3..504fd68c69f 100644
--- a/x11/xorg-libs/buildlink3.mk
+++ b/x11/xorg-libs/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.11 2006/01/18 23:53:06 xtraeme Exp $
+# $NetBSD: buildlink3.mk,v 1.12 2006/01/24 07:33:02 wiz Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 XORG_LIBS_BUILDLINK3_MK:=	${XORG_LIBS_BUILDLINK3_MK}+
@@ -19,6 +19,7 @@ BUILDLINK_PACKAGES:=	xorg-libs ${BUILDLINK_PACKAGES}
 .if !empty(XORG_LIBS_BUILDLINK3_MK:M+)
 
 BUILDLINK_DEPENDS.xorg-libs+=		xorg-libs>=6.9.0
+BUILDLINK_RECOMMENDED.xorg-libs?=		xorg-libs>=6.9.0nb1
 BUILDLINK_PKGSRCDIR.xorg-libs?=		../../x11/xorg-libs
 BUILDLINK_TRANSFORM.xorg-libs+=		-e "s|/${X11ROOT_PREFIX}/|/|"
 
diff --git a/x11/xorg-server/Makefile b/x11/xorg-server/Makefile
index 208119ef2af..b3373e002aa 100644
--- a/x11/xorg-server/Makefile
+++ b/x11/xorg-server/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.32 2006/01/23 22:55:16 joerg Exp $
+# $NetBSD: Makefile,v 1.33 2006/01/24 07:33:02 wiz Exp $
 
 DISTNAME=	${DISTFILES}
 PKGNAME=	xorg-server-${XORG_VER}
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_XORG}
 DISTFILES=	X11R${XORG_VER}-src1.tar.gz \
diff --git a/x11/xpad/Makefile b/x11/xpad/Makefile
index 2a1bf41aa08..e7982c0d5f8 100644
--- a/x11/xpad/Makefile
+++ b/x11/xpad/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.18 2005/12/05 20:51:20 rillig Exp $
+# $NetBSD: Makefile,v 1.19 2006/01/24 07:33:02 wiz Exp $
 #
 
 DISTNAME=	xpad-1.12
-PKGREVISION=	5
+PKGREVISION=	6
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=xpad/}
 EXTRACT_SUFX=	.tar.bz2
diff --git a/x11/xplanet/Makefile b/x11/xplanet/Makefile
index 0bbe60c7fdb..af245165da6 100644
--- a/x11/xplanet/Makefile
+++ b/x11/xplanet/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.27 2005/06/30 15:06:24 adam Exp $
+# $NetBSD: Makefile,v 1.28 2006/01/24 07:33:02 wiz Exp $
 
 DISTNAME=	xplanet-1.2.0
+PKGREVISION=	1
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=xplanet/}
 
diff --git a/x11/xscreensaver-demo/Makefile b/x11/xscreensaver-demo/Makefile
index 10399a5f3a1..cebc45ed5fe 100644
--- a/x11/xscreensaver-demo/Makefile
+++ b/x11/xscreensaver-demo/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.20 2005/08/10 20:56:30 jlam Exp $
+# $NetBSD: Makefile,v 1.21 2006/01/24 07:33:02 wiz Exp $
 #
 
 PKGNAME=	${DISTNAME:S/-/-demo-/}
+PKGREVISION=	1
 COMMENT=	Demo viewer and configuration tool for xscreensaver
 
 CONFLICTS+=	xscreensaver<4.14 xscreensaver-gnome-[0-9]*
diff --git a/x11/xvidcap-gtk2/Makefile b/x11/xvidcap-gtk2/Makefile
index f62066f3dfe..1029b9ac280 100644
--- a/x11/xvidcap-gtk2/Makefile
+++ b/x11/xvidcap-gtk2/Makefile
@@ -1,9 +1,10 @@
-# $NetBSD: Makefile,v 1.2 2005/12/28 16:52:25 joerg Exp $
+# $NetBSD: Makefile,v 1.3 2006/01/24 07:33:02 wiz Exp $
 #
 
 .include "../../x11/xvidcap/Makefile.common"
 
 PKGNAME=		${DISTNAME:S/-/-gtk2-/}
+PKGREVISION=		1
 COMMENT=		Capture X display to individual frames or MPEG video (GTK2 version)
 
 CONFLICTS+=		xvidcap<1.1.3nb3
diff --git a/x11/zenity/Makefile b/x11/zenity/Makefile
index 3bade719002..5ee364c42cc 100644
--- a/x11/zenity/Makefile
+++ b/x11/zenity/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.26 2005/10/14 21:49:08 jmmv Exp $
+# $NetBSD: Makefile,v 1.27 2006/01/24 07:33:02 wiz Exp $
 #
 
 DISTNAME=	zenity-2.12.1
+PKGREVISION=	1
 CATEGORIES=	x11 gnome2
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/zenity/2.12/}
 EXTRACT_SUFX=	.tar.bz2