Bump PKGREVISION for atk library major bump.

209 files changed, 427 insertions, 378 deletions

diff --git a/archivers/file-roller/Makefile b/archivers/file-roller/Makefile
index 7f0a9962505..dec3c1ed2c1 100644
--- a/archivers/file-roller/Makefile
+++ b/archivers/file-roller/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.9 2003/11/12 01:31:47 salo Exp $
+# $NetBSD: Makefile,v 1.10 2003/12/13 00:45:21 wiz Exp $
 #
 
 DISTNAME=	file-roller-2.2.4
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	archivers gnome
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/file-roller/2.2/}
 
diff --git a/audio/aumix/Makefile b/audio/aumix/Makefile
index 49a5835b594..dbbac40ac9d 100644
--- a/audio/aumix/Makefile
+++ b/audio/aumix/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.18 2003/09/28 09:13:55 jlam Exp $
+# $NetBSD: Makefile,v 1.19 2003/12/13 00:45:21 wiz Exp $
 
 DISTNAME=	aumix-2.8
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	audio
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=aumix/} \
 		http://jpj.net/~trevor/aumix/ \
diff --git a/audio/gnome2-media/Makefile b/audio/gnome2-media/Makefile
index e483563f794..dcdecb86cf6 100644
--- a/audio/gnome2-media/Makefile
+++ b/audio/gnome2-media/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.6 2003/12/08 14:41:38 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2003/12/13 00:45:21 wiz Exp $
 
 DISTNAME=		gnome-media-2.2.1.1
-PKGREVISION=		4
+PKGREVISION=		5
 CATEGORIES=		audio gnome
 MASTER_SITES=		${MASTER_SITE_GNOME:=sources/gnome-media/2.2/}
 
diff --git a/audio/gnome2-media/buildlink2.mk b/audio/gnome2-media/buildlink2.mk
index abea19e305b..31e450a64fb 100644
--- a/audio/gnome2-media/buildlink2.mk
+++ b/audio/gnome2-media/buildlink2.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.6 2003/12/08 14:41:38 wiz Exp $
+# $NetBSD: buildlink2.mk,v 1.7 2003/12/13 00:45:21 wiz Exp $
 #
 # This Makefile fragment is included by packages that use gnome-media.
 #
@@ -9,7 +9,7 @@
 GNOME_MEDIA_BUILDLINK2_MK=	# defined
 
 BUILDLINK_PACKAGES+=			gnome-media
-BUILDLINK_DEPENDS.gnome-media?=		gnome-media>=2.2.1.1nb4
+BUILDLINK_DEPENDS.gnome-media?=		gnome-media>=2.2.1.1nb5
 BUILDLINK_PKGSRCDIR.gnome-media?=		../../audio/gnome2-media
 
 EVAL_PREFIX+=	BUILDLINK_PREFIX.gnome-media=gnome-media
diff --git a/audio/streamtuner-live365/Makefile b/audio/streamtuner-live365/Makefile
index 2f430e7c0bf..24b4a9bb254 100644
--- a/audio/streamtuner-live365/Makefile
+++ b/audio/streamtuner-live365/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.7 2003/12/03 00:52:55 xtraeme Exp $
+# $NetBSD: Makefile,v 1.8 2003/12/13 00:45:21 wiz Exp $
 #
 
 DISTNAME=	streamtuner-live365-0.3.2
+PKGREVISION=	1
 CATEGORIES=	audio
 MASTER_SITES=	http://savannah.nongnu.org/download/streamtuner/streamtuner-live365.pkg/0.3.2/
 
diff --git a/audio/streamtuner-local/Makefile b/audio/streamtuner-local/Makefile
index 89938c29035..94fe3b798de 100644
--- a/audio/streamtuner-local/Makefile
+++ b/audio/streamtuner-local/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.6 2003/08/28 20:05:14 xtraeme Exp $
+# $NetBSD: Makefile,v 1.7 2003/12/13 00:45:21 wiz Exp $
 #
 
 DISTNAME=	streamtuner-local-0.2.1
-PKGREVISION=	3
+PKGREVISION=	4
 CATEGORIES=	audio www
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=streamtuner/}
 
diff --git a/audio/streamtuner/Makefile b/audio/streamtuner/Makefile
index 61dc6d5117c..8aa3a9fa1ea 100644
--- a/audio/streamtuner/Makefile
+++ b/audio/streamtuner/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.8 2003/09/18 21:57:06 xtraeme Exp $
+# $NetBSD: Makefile,v 1.9 2003/12/13 00:45:21 wiz Exp $
 #
 
 DISTNAME=	streamtuner-0.10.1
+PKGREVISION=	1
 CATEGORIES=	audio www
 MASTER_SITES=	http://savannah.nongnu.org/download/streamtuner/streamtuner.pkg/0.10.1/
 
diff --git a/audio/streamtuner/buildlink2.mk b/audio/streamtuner/buildlink2.mk
index 7abd58b4757..7c085f2d7df 100644
--- a/audio/streamtuner/buildlink2.mk
+++ b/audio/streamtuner/buildlink2.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.5 2003/07/23 11:21:52 jmmv Exp $
+# $NetBSD: buildlink2.mk,v 1.6 2003/12/13 00:45:21 wiz Exp $
 #
 # This Makefile fragment is included by packages that use streamtuner.
 #
@@ -9,7 +9,7 @@
 STREAMTUNER_BUILDLINK2_MK=	# defined
 
 BUILDLINK_PACKAGES+=			streamtuner
-BUILDLINK_DEPENDS.streamtuner?=		streamtuner>=0.9.1nb2
+BUILDLINK_DEPENDS.streamtuner?=		streamtuner>=0.10.1nb1
 BUILDLINK_PKGSRCDIR.streamtuner?=	../../audio/streamtuner
 
 EVAL_PREFIX+=	BUILDLINK_PREFIX.streamtuner=streamtuner
diff --git a/audio/xfce4-mixer/Makefile b/audio/xfce4-mixer/Makefile
index 95f9cfb28f2..0560a544d50 100644
--- a/audio/xfce4-mixer/Makefile
+++ b/audio/xfce4-mixer/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.3 2003/12/04 19:52:37 xtraeme Exp $
+# $NetBSD: Makefile,v 1.4 2003/12/13 00:45:21 wiz Exp $
 
 .include "../../meta-pkgs/xfce4/Makefile.common"
 
 DISTNAME=	xfce4-mixer-${XFCE4_VERSION}
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	audio
 COMMENT=	XFce4 mixer plugin
 
diff --git a/audio/xfce4-mixer/buildlink2.mk b/audio/xfce4-mixer/buildlink2.mk
index 7cd25c90abf..85bc81ee08f 100644
--- a/audio/xfce4-mixer/buildlink2.mk
+++ b/audio/xfce4-mixer/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:21 wiz Exp $
 #
 # This Makefile fragment is included by packages that use xfce4-mixer.
 #
@@ -9,7 +9,7 @@
 XFCE4_MIXER_BUILDLINK2_MK=	# defined
 
 BUILDLINK_PACKAGES+=			xfce4-mixer
-BUILDLINK_DEPENDS.xfce4-mixer?=		xfce4-mixer>=4.0.1
+BUILDLINK_DEPENDS.xfce4-mixer?=		xfce4-mixer>=4.0.1nb2
 BUILDLINK_PKGSRCDIR.xfce4-mixer?=		../../audio/xfce4-mixer
 
 EVAL_PREFIX+=	BUILDLINK_PREFIX.xfce4-mixer=xfce4-mixer
diff --git a/audio/xfce4-xmms-plugin/Makefile b/audio/xfce4-xmms-plugin/Makefile
index 9254bc8d2bd..57a61d708d5 100644
--- a/audio/xfce4-xmms-plugin/Makefile
+++ b/audio/xfce4-xmms-plugin/Makefile
@@ -1,10 +1,11 @@
-# $NetBSD: Makefile,v 1.1.1.1 2003/12/03 06:38:40 martti Exp $
+# $NetBSD: Makefile,v 1.2 2003/12/13 00:45:21 wiz Exp $
 
 .include "../../meta-pkgs/xfce4/Makefile.common"
 
 XFCE4_VERSION=	0.1.1
 
 DISTNAME=	xfce4-xmms-plugin-${XFCE4_VERSION}
+PKGREVISION=	1
 CATEGORIES=	audio
 MASTER_SITES=	http://download.berlios.de/xfce-goodies/
 COMMENT=	XFce4 XMMS plugin
diff --git a/audio/xfce4-xmms-plugin/buildlink2.mk b/audio/xfce4-xmms-plugin/buildlink2.mk
index 1b8375f6d8c..350f4cf2f87 100644
--- a/audio/xfce4-xmms-plugin/buildlink2.mk
+++ b/audio/xfce4-xmms-plugin/buildlink2.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.1.1.1 2003/12/03 06:38:40 martti Exp $
+# $NetBSD: buildlink2.mk,v 1.2 2003/12/13 00:45:21 wiz Exp $
 #
 # This Makefile fragment is included by packages that use xfce4-xmms-plugin.
 #
@@ -9,7 +9,7 @@
 XFCE4_XMMS_PLUGIN_BUILDLINK2_MK=	# defined
 
 BUILDLINK_PACKAGES+=			xfce4-xmms-plugin
-BUILDLINK_DEPENDS.xfce4-xmms-plugin?=		xfce4-xmms-plugin>=0.1.1
+BUILDLINK_DEPENDS.xfce4-xmms-plugin?=		xfce4-xmms-plugin>=0.1.1nb1
 BUILDLINK_PKGSRCDIR.xfce4-xmms-plugin?=		../../audio/xfce4-xmms-plugin
 
 EVAL_PREFIX+=	BUILDLINK_PREFIX.xfce4-xmms-plugin=xfce4-xmms-plugin
diff --git a/cad/geda-utils/Makefile b/cad/geda-utils/Makefile
index 4786e4bc7dc..cd4bd4866a2 100644
--- a/cad/geda-utils/Makefile
+++ b/cad/geda-utils/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.19 2003/11/04 20:46:57 dmcmahill Exp $
+# $NetBSD: Makefile,v 1.20 2003/12/13 00:45:21 wiz Exp $
 #
 
 DISTNAME=		geda-utils-${PKGVERSION}
+PKGREVISION=		1
 CATEGORIES=		cad
 MASTER_SITES=		ftp://ftp.geda.seul.org/pub/geda/devel/${PKGVERSION}/ \
 			ftp://ieee.ing.uniroma1.it/pub/geda/devel/${PKGVERSION}/ \
diff --git a/cad/geda/Makefile b/cad/geda/Makefile
index 822c7733ead..896d5c2e683 100644
--- a/cad/geda/Makefile
+++ b/cad/geda/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.28 2003/09/10 23:43:32 dmcmahill Exp $
+# $NetBSD: Makefile,v 1.29 2003/12/13 00:45:21 wiz Exp $
 #
 
 DISTNAME=	geda-${PKGVERSION}
+PKGREVISION=	1
 CATEGORIES=	cad
 MASTER_SITES=	ftp://ftp.geda.seul.org/pub/geda/devel/${PKGVERSION}/ \
 		ftp://ieee.ing.uniroma1.it/pub/geda/devel/${PKGVERSION}/ \
diff --git a/cad/gnetlist/Makefile b/cad/gnetlist/Makefile
index fdb17297ae3..d7fd47a24b2 100644
--- a/cad/gnetlist/Makefile
+++ b/cad/gnetlist/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.21 2003/09/10 23:43:35 dmcmahill Exp $
+# $NetBSD: Makefile,v 1.22 2003/12/13 00:45:21 wiz Exp $
 #
 
 DISTNAME=		geda-gnetlist-${PKGVERSION}
 PKGNAME=		gnetlist-${PKGVERSION}
+PKGREVISION=		1
 CATEGORIES=		cad
 MASTER_SITES=		ftp://ftp.geda.seul.org/pub/geda/devel/${PKGVERSION}/ \
 			ftp://ieee.ing.uniroma1.it/pub/geda/devel/${PKGVERSION}/ \
diff --git a/cad/gschem/Makefile b/cad/gschem/Makefile
index 0de7c53e046..653957b23ca 100644
--- a/cad/gschem/Makefile
+++ b/cad/gschem/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.23 2003/09/10 23:43:36 dmcmahill Exp $
+# $NetBSD: Makefile,v 1.24 2003/12/13 00:45:21 wiz Exp $
 #
 
 DISTNAME=		geda-gschem-${PKGVERSION}
 PKGNAME=		gschem-${PKGVERSION}
+PKGREVISION=		1
 CATEGORIES=		cad
 MASTER_SITES=		ftp://ftp.geda.seul.org/pub/geda/devel/${PKGVERSION}/ \
 			ftp://ieee.ing.uniroma1.it/pub/geda/devel/${PKGVERSION}/ \
diff --git a/cad/gsymcheck/Makefile b/cad/gsymcheck/Makefile
index e8ab84f500e..1cdb2d4595e 100644
--- a/cad/gsymcheck/Makefile
+++ b/cad/gsymcheck/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.18 2003/09/10 23:43:37 dmcmahill Exp $
+# $NetBSD: Makefile,v 1.19 2003/12/13 00:45:21 wiz Exp $
 #
 
 DISTNAME=		geda-gsymcheck-${PKGVERSION}
 PKGNAME=		gsymcheck-${PKGVERSION}
+PKGREVISION=		1
 CATEGORIES=		cad
 MASTER_SITES=		ftp://ftp.geda.seul.org/pub/geda/devel/${PKGVERSION}/ \
 			ftp://ieee.ing.uniroma1.it/pub/geda/devel/${PKGVERSION}/ \
diff --git a/cad/libgeda/Makefile b/cad/libgeda/Makefile
index 18b9b63c63f..1564ff31411 100644
--- a/cad/libgeda/Makefile
+++ b/cad/libgeda/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.22 2003/10/31 02:13:59 dmcmahill Exp $
+# $NetBSD: Makefile,v 1.23 2003/12/13 00:45:21 wiz Exp $
 #
 
 DISTNAME=		libgeda-${PKGVERSION}
+PKGREVISION=		1
 CATEGORIES=		cad
 MASTER_SITES=		ftp://ftp.geda.seul.org/pub/geda/devel/${PKGVERSION}/ \
 			ftp://ieee.ing.uniroma1.it/pub/geda/devel/${PKGVERSION}/ \
diff --git a/chat/gaim/Makefile b/chat/gaim/Makefile
index da3d33d1687..37870fa6bcb 100644
--- a/chat/gaim/Makefile
+++ b/chat/gaim/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.44 2003/12/08 14:41:39 wiz Exp $
+# $NetBSD: Makefile,v 1.45 2003/12/13 00:45:21 wiz Exp $
 #
 
 DISTNAME=	gaim-0.74
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	chat x11
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=gaim/}
 EXTRACT_SUFX=	.tar.bz2
diff --git a/chat/gossip/Makefile b/chat/gossip/Makefile
index 116a718394c..266cc2f2fc2 100644
--- a/chat/gossip/Makefile
+++ b/chat/gossip/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.6 2003/11/12 01:31:47 salo Exp $
+# $NetBSD: Makefile,v 1.7 2003/12/13 00:45:21 wiz Exp $
 #
 
 DISTNAME=	gossip-0.5
-PKGREVISION=	3
+PKGREVISION=	4
 CATEGORIES=	chat
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/gossip/0.5/}
 EXTRACT_SUFX=	.tar.bz2
diff --git a/chat/xchat2/Makefile b/chat/xchat2/Makefile
index a534f9e5d08..98449d85f24 100644
--- a/chat/xchat2/Makefile
+++ b/chat/xchat2/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.17 2003/11/12 03:39:39 jschauma Exp $
+# $NetBSD: Makefile,v 1.18 2003/12/13 00:45:21 wiz Exp $
 #
 
 DISTNAME=	xchat-2.0.5
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	chat gnome
 MASTER_SITES=	http://www.xchat.org/files/source/2.0/
 EXTRACT_SUFX=	.tar.bz2
diff --git a/comms/jpilot-syncmal/Makefile b/comms/jpilot-syncmal/Makefile
index 188174ed151..eb551056733 100644
--- a/comms/jpilot-syncmal/Makefile
+++ b/comms/jpilot-syncmal/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.17 2003/07/17 21:26:46 grant Exp $
+# $NetBSD: Makefile,v 1.18 2003/12/13 00:45:22 wiz Exp $
 
 DISTNAME=		jpilot-syncmal_0.71.2
-PKGREVISION=		2
+PKGREVISION=		3
 PKGNAME=		jpilot-syncmal-0.71.2
 CATEGORIES=		comms
 MASTER_SITES=		http://jasonday.home.att.net/code/syncmal/
diff --git a/comms/jpilot/Makefile b/comms/jpilot/Makefile
index 118a325f4ca..931f47ca49d 100644
--- a/comms/jpilot/Makefile
+++ b/comms/jpilot/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.36 2003/07/21 16:35:14 martti Exp $
+# $NetBSD: Makefile,v 1.37 2003/12/13 00:45:22 wiz Exp $
 #
 
 DISTNAME=		jpilot-0.99.5
-PKGREVISION=		2
+PKGREVISION=		3
 CATEGORIES=		comms
 MASTER_SITES=		http://jpilot.org/
 
diff --git a/comms/jpilot/buildlink2.mk b/comms/jpilot/buildlink2.mk
index c05e585fa7e..2cf376a3f7b 100644
--- a/comms/jpilot/buildlink2.mk
+++ b/comms/jpilot/buildlink2.mk
@@ -1,10 +1,10 @@
-# $NetBSD: buildlink2.mk,v 1.6 2003/07/13 13:50:51 wiz Exp $
+# $NetBSD: buildlink2.mk,v 1.7 2003/12/13 00:45:22 wiz Exp $
 
 .if !defined(JPILOT_BUILDLINK2_MK)
 JPILOT_BUILDLINK2_MK=	# defined
 
 BUILDLINK_PACKAGES+=		jpilot
-BUILDLINK_DEPENDS.jpilot?=	jpilot>=0.99.5nb2
+BUILDLINK_DEPENDS.jpilot?=	jpilot>=0.99.5nb3
 BUILDLINK_PKGSRCDIR.jpilot?=	../../comms/jpilot
 BUILDLINK_DEPMETHOD.jpilot?=	build
 
diff --git a/databases/libgnomedb/Makefile b/databases/libgnomedb/Makefile
index c1c5a6c49f9..1fd5b1030dc 100644
--- a/databases/libgnomedb/Makefile
+++ b/databases/libgnomedb/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.14 2003/11/12 01:31:47 salo Exp $
+# $NetBSD: Makefile,v 1.15 2003/12/13 00:45:22 wiz Exp $
 #
 
 DISTNAME=		libgnomedb-1.0.0
-PKGREVISION=		1
+PKGREVISION=		2
 CATEGORIES=		databases gnome
 MASTER_SITES=		${MASTER_SITE_GNOME:=sources/libgnomedb/1.0/}
 EXTRACT_SUFX=		.tar.bz2
diff --git a/databases/libgnomedb/buildlink2.mk b/databases/libgnomedb/buildlink2.mk
index 3c91e462dc2..bb0d9cf0799 100644
--- a/databases/libgnomedb/buildlink2.mk
+++ b/databases/libgnomedb/buildlink2.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.7 2003/11/12 01:31:47 salo Exp $
+# $NetBSD: buildlink2.mk,v 1.8 2003/12/13 00:45:22 wiz Exp $
 #
 # This Makefile fragment is included by packages that use libgnomedb.
 #
@@ -9,7 +9,7 @@
 LIBGNOMEDB_BUILDLINK2_MK=	# defined
 
 BUILDLINK_PACKAGES+=			libgnomedb
-BUILDLINK_DEPENDS.libgnomedb?=		libgnomedb>=1.0.0nb1
+BUILDLINK_DEPENDS.libgnomedb?=		libgnomedb>=1.0.0nb2
 BUILDLINK_PKGSRCDIR.libgnomedb?=		../../databases/libgnomedb
 
 EVAL_PREFIX+=	BUILDLINK_PREFIX.libgnomedb=libgnomedb
diff --git a/databases/mergeant/Makefile b/databases/mergeant/Makefile
index 98c9ca36535..3ecbe3b605d 100644
--- a/databases/mergeant/Makefile
+++ b/databases/mergeant/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.11 2003/11/12 01:31:47 salo Exp $
+# $NetBSD: Makefile,v 1.12 2003/12/13 00:45:22 wiz Exp $
 #
 
 DISTNAME=		mergeant-0.12.1
-PKGREVISION=		3
+PKGREVISION=		4
 CATEGORIES=		databases gnome
 MASTER_SITES=		${MASTER_SITE_GNOME:=sources/mergeant/0.12/}
 EXTRACT_SUFX=		.tar.bz2
diff --git a/devel/GConf2-ui/Makefile b/devel/GConf2-ui/Makefile
index 6a4256a4341..d676586921b 100644
--- a/devel/GConf2-ui/Makefile
+++ b/devel/GConf2-ui/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.5 2003/11/12 01:31:47 salo Exp $
+# $NetBSD: Makefile,v 1.6 2003/12/13 00:45:22 wiz Exp $
 #
 
 .include "../../devel/GConf2/Makefile.common"
 
 PKGNAME=	${DISTNAME:S/GConf/GConf2-ui/}
-PKGREVISION=	3
+PKGREVISION=	4
 
 CONFIGURE_ENV+=	PKG_USE_GTK=yes
 
diff --git a/devel/GConf2-ui/buildlink2.mk b/devel/GConf2-ui/buildlink2.mk
index af802844a5b..45b62e021e1 100644
--- a/devel/GConf2-ui/buildlink2.mk
+++ b/devel/GConf2-ui/buildlink2.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.5 2003/11/12 01:31:47 salo Exp $
+# $NetBSD: buildlink2.mk,v 1.6 2003/12/13 00:45:22 wiz Exp $
 #
 # This Makefile fragment is included by packages that use GConf2-ui.
 #
@@ -7,7 +7,7 @@
 GCONF2_UI_BUILDLINK2_MK=	# defined
 
 BUILDLINK_PACKAGES+=			GConf2-ui
-BUILDLINK_DEPENDS.GConf2-ui?=		GConf2-ui>=2.2.0nb3
+BUILDLINK_DEPENDS.GConf2-ui?=		GConf2-ui>=2.2.0nb4
 BUILDLINK_PKGSRCDIR.GConf2-ui?=		../../devel/GConf2-ui
 
 EVAL_PREFIX+=	BUILDLINK_PREFIX.GConf2-ui=GConf2-ui
diff --git a/devel/coconut/Makefile b/devel/coconut/Makefile
index 6e913f542f1..12fbfc9b094 100644
--- a/devel/coconut/Makefile
+++ b/devel/coconut/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.14 2003/12/04 19:48:24 xtraeme Exp $
+# $NetBSD: Makefile,v 1.15 2003/12/13 00:45:22 wiz Exp $
 #
 
 DISTNAME=	coconut-0.3.0
-PKGREVISION=	7
+PKGREVISION=	8
 CATEGORIES=	devel
 MASTER_SITES=	http://www.asahi-net.or.jp/~em7t-hmd/coconut/		\
 		${MASTER_SITE_SOURCEFORGE:=coconut-lib/}
diff --git a/devel/coconut/buildlink2.mk b/devel/coconut/buildlink2.mk
index 3c34f37b0b3..224d8fd3cc0 100644
--- a/devel/coconut/buildlink2.mk
+++ b/devel/coconut/buildlink2.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.8 2003/11/12 01:31:48 salo Exp $
+# $NetBSD: buildlink2.mk,v 1.9 2003/12/13 00:45:22 wiz Exp $
 #
 # This Makefile fragment is included by packages that use coconut.
 #
@@ -9,7 +9,7 @@
 COCONUT_BUILDLINK2_MK=	# defined
 
 BUILDLINK_PACKAGES+=			coconut
-BUILDLINK_DEPENDS.coconut?=		coconut>=0.3.0nb6
+BUILDLINK_DEPENDS.coconut?=		coconut>=0.3.0nb8
 BUILDLINK_PKGSRCDIR.coconut?=		../../devel/coconut
 
 EVAL_PREFIX+=	BUILDLINK_PREFIX.coconut=coconut
diff --git a/devel/devhelp/Makefile b/devel/devhelp/Makefile
index cdc9b520904..77c936607fc 100644
--- a/devel/devhelp/Makefile
+++ b/devel/devhelp/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.2 2003/11/12 01:31:48 salo Exp $
+# $NetBSD: Makefile,v 1.3 2003/12/13 00:45:22 wiz Exp $
 
 DISTNAME=		devhelp-0.7
-PKGREVISION=		1
+PKGREVISION=		2
 CATEGORIES=		devel x11
 MASTER_SITES=		${MASTER_SITE_GNOME:=sources/devhelp/0.7/}
 EXTRACT_SUFX=		.tar.bz2
diff --git a/devel/eel2/Makefile b/devel/eel2/Makefile
index 76b128754b2..675cfd88543 100644
--- a/devel/eel2/Makefile
+++ b/devel/eel2/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.14 2003/11/12 01:31:48 salo Exp $
+# $NetBSD: Makefile,v 1.15 2003/12/13 00:45:22 wiz Exp $
 #
 
 DISTNAME=		eel-2.2.3.1
 PKGNAME=		${DISTNAME:S/-/2-/}
-PKGREVISION=		3
+PKGREVISION=		4
 CATEGORIES=		devel gnome
 MASTER_SITES=		${MASTER_SITE_GNOME:=sources/eel/2.2/}
 EXTRACT_SUFX=		.tar.bz2
diff --git a/devel/eel2/buildlink2.mk b/devel/eel2/buildlink2.mk
index 968910babdf..40e8eee1e04 100644
--- a/devel/eel2/buildlink2.mk
+++ b/devel/eel2/buildlink2.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.7 2003/11/12 01:31:48 salo Exp $
+# $NetBSD: buildlink2.mk,v 1.8 2003/12/13 00:45:22 wiz Exp $
 #
 # This Makefile fragment is included by packages that use eel2.
 #
@@ -9,7 +9,7 @@
 EEL2_BUILDLINK2_MK=	# defined
 
 BUILDLINK_PACKAGES+=			eel2
-BUILDLINK_DEPENDS.eel2?=		eel2>=2.2.3.1nb3
+BUILDLINK_DEPENDS.eel2?=		eel2>=2.2.3.1nb4
 BUILDLINK_PKGSRCDIR.eel2?=		../../devel/eel2
 
 EVAL_PREFIX+=	BUILDLINK_PREFIX.eel2=eel2
diff --git a/devel/gail/Makefile b/devel/gail/Makefile
index b7a369744fd..798b902dca8 100644
--- a/devel/gail/Makefile
+++ b/devel/gail/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.10 2003/07/17 21:30:34 grant Exp $
+# $NetBSD: Makefile,v 1.11 2003/12/13 00:45:22 wiz Exp $
 #
 
 DISTNAME=	gail-1.2.0
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	devel gnome
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/gail/1.2/}
 EXTRACT_SUFX=	.tar.bz2
diff --git a/devel/gail/buildlink2.mk b/devel/gail/buildlink2.mk
index e211f791190..a84c87499fe 100644
--- a/devel/gail/buildlink2.mk
+++ b/devel/gail/buildlink2.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.5 2003/07/13 13:51:07 wiz Exp $
+# $NetBSD: buildlink2.mk,v 1.6 2003/12/13 00:45:22 wiz Exp $
 #
 # This Makefile fragment is included by packages that use gail.
 #
@@ -9,7 +9,7 @@
 GAIL_BUILDLINK2_MK=	# defined
 
 BUILDLINK_PACKAGES+=			gail
-BUILDLINK_DEPENDS.gail?=		gail>=1.2.0nb2
+BUILDLINK_DEPENDS.gail?=		gail>=1.2.0nb3
 BUILDLINK_PKGSRCDIR.gail?=		../../devel/gail
 
 EVAL_PREFIX+=	BUILDLINK_PREFIX.gail=gail
diff --git a/devel/gal2/Makefile b/devel/gal2/Makefile
index adfe6434258..b55cb7b7b21 100644
--- a/devel/gal2/Makefile
+++ b/devel/gal2/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.12 2003/12/06 17:50:02 recht Exp $
+# $NetBSD: Makefile,v 1.13 2003/12/13 00:45:22 wiz Exp $
 #
 
 DISTNAME=	gal-1.99.10
 PKGNAME=	${DISTNAME:S/gal/gal2/}
+PKGREVISION=	1
 CATEGORIES=	devel gnome
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/gal/1.99/}
 EXTRACT_SUFX=	.tar.bz2
diff --git a/devel/gal2/buildlink2.mk b/devel/gal2/buildlink2.mk
index 5c8b7f025a3..52307a0323b 100644
--- a/devel/gal2/buildlink2.mk
+++ b/devel/gal2/buildlink2.mk
@@ -1,11 +1,11 @@
-# $NetBSD: buildlink2.mk,v 1.7 2003/12/06 17:50:02 recht Exp $
+# $NetBSD: buildlink2.mk,v 1.8 2003/12/13 00:45:22 wiz Exp $
 #
 
 .if !defined(GAL2_BUILDLINK2_MK)
 GAL2_BUILDLINK2_MK=	# defined
 
 BUILDLINK_PACKAGES+=			gal2
-BUILDLINK_DEPENDS.gal2?=		gal2>=1.99.10
+BUILDLINK_DEPENDS.gal2?=		gal2>=1.99.10nb1
 BUILDLINK_PKGSRCDIR.gal2?=		../../devel/gal2
 
 EVAL_PREFIX+=	BUILDLINK_PREFIX.gal2=gal2
diff --git a/devel/gconfmm/Makefile b/devel/gconfmm/Makefile
index 5b9a9f63ed4..08a4f9df582 100644
--- a/devel/gconfmm/Makefile
+++ b/devel/gconfmm/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.6 2003/11/12 01:31:48 salo Exp $
+# $NetBSD: Makefile,v 1.7 2003/12/13 00:45:22 wiz Exp $
 #
 
 DISTNAME=	gconfmm-2.0.1
-PKGREVISION=	3
+PKGREVISION=	4
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=gtkmm/}
 
diff --git a/devel/gconfmm/buildlink2.mk b/devel/gconfmm/buildlink2.mk
index c68471a731d..3bc977ef27a 100644
--- a/devel/gconfmm/buildlink2.mk
+++ b/devel/gconfmm/buildlink2.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.4 2003/11/12 01:31:48 salo Exp $
+# $NetBSD: buildlink2.mk,v 1.5 2003/12/13 00:45:22 wiz Exp $
 #
 # This Makefile fragment is included by packages that use gconfmm.
 #
@@ -9,7 +9,7 @@
 GCONFMM_BUILDLINK2_MK=	# defined
 
 BUILDLINK_PACKAGES+=			gconfmm
-BUILDLINK_DEPENDS.gconfmm?=		gconfmm>=2.0.1nb3
+BUILDLINK_DEPENDS.gconfmm?=		gconfmm>=2.0.1nb4
 BUILDLINK_PKGSRCDIR.gconfmm?=		../../devel/gconfmm
 
 EVAL_PREFIX+=	BUILDLINK_PREFIX.gconfmm=gconfmm
diff --git a/devel/glade2/Makefile b/devel/glade2/Makefile
index 1e3046483da..1908b944f94 100644
--- a/devel/glade2/Makefile
+++ b/devel/glade2/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.14 2003/11/12 01:31:48 salo Exp $
+# $NetBSD: Makefile,v 1.15 2003/12/13 00:45:22 wiz Exp $
 #
 
 DISTNAME=		glade-2.0.0
 PKGNAME=		${DISTNAME:S/-/2-/}
-PKGREVISION=		5
+PKGREVISION=		6
 CATEGORIES=		devel gnome
 MASTER_SITES=		${MASTER_SITE_GNOME:=sources/glade/2.0/}
 EXTRACT_SUFX=		.tar.bz2
diff --git a/devel/gtranslator/Makefile b/devel/gtranslator/Makefile
index 0b0914d3529..0eb7d33d1c0 100644
--- a/devel/gtranslator/Makefile
+++ b/devel/gtranslator/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.2 2003/11/12 01:31:48 salo Exp $
+# $NetBSD: Makefile,v 1.3 2003/12/13 00:45:22 wiz Exp $
 #
 
 DISTNAME=	gtranslator-1.0
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	devel
 MASTER_SITES=	http://www.gtranslator.org/download/releases/1.0/
 
diff --git a/devel/libbonoboui/Makefile b/devel/libbonoboui/Makefile
index a062dc91f45..77a01272f09 100644
--- a/devel/libbonoboui/Makefile
+++ b/devel/libbonoboui/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.18 2003/11/12 01:31:48 salo Exp $
+# $NetBSD: Makefile,v 1.19 2003/12/13 00:45:22 wiz Exp $
 #
 
 DISTNAME=	libbonoboui-2.2.4
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	devel gnome
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/libbonoboui/2.2/}
 EXTRACT_SUFX=	.tar.bz2
diff --git a/devel/libbonoboui/buildlink2.mk b/devel/libbonoboui/buildlink2.mk
index 3b44a6a8c35..69bab0aba1d 100644
--- a/devel/libbonoboui/buildlink2.mk
+++ b/devel/libbonoboui/buildlink2.mk
@@ -1,10 +1,10 @@
-# $NetBSD: buildlink2.mk,v 1.8 2003/11/12 01:31:48 salo Exp $
+# $NetBSD: buildlink2.mk,v 1.9 2003/12/13 00:45:22 wiz Exp $
 
 .if !defined(LIBBONOBOUI_BUILDLINK2_MK)
 LIBBONOBOUI_BUILDLINK2_MK=	# defined
 
 BUILDLINK_PACKAGES+=		libbonoboui
-BUILDLINK_DEPENDS.libbonoboui?=	libbonoboui>=2.2.4nb2
+BUILDLINK_DEPENDS.libbonoboui?=	libbonoboui>=2.2.4nb3
 BUILDLINK_PKGSRCDIR.libbonoboui?=	../../devel/libbonoboui
 
 EVAL_PREFIX+=	BUILDLINK_PREFIX.libbonoboui=libbonoboui
diff --git a/devel/libglade2/Makefile b/devel/libglade2/Makefile
index a56c0df7231..3ca5fce7660 100644
--- a/devel/libglade2/Makefile
+++ b/devel/libglade2/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.18 2003/12/04 19:48:24 xtraeme Exp $
+# $NetBSD: Makefile,v 1.19 2003/12/13 00:45:22 wiz Exp $
 #
 
 DISTNAME=		libglade-2.0.1
 PKGNAME=		${DISTNAME:S/libglade/libglade2/}
-PKGREVISION=		11
+PKGREVISION=		12
 CATEGORIES=		devel gnome
 MASTER_SITES=		${MASTER_SITE_GNOME:=sources/libglade/2.0/}
 
diff --git a/devel/libglade2/buildlink2.mk b/devel/libglade2/buildlink2.mk
index 79e139a13f3..437ada58697 100644
--- a/devel/libglade2/buildlink2.mk
+++ b/devel/libglade2/buildlink2.mk
@@ -1,10 +1,10 @@
-# $NetBSD: buildlink2.mk,v 1.7 2003/07/13 13:51:18 wiz Exp $
+# $NetBSD: buildlink2.mk,v 1.8 2003/12/13 00:45:22 wiz Exp $
 
 .if !defined(LIBGLADE2_BUILDLINK2_MK)
 LIBGLADE2_BUILDLINK2_MK=	# defined
 
 BUILDLINK_PACKAGES+=		libglade2
-BUILDLINK_DEPENDS.libglade2?=	libglade2>=2.0.1nb9
+BUILDLINK_DEPENDS.libglade2?=	libglade2>=2.0.1nb12
 BUILDLINK_PKGSRCDIR.libglade2?=	../../devel/libglade2
 
 EVAL_PREFIX+=			BUILDLINK_PREFIX.libglade2=libglade2
diff --git a/devel/libgnomeui/Makefile b/devel/libgnomeui/Makefile
index 386b2a80ce8..f6e104d5380 100644
--- a/devel/libgnomeui/Makefile
+++ b/devel/libgnomeui/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.15 2003/11/12 01:31:48 salo Exp $
+# $NetBSD: Makefile,v 1.16 2003/12/13 00:45:22 wiz Exp $
 #
 
 DISTNAME=	libgnomeui-2.2.2
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	devel gnome
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/libgnomeui/2.2/}
 EXTRACT_SUFX=	.tar.bz2
diff --git a/devel/libgnomeui/buildlink2.mk b/devel/libgnomeui/buildlink2.mk
index 9f303edc182..cf2e03a177b 100644
--- a/devel/libgnomeui/buildlink2.mk
+++ b/devel/libgnomeui/buildlink2.mk
@@ -1,10 +1,10 @@
-# $NetBSD: buildlink2.mk,v 1.8 2003/11/12 01:31:48 salo Exp $
+# $NetBSD: buildlink2.mk,v 1.9 2003/12/13 00:45:22 wiz Exp $
 
 .if !defined(LIBGNOMEUI_BUILDLINK2_MK)
 LIBGNOMEUI_BUILDLINK2_MK=	# defined
 
 BUILDLINK_PACKAGES+=		libgnomeui
-BUILDLINK_DEPENDS.libgnomeui?=	libgnomeui>=2.2.2nb2
+BUILDLINK_DEPENDS.libgnomeui?=	libgnomeui>=2.2.2nb3
 BUILDLINK_PKGSRCDIR.libgnomeui?=	../../devel/libgnomeui
 
 EVAL_PREFIX+=			BUILDLINK_PREFIX.libgnomeui=libgnomeui
diff --git a/devel/libwnck/Makefile b/devel/libwnck/Makefile
index 8582b6b7abb..a591412e44e 100644
--- a/devel/libwnck/Makefile
+++ b/devel/libwnck/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.10 2003/07/17 21:31:47 grant Exp $
+# $NetBSD: Makefile,v 1.11 2003/12/13 00:45:22 wiz Exp $
 #
 
 DISTNAME=	libwnck-2.2.1
-PKGREVISION=	3
+PKGREVISION=	4
 CATEGORIES=	devel x11 gnome
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/libwnck/2.2/}
 EXTRACT_SUFX=	.tar.bz2
diff --git a/devel/libwnck/buildlink2.mk b/devel/libwnck/buildlink2.mk
index 95e92efb927..bf41ea25235 100644
--- a/devel/libwnck/buildlink2.mk
+++ b/devel/libwnck/buildlink2.mk
@@ -1,10 +1,10 @@
-# $NetBSD: buildlink2.mk,v 1.6 2003/07/13 13:51:21 wiz Exp $
+# $NetBSD: buildlink2.mk,v 1.7 2003/12/13 00:45:22 wiz Exp $
 
 .if !defined(LIBWNCK_BUILDLINK2_MK)
 LIBWNCK_BUILDLINK2_MK=	# defined
 
 BUILDLINK_PACKAGES+=		libwnck
-BUILDLINK_DEPENDS.libwnck?=	libwnck>=2.2.1nb3
+BUILDLINK_DEPENDS.libwnck?=	libwnck>=2.2.1nb4
 BUILDLINK_PKGSRCDIR.libwnck?=	../../devel/libwnck
 
 EVAL_PREFIX+=			BUILDLINK_PREFIX.libwnck=libwnck
diff --git a/editors/conglomerate/Makefile b/editors/conglomerate/Makefile
index 3e5d75802ba..f63741f856d 100644
--- a/editors/conglomerate/Makefile
+++ b/editors/conglomerate/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.9 2003/12/04 19:48:25 xtraeme Exp $
+# $NetBSD: Makefile,v 1.10 2003/12/13 00:45:22 wiz Exp $
 #
 
 DISTNAME=	conglomerate-0.7.6
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	editors
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=conglomerate/}
 
diff --git a/editors/gconf-editor/Makefile b/editors/gconf-editor/Makefile
index c81a64b87e5..399fef7cbb7 100644
--- a/editors/gconf-editor/Makefile
+++ b/editors/gconf-editor/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.7 2003/11/12 01:31:49 salo Exp $
+# $NetBSD: Makefile,v 1.8 2003/12/13 00:45:23 wiz Exp $
 #
 
 DISTNAME=		gconf-editor-0.3.1
-PKGREVISION=		4
+PKGREVISION=		5
 CATEGORIES=		editors gnome
 MASTER_SITES=		${MASTER_SITE_GNOME:=sources/gconf-editor/0.3/}
 EXTRACT_SUFX=		.tar.bz2
diff --git a/editors/gedit/Makefile b/editors/gedit/Makefile
index 311c58ec244..922ddb2a1f9 100644
--- a/editors/gedit/Makefile
+++ b/editors/gedit/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.15 2003/11/12 01:31:49 salo Exp $
+# $NetBSD: Makefile,v 1.16 2003/12/13 00:45:23 wiz Exp $
 #
 
 DISTNAME=		gedit-2.2.1
-PKGREVISION=		4
+PKGREVISION=		5
 CATEGORIES=		editors gnome
 MASTER_SITES=		${MASTER_SITE_GNOME:=sources/gedit/2.2/}
 EXTRACT_SUFX=		.tar.bz2
diff --git a/editors/gice/Makefile b/editors/gice/Makefile
index e94e87ed276..a6bb4390881 100644
--- a/editors/gice/Makefile
+++ b/editors/gice/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.9 2003/07/17 21:34:28 grant Exp $
+# $NetBSD: Makefile,v 1.10 2003/12/13 00:45:23 wiz Exp $
 #
 
 DISTNAME=		gice-0.6.1
-PKGREVISION=		3
+PKGREVISION=		4
 WRKSRC=			${WRKDIR}/gice
 CATEGORIES=		editors
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=gice/}
diff --git a/editors/vim-gtk2/Makefile b/editors/vim-gtk2/Makefile
index 6a6f2253d84..9d7112a1959 100644
--- a/editors/vim-gtk2/Makefile
+++ b/editors/vim-gtk2/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.4 2003/09/28 09:13:57 jlam Exp $
+# $NetBSD: Makefile,v 1.5 2003/12/13 00:45:23 wiz Exp $
 
 .include		"../vim-share/Makefile.common"
 
 PKGNAME=		vim-gtk2-${VIM_VERSION}.${VIM_PATCHLEVEL}
-PKGREVISION=		1
+PKGREVISION=		2
 
 COMMENT=		Vim editor (vi clone) with X11 GTK2 GUI
 
diff --git a/games/ccgo/Makefile b/games/ccgo/Makefile
index 99c11372e42..61f537e8fda 100644
--- a/games/ccgo/Makefile
+++ b/games/ccgo/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.7 2003/11/12 01:31:49 salo Exp $
+# $NetBSD: Makefile,v 1.8 2003/12/13 00:45:23 wiz Exp $
 #
 
 DISTNAME=		ccgo-0.3.1
-PKGREVISION=		3
+PKGREVISION=		4
 CATEGORIES=		games
 MASTER_SITES=		http://ccdw.org/~cjj/prog/ccgo/
 
diff --git a/games/gnome2-games/Makefile b/games/gnome2-games/Makefile
index 669d390e984..9ceb6074ca3 100644
--- a/games/gnome2-games/Makefile
+++ b/games/gnome2-games/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.13 2003/11/12 01:31:49 salo Exp $
+# $NetBSD: Makefile,v 1.14 2003/12/13 00:45:23 wiz Exp $
 
 DISTNAME=		gnome-games-2.2.1
-PKGREVISION=		5
+PKGREVISION=		6
 CATEGORIES=		games gnome
 MASTER_SITES=		${MASTER_SITE_GNOME:=sources/gnome-games/2.2/}
 EXTRACT_SUFX=		.tar.bz2
diff --git a/games/gnome2-games/buildlink2.mk b/games/gnome2-games/buildlink2.mk
index e7868c206a4..5921430c18a 100644
--- a/games/gnome2-games/buildlink2.mk
+++ b/games/gnome2-games/buildlink2.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.5 2003/09/28 09:13:57 jlam Exp $
+# $NetBSD: buildlink2.mk,v 1.6 2003/12/13 00:45:23 wiz Exp $
 #
 # This Makefile fragment is included by packages that use gnome-games.
 #
@@ -9,7 +9,7 @@
 GNOME_GAMES_BUILDLINK2_MK=	# defined
 
 BUILDLINK_PACKAGES+=			gnome-games
-BUILDLINK_DEPENDS.gnome-games?=		gnome-games>=2.2.1nb4
+BUILDLINK_DEPENDS.gnome-games?=		gnome-games>=2.2.1nb6
 BUILDLINK_PKGSRCDIR.gnome-games?=		../../games/gnome-games
 
 EVAL_PREFIX+=	BUILDLINK_PREFIX.gnome-games=gnome-games
diff --git a/games/gtetrinet/Makefile b/games/gtetrinet/Makefile
index 49af8b7bef6..121e55f11b4 100644
--- a/games/gtetrinet/Makefile
+++ b/games/gtetrinet/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.6 2003/11/12 01:31:49 salo Exp $
+# $NetBSD: Makefile,v 1.7 2003/12/13 00:45:23 wiz Exp $
 #
 
 DISTNAME=	gtetrinet-0.7.1
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	games gnome
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/gtetrinet/0.7/}
 
diff --git a/games/gtkballs/Makefile b/games/gtkballs/Makefile
index 895951498bd..ee20e064805 100644
--- a/games/gtkballs/Makefile
+++ b/games/gtkballs/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.9 2003/07/13 13:51:48 wiz Exp $
+# $NetBSD: Makefile,v 1.10 2003/12/13 00:45:23 wiz Exp $
 #
 
 DISTNAME=	gtkballs-3.0.1
-PKGREVISION=	4
+PKGREVISION=	5
 CATEGORIES=	games
 MASTER_SITES=	ftp://ftp.antex.ru/pub/unix/dfo/gtkballs/ \
 		http://gtkballs.antex.ru/dist/
diff --git a/games/gturing/Makefile b/games/gturing/Makefile
index 6d3d14ee275..3d5b3a7ef00 100644
--- a/games/gturing/Makefile
+++ b/games/gturing/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.10 2003/11/12 01:31:49 salo Exp $
+# $NetBSD: Makefile,v 1.11 2003/12/13 00:45:23 wiz Exp $
 #
 
 DISTNAME=		gturing-0.1.1
-PKGREVISION=		5
+PKGREVISION=		6
 CATEGORIES=		games gnome
 MASTER_SITES=		${MASTER_SITE_GNOME:=sources/gturing/0.1/}
 EXTRACT_SUFX=		.tar.bz2
diff --git a/games/sirius/Makefile b/games/sirius/Makefile
index 94138e53dbd..680d6620608 100644
--- a/games/sirius/Makefile
+++ b/games/sirius/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.7 2003/11/12 01:31:49 salo Exp $
+# $NetBSD: Makefile,v 1.8 2003/12/13 00:45:23 wiz Exp $
 #
 
 DISTNAME=	sirius-0.7.0
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	games gnome
 MASTER_SITES=	http://sirius.bitvis.nu/files/
 
diff --git a/graphics/avidemux/Makefile b/graphics/avidemux/Makefile
index dc3d652432d..0a74993e564 100644
--- a/graphics/avidemux/Makefile
+++ b/graphics/avidemux/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.3 2003/12/08 14:41:40 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2003/12/13 00:45:23 wiz Exp $
 #
 
 DISTNAME=	avidemux-2.0.10
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	graphics
 MASTER_SITES=	http://fixounet.free.fr/avidemux/
 
diff --git a/graphics/dia/Makefile b/graphics/dia/Makefile
index c2c2090ce32..f04f15cffb8 100644
--- a/graphics/dia/Makefile
+++ b/graphics/dia/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.20 2003/12/02 22:32:48 recht Exp $
+# $NetBSD: Makefile,v 1.21 2003/12/13 00:45:23 wiz Exp $
 
 DISTNAME=	dia-0.92.2
+PKGREVISION=	1
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/dia/0.92/}
 
diff --git a/graphics/eog2/Makefile b/graphics/eog2/Makefile
index 7da63db5aed..b9a95f22aa8 100644
--- a/graphics/eog2/Makefile
+++ b/graphics/eog2/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.15 2003/11/12 01:31:49 salo Exp $
+# $NetBSD: Makefile,v 1.16 2003/12/13 00:45:23 wiz Exp $
 #
 
 DISTNAME=		eog-2.3.4
-PKGREVISION=		1
+PKGREVISION=		2
 CATEGORIES=		graphics gnome
 MASTER_SITES=		${MASTER_SITE_GNOME:=sources/eog/2.3/}
 EXTRACT_SUFX=		.tar.bz2
diff --git a/graphics/gimageview/Makefile b/graphics/gimageview/Makefile
index 73d0be07342..044c1b22c8f 100644
--- a/graphics/gimageview/Makefile
+++ b/graphics/gimageview/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.14 2003/12/04 19:48:25 xtraeme Exp $
+# $NetBSD: Makefile,v 1.15 2003/12/13 00:45:23 wiz Exp $
 
 DISTNAME=	gimageview-0.2.24
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=gtkmmviewer/}
 
diff --git a/graphics/giram/Makefile b/graphics/giram/Makefile
index be24a4e2aa4..4f5999b10b7 100644
--- a/graphics/giram/Makefile
+++ b/graphics/giram/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.30 2003/07/17 21:40:56 grant Exp $
+# $NetBSD: Makefile,v 1.31 2003/12/13 00:45:23 wiz Exp $
 #
 
 DISTNAME=	giram-0.3.5
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	graphics
 MASTER_SITES=	http://www.giram.org/downloads/
 
diff --git a/graphics/gmencoder/Makefile b/graphics/gmencoder/Makefile
index 79bcdd2d51c..7e13f2410cd 100644
--- a/graphics/gmencoder/Makefile
+++ b/graphics/gmencoder/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.4 2003/11/12 01:31:49 salo Exp $
+# $NetBSD: Makefile,v 1.5 2003/12/13 00:45:23 wiz Exp $
 #
 
 DISTNAME=	gmencoder-0.1.0
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=gmencoder/}
 EXTRACT_SUFX=	.tgz
diff --git a/graphics/gqview-devel/Makefile b/graphics/gqview-devel/Makefile
index f9de380550d..7c2807743c7 100644
--- a/graphics/gqview-devel/Makefile
+++ b/graphics/gqview-devel/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.10 2003/11/10 02:03:17 xtraeme Exp $
+# $NetBSD: Makefile,v 1.11 2003/12/13 00:45:23 wiz Exp $
 #
 
 DISTNAME=	gqview-1.3.5
+PKGREVISION=	1
 CATEGORIES=	graphics x11
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=gqview/}
 
diff --git a/graphics/gtkam/Makefile b/graphics/gtkam/Makefile
index 1f6c6c10728..856955b6e7c 100644
--- a/graphics/gtkam/Makefile
+++ b/graphics/gtkam/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.15 2003/09/28 18:57:00 is Exp $
+# $NetBSD: Makefile,v 1.16 2003/12/13 00:45:23 wiz Exp $
 #
 
 DISTNAME=	gtkam-0.1.10
-PKGREVISION=	3
+PKGREVISION=	4
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=gphoto/}
 EXTRACT_SUFX=	.tar.bz2
diff --git a/graphics/gtkglext/Makefile b/graphics/gtkglext/Makefile
index 210d6d6e109..cefd01d8476 100644
--- a/graphics/gtkglext/Makefile
+++ b/graphics/gtkglext/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.12 2003/11/30 22:58:40 jschauma Exp $
+# $NetBSD: Makefile,v 1.13 2003/12/13 00:45:24 wiz Exp $
 #
 
 DISTNAME=		gtkglext-0.7.1
-PKGREVISION=		2
+PKGREVISION=		3
 CATEGORIES=		graphics
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=gtkglext/}
 EXTRACT_SUFX=		.tar.bz2
diff --git a/graphics/gtkglext/buildlink2.mk b/graphics/gtkglext/buildlink2.mk
index e866a733043..7bf19b9f2aa 100644
--- a/graphics/gtkglext/buildlink2.mk
+++ b/graphics/gtkglext/buildlink2.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.7 2003/08/27 09:08:32 wiz Exp $
+# $NetBSD: buildlink2.mk,v 1.8 2003/12/13 00:45:24 wiz Exp $
 #
 # This Makefile fragment is included by packages that use gtkglext.
 #
@@ -9,7 +9,7 @@
 GTKGLEXT_BUILDLINK2_MK=	# defined
 
 BUILDLINK_PACKAGES+=			gtkglext
-BUILDLINK_DEPENDS.gtkglext?=		gtkglext>=0.7.1nb1
+BUILDLINK_DEPENDS.gtkglext?=		gtkglext>=0.7.1nb3
 BUILDLINK_PKGSRCDIR.gtkglext?=		../../graphics/gtkglext
 
 EVAL_PREFIX+=	BUILDLINK_PREFIX.gtkglext=gtkglext
diff --git a/graphics/gxine/Makefile b/graphics/gxine/Makefile
index c2248539c8e..5d0632f6f39 100644
--- a/graphics/gxine/Makefile
+++ b/graphics/gxine/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.9 2003/12/08 14:41:40 wiz Exp $
+# $NetBSD: Makefile,v 1.10 2003/12/13 00:45:24 wiz Exp $
 #
 
 DISTNAME=		gxine-0.3.3
-PKGREVISION=		3
+PKGREVISION=		4
 CATEGORIES=		graphics
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=xine/}
 
diff --git a/graphics/libexif-gtk/Makefile b/graphics/libexif-gtk/Makefile
index d8981feac1b..febf157a779 100644
--- a/graphics/libexif-gtk/Makefile
+++ b/graphics/libexif-gtk/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.9 2003/09/23 12:18:55 recht Exp $
+# $NetBSD: Makefile,v 1.10 2003/12/13 00:45:24 wiz Exp $
 
 DISTNAME=	libexif-gtk-0.3.3
-PKGREVISION=	5
+PKGREVISION=	6
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=libexif/}
 EXTRACT_SUFX=	.tar.bz2
diff --git a/graphics/libexif-gtk/buildlink2.mk b/graphics/libexif-gtk/buildlink2.mk
index e5960bb827e..baf3028a01f 100644
--- a/graphics/libexif-gtk/buildlink2.mk
+++ b/graphics/libexif-gtk/buildlink2.mk
@@ -1,11 +1,11 @@
-# $NetBSD: buildlink2.mk,v 1.3 2003/07/13 13:52:09 wiz Exp $
+# $NetBSD: buildlink2.mk,v 1.4 2003/12/13 00:45:24 wiz Exp $
 #
 
 .if !defined(LIBEXIF_GTK_BUILDLINK2_MK)
 LIBEXIF_GTK_BUILDLINK2_MK=	# defined
 
 BUILDLINK_PACKAGES+=			libexif-gtk
-BUILDLINK_DEPENDS.libexif-gtk?=		libexif-gtk>=0.3.3nb2
+BUILDLINK_DEPENDS.libexif-gtk?=		libexif-gtk>=0.3.3nb6
 BUILDLINK_PKGSRCDIR.libexif-gtk?=	../../graphics/libexif-gtk
 
 EVAL_PREFIX+=	BUILDLINK_PREFIX.libexif-gtk=libexif-gtk
diff --git a/graphics/libgnomecanvas/Makefile b/graphics/libgnomecanvas/Makefile
index ec994457827..b7e8081a513 100644
--- a/graphics/libgnomecanvas/Makefile
+++ b/graphics/libgnomecanvas/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.15 2003/07/17 21:41:34 grant Exp $
+# $NetBSD: Makefile,v 1.16 2003/12/13 00:45:24 wiz Exp $
 #
 
 DISTNAME=		libgnomecanvas-2.2.1
-PKGREVISION=		1
+PKGREVISION=		2
 CATEGORIES=		graphics gnome
 MASTER_SITES=		${MASTER_SITE_GNOME:=sources/libgnomecanvas/2.2/}
 EXTRACT_SUFX=		.tar.bz2
diff --git a/graphics/libgnomecanvas/buildlink2.mk b/graphics/libgnomecanvas/buildlink2.mk
index 1ac5c8d7af9..beb0913e9fc 100644
--- a/graphics/libgnomecanvas/buildlink2.mk
+++ b/graphics/libgnomecanvas/buildlink2.mk
@@ -1,10 +1,10 @@
-# $NetBSD: buildlink2.mk,v 1.7 2003/07/13 13:52:10 wiz Exp $
+# $NetBSD: buildlink2.mk,v 1.8 2003/12/13 00:45:24 wiz Exp $
 
 .if !defined(LIBGNOMECANVAS_BUILDLINK2_MK)
 LIBGNOMECANVAS_BUILDLINK2_MK=	# defined
 
 BUILDLINK_PACKAGES+=		libgnomecanvas
-BUILDLINK_DEPENDS.libgnomecanvas?=	libgnomecanvas>=2.2.1nb1
+BUILDLINK_DEPENDS.libgnomecanvas?=	libgnomecanvas>=2.2.1nb2
 BUILDLINK_PKGSRCDIR.libgnomecanvas?=	../../graphics/libgnomecanvas
 
 EVAL_PREFIX+=	BUILDLINK_PREFIX.libgnomecanvas=libgnomecanvas
diff --git a/graphics/librsvg2/Makefile b/graphics/librsvg2/Makefile
index 4d9ab50dab1..0a6113ff494 100644
--- a/graphics/librsvg2/Makefile
+++ b/graphics/librsvg2/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.12 2003/12/04 19:48:25 xtraeme Exp $
+# $NetBSD: Makefile,v 1.13 2003/12/13 00:45:24 wiz Exp $
 #
 
 DISTNAME=		librsvg-2.2.5
 PKGNAME=		${DISTNAME:S/-/2-/}
-PKGREVISION=		3
+PKGREVISION=		4
 CATEGORIES=		graphics gnome
 MASTER_SITES=		${MASTER_SITE_GNOME:=sources/librsvg/2.2/}
 EXTRACT_SUFX=		.tar.bz2
diff --git a/graphics/librsvg2/buildlink2.mk b/graphics/librsvg2/buildlink2.mk
index f23b526d0ed..9f3916ab32c 100644
--- a/graphics/librsvg2/buildlink2.mk
+++ b/graphics/librsvg2/buildlink2.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.6 2003/11/12 01:31:49 salo Exp $
+# $NetBSD: buildlink2.mk,v 1.7 2003/12/13 00:45:24 wiz Exp $
 #
 # This Makefile fragment is included by packages that use librsvg2.
 #
@@ -9,7 +9,7 @@
 LIBRSVG2_BUILDLINK2_MK=	# defined
 
 BUILDLINK_PACKAGES+=			librsvg2
-BUILDLINK_DEPENDS.librsvg2?=		librsvg2>=2.2.5nb2
+BUILDLINK_DEPENDS.librsvg2?=		librsvg2>=2.2.5nb4
 BUILDLINK_PKGSRCDIR.librsvg2?=		../../graphics/librsvg2
 
 EVAL_PREFIX+=	BUILDLINK_PREFIX.librsvg2=librsvg2
diff --git a/graphics/nvtv-gtk2/Makefile b/graphics/nvtv-gtk2/Makefile
index 2320be6fca9..a3b47a7950f 100644
--- a/graphics/nvtv-gtk2/Makefile
+++ b/graphics/nvtv-gtk2/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.4 2003/10/06 12:55:36 cube Exp $
+# $NetBSD: Makefile,v 1.5 2003/12/13 00:45:24 wiz Exp $
 
 PKGNAME=	${DISTNAME:S/-/-gtk2-/}
+PKGREVISION=	1
 .include "../../graphics/nvtv/Makefile.common"
 
 CONFLICTS=	nvtv-[0-9]*
diff --git a/graphics/sodipodi/Makefile b/graphics/sodipodi/Makefile
index e6639ada079..dbd0df12915 100644
--- a/graphics/sodipodi/Makefile
+++ b/graphics/sodipodi/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.18 2003/11/12 01:31:50 salo Exp $
+# $NetBSD: Makefile,v 1.19 2003/12/13 00:45:24 wiz Exp $
 #
 
 DISTNAME=	sodipodi-0.31
-PKGREVISION=	4
+PKGREVISION=	5
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=sodipodi/}
 
diff --git a/graphics/swfdec/Makefile b/graphics/swfdec/Makefile
index f075f4ce69b..df95a1f9e78 100644
--- a/graphics/swfdec/Makefile
+++ b/graphics/swfdec/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.8 2003/07/26 21:41:26 jmmv Exp $
+# $NetBSD: Makefile,v 1.9 2003/12/13 00:45:24 wiz Exp $
 #
 
 DISTNAME=		swfdec-0.2.1
-PKGREVISION=		4
+PKGREVISION=		5
 CATEGORIES=		graphics
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=swfdec/}
 
diff --git a/graphics/swfdec/buildlink2.mk b/graphics/swfdec/buildlink2.mk
index 9abf84fba88..769287566f4 100644
--- a/graphics/swfdec/buildlink2.mk
+++ b/graphics/swfdec/buildlink2.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.4 2003/07/26 21:41:26 jmmv Exp $
+# $NetBSD: buildlink2.mk,v 1.5 2003/12/13 00:45:24 wiz Exp $
 #
 # This Makefile fragment is included by packages that use swfdec.
 #
@@ -9,7 +9,7 @@
 SWFDEC_BUILDLINK2_MK=	# defined
 
 BUILDLINK_PACKAGES+=			swfdec
-BUILDLINK_DEPENDS.swfdec?=		swfdec>=0.2.1nb4
+BUILDLINK_DEPENDS.swfdec?=		swfdec>=0.2.1nb5
 BUILDLINK_PKGSRCDIR.swfdec?=		../../graphics/swfdec
 
 EVAL_PREFIX+=	BUILDLINK_PREFIX.swfdec=swfdec
diff --git a/graphics/xfce4-artwork/Makefile b/graphics/xfce4-artwork/Makefile
index 45f7590042b..4460b5e2684 100644
--- a/graphics/xfce4-artwork/Makefile
+++ b/graphics/xfce4-artwork/Makefile
@@ -1,10 +1,11 @@
-# $NetBSD: Makefile,v 1.1.1.1 2003/09/26 10:27:37 martti Exp $
+# $NetBSD: Makefile,v 1.2 2003/12/13 00:45:24 wiz Exp $
 
 .include "../../meta-pkgs/xfce4/Makefile.common"
 
 XFCE4_VERSION=	0.0.4
 
 DISTNAME=	xfce4-artwork-${XFCE4_VERSION}
+PKGREVISION=	1
 CATEGORIES=	graphics
 MASTER_SITES=	http://download.berlios.de/xfce-goodies/
 COMMENT=	XFce4 artwork
diff --git a/graphics/xfce4-artwork/buildlink2.mk b/graphics/xfce4-artwork/buildlink2.mk
index 3d509f91d85..a9146466685 100644
--- a/graphics/xfce4-artwork/buildlink2.mk
+++ b/graphics/xfce4-artwork/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:24 wiz Exp $
 #
 # This Makefile fragment is included by packages that use xfce4-artwork.
 #
@@ -9,7 +9,7 @@
 XFCE4_ARTWORK_BUILDLINK2_MK=	# defined
 
 BUILDLINK_PACKAGES+=			xfce4-artwork
-BUILDLINK_DEPENDS.xfce4-artwork?=		xfce4-artwork>=0.0.4
+BUILDLINK_DEPENDS.xfce4-artwork?=		xfce4-artwork>=0.0.4nb1
 BUILDLINK_PKGSRCDIR.xfce4-artwork?=		../../graphics/xfce4-artwork
 
 EVAL_PREFIX+=	BUILDLINK_PREFIX.xfce4-artwork=xfce4-artwork
diff --git a/graphics/xfce4-iconbox/Makefile b/graphics/xfce4-iconbox/Makefile
index b5378affaf4..1de39c02323 100644
--- a/graphics/xfce4-iconbox/Makefile
+++ b/graphics/xfce4-iconbox/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.1.1.1 2003/09/26 10:28:20 martti Exp $
+# $NetBSD: Makefile,v 1.2 2003/12/13 00:45:24 wiz Exp $
 
 .include "../../meta-pkgs/xfce4/Makefile.common"
 
 DISTNAME=	xfce4-iconbox-${XFCE4_VERSION}
+PKGREVISION=	1
 CATEGORIES=	graphics
 COMMENT=	XFce4 icon displayer
 
diff --git a/graphics/xfce4-iconbox/buildlink2.mk b/graphics/xfce4-iconbox/buildlink2.mk
index bed93296c6e..d143ebbf64c 100644
--- a/graphics/xfce4-iconbox/buildlink2.mk
+++ b/graphics/xfce4-iconbox/buildlink2.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.4 2003/12/03 05:34:08 martti Exp $
+# $NetBSD: buildlink2.mk,v 1.5 2003/12/13 00:45:24 wiz Exp $
 #
 # This Makefile fragment is included by packages that use xfce4-iconbox.
 #
@@ -9,7 +9,7 @@
 XFCE4_ICONBOX_BUILDLINK2_MK=	# defined
 
 BUILDLINK_PACKAGES+=			xfce4-iconbox
-BUILDLINK_DEPENDS.xfce4-iconbox?=		xfce4-iconbox>=4.0.1
+BUILDLINK_DEPENDS.xfce4-iconbox?=		xfce4-iconbox>=4.0.1nb1
 BUILDLINK_PKGSRCDIR.xfce4-iconbox?=		../../graphics/xfce4-iconbox
 
 EVAL_PREFIX+=	BUILDLINK_PREFIX.xfce4-iconbox=xfce4-iconbox
diff --git a/inputmethod/nabi/Makefile b/inputmethod/nabi/Makefile
index 29208827c0a..6a952c4cc71 100644
--- a/inputmethod/nabi/Makefile
+++ b/inputmethod/nabi/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.6 2003/11/29 17:09:12 junyoung Exp $
+# $NetBSD: Makefile,v 1.7 2003/12/13 00:45:24 wiz Exp $
 #
 
 DISTNAME=		nabi-0.11
+PKGREVISION=		1
 CATEGORIES=		korean inputmethod
 MASTER_SITES=		http://download.kldp.net/nabi/
 
diff --git a/mail/balsa2/Makefile b/mail/balsa2/Makefile
index f5abfe05efe..55476dd7ef3 100644
--- a/mail/balsa2/Makefile
+++ b/mail/balsa2/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.11 2003/11/12 03:39:40 jschauma Exp $
+# $NetBSD: Makefile,v 1.12 2003/12/13 00:45:24 wiz Exp $
 #
 
 DISTNAME=		balsa-2.0.15
-PKGREVISION=		2
+PKGREVISION=		3
 CATEGORIES=		mail gnome
 MASTER_SITES=		http://balsa.gnome.org/				\
 			ftp://ftp.newton.cx/pub/balsa/
diff --git a/mail/sylpheed-gtk2/Makefile b/mail/sylpheed-gtk2/Makefile
index 3371ed95906..f04afcaaeae 100644
--- a/mail/sylpheed-gtk2/Makefile
+++ b/mail/sylpheed-gtk2/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.3 2003/11/12 03:39:41 jschauma Exp $
+# $NetBSD: Makefile,v 1.4 2003/12/13 00:45:24 wiz Exp $
 #
 
 DISTNAME=	sylpheed-0.9.5-gtk2-20030906
 PKGNAME=	sylpheed-gtk2-0.9.5
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	mail x11
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=sylpheed-gtk2/}
 
diff --git a/mail/sylpheed/Makefile b/mail/sylpheed/Makefile
index 72ad78bb08f..53e11d7a175 100644
--- a/mail/sylpheed/Makefile
+++ b/mail/sylpheed/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.51 2003/11/12 03:39:41 jschauma Exp $
+# $NetBSD: Makefile,v 1.52 2003/12/13 00:45:24 wiz Exp $
 
 DISTNAME=	sylpheed-0.9.7
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	mail news x11
 MASTER_SITES=	http://sylpheed.good-day.net/sylpheed/
 EXTRACT_SUFX=	.tar.bz2
diff --git a/math/gcalctool/Makefile b/math/gcalctool/Makefile
index d4e015f5cdb..631d09374ed 100644
--- a/math/gcalctool/Makefile
+++ b/math/gcalctool/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.10 2003/11/12 01:31:50 salo Exp $
+# $NetBSD: Makefile,v 1.11 2003/12/13 00:45:24 wiz Exp $
 #
 
 DISTNAME=		gcalctool-4.2.83
-PKGREVISION=		3
+PKGREVISION=		4
 CATEGORIES=		math gnome
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=calctool/}
 
diff --git a/meta-pkgs/gnome2/Makefile b/meta-pkgs/gnome2/Makefile
index eea8d9d63fb..6d0e2323033 100644
--- a/meta-pkgs/gnome2/Makefile
+++ b/meta-pkgs/gnome2/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.11 2003/09/12 17:45:02 xtraeme Exp $
+# $NetBSD: Makefile,v 1.12 2003/12/13 00:45:24 wiz Exp $
 
 DISTNAME=	gnome-2.2.6
+PKGREVISION=	1
 CATEGORIES=	meta-pkgs x11 gnome
 MASTER_SITES=	# empty
 DISTFILES=	# empty
diff --git a/meta-pkgs/xfce4/Makefile b/meta-pkgs/xfce4/Makefile
index 0b74dd78bc2..f9b201e0341 100644
--- a/meta-pkgs/xfce4/Makefile
+++ b/meta-pkgs/xfce4/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.3 2003/12/03 06:43:28 martti Exp $
+# $NetBSD: Makefile,v 1.4 2003/12/13 00:45:24 wiz Exp $
 
 .include "Makefile.common"
 
 DISTNAME=	xfce4-${XFCE4_VERSION}
+PKGREVISION=	1
 DISTFILES=	# empty
 CATEGORIES=	meta-pkgs
 COMMENT=	XFce4
diff --git a/meta-pkgs/xfce4/buildlink2.mk b/meta-pkgs/xfce4/buildlink2.mk
index a31df9e61de..099152a1be9 100644
--- a/meta-pkgs/xfce4/buildlink2.mk
+++ b/meta-pkgs/xfce4/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:24 wiz Exp $
 #
 # This Makefile fragment is included by packages that use xfce4.
 #
@@ -9,7 +9,7 @@
 XFCE4_BUILDLINK2_MK=	# defined
 
 BUILDLINK_PACKAGES+=			xfce4
-BUILDLINK_DEPENDS.xfce4?=		xfce4>=4.0.0
+BUILDLINK_DEPENDS.xfce4?=		xfce4>=4.0.1nb1
 BUILDLINK_PKGSRCDIR.xfce4?=		../../meta-pkgs/xfce4
 
 EVAL_PREFIX+=	BUILDLINK_PREFIX.xfce4=xfce4
diff --git a/misc/gnome2-utils/Makefile b/misc/gnome2-utils/Makefile
index 8ea86ac7679..158eec24ee6 100644
--- a/misc/gnome2-utils/Makefile
+++ b/misc/gnome2-utils/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.9 2003/11/12 01:31:50 salo Exp $
+# $NetBSD: Makefile,v 1.10 2003/12/13 00:45:24 wiz Exp $
 #
 
 DISTNAME=		gnome-utils-2.2.1
-PKGREVISION=		4
+PKGREVISION=		5
 CATEGORIES=		misc gnome
 MASTER_SITES=		${MASTER_SITE_GNOME:=sources/gnome-utils/2.2/}
 EXTRACT_SUFX=		.tar.bz2
diff --git a/misc/gperiodic/Makefile b/misc/gperiodic/Makefile
index 59a2cd9d7cc..d257511bca8 100644
--- a/misc/gperiodic/Makefile
+++ b/misc/gperiodic/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.16 2003/07/30 14:05:26 wiz Exp $
+# $NetBSD: Makefile,v 1.17 2003/12/13 00:45:24 wiz Exp $
 
 DISTNAME=		gperiodic-2.0.5
+PKGREVISION=		1
 CATEGORIES=		misc x11
 MASTER_SITES=		http://www.acclab.helsinki.fi/~frantz/software/
 
diff --git a/misc/gst-plugins/Makefile b/misc/gst-plugins/Makefile
index 12796bf2a5a..3035fe963a5 100644
--- a/misc/gst-plugins/Makefile
+++ b/misc/gst-plugins/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.11 2003/12/08 14:41:40 wiz Exp $
+# $NetBSD: Makefile,v 1.12 2003/12/13 00:45:24 wiz Exp $
 #
 
 DISTNAME=		gst-plugins-0.6.1
-PKGREVISION=		7
+PKGREVISION=		8
 CATEGORIES=		misc gnome
 MASTER_SITES=		${MASTER_SITE_GNOME:=sources/gst-plugins/0.6/}
 EXTRACT_SUFX=		.tar.bz2
diff --git a/misc/gst-plugins/buildlink2.mk b/misc/gst-plugins/buildlink2.mk
index c721aaf953b..cf62e6d8b18 100644
--- a/misc/gst-plugins/buildlink2.mk
+++ b/misc/gst-plugins/buildlink2.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.5 2003/12/08 14:41:40 wiz Exp $
+# $NetBSD: buildlink2.mk,v 1.6 2003/12/13 00:45:24 wiz Exp $
 #
 # This Makefile fragment is included by packages that use gst-plugins.
 #
@@ -7,7 +7,7 @@
 GST_PLUGINS_BUILDLINK2_MK=	# defined
 
 BUILDLINK_PACKAGES+=			gst-plugins
-BUILDLINK_DEPENDS.gst-plugins?=		gst-plugins>=0.6.1nb7
+BUILDLINK_DEPENDS.gst-plugins?=		gst-plugins>=0.6.1nb8
 BUILDLINK_PKGSRCDIR.gst-plugins?=		../../misc/gst-plugins
 
 EVAL_PREFIX+=	BUILDLINK_PREFIX.gst-plugins=gst-plugins
diff --git a/misc/gstreamer/Makefile b/misc/gstreamer/Makefile
index 04bd33e3b7e..1b5f142530b 100644
--- a/misc/gstreamer/Makefile
+++ b/misc/gstreamer/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.10 2003/12/04 19:48:25 xtraeme Exp $
+# $NetBSD: Makefile,v 1.11 2003/12/13 00:45:24 wiz Exp $
 #
 
 DISTNAME=		gstreamer-0.6.1
-PKGREVISION=		5
+PKGREVISION=		6
 CATEGORIES=		misc gnome
 MASTER_SITES=		${MASTER_SITE_GNOME:=sources/gstreamer/0.6/}
 EXTRACT_SUFX=		.tar.bz2
diff --git a/misc/gstreamer/buildlink2.mk b/misc/gstreamer/buildlink2.mk
index 247f3aeee51..0b880d0eab7 100644
--- a/misc/gstreamer/buildlink2.mk
+++ b/misc/gstreamer/buildlink2.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.6 2003/11/12 01:31:50 salo Exp $
+# $NetBSD: buildlink2.mk,v 1.7 2003/12/13 00:45:24 wiz Exp $
 #
 # This Makefile fragment is included by packages that use gstreamer.
 #
@@ -9,7 +9,7 @@
 GSTREAMER_BUILDLINK2_MK=	# defined
 
 BUILDLINK_PACKAGES+=			gstreamer
-BUILDLINK_DEPENDS.gstreamer?=		gstreamer>=0.6.1nb4
+BUILDLINK_DEPENDS.gstreamer?=		gstreamer>=0.6.1nb6
 BUILDLINK_PKGSRCDIR.gstreamer?=		../../misc/gstreamer
 
 EVAL_PREFIX+=	BUILDLINK_PREFIX.gstreamer=gstreamer
diff --git a/misc/yelp/Makefile b/misc/yelp/Makefile
index 49f7176dbcf..b86670b28c1 100644
--- a/misc/yelp/Makefile
+++ b/misc/yelp/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.2 2003/11/12 01:31:50 salo Exp $
+# $NetBSD: Makefile,v 1.3 2003/12/13 00:45:24 wiz Exp $
 #
 
 DISTNAME=		yelp-2.2.2
-PKGREVISION=		1
+PKGREVISION=		2
 CATEGORIES=		misc
 MASTER_SITES=		${MASTER_SITE_GNOME:=sources/yelp/2.2/}
 EXTRACT_SUFX=		.tar.bz2
diff --git a/net/bug-buddy/Makefile b/net/bug-buddy/Makefile
index aeba10b1347..f9b75bb7b9a 100644
--- a/net/bug-buddy/Makefile
+++ b/net/bug-buddy/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.10 2003/11/12 01:31:50 salo Exp $
+# $NetBSD: Makefile,v 1.11 2003/12/13 00:45:24 wiz Exp $
 #
 
 DISTNAME=		bug-buddy-2.2.0
-PKGREVISION=		6
+PKGREVISION=		7
 CATEGORIES=		net gnome
 MASTER_SITES=		${MASTER_SITE_GNOME:=sources/bug-buddy/2.2/}
 EXTRACT_SUFX=		.tar.bz2
diff --git a/net/dc_gui2/Makefile b/net/dc_gui2/Makefile
index fec342e32c7..40e976f32d2 100644
--- a/net/dc_gui2/Makefile
+++ b/net/dc_gui2/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.7 2003/11/12 01:31:50 salo Exp $
+# $NetBSD: Makefile,v 1.8 2003/12/13 00:45:24 wiz Exp $
 #
 
 DISTNAME=	dc_gui2-0.75
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	net
 MASTER_SITES=	http://www.ac2i.tzo.com/dctc/ \
 		http://brainz.servebeer.com/dctc/
diff --git a/net/etherape/Makefile b/net/etherape/Makefile
index e7545495863..ba3c79dea9d 100644
--- a/net/etherape/Makefile
+++ b/net/etherape/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.10 2003/11/12 01:31:51 salo Exp $
+# $NetBSD: Makefile,v 1.11 2003/12/13 00:45:24 wiz Exp $
 #
 
 DISTNAME=	etherape-0.9.0
-PKGREVISION=	3
+PKGREVISION=	4
 CATEGORIES=	gnome net
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=etherape/}
 
diff --git a/net/ethereal/Makefile b/net/ethereal/Makefile
index 1e9fc55a2a0..ddfd110dbc7 100644
--- a/net/ethereal/Makefile
+++ b/net/ethereal/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.87 2003/11/12 03:39:41 jschauma Exp $
+# $NetBSD: Makefile,v 1.88 2003/12/13 00:45:25 wiz Exp $
 #
 
 DISTNAME=		ethereal-0.9.16
-PKGREVISION=		1
+PKGREVISION=		2
 CATEGORIES=		net
 MASTER_SITES=		ftp://ftp.ethereal.com/pub/ethereal/ \
 			ftp://ftp.sunet.se/pub/network/monitoring/ethereal/ \
diff --git a/net/gftp/Makefile b/net/gftp/Makefile
index 4331e91dcf6..6198e197b21 100644
--- a/net/gftp/Makefile
+++ b/net/gftp/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.13 2003/09/01 21:38:43 xtraeme Exp $
+# $NetBSD: Makefile,v 1.14 2003/12/13 00:45:25 wiz Exp $
 #
 
 .include "${.CURDIR}/Makefile.common"
+PKGREVISION=	1
 
 COMMENT=	Multithreaded GTK2+ ftp client
 
diff --git a/net/nicotine/Makefile b/net/nicotine/Makefile
index 6a7c536ddfb..e4fe9204a36 100644
--- a/net/nicotine/Makefile
+++ b/net/nicotine/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.2 2003/09/16 11:40:26 recht Exp $
+# $NetBSD: Makefile,v 1.3 2003/12/13 00:45:25 wiz Exp $
 #
 
 DISTNAME=	nicotine-1.0.3
+PKGREVISION=	1
 CATEGORIES=	net audio x11
 MASTER_SITES=	http://nicotine.thegraveyard.org/
 EXTRACT_SUFX=	.tar.bz2
diff --git a/net/tsclient/Makefile b/net/tsclient/Makefile
index 6db07a035ab..35927ae153e 100644
--- a/net/tsclient/Makefile
+++ b/net/tsclient/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.4 2003/11/16 21:23:04 agc Exp $
+# $NetBSD: Makefile,v 1.5 2003/12/13 00:45:25 wiz Exp $
 #
 
 DISTNAME=		tsclient-0.124
-PKGREVISION=		1
+PKGREVISION=		2
 CATEGORIES=		net
 MASTER_SITES=		http://www.gnomepro.com/tsclient/
 
diff --git a/net/wistumbler2/Makefile b/net/wistumbler2/Makefile
index 97582235f5b..bc87b587cf3 100644
--- a/net/wistumbler2/Makefile
+++ b/net/wistumbler2/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.1.1.1 2003/12/03 19:11:01 xtraeme Exp $
+# $NetBSD: Makefile,v 1.2 2003/12/13 00:45:25 wiz Exp $
 
 DISTNAME=	wistumbler2.00-pre3
 PKGNAME=	${DISTNAME:S/wistumbler/wistumbler-/}
+PKGREVISION=	1
 CATEGORIES=	net
 MASTER_SITES=	ftp://ftp.nopcode.org/prj/wistumbler2/
 
diff --git a/news/pan/Makefile b/news/pan/Makefile
index fd0032fab63..047e5d167e8 100644
--- a/news/pan/Makefile
+++ b/news/pan/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.28 2003/12/04 19:48:25 xtraeme Exp $
+# $NetBSD: Makefile,v 1.29 2003/12/13 00:45:25 wiz Exp $
 #
 
 DISTNAME=		pan-0.14.2
-PKGREVISION=		1
+PKGREVISION=		2
 CATEGORIES=		news
 MASTER_SITES=		http://pan.rebelbase.com/download/releases/${DISTNAME:C/pan-//}/SOURCE/
 EXTRACT_SUFX=		.tar.bz2
diff --git a/print/ggv2/Makefile b/print/ggv2/Makefile
index 0b6b101f767..6aa31503ca6 100644
--- a/print/ggv2/Makefile
+++ b/print/ggv2/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.13 2003/11/12 01:31:51 salo Exp $
+# $NetBSD: Makefile,v 1.14 2003/12/13 00:45:25 wiz Exp $
 #
 
 DISTNAME=		ggv-2.0.0
-PKGREVISION=		3
+PKGREVISION=		4
 CATEGORIES=		print gnome
 MASTER_SITES=		${MASTER_SITE_GNOME:=sources/ggv/2.0/}
 EXTRACT_SUFX=		.tar.bz2
diff --git a/print/gpdf/Makefile b/print/gpdf/Makefile
index 216dfc12c44..463402ce035 100644
--- a/print/gpdf/Makefile
+++ b/print/gpdf/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.1.1.1 2003/12/03 23:24:22 xtraeme Exp $
+# $NetBSD: Makefile,v 1.2 2003/12/13 00:45:25 wiz Exp $
 #
 
 DISTNAME=	gpdf-0.111
+PKGREVISION=	1
 CATEGORIES=	print
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/gpdf/0.111/}
 EXTRACT_SUFX=	.tar.bz2
diff --git a/print/libgnomeprintui/Makefile b/print/libgnomeprintui/Makefile
index 5fbe47fd693..fa8a648dfc3 100644
--- a/print/libgnomeprintui/Makefile
+++ b/print/libgnomeprintui/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.14 2003/12/04 19:48:25 xtraeme Exp $
+# $NetBSD: Makefile,v 1.15 2003/12/13 00:45:25 wiz Exp $
 #
 
 DISTNAME=		libgnomeprintui-2.2.1.2
-PKGREVISION=		4
+PKGREVISION=		5
 CATEGORIES=		print gnome
 MASTER_SITES=		${MASTER_SITE_GNOME:=sources/libgnomeprintui/2.2/}
 EXTRACT_SUFX=		.tar.bz2
diff --git a/print/libgnomeprintui/buildlink2.mk b/print/libgnomeprintui/buildlink2.mk
index 8cceb27d6e8..e7f9f0ee166 100644
--- a/print/libgnomeprintui/buildlink2.mk
+++ b/print/libgnomeprintui/buildlink2.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.9 2003/11/12 01:31:51 salo Exp $
+# $NetBSD: buildlink2.mk,v 1.10 2003/12/13 00:45:25 wiz Exp $
 #
 # This Makefile fragment is included by packages that use libgnomeprintui.
 #
@@ -9,7 +9,7 @@
 LIBGNOMEPRINTUI_BUILDLINK2_MK=	# defined
 
 BUILDLINK_PACKAGES+=			libgnomeprintui
-BUILDLINK_DEPENDS.libgnomeprintui?=	libgnomeprintui>=2.2.1.2nb3
+BUILDLINK_DEPENDS.libgnomeprintui?=	libgnomeprintui>=2.2.1.2nb5
 BUILDLINK_PKGSRCDIR.libgnomeprintui?=	../../print/libgnomeprintui
 
 EVAL_PREFIX+=	BUILDLINK_PREFIX.libgnomeprintui=libgnomeprintui
diff --git a/print/xfce4-print/Makefile b/print/xfce4-print/Makefile
index 9cfefc2d24b..d1d73bd5b77 100644
--- a/print/xfce4-print/Makefile
+++ b/print/xfce4-print/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.1.1.1 2003/09/26 10:31:32 martti Exp $
+# $NetBSD: Makefile,v 1.2 2003/12/13 00:45:25 wiz Exp $
 
 .include "../../meta-pkgs/xfce4/Makefile.common"
 
 PKGNAME=	xfce4-print-${XFCE4_VERSION}
+PKGREVISION=	1
 DISTNAME=	xfprint-${XFCE4_VERSION}
 CATEGORIES=	print
 COMMENT=	XFce4 print dialog
diff --git a/print/xfce4-print/buildlink2.mk b/print/xfce4-print/buildlink2.mk
index db9620ff1ac..13cbf3559e6 100644
--- a/print/xfce4-print/buildlink2.mk
+++ b/print/xfce4-print/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:25 wiz Exp $
 #
 # This Makefile fragment is included by packages that use xfce4-print.
 #
@@ -9,7 +9,7 @@
 XFCE4_PRINT_BUILDLINK2_MK=	# defined
 
 BUILDLINK_PACKAGES+=			xfce4-print
-BUILDLINK_DEPENDS.xfce4-print?=		xfce4-print>=4.0.1
+BUILDLINK_DEPENDS.xfce4-print?=		xfce4-print>=4.0.1nb1
 BUILDLINK_PKGSRCDIR.xfce4-print?=		../../print/xfce4-print
 
 EVAL_PREFIX+=	BUILDLINK_PREFIX.xfce4-print=xfce4-print
diff --git a/security/seahorse/Makefile b/security/seahorse/Makefile
index a5e82158921..11a44586a1e 100644
--- a/security/seahorse/Makefile
+++ b/security/seahorse/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.15 2003/11/12 01:31:51 salo Exp $
+# $NetBSD: Makefile,v 1.16 2003/12/13 00:45:25 wiz Exp $
 
 DISTNAME=	seahorse-0.7.3
-PKGREVISION=	3
+PKGREVISION=	4
 CATEGORIES=	security
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=seahorse/}
 
diff --git a/sysutils/nautilus/Makefile b/sysutils/nautilus/Makefile
index 3252a7f699f..aedfdeb3ff5 100644
--- a/sysutils/nautilus/Makefile
+++ b/sysutils/nautilus/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.10 2003/12/04 19:48:25 xtraeme Exp $
+# $NetBSD: Makefile,v 1.11 2003/12/13 00:45:25 wiz Exp $
 #
 
 DISTNAME=		nautilus-2.2.3.1
-PKGREVISION=		8
+PKGREVISION=		9
 CATEGORIES=		sysutils gnome
 MASTER_SITES=		${MASTER_SITE_GNOME:=sources/nautilus/2.2/}
 EXTRACT_SUFX=		.tar.bz2
diff --git a/sysutils/nautilus/buildlink2.mk b/sysutils/nautilus/buildlink2.mk
index 10ce317746f..9bfcd03ec49 100644
--- a/sysutils/nautilus/buildlink2.mk
+++ b/sysutils/nautilus/buildlink2.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.4 2003/12/03 18:33:17 xtraeme Exp $
+# $NetBSD: buildlink2.mk,v 1.5 2003/12/13 00:45:25 wiz Exp $
 #
 # This Makefile fragment is included by packages that use nautilus.
 #
@@ -9,7 +9,7 @@
 NAUTILUS_BUILDLINK2_MK=	# defined
 
 BUILDLINK_PACKAGES+=			nautilus
-BUILDLINK_DEPENDS.nautilus?=		nautilus>=2.2.3.1nb6
+BUILDLINK_DEPENDS.nautilus?=		nautilus>=2.2.3.1nb9
 BUILDLINK_PKGSRCDIR.nautilus?=		../../sysutils/nautilus
 
 EVAL_PREFIX+=	BUILDLINK_PREFIX.nautilus=nautilus
diff --git a/sysutils/rox-session/Makefile b/sysutils/rox-session/Makefile
index 95051886bc1..65363ec5f48 100644
--- a/sysutils/rox-session/Makefile
+++ b/sysutils/rox-session/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.12 2003/12/04 19:48:25 xtraeme Exp $
+# $NetBSD: Makefile,v 1.13 2003/12/13 00:45:25 wiz Exp $
 #
 
 DISTNAME=	ROX-Session-0.1.14
 PKGNAME=	rox-session-0.1.14
-PKGREVISION=	6
+PKGREVISION=	7
 WRKSRC=		${WRKDIR}/${DISTNAME}/ROX-Session/src
 CATEGORIES=	sysutils
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=rox/}
diff --git a/sysutils/rox/Makefile b/sysutils/rox/Makefile
index f5611fd66f5..8bff9fbe5a5 100644
--- a/sysutils/rox/Makefile
+++ b/sysutils/rox/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.14 2003/12/04 19:48:25 xtraeme Exp $
+# $NetBSD: Makefile,v 1.15 2003/12/13 00:45:25 wiz Exp $
 #
 
 DISTNAME=	rox-1.2.0
-PKGREVISION=	7
+PKGREVISION=	8
 WRKSRC=		${WRKDIR}/${DISTNAME}/ROX-Filer/src
 CATEGORIES=	sysutils
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=rox/}
diff --git a/sysutils/xfce4-diskperf-plugin/Makefile b/sysutils/xfce4-diskperf-plugin/Makefile
index 963a94bac85..cd9c4644f70 100644
--- a/sysutils/xfce4-diskperf-plugin/Makefile
+++ b/sysutils/xfce4-diskperf-plugin/Makefile
@@ -1,10 +1,11 @@
-# $NetBSD: Makefile,v 1.1.1.1 2003/12/03 05:07:32 martti Exp $
+# $NetBSD: Makefile,v 1.2 2003/12/13 00:45:25 wiz Exp $
 
 .include "../../meta-pkgs/xfce4/Makefile.common"
 
 XFCE4_VERSION=	1.4
 
 DISTNAME=	xfce4-diskperf-plugin-${XFCE4_VERSION}
+PKGREVISION=	1
 CATEGORIES=	sysutils
 MASTER_SITES=	http://download.berlios.de/xfce-goodies/
 COMMENT=	XFce4 disk performance plugin
diff --git a/sysutils/xfce4-diskperf-plugin/buildlink2.mk b/sysutils/xfce4-diskperf-plugin/buildlink2.mk
index 0482ddadb19..c0b27c27a12 100644
--- a/sysutils/xfce4-diskperf-plugin/buildlink2.mk
+++ b/sysutils/xfce4-diskperf-plugin/buildlink2.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.1.1.1 2003/12/03 05:07:32 martti Exp $
+# $NetBSD: buildlink2.mk,v 1.2 2003/12/13 00:45:25 wiz Exp $
 #
 # This Makefile fragment is included by packages that use xfce4-diskperf-plugin.
 #
@@ -9,7 +9,7 @@
 XFCE4_DISKPERF_PLUGIN_BUILDLINK2_MK=	# defined
 
 BUILDLINK_PACKAGES+=			xfce4-diskperf-plugin
-BUILDLINK_DEPENDS.xfce4-diskperf-plugin?=		xfce4-diskperf-plugin>=1.4
+BUILDLINK_DEPENDS.xfce4-diskperf-plugin?=		xfce4-diskperf-plugin>=1.4nb1
 BUILDLINK_PKGSRCDIR.xfce4-diskperf-plugin?=		../../sysutils/xfce4-diskperf-plugin
 
 EVAL_PREFIX+=	BUILDLINK_PREFIX.xfce4-diskperf-plugin=xfce4-diskperf-plugin
diff --git a/sysutils/xfce4-fm-icons/Makefile b/sysutils/xfce4-fm-icons/Makefile
index 0bc9180bfc2..e1b698535c5 100644
--- a/sysutils/xfce4-fm-icons/Makefile
+++ b/sysutils/xfce4-fm-icons/Makefile
@@ -1,10 +1,11 @@
-# $NetBSD: Makefile,v 1.2 2003/12/03 05:34:08 martti Exp $
+# $NetBSD: Makefile,v 1.3 2003/12/13 00:45:25 wiz Exp $
 
 .include "../../meta-pkgs/xfce4/Makefile.common"
 
 XFCE4_VERSION=	4.0.0
 
 PKGNAME=	xfce4-fm-icons-${XFCE4_VERSION}
+PKREVISION=	1
 DISTNAME=	xffm-icons-${XFCE4_VERSION}
 CATEGORIES=	sysutils
 COMMENT=	XFce4 filemanager icons
diff --git a/sysutils/xfce4-fm/Makefile b/sysutils/xfce4-fm/Makefile
index daecee7ab59..27e87a2b28e 100644
--- a/sysutils/xfce4-fm/Makefile
+++ b/sysutils/xfce4-fm/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.3 2003/12/04 19:48:26 xtraeme Exp $
+# $NetBSD: Makefile,v 1.4 2003/12/13 00:45:25 wiz Exp $
 
 .include "../../meta-pkgs/xfce4/Makefile.common"
 
-PKGNAME=	xfce4-fm-${XFCE4_VERSION}
 DISTNAME=	xffm-${XFCE4_VERSION}
-PKGREVISION=	1
+PKGNAME=	xfce4-fm-${XFCE4_VERSION}
+PKGREVISION=	2
 CATEGORIES=	sysutils
 COMMENT=	XFce4 filemanager
 
diff --git a/sysutils/xfce4-fm/buildlink2.mk b/sysutils/xfce4-fm/buildlink2.mk
index a9304d8a5b9..9bf39795e1c 100644
--- a/sysutils/xfce4-fm/buildlink2.mk
+++ b/sysutils/xfce4-fm/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:25 wiz Exp $
 #
 # This Makefile fragment is included by packages that use xfce4-fm.
 #
@@ -9,7 +9,7 @@
 XFCE4_FM_BUILDLINK2_MK=	# defined
 
 BUILDLINK_PACKAGES+=			xfce4-fm
-BUILDLINK_DEPENDS.xfce4-fm?=		xfce4-fm>=4.0.1
+BUILDLINK_DEPENDS.xfce4-fm?=		xfce4-fm>=4.0.1nb2
 BUILDLINK_PKGSRCDIR.xfce4-fm?=		../../sysutils/xfce4-fm
 
 EVAL_PREFIX+=	BUILDLINK_PREFIX.xfce4-fm=xfce4-fm
diff --git a/sysutils/xfce4-minicmd-plugin/Makefile b/sysutils/xfce4-minicmd-plugin/Makefile
index a822769378a..fde50ad1139 100644
--- a/sysutils/xfce4-minicmd-plugin/Makefile
+++ b/sysutils/xfce4-minicmd-plugin/Makefile
@@ -1,10 +1,11 @@
-# $NetBSD: Makefile,v 1.2 2003/10/02 09:54:56 martti Exp $
+# $NetBSD: Makefile,v 1.3 2003/12/13 00:45:25 wiz Exp $
 
 .include "../../meta-pkgs/xfce4/Makefile.common"
 
 XFCE4_VERSION=	0.2.0
 
 DISTNAME=	xfce4-minicmd-plugin-${XFCE4_VERSION}
+PKGREVISION=	1
 CATEGORIES=	sysutils
 MASTER_SITES=	http://download.berlios.de/xfce-goodies/
 COMMENT=	XFce4 command plugin
diff --git a/sysutils/xfce4-minicmd-plugin/buildlink2.mk b/sysutils/xfce4-minicmd-plugin/buildlink2.mk
index 856d3977519..c9b3dfe38ec 100644
--- a/sysutils/xfce4-minicmd-plugin/buildlink2.mk
+++ b/sysutils/xfce4-minicmd-plugin/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:25 wiz Exp $
 #
 # This Makefile fragment is included by packages that use xfce4-minicmd-plugin.
 #
@@ -9,7 +9,7 @@
 XFCE4_MINICMD_PLUGIN_BUILDLINK2_MK=	# defined
 
 BUILDLINK_PACKAGES+=			xfce4-minicmd-plugin
-BUILDLINK_DEPENDS.xfce4-minicmd-plugin?=		xfce4-minicmd-plugin>=0.1.1
+BUILDLINK_DEPENDS.xfce4-minicmd-plugin?=		xfce4-minicmd-plugin>=0.2.0nb1
 BUILDLINK_PKGSRCDIR.xfce4-minicmd-plugin?=		../../sysutils/xfce4-minicmd-plugin
 
 EVAL_PREFIX+=	BUILDLINK_PREFIX.xfce4-minicmd-plugin=xfce4-minicmd-plugin
diff --git a/sysutils/xfce4-netload-plugin/Makefile b/sysutils/xfce4-netload-plugin/Makefile
index d25c94a5513..a5e12f1171b 100644
--- a/sysutils/xfce4-netload-plugin/Makefile
+++ b/sysutils/xfce4-netload-plugin/Makefile
@@ -1,10 +1,11 @@
-# $NetBSD: Makefile,v 1.3 2003/12/03 05:25:14 martti Exp $
+# $NetBSD: Makefile,v 1.4 2003/12/13 00:45:25 wiz Exp $
 
 .include "../../meta-pkgs/xfce4/Makefile.common"
 
 XFCE4_VERSION=	0.2.2
 
 DISTNAME=	xfce4-netload-plugin-${XFCE4_VERSION}
+PKGREVISION=	1
 CATEGORIES=	sysutils
 MASTER_SITES=	http://download.berlios.de/xfce-goodies/
 COMMENT=	XFce4 network load plugin
diff --git a/sysutils/xfce4-netload-plugin/buildlink2.mk b/sysutils/xfce4-netload-plugin/buildlink2.mk
index d9c4fc02ac0..1fca72f15f1 100644
--- a/sysutils/xfce4-netload-plugin/buildlink2.mk
+++ b/sysutils/xfce4-netload-plugin/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:25 wiz Exp $
 #
 # This Makefile fragment is included by packages that use xfce4-netload-plugin.
 #
@@ -9,7 +9,7 @@
 XFCE4_NETLOAD_PLUGIN_BUILDLINK2_MK=	# defined
 
 BUILDLINK_PACKAGES+=			xfce4-netload-plugin
-BUILDLINK_DEPENDS.xfce4-netload-plugin?=		xfce4-netload-plugin>=0.2.0pre6
+BUILDLINK_DEPENDS.xfce4-netload-plugin?=		xfce4-netload-plugin>=0.2.2nb1
 BUILDLINK_PKGSRCDIR.xfce4-netload-plugin?=		../../sysutils/xfce4-netload-plugin
 
 EVAL_PREFIX+=	BUILDLINK_PREFIX.xfce4-netload-plugin=xfce4-netload-plugin
diff --git a/sysutils/xfce4-showdesktop-plugin/Makefile b/sysutils/xfce4-showdesktop-plugin/Makefile
index a39a55a78ce..10c57827b95 100644
--- a/sysutils/xfce4-showdesktop-plugin/Makefile
+++ b/sysutils/xfce4-showdesktop-plugin/Makefile
@@ -1,10 +1,11 @@
-# $NetBSD: Makefile,v 1.1.1.1 2003/09/26 10:34:53 martti Exp $
+# $NetBSD: Makefile,v 1.2 2003/12/13 00:45:25 wiz Exp $
 
 .include "../../meta-pkgs/xfce4/Makefile.common"
 
 XFCE4_VERSION=	0.1.1
 
 DISTNAME=	xfce4-showdesktop-plugin-${XFCE4_VERSION}
+PKGREVISION=	1
 CATEGORIES=	sysutils
 MASTER_SITES=	http://download.berlios.de/xfce-goodies/
 COMMENT=	XFce4 showdesktop plugin
diff --git a/sysutils/xfce4-showdesktop-plugin/buildlink2.mk b/sysutils/xfce4-showdesktop-plugin/buildlink2.mk
index 169c9ac4fcb..dada0383896 100644
--- a/sysutils/xfce4-showdesktop-plugin/buildlink2.mk
+++ b/sysutils/xfce4-showdesktop-plugin/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:25 wiz Exp $
 #
 # This Makefile fragment is included by packages that use xfce4-showdesktop-plugin.
 #
@@ -9,7 +9,7 @@
 XFCE4_SHOWDESKTOP_PLUGIN_BUILDLINK2_MK=	# defined
 
 BUILDLINK_PACKAGES+=			xfce4-showdesktop-plugin
-BUILDLINK_DEPENDS.xfce4-showdesktop-plugin?=		xfce4-showdesktop-plugin>=0.1.1
+BUILDLINK_DEPENDS.xfce4-showdesktop-plugin?=		xfce4-showdesktop-plugin>=0.1.1nb1
 BUILDLINK_PKGSRCDIR.xfce4-showdesktop-plugin?=		../../sysutils/xfce4-showdesktop-plugin
 
 EVAL_PREFIX+=	BUILDLINK_PREFIX.xfce4-showdesktop-plugin=xfce4-showdesktop-plugin
diff --git a/sysutils/xfce4-systemload-plugin/Makefile b/sysutils/xfce4-systemload-plugin/Makefile
index a4e0d16cd49..d491d5e7fc0 100644
--- a/sysutils/xfce4-systemload-plugin/Makefile
+++ b/sysutils/xfce4-systemload-plugin/Makefile
@@ -1,10 +1,11 @@
-# $NetBSD: Makefile,v 1.2 2003/12/03 05:26:44 martti Exp $
+# $NetBSD: Makefile,v 1.3 2003/12/13 00:45:25 wiz Exp $
 
 .include "../../meta-pkgs/xfce4/Makefile.common"
 
 XFCE4_VERSION=	0.3.4
 
 DISTNAME=	xfce4-systemload-plugin-${XFCE4_VERSION}
+PKGREVISION=	1
 CATEGORIES=	sysutils
 MASTER_SITES=	http://download.berlios.de/xfce-goodies/
 COMMENT=	XFce4 system load plugin
diff --git a/sysutils/xfce4-systemload-plugin/buildlink2.mk b/sysutils/xfce4-systemload-plugin/buildlink2.mk
index b867fdb309f..c3ab06b8b4d 100644
--- a/sysutils/xfce4-systemload-plugin/buildlink2.mk
+++ b/sysutils/xfce4-systemload-plugin/buildlink2.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.3 2003/12/03 05:26:44 martti Exp $
+# $NetBSD: buildlink2.mk,v 1.4 2003/12/13 00:45:25 wiz Exp $
 #
 # This Makefile fragment is included by packages that use xfce4-systemload-plugin.
 #
@@ -9,7 +9,7 @@
 XFCE4_SYSTEMLOAD_PLUGIN_BUILDLINK2_MK=	# defined
 
 BUILDLINK_PACKAGES+=			xfce4-systemload-plugin
-BUILDLINK_DEPENDS.xfce4-systemload-plugin?=		xfce4-systemload-plugin>=0.3.4
+BUILDLINK_DEPENDS.xfce4-systemload-plugin?=		xfce4-systemload-plugin>=0.3.4nb1
 BUILDLINK_PKGSRCDIR.xfce4-systemload-plugin?=		../../sysutils/xfce4-systemload-plugin
 
 EVAL_PREFIX+=	BUILDLINK_PREFIX.xfce4-systemload-plugin=xfce4-systemload-plugin
diff --git a/sysutils/xfce4-systray/Makefile b/sysutils/xfce4-systray/Makefile
index ee3c4bce76d..884957aac38 100644
--- a/sysutils/xfce4-systray/Makefile
+++ b/sysutils/xfce4-systray/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:25 wiz Exp $
 
 .include "../../meta-pkgs/xfce4/Makefile.common"
 
 DISTNAME=	xfce4-systray-${XFCE4_VERSION}
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	sysutils
 COMMENT=	XFce4 systray plugin
 
diff --git a/sysutils/xfce4-systray/buildlink2.mk b/sysutils/xfce4-systray/buildlink2.mk
index 0a5baa04bb8..0d31dfe764c 100644
--- a/sysutils/xfce4-systray/buildlink2.mk
+++ b/sysutils/xfce4-systray/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:25 wiz Exp $
 #
 # This Makefile fragment is included by packages that use xfce4-systray.
 #
@@ -9,7 +9,7 @@
 XFCE4_SYSTRAY_BUILDLINK2_MK=	# defined
 
 BUILDLINK_PACKAGES+=			xfce4-systray
-BUILDLINK_DEPENDS.xfce4-systray?=		xfce4-systray>=4.0.1
+BUILDLINK_DEPENDS.xfce4-systray?=		xfce4-systray>=4.0.1nb2
 BUILDLINK_PKGSRCDIR.xfce4-systray?=		../../sysutils/xfce4-systray
 
 EVAL_PREFIX+=	BUILDLINK_PREFIX.xfce4-systray=xfce4-systray
diff --git a/textproc/gtkspell/Makefile b/textproc/gtkspell/Makefile
index 63b8ef9fa0e..7c2934e5470 100644
--- a/textproc/gtkspell/Makefile
+++ b/textproc/gtkspell/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.9 2003/07/17 22:54:18 grant Exp $
+# $NetBSD: Makefile,v 1.10 2003/12/13 00:45:25 wiz Exp $
 #
 
 DISTNAME=		gtkspell-2.0.2
-PKGREVISION=		4
+PKGREVISION=		5
 CATEGORIES=		textproc devel
 MASTER_SITES=		http://gtkspell.sourceforge.net/download/
 
diff --git a/textproc/gtkspell/buildlink2.mk b/textproc/gtkspell/buildlink2.mk
index ec84f3689b4..9464acd5c77 100644
--- a/textproc/gtkspell/buildlink2.mk
+++ b/textproc/gtkspell/buildlink2.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.5 2003/07/13 13:53:33 wiz Exp $
+# $NetBSD: buildlink2.mk,v 1.6 2003/12/13 00:45:25 wiz Exp $
 #
 # This Makefile fragment is included by packages that use gtkspell.
 #
@@ -9,7 +9,7 @@
 GTKSPELL_BUILDLINK2_MK=	# defined
 
 BUILDLINK_PACKAGES+=			gtkspell
-BUILDLINK_DEPENDS.gtkspell?=		gtkspell>=2.0.2nb4
+BUILDLINK_DEPENDS.gtkspell?=		gtkspell>=2.0.2nb5
 BUILDLINK_PKGSRCDIR.gtkspell?=		../../textproc/gtkspell
 
 EVAL_PREFIX+=	BUILDLINK_PREFIX.gtkspell=gtkspell
diff --git a/time/gdeskcal/Makefile b/time/gdeskcal/Makefile
index 2f808f4577d..4719d3b3ef6 100644
--- a/time/gdeskcal/Makefile
+++ b/time/gdeskcal/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.6 2003/09/09 14:52:57 recht Exp $
+# $NetBSD: Makefile,v 1.7 2003/12/13 00:45:25 wiz Exp $
 #
 
 DISTNAME=		gDeskCal-0_55
 PKGNAME=		gdeskcal-0.55
+PKGREVISION=		1
 CATEGORIES=		time
 MASTER_SITES=		http://www.pycage.de/download/
 
diff --git a/time/xfce4-datetime-plugin/Makefile b/time/xfce4-datetime-plugin/Makefile
index d6b74b44e31..8a5a1a87800 100644
--- a/time/xfce4-datetime-plugin/Makefile
+++ b/time/xfce4-datetime-plugin/Makefile
@@ -1,10 +1,11 @@
-# $NetBSD: Makefile,v 1.1.1.1 2003/12/03 05:14:20 martti Exp $
+# $NetBSD: Makefile,v 1.2 2003/12/13 00:45:25 wiz Exp $
 
 .include "../../meta-pkgs/xfce4/Makefile.common"
 
 XFCE4_VERSION=	0.2
 
 DISTNAME=	xfce4-datetime-plugin-${XFCE4_VERSION}
+PKGREVISION=	1
 CATEGORIES=	sysutils
 MASTER_SITES=	http://download.berlios.de/xfce-goodies/
 COMMENT=	XFce4 calendar plugin
diff --git a/time/xfce4-datetime-plugin/buildlink2.mk b/time/xfce4-datetime-plugin/buildlink2.mk
index 5b8c7888e98..fcd5875bc63 100644
--- a/time/xfce4-datetime-plugin/buildlink2.mk
+++ b/time/xfce4-datetime-plugin/buildlink2.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.1.1.1 2003/12/03 05:14:20 martti Exp $
+# $NetBSD: buildlink2.mk,v 1.2 2003/12/13 00:45:25 wiz Exp $
 #
 # This Makefile fragment is included by packages that use xfce4-datetime-plugin.
 #
@@ -9,7 +9,7 @@
 XFCE4_DATETIME_PLUGIN_BUILDLINK2_MK=	# defined
 
 BUILDLINK_PACKAGES+=			xfce4-datetime-plugin
-BUILDLINK_DEPENDS.xfce4-datetime-plugin?=		xfce4-datetime-plugin>=0.2
+BUILDLINK_DEPENDS.xfce4-datetime-plugin?=		xfce4-datetime-plugin>=0.2nb1
 BUILDLINK_PKGSRCDIR.xfce4-datetime-plugin?=		../../time/xfce4-datetime-plugin
 
 EVAL_PREFIX+=	BUILDLINK_PREFIX.xfce4-datetime-plugin=xfce4-datetime-plugin
diff --git a/wm/metacity-setup/Makefile b/wm/metacity-setup/Makefile
index 1897e46717e..62868f073cf 100644
--- a/wm/metacity-setup/Makefile
+++ b/wm/metacity-setup/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.5 2003/11/12 01:31:52 salo Exp $
+# $NetBSD: Makefile,v 1.6 2003/12/13 00:45:26 wiz Exp $
 #
 
 DISTNAME=	metacity-setup-0.7.1
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	wm
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=metacity-setup/}
 
diff --git a/wm/metacity/Makefile b/wm/metacity/Makefile
index a8abf11d2a5..f7d08ab5c44 100644
--- a/wm/metacity/Makefile
+++ b/wm/metacity/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=	metacity-2.4.55
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	wm x11 gnome
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/metacity/2.4/}
 EXTRACT_SUFX=	.tar.bz2
diff --git a/wm/metacity/buildlink2.mk b/wm/metacity/buildlink2.mk
index da896f93050..0d34def3181 100644
--- a/wm/metacity/buildlink2.mk
+++ b/wm/metacity/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 metacity.
 #
@@ -9,7 +9,7 @@
 METACITY_BUILDLINK2_MK=	# defined
 
 BUILDLINK_PACKAGES+=			metacity
-BUILDLINK_DEPENDS.metacity?=		metacity>=2.4.55nb1
+BUILDLINK_DEPENDS.metacity?=		metacity>=2.4.55nb2
 BUILDLINK_PKGSRCDIR.metacity?=		../../wm/metacity
 
 EVAL_PREFIX+=	BUILDLINK_PREFIX.metacity=metacity
diff --git a/wm/xfce4-wm-themes/Makefile b/wm/xfce4-wm-themes/Makefile
index 600e8c322f0..b4bcd2f9030 100644
--- a/wm/xfce4-wm-themes/Makefile
+++ b/wm/xfce4-wm-themes/Makefile
@@ -1,11 +1,12 @@
-# $NetBSD: Makefile,v 1.2 2003/12/03 05:34:08 martti Exp $
+# $NetBSD: Makefile,v 1.3 2003/12/13 00:45:26 wiz Exp $
 
 .include "../../meta-pkgs/xfce4/Makefile.common"
 
 XFCE4_VERSION=	4.0.0
 
-PKGNAME=	xfce4-wm-themes-${XFCE4_VERSION}
 DISTNAME=	xfwm4-themes-${XFCE4_VERSION}
+PKGNAME=	xfce4-wm-themes-${XFCE4_VERSION}
+PKGREVISION=	1
 CATEGORIES=	wm
 COMMENT=	XFce4 window manager themes
 
diff --git a/wm/xfce4-wm-themes/buildlink2.mk b/wm/xfce4-wm-themes/buildlink2.mk
index 16ab06b140c..bdb28f4f879 100644
--- a/wm/xfce4-wm-themes/buildlink2.mk
+++ b/wm/xfce4-wm-themes/buildlink2.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.3 2003/09/27 06:57:16 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 xfce4-wm-themes.
 #
@@ -9,7 +9,7 @@
 XFCE4_WM_THEMES_BUILDLINK2_MK=	# defined
 
 BUILDLINK_PACKAGES+=			xfce4-wm-themes
-BUILDLINK_DEPENDS.xfce4-wm-themes?=		xfce4-wm-themes>=4.0.0
+BUILDLINK_DEPENDS.xfce4-wm-themes?=		xfce4-wm-themes>=4.0.0nb1
 BUILDLINK_PKGSRCDIR.xfce4-wm-themes?=		../../wm/xfce4-wm-themes
 
 EVAL_PREFIX+=	BUILDLINK_PREFIX.xfce4-wm-themes=xfce4-wm-themes
diff --git a/wm/xfce4-wm/Makefile b/wm/xfce4-wm/Makefile
index b170a7fde22..6e374948780 100644
--- a/wm/xfce4-wm/Makefile
+++ b/wm/xfce4-wm/Makefile
@@ -1,9 +1,10 @@
-# $NetBSD: Makefile,v 1.1.1.1 2003/09/26 10:37:58 martti Exp $
+# $NetBSD: Makefile,v 1.2 2003/12/13 00:45:26 wiz Exp $
 
 .include "../../meta-pkgs/xfce4/Makefile.common"
 
-PKGNAME=	xfce4-wm-${XFCE4_VERSION}
 DISTNAME=	xfwm4-${XFCE4_VERSION}
+PKGNAME=	xfce4-wm-${XFCE4_VERSION}
+PKGREVISION=	1
 CATEGORIES=	wm
 COMMENT=	XFce4 window manager
 
diff --git a/wm/xfce4-wm/buildlink2.mk b/wm/xfce4-wm/buildlink2.mk
index 2b64691a38b..5d2373e7f67 100644
--- a/wm/xfce4-wm/buildlink2.mk
+++ b/wm/xfce4-wm/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 xfce4-wm.
 #
@@ -9,7 +9,7 @@
 XFCE4_WM_BUILDLINK2_MK=	# defined
 
 BUILDLINK_PACKAGES+=			xfce4-wm
-BUILDLINK_DEPENDS.xfce4-wm?=		xfce4-wm>=4.0.1
+BUILDLINK_DEPENDS.xfce4-wm?=		xfce4-wm>=4.0.1nb1
 BUILDLINK_PKGSRCDIR.xfce4-wm?=		../../wm/xfce4-wm
 
 EVAL_PREFIX+=	BUILDLINK_PREFIX.xfce4-wm=xfce4-wm
diff --git a/www/bluefish/Makefile b/www/bluefish/Makefile
index abc225f67de..a634f1723bb 100644
--- a/www/bluefish/Makefile
+++ b/www/bluefish/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.33 2003/12/03 03:50:15 xtraeme Exp $
+# $NetBSD: Makefile,v 1.34 2003/12/13 00:45:26 wiz Exp $
 #
 
 DISTNAME=	bluefish-0.12
+PKGREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	http://pkedu.fbt.eitn.wau.nl/~olivier/downloads/	\
 		ftp://bluefish.advancecreations.com/bluefish/downloads/ \
diff --git a/www/libgtkhtml/Makefile b/www/libgtkhtml/Makefile
index e2fff7c3624..56806733b1e 100644
--- a/www/libgtkhtml/Makefile
+++ b/www/libgtkhtml/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.10 2003/12/04 19:48:26 xtraeme Exp $
+# $NetBSD: Makefile,v 1.11 2003/12/13 00:45:26 wiz Exp $
 #
 
 DISTNAME=	libgtkhtml-2.2.1
-PKGREVISION=	4
+PKGREVISION=	5
 CATEGORIES=	devel gnome
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/libgtkhtml/2.2/}
 EXTRACT_SUFX=	.tar.bz2
diff --git a/www/libgtkhtml/buildlink2.mk b/www/libgtkhtml/buildlink2.mk
index d9b6bc77478..f7da68428aa 100644
--- a/www/libgtkhtml/buildlink2.mk
+++ b/www/libgtkhtml/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 libgtkhtml.
 #
@@ -9,7 +9,7 @@
 LIBGTKHTML_BUILDLINK2_MK=	# defined
 
 BUILDLINK_PACKAGES+=			libgtkhtml
-BUILDLINK_DEPENDS.libgtkhtml?=		libgtkhtml>=2.2.1nb3
+BUILDLINK_DEPENDS.libgtkhtml?=		libgtkhtml>=2.2.1nb5
 BUILDLINK_PKGSRCDIR.libgtkhtml?=	../../www/libgtkhtml
 
 EVAL_PREFIX+=	BUILDLINK_PREFIX.libgtkhtml=libgtkhtml
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