Dependency bumps, needed because of devel/pth's major bump, and related

dependency bumps.

145 files changed, 327 insertions, 252 deletions

diff --git a/x11/acidlaunch/Makefile b/x11/acidlaunch/Makefile
index 0703f965731..a2ea410ac12 100644
--- a/x11/acidlaunch/Makefile
+++ b/x11/acidlaunch/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.3 2002/10/05 00:08:48 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2003/05/02 11:56:56 wiz Exp $
 #
 
 DISTNAME=	acidlaunch-0.5
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	x11
 MASTER_SITES=	http://linuxgamers.net/download/
 
diff --git a/x11/controlcenter/Makefile b/x11/controlcenter/Makefile
index 149b73c0438..4d53441d20c 100644
--- a/x11/controlcenter/Makefile
+++ b/x11/controlcenter/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.46 2003/04/27 12:49:56 cjep Exp $
+# $NetBSD: Makefile,v 1.47 2003/05/02 11:56:57 wiz Exp $
 
 DISTNAME=		control-center-1.4.0.4
-PKGREVISION=		1
+PKGREVISION=	2
 CATEGORIES=		x11 gnome
 MASTER_SITES=		${MASTER_SITE_GNOME:=sources/control-center/1.4/}
 
diff --git a/x11/controlcenter/buildlink2.mk b/x11/controlcenter/buildlink2.mk
index 894c1314dd1..541ec99207a 100644
--- a/x11/controlcenter/buildlink2.mk
+++ b/x11/controlcenter/buildlink2.mk
@@ -1,10 +1,10 @@
-# $NetBSD: buildlink2.mk,v 1.5 2002/09/23 19:57:30 jlam Exp $
+# $NetBSD: buildlink2.mk,v 1.6 2003/05/02 11:56:57 wiz Exp $
 
 .if !defined(CONTROLCENTER_BUILDLINK2_MK)
 CONTROLCENTER_BUILDLINK2_MK=	# defined
 
 BUILDLINK_PACKAGES+=			controlcenter
-BUILDLINK_DEPENDS.controlcenter?=	control-center>=1.4.0.4
+BUILDLINK_DEPENDS.controlcenter?=	control-center>=1.4.0.4nb2
 BUILDLINK_PKGSRCDIR.controlcenter?=	../../x11/controlcenter
 DEPENDS+=	${BUILDLINK_DEPENDS.controlcenter}:../../x11/controlcenter
 
diff --git a/x11/dfm/Makefile.common b/x11/dfm/Makefile.common
index 095e5696a89..d6c37f2fa70 100644
--- a/x11/dfm/Makefile.common
+++ b/x11/dfm/Makefile.common
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile.common,v 1.6 2003/04/27 12:51:03 cjep Exp $
+# $NetBSD: Makefile.common,v 1.7 2003/05/02 11:56:57 wiz Exp $
 #
 
 DISTNAME=	dfm-0.99.9
-PKGREVISION=	1
+PKGREVISION=	2
 WRKSRC=		${WRKDIR}/dfm
 MASTER_SITES=	http://www.kaisersite.de/dfm/
 
diff --git a/x11/egtk/Makefile b/x11/egtk/Makefile
index 779d2e73827..00ad4d8a60a 100644
--- a/x11/egtk/Makefile
+++ b/x11/egtk/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.10 2003/04/10 01:28:31 grant Exp $
+# $NetBSD: Makefile,v 1.11 2003/05/02 11:56:57 wiz Exp $
 #
 
 DISTNAME=	eGTK_0.3.4
+PKGREVISION=	1
 PKGNAME=	egtk-0.3.4
 WRKSRC=		${WRKDIR}/eGTK
 CATEGORIES=	x11
@@ -11,7 +12,7 @@ MAINTAINER=	jlam@netbsd.org
 HOMEPAGE=	http://www.netlabs.net/hp/richieb/gtk_eiffel.html
 COMMENT=	Eiffel/GTK+ interface for SmallEiffel
 
-DEPENDS+=	gtk+-1.2.*:../../x11/gtk
+DEPENDS+=	gtk+>=1.2.10nb4:../../x11/gtk
 DEPENDS+=	smalleiffel-[0-9]*:../../lang/smalleiffel
 
 USE_X11=	yes
diff --git a/x11/eterm/Makefile b/x11/eterm/Makefile
index 49a1ab13586..9d3cb6ce8c7 100644
--- a/x11/eterm/Makefile
+++ b/x11/eterm/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.19 2003/04/10 20:10:20 grant Exp $
+# $NetBSD: Makefile,v 1.20 2003/05/02 11:56:58 wiz Exp $
 #
 
 DISTNAME=		Eterm-0.9.2
 PKGNAME=		${DISTNAME:S/^E/e/}
-PKGREVISION=		1
+PKGREVISION=	2
 CATEGORIES=		x11
 MASTER_SITES=		ftp://ftp.eterm.org/pub/Eterm/ \
 			ftp://alien.eterm.org/pub/Eterm/ \
diff --git a/x11/gdkxft/Makefile b/x11/gdkxft/Makefile
index 13b0b1122ec..89e8e513878 100644
--- a/x11/gdkxft/Makefile
+++ b/x11/gdkxft/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.8 2002/12/07 02:39:08 schmonz Exp $
+# $NetBSD: Makefile,v 1.9 2003/05/02 11:56:58 wiz Exp $
 #
 
 DISTNAME=		gdkxft-1.5
-PKGREVISION=		1
+PKGREVISION=	2
 CATEGORIES=		x11
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=gdkxft/}
 
diff --git a/x11/gdm/Makefile b/x11/gdm/Makefile
index 80e67b9f11d..6c1137e6d4f 100644
--- a/x11/gdm/Makefile
+++ b/x11/gdm/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.36 2003/01/28 22:04:34 jlam Exp $
+# $NetBSD: Makefile,v 1.37 2003/05/02 11:56:58 wiz Exp $
 
 DISTNAME=	gdm-2.2.0
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	x11 gnome
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/gdm/2.2/} \
 		${MASTER_SITE_LOCAL}
diff --git a/x11/gnome--/Makefile b/x11/gnome--/Makefile
index fd072443352..da27beabe95 100644
--- a/x11/gnome--/Makefile
+++ b/x11/gnome--/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.13 2003/03/01 11:49:11 jmmv Exp $
+# $NetBSD: Makefile,v 1.14 2003/05/02 11:56:59 wiz Exp $
 #
 
 DISTNAME=	gnomemm-1.2.2
 PKGNAME=	${DISTNAME:S/mm/--/}
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=gtkmm/}
 
diff --git a/x11/gnome--/buildlink2.mk b/x11/gnome--/buildlink2.mk
index dcb7f33f287..278e2553a30 100644
--- a/x11/gnome--/buildlink2.mk
+++ b/x11/gnome--/buildlink2.mk
@@ -1,10 +1,10 @@
-# $NetBSD: buildlink2.mk,v 1.5 2003/03/01 14:11:52 jmmv Exp $
+# $NetBSD: buildlink2.mk,v 1.6 2003/05/02 11:56:59 wiz Exp $
 
 .if !defined(GNOMEMM_BUILDLINK2_MK)
 GNOMEMM_BUILDLINK2_MK=	# defined
 
 BUILDLINK_PACKAGES+=		gnomemm
-BUILDLINK_DEPENDS.gnomemm?=	gnome-->=1.2.2
+BUILDLINK_DEPENDS.gnomemm?=	gnome-->=1.2.2nb2
 BUILDLINK_PKGSRCDIR.gnomemm?=	../../x11/gnome--
 
 EVAL_PREFIX+=				BUILDLINK_PREFIX.gnomemm=gnome--
diff --git a/x11/gnome-applets/Makefile b/x11/gnome-applets/Makefile
index cf927dcd150..26b4c3eef8a 100644
--- a/x11/gnome-applets/Makefile
+++ b/x11/gnome-applets/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.27 2003/04/20 13:50:30 rh Exp $
+# $NetBSD: Makefile,v 1.28 2003/05/02 11:56:59 wiz Exp $
 #
 
 DISTNAME=		gnome-applets-1.4.0.4
-PKGREVISION=		4
+PKGREVISION=	5
 CATEGORIES=		x11 gnome
 MASTER_SITES=		${MASTER_SITE_GNOME:=sources/gnome-applets/1.4/}
 EXTRACT_SUFX=		.tar.bz2
diff --git a/x11/gnome-core/Makefile b/x11/gnome-core/Makefile
index fb34046d910..9ee029a0b9d 100644
--- a/x11/gnome-core/Makefile
+++ b/x11/gnome-core/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.88 2003/04/20 10:43:51 rh Exp $
+# $NetBSD: Makefile,v 1.89 2003/05/02 11:56:59 wiz Exp $
 #
 
 .include "Makefile.common"
 
-PKGREVISION=		4
+PKGREVISION=	5
 
 COMMENT=		Core component of GNU Network Object Management Environment
 
diff --git a/x11/gnome-core/Makefile.common b/x11/gnome-core/Makefile.common
index 47ce4fe6019..d90a612a721 100644
--- a/x11/gnome-core/Makefile.common
+++ b/x11/gnome-core/Makefile.common
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile.common,v 1.1 2003/04/20 10:43:51 rh Exp $
+# $NetBSD: Makefile.common,v 1.2 2003/05/02 11:57:00 wiz Exp $
 #
 
 DISTNAME=		gnome-core-1.4.2
+PKGREVISION=	1
 CATEGORIES?=		x11 gnome
 MASTER_SITES=		${MASTER_SITE_GNOME:=sources/gnome-core/1.4/}
 EXTRACT_SUFX=		.tar.bz2
diff --git a/x11/gnome-core/buildlink2.mk b/x11/gnome-core/buildlink2.mk
index c1398b6fa9b..934a9868858 100644
--- a/x11/gnome-core/buildlink2.mk
+++ b/x11/gnome-core/buildlink2.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.6 2003/04/20 10:43:51 rh Exp $
+# $NetBSD: buildlink2.mk,v 1.7 2003/05/02 11:57:00 wiz Exp $
 #
 # This Makefile fragment is included by packages that use gnome-core.
 #
@@ -9,7 +9,7 @@
 GNOME_CORE_BUILDLINK2_MK=	# defined
 
 BUILDLINK_PACKAGES+=			gnome-core
-BUILDLINK_DEPENDS.gnome-core?=		gnome-core>=1.4.2nb4
+BUILDLINK_DEPENDS.gnome-core?=		gnome-core>=1.4.2nb5
 BUILDLINK_PKGSRCDIR.gnome-core?=		../../x11/gnome-core
 
 EVAL_PREFIX+=	BUILDLINK_PREFIX.gnome-core=gnome-core
diff --git a/x11/gnome-desktop/Makefile b/x11/gnome-desktop/Makefile
index 4f56d5fddb8..fd4853d5138 100644
--- a/x11/gnome-desktop/Makefile
+++ b/x11/gnome-desktop/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.7 2003/02/14 20:53:41 jmmv Exp $
+# $NetBSD: Makefile,v 1.8 2003/05/02 11:57:00 wiz Exp $
 #
 
 DISTNAME=		gnome-desktop-2.2.0.1
+PKGREVISION=	1
 CATEGORIES=		x11 gnome
 MASTER_SITES=		${MASTER_SITE_GNOME:=sources/gnome-desktop/2.2/}
 EXTRACT_SUFX=		.tar.bz2
diff --git a/x11/gnome-desktop/buildlink2.mk b/x11/gnome-desktop/buildlink2.mk
index bbcc0fb8cfb..f75142f35cf 100644
--- a/x11/gnome-desktop/buildlink2.mk
+++ b/x11/gnome-desktop/buildlink2.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.5 2003/02/14 20:53:42 jmmv Exp $
+# $NetBSD: buildlink2.mk,v 1.6 2003/05/02 11:57:00 wiz Exp $
 #
 # This Makefile fragment is included by packages that use gnome-desktop.
 #
@@ -9,7 +9,7 @@
 GNOME_DESKTOP_BUILDLINK2_MK=	# defined
 
 BUILDLINK_PACKAGES+=			gnome-desktop
-BUILDLINK_DEPENDS.gnome-desktop?=	gnome-desktop>=2.2.0.1
+BUILDLINK_DEPENDS.gnome-desktop?=	gnome-desktop>=2.2.0.1nb1
 BUILDLINK_PKGSRCDIR.gnome-desktop?=	../../x11/gnome-desktop
 
 EVAL_PREFIX+=	BUILDLINK_PREFIX.gnome-desktop=gnome-desktop
diff --git a/x11/gnome-gkrellm/Makefile b/x11/gnome-gkrellm/Makefile
index 6765863bba2..680a25de995 100644
--- a/x11/gnome-gkrellm/Makefile
+++ b/x11/gnome-gkrellm/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.4 2002/03/13 17:37:56 fredb Exp $
+# $NetBSD: Makefile,v 1.5 2003/05/02 11:57:00 wiz Exp $
 
 DISTNAME=	gkrellm-gnome
 PKGNAME=	gnome-gkrellm-0.1
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	gnome sysutils
 MASTER_SITES=	http://web.wt.net/~billw/gkrellm/Plugins/
 
@@ -10,8 +10,8 @@ MAINTAINER=	damon@netbsd.org
 HOMEPAGE=	http://web.wt.net/~billw/gkrellm/Plugins.html
 COMMENT=	gkrellm gnome plugin
 
-DEPENDS+=       gkrellm-1.2.*:../../sysutils/gkrellm
-DEPENDS+=	gnome-libs>=1.4.1.2nb1:../gnome-libs
+DEPENDS+=       gkrellm>=1.2.13nb1:../../sysutils/gkrellm
+DEPENDS+=	gnome-libs>=1.4.1.4nb4:../gnome-libs
 
 USE_GMAKE=	yes
 
diff --git a/x11/gnome-libs/Makefile b/x11/gnome-libs/Makefile
index c8a0ed6f227..ca17babca66 100644
--- a/x11/gnome-libs/Makefile
+++ b/x11/gnome-libs/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.84 2003/02/05 05:06:37 jlam Exp $
+# $NetBSD: Makefile,v 1.85 2003/05/02 11:57:01 wiz Exp $
 
 DISTNAME=		gnome-libs-1.4.1.4
-PKGREVISION=		3
+PKGREVISION=	4
 CATEGORIES=		x11 gnome
 MASTER_SITES=		${MASTER_SITE_GNOME:=sources/gnome-libs/1.4/}
 
diff --git a/x11/gnome-libs/buildlink2.mk b/x11/gnome-libs/buildlink2.mk
index 34332d4e784..0417e7d1f8e 100644
--- a/x11/gnome-libs/buildlink2.mk
+++ b/x11/gnome-libs/buildlink2.mk
@@ -1,10 +1,10 @@
-# $NetBSD: buildlink2.mk,v 1.4 2002/10/23 17:09:10 bouyer Exp $
+# $NetBSD: buildlink2.mk,v 1.5 2003/05/02 11:57:01 wiz Exp $
 
 .if !defined(GNOME_LIBS_BUILDLINK2_MK)
 GNOME_LIBS_BUILDLINK2_MK=	# defined
 
 BUILDLINK_PACKAGES+=			gnome-libs
-BUILDLINK_DEPENDS.gnome-libs?=		gnome-libs>=1.4.1.4
+BUILDLINK_DEPENDS.gnome-libs?=		gnome-libs>=1.4.1.4nb4
 BUILDLINK_PKGSRCDIR.gnome-libs?=	../../x11/gnome-libs
 
 EVAL_PREFIX+=	BUILDLINK_PREFIX.gnome-libs=gnome-libs
diff --git a/x11/gnome-panel/Makefile b/x11/gnome-panel/Makefile
index f2748825db4..e5a0c4203f1 100644
--- a/x11/gnome-panel/Makefile
+++ b/x11/gnome-panel/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.7 2003/04/20 14:06:43 rh Exp $
+# $NetBSD: Makefile,v 1.8 2003/05/02 11:57:01 wiz Exp $
 #
 
 DISTNAME=		gnome-panel-2.2.1
+PKGREVISION=	1
 CATEGORIES=		x11 gnome
 MASTER_SITES=		${MASTER_SITE_GNOME:=sources/gnome-panel/2.2/}
 EXTRACT_SUFX=		.tar.bz2
diff --git a/x11/gnome-panel/buildlink2.mk b/x11/gnome-panel/buildlink2.mk
index 1262074529b..d2a3cfac5fb 100644
--- a/x11/gnome-panel/buildlink2.mk
+++ b/x11/gnome-panel/buildlink2.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.3 2003/02/14 21:05:27 jmmv Exp $
+# $NetBSD: buildlink2.mk,v 1.4 2003/05/02 11:57:01 wiz Exp $
 #
 # This Makefile fragment is included by packages that use gnome-panel.
 #
@@ -9,7 +9,7 @@
 GNOME_PANEL_BUILDLINK2_MK=	# defined
 
 BUILDLINK_PACKAGES+=			gnome-panel
-BUILDLINK_DEPENDS.gnome-panel?=		gnome-panel>=2.2.0.1
+BUILDLINK_DEPENDS.gnome-panel?=		gnome-panel>=2.2.1nb1
 BUILDLINK_PKGSRCDIR.gnome-panel?=		../../x11/gnome-panel
 
 EVAL_PREFIX+=	BUILDLINK_PREFIX.gnome-panel=gnome-panel
diff --git a/x11/gnome-python/Makefile b/x11/gnome-python/Makefile
index b17c54366e0..22b1670ba5b 100644
--- a/x11/gnome-python/Makefile
+++ b/x11/gnome-python/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.33 2003/04/20 14:26:01 rh Exp $
+# $NetBSD: Makefile,v 1.34 2003/05/02 11:57:02 wiz Exp $
 
 DISTNAME=		gnome-python-1.4.4
 PKGNAME=		${PYPKGPREFIX}-gnome-1.4.4
-#PKGREVISION=		3
+PKGREVISION=		1
 CATEGORIES=		x11 gnome
 MASTER_SITES=		${MASTER_SITE_GNOME:=sources/gnome-python/1.4/}
 
diff --git a/x11/gnome-python/buildlink2.mk b/x11/gnome-python/buildlink2.mk
index 89edb152b92..4ed0562a91a 100644
--- a/x11/gnome-python/buildlink2.mk
+++ b/x11/gnome-python/buildlink2.mk
@@ -1,7 +1,7 @@
-# $NetBSD: buildlink2.mk,v 1.4 2002/12/24 06:10:31 wiz Exp $
+# $NetBSD: buildlink2.mk,v 1.5 2003/05/02 11:57:02 wiz Exp $
 
 .include "../../lang/python/pyversion.mk"
 
 BUILDLINK_PACKAGES+=		pygnome
-BUILDLINK_DEPENDS.pygnome?=	${PYPKGPREFIX}-gnome>=1.4.0nb3
+BUILDLINK_DEPENDS.pygnome?=	${PYPKGPREFIX}-gnome>=1.4.4nb1
 BUILDLINK_PKGSRCDIR.pygnome?=	../../x11/gnome-python
diff --git a/x11/gnome-session/Makefile b/x11/gnome-session/Makefile
index 09fc4708e32..f3a05e494e4 100644
--- a/x11/gnome-session/Makefile
+++ b/x11/gnome-session/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.11 2003/04/20 13:59:34 rh Exp $
+# $NetBSD: Makefile,v 1.12 2003/05/02 11:57:02 wiz Exp $
 #
 
 DISTNAME=		gnome-session-2.2.1
+PKGREVISION=	1
 CATEGORIES=		x11 gnome
 MASTER_SITES=		${MASTER_SITE_GNOME:=sources/gnome-session/2.2/}
 EXTRACT_SUFX=		.tar.bz2
diff --git a/x11/gnome-users-guide/Makefile b/x11/gnome-users-guide/Makefile
index ccb33035cd3..e53157b009f 100644
--- a/x11/gnome-users-guide/Makefile
+++ b/x11/gnome-users-guide/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.9 2002/10/19 10:55:02 rh Exp $
+# $NetBSD: Makefile,v 1.10 2003/05/02 11:57:02 wiz Exp $
 
 DISTNAME=	users-guide-1.2
 PKGNAME=	gnome-users-guide-1.2
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	x11 gnome
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/users-guide/1.2/}
 
@@ -10,7 +10,7 @@ MAINTAINER=	tron@netbsd.org
 HOMEPAGE=	http://www.gnome.org/users-guide/project.shtml
 COMMENT=	User documentation for GNOME
 
-DEPENDS+=	gnome-libs>=1.4.1.2nb1:../gnome-libs
+DEPENDS+=	gnome-libs>=1.4.1.4nb4:../gnome-libs
 
 GNU_CONFIGURE=	YES
 USE_X11BASE=	YES
diff --git a/x11/gnome1-panel/Makefile b/x11/gnome1-panel/Makefile
index b2a69fbe880..2dd6e795002 100644
--- a/x11/gnome1-panel/Makefile
+++ b/x11/gnome1-panel/Makefile
@@ -1,9 +1,10 @@
-# $NetBSD: Makefile,v 1.2 2003/04/20 10:29:22 rh Exp $
+# $NetBSD: Makefile,v 1.3 2003/05/02 11:57:03 wiz Exp $
 #
 
 .include "../../x11/gnome-core/Makefile.common"
 
 PKGNAME=		${DISTNAME:S/-core/-panel/}
+PKGREVISION=		1
 
 COMMENT=		gnome-panel component split out from gnome-core
 
diff --git a/x11/gnome1-panel/buildlink2.mk b/x11/gnome1-panel/buildlink2.mk
index f34d4bddb77..6092514faf9 100644
--- a/x11/gnome1-panel/buildlink2.mk
+++ b/x11/gnome1-panel/buildlink2.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.1.1.1 2003/04/20 09:10:11 rh Exp $
+# $NetBSD: buildlink2.mk,v 1.2 2003/05/02 11:57:03 wiz Exp $
 #
 # This Makefile fragment is included by packages that use gnome-panel.
 #
@@ -9,7 +9,7 @@
 GNOME_PANEL_BUILDLINK2_MK=	# defined
 
 BUILDLINK_PACKAGES+=			gnome-panel
-BUILDLINK_DEPENDS.gnome-panel?=		gnome-panel>=1.4.2
+BUILDLINK_DEPENDS.gnome-panel?=		gnome-panel>=1.4.2nb1
 BUILDLINK_PKGSRCDIR.gnome-panel?=		../../x11/gnome1-panel
 
 EVAL_PREFIX+=	BUILDLINK_PREFIX.gnome-panel=gnome-panel
diff --git a/x11/gnome1-session/Makefile b/x11/gnome1-session/Makefile
index b570c8931f7..37b627c5f57 100644
--- a/x11/gnome1-session/Makefile
+++ b/x11/gnome1-session/Makefile
@@ -1,9 +1,10 @@
-# $NetBSD: Makefile,v 1.2 2003/04/20 09:08:19 rh Exp $
+# $NetBSD: Makefile,v 1.3 2003/05/02 11:57:03 wiz Exp $
 #
 
 .include "../../x11/gnome-core/Makefile.common"
 
 PKGNAME=		${DISTNAME:S/-core/-session/}
+PKGREVISION=		1
 
 COMMENT=		Gnome-session component split out from gnome-core
 
diff --git a/x11/gnome1-session/buildlink2.mk b/x11/gnome1-session/buildlink2.mk
index a2c5a611a2b..f5e2b858a25 100644
--- a/x11/gnome1-session/buildlink2.mk
+++ b/x11/gnome1-session/buildlink2.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.1.1.1 2003/04/20 09:05:26 rh Exp $
+# $NetBSD: buildlink2.mk,v 1.2 2003/05/02 11:57:03 wiz Exp $
 #
 # This Makefile fragment is included by packages that use gnome-session.
 #
@@ -9,7 +9,7 @@
 GNOME_SESSION_BUILDLINK2_MK=	# defined
 
 BUILDLINK_PACKAGES+=			gnome-session
-BUILDLINK_DEPENDS.gnome-session?=		gnome-session>=1.4.2
+BUILDLINK_DEPENDS.gnome-session?=		gnome-session>=1.4.2nb1
 BUILDLINK_PKGSRCDIR.gnome-session?=		../../x11/gnome1-session
 
 EVAL_PREFIX+=	BUILDLINK_PREFIX.gnome-session=gnome-session
diff --git a/x11/gnome2-applets/Makefile b/x11/gnome2-applets/Makefile
index e4e2ffc068a..7c16e525124 100644
--- a/x11/gnome2-applets/Makefile
+++ b/x11/gnome2-applets/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.1.1.1 2003/04/20 23:19:23 rh Exp $
+# $NetBSD: Makefile,v 1.2 2003/05/02 11:57:03 wiz Exp $
 #
 
 DISTNAME=		gnome-applets-2.2.1
+PKGREVISION=	1
 CATEGORIES=		x11 gnome
 MASTER_SITES=		${MASTER_SITE_GNOME:=sources/gnome-applets/2.2/}
 EXTRACT_SUFX=		.tar.bz2
diff --git a/x11/gnome2-control-center/Makefile b/x11/gnome2-control-center/Makefile
index a177f2dfd24..a6a80e173c8 100644
--- a/x11/gnome2-control-center/Makefile
+++ b/x11/gnome2-control-center/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.8 2003/04/20 13:52:54 rh Exp $
+# $NetBSD: Makefile,v 1.9 2003/05/02 11:57:04 wiz Exp $
 #
 
 DISTNAME=	control-center-2.2.1
+PKGREVISION=	1
 PKGNAME=	gnome2-${DISTNAME}
 CATEGORIES=	x11 gnome
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/control-center/2.2/}
diff --git a/x11/gnome2-control-center/buildlink2.mk b/x11/gnome2-control-center/buildlink2.mk
index 25e911f642d..1924de5b5c5 100644
--- a/x11/gnome2-control-center/buildlink2.mk
+++ b/x11/gnome2-control-center/buildlink2.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.5 2003/02/14 21:03:41 jmmv Exp $
+# $NetBSD: buildlink2.mk,v 1.6 2003/05/02 11:57:04 wiz Exp $
 #
 # This Makefile fragment is included by packages that use gnome2-control-center.
 #
@@ -9,7 +9,7 @@
 GNOME2_CONTROL_CENTER_BUILDLINK2_MK=	# defined
 
 BUILDLINK_PACKAGES+=			gnome2-control-center
-BUILDLINK_DEPENDS.gnome2-control-center?=	gnome2-control-center>=2.2.0.1
+BUILDLINK_DEPENDS.gnome2-control-center?=	gnome2-control-center>=2.2.1nb1
 BUILDLINK_PKGSRCDIR.gnome2-control-center?=	../../x11/gnome2-control-center
 
 EVAL_PREFIX+=	BUILDLINK_PREFIX.gnome2-control-center=gnome2-control-center
diff --git a/x11/gnome2-terminal/Makefile b/x11/gnome2-terminal/Makefile
index 7eadd7a1496..f31aa94498d 100644
--- a/x11/gnome2-terminal/Makefile
+++ b/x11/gnome2-terminal/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.6 2003/02/18 14:56:04 jmmv Exp $
+# $NetBSD: Makefile,v 1.7 2003/05/02 11:57:04 wiz Exp $
 #
 
 DISTNAME=		gnome-terminal-2.0.1
 PKGNAME=		${DISTNAME:S/-/2-/}
-PKGREVISION=		3
+PKGREVISION=	4
 CATEGORIES=		x11 gnome
 MASTER_SITES=		${MASTER_SITE_GNOME:=sources/gnome-terminal/2.0/}
 EXTRACT_SUFX=		.tar.bz2
diff --git a/x11/gnustep-back/Makefile b/x11/gnustep-back/Makefile
index ae4084362af..385ba0706fc 100644
--- a/x11/gnustep-back/Makefile
+++ b/x11/gnustep-back/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.4 2003/04/01 08:37:43 rh Exp $
+# $NetBSD: Makefile,v 1.5 2003/05/02 11:57:04 wiz Exp $
 #
 
 DISTNAME=	gnustep-back-0.8.5
+PKGREVISION=	1
 CATEGORIES=	x11 gnustep
 MASTER_SITES=	${MASTER_SITE_GNUSTEP:=core/}
 
diff --git a/x11/gnustep-back/buildlink2.mk b/x11/gnustep-back/buildlink2.mk
index 9c61852c307..9f1d1ad8c63 100644
--- a/x11/gnustep-back/buildlink2.mk
+++ b/x11/gnustep-back/buildlink2.mk
@@ -1,11 +1,11 @@
-# $NetBSD: buildlink2.mk,v 1.3 2003/01/03 04:12:03 rh Exp $
+# $NetBSD: buildlink2.mk,v 1.4 2003/05/02 11:57:04 wiz Exp $
 #
 
 .if !defined(GNUSTEP_BACK_BUILDLINK2_MK)
 GNUSTEP_BACK_BUILDLINK2_MK=	# defined
 
 BUILDLINK_PACKAGES+=			gnustep-back
-BUILDLINK_DEPENDS.gnustep-back?=	gnustep-back>=0.8.3
+BUILDLINK_DEPENDS.gnustep-back?=	gnustep-back>=0.8.5nb1
 BUILDLINK_PKGSRCDIR.gnustep-back?=	../../x11/gnustep-back
 
 EVAL_PREFIX+=	BUILDLINK_PREFIX.gnustep-back=gnustep-back
diff --git a/x11/gnustep-gui/Makefile b/x11/gnustep-gui/Makefile
index 41b1c94cfea..d024e9e81a0 100644
--- a/x11/gnustep-gui/Makefile
+++ b/x11/gnustep-gui/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.4 2003/04/01 08:35:15 rh Exp $
+# $NetBSD: Makefile,v 1.5 2003/05/02 11:57:04 wiz Exp $
 #
 
 DISTNAME=	gnustep-gui-0.8.5
+PKGREVISION=	1
 CATEGORIES=	x11 gnustep
 MASTER_SITES=	${MASTER_SITE_GNUSTEP:=core/}
 
diff --git a/x11/gnustep-gui/buildlink2.mk b/x11/gnustep-gui/buildlink2.mk
index 9f4b0808c16..ddbd7510ec8 100644
--- a/x11/gnustep-gui/buildlink2.mk
+++ b/x11/gnustep-gui/buildlink2.mk
@@ -1,11 +1,11 @@
-# $NetBSD: buildlink2.mk,v 1.4 2003/04/01 08:35:15 rh Exp $
+# $NetBSD: buildlink2.mk,v 1.5 2003/05/02 11:57:05 wiz Exp $
 #
 
 .if !defined(GNUSTEP_GUI_BUILDLINK2_MK)
 GNUSTEP_GUI_BUILDLINK2_MK=	# defined
 
 BUILDLINK_PACKAGES+=			gnustep-gui
-BUILDLINK_DEPENDS.gnustep-gui?=		gnustep-gui>=0.8.5
+BUILDLINK_DEPENDS.gnustep-gui?=		gnustep-gui>=0.8.5nb1
 BUILDLINK_PKGSRCDIR.gnustep-gui?=	../../x11/gnustep-gui
 
 EVAL_PREFIX+=	BUILDLINK_PREFIX.gnustep-gui=gnustep-gui
diff --git a/x11/gnustep-preferences/Makefile b/x11/gnustep-preferences/Makefile
index d36fc04db78..fc099090371 100644
--- a/x11/gnustep-preferences/Makefile
+++ b/x11/gnustep-preferences/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.3 2003/03/07 03:00:40 jmc Exp $
+# $NetBSD: Makefile,v 1.4 2003/05/02 11:57:05 wiz Exp $
 #
 
 DISTNAME=	Preferences-1.2.0
-PKGREVISION=	2
+PKGREVISION=	3
 PKGNAME=	gnustep-${DISTNAME:S/P/p/}
 CATEGORIES=	x11 gnustep
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=prefsapp/}
diff --git a/x11/gtk+extra/Makefile b/x11/gtk+extra/Makefile
index 52675917eae..76cd5fd3796 100644
--- a/x11/gtk+extra/Makefile
+++ b/x11/gtk+extra/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.8 2002/09/22 10:30:00 jlam Exp $
+# $NetBSD: Makefile,v 1.9 2003/05/02 11:57:05 wiz Exp $
 #
 
 DISTNAME=	gtk+extra-0.99.17
+PKGREVISION=	1
 CATEGORIES=	x11
 MASTER_SITES=	http://gtkextra.sourceforge.net/src/
 
diff --git a/x11/gtk+extra/buildlink2.mk b/x11/gtk+extra/buildlink2.mk
index cd28f8f2169..89b11b12f46 100644
--- a/x11/gtk+extra/buildlink2.mk
+++ b/x11/gtk+extra/buildlink2.mk
@@ -1,10 +1,10 @@
-# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 19:23:30 jlam Exp $
+# $NetBSD: buildlink2.mk,v 1.3 2003/05/02 11:57:05 wiz Exp $
 
 .if !defined(GTKEXTRA_BUILDLINK2_MK)
 GTKEXTRA_BUILDLINK2_MK=	# defined
 
 BUILDLINK_PACKAGES+=		gtkextra
-BUILDLINK_DEPENDS.gtkextra?=	gtk+extra>=0.99.17
+BUILDLINK_DEPENDS.gtkextra?=	gtk+extra>=0.99.17nb1
 BUILDLINK_PKGSRCDIR.gtkextra?=	../../x11/gtk+extra
 
 EVAL_PREFIX+=		BUILDLINK_PREFIX.gtkextra=gtk+extra
diff --git a/x11/gtk--/Makefile b/x11/gtk--/Makefile
index 84ae07ddcc4..821bcb00c80 100644
--- a/x11/gtk--/Makefile
+++ b/x11/gtk--/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.28 2003/03/01 11:49:11 jmmv Exp $
+# $NetBSD: Makefile,v 1.29 2003/05/02 11:57:06 wiz Exp $
 #
 
 DISTNAME=		gtkmm-1.2.10
 PKGNAME=		gtk---1.2.10
-PKGREVISION=		1
+PKGREVISION=	2
 CATEGORIES=		x11 devel
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=gtkmm/} \
 			${MASTER_SITE_GNOME:=sources/gtkmm/1.2/}
diff --git a/x11/gtk--/buildlink2.mk b/x11/gtk--/buildlink2.mk
index fee8dbc4b83..b148264f38a 100644
--- a/x11/gtk--/buildlink2.mk
+++ b/x11/gtk--/buildlink2.mk
@@ -1,10 +1,10 @@
-# $NetBSD: buildlink2.mk,v 1.5 2003/03/01 14:11:52 jmmv Exp $
+# $NetBSD: buildlink2.mk,v 1.6 2003/05/02 11:57:06 wiz Exp $
 
 .if !defined(GTKMM_BUILDLINK2_MK)
 GTKMM_BUILDLINK2_MK=	# defined
 
 BUILDLINK_PACKAGES+=		gtkmm
-BUILDLINK_DEPENDS.gtkmm?=	gtk-->=1.2.10
+BUILDLINK_DEPENDS.gtkmm?=	gtk-->=1.2.10nb2
 BUILDLINK_PKGSRCDIR.gtkmm?=	../../x11/gtk--
 
 EVAL_PREFIX+=			BUILDLINK_PREFIX.gtkmm=gtkmm
diff --git a/x11/gtk-engines/Makefile b/x11/gtk-engines/Makefile
index 714e9c88038..8aeb84a733c 100644
--- a/x11/gtk-engines/Makefile
+++ b/x11/gtk-engines/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.13 2003/01/10 08:46:53 jlam Exp $
+# $NetBSD: Makefile,v 1.14 2003/05/02 11:57:06 wiz Exp $
 
 DISTNAME=		gtk-engines-0.12
-PKGREVISION=		2
+PKGREVISION=	3
 CATEGORIES=		x11
 MASTER_SITES=		${MASTER_SITE_GNOME:=sources/gtk-engines/0.12/}
 
@@ -15,8 +15,6 @@ USE_X11BASE=		# defined
 USE_LIBTOOL=		# defined
 SHLIBTOOL_OVERRIDE=	${WRKSRC}/libtool
 
-BUILDLINK_DEPENDS.gtk=	gtk+>=1.2.9
-
 .include "../../x11/gtk/buildlink2.mk"
 .include "../../graphics/imlib/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/gtk/Makefile b/x11/gtk/Makefile
index 89dcc30fc27..ebdb3514e67 100644
--- a/x11/gtk/Makefile
+++ b/x11/gtk/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.80 2003/04/27 12:51:35 cjep Exp $
+# $NetBSD: Makefile,v 1.81 2003/05/02 11:57:05 wiz Exp $
 
 DISTNAME=		gtk+-1.2.10
-PKGREVISION=		3
+PKGREVISION=	4
 CATEGORIES=		x11
 MASTER_SITES=		ftp://ftp.gtk.org/pub/gtk/v1.2/ \
 			ftp://ftp.cs.umn.edu/pub/gimp/gtk/v1.2/ \
diff --git a/x11/gtk/buildlink2.mk b/x11/gtk/buildlink2.mk
index cb71327cd63..8e33eb1dfc7 100644
--- a/x11/gtk/buildlink2.mk
+++ b/x11/gtk/buildlink2.mk
@@ -1,10 +1,10 @@
-# $NetBSD: buildlink2.mk,v 1.6 2002/11/04 14:40:04 wiz Exp $
+# $NetBSD: buildlink2.mk,v 1.7 2003/05/02 11:57:05 wiz Exp $
 
 .if !defined(GTK_BUILDLINK2_MK)
 GTK_BUILDLINK2_MK=	# defined
 
 BUILDLINK_PACKAGES+=		gtk
-BUILDLINK_DEPENDS.gtk?=		gtk+>=1.2.8
+BUILDLINK_DEPENDS.gtk?=		gtk+>=1.2.10nb4
 BUILDLINK_PKGSRCDIR.gtk?=	../../x11/gtk
 
 EVAL_PREFIX+=		BUILDLINK_PREFIX.gtk=gtk
diff --git a/x11/gtk2-engines/Makefile b/x11/gtk2-engines/Makefile
index d73e439b2af..2a9090d1ffe 100644
--- a/x11/gtk2-engines/Makefile
+++ b/x11/gtk2-engines/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.7 2003/01/18 10:49:33 jmmv Exp $
+# $NetBSD: Makefile,v 1.8 2003/05/02 11:57:07 wiz Exp $
 #
 
 DISTNAME=		gtk-engines-2.2.0
+PKGREVISION=	1
 PKGNAME=		${DISTNAME:S/gtk/gtk2/}
 CATEGORIES=		x11
 MASTER_SITES=		${MASTER_SITE_GNOME:=sources/gtk-engines/2.2/}
diff --git a/x11/gtk2/Makefile b/x11/gtk2/Makefile
index 77d8f4bf77f..da79f223730 100644
--- a/x11/gtk2/Makefile
+++ b/x11/gtk2/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.23 2003/02/15 11:02:29 wiz Exp $
+# $NetBSD: Makefile,v 1.24 2003/05/02 11:57:07 wiz Exp $
 #
 
 DISTNAME=		gtk+-2.2.1
+PKGREVISION=	1
 PKGNAME=		${DISTNAME:S/gtk/gtk2/}
 CATEGORIES=		x11
 MASTER_SITES=		ftp://ftp.gtk.org/pub/gtk/v2.2/ \
diff --git a/x11/gtk2/buildlink2.mk b/x11/gtk2/buildlink2.mk
index 6fad03c8029..5fadc15fef9 100644
--- a/x11/gtk2/buildlink2.mk
+++ b/x11/gtk2/buildlink2.mk
@@ -1,10 +1,10 @@
-# $NetBSD: buildlink2.mk,v 1.6 2003/01/11 18:23:46 wiz Exp $
+# $NetBSD: buildlink2.mk,v 1.7 2003/05/02 11:57:07 wiz Exp $
 
 .if !defined(GTK2_BUILDLINK2_MK)
 GTK2_BUILDLINK2_MK=	# defined
 
 BUILDLINK_PACKAGES+=		gtk2
-BUILDLINK_DEPENDS.gtk2?=	gtk2+>=2.2.0
+BUILDLINK_DEPENDS.gtk2?=	gtk2+>=2.2.1nb1
 BUILDLINK_PKGSRCDIR.gtk2?=	../../x11/gtk2
 
 EVAL_PREFIX+=		BUILDLINK_PREFIX.gtk2=gtk2
diff --git a/x11/gtkglarea/Makefile b/x11/gtkglarea/Makefile
index 9d56fa7dc7f..3af8c130140 100644
--- a/x11/gtkglarea/Makefile
+++ b/x11/gtkglarea/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.26 2003/03/09 19:28:16 jschauma Exp $
+# $NetBSD: Makefile,v 1.27 2003/05/02 11:57:07 wiz Exp $
 
 DISTNAME=		gtkglarea-1.2.2
-PKGREVISION=		1
+PKGREVISION=	2
 CATEGORIES=		x11 graphics
 MASTER_SITES=		http://www.student.oulu.fi/~jlof/gtkglarea/download/
 
diff --git a/x11/gtkglarea/buildlink2.mk b/x11/gtkglarea/buildlink2.mk
index a8f12e03603..9e374a7c10f 100644
--- a/x11/gtkglarea/buildlink2.mk
+++ b/x11/gtkglarea/buildlink2.mk
@@ -1,10 +1,10 @@
-# $NetBSD: buildlink2.mk,v 1.3 2003/03/12 22:07:29 jschauma Exp $
+# $NetBSD: buildlink2.mk,v 1.4 2003/05/02 11:57:08 wiz Exp $
 
 .if !defined(GTKGLAREA_BUILDLINK2_MK)
 GTKGLAREA_BUILDLINK2_MK=	# defined
 
 BUILDLINK_PACKAGES+=			gtkglarea
-BUILDLINK_DEPENDS.gtkglarea?=		gtkglarea>=1.2.2
+BUILDLINK_DEPENDS.gtkglarea?=		gtkglarea>=1.2.2nb2
 BUILDLINK_PKGSRCDIR.gtkglarea?=		../../x11/gtkglarea
 
 EVAL_PREFIX+=	BUILDLINK_PREFIX.gtkglarea=gtkglarea
diff --git a/x11/gtkmm/Makefile b/x11/gtkmm/Makefile
index 556cae9eb1b..657ff14d8a0 100644
--- a/x11/gtkmm/Makefile
+++ b/x11/gtkmm/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.4 2003/03/15 20:32:38 jmmv Exp $
+# $NetBSD: Makefile,v 1.5 2003/05/02 11:57:08 wiz Exp $
 #
 
 DISTNAME=	gtkmm-2.2.1
+PKGREVISION=	1
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=gtkmm/}
 
diff --git a/x11/gtkmm/buildlink2.mk b/x11/gtkmm/buildlink2.mk
index 7151df167c2..d2b1b0b52d4 100644
--- a/x11/gtkmm/buildlink2.mk
+++ b/x11/gtkmm/buildlink2.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.1.1.1 2003/03/01 14:33:09 jmmv Exp $
+# $NetBSD: buildlink2.mk,v 1.2 2003/05/02 11:57:08 wiz Exp $
 #
 # This Makefile fragment is included by packages that use gtkmm.
 #
@@ -9,7 +9,7 @@
 GTKMM_BUILDLINK2_MK=	# defined
 
 BUILDLINK_PACKAGES+=			gtkmm
-BUILDLINK_DEPENDS.gtkmm?=		gtkmm>=2.2.0
+BUILDLINK_DEPENDS.gtkmm?=		gtkmm>=2.2.1nb1
 BUILDLINK_PKGSRCDIR.gtkmm?=		../../x11/gtkmm
 
 EVAL_PREFIX+=	BUILDLINK_PREFIX.gtkmm=gtkmm
diff --git a/x11/gtkstep/Makefile b/x11/gtkstep/Makefile
index e9a9a0fa396..4bbee4359ab 100644
--- a/x11/gtkstep/Makefile
+++ b/x11/gtkstep/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.9 2001/02/17 17:06:30 wiz Exp $
+# $NetBSD: Makefile,v 1.10 2003/05/02 11:57:09 wiz Exp $
 
 DISTNAME=		gtkstep-1.10
+PKGREVISION=		1
 CATEGORIES=		x11
 MASTER_SITES=		http://ulli.linuxave.net/gtkstep/
 EXTRACT_SUFX=		.tar.bz2
@@ -9,7 +10,7 @@ MAINTAINER=		jlam@netbsd.org
 HOMEPAGE=		http://ulli.linuxave.net/gtkstep/index.html
 COMMENT=		GTK theme-engine to yield a NEXTSTEP(tm) look and feel
 
-DEPENDS+=		gtk+-1.2.*:../../x11/gtk
+DEPENDS+=		gtk+>=1.2.10nb4:../../x11/gtk
 
 GNU_CONFIGURE=		# defined
 USE_X11BASE=		# defined
diff --git a/x11/gtoolkit/Makefile.common b/x11/gtoolkit/Makefile.common
index 066ecd7094c..cbe156e7873 100644
--- a/x11/gtoolkit/Makefile.common
+++ b/x11/gtoolkit/Makefile.common
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile.common,v 1.2 2002/11/09 13:43:48 wiz Exp $
+# $NetBSD: Makefile.common,v 1.3 2003/05/02 11:57:09 wiz Exp $
 #
 
 DISTNAME=		gtoolkit-0.9.5
+PKGREVISION=	1
 CATEGORIES?=		x11
 MASTER_SITES?=		ftp://ftp.inf.uos.de/pub/elmar/gtk/objc-gtoolkit/
 
diff --git a/x11/gtoolkit/buildlink2.mk b/x11/gtoolkit/buildlink2.mk
index 50af624b3e9..b5558e592d9 100644
--- a/x11/gtoolkit/buildlink2.mk
+++ b/x11/gtoolkit/buildlink2.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.1.1.1 2002/11/09 05:19:28 rh Exp $
+# $NetBSD: buildlink2.mk,v 1.2 2003/05/02 11:57:09 wiz Exp $
 #
 # This Makefile fragment is included by packages that use gtoolkit.
 #
@@ -9,7 +9,7 @@
 GTOOLKIT_BUILDLINK2_MK=	# defined
 
 BUILDLINK_PACKAGES+=			gtoolkit
-BUILDLINK_DEPENDS.gtoolkit?=		gtoolkit>=0.9.5
+BUILDLINK_DEPENDS.gtoolkit?=		gtoolkit>=0.9.5nb1
 BUILDLINK_PKGSRCDIR.gtoolkit?=		../../x11/gtoolkit
 
 EVAL_PREFIX+=	BUILDLINK_PREFIX.gtoolkit=gtoolkit
diff --git a/x11/hot-babe/Makefile b/x11/hot-babe/Makefile
index 26d63018caf..890a2895c86 100644
--- a/x11/hot-babe/Makefile
+++ b/x11/hot-babe/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.3 2002/11/05 07:59:31 simonb Exp $
+# $NetBSD: Makefile,v 1.4 2003/05/02 11:57:09 wiz Exp $
 #
 
 DISTNAME=	hot-babe-0.1.2
+PKGREVISION=	1
 CATEGORIES=	x11
 MASTER_SITES=	http://dindinx.net/hotbabe/downloads/
 
diff --git a/x11/kde2/Makefile b/x11/kde2/Makefile
index f7d27cf6a39..6f77a165cfc 100644
--- a/x11/kde2/Makefile
+++ b/x11/kde2/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.15 2003/04/28 08:59:29 skrll Exp $
+# $NetBSD: Makefile,v 1.16 2003/05/02 11:57:10 wiz Exp $
 
 DISTNAME=	kde-2.2.2
-PKGREVISION=	5
+PKGREVISION=	6
 CATEGORIES=	x11 kde
 MASTER_SITES=	# empty
 DISTFILES=	# empty
@@ -10,16 +10,16 @@ MAINTAINER=	packages@netbsd.org
 HOMEPAGE=	http://www.kde.org/
 COMMENT=	"meta-package" for the KDE integrated X11 desktop
 
-DEPENDS+=	kdeartwork-2.2.2:../../misc/kdeartwork2
-DEPENDS+=	kdeaddons-2.2.2:../../misc/kdeaddons2
-DEPENDS+=	kdeadmin-2.2.2nb2:../../misc/kdeadmin2
-DEPENDS+=	kdegames-2.2.2nb1:../../games/kdegames2
-DEPENDS+=	kdegraphics-2.2.2nb2:../../graphics/kdegraphics2
-DEPENDS+=	kdemultimedia-2.2.2nb1:../../audio/kdemultimedia2
-DEPENDS+=	kdenetwork-2.2.2nb4:../../net/kdenetwork2
-DEPENDS+=	kdepim-2.2.2nb2:../../misc/kdepim2
-DEPENDS+=	kdetoys-2.2.2nb1:../../games/kdetoys2
-DEPENDS+=	kdeutils-2.2.2nb1:../../misc/kdeutils2
+DEPENDS+=	kdeartwork-2.2.2nb1:../../misc/kdeartwork2
+DEPENDS+=	kdeaddons-2.2.2nb1:../../misc/kdeaddons2
+DEPENDS+=	kdeadmin-2.2.2nb3:../../misc/kdeadmin2
+DEPENDS+=	kdegames-2.2.2nb2:../../games/kdegames2
+DEPENDS+=	kdegraphics-2.2.2nb3:../../graphics/kdegraphics2
+DEPENDS+=	kdemultimedia-2.2.2nb2:../../audio/kdemultimedia2
+DEPENDS+=	kdenetwork-2.2.2nb5:../../net/kdenetwork2
+DEPENDS+=	kdepim-2.2.2nb3:../../misc/kdepim2
+DEPENDS+=	kdetoys-2.2.2nb2:../../games/kdetoys2
+DEPENDS+=	kdeutils-2.2.2nb2:../../misc/kdeutils2
 
 EXTRACT_ONLY=	# empty
 USE_X11BASE=	yes
diff --git a/x11/kde3-i18n-af/Makefile b/x11/kde3-i18n-af/Makefile
index 2b00f7b59d8..d790604da24 100644
--- a/x11/kde3-i18n-af/Makefile
+++ b/x11/kde3-i18n-af/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.2 2003/03/29 12:42:59 jmmv Exp $
+# $NetBSD: Makefile,v 1.3 2003/05/02 11:57:10 wiz Exp $
 
 DISTNAME=	kde-i18n-af-${_KDE_VERSION}
+PKGREVISION=	1
 WRKSRC=		${WRKDIR}/kde-i18n-af
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITES_KDE:=kde-i18n/}
diff --git a/x11/kde3-i18n-ar/Makefile b/x11/kde3-i18n-ar/Makefile
index ab03dd62883..910d8a1c7d2 100644
--- a/x11/kde3-i18n-ar/Makefile
+++ b/x11/kde3-i18n-ar/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.2 2003/03/29 12:42:59 jmmv Exp $
+# $NetBSD: Makefile,v 1.3 2003/05/02 11:57:11 wiz Exp $
 
 DISTNAME=	kde-i18n-ar-${_KDE_VERSION}
+PKGREVISION=	1
 WRKSRC=		${WRKDIR}/kde-i18n-ar
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITES_KDE:=kde-i18n/}
diff --git a/x11/kde3-i18n-bg/Makefile b/x11/kde3-i18n-bg/Makefile
index a3a326fa70c..df6556effb5 100644
--- a/x11/kde3-i18n-bg/Makefile
+++ b/x11/kde3-i18n-bg/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.2 2003/03/29 12:42:59 jmmv Exp $
+# $NetBSD: Makefile,v 1.3 2003/05/02 11:57:11 wiz Exp $
 
 DISTNAME=	kde-i18n-bg-${_KDE_VERSION}
+PKGREVISION=	1
 WRKSRC=		${WRKDIR}/kde-i18n-bg
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITES_KDE:=kde-i18n/}
diff --git a/x11/kde3-i18n-bs/Makefile b/x11/kde3-i18n-bs/Makefile
index 9b875c9ec7e..6b36dd7a018 100644
--- a/x11/kde3-i18n-bs/Makefile
+++ b/x11/kde3-i18n-bs/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.2 2003/03/29 12:42:59 jmmv Exp $
+# $NetBSD: Makefile,v 1.3 2003/05/02 11:57:11 wiz Exp $
 
 DISTNAME=	kde-i18n-bs-${_KDE_VERSION}
+PKGREVISION=	1
 WRKSRC=		${WRKDIR}/kde-i18n-bs
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITES_KDE:=kde-i18n/}
diff --git a/x11/kde3-i18n-ca/Makefile b/x11/kde3-i18n-ca/Makefile
index 2a6bd53053b..0b4cee2b842 100644
--- a/x11/kde3-i18n-ca/Makefile
+++ b/x11/kde3-i18n-ca/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.2 2003/03/29 12:42:59 jmmv Exp $
+# $NetBSD: Makefile,v 1.3 2003/05/02 11:57:12 wiz Exp $
 
 DISTNAME=	kde-i18n-ca-${_KDE_VERSION}
+PKGREVISION=	1
 WRKSRC=		${WRKDIR}/kde-i18n-ca
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITES_KDE:=kde-i18n/}
diff --git a/x11/kde3-i18n-cs/Makefile b/x11/kde3-i18n-cs/Makefile
index f6b27ec2e1d..3ef6002e734 100644
--- a/x11/kde3-i18n-cs/Makefile
+++ b/x11/kde3-i18n-cs/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.2 2003/03/29 12:42:59 jmmv Exp $
+# $NetBSD: Makefile,v 1.3 2003/05/02 11:57:12 wiz Exp $
 
 DISTNAME=	kde-i18n-cs-${_KDE_VERSION}
+PKGREVISION=	1
 WRKSRC=		${WRKDIR}/kde-i18n-cs
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITES_KDE:=kde-i18n/}
diff --git a/x11/kde3-i18n-da/Makefile b/x11/kde3-i18n-da/Makefile
index 82a0fb8f70f..bc3330806c1 100644
--- a/x11/kde3-i18n-da/Makefile
+++ b/x11/kde3-i18n-da/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.2 2003/03/29 12:43:00 jmmv Exp $
+# $NetBSD: Makefile,v 1.3 2003/05/02 11:57:12 wiz Exp $
 
 DISTNAME=	kde-i18n-da-${_KDE_VERSION}
+PKGREVISION=	1
 WRKSRC=		${WRKDIR}/kde-i18n-da
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITES_KDE:=kde-i18n/}
diff --git a/x11/kde3-i18n-de/Makefile b/x11/kde3-i18n-de/Makefile
index 413f5f70a29..39436c0c8a4 100644
--- a/x11/kde3-i18n-de/Makefile
+++ b/x11/kde3-i18n-de/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.2 2003/03/29 12:43:00 jmmv Exp $
+# $NetBSD: Makefile,v 1.3 2003/05/02 11:57:12 wiz Exp $
 
 DISTNAME=	kde-i18n-de-${_KDE_VERSION}
+PKGREVISION=	1
 WRKSRC=		${WRKDIR}/kde-i18n-de
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITES_KDE:=kde-i18n/}
diff --git a/x11/kde3-i18n-el/Makefile b/x11/kde3-i18n-el/Makefile
index c200a6a9040..d0a9f2853df 100644
--- a/x11/kde3-i18n-el/Makefile
+++ b/x11/kde3-i18n-el/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.2 2003/03/29 12:43:00 jmmv Exp $
+# $NetBSD: Makefile,v 1.3 2003/05/02 11:57:13 wiz Exp $
 
 DISTNAME=	kde-i18n-el-${_KDE_VERSION}
+PKGREVISION=	1
 WRKSRC=		${WRKDIR}/kde-i18n-el
 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 44b75681f5d..50cdbd47592 100644
--- a/x11/kde3-i18n-en_GB/Makefile
+++ b/x11/kde3-i18n-en_GB/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.2 2003/03/29 12:43:00 jmmv Exp $
+# $NetBSD: Makefile,v 1.3 2003/05/02 11:57:13 wiz Exp $
 
 DISTNAME=	kde-i18n-en_GB-${_KDE_VERSION}
+PKGREVISION=	1
 WRKSRC=		${WRKDIR}/kde-i18n-en_GB
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITES_KDE:=kde-i18n/}
diff --git a/x11/kde3-i18n-eo/Makefile b/x11/kde3-i18n-eo/Makefile
index dd4cf0f41cd..2bf0b0fa7a2 100644
--- a/x11/kde3-i18n-eo/Makefile
+++ b/x11/kde3-i18n-eo/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.2 2003/03/29 12:43:00 jmmv Exp $
+# $NetBSD: Makefile,v 1.3 2003/05/02 11:57:13 wiz Exp $
 
 DISTNAME=	kde-i18n-eo-${_KDE_VERSION}
+PKGREVISION=	1
 WRKSRC=		${WRKDIR}/kde-i18n-eo
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITES_KDE:=kde-i18n/}
diff --git a/x11/kde3-i18n-es/Makefile b/x11/kde3-i18n-es/Makefile
index b9ad58c4b19..f572a39ef98 100644
--- a/x11/kde3-i18n-es/Makefile
+++ b/x11/kde3-i18n-es/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.2 2003/03/29 12:43:01 jmmv Exp $
+# $NetBSD: Makefile,v 1.3 2003/05/02 11:57:13 wiz Exp $
 
 DISTNAME=	kde-i18n-es-${_KDE_VERSION}
+PKGREVISION=	1
 WRKSRC=		${WRKDIR}/kde-i18n-es
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITES_KDE:=kde-i18n/}
diff --git a/x11/kde3-i18n-et/Makefile b/x11/kde3-i18n-et/Makefile
index 8582da8a885..cd755c50a12 100644
--- a/x11/kde3-i18n-et/Makefile
+++ b/x11/kde3-i18n-et/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.2 2003/03/29 12:43:01 jmmv Exp $
+# $NetBSD: Makefile,v 1.3 2003/05/02 11:57:14 wiz Exp $
 
 DISTNAME=	kde-i18n-et-${_KDE_VERSION}
+PKGREVISION=	1
 WRKSRC=		${WRKDIR}/kde-i18n-et
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITES_KDE:=kde-i18n/}
diff --git a/x11/kde3-i18n-eu/Makefile b/x11/kde3-i18n-eu/Makefile
index 90912d2026b..16f41aae88f 100644
--- a/x11/kde3-i18n-eu/Makefile
+++ b/x11/kde3-i18n-eu/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.2 2003/03/29 12:43:01 jmmv Exp $
+# $NetBSD: Makefile,v 1.3 2003/05/02 11:57:14 wiz Exp $
 
 DISTNAME=	kde-i18n-eu-${_KDE_VERSION}
+PKGREVISION=	1
 WRKSRC=		${WRKDIR}/kde-i18n-eu
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITES_KDE:=kde-i18n/}
diff --git a/x11/kde3-i18n-fa/Makefile b/x11/kde3-i18n-fa/Makefile
index 1215782fa38..38847270c13 100644
--- a/x11/kde3-i18n-fa/Makefile
+++ b/x11/kde3-i18n-fa/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.2 2003/03/29 12:43:01 jmmv Exp $
+# $NetBSD: Makefile,v 1.3 2003/05/02 11:57:14 wiz Exp $
 
 DISTNAME=	kde-i18n-fa-${_KDE_VERSION}
+PKGREVISION=	1
 WRKSRC=		${WRKDIR}/kde-i18n-fa
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITES_KDE:=kde-i18n/}
diff --git a/x11/kde3-i18n-fi/Makefile b/x11/kde3-i18n-fi/Makefile
index f34a1028276..6a63221965f 100644
--- a/x11/kde3-i18n-fi/Makefile
+++ b/x11/kde3-i18n-fi/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.2 2003/03/29 12:43:01 jmmv Exp $
+# $NetBSD: Makefile,v 1.3 2003/05/02 11:57:15 wiz Exp $
 
 DISTNAME=	kde-i18n-fi-${_KDE_VERSION}
+PKGREVISION=	1
 WRKSRC=		${WRKDIR}/kde-i18n-fi
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITES_KDE:=kde-i18n/}
diff --git a/x11/kde3-i18n-fr/Makefile b/x11/kde3-i18n-fr/Makefile
index c15775fd34b..4a397ca9e6a 100644
--- a/x11/kde3-i18n-fr/Makefile
+++ b/x11/kde3-i18n-fr/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.2 2003/03/29 12:43:01 jmmv Exp $
+# $NetBSD: Makefile,v 1.3 2003/05/02 11:57:15 wiz Exp $
 
 DISTNAME=	kde-i18n-fr-${_KDE_VERSION}
+PKGREVISION=	1
 WRKSRC=		${WRKDIR}/kde-i18n-fr
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITES_KDE:=kde-i18n/}
diff --git a/x11/kde3-i18n-he/Makefile b/x11/kde3-i18n-he/Makefile
index 0d8c15a1062..d15d39fb17e 100644
--- a/x11/kde3-i18n-he/Makefile
+++ b/x11/kde3-i18n-he/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.2 2003/03/29 12:43:02 jmmv Exp $
+# $NetBSD: Makefile,v 1.3 2003/05/02 11:57:15 wiz Exp $
 
 DISTNAME=	kde-i18n-he-${_KDE_VERSION}
+PKGREVISION=	1
 WRKSRC=		${WRKDIR}/kde-i18n-he
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITES_KDE:=kde-i18n/}
diff --git a/x11/kde3-i18n-hu/Makefile b/x11/kde3-i18n-hu/Makefile
index 29814b5479b..e5439dbed77 100644
--- a/x11/kde3-i18n-hu/Makefile
+++ b/x11/kde3-i18n-hu/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.2 2003/03/29 12:43:02 jmmv Exp $
+# $NetBSD: Makefile,v 1.3 2003/05/02 11:57:16 wiz Exp $
 
 DISTNAME=	kde-i18n-hu-${_KDE_VERSION}
+PKGREVISION=	1
 WRKSRC=		${WRKDIR}/kde-i18n-hu
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITES_KDE:=kde-i18n/}
diff --git a/x11/kde3-i18n-it/Makefile b/x11/kde3-i18n-it/Makefile
index 97a64ecde5f..f4ed43dc75d 100644
--- a/x11/kde3-i18n-it/Makefile
+++ b/x11/kde3-i18n-it/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.2 2003/03/29 12:43:02 jmmv Exp $
+# $NetBSD: Makefile,v 1.3 2003/05/02 11:57:16 wiz Exp $
 
 DISTNAME=	kde-i18n-it-${_KDE_VERSION}
+PKGREVISION=	1
 WRKSRC=		${WRKDIR}/kde-i18n-it
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITES_KDE:=kde-i18n/}
diff --git a/x11/kde3-i18n-ja/Makefile b/x11/kde3-i18n-ja/Makefile
index 4c695ae6ffd..fe3bf2abdfa 100644
--- a/x11/kde3-i18n-ja/Makefile
+++ b/x11/kde3-i18n-ja/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.2 2003/03/29 12:43:02 jmmv Exp $
+# $NetBSD: Makefile,v 1.3 2003/05/02 11:57:16 wiz Exp $
 
 DISTNAME=	kde-i18n-ja-${_KDE_VERSION}
+PKGREVISION=	1
 WRKSRC=		${WRKDIR}/kde-i18n-ja
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITES_KDE:=kde-i18n/}
diff --git a/x11/kde3-i18n-lt/Makefile b/x11/kde3-i18n-lt/Makefile
index 5ff38d8e0d0..8a420689373 100644
--- a/x11/kde3-i18n-lt/Makefile
+++ b/x11/kde3-i18n-lt/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.2 2003/03/29 12:43:03 jmmv Exp $
+# $NetBSD: Makefile,v 1.3 2003/05/02 11:57:16 wiz Exp $
 
 DISTNAME=	kde-i18n-lt-${_KDE_VERSION}
+PKGREVISION=	1
 WRKSRC=		${WRKDIR}/kde-i18n-lt
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITES_KDE:=kde-i18n/}
diff --git a/x11/kde3-i18n-mt/Makefile b/x11/kde3-i18n-mt/Makefile
index d64a3a7b610..37cc921cb02 100644
--- a/x11/kde3-i18n-mt/Makefile
+++ b/x11/kde3-i18n-mt/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.2 2003/03/29 12:43:03 jmmv Exp $
+# $NetBSD: Makefile,v 1.3 2003/05/02 11:57:17 wiz Exp $
 
 DISTNAME=	kde-i18n-mt-${_KDE_VERSION}
+PKGREVISION=	1
 WRKSRC=		${WRKDIR}/kde-i18n-mt
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITES_KDE:=kde-i18n/}
diff --git a/x11/kde3-i18n-nb/Makefile b/x11/kde3-i18n-nb/Makefile
index ef96a68e536..1e63025b5f5 100644
--- a/x11/kde3-i18n-nb/Makefile
+++ b/x11/kde3-i18n-nb/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.2 2003/03/29 12:43:03 jmmv Exp $
+# $NetBSD: Makefile,v 1.3 2003/05/02 11:57:17 wiz Exp $
 
 DISTNAME=	kde-i18n-nb-${_KDE_VERSION}
+PKGREVISION=	1
 WRKSRC=		${WRKDIR}/kde-i18n-nb
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITES_KDE:=kde-i18n/}
diff --git a/x11/kde3-i18n-nl/Makefile b/x11/kde3-i18n-nl/Makefile
index b7759851fa3..6743fbf36c8 100644
--- a/x11/kde3-i18n-nl/Makefile
+++ b/x11/kde3-i18n-nl/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.2 2003/03/29 12:43:03 jmmv Exp $
+# $NetBSD: Makefile,v 1.3 2003/05/02 11:57:17 wiz Exp $
 
 DISTNAME=	kde-i18n-nl-${_KDE_VERSION}
+PKGREVISION=	1
 WRKSRC=		${WRKDIR}/kde-i18n-nl
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITES_KDE:=kde-i18n/}
diff --git a/x11/kde3-i18n-nn/Makefile b/x11/kde3-i18n-nn/Makefile
index 4edb624e27a..ed0757055ed 100644
--- a/x11/kde3-i18n-nn/Makefile
+++ b/x11/kde3-i18n-nn/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.2 2003/03/29 12:43:04 jmmv Exp $
+# $NetBSD: Makefile,v 1.3 2003/05/02 11:57:18 wiz Exp $
 
 DISTNAME=	kde-i18n-nn-${_KDE_VERSION}
+PKGREVISION=	1
 WRKSRC=		${WRKDIR}/kde-i18n-nn
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITES_KDE:=kde-i18n/}
diff --git a/x11/kde3-i18n-nso/Makefile b/x11/kde3-i18n-nso/Makefile
index 20605c306fc..39fe33245e4 100644
--- a/x11/kde3-i18n-nso/Makefile
+++ b/x11/kde3-i18n-nso/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.2 2003/03/29 12:43:04 jmmv Exp $
+# $NetBSD: Makefile,v 1.3 2003/05/02 11:57:18 wiz Exp $
 
 DISTNAME=	kde-i18n-nso-${_KDE_VERSION}
+PKGREVISION=	1
 WRKSRC=		${WRKDIR}/kde-i18n-nso
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITES_KDE:=kde-i18n/}
diff --git a/x11/kde3-i18n-pl/Makefile b/x11/kde3-i18n-pl/Makefile
index 37ed01effe1..7e08e6332f9 100644
--- a/x11/kde3-i18n-pl/Makefile
+++ b/x11/kde3-i18n-pl/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.2 2003/03/29 12:43:04 jmmv Exp $
+# $NetBSD: Makefile,v 1.3 2003/05/02 11:57:18 wiz Exp $
 
 DISTNAME=	kde-i18n-pl-${_KDE_VERSION}
+PKGREVISION=	1
 WRKSRC=		${WRKDIR}/kde-i18n-pl
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITES_KDE:=kde-i18n/}
diff --git a/x11/kde3-i18n-pt/Makefile b/x11/kde3-i18n-pt/Makefile
index e0cd2564179..1e2ce7b8c53 100644
--- a/x11/kde3-i18n-pt/Makefile
+++ b/x11/kde3-i18n-pt/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.2 2003/03/29 12:43:04 jmmv Exp $
+# $NetBSD: Makefile,v 1.3 2003/05/02 11:57:18 wiz Exp $
 
 DISTNAME=	kde-i18n-pt-${_KDE_VERSION}
+PKGREVISION=	1
 WRKSRC=		${WRKDIR}/kde-i18n-pt
 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 f800cef7c84..73a6358112b 100644
--- a/x11/kde3-i18n-pt_BR/Makefile
+++ b/x11/kde3-i18n-pt_BR/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.2 2003/03/29 12:43:04 jmmv Exp $
+# $NetBSD: Makefile,v 1.3 2003/05/02 11:57:19 wiz Exp $
 
 DISTNAME=	kde-i18n-pt_BR-${_KDE_VERSION}
+PKGREVISION=	1
 WRKSRC=		${WRKDIR}/kde-i18n-pt_BR
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITES_KDE:=kde-i18n/}
diff --git a/x11/kde3-i18n-ro/Makefile b/x11/kde3-i18n-ro/Makefile
index b4884e40176..7ffb184e9b9 100644
--- a/x11/kde3-i18n-ro/Makefile
+++ b/x11/kde3-i18n-ro/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.2 2003/03/29 12:43:04 jmmv Exp $
+# $NetBSD: Makefile,v 1.3 2003/05/02 11:57:19 wiz Exp $
 
 DISTNAME=	kde-i18n-ro-${_KDE_VERSION}
+PKGREVISION=	1
 WRKSRC=		${WRKDIR}/kde-i18n-ro
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITES_KDE:=kde-i18n/}
diff --git a/x11/kde3-i18n-ru/Makefile b/x11/kde3-i18n-ru/Makefile
index 3e683f5871e..22565e009dc 100644
--- a/x11/kde3-i18n-ru/Makefile
+++ b/x11/kde3-i18n-ru/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.2 2003/03/29 12:43:05 jmmv Exp $
+# $NetBSD: Makefile,v 1.3 2003/05/02 11:57:19 wiz Exp $
 
 DISTNAME=	kde-i18n-ru-${_KDE_VERSION}
+PKGREVISION=	1
 WRKSRC=		${WRKDIR}/kde-i18n-ru
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITES_KDE:=kde-i18n/}
diff --git a/x11/kde3-i18n-sk/Makefile b/x11/kde3-i18n-sk/Makefile
index fa5ffe7a9a5..2edc2492d87 100644
--- a/x11/kde3-i18n-sk/Makefile
+++ b/x11/kde3-i18n-sk/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.2 2003/03/29 12:43:05 jmmv Exp $
+# $NetBSD: Makefile,v 1.3 2003/05/02 11:57:19 wiz Exp $
 
 DISTNAME=	kde-i18n-sk-${_KDE_VERSION}
+PKGREVISION=	1
 WRKSRC=		${WRKDIR}/kde-i18n-sk
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITES_KDE:=kde-i18n/}
diff --git a/x11/kde3-i18n-sl/Makefile b/x11/kde3-i18n-sl/Makefile
index 92c29aa541d..ffb7e6d156b 100644
--- a/x11/kde3-i18n-sl/Makefile
+++ b/x11/kde3-i18n-sl/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.2 2003/03/29 12:43:05 jmmv Exp $
+# $NetBSD: Makefile,v 1.3 2003/05/02 11:57:20 wiz Exp $
 
 DISTNAME=	kde-i18n-sl-${_KDE_VERSION}
+PKGREVISION=	1
 WRKSRC=		${WRKDIR}/kde-i18n-sl
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITES_KDE:=kde-i18n/}
diff --git a/x11/kde3-i18n-sr/Makefile b/x11/kde3-i18n-sr/Makefile
index 5ffaf2cd989..49254d563da 100644
--- a/x11/kde3-i18n-sr/Makefile
+++ b/x11/kde3-i18n-sr/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.2 2003/03/29 12:43:05 jmmv Exp $
+# $NetBSD: Makefile,v 1.3 2003/05/02 11:57:20 wiz Exp $
 
 DISTNAME=	kde-i18n-sr-${_KDE_VERSION}
+PKGREVISION=	1
 WRKSRC=		${WRKDIR}/kde-i18n-sr
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITES_KDE:=kde-i18n/}
diff --git a/x11/kde3-i18n-sv/Makefile b/x11/kde3-i18n-sv/Makefile
index 4fdd5a683d7..71971a5fc99 100644
--- a/x11/kde3-i18n-sv/Makefile
+++ b/x11/kde3-i18n-sv/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.2 2003/03/29 12:43:05 jmmv Exp $
+# $NetBSD: Makefile,v 1.3 2003/05/02 11:57:20 wiz Exp $
 
 DISTNAME=	kde-i18n-sv-${_KDE_VERSION}
+PKGREVISION=	1
 WRKSRC=		${WRKDIR}/kde-i18n-sv
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITES_KDE:=kde-i18n/}
diff --git a/x11/kde3-i18n-ta/Makefile b/x11/kde3-i18n-ta/Makefile
index c38ed8a20d2..cbcffc044ea 100644
--- a/x11/kde3-i18n-ta/Makefile
+++ b/x11/kde3-i18n-ta/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.2 2003/03/29 12:43:06 jmmv Exp $
+# $NetBSD: Makefile,v 1.3 2003/05/02 11:57:20 wiz Exp $
 
 DISTNAME=	kde-i18n-ta-${_KDE_VERSION}
+PKGREVISION=	1
 WRKSRC=		${WRKDIR}/kde-i18n-ta
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITES_KDE:=kde-i18n/}
diff --git a/x11/kde3-i18n-th/Makefile b/x11/kde3-i18n-th/Makefile
index 1a857d31af8..bd3b8d44169 100644
--- a/x11/kde3-i18n-th/Makefile
+++ b/x11/kde3-i18n-th/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.2 2003/03/29 12:43:06 jmmv Exp $
+# $NetBSD: Makefile,v 1.3 2003/05/02 11:57:21 wiz Exp $
 
 DISTNAME=	kde-i18n-th-${_KDE_VERSION}
+PKGREVISION=	1
 WRKSRC=		${WRKDIR}/kde-i18n-th
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITES_KDE:=kde-i18n/}
diff --git a/x11/kde3-i18n-tr/Makefile b/x11/kde3-i18n-tr/Makefile
index 6a6bbd0de5d..c831f4fccfd 100644
--- a/x11/kde3-i18n-tr/Makefile
+++ b/x11/kde3-i18n-tr/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.2 2003/03/29 12:43:06 jmmv Exp $
+# $NetBSD: Makefile,v 1.3 2003/05/02 11:57:21 wiz Exp $
 
 DISTNAME=	kde-i18n-tr-${_KDE_VERSION}
+PKGREVISION=	1
 WRKSRC=		${WRKDIR}/kde-i18n-tr
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITES_KDE:=kde-i18n/}
diff --git a/x11/kde3-i18n-uk/Makefile b/x11/kde3-i18n-uk/Makefile
index c5c4f8bd255..f1e8e832d95 100644
--- a/x11/kde3-i18n-uk/Makefile
+++ b/x11/kde3-i18n-uk/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.2 2003/03/29 12:43:06 jmmv Exp $
+# $NetBSD: Makefile,v 1.3 2003/05/02 11:57:23 wiz Exp $
 
 DISTNAME=	kde-i18n-uk-${_KDE_VERSION}
+PKGREVISION=	1
 WRKSRC=		${WRKDIR}/kde-i18n-uk
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITES_KDE:=kde-i18n/}
diff --git a/x11/kde3-i18n-ven/Makefile b/x11/kde3-i18n-ven/Makefile
index 95de854ed73..b43361b5e04 100644
--- a/x11/kde3-i18n-ven/Makefile
+++ b/x11/kde3-i18n-ven/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.2 2003/03/29 12:43:06 jmmv Exp $
+# $NetBSD: Makefile,v 1.3 2003/05/02 11:57:24 wiz Exp $
 
 DISTNAME=	kde-i18n-ven-${_KDE_VERSION}
+PKGREVISION=	1
 WRKSRC=		${WRKDIR}/kde-i18n-ven
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITES_KDE:=kde-i18n/}
diff --git a/x11/kde3-i18n-vi/Makefile b/x11/kde3-i18n-vi/Makefile
index cbfdf6a9327..3d45948eb34 100644
--- a/x11/kde3-i18n-vi/Makefile
+++ b/x11/kde3-i18n-vi/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.2 2003/03/29 12:43:06 jmmv Exp $
+# $NetBSD: Makefile,v 1.3 2003/05/02 11:57:24 wiz Exp $
 
 DISTNAME=	kde-i18n-vi-${_KDE_VERSION}
+PKGREVISION=	1
 WRKSRC=		${WRKDIR}/kde-i18n-vi
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITES_KDE:=kde-i18n/}
diff --git a/x11/kde3-i18n-xh/Makefile b/x11/kde3-i18n-xh/Makefile
index dbc77a325eb..70b0119b67c 100644
--- a/x11/kde3-i18n-xh/Makefile
+++ b/x11/kde3-i18n-xh/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.2 2003/03/29 12:43:07 jmmv Exp $
+# $NetBSD: Makefile,v 1.3 2003/05/02 11:57:24 wiz Exp $
 
 DISTNAME=	kde-i18n-xh-${_KDE_VERSION}
+PKGREVISION=	1
 WRKSRC=		${WRKDIR}/kde-i18n-xh
 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 40af201b359..97116433f2e 100644
--- a/x11/kde3-i18n-zh_CN/Makefile
+++ b/x11/kde3-i18n-zh_CN/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.2 2003/03/29 12:43:07 jmmv Exp $
+# $NetBSD: Makefile,v 1.3 2003/05/02 11:57:25 wiz Exp $
 
 DISTNAME=	kde-i18n-zh_CN-${_KDE_VERSION}
+PKGREVISION=	1
 WRKSRC=		${WRKDIR}/kde-i18n-zh_CN
 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 3f71a4be320..4c96d155cf5 100644
--- a/x11/kde3-i18n-zh_TW/Makefile
+++ b/x11/kde3-i18n-zh_TW/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.2 2003/03/29 12:43:07 jmmv Exp $
+# $NetBSD: Makefile,v 1.3 2003/05/02 11:57:25 wiz Exp $
 
 DISTNAME=	kde-i18n-zh_TW-${_KDE_VERSION}
+PKGREVISION=	1
 WRKSRC=		${WRKDIR}/kde-i18n-zh_TW
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITES_KDE:=kde-i18n/}
diff --git a/x11/kde3-i18n-zu/Makefile b/x11/kde3-i18n-zu/Makefile
index 0d9e57b4247..2350845b9c8 100644
--- a/x11/kde3-i18n-zu/Makefile
+++ b/x11/kde3-i18n-zu/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.2 2003/03/29 12:43:07 jmmv Exp $
+# $NetBSD: Makefile,v 1.3 2003/05/02 11:57:25 wiz Exp $
 
 DISTNAME=	kde-i18n-zu-${_KDE_VERSION}
+PKGREVISION=	1
 WRKSRC=		${WRKDIR}/kde-i18n-zu
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITES_KDE:=kde-i18n/}
diff --git a/x11/kde3/Makefile b/x11/kde3/Makefile
index 1ffbf27cc29..2b2d8e3f9b0 100644
--- a/x11/kde3/Makefile
+++ b/x11/kde3/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.20 2003/04/10 13:13:26 markd Exp $
+# $NetBSD: Makefile,v 1.21 2003/05/02 11:57:10 wiz Exp $
 
 DISTNAME=	kde-3.1.1
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	x11 kde
 MASTER_SITES=	# empty
 DISTFILES=	# empty
@@ -10,18 +10,18 @@ MAINTAINER=	skrll@netbsd.org
 HOMEPAGE=	http://www.kde.org/
 COMMENT=	"meta-package" for the KDE integrated X11 desktop
 
-DEPENDS+=	kdeartwork-3.1.1:../../misc/kdeartwork3
-DEPENDS+=	kdeaddons-3.1.1:../../misc/kdeaddons3
-DEPENDS+=	kdeadmin-3.1.1:../../misc/kdeadmin3
-DEPENDS+=	kdeedu-3.1.1:../../misc/kdeedu3
-DEPENDS+=	kdegames-3.1.1:../../games/kdegames3
-DEPENDS+=	kdegraphics-3.1.1nb2:../../graphics/kdegraphics3
-DEPENDS+=	kdemultimedia-3.1.1nb1:../../audio/kdemultimedia3
-DEPENDS+=	kdenetwork-3.1.1:../../net/kdenetwork3
-DEPENDS+=	kdepim-3.1.1:../../misc/kdepim3
-DEPENDS+=	kdetoys-3.1.1:../../games/kdetoys3
-DEPENDS+=	kdeutils-3.1.1:../../misc/kdeutils3
-DEPENDS+=	quanta-3.1.1:../../www/quanta3
+DEPENDS+=	kdeartwork-3.1.1nb1:../../misc/kdeartwork3
+DEPENDS+=	kdeaddons-3.1.1nb1:../../misc/kdeaddons3
+DEPENDS+=	kdeadmin-3.1.1nb1:../../misc/kdeadmin3
+DEPENDS+=	kdeedu-3.1.1nb1:../../misc/kdeedu3
+DEPENDS+=	kdegames-3.1.1nb1:../../games/kdegames3
+DEPENDS+=	kdegraphics-3.1.1nb3:../../graphics/kdegraphics3
+DEPENDS+=	kdemultimedia-3.1.1nb2:../../audio/kdemultimedia3
+DEPENDS+=	kdenetwork-3.1.1nb1:../../net/kdenetwork3
+DEPENDS+=	kdepim-3.1.1nb1:../../misc/kdepim3
+DEPENDS+=	kdetoys-3.1.1nb1:../../games/kdetoys3
+DEPENDS+=	kdeutils-3.1.1nb1:../../misc/kdeutils3
+DEPENDS+=	quanta-3.1.1nb1:../../www/quanta3
 
 EXTRACT_ONLY=	# empty
 USE_BUILDLINK2=	yes
diff --git a/x11/kdebase2/Makefile b/x11/kdebase2/Makefile
index fcf4d37cf76..b7b25449306 100644
--- a/x11/kdebase2/Makefile
+++ b/x11/kdebase2/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.41 2003/03/28 20:37:17 wiz Exp $
+# $NetBSD: Makefile,v 1.42 2003/05/02 11:57:25 wiz Exp $
 
 DISTNAME=	kdebase-2.2.2
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	x11
 COMMENT=	Base modules for the KDE 2 integrated X11 desktop
 
diff --git a/x11/kdebase2/buildlink2.mk b/x11/kdebase2/buildlink2.mk
index b2455d234a2..1bb7ef377e8 100644
--- a/x11/kdebase2/buildlink2.mk
+++ b/x11/kdebase2/buildlink2.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.7 2002/10/26 13:09:07 bouyer Exp $
+# $NetBSD: buildlink2.mk,v 1.8 2003/05/02 11:57:26 wiz Exp $
 
 .if !defined(KDEBASE2_BUILDLINK2_MK)
 KDEBASE2_BUILDLINK2_MK=	# defined
@@ -7,7 +7,7 @@ KDEBASE2_BUILDLINK2_MK=	# defined
 
 BUILDLINK_PACKAGES+=		kdebase2
 BUILDLINK_PKGBASE.kdebase2?=	kdebase
-BUILDLINK_DEPENDS.kdebase2?=	kdebase>=2.2.2nb1
+BUILDLINK_DEPENDS.kdebase2?=	kdebase>=2.2.2nb2
 BUILDLINK_PKGSRCDIR.kdebase2?=	../../x11/kdebase2
 
 EVAL_PREFIX+=	BUILDLINK_PREFIX.kdebase2=kdebase
diff --git a/x11/kdebase3/Makefile b/x11/kdebase3/Makefile
index 29105f4ea0a..9b6293ab46b 100644
--- a/x11/kdebase3/Makefile
+++ b/x11/kdebase3/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.23 2003/04/10 13:13:26 markd Exp $
+# $NetBSD: Makefile,v 1.24 2003/05/02 11:57:26 wiz Exp $
 
 DISTNAME=	kdebase-3.1.1
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	x11
 COMMENT=	Base modules for the KDE 3 integrated X11 desktop
 
diff --git a/x11/kdebase3/buildlink2.mk b/x11/kdebase3/buildlink2.mk
index 7a3f80e8025..a68ef9de725 100644
--- a/x11/kdebase3/buildlink2.mk
+++ b/x11/kdebase3/buildlink2.mk
@@ -1,11 +1,11 @@
-# $NetBSD: buildlink2.mk,v 1.8 2003/04/10 13:13:26 markd Exp $
+# $NetBSD: buildlink2.mk,v 1.9 2003/05/02 11:57:26 wiz Exp $
 
 .if !defined(KDEBASE3_BUILDLINK2_MK)
 KDEBASE3_BUILDLINK2_MK=	# defined
 
 BUILDLINK_PACKAGES+=		kdebase3
 BUILDLINK_PKGBASE.kdebase3?=	kdebase
-BUILDLINK_DEPENDS.kdebase3?=	kdebase>=3.1.1nb1
+BUILDLINK_DEPENDS.kdebase3?=	kdebase>=3.1.1nb2
 BUILDLINK_PKGSRCDIR.kdebase3?=	../../x11/kdebase3
 
 .include "../../mk/bsd.prefs.mk"
diff --git a/x11/kdelibs2/Makefile b/x11/kdelibs2/Makefile
index 5904869a623..7bb1a18bc81 100644
--- a/x11/kdelibs2/Makefile
+++ b/x11/kdelibs2/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.47 2002/12/14 03:43:20 schmonz Exp $
+# $NetBSD: Makefile,v 1.48 2003/05/02 11:57:26 wiz Exp $
 
 DISTNAME=	kdelibs-2.2.2
-PKGREVISION=	4
+PKGREVISION=	5
 CATEGORIES=	x11
 COMMENT=	Support libraries for the KDE integrated X11 desktop
 
@@ -9,8 +9,6 @@ COMMENT=	Support libraries for the KDE integrated X11 desktop
 
 CONFLICTS=	arts-[1-9]*
 
-BUILDLINK_DEPENDS.qt2-libs=	qt2-libs>=2.3.1nb2
-
 USE_BUILDLINK2=		YES
 USE_CXX=		YES
 USE_OPENSSL_VERSION=	${OPENSSL_VERSION_096}
diff --git a/x11/kdelibs2/buildlink2.mk b/x11/kdelibs2/buildlink2.mk
index a6363cee571..703cd79bd0a 100644
--- a/x11/kdelibs2/buildlink2.mk
+++ b/x11/kdelibs2/buildlink2.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.13 2003/03/13 14:19:22 hubertf Exp $
+# $NetBSD: buildlink2.mk,v 1.14 2003/05/02 11:57:27 wiz Exp $
 
 .if !defined(KDELIBS2_BUILDLINK2_MK)
 KDELIBS2_BUILDLINK2_MK=	# defined
@@ -8,7 +8,7 @@ KDELIBS2_BUILDLINK2_MK=	# defined
 BUILDLINK_PACKAGES+=		kdelibs2
 BUILDLINK_PKGBASE.kdelibs2?=	kdelibs
 .if !defined(BUILDLINK_DEPENDS.kdelibs2)
-BUILDLINK_DEPENDS.kdelibs2+=	kdelibs>=2.2.2nb4
+BUILDLINK_DEPENDS.kdelibs2+=	kdelibs>=2.2.2nb5
 BUILDLINK_DEPENDS.kdelibs2+=	kdelibs<3.0	# qt2-designer-kde wants KDE_2_
 .endif
 BUILDLINK_PKGSRCDIR.kdelibs2?=	../../x11/kdelibs2
@@ -25,8 +25,8 @@ BUILDLINK_FILES_CMD.kdelibs2= \
 
 KDEDIR=				${BUILDLINK_PREFIX.kdelibs2}
 
-BUILDLINK_DEPENDS.audiofile=	libaudiofile>=0.1.9
-BUILDLINK_DEPENDS.qt2-libs=	qt2-libs>=2.3.1nb2
+BUILDLINK_DEPENDS.audiofile=	libaudiofile>=2.2.2nb5
+BUILDLINK_DEPENDS.qt2-libs=	qt2-libs>=2.2.2nb5
 USE_OPENSSL_VERSION=		${OPENSSL_VERSION_096}
 
 .include "../../audio/libaudiofile/buildlink2.mk"
diff --git a/x11/kdelibs3/Makefile b/x11/kdelibs3/Makefile
index 6a3d2893ccd..8f2d05ea139 100644
--- a/x11/kdelibs3/Makefile
+++ b/x11/kdelibs3/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.25 2003/04/10 13:13:25 markd Exp $
+# $NetBSD: Makefile,v 1.26 2003/05/02 11:57:27 wiz Exp $
 
 DISTNAME=	kdelibs-3.1.1
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	x11
 COMMENT=	Support libraries for the KDE integrated X11 desktop
 
@@ -9,8 +9,6 @@ COMMENT=	Support libraries for the KDE integrated X11 desktop
 
 CONFLICTS+=	koffice3<=1.1.1
 
-BUILDLINK_DEPENDS.qt3-libs=	qt3-libs>=3.1.1
-
 USE_BUILDLINK2=		YES
 USE_CXX=		YES
 USE_OPENSSL_VERSION=	${OPENSSL_VERSION_096}
diff --git a/x11/kdelibs3/buildlink2.mk b/x11/kdelibs3/buildlink2.mk
index 952d7ecc04b..f7f7451defa 100644
--- a/x11/kdelibs3/buildlink2.mk
+++ b/x11/kdelibs3/buildlink2.mk
@@ -1,11 +1,11 @@
-# $NetBSD: buildlink2.mk,v 1.13 2003/04/10 13:13:26 markd Exp $
+# $NetBSD: buildlink2.mk,v 1.14 2003/05/02 11:57:27 wiz Exp $
 
 .if !defined(KDELIBS3_BUILDLINK2_MK)
 KDELIBS3_BUILDLINK2_MK=	# defined
 
 BUILDLINK_PACKAGES+=		kdelibs3
 BUILDLINK_PKGBASE.kdelibs3?=	kdelibs
-BUILDLINK_DEPENDS.kdelibs3?=	kdelibs>=3.1.1nb1
+BUILDLINK_DEPENDS.kdelibs3?=	kdelibs>=3.1.1nb2
 BUILDLINK_PKGSRCDIR.kdelibs3?=	../../x11/kdelibs3
 
 .include "../../mk/bsd.prefs.mk"
@@ -17,8 +17,8 @@ BUILDLINK_FILES_CMD.kdelibs3= \
 
 KDEDIR=				${BUILDLINK_PREFIX.kdelibs3}
 
-BUILDLINK_DEPENDS.audiofile=	libaudiofile>=0.1.9
-BUILDLINK_DEPENDS.qt3-libs=	qt3-libs>=3.1.1
+BUILDLINK_DEPENDS.audiofile=	libaudiofile>=3.1.1nb2
+BUILDLINK_DEPENDS.qt3-libs=	qt3-libs>=3.1.1nb2
 USE_OPENSSL_VERSION=		${OPENSSL_VERSION_096}
 
 .include "../../audio/libaudiofile/buildlink2.mk"
diff --git a/x11/kterm/Makefile b/x11/kterm/Makefile
index ecb1ab100cf..9617c520a81 100644
--- a/x11/kterm/Makefile
+++ b/x11/kterm/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.21 2003/03/03 04:17:45 jschauma Exp $
+# $NetBSD: Makefile,v 1.22 2003/05/02 11:57:27 wiz Exp $
 
 DISTNAME=	kterm-6.2.0
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_XCONTRIB:=applications/}
 
@@ -28,7 +28,6 @@ BUILD_DEFS+=	KTERM_USE_WALLPAPER
 .  if ${KTERM_USE_WALLPAPER} == "imlib"
 SITES_KTerm-BGP-Imlib-1.0.patch.gz=	http://delegate.uec.ac.jp:8081/club/mma/%7Etakkun/fun/handling/
 PATCHFILES+=	KTerm-BGP-Imlib-1.0.patch.gz
-BUILDLINK_DEPENDS.imlib?=	imlib>=1.9.4
 .    include "../../graphics/imlib/buildlink2.mk"
 .  elif ${KTERM_USE_WALLPAPER} == "YES"
 SITES_KTerm-BGP-1.0.patch.gz=	http://delegate.uec.ac.jp:8081/club/mma/%7Etakkun/fun/handling/
diff --git a/x11/lablgtk/Makefile b/x11/lablgtk/Makefile
index 030c28f5850..0ad96c9240a 100644
--- a/x11/lablgtk/Makefile
+++ b/x11/lablgtk/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.4 2003/03/17 11:56:22 dmcmahill Exp $
+# $NetBSD: Makefile,v 1.5 2003/05/02 11:57:27 wiz Exp $
 #
 
 DISTNAME=	lablgtk-1.2.5
+PKGREVISION=	1
 CATEGORIES=	x11
 MASTER_SITES=	http://wwwfun.kurims.kyoto-u.ac.jp/soft/olabl/dist/
 
diff --git a/x11/lablgtk/buildlink2.mk b/x11/lablgtk/buildlink2.mk
index a0b0612269c..549fc601e28 100644
--- a/x11/lablgtk/buildlink2.mk
+++ b/x11/lablgtk/buildlink2.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.2 2002/10/16 16:45:37 dillo Exp $
+# $NetBSD: buildlink2.mk,v 1.3 2003/05/02 11:57:28 wiz Exp $
 #
 # This Makefile fragment is included by packages that use lablgtk.
 
@@ -6,7 +6,7 @@
 LABLGTK_BUILDLINK2_MK=	# defined
 
 BUILDLINK_PACKAGES+=			lablgtk
-BUILDLINK_DEPENDS.lablgtk?=		lablgtk>=1.2.5
+BUILDLINK_DEPENDS.lablgtk?=		lablgtk>=1.2.5nb1
 BUILDLINK_PKGSRCDIR.lablgtk?=		../../x11/lablgtk
 
 EVAL_PREFIX+=	BUILDLINK_PREFIX.lablgtk=lablgtk
diff --git a/x11/libzvt/Makefile b/x11/libzvt/Makefile
index 4676f0c37bb..ae99a265d61 100644
--- a/x11/libzvt/Makefile
+++ b/x11/libzvt/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.2 2002/12/24 06:10:34 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2003/05/02 11:57:28 wiz Exp $
 #
 
 DISTNAME=		libzvt-2.0.1
-PKGREVISION=		1
+PKGREVISION=	2
 CATEGORIES=		x11 gnome
 MASTER_SITES=		${MASTER_SITE_GNOME:=sources/libzvt/2.0/}
 EXTRACT_SUFX=		.tar.bz2
diff --git a/x11/libzvt/buildlink2.mk b/x11/libzvt/buildlink2.mk
index 3067e517d48..00b9072ca93 100644
--- a/x11/libzvt/buildlink2.mk
+++ b/x11/libzvt/buildlink2.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.2 2002/12/24 06:10:34 wiz Exp $
+# $NetBSD: buildlink2.mk,v 1.3 2003/05/02 11:57:28 wiz Exp $
 #
 # This Makefile fragment is included by packages that use libzvt.
 #
@@ -9,7 +9,7 @@
 LIBZVT_BUILDLINK2_MK=	# defined
 
 BUILDLINK_PACKAGES+=			libzvt
-BUILDLINK_DEPENDS.libzvt?=		libzvt>=2.0.1nb1
+BUILDLINK_DEPENDS.libzvt?=		libzvt>=2.0.1nb2
 BUILDLINK_PKGSRCDIR.libzvt?=		../../x11/libzvt
 
 EVAL_PREFIX+=	BUILDLINK_PREFIX.libzvt=libzvt
diff --git a/x11/mlterm/Makefile b/x11/mlterm/Makefile
index 46bc2d81b16..1386e924711 100644
--- a/x11/mlterm/Makefile
+++ b/x11/mlterm/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.12 2003/02/05 23:28:58 dmcmahill Exp $
+# $NetBSD: Makefile,v 1.13 2003/05/02 11:57:28 wiz Exp $
 
 DISTNAME=	mlterm-2.6.2
+PKGREVISION=	1
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=mlterm/}
 
diff --git a/x11/multi-gnome-terminal/Makefile b/x11/multi-gnome-terminal/Makefile
index 2c02a5d6db8..a65278e6383 100644
--- a/x11/multi-gnome-terminal/Makefile
+++ b/x11/multi-gnome-terminal/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.10 2003/02/18 14:56:05 jmmv Exp $
+# $NetBSD: Makefile,v 1.11 2003/05/02 11:57:29 wiz Exp $
 
 DISTNAME=	multi-gnome-terminal-1.6.1
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	gnome x11
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=multignometerm/}
 
diff --git a/x11/p5-gtk/Makefile b/x11/p5-gtk/Makefile
index 2fcf0db8da2..7959820da36 100644
--- a/x11/p5-gtk/Makefile
+++ b/x11/p5-gtk/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.18 2002/10/13 11:43:59 wiz Exp $
+# $NetBSD: Makefile,v 1.19 2003/05/02 11:57:29 wiz Exp $
 #
 
 DISTNAME=		Gtk-Perl-0.7008
+PKGREVISION=	1
 PKGNAME=		p5-gtk-0.7008
 SVR4_PKGNAME=		p5gtk
 WRKSRC=			${WRKDIR}/${DISTNAME}/Gtk
diff --git a/x11/py-wxWindows/Makefile b/x11/py-wxWindows/Makefile
index 8dfcb878aed..628cd4436d5 100644
--- a/x11/py-wxWindows/Makefile
+++ b/x11/py-wxWindows/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.12 2002/10/09 14:35:38 wiz Exp $
+# $NetBSD: Makefile,v 1.13 2003/05/02 11:57:29 wiz Exp $
 #
 
 DISTNAME=	wxPython-2.2.2
 PKGNAME=	${PYPKGPREFIX}-wxWindows-2.2.2
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=wxpython/}
 
diff --git a/x11/pygtk/Makefile b/x11/pygtk/Makefile
index 08ec6cd7f31..ff48d7466df 100644
--- a/x11/pygtk/Makefile
+++ b/x11/pygtk/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.4 2002/10/07 11:33:06 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2003/05/02 11:57:29 wiz Exp $
 #
 
 DISTNAME=	pygtk-0.6.9
 PKGNAME=	${PYPKGPREFIX}-gtk-0.6.9
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	x11
 MASTER_SITES=	ftp://ftp.gtk.org/pub/gtk/python/
 
diff --git a/x11/pygtk/buildlink2.mk b/x11/pygtk/buildlink2.mk
index 1901c38587e..443125a94d3 100644
--- a/x11/pygtk/buildlink2.mk
+++ b/x11/pygtk/buildlink2.mk
@@ -1,11 +1,11 @@
-# $NetBSD: buildlink2.mk,v 1.3 2002/11/15 05:29:26 jlam Exp $
+# $NetBSD: buildlink2.mk,v 1.4 2003/05/02 11:57:30 wiz Exp $
 
 .if !defined(PY_GTK_BUILDLINK2_MK)
 
 .include "../../lang/python/pyversion.mk"
 
 BUILDLINK_PACKAGES+=		pygtk
-BUILDLINK_DEPENDS.pygtk?=	${PYPKGPREFIX}-gtk-[0-9]*
+BUILDLINK_DEPENDS.pygtk?=	${PYPKGPREFIX}-gtk>=0.6.9nb2
 BUILDLINK_PKGSRCDIR.pygtk?=	../../x11/pygtk
 
 .endif	# PY_GTK_BUILDLINK2_MK
diff --git a/x11/qt2-designer-kde/Makefile b/x11/qt2-designer-kde/Makefile
index 46e6ff51fcd..bda1afbae5e 100644
--- a/x11/qt2-designer-kde/Makefile
+++ b/x11/qt2-designer-kde/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.11 2002/08/25 18:40:42 jlam Exp $
+# $NetBSD: Makefile,v 1.12 2003/05/02 11:57:30 wiz Exp $
 #
 
 PKGNAME=		qt2-designer-kde-${QTVERSION}
-PKGREVISION=		2
+PKGREVISION=	3
 COMMENT=		Visual (WYSIWYG) QT GUI builder with KDE widget support
 
 CONFLICTS+=		qt2-designer-[0-9]*
diff --git a/x11/qt3-libs/Makefile.common b/x11/qt3-libs/Makefile.common
index 54bb44e31b6..7921b78c4f6 100644
--- a/x11/qt3-libs/Makefile.common
+++ b/x11/qt3-libs/Makefile.common
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile.common,v 1.14 2003/03/18 08:36:24 skrll Exp $
+# $NetBSD: Makefile.common,v 1.15 2003/05/02 11:57:30 wiz Exp $
 #
 DISTNAME=		qt-x11-free-${QTVERSION}
+PKGREVISION=		1
 CATEGORIES=		x11
 MASTER_SITES=		ftp://ftp.trolltech.com/qt/source/ \
 			ftp://ftp.bero.org/pub/qt/source/
diff --git a/x11/qt3-libs/buildlink2.mk b/x11/qt3-libs/buildlink2.mk
index fe0ccbfc643..5c8fed10976 100644
--- a/x11/qt3-libs/buildlink2.mk
+++ b/x11/qt3-libs/buildlink2.mk
@@ -1,10 +1,10 @@
-# $NetBSD: buildlink2.mk,v 1.13 2003/03/18 08:36:24 skrll Exp $
+# $NetBSD: buildlink2.mk,v 1.14 2003/05/02 11:57:30 wiz Exp $
 
 .if !defined(QT3_LIBS_BUILDLINK2_MK)
 QT3_LIBS_BUILDLINK2_MK=	# defined
 
 BUILDLINK_PACKAGES+=		qt3-libs
-BUILDLINK_DEPENDS.qt3-libs?=	qt3-libs>=3.1.2
+BUILDLINK_DEPENDS.qt3-libs?=	qt3-libs>=3.1.2nb1
 BUILDLINK_PKGSRCDIR.qt3-libs?=	../../x11/qt3-libs
 
 EVAL_PREFIX+=	BUILDLINK_PREFIX.qt3-libs=qt3-libs
diff --git a/x11/qt3-mysql/Makefile b/x11/qt3-mysql/Makefile
index 2193b2a871b..ab3247bc578 100644
--- a/x11/qt3-mysql/Makefile
+++ b/x11/qt3-mysql/Makefile
@@ -1,9 +1,10 @@
-# $NetBSD: Makefile,v 1.4 2003/02/18 19:16:55 drochner Exp $
+# $NetBSD: Makefile,v 1.5 2003/05/02 11:57:31 wiz Exp $
 #
 
 .include "../qt3-libs/Makefile.common"
 
 PKGNAME=		qt3-mysql-${QTVERSION}
+PKGREVISION=		1
 COMMENT=		QT mysql driver
 
 CONFIGURE_ARGS+=	-I${QTDIR}/include \
diff --git a/x11/qt3-psql/Makefile b/x11/qt3-psql/Makefile
index c94b6af27e7..1cfd89971bf 100644
--- a/x11/qt3-psql/Makefile
+++ b/x11/qt3-psql/Makefile
@@ -1,9 +1,10 @@
-# $NetBSD: Makefile,v 1.7 2003/04/06 21:34:40 jmc Exp $
+# $NetBSD: Makefile,v 1.8 2003/05/02 11:57:31 wiz Exp $
 #
 
 .include "../qt3-libs/Makefile.common"
 
 PKGNAME=		qt3-psql-${QTVERSION}
+PKGREVISION=		1
 COMMENT=		QT postgresql driver
 
 CONFIGURE_ARGS+=	-I${QTDIR}/include \
diff --git a/x11/qt3-tools/Makefile b/x11/qt3-tools/Makefile
index ba0d74b611e..17d7f5a593a 100644
--- a/x11/qt3-tools/Makefile
+++ b/x11/qt3-tools/Makefile
@@ -1,9 +1,10 @@
-# $NetBSD: Makefile,v 1.18 2003/03/18 08:36:25 skrll Exp $
+# $NetBSD: Makefile,v 1.19 2003/05/02 11:57:31 wiz Exp $
 #
 
 .include "../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/buildlink2.mk b/x11/qt3-tools/buildlink2.mk
index 720b30adf9c..c6304587ccc 100644
--- a/x11/qt3-tools/buildlink2.mk
+++ b/x11/qt3-tools/buildlink2.mk
@@ -1,10 +1,10 @@
-# $NetBSD: buildlink2.mk,v 1.8 2003/03/18 08:36:26 skrll Exp $
+# $NetBSD: buildlink2.mk,v 1.9 2003/05/02 11:57:31 wiz Exp $
 
 .if !defined(QT3_TOOLS_BUILDLINK2_MK)
 QT3_TOOLS_BUILDLINK2_MK=	# defined
 
 BUILDLINK_PACKAGES+=		qt3-tools
-BUILDLINK_DEPENDS.qt3-tools?=	qt3-tools>=3.1.2
+BUILDLINK_DEPENDS.qt3-tools?=	qt3-tools>=3.1.2nb1
 BUILDLINK_PKGSRCDIR.qt3-tools?=	../../x11/qt3-tools
 
 EVAL_PREFIX+=			BUILDLINK_PREFIX.qt3-tools=qt3-tools
diff --git a/x11/qt3/Makefile b/x11/qt3/Makefile
index 26bf763ad7f..47f0ef1a9b9 100644
--- a/x11/qt3/Makefile
+++ b/x11/qt3/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.15 2003/03/28 21:14:40 wiz Exp $
+# $NetBSD: Makefile,v 1.16 2003/05/02 11:57:30 wiz Exp $
 
 DISTNAME=	qt3-${QTVERSION}
+PKGREVISION=	1
 CATEGORIES=	x11
 MASTER_SITES=	# empty
 DISTFILES=	# empty
@@ -9,9 +10,9 @@ COMMENT=	"meta-package" for the QT GUI C++ toolkit
 
 .include "./Makefile.common"
 
-DEPENDS+=	qt3-libs-${QTVERSION}:../../x11/qt3-libs
-DEPENDS+=	qt3-tools-${QTVERSION}:../../x11/qt3-tools
-DEPENDS+=	qt3-docs-${QTVERSION}:../../x11/qt3-docs
+DEPENDS+=	qt3-libs-${QTVERSION}nb1:../../x11/qt3-libs
+DEPENDS+=	qt3-tools-${QTVERSION}nb1:../../x11/qt3-tools
+DEPENDS+=	qt3-docs-${QTVERSION}nb1:../../x11/qt3-docs
 
 USE_BUILDLINK2=	yes
 USE_X11BASE=	yes
diff --git a/x11/rep-gtk/Makefile b/x11/rep-gtk/Makefile
index abd2940e4e6..7ecb5db6def 100644
--- a/x11/rep-gtk/Makefile
+++ b/x11/rep-gtk/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.16 2002/10/08 13:12:58 wiz Exp $
+# $NetBSD: Makefile,v 1.17 2003/05/02 11:57:32 wiz Exp $
 #
 
 DISTNAME=		rep-gtk-0.15
-PKGREVISION=		2
+PKGREVISION=	3
 CATEGORIES=		x11 lang
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=rep-gtk/}
 
diff --git a/x11/ruby-gtk/Makefile b/x11/ruby-gtk/Makefile
index 7ee53dab3d2..9a7db303430 100644
--- a/x11/ruby-gtk/Makefile
+++ b/x11/ruby-gtk/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.17 2003/03/29 12:43:09 jmmv Exp $
+# $NetBSD: Makefile,v 1.18 2003/05/02 11:57:32 wiz Exp $
 # FreeBSD: ports/x11-toolkits/ruby-gtk/Makefile,v 1.16 2000/10/15 15:45:59 knu Exp
 
 DISTNAME=	ruby-gtk-0.25
 PKGNAME=	${RUBY_PKGNAMEPREFIX}gtk-0.25
-PKGREVISION=	2
+PKGREVISION=	3
 WRKSRC=		${WRKDIR}/${DISTNAME:S/ruby-//}
 CATEGORIES=	x11
 MASTER_SITES=	http://www.ruby-lang.org/gtk/download/
@@ -19,7 +19,7 @@ USE_RUBY_EXTCONF= yes
 
 INSTALL_TARGET=	site-install
 
-DEPENDS+=	imlib>=1.9.11nb1:../../graphics/imlib
+DEPENDS+=	imlib>=1.9.14nb3:../../graphics/imlib
 
 DOCS_EN=	README README.EXT doc/rbbr.rb
 DOCS_JA=	README.ja README.EXT.ja
diff --git a/x11/wxGTK/Makefile b/x11/wxGTK/Makefile
index 15941d90309..da57b2b5aed 100644
--- a/x11/wxGTK/Makefile
+++ b/x11/wxGTK/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.19 2003/04/06 19:58:55 salo Exp $
+# $NetBSD: Makefile,v 1.20 2003/05/02 11:57:32 wiz Exp $
 #
 
 DISTNAME=		wxGTK-2.4.0
+PKGREVISION=		1
 CATEGORIES=		x11
 MASTER_SITES=		ftp://biolpc22.york.ac.uk/pub/2.4.0/
 
diff --git a/x11/wxGTK/buildlink2.mk b/x11/wxGTK/buildlink2.mk
index e5f307721e4..31318a76571 100644
--- a/x11/wxGTK/buildlink2.mk
+++ b/x11/wxGTK/buildlink2.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.4 2003/03/31 18:25:09 jmmv Exp $
+# $NetBSD: buildlink2.mk,v 1.5 2003/05/02 11:57:32 wiz Exp $
 #
 # This Makefile fragment is included by packages that use wxGTK.
 #
@@ -9,7 +9,7 @@
 WXGTK_BUILDLINK2_MK=	# defined
 
 BUILDLINK_PACKAGES+=		wxGTK
-BUILDLINK_DEPENDS.wxGTK?=	wxGTK>=2.4.0
+BUILDLINK_DEPENDS.wxGTK?=	wxGTK>=2.4.0nb1
 BUILDLINK_PKGSRCDIR.wxGTK?=	../../x11/wxGTK
 
 EVAL_PREFIX+=			BUILDLINK_PREFIX.wxGTK=wxGTK
diff --git a/x11/xbindkeys-config/Makefile b/x11/xbindkeys-config/Makefile
index c26dc45d84a..fdd86e60d31 100644
--- a/x11/xbindkeys-config/Makefile
+++ b/x11/xbindkeys-config/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.3 2003/01/03 15:27:01 jmmv Exp $
+# $NetBSD: Makefile,v 1.4 2003/05/02 11:57:32 wiz Exp $
 
 DISTNAME=	xbindkeys_config-0.1.2
+PKGREVISION=	1
 PKGNAME=	xbindkeys-config-0.1.2
 CATEGORIES=	x11
 MASTER_SITES=	http://www.netchampagne.com/xbindkeys_config/
diff --git a/x11/xdialog/Makefile b/x11/xdialog/Makefile
index bccfd94df39..0c0584056d6 100644
--- a/x11/xdialog/Makefile
+++ b/x11/xdialog/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.4 2001/02/17 17:07:04 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2003/05/02 11:57:33 wiz Exp $
 
 DISTNAME=		Xdialog-1.4.6
+PKGREVISION=		1
 PKGNAME=		xdialog-1.4.6
 CATEGORIES=		misc x11
 MASTER_SITES=		http://xdialog.free.fr/
@@ -10,7 +11,7 @@ MAINTAINER=		jlam@netbsd.org
 HOMEPAGE=		http://xdialog.free.fr/
 COMMENT=		X11 drop-in replacement for the curses dialog program
 
-DEPENDS+=		gtk+-1.2.*:../../x11/gtk
+DEPENDS+=		gtk+>=1.2.10nb4:../../x11/gtk
 
 USE_X11BASE=		# defined
 USE_GMAKE=		# defined
diff --git a/x11/xfce/Makefile b/x11/xfce/Makefile
index ba13ba6c711..de87ba08814 100644
--- a/x11/xfce/Makefile
+++ b/x11/xfce/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.31 2003/04/27 12:52:41 cjep Exp $
+# $NetBSD: Makefile,v 1.32 2003/05/02 11:57:33 wiz Exp $
 
 DISTNAME=		xfce-3.8.18
+PKGREVISION=	1
 CATEGORIES=		x11
 MASTER_SITES=		http://www.xfce.org/archive/
 
diff --git a/x11/xmms-osd/Makefile b/x11/xmms-osd/Makefile
index c1a4f1097f1..a7a6a5f273b 100644
--- a/x11/xmms-osd/Makefile
+++ b/x11/xmms-osd/Makefile
@@ -1,9 +1,10 @@
-# $NetBSD: Makefile,v 1.1.1.1 2003/04/12 12:15:35 jmmv Exp $
+# $NetBSD: Makefile,v 1.2 2003/05/02 11:57:33 wiz Exp $
 #
 
 .include "../xosd/Makefile.common"
 
 PKGNAME=		${DISTNAME:S/xosd/xmms-osd/}
+PKGREVISION=		1
 COMMENT=		XMMS plugin that shows current status on your desktop
 CONFLICTS=		xosd<=2.2.0
 
diff --git a/x11/xosd/Makefile b/x11/xosd/Makefile
index 7100e10bddb..30afae19d3d 100644
--- a/x11/xosd/Makefile
+++ b/x11/xosd/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.5 2003/04/22 19:06:11 jmmv Exp $
+# $NetBSD: Makefile,v 1.6 2003/05/02 11:57:34 wiz Exp $
 #
 
 .include "Makefile.common"
+PKGREVISION=		1
 
 COMMENT=		Library to display shaped text on your X display
 
diff --git a/x11/xosd/buildlink2.mk b/x11/xosd/buildlink2.mk
index d68729a0c6e..a4457519780 100644
--- a/x11/xosd/buildlink2.mk
+++ b/x11/xosd/buildlink2.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.5 2003/04/22 19:06:12 jmmv Exp $
+# $NetBSD: buildlink2.mk,v 1.6 2003/05/02 11:57:34 wiz Exp $
 #
 # This Makefile fragment is included by packages that use xosd.
 #
@@ -9,7 +9,7 @@
 XOSD_BUILDLINK2_MK=	# defined
 
 BUILDLINK_PACKAGES+=			xosd
-BUILDLINK_DEPENDS.xosd?=		xosd>=2.2.1
+BUILDLINK_DEPENDS.xosd?=		xosd>=2.2.1nb1
 BUILDLINK_PKGSRCDIR.xosd?=		../../x11/xosd
 
 EVAL_PREFIX+=	BUILDLINK_PREFIX.xosd=xosd
diff --git a/x11/xscreensaver-gnome/Makefile b/x11/xscreensaver-gnome/Makefile
index 02a4cbe3921..f70fe638ab9 100644
--- a/x11/xscreensaver-gnome/Makefile
+++ b/x11/xscreensaver-gnome/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.16 2003/02/15 10:48:27 wiz Exp $
+# $NetBSD: Makefile,v 1.17 2003/05/02 11:57:34 wiz Exp $
 #
 
 PKGNAME=	${DISTNAME:S/-/-gnome-/}
+PKGREVISION=	1
 COMMENT=	Screen saver and locker for the X window system (with GNOME support)
 
 CONFLICTS+=	xscreensaver-[0-9]*
diff --git a/x11/xscreensaver/Makefile b/x11/xscreensaver/Makefile
index 60c192601e6..c925df80b80 100644
--- a/x11/xscreensaver/Makefile
+++ b/x11/xscreensaver/Makefile
@@ -1,6 +1,8 @@
-# $NetBSD: Makefile,v 1.55 2003/02/15 10:48:26 wiz Exp $
+# $NetBSD: Makefile,v 1.56 2003/05/02 11:57:34 wiz Exp $
 #
 
+PKGREVISION=	1
+
 COMMENT=	Screen saver and locker for the X window system
 
 CONFLICTS+=	xscreensaver-gnome-[0-9]*
diff --git a/x11/xteddy2/Makefile b/x11/xteddy2/Makefile
index ab63bc0c53d..a35b158e4ab 100644
--- a/x11/xteddy2/Makefile
+++ b/x11/xteddy2/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.11 2002/08/25 21:52:58 jlam Exp $
+# $NetBSD: Makefile,v 1.12 2003/05/02 11:57:35 wiz Exp $
 
 DISTNAME=	xteddy-2.0.1
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	x11 games
 MASTER_SITES=	http://www.ITN.LiU.SE/~stegu/xteddy/
 
diff --git a/x11/xvattr/Makefile b/x11/xvattr/Makefile
index def8206de28..150738a8023 100644
--- a/x11/xvattr/Makefile
+++ b/x11/xvattr/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.5 2002/12/07 02:39:08 schmonz Exp $
+# $NetBSD: Makefile,v 1.6 2003/05/02 11:57:35 wiz Exp $
 
 DISTNAME=	xvattr-1.3
+PKGREVISION=	1
 CATEGORIES=	x11
 MASTER_SITES=	http://www.dtek.chalmers.se/groups/dvd/dist/