Bump PKGREVISION for atk library major bump.

57 files changed, 120 insertions, 106 deletions

diff --git a/x11/gnome-desktop/Makefile b/x11/gnome-desktop/Makefile
index 5bdf509e92d..ab9c3db48ce 100644
--- a/x11/gnome-desktop/Makefile
+++ b/x11/gnome-desktop/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.13 2003/11/12 01:31:52 salo Exp $
+# $NetBSD: Makefile,v 1.14 2003/12/13 00:45:26 wiz Exp $
 #
 
 DISTNAME=		gnome-desktop-2.2.0.1
-PKGREVISION=		3
+PKGREVISION=		4
 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 f6ab65ce227..697aea49602 100644
--- a/x11/gnome-desktop/buildlink2.mk
+++ b/x11/gnome-desktop/buildlink2.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.9 2003/11/12 01:31:52 salo Exp $
+# $NetBSD: buildlink2.mk,v 1.10 2003/12/13 00:45:26 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.1nb3
+BUILDLINK_DEPENDS.gnome-desktop?=	gnome-desktop>=2.2.0.1nb4
 BUILDLINK_PKGSRCDIR.gnome-desktop?=	../../x11/gnome-desktop
 
 EVAL_PREFIX+=	BUILDLINK_PREFIX.gnome-desktop=gnome-desktop
diff --git a/x11/gnome-panel/Makefile b/x11/gnome-panel/Makefile
index 57af7e9f498..eebec98cb17 100644
--- a/x11/gnome-panel/Makefile
+++ b/x11/gnome-panel/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.15 2003/11/12 01:31:52 salo Exp $
+# $NetBSD: Makefile,v 1.16 2003/12/13 00:45:26 wiz Exp $
 #
 
 DISTNAME=		gnome-panel-2.2.2.2
-PKGREVISION=		3
+PKGREVISION=		4
 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 2a074d9f1d5..88c4e375990 100644
--- a/x11/gnome-panel/buildlink2.mk
+++ b/x11/gnome-panel/buildlink2.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.6 2003/11/12 01:31:52 salo Exp $
+# $NetBSD: buildlink2.mk,v 1.7 2003/12/13 00:45:26 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.2.2nb3
+BUILDLINK_DEPENDS.gnome-panel?=		gnome-panel>=2.2.2.2nb4
 BUILDLINK_PKGSRCDIR.gnome-panel?=		../../x11/gnome-panel
 
 EVAL_PREFIX+=	BUILDLINK_PREFIX.gnome-panel=gnome-panel
diff --git a/x11/gnome-session/Makefile b/x11/gnome-session/Makefile
index 673bbb4a9b3..aa64f3d2700 100644
--- a/x11/gnome-session/Makefile
+++ b/x11/gnome-session/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.17 2003/11/12 01:31:52 salo Exp $
+# $NetBSD: Makefile,v 1.18 2003/12/13 00:45:26 wiz Exp $
 #
 
 DISTNAME=		gnome-session-2.2.1
-PKGREVISION=		4
+PKGREVISION=		5
 CATEGORIES=		x11 gnome
 MASTER_SITES=		${MASTER_SITE_GNOME:=sources/gnome-session/2.2/}
 EXTRACT_SUFX=		.tar.bz2
diff --git a/x11/gnome-themes/Makefile b/x11/gnome-themes/Makefile
index c0b64e03324..773884865df 100644
--- a/x11/gnome-themes/Makefile
+++ b/x11/gnome-themes/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.2 2003/11/12 01:31:52 salo Exp $
+# $NetBSD: Makefile,v 1.3 2003/12/13 00:45:26 wiz Exp $
 #
 
 DISTNAME=		gnome-themes-2.2
-PKGREVISION=		1
+PKGREVISION=		2
 CATEGORIES=		x11
 MASTER_SITES=		${MASTER_SITE_GNOME:=sources/gnome-themes/2.2/}
 EXTRACT_SUFX=		.tar.bz2
diff --git a/x11/gnome2-applets/Makefile b/x11/gnome2-applets/Makefile
index 03c8559e9df..913f7a84351 100644
--- a/x11/gnome2-applets/Makefile
+++ b/x11/gnome2-applets/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.7 2003/11/12 01:31:53 salo Exp $
+# $NetBSD: Makefile,v 1.8 2003/12/13 00:45:26 wiz Exp $
 #
 
 DISTNAME=		gnome-applets-2.2.1
-PKGREVISION=		4
+PKGREVISION=		5
 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 059c24a3369..1cce3461320 100644
--- a/x11/gnome2-control-center/Makefile
+++ b/x11/gnome2-control-center/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.15 2003/11/12 01:31:53 salo Exp $
+# $NetBSD: Makefile,v 1.16 2003/12/13 00:45:26 wiz Exp $
 #
 
 DISTNAME=	control-center-2.2.1
 PKGNAME=	gnome2-${DISTNAME}
-PKGREVISION=	5
+PKGREVISION=	6
 CATEGORIES=	x11 gnome
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/control-center/2.2/}
 EXTRACT_SUFX=	.tar.bz2
diff --git a/x11/gnome2-control-center/buildlink2.mk b/x11/gnome2-control-center/buildlink2.mk
index f1d23203852..0d0d08878dc 100644
--- a/x11/gnome2-control-center/buildlink2.mk
+++ b/x11/gnome2-control-center/buildlink2.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.8 2003/11/12 01:31:53 salo Exp $
+# $NetBSD: buildlink2.mk,v 1.9 2003/12/13 00:45:26 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.1nb5
+BUILDLINK_DEPENDS.gnome2-control-center?=	gnome2-control-center>=2.2.1nb6
 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 da8dbbeabea..f70716338a9 100644
--- a/x11/gnome2-terminal/Makefile
+++ b/x11/gnome2-terminal/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.13 2003/11/12 01:31:53 salo Exp $
+# $NetBSD: Makefile,v 1.14 2003/12/13 00:45:26 wiz Exp $
 #
 
 DISTNAME=		gnome-terminal-2.0.2
 PKGNAME=		${DISTNAME:S/-/2-/}
-PKGREVISION=		2
+PKGREVISION=		3
 CATEGORIES=		x11 gnome
 MASTER_SITES=		${MASTER_SITE_GNOME:=sources/gnome-terminal/2.0/}
 EXTRACT_SUFX=		.tar.bz2
diff --git a/x11/gtk-thinice-engine/Makefile b/x11/gtk-thinice-engine/Makefile
index 70ebbc05513..502746d3076 100644
--- a/x11/gtk-thinice-engine/Makefile
+++ b/x11/gtk-thinice-engine/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.1.1.1 2003/09/12 17:20:02 xtraeme Exp $
+# $NetBSD: Makefile,v 1.2 2003/12/13 00:45:26 wiz Exp $
 #
 
 DISTNAME=	gtk-thinice-engine-2.0.2
+PKGREVISION=	1
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/gtk-thinice-engine/2.0/}
 EXTRACT_SUFX=	.tar.bz2
diff --git a/x11/gtk-thinice-engine/buildlink2.mk b/x11/gtk-thinice-engine/buildlink2.mk
index 6e55b08fde2..6850937bc25 100644
--- a/x11/gtk-thinice-engine/buildlink2.mk
+++ b/x11/gtk-thinice-engine/buildlink2.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.2 2003/09/13 03:37:33 xtraeme Exp $
+# $NetBSD: buildlink2.mk,v 1.3 2003/12/13 00:45:26 wiz Exp $
 #
 # This Makefile fragment is included by packages that use gtk-thinice-engine.
 #
@@ -9,7 +9,7 @@
 GTK_THINICE_ENGINE_BUILDLINK2_MK=	# defined
 
 BUILDLINK_PACKAGES+=			gtk-thinice-engine
-BUILDLINK_DEPENDS.gtk-thinice-engine?=		gtk-thinice-engine>=2.0.2
+BUILDLINK_DEPENDS.gtk-thinice-engine?=		gtk-thinice-engine>=2.0.2nb1
 BUILDLINK_PKGSRCDIR.gtk-thinice-engine?=		../../x11/gtk-thinice-engine
 
 EVAL_PREFIX+=	BUILDLINK_PREFIX.gtk-thinice-engine=gtk-thinice-engine
diff --git a/x11/gtk2-engines/Makefile b/x11/gtk2-engines/Makefile
index 48ec7954644..5d8eb901e2c 100644
--- a/x11/gtk2-engines/Makefile
+++ b/x11/gtk2-engines/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.13 2003/07/23 14:00:06 jmmv Exp $
+# $NetBSD: Makefile,v 1.14 2003/12/13 00:45:26 wiz Exp $
 #
 
 DISTNAME=		gtk-engines-2.2.0
 PKGNAME=		${DISTNAME:S/gtk/gtk2/}
-PKGREVISION=		2
+PKGREVISION=		3
 CATEGORIES=		x11
 MASTER_SITES=		${MASTER_SITE_GNOME:=sources/gtk-engines/2.2/}
 EXTRACT_SUFX=		.tar.bz2
diff --git a/x11/gtk2-engines/buildlink2.mk b/x11/gtk2-engines/buildlink2.mk
index 60b28385a45..b9a0f8f76ec 100644
--- a/x11/gtk2-engines/buildlink2.mk
+++ b/x11/gtk2-engines/buildlink2.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.1 2003/07/23 15:40:52 jmmv Exp $
+# $NetBSD: buildlink2.mk,v 1.2 2003/12/13 00:45:26 wiz Exp $
 #
 # This Makefile fragment is included by packages that use gtk2-engines.
 #
@@ -9,7 +9,7 @@
 GTK2_ENGINES_BUILDLINK2_MK=	# defined
 
 BUILDLINK_PACKAGES+=			gtk2-engines
-BUILDLINK_DEPENDS.gtk2-engines?=	gtk2-engines>=2.2.0nb2
+BUILDLINK_DEPENDS.gtk2-engines?=	gtk2-engines>=2.2.0nb3
 BUILDLINK_PKGSRCDIR.gtk2-engines?=	../../x11/gtk2-engines
 
 EVAL_PREFIX+=	BUILDLINK_PREFIX.gtk2-engines=gtk2-engines
diff --git a/x11/gtk2-theme-switch/Makefile b/x11/gtk2-theme-switch/Makefile
index 8b5225bff03..677aad2a4c6 100644
--- a/x11/gtk2-theme-switch/Makefile
+++ b/x11/gtk2-theme-switch/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.1.1.1 2003/12/05 18:08:06 xtraeme Exp $
+# $NetBSD: Makefile,v 1.2 2003/12/13 00:45:26 wiz Exp $
 #
 
 DISTNAME=		gtk-theme-switch-2.0.0rc2
 PKGNAME=		${DISTNAME:S/gtk/gtk2/}
+PKGREVISION=		1
 CATEGORIES=		x11
 MASTER_SITES=		http://www.muhri.net/
 
diff --git a/x11/gtk2/Makefile b/x11/gtk2/Makefile
index f785cef186c..931e2818a4d 100644
--- a/x11/gtk2/Makefile
+++ b/x11/gtk2/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.35 2003/11/02 07:03:08 xtraeme Exp $
+# $NetBSD: Makefile,v 1.36 2003/12/13 00:45:26 wiz Exp $
 #
 
 DISTNAME=		gtk+-2.2.4
 PKGNAME=		${DISTNAME:S/gtk/gtk2/}
+PKGREVISION=		1
 CATEGORIES=		x11
 MASTER_SITES=		ftp://ftp.gtk.org/pub/gtk/v2.2/ \
 			ftp://ftp.cs.umn.edu/pub/gimp/gtk/v2.2/ \
diff --git a/x11/gtk2/buildlink2.mk b/x11/gtk2/buildlink2.mk
index 8a3d009961b..ff61ab110b8 100644
--- a/x11/gtk2/buildlink2.mk
+++ b/x11/gtk2/buildlink2.mk
@@ -1,10 +1,10 @@
-# $NetBSD: buildlink2.mk,v 1.8 2003/07/13 13:54:03 wiz Exp $
+# $NetBSD: buildlink2.mk,v 1.9 2003/12/13 00:45:26 wiz Exp $
 
 .if !defined(GTK2_BUILDLINK2_MK)
 GTK2_BUILDLINK2_MK=	# defined
 
 BUILDLINK_PACKAGES+=		gtk2
-BUILDLINK_DEPENDS.gtk2?=	gtk2+>=2.2.2nb2
+BUILDLINK_DEPENDS.gtk2?=	gtk2+>=2.2.4nb1
 BUILDLINK_PKGSRCDIR.gtk2?=	../../x11/gtk2
 
 EVAL_PREFIX+=		BUILDLINK_PREFIX.gtk2=gtk2
diff --git a/x11/gtkglarea2/Makefile b/x11/gtkglarea2/Makefile
index f4d00394bc5..3c555b0cc1d 100644
--- a/x11/gtkglarea2/Makefile
+++ b/x11/gtkglarea2/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.3 2003/09/14 18:13:48 recht Exp $
+# $NetBSD: Makefile,v 1.4 2003/12/13 00:45:26 wiz Exp $
 #
 
 DISTNAME=	gtkglarea-1.99.0
 PKGNAME=	${DISTNAME:S/-/2-/}
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/gtkglarea/1.99/}
 EXTRACT_SUFX=	.tar.bz2
diff --git a/x11/gtkglarea2/buildlink2.mk b/x11/gtkglarea2/buildlink2.mk
index 2cc3099f154..ecfa3860083 100644
--- a/x11/gtkglarea2/buildlink2.mk
+++ b/x11/gtkglarea2/buildlink2.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.3 2003/07/13 13:54:04 wiz Exp $
+# $NetBSD: buildlink2.mk,v 1.4 2003/12/13 00:45:26 wiz Exp $
 #
 # This Makefile fragment is included by packages that use gtkglarea2.
 #
@@ -9,7 +9,7 @@
 GTKGLAREA2_BUILDLINK2_MK=	# defined
 
 BUILDLINK_PACKAGES+=			gtkglarea2
-BUILDLINK_DEPENDS.gtkglarea2?=		gtkglarea2>=1.99.0nb1
+BUILDLINK_DEPENDS.gtkglarea2?=		gtkglarea2>=1.99.0nb2
 BUILDLINK_PKGSRCDIR.gtkglarea2?=		../../x11/gtkglarea2
 
 EVAL_PREFIX+=	BUILDLINK_PREFIX.gtkglarea2=gtkglarea2
diff --git a/x11/gtkmm/Makefile b/x11/gtkmm/Makefile
index ffcc50ed2e4..7a35ce8e85d 100644
--- a/x11/gtkmm/Makefile
+++ b/x11/gtkmm/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.12 2003/11/01 18:24:39 wiz Exp $
+# $NetBSD: Makefile,v 1.13 2003/12/13 00:45:26 wiz Exp $
 #
 
 DISTNAME=	gtkmm-2.2.8
+PKGREVISION=	1
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=gtkmm/}
 
diff --git a/x11/gtkmm/buildlink2.mk b/x11/gtkmm/buildlink2.mk
index 306e08a5e66..2b97fb40a57 100644
--- a/x11/gtkmm/buildlink2.mk
+++ b/x11/gtkmm/buildlink2.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.3 2003/07/13 13:54:04 wiz Exp $
+# $NetBSD: buildlink2.mk,v 1.4 2003/12/13 00:45:26 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.1nb2
+BUILDLINK_DEPENDS.gtkmm?=		gtkmm>=2.2.8nb1
 BUILDLINK_PKGSRCDIR.gtkmm?=		../../x11/gtkmm
 
 EVAL_PREFIX+=	BUILDLINK_PREFIX.gtkmm=gtkmm
diff --git a/x11/gtksourceview/Makefile b/x11/gtksourceview/Makefile
index d264f117c4b..a82af860d34 100644
--- a/x11/gtksourceview/Makefile
+++ b/x11/gtksourceview/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.4 2003/12/04 19:48:26 xtraeme Exp $
+# $NetBSD: Makefile,v 1.5 2003/12/13 00:45:26 wiz Exp $
 #
 
 DISTNAME=	gtksourceview-0.7.0
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/gtksourceview/0.7/}
 
diff --git a/x11/gtksourceview/buildlink2.mk b/x11/gtksourceview/buildlink2.mk
index ae9a0e3180f..8e0d6cc9ac9 100644
--- a/x11/gtksourceview/buildlink2.mk
+++ b/x11/gtksourceview/buildlink2.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.3 2003/11/12 01:31:53 salo Exp $
+# $NetBSD: buildlink2.mk,v 1.4 2003/12/13 00:45:26 wiz Exp $
 #
 # This Makefile fragment is included by packages that use gtksourceview.
 #
@@ -9,7 +9,7 @@
 GTKSOURCEVIEW_BUILDLINK2_MK=	# defined
 
 BUILDLINK_PACKAGES+=			gtksourceview
-BUILDLINK_DEPENDS.gtksourceview?=		gtksourceview>=0.7.0nb1
+BUILDLINK_DEPENDS.gtksourceview?=		gtksourceview>=0.7.0nb3
 BUILDLINK_PKGSRCDIR.gtksourceview?=		../../x11/gtksourceview
 
 EVAL_PREFIX+=	BUILDLINK_PREFIX.gtksourceview=gtksourceview
diff --git a/x11/libxfce4gui/Makefile b/x11/libxfce4gui/Makefile
index fb64851d55d..ecad67bad25 100644
--- a/x11/libxfce4gui/Makefile
+++ b/x11/libxfce4gui/Makefile
@@ -1,9 +1,10 @@
-# $NetBSD: Makefile,v 1.1.1.1 2003/09/26 10:40:05 martti Exp $
+# $NetBSD: Makefile,v 1.2 2003/12/13 00:45:26 wiz Exp $
 
 .include "../../meta-pkgs/xfce4/Makefile.common"
 
-PKGNAME=	libxfce4gui-${XFCE4_VERSION}
 DISTNAME=	libxfcegui4-${XFCE4_VERSION}
+PKGNAME=	libxfce4gui-${XFCE4_VERSION}
+PKGREVISION=	1
 CATEGORIES=	x11
 COMMENT=	XFce4 widget library
 
diff --git a/x11/libxfce4gui/buildlink2.mk b/x11/libxfce4gui/buildlink2.mk
index 8a62277b256..098bd1f003c 100644
--- a/x11/libxfce4gui/buildlink2.mk
+++ b/x11/libxfce4gui/buildlink2.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.3 2003/12/03 05:34:08 martti Exp $
+# $NetBSD: buildlink2.mk,v 1.4 2003/12/13 00:45:26 wiz Exp $
 #
 # This Makefile fragment is included by packages that use libxfce4gui.
 #
@@ -9,7 +9,7 @@
 LIBXFCE4GUI_BUILDLINK2_MK=	# defined
 
 BUILDLINK_PACKAGES+=			libxfce4gui
-BUILDLINK_DEPENDS.libxfce4gui?=		libxfce4gui>=4.0.1
+BUILDLINK_DEPENDS.libxfce4gui?=		libxfce4gui>=4.0.1nb1
 BUILDLINK_PKGSRCDIR.libxfce4gui?=		../../x11/libxfce4gui
 
 EVAL_PREFIX+=	BUILDLINK_PREFIX.libxfce4gui=libxfce4gui
diff --git a/x11/libzvt/Makefile b/x11/libzvt/Makefile
index 19070277643..a576f171b08 100644
--- a/x11/libzvt/Makefile
+++ b/x11/libzvt/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.5 2003/07/13 13:54:26 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2003/12/13 00:45:26 wiz Exp $
 #
 
 DISTNAME=		libzvt-2.0.1
-PKGREVISION=		3
+PKGREVISION=		4
 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 42b13fd62c4..7534457485c 100644
--- a/x11/libzvt/buildlink2.mk
+++ b/x11/libzvt/buildlink2.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.4 2003/07/13 13:54:26 wiz Exp $
+# $NetBSD: buildlink2.mk,v 1.5 2003/12/13 00:45:26 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.1nb3
+BUILDLINK_DEPENDS.libzvt?=		libzvt>=2.0.1nb4
 BUILDLINK_PKGSRCDIR.libzvt?=		../../x11/libzvt
 
 EVAL_PREFIX+=	BUILDLINK_PREFIX.libzvt=libzvt
diff --git a/x11/py-gnome2/Makefile b/x11/py-gnome2/Makefile
index 85c77dd348c..9ce9c4b1507 100644
--- a/x11/py-gnome2/Makefile
+++ b/x11/py-gnome2/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.3 2003/11/12 01:31:53 salo Exp $
+# $NetBSD: Makefile,v 1.4 2003/12/13 00:45:26 wiz Exp $
 #
 
 DISTNAME=	gnome-python-2.0.0
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME:S/gnome-python/gnome2/}
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/gnome-python/2.0/}
 EXTRACT_SUFX=	.tar.bz2
diff --git a/x11/py-gnome2/buildlink2.mk b/x11/py-gnome2/buildlink2.mk
index 0484ede1f77..3566a0c2768 100644
--- a/x11/py-gnome2/buildlink2.mk
+++ b/x11/py-gnome2/buildlink2.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.2 2003/11/12 01:31:53 salo Exp $
+# $NetBSD: buildlink2.mk,v 1.3 2003/12/13 00:45:26 wiz Exp $
 
 .if !defined(PYGNOME2_BUILDLINK2_MK)
 PYGNOME2_BUILDLINK2_MK=	# defined
@@ -7,7 +7,7 @@ PYTHON_VERSIONS_ACCEPTED=	23pth 22pth
 .include "../../lang/python/pyversion.mk"
 
 BUILDLINK_PACKAGES+=			pygnome2
-BUILDLINK_DEPENDS.pygnome2?=		${PYPKGPREFIX}-gnome2>=2.0.0nb1
+BUILDLINK_DEPENDS.pygnome2?=		${PYPKGPREFIX}-gnome2>=2.0.0nb2
 BUILDLINK_PKGSRCDIR.pygnome2?=		../../x11/py-gnome2
 
 EVAL_PREFIX+=	BUILDLINK_PREFIX.pygnome2=${PYPKGPREFIX}-gnome2
diff --git a/x11/py-gtk2/Makefile b/x11/py-gtk2/Makefile
index daba0da7848..c80529825f0 100644
--- a/x11/py-gtk2/Makefile
+++ b/x11/py-gtk2/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.8 2003/09/09 13:55:35 drochner Exp $
+# $NetBSD: Makefile,v 1.9 2003/12/13 00:45:26 wiz Exp $
 #
 
 DISTNAME=	pygtk-2.0.0
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME:S/pygtk/gtk2/}
+PKGREVISION=	1
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/pygtk/2.0/}
 EXTRACT_SUFX=	.tar.bz2
diff --git a/x11/py-gtk2/buildlink2.mk b/x11/py-gtk2/buildlink2.mk
index 2326a3acc7b..1773908cdf5 100644
--- a/x11/py-gtk2/buildlink2.mk
+++ b/x11/py-gtk2/buildlink2.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.5 2003/08/17 18:10:36 recht Exp $
+# $NetBSD: buildlink2.mk,v 1.6 2003/12/13 00:45:26 wiz Exp $
 
 .if !defined(PYGTK2_BUILDLINK2_MK)
 PYGTK2_BUILDLINK2_MK=	# defined
@@ -7,7 +7,7 @@ PYTHON_VERSIONS_ACCEPTED=	23pth 22pth
 .include "../../lang/python/pyversion.mk"
 
 BUILDLINK_PACKAGES+=			pygtk2
-BUILDLINK_DEPENDS.pygtk2?=		${PYPKGPREFIX}-gtk2>=1.99.16nb1
+BUILDLINK_DEPENDS.pygtk2?=		${PYPKGPREFIX}-gtk2>=2.0.0nb1
 BUILDLINK_PKGSRCDIR.pygtk2?=		../../x11/py-gtk2
 
 EVAL_PREFIX+=	BUILDLINK_PREFIX.pygtk2=${PYPKGPREFIX}-gtk2
diff --git a/x11/xfce4-clipman-plugin/Makefile b/x11/xfce4-clipman-plugin/Makefile
index ef0c4177697..966963479a7 100644
--- a/x11/xfce4-clipman-plugin/Makefile
+++ b/x11/xfce4-clipman-plugin/Makefile
@@ -1,10 +1,11 @@
-# $NetBSD: Makefile,v 1.1.1.1 2003/12/03 05:18:46 martti Exp $
+# $NetBSD: Makefile,v 1.2 2003/12/13 00:45:27 wiz Exp $
 
 .include "../../meta-pkgs/xfce4/Makefile.common"
 
 XFCE4_VERSION=	0.3.1
 
 DISTNAME=	xfce4-clipman-plugin-${XFCE4_VERSION}
+PKGREVISION=	1
 CATEGORIES=	sysutils
 MASTER_SITES=	http://download.berlios.de/xfce-goodies/
 COMMENT=	XFce4 clipboard plugin
diff --git a/x11/xfce4-clipman-plugin/buildlink2.mk b/x11/xfce4-clipman-plugin/buildlink2.mk
index a5597443078..7974681ad2e 100644
--- a/x11/xfce4-clipman-plugin/buildlink2.mk
+++ b/x11/xfce4-clipman-plugin/buildlink2.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.1.1.1 2003/12/03 05:18:46 martti Exp $
+# $NetBSD: buildlink2.mk,v 1.2 2003/12/13 00:45:27 wiz Exp $
 #
 # This Makefile fragment is included by packages that use xfce4-clipman-plugin.
 #
@@ -9,7 +9,7 @@
 XFCE4_CLIPMAN_PLUGIN_BUILDLINK2_MK=	# defined
 
 BUILDLINK_PACKAGES+=			xfce4-clipman-plugin
-BUILDLINK_DEPENDS.xfce4-clipman-plugin?=		xfce4-clipman-plugin>=0.3.1
+BUILDLINK_DEPENDS.xfce4-clipman-plugin?=		xfce4-clipman-plugin>=0.3.1nb1
 BUILDLINK_PKGSRCDIR.xfce4-clipman-plugin?=		../../x11/xfce4-clipman-plugin
 
 EVAL_PREFIX+=	BUILDLINK_PREFIX.xfce4-clipman-plugin=xfce4-clipman-plugin
diff --git a/x11/xfce4-desktop/Makefile b/x11/xfce4-desktop/Makefile
index 6a7090aa40c..5d264f5c733 100644
--- a/x11/xfce4-desktop/Makefile
+++ b/x11/xfce4-desktop/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.2 2003/12/04 19:48:26 xtraeme Exp $
+# $NetBSD: Makefile,v 1.3 2003/12/13 00:45:27 wiz Exp $
 
 .include "../../meta-pkgs/xfce4/Makefile.common"
 
-PKGNAME=	xfce4-desktop-${XFCE4_VERSION}
 DISTNAME=	xfdesktop-${XFCE4_VERSION}
-PKGREVISION=	1
+PKGNAME=	xfce4-desktop-${XFCE4_VERSION}
+PKGREVISION=	2
 CATEGORIES=	x11
 COMMENT=	XFce4 desktop background manager
 
diff --git a/x11/xfce4-desktop/buildlink2.mk b/x11/xfce4-desktop/buildlink2.mk
index 53ecf306e1e..c21a8deff02 100644
--- a/x11/xfce4-desktop/buildlink2.mk
+++ b/x11/xfce4-desktop/buildlink2.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.3 2003/12/03 05:34:09 martti Exp $
+# $NetBSD: buildlink2.mk,v 1.4 2003/12/13 00:45:27 wiz Exp $
 #
 # This Makefile fragment is included by packages that use xfce4-desktop.
 #
@@ -9,7 +9,7 @@
 XFCE4_DESKTOP_BUILDLINK2_MK=	# defined
 
 BUILDLINK_PACKAGES+=			xfce4-desktop
-BUILDLINK_DEPENDS.xfce4-desktop?=		xfce4-desktop>=4.0.1
+BUILDLINK_DEPENDS.xfce4-desktop?=		xfce4-desktop>=4.0.1nb2
 BUILDLINK_PKGSRCDIR.xfce4-desktop?=		../../x11/xfce4-desktop
 
 EVAL_PREFIX+=	BUILDLINK_PREFIX.xfce4-desktop=xfce4-desktop
diff --git a/x11/xfce4-gtk2-engines/Makefile b/x11/xfce4-gtk2-engines/Makefile
index 42793dfa4ce..dfc21ba379d 100644
--- a/x11/xfce4-gtk2-engines/Makefile
+++ b/x11/xfce4-gtk2-engines/Makefile
@@ -1,12 +1,13 @@
-# $NetBSD: Makefile,v 1.2 2003/12/03 05:24:38 martti Exp $
+# $NetBSD: Makefile,v 1.3 2003/12/13 00:45:27 wiz Exp $
 #
 
 .include "../../meta-pkgs/xfce4/Makefile.common"
 
 XFCE4_VERSION=	2.1.7
 
-PKGNAME=	xfce4-gtk2-engine-${XFCE4_VERSION}
 DISTNAME=	gtk-xfce-engine-${XFCE4_VERSION}
+PKGNAME=	xfce4-gtk2-engine-${XFCE4_VERSION}
+PKGREVISION=	1
 CATEGORIES=	x11
 COMMENT=	XFce4 GTK2 themes
 
diff --git a/x11/xfce4-gtk2-engines/buildlink2.mk b/x11/xfce4-gtk2-engines/buildlink2.mk
index 9f6948bc5c0..e7cc8e75d4c 100644
--- a/x11/xfce4-gtk2-engines/buildlink2.mk
+++ b/x11/xfce4-gtk2-engines/buildlink2.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.3 2003/12/03 05:24:38 martti Exp $
+# $NetBSD: buildlink2.mk,v 1.4 2003/12/13 00:45:27 wiz Exp $
 #
 # This Makefile fragment is included by packages that use xfce4-gtk2-engine.
 #
@@ -9,7 +9,7 @@
 XFCE4_GTK2_ENGINE_BUILDLINK2_MK=	# defined
 
 BUILDLINK_PACKAGES+=			xfce4-gtk2-engine
-BUILDLINK_DEPENDS.xfce4-gtk2-engine?=		xfce4-gtk2-engine>=2.1.7
+BUILDLINK_DEPENDS.xfce4-gtk2-engine?=		xfce4-gtk2-engine>=2.1.7nb1
 BUILDLINK_PKGSRCDIR.xfce4-gtk2-engine?=		../../x11/xfce4-gtk2-engines
 
 EVAL_PREFIX+=	BUILDLINK_PREFIX.xfce4-gtk2-engine=xfce4-gtk2-engine
diff --git a/x11/xfce4-mcs-manager/Makefile b/x11/xfce4-mcs-manager/Makefile
index b7fa1fec929..e900b77dc81 100644
--- a/x11/xfce4-mcs-manager/Makefile
+++ b/x11/xfce4-mcs-manager/Makefile
@@ -1,9 +1,10 @@
-# $NetBSD: Makefile,v 1.1.1.1 2003/09/26 10:42:58 martti Exp $
+# $NetBSD: Makefile,v 1.2 2003/12/13 00:45:27 wiz Exp $
 
 .include "../../meta-pkgs/xfce4/Makefile.common"
 
-PKGNAME=	xfce4-mcs-manager-${XFCE4_VERSION}
 DISTNAME=	xfce-mcs-manager-${XFCE4_VERSION}
+PKGNAME=	xfce4-mcs-manager-${XFCE4_VERSION}
+PKGREVISION=	1
 CATEGORIES=	x11
 COMMENT=	XFce4 settings manager
 
diff --git a/x11/xfce4-mcs-manager/buildlink2.mk b/x11/xfce4-mcs-manager/buildlink2.mk
index 685824526dd..a37dd06a9e6 100644
--- a/x11/xfce4-mcs-manager/buildlink2.mk
+++ b/x11/xfce4-mcs-manager/buildlink2.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.3 2003/12/03 05:34:09 martti Exp $
+# $NetBSD: buildlink2.mk,v 1.4 2003/12/13 00:45:27 wiz Exp $
 #
 # This Makefile fragment is included by packages that use xfce4-mcs-manager.
 #
@@ -9,7 +9,7 @@
 XFCE4_MCS_MANAGER_BUILDLINK2_MK=	# defined
 
 BUILDLINK_PACKAGES+=			xfce4-mcs-manager
-BUILDLINK_DEPENDS.xfce4-mcs-manager?=		xfce4-mcs-manager>=4.0.1
+BUILDLINK_DEPENDS.xfce4-mcs-manager?=		xfce4-mcs-manager>=4.0.1nb1
 BUILDLINK_PKGSRCDIR.xfce4-mcs-manager?=		../../x11/xfce4-mcs-manager
 
 EVAL_PREFIX+=	BUILDLINK_PREFIX.xfce4-mcs-manager=xfce4-mcs-manager
diff --git a/x11/xfce4-mcs-plugins/Makefile b/x11/xfce4-mcs-plugins/Makefile
index a0cd3178d09..8fdd242d2cf 100644
--- a/x11/xfce4-mcs-plugins/Makefile
+++ b/x11/xfce4-mcs-plugins/Makefile
@@ -1,9 +1,10 @@
-# $NetBSD: Makefile,v 1.1.1.1 2003/09/26 10:44:37 martti Exp $
+# $NetBSD: Makefile,v 1.2 2003/12/13 00:45:27 wiz Exp $
 
 .include "../../meta-pkgs/xfce4/Makefile.common"
 
-PKGNAME=	xfce4-mcs-plugins-${XFCE4_VERSION}
 DISTNAME=	xfce-mcs-plugins-${XFCE4_VERSION}
+PKGNAME=	xfce4-mcs-plugins-${XFCE4_VERSION}
+PKGREVISION=	1
 CATEGORIES=	x11
 COMMENT=	XFce4 settings manager plugins
 
diff --git a/x11/xfce4-mcs-plugins/buildlink2.mk b/x11/xfce4-mcs-plugins/buildlink2.mk
index c7190e279c9..14b2f1d5c8c 100644
--- a/x11/xfce4-mcs-plugins/buildlink2.mk
+++ b/x11/xfce4-mcs-plugins/buildlink2.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.3 2003/12/03 05:34:09 martti Exp $
+# $NetBSD: buildlink2.mk,v 1.4 2003/12/13 00:45:27 wiz Exp $
 #
 # This Makefile fragment is included by packages that use xfce4-mcs-plugins.
 #
@@ -9,7 +9,7 @@
 XFCE4_MCS_PLUGINS_BUILDLINK2_MK=	# defined
 
 BUILDLINK_PACKAGES+=			xfce4-mcs-plugins
-BUILDLINK_DEPENDS.xfce4-mcs-plugins?=		xfce4-mcs-plugins>=4.0.1
+BUILDLINK_DEPENDS.xfce4-mcs-plugins?=		xfce4-mcs-plugins>=4.0.1nb1
 BUILDLINK_PKGSRCDIR.xfce4-mcs-plugins?=		../../x11/xfce4-mcs-plugins
 
 EVAL_PREFIX+=	BUILDLINK_PREFIX.xfce4-mcs-plugins=xfce4-mcs-plugins
diff --git a/x11/xfce4-notes-plugin/Makefile b/x11/xfce4-notes-plugin/Makefile
index bb7773228ef..e6d65396a1d 100644
--- a/x11/xfce4-notes-plugin/Makefile
+++ b/x11/xfce4-notes-plugin/Makefile
@@ -1,10 +1,11 @@
-# $NetBSD: Makefile,v 1.1.1.1 2003/12/03 05:20:48 martti Exp $
+# $NetBSD: Makefile,v 1.2 2003/12/13 00:45:27 wiz Exp $
 
 .include "../../meta-pkgs/xfce4/Makefile.common"
 
 XFCE4_VERSION=	0.9.7
 
 DISTNAME=	xfce4-notes-plugin-${XFCE4_VERSION}
+PKGREVISION=	1
 CATEGORIES=	sysutils
 MASTER_SITES=	http://download.berlios.de/xfce-goodies/
 COMMENT=	XFce4 notes plugin
diff --git a/x11/xfce4-notes-plugin/buildlink2.mk b/x11/xfce4-notes-plugin/buildlink2.mk
index 71302a993a8..148860dd402 100644
--- a/x11/xfce4-notes-plugin/buildlink2.mk
+++ b/x11/xfce4-notes-plugin/buildlink2.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.1.1.1 2003/12/03 05:20:48 martti Exp $
+# $NetBSD: buildlink2.mk,v 1.2 2003/12/13 00:45:27 wiz Exp $
 #
 # This Makefile fragment is included by packages that use xfce4-notes-plugin.
 #
@@ -9,7 +9,7 @@
 XFCE4_NOTES_PLUGIN_BUILDLINK2_MK=	# defined
 
 BUILDLINK_PACKAGES+=			xfce4-notes-plugin
-BUILDLINK_DEPENDS.xfce4-notes-plugin?=		xfce4-notes-plugin>=0.9.7
+BUILDLINK_DEPENDS.xfce4-notes-plugin?=		xfce4-notes-plugin>=0.9.7nb1
 BUILDLINK_PKGSRCDIR.xfce4-notes-plugin?=		../../x11/xfce4-notes-plugin
 
 EVAL_PREFIX+=	BUILDLINK_PREFIX.xfce4-notes-plugin=xfce4-notes-plugin
diff --git a/x11/xfce4-panel/Makefile b/x11/xfce4-panel/Makefile
index f9015f1be19..27a996747e8 100644
--- a/x11/xfce4-panel/Makefile
+++ b/x11/xfce4-panel/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.2 2003/12/04 19:48:26 xtraeme Exp $
+# $NetBSD: Makefile,v 1.3 2003/12/13 00:45:27 wiz Exp $
 
 .include "../../meta-pkgs/xfce4/Makefile.common"
 
 DISTNAME=	xfce4-panel-${XFCE4_VERSION}
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	x11
 COMMENT=	XFce4 panel
 
diff --git a/x11/xfce4-panel/buildlink2.mk b/x11/xfce4-panel/buildlink2.mk
index 87042946a2e..56a0251b43c 100644
--- a/x11/xfce4-panel/buildlink2.mk
+++ b/x11/xfce4-panel/buildlink2.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.3 2003/12/03 05:34:09 martti Exp $
+# $NetBSD: buildlink2.mk,v 1.4 2003/12/13 00:45:27 wiz Exp $
 #
 # This Makefile fragment is included by packages that use xfce4-panel.
 #
@@ -9,7 +9,7 @@
 XFCE4_PANEL_BUILDLINK2_MK=	# defined
 
 BUILDLINK_PACKAGES+=			xfce4-panel
-BUILDLINK_DEPENDS.xfce4-panel?=		xfce4-panel>=4.0.1
+BUILDLINK_DEPENDS.xfce4-panel?=		xfce4-panel>=4.0.1nb2
 BUILDLINK_PKGSRCDIR.xfce4-panel?=		../../x11/xfce4-panel
 
 EVAL_PREFIX+=	BUILDLINK_PREFIX.xfce4-panel=xfce4-panel
diff --git a/x11/xfce4-themes/Makefile b/x11/xfce4-themes/Makefile
index 6628fd3f0eb..59a55166137 100644
--- a/x11/xfce4-themes/Makefile
+++ b/x11/xfce4-themes/Makefile
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.3 2003/12/04 19:48:26 xtraeme Exp $
+# $NetBSD: Makefile,v 1.4 2003/12/13 00:45:27 wiz Exp $
 
 .include "../../meta-pkgs/xfce4/Makefile.common"
 
 XFCE4_VERSION=	4.0.0
 
 DISTNAME=	xfce4-themes-${XFCE4_VERSION}
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	x11
 COMMENT=	XFce4 themes
 
diff --git a/x11/xfce4-themes/buildlink2.mk b/x11/xfce4-themes/buildlink2.mk
index a40e3198661..4e950540936 100644
--- a/x11/xfce4-themes/buildlink2.mk
+++ b/x11/xfce4-themes/buildlink2.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.2 2003/09/27 06:57:16 martti Exp $
+# $NetBSD: buildlink2.mk,v 1.3 2003/12/13 00:45:27 wiz Exp $
 #
 # This Makefile fragment is included by packages that use xfce4-themes.
 #
@@ -9,7 +9,7 @@
 XFCE4_THEMES_BUILDLINK2_MK=	# defined
 
 BUILDLINK_PACKAGES+=			xfce4-themes
-BUILDLINK_DEPENDS.xfce4-themes?=		xfce4-themes>=4.0.0
+BUILDLINK_DEPENDS.xfce4-themes?=		xfce4-themes>=4.0.0nb2
 BUILDLINK_PKGSRCDIR.xfce4-themes?=		../../x11/xfce4-themes
 
 EVAL_PREFIX+=	BUILDLINK_PREFIX.xfce4-themes=xfce4-themes
diff --git a/x11/xfce4-toys/Makefile b/x11/xfce4-toys/Makefile
index 3bd434e97b2..431cad44a9c 100644
--- a/x11/xfce4-toys/Makefile
+++ b/x11/xfce4-toys/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.2 2003/12/04 19:48:26 xtraeme Exp $
+# $NetBSD: Makefile,v 1.3 2003/12/13 00:45:27 wiz Exp $
 
 .include "../../meta-pkgs/xfce4/Makefile.common"
 
 DISTNAME=	xfce4-toys-${XFCE4_VERSION}
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	x11
 COMMENT=	XFce4 toys
 
diff --git a/x11/xfce4-toys/buildlink2.mk b/x11/xfce4-toys/buildlink2.mk
index e72c7090988..87e6ab0bece 100644
--- a/x11/xfce4-toys/buildlink2.mk
+++ b/x11/xfce4-toys/buildlink2.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.3 2003/12/03 05:34:09 martti Exp $
+# $NetBSD: buildlink2.mk,v 1.4 2003/12/13 00:45:27 wiz Exp $
 #
 # This Makefile fragment is included by packages that use xfce4-toys.
 #
@@ -9,7 +9,7 @@
 XFCE4_TOYS_BUILDLINK2_MK=	# defined
 
 BUILDLINK_PACKAGES+=			xfce4-toys
-BUILDLINK_DEPENDS.xfce4-toys?=		xfce4-toys>=4.0.1
+BUILDLINK_DEPENDS.xfce4-toys?=		xfce4-toys>=4.0.1nb2
 BUILDLINK_PKGSRCDIR.xfce4-toys?=		../../x11/xfce4-toys
 
 EVAL_PREFIX+=	BUILDLINK_PREFIX.xfce4-toys=xfce4-toys
diff --git a/x11/xfce4-trigger-launcher/Makefile b/x11/xfce4-trigger-launcher/Makefile
index 465598b6d40..3aaa2e6df75 100644
--- a/x11/xfce4-trigger-launcher/Makefile
+++ b/x11/xfce4-trigger-launcher/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.2 2003/12/04 19:48:26 xtraeme Exp $
+# $NetBSD: Makefile,v 1.3 2003/12/13 00:45:27 wiz Exp $
 
 .include "../../meta-pkgs/xfce4/Makefile.common"
 
 DISTNAME=	xfce4-trigger-launcher-${XFCE4_VERSION}
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	x11
 COMMENT=	XFce4 trigger-launcher
 
diff --git a/x11/xfce4-trigger-launcher/buildlink2.mk b/x11/xfce4-trigger-launcher/buildlink2.mk
index 867ec01a641..98a002f7443 100644
--- a/x11/xfce4-trigger-launcher/buildlink2.mk
+++ b/x11/xfce4-trigger-launcher/buildlink2.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.3 2003/12/03 05:34:09 martti Exp $
+# $NetBSD: buildlink2.mk,v 1.4 2003/12/13 00:45:27 wiz Exp $
 #
 # This Makefile fragment is included by packages that use xfce4-trigger-launcher.
 #
@@ -9,7 +9,7 @@
 XFCE4_TRIGGER_LAUNCHER_BUILDLINK2_MK=	# defined
 
 BUILDLINK_PACKAGES+=			xfce4-trigger-launcher
-BUILDLINK_DEPENDS.xfce4-trigger-launcher?=		xfce4-trigger-launcher>=4.0.1
+BUILDLINK_DEPENDS.xfce4-trigger-launcher?=		xfce4-trigger-launcher>=4.0.1nb2
 BUILDLINK_PKGSRCDIR.xfce4-trigger-launcher?=		../../x11/xfce4-trigger-launcher
 
 EVAL_PREFIX+=	BUILDLINK_PREFIX.xfce4-trigger-launcher=xfce4-trigger-launcher
diff --git a/x11/xfce4-utils/Makefile b/x11/xfce4-utils/Makefile
index b5a70fad75d..012a530dc5b 100644
--- a/x11/xfce4-utils/Makefile
+++ b/x11/xfce4-utils/Makefile
@@ -1,9 +1,10 @@
-# $NetBSD: Makefile,v 1.1.1.1 2003/09/26 10:59:30 martti Exp $
+# $NetBSD: Makefile,v 1.2 2003/12/13 00:45:27 wiz Exp $
 
 .include "../../meta-pkgs/xfce4/Makefile.common"
 
-PKGNAME=	xfce4-utils-${XFCE4_VERSION}
 DISTNAME=	xfce-utils-${XFCE4_VERSION}
+PKGNAME=	xfce4-utils-${XFCE4_VERSION}
+PKGREVISION=	1
 CATEGORIES=	x11
 COMMENT=	XFce4 utilities
 
diff --git a/x11/xfce4-utils/buildlink2.mk b/x11/xfce4-utils/buildlink2.mk
index f35d3ef21a8..d5ab52b087e 100644
--- a/x11/xfce4-utils/buildlink2.mk
+++ b/x11/xfce4-utils/buildlink2.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.3 2003/12/03 05:34:09 martti Exp $
+# $NetBSD: buildlink2.mk,v 1.4 2003/12/13 00:45:27 wiz Exp $
 #
 # This Makefile fragment is included by packages that use xfce4-utils.
 #
@@ -9,7 +9,7 @@
 XFCE4_UTILS_BUILDLINK2_MK=	# defined
 
 BUILDLINK_PACKAGES+=			xfce4-utils
-BUILDLINK_DEPENDS.xfce4-utils?=		xfce4-utils>=4.0.1
+BUILDLINK_DEPENDS.xfce4-utils?=		xfce4-utils>=4.0.1nb1
 BUILDLINK_PKGSRCDIR.xfce4-utils?=		../../x11/xfce4-utils
 
 EVAL_PREFIX+=	BUILDLINK_PREFIX.xfce4-utils=xfce4-utils
diff --git a/x11/xpad/Makefile b/x11/xpad/Makefile
index 713ea282f89..83343598a4e 100644
--- a/x11/xpad/Makefile
+++ b/x11/xpad/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.2 2003/10/03 09:31:12 xtraeme Exp $
+# $NetBSD: Makefile,v 1.3 2003/12/13 00:45:27 wiz Exp $
 #
 
 DISTNAME=	xpad-1.12
+PKGREVISION=	1
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=xpad/}
 EXTRACT_SUFX=	.tar.bz2
diff --git a/x11/xscreensaver/Makefile b/x11/xscreensaver/Makefile
index 53cdc9450d5..ce99b9e4397 100644
--- a/x11/xscreensaver/Makefile
+++ b/x11/xscreensaver/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.60 2003/12/04 19:48:26 xtraeme Exp $
+# $NetBSD: Makefile,v 1.61 2003/12/13 00:45:27 wiz Exp $
 #
 
 COMMENT=	Screen saver and locker for the X window system
 
 CONFLICTS+=	xscreensaver-gnome-[0-9]*
-PKGREVISION=	1
+PKGREVISION=	2
 
 .include "../../x11/xscreensaver/Makefile.common"
 
diff --git a/x11/xscreensaver/buildlink2.mk b/x11/xscreensaver/buildlink2.mk
index 783163d4f4c..60e87c210cb 100644
--- a/x11/xscreensaver/buildlink2.mk
+++ b/x11/xscreensaver/buildlink2.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.2 2003/10/07 09:43:30 martti Exp $
+# $NetBSD: buildlink2.mk,v 1.3 2003/12/13 00:45:27 wiz Exp $
 #
 # This Makefile fragment is included by packages that use xscreensaver.
 #
@@ -9,7 +9,7 @@
 XSCREENSAVER_BUILDLINK2_MK=	# defined
 
 BUILDLINK_PACKAGES+=			xscreensaver
-BUILDLINK_DEPENDS.xscreensaver?=		xscreensaver{,-gnome}>=4.11nb1
+BUILDLINK_DEPENDS.xscreensaver?=		xscreensaver{,-gnome}>=4.13nb2
 BUILDLINK_PKGSRCDIR.xscreensaver?=		../../x11/xscreensaver
 
 EVAL_PREFIX+=	BUILDLINK_PREFIX.xscreensaver=xscreensaver
diff --git a/x11/zenity/Makefile b/x11/zenity/Makefile
index 2e4fae4bb7d..aaf57f2f771 100644
--- a/x11/zenity/Makefile
+++ b/x11/zenity/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.1.1.1 2003/12/03 23:40:39 xtraeme Exp $
+# $NetBSD: Makefile,v 1.2 2003/12/13 00:45:27 wiz Exp $
 #
 
 DISTNAME=	zenity-1.6
+PKGREVISION=	1
 CATEGORIES=	x11 gnome2
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/zenity/1.6/}
 EXTRACT_SUFX=	.tar.bz2