PKGREVISION++ due to devel/popt update.

176 files changed, 353 insertions, 330 deletions

diff --git a/archivers/file-roller/Makefile b/archivers/file-roller/Makefile
index b752f403107..7f0a9962505 100644
--- a/archivers/file-roller/Makefile
+++ b/archivers/file-roller/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.8 2003/08/28 20:05:13 xtraeme Exp $
+# $NetBSD: Makefile,v 1.9 2003/11/12 01:31:47 salo Exp $
 #
 
 DISTNAME=	file-roller-2.2.4
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	archivers gnome
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/file-roller/2.2/}
 
diff --git a/audio/gnome2-media/Makefile b/audio/gnome2-media/Makefile
index a50f179228b..139cfabcb5a 100644
--- a/audio/gnome2-media/Makefile
+++ b/audio/gnome2-media/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.4 2003/07/17 21:22:18 grant Exp $
+# $NetBSD: Makefile,v 1.5 2003/11/12 01:31:47 salo Exp $
 
 DISTNAME=		gnome-media-2.2.1.1
-PKGREVISION=		2
+PKGREVISION=		3
 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 38eef40f825..55d3ef0bc6d 100644
--- a/audio/gnome2-media/buildlink2.mk
+++ b/audio/gnome2-media/buildlink2.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.4 2003/07/13 13:50:25 wiz Exp $
+# $NetBSD: buildlink2.mk,v 1.5 2003/11/12 01:31:47 salo 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.1nb2
+BUILDLINK_DEPENDS.gnome-media?=		gnome-media>=2.2.1.1nb3
 BUILDLINK_PKGSRCDIR.gnome-media?=		../../audio/gnome2-media
 
 EVAL_PREFIX+=	BUILDLINK_PREFIX.gnome-media=gnome-media
diff --git a/cad/oregano/Makefile b/cad/oregano/Makefile
index 12a29ca23cd..d4746ac06ac 100644
--- a/cad/oregano/Makefile
+++ b/cad/oregano/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.19 2003/07/21 16:32:12 martti Exp $
+# $NetBSD: Makefile,v 1.20 2003/11/12 01:31:47 salo Exp $
 #
 
 DISTNAME=		oregano-0.20
-PKGREVISION=		7
+PKGREVISION=		8
 CATEGORIES=		cad gnome
 MASTER_SITES=		http://www.dtek.chalmers.se/~d4hult/oregano/download/
 
diff --git a/chat/everybuddy-gnome/Makefile b/chat/everybuddy-gnome/Makefile
index a2b89b64034..19d05c0820a 100644
--- a/chat/everybuddy-gnome/Makefile
+++ b/chat/everybuddy-gnome/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.9 2003/08/15 22:48:04 jmc Exp $
+# $NetBSD: Makefile,v 1.10 2003/11/12 01:31:47 salo Exp $
 
 .include "../everybuddy/Makefile.common"
 
 PKGNAME=	${DISTNAME:S/-/-gnome-/}
-PKGREVISION=	6
+PKGREVISION=	7
 CONFLICTS+=	everybuddy-[0-9]*
 COMMENT+=	with GNOME support
 
diff --git a/chat/gabber/Makefile b/chat/gabber/Makefile
index 7db9198ccb9..9578531da65 100644
--- a/chat/gabber/Makefile
+++ b/chat/gabber/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.24 2003/09/30 17:48:51 jmmv Exp $
+# $NetBSD: Makefile,v 1.25 2003/11/12 01:31:47 salo Exp $
 
 DISTNAME=	gabber-0.8.8
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	chat
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=gabber/}
 
diff --git a/chat/gaim-gnome/Makefile b/chat/gaim-gnome/Makefile
index b16e29d600a..aab8d93316c 100644
--- a/chat/gaim-gnome/Makefile
+++ b/chat/gaim-gnome/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.8 2003/07/13 13:50:45 wiz Exp $
+# $NetBSD: Makefile,v 1.9 2003/11/12 01:31:47 salo Exp $
 
 .include "../gaim-gtk1/Makefile.common"
 
 PKGNAME=	${DISTNAME:S/-/-gnome-/}
-PKGREVISION=	4
+PKGREVISION=	5
 CONFLICTS+=	gaim-[0-9]*
 COMMENT+=	with GNOME support
 
diff --git a/chat/gnomeicu/Makefile b/chat/gnomeicu/Makefile
index 948b9e8cc8e..febf7ae9778 100644
--- a/chat/gnomeicu/Makefile
+++ b/chat/gnomeicu/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.15 2003/08/15 22:22:43 jmc Exp $
+# $NetBSD: Makefile,v 1.16 2003/11/12 01:31:47 salo Exp $
 
 DISTNAME=	gnomeicu-0.96
-PKGREVISION=	7
+PKGREVISION=	8
 CATEGORIES=	chat gnome
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=gnomeicu/}
 EXTRACT_SUFX=	.tar.bz2
diff --git a/chat/gossip/Makefile b/chat/gossip/Makefile
index b2f9045ef7f..116a718394c 100644
--- a/chat/gossip/Makefile
+++ b/chat/gossip/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.5 2003/10/18 08:11:43 jmmv Exp $
+# $NetBSD: Makefile,v 1.6 2003/11/12 01:31:47 salo Exp $
 #
 
 DISTNAME=	gossip-0.5
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	chat
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/gossip/0.5/}
 EXTRACT_SUFX=	.tar.bz2
diff --git a/comms/gnome-pilot/Makefile b/comms/gnome-pilot/Makefile
index 37242183a55..b590e3ba318 100644
--- a/comms/gnome-pilot/Makefile
+++ b/comms/gnome-pilot/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.10 2003/07/17 21:26:42 grant Exp $
+# $NetBSD: Makefile,v 1.11 2003/11/12 01:31:47 salo Exp $
 #
 
 DISTNAME=		gnome-pilot-0.1.71
-PKGREVISION=		4
+PKGREVISION=		5
 CATEGORIES=		comms gnome
 MASTER_SITES=		${MASTER_SITE_GNOME:=sources/gnome-pilot/0.1/}
 EXTRACT_SUFX=		.tar.bz2
diff --git a/comms/gnome-pilot/buildlink2.mk b/comms/gnome-pilot/buildlink2.mk
index 6dca0b11698..24474f57708 100644
--- a/comms/gnome-pilot/buildlink2.mk
+++ b/comms/gnome-pilot/buildlink2.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.3 2003/07/13 13:50:50 wiz Exp $
+# $NetBSD: buildlink2.mk,v 1.4 2003/11/12 01:31:47 salo Exp $
 #
 # This Makefile fragment is included by packages that use gnome-pilot.
 #
@@ -9,7 +9,7 @@
 GNOME_PILOT_BUILDLINK2_MK=	# defined
 
 BUILDLINK_PACKAGES+=			gnome-pilot
-BUILDLINK_DEPENDS.gnome-pilot?=		gnome-pilot>=0.1.71nb4
+BUILDLINK_DEPENDS.gnome-pilot?=		gnome-pilot>=0.1.71nb5
 BUILDLINK_PKGSRCDIR.gnome-pilot?=		../../comms/gnome-pilot
 
 EVAL_PREFIX+=	BUILDLINK_PREFIX.gnome-pilot=gnome-pilot
diff --git a/databases/gtranscript/Makefile b/databases/gtranscript/Makefile
index 63742218d31..720605cb912 100644
--- a/databases/gtranscript/Makefile
+++ b/databases/gtranscript/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.20 2003/09/19 23:08:24 dent Exp $
+# $NetBSD: Makefile,v 1.21 2003/11/12 01:31:47 salo Exp $
 #
 
 DISTNAME=	gtranscript-0.0.1
-PKGREVISION=	4
+PKGREVISION=	5
 CATEGORIES=	databases
 MASTER_SITES=	ftp://ftp.matrix.com.br/pub/linuxberg/files/gnome/office/ \
 		ftp://ftp.abordo.com.br/pub/linuxberg/files/gnome/office/ \
diff --git a/databases/libgda/Makefile b/databases/libgda/Makefile
index 76a3fdac79d..b8c3cb49104 100644
--- a/databases/libgda/Makefile
+++ b/databases/libgda/Makefile
@@ -1,8 +1,10 @@
-# $NetBSD: Makefile,v 1.5 2003/09/11 12:38:26 jmmv Exp $
+# $NetBSD: Makefile,v 1.6 2003/11/12 01:31:47 salo Exp $
 #
 
 .include "Makefile.common"
 
+PKGREVISION=		1
+
 COMMENT=		GNU Database access library
 
 PKGCONFIG_OVERRIDE=	${WRKSRC}/libgda.pc.in
diff --git a/databases/libgda/buildlink2.mk b/databases/libgda/buildlink2.mk
index b32857d6a85..3982e4b22ae 100644
--- a/databases/libgda/buildlink2.mk
+++ b/databases/libgda/buildlink2.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.8 2003/09/11 12:38:26 jmmv Exp $
+# $NetBSD: buildlink2.mk,v 1.9 2003/11/12 01:31:47 salo Exp $
 #
 # This Makefile fragment is included by packages that use libgda.
 #
@@ -9,7 +9,7 @@
 LIBGDA_BUILDLINK2_MK=	# defined
 
 BUILDLINK_PACKAGES+=			libgda
-BUILDLINK_DEPENDS.libgda?=		libgda>=0.99.0
+BUILDLINK_DEPENDS.libgda?=		libgda>=0.99.0nb1
 BUILDLINK_PKGSRCDIR.libgda?=		../../databases/libgda
 
 EVAL_PREFIX+=	BUILDLINK_PREFIX.libgda=libgda
diff --git a/databases/libgnomedb/Makefile b/databases/libgnomedb/Makefile
index bb1ceb61bdd..c1c5a6c49f9 100644
--- a/databases/libgnomedb/Makefile
+++ b/databases/libgnomedb/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.13 2003/09/19 22:19:50 jmmv Exp $
+# $NetBSD: Makefile,v 1.14 2003/11/12 01:31:47 salo Exp $
 #
 
 DISTNAME=		libgnomedb-1.0.0
+PKGREVISION=		1
 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 1050c24212e..3c91e462dc2 100644
--- a/databases/libgnomedb/buildlink2.mk
+++ b/databases/libgnomedb/buildlink2.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.6 2003/09/11 12:40:23 jmmv Exp $
+# $NetBSD: buildlink2.mk,v 1.7 2003/11/12 01:31:47 salo 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>=0.99.0
+BUILDLINK_DEPENDS.libgnomedb?=		libgnomedb>=1.0.0nb1
 BUILDLINK_PKGSRCDIR.libgnomedb?=		../../databases/libgnomedb
 
 EVAL_PREFIX+=	BUILDLINK_PREFIX.libgnomedb=libgnomedb
diff --git a/databases/mergeant/Makefile b/databases/mergeant/Makefile
index e76a458a8c3..98c9ca36535 100644
--- a/databases/mergeant/Makefile
+++ b/databases/mergeant/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.10 2003/09/11 12:41:23 jmmv Exp $
+# $NetBSD: Makefile,v 1.11 2003/11/12 01:31:47 salo Exp $
 #
 
 DISTNAME=		mergeant-0.12.1
-PKGREVISION=		2
+PKGREVISION=		3
 CATEGORIES=		databases gnome
 MASTER_SITES=		${MASTER_SITE_GNOME:=sources/mergeant/0.12/}
 EXTRACT_SUFX=		.tar.bz2
diff --git a/devel/GConf/Makefile b/devel/GConf/Makefile
index 39065368485..4e5769b91f0 100644
--- a/devel/GConf/Makefile
+++ b/devel/GConf/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.37 2003/07/21 16:43:13 martti Exp $
+# $NetBSD: Makefile,v 1.38 2003/11/12 01:31:47 salo Exp $
 #
 
 DISTNAME=		GConf-1.0.9
-PKGREVISION=		3
+PKGREVISION=		4
 CATEGORIES=		devel gnome
 MASTER_SITES=		${MASTER_SITE_GNOME:=sources/GConf/1.0/}
 EXTRACT_SUFX=		.tar.bz2
diff --git a/devel/GConf/buildlink2.mk b/devel/GConf/buildlink2.mk
index 16d4f79a8ab..f86c8ac454e 100644
--- a/devel/GConf/buildlink2.mk
+++ b/devel/GConf/buildlink2.mk
@@ -1,10 +1,10 @@
-# $NetBSD: buildlink2.mk,v 1.4 2003/07/13 13:51:00 wiz Exp $
+# $NetBSD: buildlink2.mk,v 1.5 2003/11/12 01:31:47 salo Exp $
 
 .if !defined(GCONF_BUILDLINK2_MK)
 GCONF_BUILDLINK2_MK=	# defined
 
 BUILDLINK_PACKAGES+=		gconf
-BUILDLINK_DEPENDS.gconf?=	GConf>=1.0.9nb3
+BUILDLINK_DEPENDS.gconf?=	GConf>=1.0.9nb4
 BUILDLINK_PKGSRCDIR.gconf?=	../../devel/GConf
 
 EVAL_PREFIX+=			BUILDLINK_PREFIX.gconf=GConf
diff --git a/devel/GConf2-ui/Makefile b/devel/GConf2-ui/Makefile
index a81b151f38d..6a4256a4341 100644
--- a/devel/GConf2-ui/Makefile
+++ b/devel/GConf2-ui/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.4 2003/07/13 13:51:00 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2003/11/12 01:31:47 salo Exp $
 #
 
 .include "../../devel/GConf2/Makefile.common"
 
 PKGNAME=	${DISTNAME:S/GConf/GConf2-ui/}
-PKGREVISION=	2
+PKGREVISION=	3
 
 CONFIGURE_ENV+=	PKG_USE_GTK=yes
 
diff --git a/devel/GConf2-ui/buildlink2.mk b/devel/GConf2-ui/buildlink2.mk
index e7d1a539576..af802844a5b 100644
--- a/devel/GConf2-ui/buildlink2.mk
+++ b/devel/GConf2-ui/buildlink2.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.4 2003/07/13 13:51:00 wiz Exp $
+# $NetBSD: buildlink2.mk,v 1.5 2003/11/12 01:31:47 salo 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.0nb2
+BUILDLINK_DEPENDS.GConf2-ui?=		GConf2-ui>=2.2.0nb3
 BUILDLINK_PKGSRCDIR.GConf2-ui?=		../../devel/GConf2-ui
 
 EVAL_PREFIX+=	BUILDLINK_PREFIX.GConf2-ui=GConf2-ui
diff --git a/devel/GConf2/Makefile b/devel/GConf2/Makefile
index 1213f623f09..83a4bfdc9fa 100644
--- a/devel/GConf2/Makefile
+++ b/devel/GConf2/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.16 2003/07/13 13:51:00 wiz Exp $
+# $NetBSD: Makefile,v 1.17 2003/11/12 01:31:47 salo Exp $
 #
 
 .include "../../devel/GConf2/Makefile.common"
 
 PKGNAME=	${DISTNAME:S/GConf/GConf2/}
-PKGREVISION=	2
+PKGREVISION=	3
 
 USE_PKGINSTALL=	YES
 
diff --git a/devel/GConf2/buildlink2.mk b/devel/GConf2/buildlink2.mk
index 228b57a58bc..537a2ad9e48 100644
--- a/devel/GConf2/buildlink2.mk
+++ b/devel/GConf2/buildlink2.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.17 2003/07/13 13:51:00 wiz Exp $
+# $NetBSD: buildlink2.mk,v 1.18 2003/11/12 01:31:47 salo Exp $
 #
 # This Makefile fragment is included by packages that use GConf2.
 #
@@ -9,7 +9,7 @@
 GCONF2_BUILDLINK2_MK=	# defined
 
 BUILDLINK_PACKAGES+=			GConf2
-BUILDLINK_DEPENDS.GConf2?=		GConf2>=2.2.0nb2
+BUILDLINK_DEPENDS.GConf2?=		GConf2>=2.2.0nb3
 BUILDLINK_PKGSRCDIR.GConf2?=		../../devel/GConf2
 
 EVAL_PREFIX+=	BUILDLINK_PREFIX.GConf2=GConf2
diff --git a/devel/anjuta/Makefile b/devel/anjuta/Makefile
index a7ace2c0220..b81fd37d971 100644
--- a/devel/anjuta/Makefile
+++ b/devel/anjuta/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.15 2003/07/17 21:29:26 grant Exp $
+# $NetBSD: Makefile,v 1.16 2003/11/12 01:31:47 salo Exp $
 #
 
 DISTNAME=		anjuta-1.0.1
-PKGREVISION=		4
+PKGREVISION=		5
 CATEGORIES=		devel
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=anjuta/}
 
diff --git a/devel/bonobo-activation/Makefile b/devel/bonobo-activation/Makefile
index cf398ecffba..54a74070d48 100644
--- a/devel/bonobo-activation/Makefile
+++ b/devel/bonobo-activation/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.22 2003/07/17 21:29:43 grant Exp $
+# $NetBSD: Makefile,v 1.23 2003/11/12 01:31:47 salo Exp $
 #
 
 DISTNAME=		bonobo-activation-2.1.1
-PKGREVISION=		2
+PKGREVISION=		3
 CATEGORIES=		devel gnome
 MASTER_SITES=		${MASTER_SITE_GNOME:=sources/bonobo-activation/2.1/}
 EXTRACT_SUFX=		.tar.bz2
diff --git a/devel/bonobo-activation/buildlink2.mk b/devel/bonobo-activation/buildlink2.mk
index 95e7954c6bd..ee5219dd2a0 100644
--- a/devel/bonobo-activation/buildlink2.mk
+++ b/devel/bonobo-activation/buildlink2.mk
@@ -1,10 +1,10 @@
-# $NetBSD: buildlink2.mk,v 1.10 2003/07/13 13:51:02 wiz Exp $
+# $NetBSD: buildlink2.mk,v 1.11 2003/11/12 01:31:47 salo Exp $
 
 .if !defined(BONOBO_ACTIVATION_BUILDLINK2_MK)
 BONOBO_ACTIVATION_BUILDLINK2_MK=	# defined
 
 BUILDLINK_PACKAGES+=				bonobo-activation
-BUILDLINK_DEPENDS.bonobo-activation?=		bonobo-activation>=2.1.1nb2
+BUILDLINK_DEPENDS.bonobo-activation?=		bonobo-activation>=2.1.1nb3
 BUILDLINK_PKGSRCDIR.bonobo-activation?=		../../devel/bonobo-activation
 
 EVAL_PREFIX+=	BUILDLINK_PREFIX.bonobo-activation=bonobo-activation
diff --git a/devel/bonobo-conf/Makefile b/devel/bonobo-conf/Makefile
index 6b0eeaa0ba2..71a440462a4 100644
--- a/devel/bonobo-conf/Makefile
+++ b/devel/bonobo-conf/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.15 2003/07/17 21:29:44 grant Exp $
+# $NetBSD: Makefile,v 1.16 2003/11/12 01:31:48 salo Exp $
 
 DISTNAME=		bonobo-conf-0.14
-PKGREVISION=		5
+PKGREVISION=		6
 CATEGORIES=		devel gnome
 MASTER_SITES=		${MASTER_SITE_GNOME:=sources/bonobo-conf/0.14/}
 
diff --git a/devel/bonobo-conf/buildlink2.mk b/devel/bonobo-conf/buildlink2.mk
index 30490a7ab83..272f736e443 100644
--- a/devel/bonobo-conf/buildlink2.mk
+++ b/devel/bonobo-conf/buildlink2.mk
@@ -1,10 +1,10 @@
-# $NetBSD: buildlink2.mk,v 1.6 2003/07/13 13:51:03 wiz Exp $
+# $NetBSD: buildlink2.mk,v 1.7 2003/11/12 01:31:48 salo Exp $
 
 .if !defined(BONOBO_CONF_BUILDLINK2_MK)
 BONOBO_CONF_BUILDLINK2_MK=	# defined
 
 BUILDLINK_PACKAGES+=			bonobo-conf
-BUILDLINK_DEPENDS.bonobo-conf?=		bonobo-conf>=0.14nb5
+BUILDLINK_DEPENDS.bonobo-conf?=		bonobo-conf>=0.14nb6
 BUILDLINK_PKGSRCDIR.bonobo-conf?=	../../devel/bonobo-conf
 
 EVAL_PREFIX+=			BUILDLINK_PREFIX.bonobo-conf=bonobo-conf
diff --git a/devel/bonobo/Makefile b/devel/bonobo/Makefile
index d3aaf3e9a6b..5405bf5bd98 100644
--- a/devel/bonobo/Makefile
+++ b/devel/bonobo/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.39 2003/07/17 21:29:42 grant Exp $
+# $NetBSD: Makefile,v 1.40 2003/11/12 01:31:47 salo Exp $
 #
 
 DISTNAME=		bonobo-1.0.18
-PKGREVISION=		5
+PKGREVISION=		6
 CATEGORIES=		devel
 MASTER_SITES=		${MASTER_SITE_GNOME:=sources/bonobo/1.0/}
 
diff --git a/devel/bonobo/buildlink2.mk b/devel/bonobo/buildlink2.mk
index 38b36482634..e019d5c01c2 100644
--- a/devel/bonobo/buildlink2.mk
+++ b/devel/bonobo/buildlink2.mk
@@ -1,10 +1,10 @@
-# $NetBSD: buildlink2.mk,v 1.6 2003/07/13 13:51:03 wiz Exp $
+# $NetBSD: buildlink2.mk,v 1.7 2003/11/12 01:31:47 salo Exp $
 
 .if !defined(BONOBO_BUILDLINK2_MK)
 BONOBO_BUILDLINK2_MK=	# defined
 
 BUILDLINK_PACKAGES+=		bonobo
-BUILDLINK_DEPENDS.bonobo?=	bonobo>=1.0.18nb5
+BUILDLINK_DEPENDS.bonobo?=	bonobo>=1.0.18nb6
 BUILDLINK_PKGSRCDIR.bonobo?=	../../devel/bonobo
 
 EVAL_PREFIX+=			BUILDLINK_PREFIX.bonobo=bonobo
diff --git a/devel/coconut/Makefile b/devel/coconut/Makefile
index a122eec3b84..608e6845bc9 100644
--- a/devel/coconut/Makefile
+++ b/devel/coconut/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.12 2003/09/28 09:13:56 jlam Exp $
+# $NetBSD: Makefile,v 1.13 2003/11/12 01:31:48 salo Exp $
 #
 
 DISTNAME=	coconut-0.3.0
-PKGREVISION=	5
+PKGREVISION=	6
 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 0546b22c11e..3c34f37b0b3 100644
--- a/devel/coconut/buildlink2.mk
+++ b/devel/coconut/buildlink2.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.7 2003/09/28 09:13:56 jlam Exp $
+# $NetBSD: buildlink2.mk,v 1.8 2003/11/12 01:31:48 salo 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.0nb5
+BUILDLINK_DEPENDS.coconut?=		coconut>=0.3.0nb6
 BUILDLINK_PKGSRCDIR.coconut?=		../../devel/coconut
 
 EVAL_PREFIX+=	BUILDLINK_PREFIX.coconut=coconut
diff --git a/devel/devhelp/Makefile b/devel/devhelp/Makefile
index 2d729d1f45c..cdc9b520904 100644
--- a/devel/devhelp/Makefile
+++ b/devel/devhelp/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.1.1.1 2003/09/25 16:04:06 xtraeme Exp $
+# $NetBSD: Makefile,v 1.2 2003/11/12 01:31:48 salo Exp $
 
 DISTNAME=		devhelp-0.7
+PKGREVISION=		1
 CATEGORIES=		devel x11
 MASTER_SITES=		${MASTER_SITE_GNOME:=sources/devhelp/0.7/}
 EXTRACT_SUFX=		.tar.bz2
diff --git a/devel/eel/Makefile b/devel/eel/Makefile
index 0b662021310..4e0e1dd5d11 100644
--- a/devel/eel/Makefile
+++ b/devel/eel/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.13 2003/07/17 21:30:23 grant Exp $
+# $NetBSD: Makefile,v 1.14 2003/11/12 01:31:48 salo Exp $
 #
 
 DISTNAME=		eel-1.0.1
-PKGREVISION=		4
+PKGREVISION=		5
 CATEGORIES=		devel gnome
 MASTER_SITES=		${MASTER_SITE_GNOME:=sources/eel/1.0/}/
 EXTRACT_SUFX=		.tar.bz2
diff --git a/devel/eel2/Makefile b/devel/eel2/Makefile
index 26a086f1539..76b128754b2 100644
--- a/devel/eel2/Makefile
+++ b/devel/eel2/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.13 2003/07/17 21:30:24 grant Exp $
+# $NetBSD: Makefile,v 1.14 2003/11/12 01:31:48 salo Exp $
 #
 
 DISTNAME=		eel-2.2.3.1
 PKGNAME=		${DISTNAME:S/-/2-/}
-PKGREVISION=		2
+PKGREVISION=		3
 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 5f664035789..968910babdf 100644
--- a/devel/eel2/buildlink2.mk
+++ b/devel/eel2/buildlink2.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.6 2003/07/13 13:51:06 wiz Exp $
+# $NetBSD: buildlink2.mk,v 1.7 2003/11/12 01:31:48 salo 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.1nb2
+BUILDLINK_DEPENDS.eel2?=		eel2>=2.2.3.1nb3
 BUILDLINK_PKGSRCDIR.eel2?=		../../devel/eel2
 
 EVAL_PREFIX+=	BUILDLINK_PREFIX.eel2=eel2
diff --git a/devel/gal/Makefile b/devel/gal/Makefile
index 330666f43a6..bd206435a81 100644
--- a/devel/gal/Makefile
+++ b/devel/gal/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.35 2003/07/17 21:30:35 grant Exp $
+# $NetBSD: Makefile,v 1.36 2003/11/12 01:31:48 salo Exp $
 
 DISTNAME=		gal-0.22
-PKGREVISION=		2
+PKGREVISION=		3
 CATEGORIES=		gnome devel
 MASTER_SITES=		${MASTER_SITE_GNOME:=sources/gal/0.22/}
 EXTRACT_SUFX=		.tar.bz2
diff --git a/devel/gal/buildlink2.mk b/devel/gal/buildlink2.mk
index 7ad6dfc6c82..8725c0bfcbc 100644
--- a/devel/gal/buildlink2.mk
+++ b/devel/gal/buildlink2.mk
@@ -1,10 +1,10 @@
-# $NetBSD: buildlink2.mk,v 1.7 2003/07/13 13:51:07 wiz Exp $
+# $NetBSD: buildlink2.mk,v 1.8 2003/11/12 01:31:48 salo Exp $
 
 .if !defined(GAL_BUILDLINK2_MK)
 GAL_BUILDLINK2_MK=	# defined
 
 BUILDLINK_PACKAGES+=		gal
-BUILDLINK_DEPENDS.gal?=		gal>=0.22nb2
+BUILDLINK_DEPENDS.gal?=		gal>=0.22nb3
 BUILDLINK_PKGSRCDIR.gal?=	../../devel/gal
 
 EVAL_PREFIX+=			BUILDLINK_PREFIX.gal=gal
diff --git a/devel/gal2/Makefile b/devel/gal2/Makefile
index 00c81e3ab64..a5d1f8933bc 100644
--- a/devel/gal2/Makefile
+++ b/devel/gal2/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.9 2003/07/17 21:30:36 grant Exp $
+# $NetBSD: Makefile,v 1.10 2003/11/12 01:31:48 salo Exp $
 #
 
 DISTNAME=		gal2-0-0.0.7
 PKGNAME=		${DISTNAME:S/-0-/-/}
-PKGREVISION=		4
+PKGREVISION=		5
 CATEGORIES=		devel gnome
 MASTER_SITES=		${MASTER_SITE_GNOME:=sources/gal2-0/0.0/}
 EXTRACT_SUFX=		.tar.bz2
diff --git a/devel/gal2/buildlink2.mk b/devel/gal2/buildlink2.mk
index 10b357beadb..de5456df633 100644
--- a/devel/gal2/buildlink2.mk
+++ b/devel/gal2/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/11/12 01:31:48 salo Exp $
 #
 # This Makefile fragment is included by packages that use gal2.
 #
@@ -9,7 +9,7 @@
 GAL2_BUILDLINK2_MK=	# defined
 
 BUILDLINK_PACKAGES+=			gal2
-BUILDLINK_DEPENDS.gal2?=		gal2>=0.0.7nb4
+BUILDLINK_DEPENDS.gal2?=		gal2>=0.0.7nb5
 BUILDLINK_PKGSRCDIR.gal2?=		../../devel/gal2
 
 EVAL_PREFIX+=	BUILDLINK_PREFIX.gal2=gal2
diff --git a/devel/gconfmm/Makefile b/devel/gconfmm/Makefile
index db0fbe21977..5b9a9f63ed4 100644
--- a/devel/gconfmm/Makefile
+++ b/devel/gconfmm/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.5 2003/07/17 21:30:37 grant Exp $
+# $NetBSD: Makefile,v 1.6 2003/11/12 01:31:48 salo Exp $
 #
 
 DISTNAME=	gconfmm-2.0.1
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=gtkmm/}
 
diff --git a/devel/gconfmm/buildlink2.mk b/devel/gconfmm/buildlink2.mk
index aa9f976bd3f..c68471a731d 100644
--- a/devel/gconfmm/buildlink2.mk
+++ b/devel/gconfmm/buildlink2.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.3 2003/07/13 13:51:08 wiz Exp $
+# $NetBSD: buildlink2.mk,v 1.4 2003/11/12 01:31:48 salo 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.1nb2
+BUILDLINK_DEPENDS.gconfmm?=		gconfmm>=2.0.1nb3
 BUILDLINK_PKGSRCDIR.gconfmm?=		../../devel/gconfmm
 
 EVAL_PREFIX+=	BUILDLINK_PREFIX.gconfmm=gconfmm
diff --git a/devel/glade/Makefile b/devel/glade/Makefile
index b7a04608605..e4b9bc964bd 100644
--- a/devel/glade/Makefile
+++ b/devel/glade/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.41 2003/07/17 21:30:42 grant Exp $
+# $NetBSD: Makefile,v 1.42 2003/11/12 01:31:48 salo Exp $
 
 DISTNAME=	glade-0.6.4
-PKGREVISION=	3
+PKGREVISION=	4
 CATEGORIES=	devel
 MASTER_SITES=   ${MASTER_SITE_GNOME:=sources/glade/0.6/}
 
diff --git a/devel/glade2/Makefile b/devel/glade2/Makefile
index ba374d5dedc..1e3046483da 100644
--- a/devel/glade2/Makefile
+++ b/devel/glade2/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.13 2003/09/11 12:42:51 jmmv Exp $
+# $NetBSD: Makefile,v 1.14 2003/11/12 01:31:48 salo Exp $
 #
 
 DISTNAME=		glade-2.0.0
 PKGNAME=		${DISTNAME:S/-/2-/}
-PKGREVISION=		4
+PKGREVISION=		5
 CATEGORIES=		devel gnome
 MASTER_SITES=		${MASTER_SITE_GNOME:=sources/glade/2.0/}
 EXTRACT_SUFX=		.tar.bz2
diff --git a/devel/gscope/Makefile b/devel/gscope/Makefile
index e3daeb05df2..51e1b3f11fe 100644
--- a/devel/gscope/Makefile
+++ b/devel/gscope/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.7 2003/07/21 16:43:23 martti Exp $
+# $NetBSD: Makefile,v 1.8 2003/11/12 01:31:48 salo Exp $
 #
 
 DISTNAME=		gscope-0.4.1
-PKGREVISION=		2
+PKGREVISION=		3
 CATEGORIES=		devel
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=gscope/}
 
diff --git a/devel/gtkdiff/Makefile b/devel/gtkdiff/Makefile
index f48baf94396..dd154f1193f 100644
--- a/devel/gtkdiff/Makefile
+++ b/devel/gtkdiff/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.15 2003/07/21 16:43:23 martti Exp $
+# $NetBSD: Makefile,v 1.16 2003/11/12 01:31:48 salo Exp $
 #
 
 DISTNAME=	gtkdiff-1.8.0
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	devel gnome
 MASTER_SITES=	http://home.catv.ne.jp/pp/ginoue/software/gtkdiff/
 
diff --git a/devel/gtranslator/Makefile b/devel/gtranslator/Makefile
index 11f2391ecbe..0b0914d3529 100644
--- a/devel/gtranslator/Makefile
+++ b/devel/gtranslator/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.1.1.1 2003/09/05 17:00:35 xtraeme Exp $
+# $NetBSD: Makefile,v 1.2 2003/11/12 01:31:48 salo Exp $
 #
 
 DISTNAME=	gtranslator-1.0
+PKGREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	http://www.gtranslator.org/download/releases/1.0/
 
diff --git a/devel/libbonobo/Makefile b/devel/libbonobo/Makefile
index 9fc5515a2e8..85b84f1a5b2 100644
--- a/devel/libbonobo/Makefile
+++ b/devel/libbonobo/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.14 2003/09/23 12:18:56 recht Exp $
+# $NetBSD: Makefile,v 1.15 2003/11/12 01:31:48 salo Exp $
 
 DISTNAME=		libbonobo-2.2.0
-PKGREVISION=		3
+PKGREVISION=		4
 CATEGORIES=		devel gnome
 MASTER_SITES=		${MASTER_SITE_GNOME:=sources/libbonobo/2.2/}
 EXTRACT_SUFX=		.tar.bz2
diff --git a/devel/libbonobo/buildlink2.mk b/devel/libbonobo/buildlink2.mk
index 23aea8b5bba..d8ab6672eef 100644
--- a/devel/libbonobo/buildlink2.mk
+++ b/devel/libbonobo/buildlink2.mk
@@ -1,10 +1,10 @@
-# $NetBSD: buildlink2.mk,v 1.7 2003/07/13 13:51:17 wiz Exp $
+# $NetBSD: buildlink2.mk,v 1.8 2003/11/12 01:31:48 salo Exp $
 
 .if !defined(LIBBONOBO_BUILDLINK2_MK)
 LIBBONOBO_BUILDLINK2_MK=	# defined
 
 BUILDLINK_PACKAGES+=		libbonobo
-BUILDLINK_DEPENDS.libbonobo?=	libbonobo>=2.2.0nb2
+BUILDLINK_DEPENDS.libbonobo?=	libbonobo>=2.2.0nb4
 BUILDLINK_PKGSRCDIR.libbonobo?=	../../devel/libbonobo
 
 EVAL_PREFIX+=	BUILDLINK_PREFIX.libbonobo=libbonobo
diff --git a/devel/libbonoboui/Makefile b/devel/libbonoboui/Makefile
index 0a5449e6e65..a062dc91f45 100644
--- a/devel/libbonoboui/Makefile
+++ b/devel/libbonoboui/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.17 2003/09/23 12:18:56 recht Exp $
+# $NetBSD: Makefile,v 1.18 2003/11/12 01:31:48 salo Exp $
 #
 
 DISTNAME=	libbonoboui-2.2.4
-PKGREVISION=	1
+PKGREVISION=	2
 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 faa9269b940..3b44a6a8c35 100644
--- a/devel/libbonoboui/buildlink2.mk
+++ b/devel/libbonoboui/buildlink2.mk
@@ -1,10 +1,10 @@
-# $NetBSD: buildlink2.mk,v 1.7 2003/07/13 13:51:17 wiz Exp $
+# $NetBSD: buildlink2.mk,v 1.8 2003/11/12 01:31:48 salo Exp $
 
 .if !defined(LIBBONOBOUI_BUILDLINK2_MK)
 LIBBONOBOUI_BUILDLINK2_MK=	# defined
 
 BUILDLINK_PACKAGES+=		libbonoboui
-BUILDLINK_DEPENDS.libbonoboui?=	libbonoboui>=2.2.0.1nb3
+BUILDLINK_DEPENDS.libbonoboui?=	libbonoboui>=2.2.4nb2
 BUILDLINK_PKGSRCDIR.libbonoboui?=	../../devel/libbonoboui
 
 EVAL_PREFIX+=	BUILDLINK_PREFIX.libbonoboui=libbonoboui
diff --git a/devel/libgnome/Makefile b/devel/libgnome/Makefile
index a8934f1ac3a..5f3b207b396 100644
--- a/devel/libgnome/Makefile
+++ b/devel/libgnome/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.15 2003/09/25 02:56:01 danw Exp $
+# $NetBSD: Makefile,v 1.16 2003/11/12 01:31:48 salo Exp $
 #
 
 DISTNAME=	libgnome-2.2.3
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	devel gnome
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/libgnome/2.2/}
 EXTRACT_SUFX=	.tar.bz2
diff --git a/devel/libgnome/buildlink2.mk b/devel/libgnome/buildlink2.mk
index f677e49ddc3..a48ca33e97d 100644
--- a/devel/libgnome/buildlink2.mk
+++ b/devel/libgnome/buildlink2.mk
@@ -1,10 +1,10 @@
-# $NetBSD: buildlink2.mk,v 1.6 2003/07/13 13:51:19 wiz Exp $
+# $NetBSD: buildlink2.mk,v 1.7 2003/11/12 01:31:48 salo Exp $
 
 .if !defined(LIBGNOME_BUILDLINK2_MK)
 LIBGNOME_BUILDLINK2_MK=	# defined
 
 BUILDLINK_PACKAGES+=		libgnome
-BUILDLINK_DEPENDS.libgnome?=	libgnome>=2.2.3nb1
+BUILDLINK_DEPENDS.libgnome?=	libgnome>=2.2.3nb3
 BUILDLINK_PKGSRCDIR.libgnome?=	../../devel/libgnome
 
 EVAL_PREFIX+=			BUILDLINK_PREFIX.libgnome=libgnome
diff --git a/devel/libgnomeui/Makefile b/devel/libgnomeui/Makefile
index b83dab09208..386b2a80ce8 100644
--- a/devel/libgnomeui/Makefile
+++ b/devel/libgnomeui/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.14 2003/07/17 21:31:29 grant Exp $
+# $NetBSD: Makefile,v 1.15 2003/11/12 01:31:48 salo Exp $
 #
 
 DISTNAME=	libgnomeui-2.2.2
-PKGREVISION=	1
+PKGREVISION=	2
 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 f9735417d06..9f303edc182 100644
--- a/devel/libgnomeui/buildlink2.mk
+++ b/devel/libgnomeui/buildlink2.mk
@@ -1,10 +1,10 @@
-# $NetBSD: buildlink2.mk,v 1.7 2003/07/13 13:51:19 wiz Exp $
+# $NetBSD: buildlink2.mk,v 1.8 2003/11/12 01:31:48 salo Exp $
 
 .if !defined(LIBGNOMEUI_BUILDLINK2_MK)
 LIBGNOMEUI_BUILDLINK2_MK=	# defined
 
 BUILDLINK_PACKAGES+=		libgnomeui
-BUILDLINK_DEPENDS.libgnomeui?=	libgnomeui>=2.2.2nb1
+BUILDLINK_DEPENDS.libgnomeui?=	libgnomeui>=2.2.2nb2
 BUILDLINK_PKGSRCDIR.libgnomeui?=	../../devel/libgnomeui
 
 EVAL_PREFIX+=			BUILDLINK_PREFIX.libgnomeui=libgnomeui
diff --git a/devel/libgsf/Makefile b/devel/libgsf/Makefile
index 254f268144f..0fae89a2785 100644
--- a/devel/libgsf/Makefile
+++ b/devel/libgsf/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.4 2003/10/05 20:20:18 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2003/11/12 01:31:48 salo Exp $
 #
 
 DISTNAME=	libgsf-1.8.2
+PKGREVISION=	1
 CATEGORIES=	devel gnome
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/libgsf/1.8/}
 EXTRACT_SUFX=	.tar.bz2
diff --git a/devel/libgsf/buildlink2.mk b/devel/libgsf/buildlink2.mk
index 060ad086258..141ee7ea351 100644
--- a/devel/libgsf/buildlink2.mk
+++ b/devel/libgsf/buildlink2.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.2 2003/07/13 13:51:20 wiz Exp $
+# $NetBSD: buildlink2.mk,v 1.3 2003/11/12 01:31:48 salo Exp $
 #
 # This Makefile fragment is included by packages that use libgsf.
 #
@@ -9,7 +9,7 @@
 LIBGSF_BUILDLINK2_MK=	# defined
 
 BUILDLINK_PACKAGES+=			libgsf
-BUILDLINK_DEPENDS.libgsf?=		libgsf>=1.8.0nb1
+BUILDLINK_DEPENDS.libgsf?=		libgsf>=1.8.2nb1
 BUILDLINK_PKGSRCDIR.libgsf?=		../../devel/libgsf
 
 EVAL_PREFIX+=	BUILDLINK_PREFIX.libgsf=libgsf
diff --git a/devel/librsync/Makefile b/devel/librsync/Makefile
index e146cf13b1c..51a55689c2f 100644
--- a/devel/librsync/Makefile
+++ b/devel/librsync/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.5 2003/08/27 15:33:33 abs Exp $
+# $NetBSD: Makefile,v 1.6 2003/11/12 01:31:48 salo Exp $
 #
 
 DISTNAME=		librsync-0.9.6
-PKGREVISION=		1
+PKGREVISION=		2
 CATEGORIES=		devel net
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=librsync/}
 
diff --git a/devel/librsync/buildlink2.mk b/devel/librsync/buildlink2.mk
index 14c3de462fb..7b286ba484c 100644
--- a/devel/librsync/buildlink2.mk
+++ b/devel/librsync/buildlink2.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.6 2003/08/28 14:49:11 abs Exp $
+# $NetBSD: buildlink2.mk,v 1.7 2003/11/12 01:31:48 salo Exp $
 #
 # This Makefile fragment is included by packages that use librsync.
 #
@@ -9,7 +9,7 @@
 LIBRSYNC_BUILDLINK2_MK=	# defined
 
 BUILDLINK_PACKAGES+=			librsync
-BUILDLINK_DEPENDS.librsync?=		librsync>=0.9.6
+BUILDLINK_DEPENDS.librsync?=		librsync>=0.9.6nb2
 BUILDLINK_PKGSRCDIR.librsync?=		../../devel/librsync
 
 EVAL_PREFIX+=	BUILDLINK_PREFIX.librsync=librsync
diff --git a/devel/mrproject/Makefile b/devel/mrproject/Makefile
index e20cf258d9c..fc1afb8ab34 100644
--- a/devel/mrproject/Makefile
+++ b/devel/mrproject/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.16 2003/07/17 21:31:51 grant Exp $
+# $NetBSD: Makefile,v 1.17 2003/11/12 01:31:48 salo Exp $
 #
 
 DISTNAME=		mrproject-0.5.1
-PKGREVISION=		6
+PKGREVISION=		7
 CATEGORIES=		devel
 MASTER_SITES=		ftp://ftp.codefactory.se/pub/software/mrproject/source/
 
diff --git a/devel/oaf/Makefile b/devel/oaf/Makefile
index 86787a097cd..ac298cdad00 100644
--- a/devel/oaf/Makefile
+++ b/devel/oaf/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.30 2003/10/18 13:08:49 cjep Exp $
+# $NetBSD: Makefile,v 1.31 2003/11/12 01:31:48 salo Exp $
 #
 
 DISTNAME=		oaf-0.6.10
-PKGREVISION=		2
+PKGREVISION=		3
 CATEGORIES=		devel gnome
 MASTER_SITES=		${MASTER_SITE_GNOME:=sources/oaf/0.6/}
 EXTRACT_SUFX=		.tar.bz2
diff --git a/devel/oaf/buildlink2.mk b/devel/oaf/buildlink2.mk
index 4432dbc09df..de83e5a7611 100644
--- a/devel/oaf/buildlink2.mk
+++ b/devel/oaf/buildlink2.mk
@@ -1,10 +1,10 @@
-# $NetBSD: buildlink2.mk,v 1.6 2003/07/13 13:51:23 wiz Exp $
+# $NetBSD: buildlink2.mk,v 1.7 2003/11/12 01:31:48 salo Exp $
 
 .if !defined(OAF_BUILDLINK2_MK)
 OAF_BUILDLINK2_MK=	# defined
 
 BUILDLINK_PACKAGES+=		oaf
-BUILDLINK_DEPENDS.oaf?=		oaf>=0.6.10nb2
+BUILDLINK_DEPENDS.oaf?=		oaf>=0.6.10nb3
 BUILDLINK_PKGSRCDIR.oaf?=	../../devel/oaf
 
 EVAL_PREFIX+=			BUILDLINK_PREFIX.oaf=oaf
diff --git a/editors/conglomerate/Makefile b/editors/conglomerate/Makefile
index 3c657c3ef33..277f63f08bc 100644
--- a/editors/conglomerate/Makefile
+++ b/editors/conglomerate/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.6 2003/09/27 10:22:49 xtraeme Exp $
+# $NetBSD: Makefile,v 1.7 2003/11/12 01:31:49 salo Exp $
 #
 
 DISTNAME=	conglomerate-0.7.4
-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 0a7b5c1e8c5..c81a64b87e5 100644
--- a/editors/gconf-editor/Makefile
+++ b/editors/gconf-editor/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.6 2003/07/13 13:51:31 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2003/11/12 01:31:49 salo Exp $
 #
 
 DISTNAME=		gconf-editor-0.3.1
-PKGREVISION=		3
+PKGREVISION=		4
 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 d0d9f80b46d..311c58ec244 100644
--- a/editors/gedit/Makefile
+++ b/editors/gedit/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.14 2003/07/21 16:44:35 martti Exp $
+# $NetBSD: Makefile,v 1.15 2003/11/12 01:31:49 salo Exp $
 #
 
 DISTNAME=		gedit-2.2.1
-PKGREVISION=		3
+PKGREVISION=		4
 CATEGORIES=		editors gnome
 MASTER_SITES=		${MASTER_SITE_GNOME:=sources/gedit/2.2/}
 EXTRACT_SUFX=		.tar.bz2
diff --git a/editors/gnotepad/Makefile b/editors/gnotepad/Makefile
index a40cda6361e..3f78c9a6126 100644
--- a/editors/gnotepad/Makefile
+++ b/editors/gnotepad/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.17 2003/07/21 16:44:35 martti Exp $
+# $NetBSD: Makefile,v 1.18 2003/11/12 01:31:49 salo Exp $
 
 DISTNAME=	gnotepad+-1.3.3
 PKGNAME=	${DISTNAME:S/+//}
-PKGREVISION=	5
+PKGREVISION=	6
 CATEGORIES=	editors
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=gnotepad/}
 
diff --git a/emulators/gpsim/Makefile b/emulators/gpsim/Makefile
index 17300f2614f..a434d65a53e 100644
--- a/emulators/gpsim/Makefile
+++ b/emulators/gpsim/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.6 2003/07/13 13:51:39 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2003/11/12 01:31:49 salo Exp $
 #
 
 DISTNAME=	gpsim-0.20.7
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	emulators
 MASTER_SITES=	http://www.dattalo.com/gnupic/
 
diff --git a/finance/gnucash/Makefile b/finance/gnucash/Makefile
index 5569b3f13bb..e310ee963e4 100644
--- a/finance/gnucash/Makefile
+++ b/finance/gnucash/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.51 2003/10/30 16:23:18 jmmv Exp $
+# $NetBSD: Makefile,v 1.52 2003/11/12 01:31:49 salo Exp $
 
 DISTNAME=		gnucash-1.8.4
-PKGREVISION=		2
+PKGREVISION=		3
 CATEGORIES=		finance
 MASTER_SITES=		ftp://ftp.gnucash.org/pub/gnucash/sources/stable/ \
 			${MASTER_SITE_SOURCEFORGE:=gnucash/}
diff --git a/fonts/chkfontpath/Makefile b/fonts/chkfontpath/Makefile
index e52946cbcec..102a00da780 100644
--- a/fonts/chkfontpath/Makefile
+++ b/fonts/chkfontpath/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.1.1.1 2003/10/03 18:20:40 hubertf Exp $
+# $NetBSD: Makefile,v 1.2 2003/11/12 01:31:49 salo Exp $
 #
 
 DISTNAME=	chkfontpath-1.9.7
+PKGREVISION=	1
 CATEGORIES=	fonts
 MASTER_SITES=	ftp://ftp.redhat.com/pub/redhat/linux/9/en/os/i386/SRPMS/
 EXTRACT_SUFX=	-1.src.rpm
diff --git a/games/ccgo/Makefile b/games/ccgo/Makefile
index 27d8e5fa63c..99c11372e42 100644
--- a/games/ccgo/Makefile
+++ b/games/ccgo/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.6 2003/07/17 21:37:58 grant Exp $
+# $NetBSD: Makefile,v 1.7 2003/11/12 01:31:49 salo Exp $
 #
 
 DISTNAME=		ccgo-0.3.1
-PKGREVISION=		2
+PKGREVISION=		3
 CATEGORIES=		games
 MASTER_SITES=		http://ccdw.org/~cjj/prog/ccgo/
 
diff --git a/games/gnome-breakout/Makefile b/games/gnome-breakout/Makefile
index c0bfaba8493..468481bb5af 100644
--- a/games/gnome-breakout/Makefile
+++ b/games/gnome-breakout/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.13 2003/07/17 21:38:30 grant Exp $
+# $NetBSD: Makefile,v 1.14 2003/11/12 01:31:49 salo Exp $
 #
 
 DISTNAME=	gnome-breakout-0.5.2
-PKGREVISION=	4
+PKGREVISION=	5
 CATEGORIES=	games gnome
 MASTER_SITES=	http://www.senet.com.au/~alcaron/
 
diff --git a/games/gnome-chess/Makefile b/games/gnome-chess/Makefile
index 6445cc2022a..979f1ea3621 100644
--- a/games/gnome-chess/Makefile
+++ b/games/gnome-chess/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.23 2003/09/19 23:08:27 dent Exp $
+# $NetBSD: Makefile,v 1.24 2003/11/12 01:31:49 salo Exp $
 
 DISTNAME=		gnome-chess-0.3.3
-PKGREVISION=		8
+PKGREVISION=		9
 CATEGORIES=		games gnome
 MASTER_SITES=		${MASTER_SITE_GNOME:=sources/gnome-chess/0.3/}
 
diff --git a/games/gnome-games/Makefile b/games/gnome-games/Makefile
index 6f1fe70534c..77375701ac4 100644
--- a/games/gnome-games/Makefile
+++ b/games/gnome-games/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.56 2003/09/28 09:13:57 jlam Exp $
+# $NetBSD: Makefile,v 1.57 2003/11/12 01:31:49 salo Exp $
 
 DISTNAME=		gnome-games-1.4.0.4
-PKGREVISION=		7
+PKGREVISION=		8
 CATEGORIES=		games gnome
 MASTER_SITES=		${MASTER_SITE_GNOME:=sources/gnome-games/1.4/}\
 			${MASTER_SITE_LOCAL}
diff --git a/games/gnome-games/buildlink2.mk b/games/gnome-games/buildlink2.mk
index c5518bde3ff..72f1d820348 100644
--- a/games/gnome-games/buildlink2.mk
+++ b/games/gnome-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/11/12 01:31:49 salo 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>=1.4.0.4nb7
+BUILDLINK_DEPENDS.gnome-games?=		gnome-games>=1.4.0.4nb8
 BUILDLINK_PKGSRCDIR.gnome-games?=		../../games/gnome-games
 
 EVAL_PREFIX+=	BUILDLINK_PREFIX.gnome-games=gnome-games
diff --git a/games/gnome2-games/Makefile b/games/gnome2-games/Makefile
index b803a227e09..669d390e984 100644
--- a/games/gnome2-games/Makefile
+++ b/games/gnome2-games/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.12 2003/09/28 09:13:57 jlam Exp $
+# $NetBSD: Makefile,v 1.13 2003/11/12 01:31:49 salo Exp $
 
 DISTNAME=		gnome-games-2.2.1
-PKGREVISION=		4
+PKGREVISION=		5
 CATEGORIES=		games gnome
 MASTER_SITES=		${MASTER_SITE_GNOME:=sources/gnome-games/2.2/}
 EXTRACT_SUFX=		.tar.bz2
diff --git a/games/gtetrinet/Makefile b/games/gtetrinet/Makefile
index 4232173c78f..49af8b7bef6 100644
--- a/games/gtetrinet/Makefile
+++ b/games/gtetrinet/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.5 2003/07/13 13:51:48 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2003/11/12 01:31:49 salo Exp $
 #
 
 DISTNAME=	gtetrinet-0.7.1
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	games gnome
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/gtetrinet/0.7/}
 
diff --git a/games/gturing/Makefile b/games/gturing/Makefile
index 3f29d9a8142..6d3d14ee275 100644
--- a/games/gturing/Makefile
+++ b/games/gturing/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.9 2003/07/17 21:38:46 grant Exp $
+# $NetBSD: Makefile,v 1.10 2003/11/12 01:31:49 salo Exp $
 #
 
 DISTNAME=		gturing-0.1.1
-PKGREVISION=		4
+PKGREVISION=		5
 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 101f1c2e72d..94138e53dbd 100644
--- a/games/sirius/Makefile
+++ b/games/sirius/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.6 2003/07/17 21:39:23 grant Exp $
+# $NetBSD: Makefile,v 1.7 2003/11/12 01:31:49 salo Exp $
 #
 
 DISTNAME=	sirius-0.7.0
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	games gnome
 MASTER_SITES=	http://sirius.bitvis.nu/files/
 
diff --git a/graphics/dia/Makefile b/graphics/dia/Makefile
index 024fb4fe164..a62de3e12bd 100644
--- a/graphics/dia/Makefile
+++ b/graphics/dia/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.18 2003/07/21 16:51:38 martti Exp $
+# $NetBSD: Makefile,v 1.19 2003/11/12 01:31:49 salo Exp $
 
 DISTNAME=	dia-0.91
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/dia/0.91/}
 
diff --git a/graphics/ee/Makefile b/graphics/ee/Makefile
index eebdfe24e7c..113c0a9c59f 100644
--- a/graphics/ee/Makefile
+++ b/graphics/ee/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.32 2003/07/13 13:51:59 wiz Exp $
+# $NetBSD: Makefile,v 1.33 2003/11/12 01:31:49 salo Exp $
 
 DISTNAME=		ee-0.3.12
-PKGREVISION=		6
+PKGREVISION=		7
 CATEGORIES=		x11 gnome
 MASTER_SITES=		${MASTER_SITE_GNOME:=sources/ee/0.3/}
 
diff --git a/graphics/eog/Makefile b/graphics/eog/Makefile
index 352c4a7c83a..0a26126bbeb 100644
--- a/graphics/eog/Makefile
+++ b/graphics/eog/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.10 2003/07/13 13:51:59 wiz Exp $
+# $NetBSD: Makefile,v 1.11 2003/11/12 01:31:49 salo Exp $
 
 DISTNAME=		eog-0.6
-PKGREVISION=		4
+PKGREVISION=		5
 CATEGORIES=		gnome graphics x11
 MASTER_SITES=		${MASTER_SITE_GNOME:=sources/eog/0.6/}
 
diff --git a/graphics/eog2/Makefile b/graphics/eog2/Makefile
index a7907fc9ef4..7da63db5aed 100644
--- a/graphics/eog2/Makefile
+++ b/graphics/eog2/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.14 2003/09/13 04:57:42 xtraeme Exp $
+# $NetBSD: Makefile,v 1.15 2003/11/12 01:31:49 salo Exp $
 #
 
 DISTNAME=		eog-2.3.4
+PKGREVISION=		1
 CATEGORIES=		graphics gnome
 MASTER_SITES=		${MASTER_SITE_GNOME:=sources/eog/2.3/}
 EXTRACT_SUFX=		.tar.bz2
diff --git a/graphics/exif/Makefile b/graphics/exif/Makefile
index 46d6a6e6c2a..5c76e45e5d8 100644
--- a/graphics/exif/Makefile
+++ b/graphics/exif/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.2 2003/10/14 12:31:18 salo Exp $
+# $NetBSD: Makefile,v 1.3 2003/11/12 01:31:49 salo Exp $
 #
 
 DISTNAME=	exif-0.6
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=libexif/}
 
diff --git a/graphics/gimageview/Makefile b/graphics/gimageview/Makefile
index 162bd219813..c7458e8fbd5 100644
--- a/graphics/gimageview/Makefile
+++ b/graphics/gimageview/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.12 2003/09/12 01:47:39 simonb Exp $
+# $NetBSD: Makefile,v 1.13 2003/11/12 01:31:49 salo Exp $
 
 DISTNAME=	gimageview-0.2.24
+PKGREVISION=	1
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=gtkmmviewer/}
 
diff --git a/graphics/gmencoder/Makefile b/graphics/gmencoder/Makefile
index cbb7b9a1d17..79bcdd2d51c 100644
--- a/graphics/gmencoder/Makefile
+++ b/graphics/gmencoder/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.3 2003/08/28 20:05:18 xtraeme Exp $
+# $NetBSD: Makefile,v 1.4 2003/11/12 01:31:49 salo Exp $
 #
 
 DISTNAME=	gmencoder-0.1.0
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=gmencoder/}
 EXTRACT_SUFX=	.tgz
diff --git a/graphics/gphoto2/Makefile b/graphics/gphoto2/Makefile
index 2d26654b2a7..1231d12c605 100644
--- a/graphics/gphoto2/Makefile
+++ b/graphics/gphoto2/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.22 2003/09/28 18:59:09 is Exp $
+# $NetBSD: Makefile,v 1.23 2003/11/12 01:31:49 salo Exp $
 #
 
 DISTNAME=	gphoto2-2.1.2
+PKGREVISION=	1
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=gphoto/}
 EXTRACT_SUFX=	.tar.bz2
diff --git a/graphics/librsvg2/Makefile b/graphics/librsvg2/Makefile
index 817df6bef4b..cef71bc13ab 100644
--- a/graphics/librsvg2/Makefile
+++ b/graphics/librsvg2/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.10 2003/07/17 21:41:36 grant Exp $
+# $NetBSD: Makefile,v 1.11 2003/11/12 01:31:49 salo Exp $
 #
 
 DISTNAME=		librsvg-2.2.5
 PKGNAME=		${DISTNAME:S/-/2-/}
-PKGREVISION=		1
+PKGREVISION=		2
 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 794b7018562..f23b526d0ed 100644
--- a/graphics/librsvg2/buildlink2.mk
+++ b/graphics/librsvg2/buildlink2.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.5 2003/07/13 13:52:11 wiz Exp $
+# $NetBSD: buildlink2.mk,v 1.6 2003/11/12 01:31:49 salo 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.5nb1
+BUILDLINK_DEPENDS.librsvg2?=		librsvg2>=2.2.5nb2
 BUILDLINK_PKGSRCDIR.librsvg2?=		../../graphics/librsvg2
 
 EVAL_PREFIX+=	BUILDLINK_PREFIX.librsvg2=librsvg2
diff --git a/graphics/p5-Gdk-Pixbuf/Makefile b/graphics/p5-Gdk-Pixbuf/Makefile
index 9a577a826f0..9115ab739d1 100644
--- a/graphics/p5-Gdk-Pixbuf/Makefile
+++ b/graphics/p5-Gdk-Pixbuf/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.3 2003/07/17 21:42:05 grant Exp $
+# $NetBSD: Makefile,v 1.4 2003/11/12 01:31:50 salo Exp $
 #
 
 .include "../../x11/p5-gtk/Makefile.common"
 
 PKGNAME=	p5-Gdk-Pixbuf-${GTKPERL_VERSION}
-PKGREVISION=	1
+PKGREVISION=	2
 
 MAINTAINER=	tech-pkg@NetBSD.org
 COMMENT=	Perl5 Gtk::Gdk::Pixbuf
diff --git a/graphics/sodipodi/Makefile b/graphics/sodipodi/Makefile
index a6f4e3f64f8..e6639ada079 100644
--- a/graphics/sodipodi/Makefile
+++ b/graphics/sodipodi/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.17 2003/07/17 21:42:47 grant Exp $
+# $NetBSD: Makefile,v 1.18 2003/11/12 01:31:50 salo Exp $
 #
 
 DISTNAME=	sodipodi-0.31
-PKGREVISION=	3
+PKGREVISION=	4
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=sodipodi/}
 
diff --git a/mail/balsa/Makefile b/mail/balsa/Makefile
index f4172cc695d..597b29392ed 100644
--- a/mail/balsa/Makefile
+++ b/mail/balsa/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.35 2003/07/17 21:45:42 grant Exp $
+# $NetBSD: Makefile,v 1.36 2003/11/12 01:31:50 salo Exp $
 #
 
 DISTNAME=		balsa-1.4.3
-PKGREVISION=		2
+PKGREVISION=		3
 CATEGORIES=		mail gnome
 MASTER_SITES=		http://www.theochem.kth.se/~pawsa/balsa/ \
 			ftp://ftp.newton.cx/pub/balsa/
diff --git a/mail/balsa2/Makefile b/mail/balsa2/Makefile
index db097fb60f3..5e07cf87bda 100644
--- a/mail/balsa2/Makefile
+++ b/mail/balsa2/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.9 2003/09/30 06:28:58 xtraeme Exp $
+# $NetBSD: Makefile,v 1.10 2003/11/12 01:31:50 salo Exp $
 #
 
 DISTNAME=		balsa-2.0.15
+PKGREVISION=		1
 CATEGORIES=		mail gnome
 MASTER_SITES=		http://balsa.gnome.org/				\
 			ftp://ftp.newton.cx/pub/balsa/
diff --git a/mail/evolution/Makefile b/mail/evolution/Makefile
index ba427940576..e1e6ccddaf9 100644
--- a/mail/evolution/Makefile
+++ b/mail/evolution/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.41 2003/10/21 11:28:10 tron Exp $
+# $NetBSD: Makefile,v 1.42 2003/11/12 01:31:50 salo Exp $
 
 DISTNAME=		evolution-1.2.4
-PKGREVISION=		3
+PKGREVISION=		4
 CATEGORIES=		mail time gnome
 MASTER_SITES=		ftp://ftp.ximian.com/pub/ximian-evolution/source/ \
 			ftp://ximian.netnitco.net/pub/mirrors/ximian/ximian-evolution/source/ \
diff --git a/mail/evolution/buildlink2.mk b/mail/evolution/buildlink2.mk
index 62ab2843838..67c668127a8 100644
--- a/mail/evolution/buildlink2.mk
+++ b/mail/evolution/buildlink2.mk
@@ -1,11 +1,11 @@
-# $NetBSD: buildlink2.mk,v 1.4 2003/07/13 13:52:26 wiz Exp $
+# $NetBSD: buildlink2.mk,v 1.5 2003/11/12 01:31:50 salo Exp $
 #
 
 .if !defined(EVOLUTION_BUILDLINK2_MK)
 EVOLUTION_BUILDLINK2_MK=	# defined
 
 BUILDLINK_PACKAGES+=			evolution
-BUILDLINK_DEPENDS.evolution?=		evolution>=1.2.4nb3
+BUILDLINK_DEPENDS.evolution?=		evolution>=1.2.4nb4
 BUILDLINK_PKGSRCDIR.evolution?=		../../mail/evolution
 
 EVAL_PREFIX+=	BUILDLINK_PREFIX.evolution=evolution
diff --git a/math/gcalctool/Makefile b/math/gcalctool/Makefile
index a146ac6dc5f..d4e015f5cdb 100644
--- a/math/gcalctool/Makefile
+++ b/math/gcalctool/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.9 2003/08/26 16:12:48 junyoung Exp $
+# $NetBSD: Makefile,v 1.10 2003/11/12 01:31:50 salo Exp $
 #
 
 DISTNAME=		gcalctool-4.2.83
-PKGREVISION=		2
+PKGREVISION=		3
 CATEGORIES=		math gnome
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=calctool/}
 
diff --git a/math/gnumeric/Makefile b/math/gnumeric/Makefile
index 814a2731c25..29d796d1fdb 100644
--- a/math/gnumeric/Makefile
+++ b/math/gnumeric/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.75 2003/07/17 21:47:33 grant Exp $
+# $NetBSD: Makefile,v 1.76 2003/11/12 01:31:50 salo Exp $
 #
 
 DISTNAME=		gnumeric-1.0.13
-PKGREVISION=		3
+PKGREVISION=		4
 CATEGORIES=		math gnome
 MASTER_SITES=		${MASTER_SITE_GNOME:=sources/gnumeric/1.0/}
 
diff --git a/math/gnumeric0/Makefile b/math/gnumeric0/Makefile
index 86ee2f33838..61285847282 100644
--- a/math/gnumeric0/Makefile
+++ b/math/gnumeric0/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.17 2003/07/17 21:47:34 grant Exp $
+# $NetBSD: Makefile,v 1.18 2003/11/12 01:31:50 salo Exp $
 #
 
 DISTNAME=		gnumeric-0.75
-PKGREVISION=		8
+PKGREVISION=		9
 CATEGORIES=		math gnome
 MASTER_SITES=		${MASTER_SITE_GNOME:=sources/gnumeric/0.75/}
 
diff --git a/math/guppi/Makefile b/math/guppi/Makefile
index c6ed0407cdf..f76bd3ac247 100644
--- a/math/guppi/Makefile
+++ b/math/guppi/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.29 2003/07/17 21:47:42 grant Exp $
+# $NetBSD: Makefile,v 1.30 2003/11/12 01:31:50 salo Exp $
 
 DISTNAME=	Guppi-0.40.3
 PKGNAME=	${DISTNAME:S/G/g/}
-PKGREVISION=	5
+PKGREVISION=	6
 CATEGORIES=	math graphics
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/Guppi/0.40/}
 EXTRACT_SUFX=	.tar.bz2
diff --git a/math/guppi/buildlink2.mk b/math/guppi/buildlink2.mk
index 57ee04ccc1b..b8e01127f48 100644
--- a/math/guppi/buildlink2.mk
+++ b/math/guppi/buildlink2.mk
@@ -1,10 +1,10 @@
-# $NetBSD: buildlink2.mk,v 1.4 2003/07/13 13:52:32 wiz Exp $
+# $NetBSD: buildlink2.mk,v 1.5 2003/11/12 01:31:50 salo Exp $
 
 .if !defined(GUPPI_BUILDLINK2_MK)
 GUPPI_BUILDLINK2_MK=	# defined
 
 BUILDLINK_PACKAGES+=		guppi
-BUILDLINK_DEPENDS.guppi?=	guppi>=0.40.3nb5
+BUILDLINK_DEPENDS.guppi?=	guppi>=0.40.3nb6
 BUILDLINK_PKGSRCDIR.guppi?=	../../math/guppi
 
 EVAL_PREFIX+=	BUILDLINK_PREFIX.guppi=guppi
diff --git a/meta-pkgs/gnome/Makefile b/meta-pkgs/gnome/Makefile
index 59fc4d636bf..4c53f26c866 100644
--- a/meta-pkgs/gnome/Makefile
+++ b/meta-pkgs/gnome/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.19 2003/07/21 16:58:15 martti Exp $
+# $NetBSD: Makefile,v 1.20 2003/11/12 01:31:50 salo Exp $
 
 DISTNAME=	gnome-1.4.2.1
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	meta-pkgs x11 gnome
 MASTER_SITES=	# empty
 DISTFILES=	# empty
diff --git a/misc/gnome-pim/Makefile b/misc/gnome-pim/Makefile
index 0c35b5a2ebc..350b1607f47 100644
--- a/misc/gnome-pim/Makefile
+++ b/misc/gnome-pim/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.41 2003/07/17 21:49:01 grant Exp $
+# $NetBSD: Makefile,v 1.42 2003/11/12 01:31:50 salo Exp $
 
 DISTNAME=		gnome-pim-1.4.6
-PKGREVISION=		3
+PKGREVISION=		4
 CATEGORIES=		misc x11 gnome
 MASTER_SITES=		${MASTER_SITE_GNOME:=sources/gnome-pim/1.4/}
 
diff --git a/misc/gnome-utils/Makefile b/misc/gnome-utils/Makefile
index 7d840ad990d..fc5b5eb7f07 100644
--- a/misc/gnome-utils/Makefile
+++ b/misc/gnome-utils/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.65 2003/09/28 09:13:58 jlam Exp $
+# $NetBSD: Makefile,v 1.66 2003/11/12 01:31:50 salo Exp $
 
 DISTNAME=		gnome-utils-1.4.1.2
-PKGREVISION=		4
+PKGREVISION=		5
 CATEGORIES=		misc x11 gnome
 MASTER_SITES=		${MASTER_SITE_GNOME:=sources/gnome-utils/1.4/}
 EXTRACT_SUFX=		.tar.bz2
diff --git a/misc/gnome2-utils/Makefile b/misc/gnome2-utils/Makefile
index 670771a89d3..8ea86ac7679 100644
--- a/misc/gnome2-utils/Makefile
+++ b/misc/gnome2-utils/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.8 2003/09/28 09:13:58 jlam Exp $
+# $NetBSD: Makefile,v 1.9 2003/11/12 01:31:50 salo Exp $
 #
 
 DISTNAME=		gnome-utils-2.2.1
-PKGREVISION=		3
+PKGREVISION=		4
 CATEGORIES=		misc gnome
 MASTER_SITES=		${MASTER_SITE_GNOME:=sources/gnome-utils/2.2/}
 EXTRACT_SUFX=		.tar.bz2
diff --git a/misc/gst-plugins/Makefile b/misc/gst-plugins/Makefile
index 3f15fd94423..4b2e9862e8a 100644
--- a/misc/gst-plugins/Makefile
+++ b/misc/gst-plugins/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.8 2003/08/17 20:31:55 jmc Exp $
+# $NetBSD: Makefile,v 1.9 2003/11/12 01:31:50 salo Exp $
 #
 
 DISTNAME=		gst-plugins-0.6.1
-PKGREVISION=		4
+PKGREVISION=		5
 CATEGORIES=		misc gnome
 MASTER_SITES=		${MASTER_SITE_GNOME:=sources/gst-plugins/0.6/}
 EXTRACT_SUFX=		.tar.bz2
diff --git a/misc/gstreamer/Makefile b/misc/gstreamer/Makefile
index 91dd58b6712..541a7037456 100644
--- a/misc/gstreamer/Makefile
+++ b/misc/gstreamer/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.7 2003/08/28 17:39:40 wiz Exp $
+# $NetBSD: Makefile,v 1.8 2003/11/12 01:31:50 salo Exp $
 #
 
 DISTNAME=		gstreamer-0.6.1
-PKGREVISION=		3
+PKGREVISION=		4
 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 b06d2c2c844..247f3aeee51 100644
--- a/misc/gstreamer/buildlink2.mk
+++ b/misc/gstreamer/buildlink2.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.5 2003/08/28 17:39:40 wiz Exp $
+# $NetBSD: buildlink2.mk,v 1.6 2003/11/12 01:31:50 salo 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.1nb2
+BUILDLINK_DEPENDS.gstreamer?=		gstreamer>=0.6.1nb4
 BUILDLINK_PKGSRCDIR.gstreamer?=		../../misc/gstreamer
 
 EVAL_PREFIX+=	BUILDLINK_PREFIX.gstreamer=gstreamer
diff --git a/misc/ooqstart/Makefile b/misc/ooqstart/Makefile
index ac87241fe4a..f78866d2739 100644
--- a/misc/ooqstart/Makefile
+++ b/misc/ooqstart/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.7 2003/07/17 21:49:33 grant Exp $
+# $NetBSD: Makefile,v 1.8 2003/11/12 01:31:50 salo Exp $
 #
 
 DISTNAME=	ooqstart-0.8.3
-PKGREVISION=	3
+PKGREVISION=	4
 CATEGORIES=	misc gnome
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=ooqstart/}
 EXTRACT_SUFX=	.tgz
diff --git a/misc/yelp/Makefile b/misc/yelp/Makefile
index 88b7a1dafa3..49f7176dbcf 100644
--- a/misc/yelp/Makefile
+++ b/misc/yelp/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.1.1.1 2003/09/12 17:29:38 xtraeme Exp $
+# $NetBSD: Makefile,v 1.2 2003/11/12 01:31:50 salo Exp $
 #
 
 DISTNAME=		yelp-2.2.2
+PKGREVISION=		1
 CATEGORIES=		misc
 MASTER_SITES=		${MASTER_SITE_GNOME:=sources/yelp/2.2/}
 EXTRACT_SUFX=		.tar.bz2
diff --git a/net/ORBit2/Makefile b/net/ORBit2/Makefile
index 829267a6815..cafd37f78c6 100644
--- a/net/ORBit2/Makefile
+++ b/net/ORBit2/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.19 2003/07/21 17:10:19 martti Exp $
+# $NetBSD: Makefile,v 1.20 2003/11/12 01:31:50 salo Exp $
 #
 
 DISTNAME=		ORBit2-2.6.0
-PKGREVISION=		3
+PKGREVISION=		4
 CATEGORIES=		net gnome
 MASTER_SITES=		${MASTER_SITE_GNOME:=sources/ORBit2/2.6/}
 EXTRACT_SUFX=		.tar.bz2
diff --git a/net/ORBit2/buildlink2.mk b/net/ORBit2/buildlink2.mk
index 9cd92f1a677..cca1d2f70df 100644
--- a/net/ORBit2/buildlink2.mk
+++ b/net/ORBit2/buildlink2.mk
@@ -1,10 +1,10 @@
-# $NetBSD: buildlink2.mk,v 1.9 2003/07/13 13:52:47 wiz Exp $
+# $NetBSD: buildlink2.mk,v 1.10 2003/11/12 01:31:50 salo Exp $
 
 .if !defined(ORBIT2_BUILDLINK2_MK)
 ORBIT2_BUILDLINK2_MK=	# defined
 
 BUILDLINK_PACKAGES+=		orbit2
-BUILDLINK_DEPENDS.orbit2?=	ORBit2>=2.6.0nb3
+BUILDLINK_DEPENDS.orbit2?=	ORBit2>=2.6.0nb4
 BUILDLINK_PKGSRCDIR.orbit2?=	../../net/ORBit2
 
 EVAL_PREFIX+=				BUILDLINK_PREFIX.orbit2=orbit2
diff --git a/net/bug-buddy/Makefile b/net/bug-buddy/Makefile
index 07bb1f677d4..aeba10b1347 100644
--- a/net/bug-buddy/Makefile
+++ b/net/bug-buddy/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.9 2003/07/21 17:10:26 martti Exp $
+# $NetBSD: Makefile,v 1.10 2003/11/12 01:31:50 salo Exp $
 #
 
 DISTNAME=		bug-buddy-2.2.0
-PKGREVISION=		5
+PKGREVISION=		6
 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 9985311b57d..fec342e32c7 100644
--- a/net/dc_gui2/Makefile
+++ b/net/dc_gui2/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.6 2003/07/21 17:10:33 martti Exp $
+# $NetBSD: Makefile,v 1.7 2003/11/12 01:31:50 salo Exp $
 #
 
 DISTNAME=	dc_gui2-0.75
+PKGREVISION=	1
 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 9f68cd5fef2..e7545495863 100644
--- a/net/etherape/Makefile
+++ b/net/etherape/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.9 2003/07/21 17:10:35 martti Exp $
+# $NetBSD: Makefile,v 1.10 2003/11/12 01:31:51 salo Exp $
 #
 
 DISTNAME=	etherape-0.9.0
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	gnome net
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=etherape/}
 
diff --git a/net/gnapster/Makefile b/net/gnapster/Makefile
index 9aa83e580ce..de1ca3385fd 100644
--- a/net/gnapster/Makefile
+++ b/net/gnapster/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.26 2003/07/21 17:10:41 martti Exp $
+# $NetBSD: Makefile,v 1.27 2003/11/12 01:31:51 salo Exp $
 
 DISTNAME=	gnapster-1.5.0
-PKGREVISION=	5
+PKGREVISION=	6
 CATEGORIES=	net
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=gnapster/}
 
diff --git a/net/gtm/Makefile b/net/gtm/Makefile
index 13f7e0271fb..20b30d321a0 100644
--- a/net/gtm/Makefile
+++ b/net/gtm/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.19 2003/09/16 22:24:14 wiz Exp $
+# $NetBSD: Makefile,v 1.20 2003/11/12 01:31:51 salo Exp $
 #
 
 DISTNAME=	gtm-0.4.12
+PKGREVISION=	1
 CATEGORIES=	net gnome
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=gtm/}
 
diff --git a/net/py-ORBit/Makefile b/net/py-ORBit/Makefile
index 5adb89cdba3..4c6bc0b9861 100644
--- a/net/py-ORBit/Makefile
+++ b/net/py-ORBit/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.6 2003/09/08 21:14:08 recht Exp $
+# $NetBSD: Makefile,v 1.7 2003/11/12 01:31:51 salo Exp $
 #
 
 DISTNAME=	pyorbit-2.0.0
+PKGREVISION=	1
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME:S/pyorbit/ORBit/}
 CATEGORIES=	net
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/pyorbit/2.0/}
diff --git a/net/py-ORBit/buildlink2.mk b/net/py-ORBit/buildlink2.mk
index ffaafc73bf5..4f5d23e8b11 100644
--- a/net/py-ORBit/buildlink2.mk
+++ b/net/py-ORBit/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/11/12 01:31:51 salo Exp $
 
 .if !defined(PYORBIT_BUILDLINK2_MK)
 PYORBIT_BUILDLINK2_MK=	# defined
@@ -7,7 +7,7 @@ PYTHON_VERSIONS_ACCEPTED=	23pth 22pth
 .include "../../lang/python/pyversion.mk"
 
 BUILDLINK_PACKAGES+=			pyorbit
-BUILDLINK_DEPENDS.pyorbit?=		${PYPKGPREFIX}-ORBit>=1.99.6
+BUILDLINK_DEPENDS.pyorbit?=		${PYPKGPREFIX}-ORBit>=2.0.0nb1
 BUILDLINK_PKGSRCDIR.pyorbit?=		../../net/py-ORBit
 
 EVAL_PREFIX+=	BUILDLINK_PREFIX.pyorbit=${PYPKGPREFIX}-ORBit
diff --git a/net/soup/Makefile b/net/soup/Makefile
index 16a012c7464..74f152c0728 100644
--- a/net/soup/Makefile
+++ b/net/soup/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.10 2003/07/21 17:11:17 martti Exp $
+# $NetBSD: Makefile,v 1.11 2003/11/12 01:31:51 salo Exp $
 #
 
 DISTNAME=		soup-0.7.10
-PKGREVISION=		4
+PKGREVISION=		5
 CATEGORIES=		net gnome
 MASTER_SITES=		${MASTER_SITE_GNOME:=sources/soup/0.7/}
 EXTRACT_SUFX=		.tar.bz2
diff --git a/net/soup/buildlink2.mk b/net/soup/buildlink2.mk
index cd36299bcb4..e708b1676dc 100644
--- a/net/soup/buildlink2.mk
+++ b/net/soup/buildlink2.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.4 2003/07/13 13:53:00 wiz Exp $
+# $NetBSD: buildlink2.mk,v 1.5 2003/11/12 01:31:51 salo Exp $
 #
 # This Makefile fragment is included by packages that use soup.
 #
@@ -9,7 +9,7 @@
 SOUP_BUILDLINK2_MK=	# defined
 
 BUILDLINK_PACKAGES+=			soup
-BUILDLINK_DEPENDS.soup?=		soup>=0.7.10nb4
+BUILDLINK_DEPENDS.soup?=		soup>=0.7.10nb5
 BUILDLINK_PKGSRCDIR.soup?=		../../net/soup
 
 EVAL_PREFIX+=	BUILDLINK_PREFIX.soup=soup
diff --git a/net/tsclient/Makefile b/net/tsclient/Makefile
index 0a6dc2a1020..ad20c951914 100644
--- a/net/tsclient/Makefile
+++ b/net/tsclient/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.2 2003/09/16 07:59:10 xtraeme Exp $
+# $NetBSD: Makefile,v 1.3 2003/11/12 01:31:51 salo Exp $
 #
 
 DISTNAME=		tsclient-0.124
+PKGREVISION=		1
 CATEGORIES=		net
 MASTER_SITES=		http://www.gnomepro.com/tsclient/
 
diff --git a/news/pan-gnome/Makefile b/news/pan-gnome/Makefile
index 3ceed8c9039..1241ce486f8 100644
--- a/news/pan-gnome/Makefile
+++ b/news/pan-gnome/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.4 2003/07/17 22:52:10 grant Exp $
+# $NetBSD: Makefile,v 1.5 2003/11/12 01:31:51 salo Exp $
 #
 
 DISTNAME=	pan-0.11.4
-PKGREVISION=	4
+PKGREVISION=	5
 CATEGORIES=	news gnome
 MASTER_SITES=	http://pan.rebelbase.com/download/releases/${DISTNAME:C/pan-//}/SOURCE/
 EXTRACT_SUFX=	.tar.bz2
diff --git a/print/ggv/Makefile b/print/ggv/Makefile
index 341c90cc53a..6517e0ece88 100644
--- a/print/ggv/Makefile
+++ b/print/ggv/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.41 2003/07/17 22:52:26 grant Exp $
+# $NetBSD: Makefile,v 1.42 2003/11/12 01:31:51 salo Exp $
 #
 
 DISTNAME=		ggv-1.0.2
-PKGREVISION=		9
+PKGREVISION=		10
 CATEGORIES=		print gnome
 MASTER_SITES=		${MASTER_SITE_GNOME:=sources/ggv/1.0/}
 
diff --git a/print/ggv2/Makefile b/print/ggv2/Makefile
index 42b8cd223b7..0b6b101f767 100644
--- a/print/ggv2/Makefile
+++ b/print/ggv2/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.12 2003/07/17 22:52:26 grant Exp $
+# $NetBSD: Makefile,v 1.13 2003/11/12 01:31:51 salo Exp $
 #
 
 DISTNAME=		ggv-2.0.0
-PKGREVISION=		2
+PKGREVISION=		3
 CATEGORIES=		print gnome
 MASTER_SITES=		${MASTER_SITE_GNOME:=sources/ggv/2.0/}
 EXTRACT_SUFX=		.tar.bz2
diff --git a/print/libgnomeprint/Makefile b/print/libgnomeprint/Makefile
index 070b9924e83..8e44b9d5233 100644
--- a/print/libgnomeprint/Makefile
+++ b/print/libgnomeprint/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.17 2003/09/27 21:05:22 danw Exp $
+# $NetBSD: Makefile,v 1.18 2003/11/12 01:31:51 salo Exp $
 #
 
 DISTNAME=		libgnomeprint-2.2.1.2
-PKGREVISION=		2
+PKGREVISION=		3
 CATEGORIES=		print gnome
 MASTER_SITES=		${MASTER_SITE_GNOME:=sources/libgnomeprint/2.2/}
 EXTRACT_SUFX=		.tar.bz2
diff --git a/print/libgnomeprint/buildlink2.mk b/print/libgnomeprint/buildlink2.mk
index 0b3e9b42c27..9657f13aee5 100644
--- a/print/libgnomeprint/buildlink2.mk
+++ b/print/libgnomeprint/buildlink2.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.9 2003/07/13 13:53:09 wiz Exp $
+# $NetBSD: buildlink2.mk,v 1.10 2003/11/12 01:31:51 salo Exp $
 #
 # This Makefile fragment is included by packages that use libgnomeprint.
 #
@@ -9,7 +9,7 @@
 LIBGNOMEPRINT_BUILDLINK2_MK=	# defined
 
 BUILDLINK_PACKAGES+=			libgnomeprint
-BUILDLINK_DEPENDS.libgnomeprint?=	libgnomeprint>=2.2.1.2nb2
+BUILDLINK_DEPENDS.libgnomeprint?=	libgnomeprint>=2.2.1.2nb3
 BUILDLINK_PKGSRCDIR.libgnomeprint?=	../../print/libgnomeprint
 
 EVAL_PREFIX+=	BUILDLINK_PREFIX.libgnomeprint=libgnomeprint
diff --git a/print/libgnomeprintui/Makefile b/print/libgnomeprintui/Makefile
index 59dd61819b1..a3008d516d9 100644
--- a/print/libgnomeprintui/Makefile
+++ b/print/libgnomeprintui/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.12 2003/07/17 22:52:34 grant Exp $
+# $NetBSD: Makefile,v 1.13 2003/11/12 01:31:51 salo Exp $
 #
 
 DISTNAME=		libgnomeprintui-2.2.1.2
-PKGREVISION=		2
+PKGREVISION=		3
 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 bd6df0a3522..8cceb27d6e8 100644
--- a/print/libgnomeprintui/buildlink2.mk
+++ b/print/libgnomeprintui/buildlink2.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.8 2003/07/13 13:53:09 wiz Exp $
+# $NetBSD: buildlink2.mk,v 1.9 2003/11/12 01:31:51 salo 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.2nb2
+BUILDLINK_DEPENDS.libgnomeprintui?=	libgnomeprintui>=2.2.1.2nb3
 BUILDLINK_PKGSRCDIR.libgnomeprintui?=	../../print/libgnomeprintui
 
 EVAL_PREFIX+=	BUILDLINK_PREFIX.libgnomeprintui=libgnomeprintui
diff --git a/security/seahorse/Makefile b/security/seahorse/Makefile
index 589eb525e0b..a5e82158921 100644
--- a/security/seahorse/Makefile
+++ b/security/seahorse/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.14 2003/07/17 22:53:14 grant Exp $
+# $NetBSD: Makefile,v 1.15 2003/11/12 01:31:51 salo Exp $
 
 DISTNAME=	seahorse-0.7.3
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	security
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=seahorse/}
 
diff --git a/sysutils/gmc/Makefile b/sysutils/gmc/Makefile
index a9329efc0b3..f645ca544d2 100644
--- a/sysutils/gmc/Makefile
+++ b/sysutils/gmc/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.32 2003/07/13 13:53:16 wiz Exp $
+# $NetBSD: Makefile,v 1.33 2003/11/12 01:31:51 salo Exp $
 
 PKGNAME=		g${DISTNAME}
-PKGREVISION=		5
+PKGREVISION=		6
 CATEGORIES+=		gnome
 
 COMMENT=		GNOME version of Midnight Commander, a free Norton Commander Clone
diff --git a/sysutils/gnome-vfs/Makefile b/sysutils/gnome-vfs/Makefile
index 4cc1fe1b373..dcdeb52a4dd 100644
--- a/sysutils/gnome-vfs/Makefile
+++ b/sysutils/gnome-vfs/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.32 2003/07/17 22:53:35 grant Exp $
+# $NetBSD: Makefile,v 1.33 2003/11/12 01:31:51 salo Exp $
 
 DISTNAME=		gnome-vfs-1.0.5
-PKGREVISION=		3
+PKGREVISION=		4
 CATEGORIES=		sysutils gnome
 MASTER_SITES=		${MASTER_SITE_GNOME:=sources/gnome-vfs/1.0/}
 
diff --git a/sysutils/gnome-vfs/buildlink2.mk b/sysutils/gnome-vfs/buildlink2.mk
index 57806f1b2f7..a740078e4a8 100644
--- a/sysutils/gnome-vfs/buildlink2.mk
+++ b/sysutils/gnome-vfs/buildlink2.mk
@@ -1,10 +1,10 @@
-# $NetBSD: buildlink2.mk,v 1.6 2003/07/13 13:53:16 wiz Exp $
+# $NetBSD: buildlink2.mk,v 1.7 2003/11/12 01:31:51 salo Exp $
 
 .if !defined(GNOME_VFS_BUILDLINK2_MK)
 GNOME_VFS_BUILDLINK2_MK=	# defined
 
 BUILDLINK_PACKAGES+=		gnome-vfs
-BUILDLINK_DEPENDS.gnome-vfs?=	gnome-vfs>=1.0.5nb3
+BUILDLINK_DEPENDS.gnome-vfs?=	gnome-vfs>=1.0.5nb4
 BUILDLINK_PKGSRCDIR.gnome-vfs?=	../../sysutils/gnome-vfs
 
 EVAL_PREFIX+=			BUILDLINK_PREFIX.gnome-vfs=gnome-vfs
diff --git a/sysutils/gnome-vfs2/Makefile b/sysutils/gnome-vfs2/Makefile
index f03a83f54c3..a7bd3ed402d 100644
--- a/sysutils/gnome-vfs2/Makefile
+++ b/sysutils/gnome-vfs2/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.15 2003/07/17 22:53:35 grant Exp $
+# $NetBSD: Makefile,v 1.16 2003/11/12 01:31:51 salo Exp $
 #
 
 DISTNAME=		gnome-vfs-2.2.4
 PKGNAME=		${DISTNAME:S/vfs/vfs2/}
-PKGREVISION=		3
+PKGREVISION=		4
 CATEGORIES=		sysutils gnome
 MASTER_SITES=		${MASTER_SITE_GNOME:=sources/gnome-vfs/2.2/}
 EXTRACT_SUFX=		.tar.bz2
diff --git a/sysutils/gnome-vfs2/buildlink2.mk b/sysutils/gnome-vfs2/buildlink2.mk
index 77fc1e75f90..71a1bbc97e6 100644
--- a/sysutils/gnome-vfs2/buildlink2.mk
+++ b/sysutils/gnome-vfs2/buildlink2.mk
@@ -1,10 +1,10 @@
-# $NetBSD: buildlink2.mk,v 1.10 2003/07/13 13:53:17 wiz Exp $
+# $NetBSD: buildlink2.mk,v 1.11 2003/11/12 01:31:51 salo Exp $
 
 .if !defined(GNOME_VFS2_BUILDLINK2_MK)
 GNOME_VFS2_BUILDLINK2_MK=	# defined
 
 BUILDLINK_PACKAGES+=		gnome-vfs2
-BUILDLINK_DEPENDS.gnome-vfs2?=	gnome-vfs2>=2.2.4nb3
+BUILDLINK_DEPENDS.gnome-vfs2?=	gnome-vfs2>=2.2.4nb4
 BUILDLINK_PKGSRCDIR.gnome-vfs2?=	../../sysutils/gnome-vfs2
 
 EVAL_PREFIX+=				BUILDLINK_PREFIX.gnome-vfs2=gnome-vfs2
diff --git a/sysutils/gtop/Makefile b/sysutils/gtop/Makefile
index a0c7423d9e1..aec804c6188 100644
--- a/sysutils/gtop/Makefile
+++ b/sysutils/gtop/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.27 2003/07/17 22:53:36 grant Exp $
+# $NetBSD: Makefile,v 1.28 2003/11/12 01:31:51 salo Exp $
 
 DISTNAME=		gtop-1.0.13
-PKGREVISION=		4
+PKGREVISION=		5
 CATEGORIES=		sysutils gnome
 MASTER_SITES=		${MASTER_SITE_GNOME:=sources/gtop/1.0/}
 
diff --git a/sysutils/medusa/Makefile b/sysutils/medusa/Makefile
index a829472d562..ddf1b2d084b 100644
--- a/sysutils/medusa/Makefile
+++ b/sysutils/medusa/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.12 2003/07/21 17:24:19 martti Exp $
+# $NetBSD: Makefile,v 1.13 2003/11/12 01:31:51 salo Exp $
 #
 
 DISTNAME=		medusa-0.5.1
-PKGREVISION=		3
+PKGREVISION=		4
 CATEGORIES=		sysutils gnome
 MASTER_SITES=		${MASTER_SITE_GNOME:=sources/medusa/0.5/}	\
 			http://download.eazel.com/source/
diff --git a/sysutils/medusa/buildlink2.mk b/sysutils/medusa/buildlink2.mk
index 78e466deb0d..b75685c8b87 100644
--- a/sysutils/medusa/buildlink2.mk
+++ b/sysutils/medusa/buildlink2.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.3 2003/07/13 13:53:20 wiz Exp $
+# $NetBSD: buildlink2.mk,v 1.4 2003/11/12 01:31:51 salo Exp $
 #
 # This Makefile fragment is included by packages that use medusa.
 #
@@ -9,7 +9,7 @@
 MEDUSA_BUILDLINK2_MK=	# defined
 
 BUILDLINK_PACKAGES+=			medusa
-BUILDLINK_DEPENDS.medusa?=		medusa>=0.5.1nb3
+BUILDLINK_DEPENDS.medusa?=		medusa>=0.5.1nb4
 BUILDLINK_PKGSRCDIR.medusa?=		../../sysutils/medusa
 
 EVAL_PREFIX+=	BUILDLINK_PREFIX.medusa=medusa
diff --git a/sysutils/nautilus/Makefile b/sysutils/nautilus/Makefile
index 022c7c59dad..44b3eea720f 100644
--- a/sysutils/nautilus/Makefile
+++ b/sysutils/nautilus/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.7 2003/07/17 22:53:44 grant Exp $
+# $NetBSD: Makefile,v 1.8 2003/11/12 01:31:51 salo Exp $
 #
 
 DISTNAME=		nautilus-2.2.3.1
-PKGREVISION=		5
+PKGREVISION=		6
 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 19599d13f17..8c00f4a6bb8 100644
--- a/sysutils/nautilus/buildlink2.mk
+++ b/sysutils/nautilus/buildlink2.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.2 2003/07/13 13:53:20 wiz Exp $
+# $NetBSD: buildlink2.mk,v 1.3 2003/11/12 01:31:51 salo 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.1nb5
+BUILDLINK_DEPENDS.nautilus?=		nautilus>=2.2.3.1nb6
 BUILDLINK_PKGSRCDIR.nautilus?=		../../sysutils/nautilus
 
 EVAL_PREFIX+=	BUILDLINK_PREFIX.nautilus=nautilus
diff --git a/sysutils/rdiff-backup/Makefile b/sysutils/rdiff-backup/Makefile
index 0e5be8403ac..9a8bea58c07 100644
--- a/sysutils/rdiff-backup/Makefile
+++ b/sysutils/rdiff-backup/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.8 2003/09/29 02:00:45 lukem Exp $
+# $NetBSD: Makefile,v 1.9 2003/11/12 01:31:51 salo Exp $
 #
 
 DISTNAME=	rdiff-backup-0.12.5
+PKGREVISION=	1
 CATEGORIES=	sysutils net
 MASTER_SITES=	http://rdiff-backup.stanford.edu/
 
diff --git a/wm/econf/Makefile b/wm/econf/Makefile
index c841fc1ad70..e105f7f766a 100644
--- a/wm/econf/Makefile
+++ b/wm/econf/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.11 2003/07/21 17:34:01 martti Exp $
+# $NetBSD: Makefile,v 1.12 2003/11/12 01:31:51 salo Exp $
 #
 
 DISTNAME=		enlightenment-conf-0.15
 PKGNAME=		econf-0.15
-PKGREVISION=		3
+PKGREVISION=		4
 CATEGORIES=		x11 wm
 MASTER_SITES=		ftp://www.rasterman.com/pub/enlightenment/enlightenment/
 
diff --git a/wm/metacity-setup/Makefile b/wm/metacity-setup/Makefile
index ffb131c149e..1897e46717e 100644
--- a/wm/metacity-setup/Makefile
+++ b/wm/metacity-setup/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.4 2003/07/17 22:55:15 grant Exp $
+# $NetBSD: Makefile,v 1.5 2003/11/12 01:31:52 salo Exp $
 #
 
 DISTNAME=	metacity-setup-0.7.1
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	wm
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=metacity-setup/}
 
diff --git a/wm/metacity/Makefile b/wm/metacity/Makefile
index 53e22b52d84..a8abf11d2a5 100644
--- a/wm/metacity/Makefile
+++ b/wm/metacity/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.14 2003/07/23 15:34:17 jmmv Exp $
+# $NetBSD: Makefile,v 1.15 2003/11/12 01:31:52 salo Exp $
 #
 
 DISTNAME=	metacity-2.4.55
+PKGREVISION=	1
 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 adaa40403e8..da896f93050 100644
--- a/wm/metacity/buildlink2.mk
+++ b/wm/metacity/buildlink2.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.5 2003/07/23 15:34:17 jmmv Exp $
+# $NetBSD: buildlink2.mk,v 1.6 2003/11/12 01:31:52 salo 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.55
+BUILDLINK_DEPENDS.metacity?=		metacity>=2.4.55nb1
 BUILDLINK_PKGSRCDIR.metacity?=		../../wm/metacity
 
 EVAL_PREFIX+=	BUILDLINK_PREFIX.metacity=metacity
diff --git a/wm/sawfish-replibs/Makefile b/wm/sawfish-replibs/Makefile
index 6a08c81f8fc..505d4c69330 100644
--- a/wm/sawfish-replibs/Makefile
+++ b/wm/sawfish-replibs/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.9 2003/07/21 17:34:05 martti Exp $
+# $NetBSD: Makefile,v 1.10 2003/11/12 01:31:52 salo Exp $
 #
 
 PKGNAME=	sawfish-replibs-${SF_VERS}
-PKGREVISION=	2
+PKGREVISION=	3
 
 COMMENT=	Librep Lisp libraries for sawfish
 
diff --git a/wm/sawfish/Makefile b/wm/sawfish/Makefile
index 67afe979cb5..92600c8ebdb 100644
--- a/wm/sawfish/Makefile
+++ b/wm/sawfish/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.19 2003/08/09 11:30:27 seb Exp $
+# $NetBSD: Makefile,v 1.20 2003/11/12 01:31:52 salo Exp $
 #
 
 PKGNAME=		sawfish-${SF_VERS}
-PKGREVISION=		4
+PKGREVISION=		5
 
 COMMENT=		GNOME-aware window manager that is fully configurable in Lisp
 
diff --git a/www/galeon/Makefile b/www/galeon/Makefile
index 85559491daf..ac7c3f9d8a0 100644
--- a/www/galeon/Makefile
+++ b/www/galeon/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.53 2003/07/17 22:55:33 grant Exp $
+# $NetBSD: Makefile,v 1.54 2003/11/12 01:31:52 salo Exp $
 
 DISTNAME=	galeon-1.2.11
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=galeon/}
 
diff --git a/www/gtkhtml/Makefile b/www/gtkhtml/Makefile
index 657065f7981..fbc58fcd689 100644
--- a/www/gtkhtml/Makefile
+++ b/www/gtkhtml/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.33 2003/09/13 21:01:29 tron Exp $
+# $NetBSD: Makefile,v 1.34 2003/11/12 01:31:52 salo Exp $
 
 DISTNAME=		gtkhtml-1.1.10
+PKGREVISION=		1
 CATEGORIES=		www gnome
 MASTER_SITES=		${MASTER_SITE_GNOME:=sources/gtkhtml/1.1/}
 EXTRACT_SUFX=		.tar.bz2
diff --git a/www/gtkhtml/buildlink2.mk b/www/gtkhtml/buildlink2.mk
index b496f66f944..a332800a283 100644
--- a/www/gtkhtml/buildlink2.mk
+++ b/www/gtkhtml/buildlink2.mk
@@ -1,10 +1,10 @@
-# $NetBSD: buildlink2.mk,v 1.7 2003/07/13 13:53:48 wiz Exp $
+# $NetBSD: buildlink2.mk,v 1.8 2003/11/12 01:31:52 salo Exp $
 
 .if !defined(GTKHTML_BUILDLINK2_MK)
 GTKHTML_BUILDLINK2_MK=	# defined
 
 BUILDLINK_PACKAGES+=			gtkhtml
-BUILDLINK_DEPENDS.gtkhtml?=		gtkhtml>=1.1.7nb3
+BUILDLINK_DEPENDS.gtkhtml?=		gtkhtml>=1.1.10nb1
 BUILDLINK_PKGSRCDIR.gtkhtml?=		../../www/gtkhtml
 
 EVAL_PREFIX+=	BUILDLINK_PREFIX.gtkhtml=gtkhtml
diff --git a/www/libgtkhtml/Makefile b/www/libgtkhtml/Makefile
index 01a3ae8d9c4..e4aebb706b8 100644
--- a/www/libgtkhtml/Makefile
+++ b/www/libgtkhtml/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.8 2003/07/17 22:55:40 grant Exp $
+# $NetBSD: Makefile,v 1.9 2003/11/12 01:31:52 salo Exp $
 #
 
 DISTNAME=	libgtkhtml-2.2.1
-PKGREVISION=	2
+PKGREVISION=	3
 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 aad25f66897..d9b6bc77478 100644
--- a/www/libgtkhtml/buildlink2.mk
+++ b/www/libgtkhtml/buildlink2.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.5 2003/07/13 13:53:49 wiz Exp $
+# $NetBSD: buildlink2.mk,v 1.6 2003/11/12 01:31:52 salo 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.1nb2
+BUILDLINK_DEPENDS.libgtkhtml?=		libgtkhtml>=2.2.1nb3
 BUILDLINK_PKGSRCDIR.libgtkhtml?=	../../www/libgtkhtml
 
 EVAL_PREFIX+=	BUILDLINK_PREFIX.libgtkhtml=libgtkhtml
diff --git a/x11/controlcenter/Makefile b/x11/controlcenter/Makefile
index 3d6b46ae3d3..1c01120f74d 100644
--- a/x11/controlcenter/Makefile
+++ b/x11/controlcenter/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.50 2003/07/17 22:56:21 grant Exp $
+# $NetBSD: Makefile,v 1.51 2003/11/12 01:31:52 salo Exp $
 
 DISTNAME=		control-center-1.4.0.4
-PKGREVISION=		3
+PKGREVISION=		4
 CATEGORIES=		x11 gnome
 MASTER_SITES=		${MASTER_SITE_GNOME:=sources/control-center/1.4/}
 
diff --git a/x11/controlcenter/buildlink2.mk b/x11/controlcenter/buildlink2.mk
index 5e4166d4985..8f530952795 100644
--- a/x11/controlcenter/buildlink2.mk
+++ b/x11/controlcenter/buildlink2.mk
@@ -1,10 +1,10 @@
-# $NetBSD: buildlink2.mk,v 1.7 2003/07/13 13:53:53 wiz Exp $
+# $NetBSD: buildlink2.mk,v 1.8 2003/11/12 01:31:52 salo Exp $
 
 .if !defined(CONTROLCENTER_BUILDLINK2_MK)
 CONTROLCENTER_BUILDLINK2_MK=	# defined
 
 BUILDLINK_PACKAGES+=			controlcenter
-BUILDLINK_DEPENDS.controlcenter?=	control-center>=1.4.0.4nb3
+BUILDLINK_DEPENDS.controlcenter?=	control-center>=1.4.0.4nb4
 BUILDLINK_PKGSRCDIR.controlcenter?=	../../x11/controlcenter
 DEPENDS+=	${BUILDLINK_DEPENDS.controlcenter}:../../x11/controlcenter
 
diff --git a/x11/gdkxft/Makefile b/x11/gdkxft/Makefile
index 7a15571cfcc..a43a1d3a6e2 100644
--- a/x11/gdkxft/Makefile
+++ b/x11/gdkxft/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.15 2003/10/30 12:29:30 grant Exp $
+# $NetBSD: Makefile,v 1.16 2003/11/12 01:31:52 salo Exp $
 #
 
 DISTNAME=		gdkxft-1.5
-PKGREVISION=		3
+PKGREVISION=		4
 CATEGORIES=		x11
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=gdkxft/}
 
diff --git a/x11/gnome-applets/Makefile b/x11/gnome-applets/Makefile
index 4f3851e52e6..33a318f0ac6 100644
--- a/x11/gnome-applets/Makefile
+++ b/x11/gnome-applets/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.32 2003/07/17 22:56:26 grant Exp $
+# $NetBSD: Makefile,v 1.33 2003/11/12 01:31:52 salo Exp $
 #
 
 DISTNAME=		gnome-applets-1.4.0.4
-PKGREVISION=		6
+PKGREVISION=		7
 CATEGORIES=		x11 gnome
 MASTER_SITES=		${MASTER_SITE_GNOME:=sources/gnome-applets/1.4/}
 EXTRACT_SUFX=		.tar.bz2
diff --git a/x11/gnome-core/Makefile b/x11/gnome-core/Makefile
index 1cadd666267..20c9e36a7c6 100644
--- a/x11/gnome-core/Makefile
+++ b/x11/gnome-core/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.92 2003/09/08 18:08:33 jmmv Exp $
+# $NetBSD: Makefile,v 1.93 2003/11/12 01:31:52 salo Exp $
 #
 
 .include "Makefile.common"
 
-PKGREVISION=		7
+PKGREVISION=		8
 
 COMMENT=		Core component of GNU Network Object Management Environment
 
diff --git a/x11/gnome-core/buildlink2.mk b/x11/gnome-core/buildlink2.mk
index b948016690a..57d51403c49 100644
--- a/x11/gnome-core/buildlink2.mk
+++ b/x11/gnome-core/buildlink2.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.8 2003/07/13 13:53:55 wiz Exp $
+# $NetBSD: buildlink2.mk,v 1.9 2003/11/12 01:31:52 salo Exp $
 #
 # This Makefile fragment is included by packages that use gnome-core.
 #
@@ -9,7 +9,7 @@
 GNOME_CORE_BUILDLINK2_MK=	# defined
 
 BUILDLINK_PACKAGES+=			gnome-core
-BUILDLINK_DEPENDS.gnome-core?=		gnome-core>=1.4.2nb6
+BUILDLINK_DEPENDS.gnome-core?=		gnome-core>=1.4.2nb8
 BUILDLINK_PKGSRCDIR.gnome-core?=		../../x11/gnome-core
 
 EVAL_PREFIX+=	BUILDLINK_PREFIX.gnome-core=gnome-core
diff --git a/x11/gnome-desktop/Makefile b/x11/gnome-desktop/Makefile
index 322dc9ad969..5bdf509e92d 100644
--- a/x11/gnome-desktop/Makefile
+++ b/x11/gnome-desktop/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.12 2003/07/17 22:56:26 grant Exp $
+# $NetBSD: Makefile,v 1.13 2003/11/12 01:31:52 salo Exp $
 #
 
 DISTNAME=		gnome-desktop-2.2.0.1
-PKGREVISION=		2
+PKGREVISION=		3
 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 7b241c447cb..f6ab65ce227 100644
--- a/x11/gnome-desktop/buildlink2.mk
+++ b/x11/gnome-desktop/buildlink2.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.8 2003/07/13 13:53:56 wiz Exp $
+# $NetBSD: buildlink2.mk,v 1.9 2003/11/12 01:31:52 salo 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.1nb2
+BUILDLINK_DEPENDS.gnome-desktop?=	gnome-desktop>=2.2.0.1nb3
 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 f83c1faa6cf..57af7e9f498 100644
--- a/x11/gnome-panel/Makefile
+++ b/x11/gnome-panel/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.14 2003/07/23 15:36:27 jmmv Exp $
+# $NetBSD: Makefile,v 1.15 2003/11/12 01:31:52 salo Exp $
 #
 
 DISTNAME=		gnome-panel-2.2.2.2
-PKGREVISION=		2
+PKGREVISION=		3
 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 6705b815961..2a074d9f1d5 100644
--- a/x11/gnome-panel/buildlink2.mk
+++ b/x11/gnome-panel/buildlink2.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.5 2003/07/13 13:53:56 wiz Exp $
+# $NetBSD: buildlink2.mk,v 1.6 2003/11/12 01:31:52 salo 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.2nb1
+BUILDLINK_DEPENDS.gnome-panel?=		gnome-panel>=2.2.2.2nb3
 BUILDLINK_PKGSRCDIR.gnome-panel?=		../../x11/gnome-panel
 
 EVAL_PREFIX+=	BUILDLINK_PREFIX.gnome-panel=gnome-panel
diff --git a/x11/gnome-python/Makefile b/x11/gnome-python/Makefile
index 43bf714681e..a8eb0f05623 100644
--- a/x11/gnome-python/Makefile
+++ b/x11/gnome-python/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.36 2003/07/17 22:56:27 grant Exp $
+# $NetBSD: Makefile,v 1.37 2003/11/12 01:31:52 salo Exp $
 
 DISTNAME=		gnome-python-1.4.4
 PKGNAME=		${PYPKGPREFIX}-gnome-1.4.4
-PKGREVISION=		2
+PKGREVISION=		3
 CATEGORIES=		x11 gnome
 MASTER_SITES=		${MASTER_SITE_GNOME:=sources/gnome-python/1.4/}
 
diff --git a/x11/gnome-session/Makefile b/x11/gnome-session/Makefile
index d8f075daaa5..673bbb4a9b3 100644
--- a/x11/gnome-session/Makefile
+++ b/x11/gnome-session/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.16 2003/07/23 15:36:28 jmmv Exp $
+# $NetBSD: Makefile,v 1.17 2003/11/12 01:31:52 salo Exp $
 #
 
 DISTNAME=		gnome-session-2.2.1
-PKGREVISION=		3
+PKGREVISION=		4
 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 f93674b7bd1..c0b64e03324 100644
--- a/x11/gnome-themes/Makefile
+++ b/x11/gnome-themes/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.1.1.1 2003/09/12 17:15:11 xtraeme Exp $
+# $NetBSD: Makefile,v 1.2 2003/11/12 01:31:52 salo Exp $
 #
 
 DISTNAME=		gnome-themes-2.2
+PKGREVISION=		1
 CATEGORIES=		x11
 MASTER_SITES=		${MASTER_SITE_GNOME:=sources/gnome-themes/2.2/}
 EXTRACT_SUFX=		.tar.bz2
diff --git a/x11/gnome1-panel/Makefile b/x11/gnome1-panel/Makefile
index 66787a61386..2a2e394447d 100644
--- a/x11/gnome1-panel/Makefile
+++ b/x11/gnome1-panel/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.5 2003/07/21 17:38:27 martti Exp $
+# $NetBSD: Makefile,v 1.6 2003/11/12 01:31:52 salo Exp $
 #
 
 .include "../../x11/gnome-core/Makefile.common"
 
 PKGNAME=		${DISTNAME:S/-core/-panel/}
-PKGREVISION=		2
+PKGREVISION=		3
 
 COMMENT=		Gnome-panel component split out from gnome-core
 
diff --git a/x11/gnome1-panel/buildlink2.mk b/x11/gnome1-panel/buildlink2.mk
index be424464ce8..bf6696df8c0 100644
--- a/x11/gnome1-panel/buildlink2.mk
+++ b/x11/gnome1-panel/buildlink2.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.3 2003/07/13 13:53:57 wiz Exp $
+# $NetBSD: buildlink2.mk,v 1.4 2003/11/12 01:31:52 salo Exp $
 #
 # This Makefile fragment is included by packages that use gnome-panel.
 #
@@ -9,7 +9,7 @@
 GNOME_PANEL_BUILDLINK2_MK=	# defined
 
 BUILDLINK_PACKAGES+=			gnome-panel
-BUILDLINK_DEPENDS.gnome-panel?=		gnome-panel>=1.4.2nb2
+BUILDLINK_DEPENDS.gnome-panel?=		gnome-panel>=1.4.2nb3
 BUILDLINK_PKGSRCDIR.gnome-panel?=		../../x11/gnome1-panel
 
 EVAL_PREFIX+=	BUILDLINK_PREFIX.gnome-panel=gnome-panel
diff --git a/x11/gnome1-session/Makefile b/x11/gnome1-session/Makefile
index 413341d59ca..de9b5b56409 100644
--- a/x11/gnome1-session/Makefile
+++ b/x11/gnome1-session/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.4 2003/07/13 13:53:58 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2003/11/12 01:31:53 salo Exp $
 #
 
 .include "../../x11/gnome-core/Makefile.common"
 
 PKGNAME=		${DISTNAME:S/-core/-session/}
-PKGREVISION=		2
+PKGREVISION=		3
 
 COMMENT=		Gnome-session component split out from gnome-core
 
diff --git a/x11/gnome1-session/buildlink2.mk b/x11/gnome1-session/buildlink2.mk
index fd5fe382f0e..fd0f4490b27 100644
--- a/x11/gnome1-session/buildlink2.mk
+++ b/x11/gnome1-session/buildlink2.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.3 2003/07/13 13:53:58 wiz Exp $
+# $NetBSD: buildlink2.mk,v 1.4 2003/11/12 01:31:53 salo Exp $
 #
 # This Makefile fragment is included by packages that use gnome-session.
 #
@@ -9,7 +9,7 @@
 GNOME_SESSION_BUILDLINK2_MK=	# defined
 
 BUILDLINK_PACKAGES+=			gnome-session
-BUILDLINK_DEPENDS.gnome-session?=		gnome-session>=1.4.2nb2
+BUILDLINK_DEPENDS.gnome-session?=		gnome-session>=1.4.2nb3
 BUILDLINK_PKGSRCDIR.gnome-session?=		../../x11/gnome1-session
 
 EVAL_PREFIX+=	BUILDLINK_PREFIX.gnome-session=gnome-session
diff --git a/x11/gnome2-applets/Makefile b/x11/gnome2-applets/Makefile
index 2bf8432c006..03c8559e9df 100644
--- a/x11/gnome2-applets/Makefile
+++ b/x11/gnome2-applets/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.6 2003/07/23 15:36:29 jmmv Exp $
+# $NetBSD: Makefile,v 1.7 2003/11/12 01:31:53 salo Exp $
 #
 
 DISTNAME=		gnome-applets-2.2.1
-PKGREVISION=		3
+PKGREVISION=		4
 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 ecda172453a..059c24a3369 100644
--- a/x11/gnome2-control-center/Makefile
+++ b/x11/gnome2-control-center/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.14 2003/07/23 15:36:26 jmmv Exp $
+# $NetBSD: Makefile,v 1.15 2003/11/12 01:31:53 salo Exp $
 #
 
 DISTNAME=	control-center-2.2.1
 PKGNAME=	gnome2-${DISTNAME}
-PKGREVISION=	4
+PKGREVISION=	5
 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 f56ac836fa0..f1d23203852 100644
--- a/x11/gnome2-control-center/buildlink2.mk
+++ b/x11/gnome2-control-center/buildlink2.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.7 2003/07/13 13:53:58 wiz Exp $
+# $NetBSD: buildlink2.mk,v 1.8 2003/11/12 01:31:53 salo 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.1nb3
+BUILDLINK_DEPENDS.gnome2-control-center?=	gnome2-control-center>=2.2.1nb5
 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 7e57ef19cd9..da8dbbeabea 100644
--- a/x11/gnome2-terminal/Makefile
+++ b/x11/gnome2-terminal/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.12 2003/09/08 18:07:21 jmmv Exp $
+# $NetBSD: Makefile,v 1.13 2003/11/12 01:31:53 salo Exp $
 #
 
 DISTNAME=		gnome-terminal-2.0.2
 PKGNAME=		${DISTNAME:S/-/2-/}
-PKGREVISION=		1
+PKGREVISION=		2
 CATEGORIES=		x11 gnome
 MASTER_SITES=		${MASTER_SITE_GNOME:=sources/gnome-terminal/2.0/}
 EXTRACT_SUFX=		.tar.bz2
diff --git a/x11/gtksourceview/Makefile b/x11/gtksourceview/Makefile
index 2236828cac2..69f03b4a88f 100644
--- a/x11/gtksourceview/Makefile
+++ b/x11/gtksourceview/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.2 2003/10/24 21:55:34 cube Exp $
+# $NetBSD: Makefile,v 1.3 2003/11/12 01:31:53 salo Exp $
 #
 
 DISTNAME=	gtksourceview-0.7.0
+PKGREVISION=	1
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/gtksourceview/0.7/}
 
diff --git a/x11/gtksourceview/buildlink2.mk b/x11/gtksourceview/buildlink2.mk
index d0c176c48fe..ae9a0e3180f 100644
--- a/x11/gtksourceview/buildlink2.mk
+++ b/x11/gtksourceview/buildlink2.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.2 2003/10/24 21:55:34 cube Exp $
+# $NetBSD: buildlink2.mk,v 1.3 2003/11/12 01:31:53 salo 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.0
+BUILDLINK_DEPENDS.gtksourceview?=		gtksourceview>=0.7.0nb1
 BUILDLINK_PKGSRCDIR.gtksourceview?=		../../x11/gtksourceview
 
 EVAL_PREFIX+=	BUILDLINK_PREFIX.gtksourceview=gtksourceview
diff --git a/x11/py-gnome2/Makefile b/x11/py-gnome2/Makefile
index 9094eca5ddf..85c77dd348c 100644
--- a/x11/py-gnome2/Makefile
+++ b/x11/py-gnome2/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.2 2003/09/09 16:30:23 recht Exp $
+# $NetBSD: Makefile,v 1.3 2003/11/12 01:31:53 salo Exp $
 #
 
 DISTNAME=	gnome-python-2.0.0
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME:S/gnome-python/gnome2/}
+PKGREVISION=	1
 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 09dd9309ac9..0484ede1f77 100644
--- a/x11/py-gnome2/buildlink2.mk
+++ b/x11/py-gnome2/buildlink2.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.1.1.1 2003/09/09 13:06:20 recht Exp $
+# $NetBSD: buildlink2.mk,v 1.2 2003/11/12 01:31:53 salo 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.0
+BUILDLINK_DEPENDS.pygnome2?=		${PYPKGPREFIX}-gnome2>=2.0.0nb1
 BUILDLINK_PKGSRCDIR.pygnome2?=		../../x11/py-gnome2
 
 EVAL_PREFIX+=	BUILDLINK_PREFIX.pygnome2=${PYPKGPREFIX}-gnome2
diff --git a/x11/xscreensaver-gnome/Makefile b/x11/xscreensaver-gnome/Makefile
index 427bfe09cbd..0460f6f48ae 100644
--- a/x11/xscreensaver-gnome/Makefile
+++ b/x11/xscreensaver-gnome/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.20 2003/09/08 12:11:17 wiz Exp $
+# $NetBSD: Makefile,v 1.21 2003/11/12 01:31:53 salo Exp $
 #
 
 PKGNAME=	${DISTNAME:S/-/-gnome-/}
+PKGREVISION=	1
 COMMENT=	Screen saver and locker for the X window system (with GNOME support)
 
 CONFLICTS+=	xscreensaver-[0-9]*