Give all packages which depend on "png" a version bump, and update

all dependencies on packages depending on "png" which contain shared
libraries, all for the (imminent) update to the "png" package.
[List courtesy of John Darrow, courtesy of "bulk-build".]

63 files changed, 182 insertions, 133 deletions

diff --git a/x11/XmHTML/Makefile b/x11/XmHTML/Makefile
index 29ba6b436f2..9b3780868c1 100644
--- a/x11/XmHTML/Makefile
+++ b/x11/XmHTML/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.24 2001/10/24 22:11:11 jlam Exp $
+# $NetBSD: Makefile,v 1.25 2002/03/13 17:37:53 fredb Exp $
 #
 
 DISTNAME=       XmHTML-1.1.7
+PKGREVISION=	2
 CATEGORIES=	x11
 MASTER_SITES=   http://www.xs4all.nl/~ripley/XmHTML/dist/
 
diff --git a/x11/aterm/Makefile b/x11/aterm/Makefile
index 91577435494..7b7afe0e05c 100644
--- a/x11/aterm/Makefile
+++ b/x11/aterm/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.6 2001/12/11 16:02:08 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2002/03/13 17:37:53 fredb Exp $
 #
 
 DISTNAME=	aterm-0.4.2
+PKGREVISION=	1
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=aterm/}
 
diff --git a/x11/controlcenter/Makefile b/x11/controlcenter/Makefile
index e2abcb618cb..ed34ecb3b87 100644
--- a/x11/controlcenter/Makefile
+++ b/x11/controlcenter/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.34 2001/10/24 22:11:11 jlam Exp $
+# $NetBSD: Makefile,v 1.35 2002/03/13 17:37:54 fredb Exp $
 
 DISTNAME=		control-center-1.4.0.1
+PKGREVISION=		1
 CATEGORIES=		x11 gnome
 MASTER_SITES=		${MASTER_SITE_GNOME:=stable/sources/control-center/}
 
@@ -11,7 +12,7 @@ COMMENT=		GNOME control-center development library
 DEPENDS+=			scrollkeeper-[0-9]*:../../textproc/scrollkeeper
 BUILD_USES_MSGFMT=	YES
 
-BUILDLINK_DEPENDS.gnome-libs=	gnome-libs>=1.2.13
+BUILDLINK_DEPENDS.gnome-libs=	gnome-libs>=1.4.1.2nb1
 
 USE_BUILDLINK_ONLY=	YES
 USE_X11BASE=		YES
diff --git a/x11/controlcenter/buildlink.mk b/x11/controlcenter/buildlink.mk
index 63f4f6beb3d..119b09f6dbf 100644
--- a/x11/controlcenter/buildlink.mk
+++ b/x11/controlcenter/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.1 2001/10/06 13:09:52 rh Exp $
+# $NetBSD: buildlink.mk,v 1.2 2002/03/13 17:37:54 fredb Exp $
 #
 # This Makefile fragment is included by packages that use controlcenter.
 #
@@ -17,7 +17,7 @@ CONTROLCENTER_BUILDLINK_MK=	# defined
 
 .include "../../mk/bsd.buildlink.mk"
 
-BUILDLINK_DEPENDS.controlcenter?=	control-center>=1.4
+BUILDLINK_DEPENDS.controlcenter?=	control-center>=1.4.0.1nb1
 DEPENDS+=	${BUILDLINK_DEPENDS.controlcenter}:../../x11/controlcenter
 
 EVAL_PREFIX+=			BUILDLINK_PREFIX.controlcenter=controlcenter
diff --git a/x11/dfm/Makefile.common b/x11/dfm/Makefile.common
index a45f6f7ab55..9621643c0a8 100644
--- a/x11/dfm/Makefile.common
+++ b/x11/dfm/Makefile.common
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile.common,v 1.2 2001/10/21 10:49:59 wiz Exp $
+# $NetBSD: Makefile.common,v 1.3 2002/03/13 17:37:54 fredb Exp $
 #
 
 DISTNAME=	dfm-0.99.9
+PKGREVISION=	1
 MASTER_SITES=	http://www.kaisersite.de/dfm/
 
 WRKSRC=		${WRKDIR}/dfm
diff --git a/x11/ebuilder/Makefile b/x11/ebuilder/Makefile
index e0b5548408c..f66852e212b 100644
--- a/x11/ebuilder/Makefile
+++ b/x11/ebuilder/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.14 2001/10/24 22:11:11 jlam Exp $
+# $NetBSD: Makefile,v 1.15 2002/03/13 17:37:54 fredb Exp $
 #
 
 DISTNAME=	ebuilder-0.56d
+PKGREVISION=	1
 WRKSRC=		${WRKDIR}/${PKGNAME}
 CATEGORIES=	x11 devel
 MASTER_SITES=	http://web.inter.nl.net/users/eavdmeer/src/
diff --git a/x11/eterm/Makefile b/x11/eterm/Makefile
index 39fb3d5497d..7450c371967 100644
--- a/x11/eterm/Makefile
+++ b/x11/eterm/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.14 2001/12/11 15:37:48 wiz Exp $
+# $NetBSD: Makefile,v 1.15 2002/03/13 17:37:54 fredb Exp $
 
 DISTNAME=		Eterm-0.8.10
 PKGNAME=		eterm-0.8.10
+PKGREVISION=		1
 CATEGORIES=		x11
 MASTER_SITES=		ftp://ftp.eterm.org/pub/Eterm/ \
 			ftp://alien.eterm.org/pub/Eterm/ \
diff --git a/x11/fox/Makefile b/x11/fox/Makefile
index 9d11a96abf1..0b6a748861b 100644
--- a/x11/fox/Makefile
+++ b/x11/fox/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.8 2001/08/05 17:04:21 sakamoto Exp $
+# $NetBSD: Makefile,v 1.9 2002/03/13 17:37:55 fredb Exp $
 # FreeBSD Id: ports/x11-toolkits/fox/Makefile,v 1.14 2001/02/23 19:00:05 knu Exp
 
 DISTNAME=	fox-0.99.174
+PKGREVISION=	1
 CATEGORIES=	x11
 MASTER_SITES=	ftp://ftp.cfdrc.com/pub/FOX/ \
 		ftp://SunSITE.Informatik.RWTH-Aachen.DE/pub/Linux/fox/
diff --git a/x11/fox/buildlink.mk b/x11/fox/buildlink.mk
index 251248396ce..8106a38f553 100644
--- a/x11/fox/buildlink.mk
+++ b/x11/fox/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.1 2001/08/05 17:04:21 sakamoto Exp $
+# $NetBSD: buildlink.mk,v 1.2 2002/03/13 17:37:55 fredb Exp $
 #
 # This Makefile fragment is included by packages that use fox.
 #
@@ -17,7 +17,7 @@ FOX_BUILDLINK_MK=	# defined
 
 .include "../../mk/bsd.buildlink.mk"
 
-BUILDLINK_DEPENDS.fox?=	fox-*
+BUILDLINK_DEPENDS.fox?=	fox>=0.99.174nb1
 DEPENDS+=	${BUILDLINK_DEPENDS.fox}:../../x11/fox
 
 EVAL_PREFIX+=		BUILDLINK_PREFIX.fox=fox
diff --git a/x11/gdm/Makefile b/x11/gdm/Makefile
index a1dbb4934af..99be9a0af54 100644
--- a/x11/gdm/Makefile
+++ b/x11/gdm/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.25 2001/09/30 07:39:48 tron Exp $
+# $NetBSD: Makefile,v 1.26 2002/03/13 17:37:55 fredb Exp $
 
 DISTNAME=	gdm-2.2.0
+PKGREVISION=	1
 CATEGORIES=	x11 gnome
 MASTER_SITES=	${MASTER_SITE_GNOME:=stable/sources/gdm/} \
 		${MASTER_SITE_LOCAL}
@@ -10,8 +11,8 @@ MAINTAINER=	mjl@netbsd.org
 HOMEPAGE=	http://www.gnome.org/
 COMMENT=	Gnome Display Manager - a re-implementation of the xdm program
 
-DEPENDS+=	gnome-libs-[0-9]*:../../x11/gnome-libs
-DEPENDS+=	libglade>=0.16:../../devel/libglade
+DEPENDS+=	gnome-libs>=1.4.1.2nb1:../../x11/gnome-libs
+DEPENDS+=	libglade>=0.17nb1:../../devel/libglade
 
 EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 
diff --git a/x11/gnome--/Makefile b/x11/gnome--/Makefile
index ef3d291966e..776b7e60bbb 100644
--- a/x11/gnome--/Makefile
+++ b/x11/gnome--/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.5 2002/02/14 13:50:44 drochner Exp $
+# $NetBSD: Makefile,v 1.6 2002/03/13 17:37:55 fredb Exp $
 #
 
 DISTNAME=	gnomemm-1.1.19
 PKGNAME=	gnome---1.1.19
+PKGREVISION=	1
 CATEGORIES=	x11
 MASTER_SITES=	http://prdownloads.sourceforge.net/gtkmm/
 
@@ -10,7 +11,7 @@ MAINTAINER=	packages@netbsd.org
 HOMEPAGE=	http://gtkmm.sourceforge.net/
 COMMENT=	C++ binding for the GNOME libraries
 
-DEPENDS+=	gnome-libs-[0-9]*:../../x11/gnome-libs
+DEPENDS+=	gnome-libs>=1.4.1.2nb1:../../x11/gnome-libs
 DEPENDS+=	libsigc++>=1.0.1:../../devel/libsigc++
 DEPENDS+=	gtk-->=1.2.5:../../x11/gtk--
 BUILD_DEPENDS+=	perl-*:../../lang/perl5
diff --git a/x11/gnome-applets/Makefile b/x11/gnome-applets/Makefile
index 3ec92ae6654..df485e03c12 100644
--- a/x11/gnome-applets/Makefile
+++ b/x11/gnome-applets/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.17 2001/10/06 18:29:33 rh Exp $
+# $NetBSD: Makefile,v 1.18 2002/03/13 17:37:55 fredb Exp $
 #
 
 DISTNAME=		gnome-applets-1.4.0.4
+PKGREVISION=		1
 CATEGORIES=		x11 gnome
 MASTER_SITES=		${MASTER_SITE_GNOME:=stable/sources/gnome-applets/}
 EXTRACT_SUFX=		.tar.bz2
@@ -11,8 +12,8 @@ HOMEPAGE=		http://www.gnome.org/
 COMMENT=		Applets for GNOME
 
 BUILD_DEPENDS+=		xml-i18n-tools-[0-9]*:../../textproc/xml-i18n-tools
-DEPENDS+=		gnome-core>=1.4.0.4:../../x11/gnome-core
-DEPENDS+=		libgtop>=1.0.12:../../devel/libgtop
+DEPENDS+=		gnome-core>=1.4.0.4nb1:../../x11/gnome-core
+DEPENDS+=		libgtop>=1.0.12nb2:../../devel/libgtop
 
 USE_GMAKE=		YES
 USE_X11BASE=		YES
diff --git a/x11/gnome-core/Makefile b/x11/gnome-core/Makefile
index 6b20d6bbf01..f96c6a56088 100644
--- a/x11/gnome-core/Makefile
+++ b/x11/gnome-core/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.72 2001/10/24 22:11:12 jlam Exp $
+# $NetBSD: Makefile,v 1.73 2002/03/13 17:37:56 fredb Exp $
 
 DISTNAME=		gnome-core-1.4.0.4
+PKGREVISION=		1
 CATEGORIES=		x11 gnome
 MASTER_SITES=		${MASTER_SITE_GNOME:=stable/sources/gnome-core/}
 EXTRACT_SUFX=		.tar.bz2
diff --git a/x11/gnome-core/buildlink.mk b/x11/gnome-core/buildlink.mk
index cc7865936a9..26362cb9dea 100644
--- a/x11/gnome-core/buildlink.mk
+++ b/x11/gnome-core/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.3 2001/10/06 15:58:06 rh Exp $
+# $NetBSD: buildlink.mk,v 1.4 2002/03/13 17:37:56 fredb Exp $
 #
 # This Makefile fragment is included by packages that use gnome-core.
 #
@@ -17,7 +17,7 @@ GNOME_CORE_BUILDLINK_MK=	# defined
 
 .include "../../mk/bsd.buildlink.mk"
 
-BUILDLINK_DEPENDS.gnome-core?=	gnome-core>=1.0.53
+BUILDLINK_DEPENDS.gnome-core?=	gnome-core>=1.4.0.4nb1
 DEPENDS+=	${BUILDLINK_DEPENDS.gnome-core}:../../x11/gnome-core
 
 EVAL_PREFIX+=			BUILDLINK_PREFIX.gnome-core=gnome-core
diff --git a/x11/gnome-gkrellm/Makefile b/x11/gnome-gkrellm/Makefile
index aefe51d94bc..6765863bba2 100644
--- a/x11/gnome-gkrellm/Makefile
+++ b/x11/gnome-gkrellm/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.3 2001/11/14 05:02:47 damon Exp $
+# $NetBSD: Makefile,v 1.4 2002/03/13 17:37:56 fredb Exp $
 
 DISTNAME=	gkrellm-gnome
 PKGNAME=	gnome-gkrellm-0.1
+PKGREVISION=	1
 CATEGORIES=	gnome sysutils
 MASTER_SITES=	http://web.wt.net/~billw/gkrellm/Plugins/
 
@@ -10,7 +11,7 @@ HOMEPAGE=	http://web.wt.net/~billw/gkrellm/Plugins.html
 COMMENT=	gkrellm gnome plugin
 
 DEPENDS+=       gkrellm-1.2.*:../../sysutils/gkrellm
-DEPENDS+=	gnome-libs>=1.2.1:../gnome-libs
+DEPENDS+=	gnome-libs>=1.4.1.2nb1:../gnome-libs
 
 USE_GMAKE=	yes
 
diff --git a/x11/gnome-libs/Makefile b/x11/gnome-libs/Makefile
index cdf46da18a7..f35da072549 100644
--- a/x11/gnome-libs/Makefile
+++ b/x11/gnome-libs/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.74 2002/01/01 15:14:19 bjoern Exp $
+# $NetBSD: Makefile,v 1.75 2002/03/13 17:37:56 fredb Exp $
 
 DISTNAME=		gnome-libs-1.4.1.2
+PKGREVISION=		1
 CATEGORIES=		x11 gnome
 MASTER_SITES=		${MASTER_SITE_GNOME:=stable/sources/gnome-libs/}
 
diff --git a/x11/gnome-libs/buildlink.mk b/x11/gnome-libs/buildlink.mk
index 3b5237471c1..0f42035cde1 100644
--- a/x11/gnome-libs/buildlink.mk
+++ b/x11/gnome-libs/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.13 2001/10/21 19:41:16 rh Exp $
+# $NetBSD: buildlink.mk,v 1.14 2002/03/13 17:37:56 fredb Exp $
 #
 # This Makefile fragment is included by packages that use gnome-libs.
 #
@@ -17,7 +17,7 @@ GNOME_LIBS_BUILDLINK_MK=	# defined
 
 .include "../../mk/bsd.buildlink.mk"
 
-BUILDLINK_DEPENDS.gnome-libs?=	gnome-libs>=1.0.53
+BUILDLINK_DEPENDS.gnome-libs?=	gnome-libs>=1.4.1.2nb1
 DEPENDS+=	${BUILDLINK_DEPENDS.gnome-libs}:../../x11/gnome-libs
 
 EVAL_PREFIX+=			BUILDLINK_PREFIX.gnome-libs=gnome-libs
diff --git a/x11/gnome-python/Makefile b/x11/gnome-python/Makefile
index f9a46b11968..39e71ac4ae4 100644
--- a/x11/gnome-python/Makefile
+++ b/x11/gnome-python/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.22 2002/02/12 21:49:56 jwise Exp $
+# $NetBSD: Makefile,v 1.23 2002/03/13 17:37:56 fredb Exp $
 
 DISTNAME=		gnome-python-1.4.0
 PKGNAME=		${PYPKGPREFIX}-gnome-1.4.0
+PKGREVISION=		1
 CATEGORIES=		x11 gnome
 MASTER_SITES=		${MASTER_SITE_GNOME:=stable/sources/gnome-python/}
 
@@ -9,9 +10,9 @@ MAINTAINER=		drochner@netbsd.org
 HOMEPAGE=		http://www.daa.com.au/~james/gnome/
 COMMENT=		Python Bindings for the GNU Network Object Model Environment
 
-DEPENDS+=		gnome-core>1.4.0:../gnome-core
+DEPENDS+=		gnome-core>=1.4.0.4nb1:../../x11/gnome-core
 DEPENDS+=		gtkglarea-[0-9]*:../../x11/gtkglarea
-DEPENDS+=		libglade-[0-9]*:../../devel/libglade
+DEPENDS+=		libglade-0.17nb1:../../devel/libglade
 
 CONFLICTS+=		py-gtk-[0-9]*
 CONFLICTS+=		gnome-python-*
diff --git a/x11/gnome-users-guide/Makefile b/x11/gnome-users-guide/Makefile
index 65528f92dd0..21739845f83 100644
--- a/x11/gnome-users-guide/Makefile
+++ b/x11/gnome-users-guide/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.7 2001/02/17 17:06:25 wiz Exp $
+# $NetBSD: Makefile,v 1.8 2002/03/13 17:37:57 fredb Exp $
 
 DISTNAME=	users-guide-1.2
 PKGNAME=	gnome-users-guide-1.2
+PKGREVISION=	1
 CATEGORIES=	x11 gnome
 MASTER_SITES=	${MASTER_SITE_GNOME:=stable/sources/users-guide/}
 
@@ -9,7 +10,7 @@ MAINTAINER=	tron@netbsd.org
 HOMEPAGE=	http://www.gnome.org/users-guide/project.shtml
 COMMENT=	User documentation for GNOME
 
-DEPENDS+=	gnome-libs>=1.2.1:../gnome-libs
+DEPENDS+=	gnome-libs>=1.4.1.2nb1:../gnome-libs
 
 GNU_CONFIGURE=	YES
 USE_X11BASE=	YES
diff --git a/x11/gnome/Makefile b/x11/gnome/Makefile
index be5c6f7a1da..6e5a9d26375 100644
--- a/x11/gnome/Makefile
+++ b/x11/gnome/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.27 2002/01/23 19:40:03 tron Exp $
+# $NetBSD: Makefile,v 1.28 2002/03/13 17:37:55 fredb Exp $
 
 DISTNAME=	gnome-1.4.0.5
+PKGREVISION=	1
 CATEGORIES=	x11 gnome
 MASTER_SITES=	# empty
 DISTFILES=	# empty
@@ -9,7 +10,7 @@ MAINTAINER=	packages@netbsd.org
 HOMEPAGE=	http://www.gnome.org/
 COMMENT=	"meta-package" for the GNU Network Object Model Environment
 
-DEPENDS+=	gnome-core>=1.4.0.4:../gnome-core
+DEPENDS+=	gnome-core>=1.4.0.4nb1:../../x11/gnome-core
 DEPENDS+=	ee>=0.3.12:../../graphics/ee
 DEPENDS+=	gdm>=2.2.0:../gdm
 DEPENDS+=	ggv>=1.0.1:../../print/ggv
@@ -23,7 +24,7 @@ DEPENDS+=	gnome-media>=1.2.0:../../audio/gnome-media
 DEPENDS+=	gnome-pim>=1.4.0:../../misc/gnome-pim
 DEPENDS+=	gnome-users-guide>=1.2:../gnome-users-guide
 DEPENDS+=	gnome-utils>=1.4.1:../../misc/gnome-utils
-DEPENDS+=	evolution>=0.15:../../mail/evolution
+DEPENDS+=	evolution>=0.15nb1:../../mail/evolution
 DEPENDS+=	gnumeric>=0.75:../../math/gnumeric0
 DEPENDS+=	gtk-->=1.2.5:../gtk--
 DEPENDS+=	gtk-engines>=0.12:../gtk-engines
diff --git a/x11/gtk-engines/Makefile b/x11/gtk-engines/Makefile
index 779e7fefc77..6df87ffbf9b 100644
--- a/x11/gtk-engines/Makefile
+++ b/x11/gtk-engines/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.9 2001/07/29 00:46:59 wiz Exp $
+# $NetBSD: Makefile,v 1.10 2002/03/13 17:37:57 fredb Exp $
 
 DISTNAME=		gtk-engines-0.12
+PKGREVISION=		1
 CATEGORIES=		x11
 MASTER_SITES=		${MASTER_SITE_GNOME:=stable/sources/gtk-engines/}
 
diff --git a/x11/kde/Makefile b/x11/kde/Makefile
index 434aaca3761..2a871c5a814 100644
--- a/x11/kde/Makefile
+++ b/x11/kde/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.27 2001/02/17 17:06:32 wiz Exp $
+# $NetBSD: Makefile,v 1.28 2002/03/13 17:37:57 fredb Exp $
 # FreeBSD Id: Makefile,v 1.2 1997/11/27 00:47:46 se Exp
 #
 
 DISTNAME=	kde-1.1.2
+PKGREVISION=	1
 CATEGORIES=	x11 kde
 MASTER_SITES=	# empty
 DISTFILES=	# empty
@@ -11,13 +12,13 @@ MAINTAINER=	packages@netbsd.org
 HOMEPAGE=	http://www.kde.org/
 COMMENT=	"meta-package" for the KDE integrated X11 desktop
 
-DEPENDS+=	kdeutils-1.1.2:../../misc/kdeutils
-DEPENDS+=	kdenetwork-1.1.2:../../net/kdenetwork
-DEPENDS+=	kdegraphics-1.1.2:../../graphics/kdegraphics
-DEPENDS+=	kdegames-1.1.2:../../games/kdegames
-DEPENDS+=	kdemultimedia-1.1.2:../../audio/kdemultimedia
-DEPENDS+=	kdetoys-1.1.2:../../games/kdetoys
-DEPENDS+=	korganizer-1.1.2:../../time/korganizer
+DEPENDS+=	kdeutils-1.1.2nb1:../../misc/kdeutils
+DEPENDS+=	kdenetwork-1.1.2nb1:../../net/kdenetwork
+DEPENDS+=	kdegraphics-1.1.2nb1:../../graphics/kdegraphics
+DEPENDS+=	kdegames-1.1.2nb1:../../games/kdegames
+DEPENDS+=	kdemultimedia-1.1.2nb1:../../audio/kdemultimedia
+DEPENDS+=	kdetoys-1.1.2nb1:../../games/kdetoys
+DEPENDS+=	korganizer-1.1.2nb1:../../time/korganizer
 
 USE_X11=	yes
 EXTRACT_ONLY=	# empty
diff --git a/x11/kde2/Makefile b/x11/kde2/Makefile
index 9e7232c8129..c43d9fa175d 100644
--- a/x11/kde2/Makefile
+++ b/x11/kde2/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.5 2001/12/03 15:37:16 skrll Exp $
+# $NetBSD: Makefile,v 1.6 2002/03/13 17:37:57 fredb Exp $
 
 DISTNAME=	kde-2.2.2
+PKGREVISION=	1
 CATEGORIES=	x11 kde
 MASTER_SITES=	# empty
 DISTFILES=	# empty
@@ -9,14 +10,14 @@ MAINTAINER=	skrll@netbsd.org
 HOMEPAGE=	http://www.kde.org/
 COMMENT=	"meta-package" for the KDE integrated X11 desktop
 
-DEPENDS+=	kdeadmin-2.2.2:../../misc/kdeadmin2
-DEPENDS+=	kdegames-2.2.2:../../games/kdegames2
-DEPENDS+=	kdegraphics-2.2.2:../../graphics/kdegraphics2
-DEPENDS+=	kdemultimedia-2.2.2:../../audio/kdemultimedia2
-DEPENDS+=	kdenetwork-2.2.2:../../net/kdenetwork2
-DEPENDS+=	kdepim-2.2.2:../../misc/kdepim2
-DEPENDS+=	kdetoys-2.2.2:../../games/kdetoys2
-DEPENDS+=	kdeutils-2.2.2:../../misc/kdeutils2
+DEPENDS+=	kdeadmin-2.2.2nb1:../../misc/kdeadmin2
+DEPENDS+=	kdegames-2.2.2nb1:../../games/kdegames2
+DEPENDS+=	kdegraphics-2.2.2nb1:../../graphics/kdegraphics2
+DEPENDS+=	kdemultimedia-2.2.2nb1:../../audio/kdemultimedia2
+DEPENDS+=	kdenetwork-2.2.2nb1:../../net/kdenetwork2
+DEPENDS+=	kdepim-2.2.2nb1:../../misc/kdepim2
+DEPENDS+=	kdetoys-2.2.2nb1:../../games/kdetoys2
+DEPENDS+=	kdeutils-2.2.2nb1:../../misc/kdeutils2
 
 EXTRACT_ONLY=	# empty
 USE_X11BASE=	yes
diff --git a/x11/kdebase/Makefile b/x11/kdebase/Makefile
index 72acecb030e..2bee1b7ac72 100644
--- a/x11/kdebase/Makefile
+++ b/x11/kdebase/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.83 2001/09/27 23:19:00 jlam Exp $
+# $NetBSD: Makefile,v 1.84 2002/03/13 17:37:57 fredb Exp $
 # FreeBSD Id: Makefile,v 1.6 1997/11/27 00:35:27 se Exp
 
 DISTNAME=	kdebase-1.1.2
+PKGREVISION=	1
 CATEGORIES=	x11 kde
 MASTER_SITES=	ftp://ftp.us.kde.org/pub/kde/Attic/old/1.1.2/distribution/tar/generic/source/bz2/ \
 		ftp://ftp.de.kde.org/pub/kde/Attic/old/1.1.2/distribution/tar/generic/source/bz2/ \
@@ -14,7 +15,7 @@ HOMEPAGE=       http://www.kde.org/
 COMMENT=	Base modules for the KDE integrated X11 desktop
 
 BUILD_USES_MSGFMT=	yes
-DEPENDS+=	kdelibs-1.1.2:../../x11/kdelibs
+DEPENDS+=	kdelibs-1.1.2nb1:../../x11/kdelibs
 # kdebase doesn't manipulate GIFs, but KDE packages depending on kdebase
 # often do, so put the dependency here.
 #
diff --git a/x11/kdebase2/Makefile b/x11/kdebase2/Makefile
index 226f2c1008c..ec76dcd130e 100644
--- a/x11/kdebase2/Makefile
+++ b/x11/kdebase2/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.34 2001/12/07 18:13:41 skrll Exp $
+# $NetBSD: Makefile,v 1.35 2002/03/13 17:37:58 fredb Exp $
 
 DISTNAME=	kdebase-2.2.2
+PKGREVISION=	1
 CATEGORIES=	x11
 COMMENT=	Base modules for the KDE 2 integrated X11 desktop
 
@@ -8,7 +9,7 @@ COMMENT=	Base modules for the KDE 2 integrated X11 desktop
 
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} Daemon.png Daemon.README
 
-BUILD_DEPENDS+=	qt2-designer-kde>=2.3.1nb1:../../x11/qt2-designer-kde
+BUILD_DEPENDS+=	qt2-designer-kde>=2.3.1nb2:../../x11/qt2-designer-kde
 
 EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 
diff --git a/x11/kdebase2/buildlink.mk b/x11/kdebase2/buildlink.mk
index a735655586d..6ac3a81aff9 100644
--- a/x11/kdebase2/buildlink.mk
+++ b/x11/kdebase2/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.7 2001/11/13 21:10:46 jlam Exp $
+# $NetBSD: buildlink.mk,v 1.8 2002/03/13 17:37:58 fredb Exp $
 #
 # This Makefile fragment is included by packages that use kdebase2.
 #
@@ -17,7 +17,7 @@ KDEBASE2_BUILDLINK_MK=	# defined
 
 .include "../../mk/bsd.buildlink.mk"
 
-BUILDLINK_DEPENDS.kdebase2?=	kdebase-2.[1-9]*
+BUILDLINK_DEPENDS.kdebase2?=	kdebase>=2.2.2nb1
 DEPENDS+=	${BUILDLINK_DEPENDS.kdebase2}:../../x11/kdebase2
 
 .include "../../mk/bsd.prefs.mk"
diff --git a/x11/kdelibdocs2/Makefile b/x11/kdelibdocs2/Makefile
index 2d03fb247bd..da6f1f6f66c 100644
--- a/x11/kdelibdocs2/Makefile
+++ b/x11/kdelibdocs2/Makefile
@@ -1,14 +1,15 @@
-# $NetBSD: Makefile,v 1.5 2001/12/10 13:57:16 skrll Exp $
+# $NetBSD: Makefile,v 1.6 2002/03/13 17:37:58 fredb Exp $
 
 DISTNAME=	kdelibs-2.2.2
 PKGNAME=	${DISTNAME:S/kdelib/kdelibdoc/}
+PKGREVISION=	1
 CATEGORIES=	x11 devel
 COMMENT=	KDE library documentation
 
 .include "../../x11/kde2/Makefile.kde2"
 
 BUILD_DEPENDS+=		kdoc>=2.2.2:../../textproc/kdoc
-DEPENDS+=		qt2-docs>=2.3.1:../../x11/qt2-docs
+DEPENDS+=		qt2-docs>=2.3.1nb2:../../x11/qt2-docs
 
 USE_X11BASE=		yes
 NO_CONFIGURE=		yes
diff --git a/x11/kdelibs/Makefile b/x11/kdelibs/Makefile
index d0eb253c264..1b50c0bbdc2 100644
--- a/x11/kdelibs/Makefile
+++ b/x11/kdelibs/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.59 2001/09/27 23:19:01 jlam Exp $
+# $NetBSD: Makefile,v 1.60 2002/03/13 17:37:58 fredb Exp $
 # FreeBSD Id: Makefile,v 1.5 1997/11/27 00:25:46 se Exp
 #
 
 DISTNAME=	kdelibs-1.1.2
+PKGREVISION=	1
 CATEGORIES=	x11 kde
 MASTER_SITES=	ftp://ftp.us.kde.org/pub/kde/Attic/old/1.1.2/distribution/tar/generic/source/bz2/ \
 		ftp://ftp.de.kde.org/pub/kde/Attic/old/1.1.2/distribution/tar/generic/source/bz2/
@@ -13,7 +14,7 @@ HOMEPAGE=       http://www.kde.org/
 COMMENT=	Support libraries for the KDE integrated X11 desktop
 
 DEPENDS+=	jpeg-6b:../../graphics/jpeg
-DEPENDS+=	png>=1.0.11:../../graphics/png
+DEPENDS+=	png>=1.2.1:../../graphics/png
 DEPENDS+=	qt1-1.44:../../x11/qt1
 DEPENDS+=	tiff-[0-9]*:../../graphics/tiff
 
diff --git a/x11/kdelibs2/Makefile b/x11/kdelibs2/Makefile
index 60b92a7036d..bad5e6283e0 100644
--- a/x11/kdelibs2/Makefile
+++ b/x11/kdelibs2/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.32 2002/02/15 09:26:32 skrll Exp $
+# $NetBSD: Makefile,v 1.33 2002/03/13 17:37:58 fredb Exp $
 
 DISTNAME=	kdelibs-2.2.2
+PKGREVISION=	1
 CATEGORIES=	x11
 COMMENT=	Support libraries for the KDE integrated X11 desktop
 
@@ -8,7 +9,7 @@ COMMENT=	Support libraries for the KDE integrated X11 desktop
 
 BUILDLINK_DEPENDS.libxml2=     libxml2>=2.4.8
 BUILDLINK_DEPENDS.audiofile=	libaudiofile>=0.1.9
-BUILDLINK_DEPENDS.qt2-libs=	qt2-libs>=2.3.0
+BUILDLINK_DEPENDS.qt2-libs=	qt2-libs>=2.3.1nb2
 
 USE_BUILDLINK_ONLY=	YES
 USE_OPENSSL_VERSION=	${OPENSSL_VERSION_096}
diff --git a/x11/kdelibs2/buildlink.mk b/x11/kdelibs2/buildlink.mk
index 2873252ebba..d6accfde284 100644
--- a/x11/kdelibs2/buildlink.mk
+++ b/x11/kdelibs2/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.19 2001/12/30 23:32:24 zuntum Exp $
+# $NetBSD: buildlink.mk,v 1.20 2002/03/13 17:37:58 fredb Exp $
 #
 # This Makefile fragment is included by packages that use kdelibs2.
 #
@@ -17,7 +17,7 @@ KDELIBS2_BUILDLINK_MK=	# defined
 
 .include "../../mk/bsd.buildlink.mk"
 
-BUILDLINK_DEPENDS.kdelibs2?=	kdelibs-2.[1-9]*
+BUILDLINK_DEPENDS.kdelibs2?=	kdelibs>=2.2.2nb1
 DEPENDS+=	${BUILDLINK_DEPENDS.kdelibs2}:../../x11/kdelibs2
 
 .include "../../mk/bsd.prefs.mk"
@@ -36,7 +36,7 @@ BUILDLINK_KDEDIR=		${BUILDLINK_DIR}
 KDEDIR=				${BUILDLINK_PREFIX.kdelibs2}
 
 BUILDLINK_DEPENDS.audiofile=	libaudiofile>=0.1.9
-BUILDLINK_DEPENDS.qt2-libs=	qt2-libs>=2.3.0
+BUILDLINK_DEPENDS.qt2-libs=	qt2-libs>=2.3.1nb2
 USE_OPENSSL_VERSION=		${OPENSSL_VERSION_096}
 
 .include "../../audio/libaudiofile/buildlink.mk"
diff --git a/x11/khostchooser/Makefile b/x11/khostchooser/Makefile
index e002190fd8c..d9d238e9a68 100644
--- a/x11/khostchooser/Makefile
+++ b/x11/khostchooser/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.16 2001/09/27 23:19:01 jlam Exp $
+# $NetBSD: Makefile,v 1.17 2002/03/13 17:37:59 fredb Exp $
 #
 
 DISTNAME=	khostchooser-0.3
+PKGREVISION=	1
 CATEGORIES=	x11 kde
 MASTER_SITES=	ftp://ftp.kde.org/pub/kde/stable/1.1.2/apps/network/
 EXTRACT_SUFX=	.tgz
@@ -10,7 +11,7 @@ MAINTAINER=	root@garbled.net
 COMMENT=	KDE Chooser replacement for X
 
 BUILD_USES_MSGFMT=	yes
-DEPENDS+=	kdelibs-1.1.2:../../x11/kdelibs
+DEPENDS+=	kdelibs-1.1.2nb1:../../x11/kdelibs
 DEPENDS+=	libungif-[0-9]*:../../graphics/libungif
 
 WRKSRC=		${WRKDIR}/khostchooser
diff --git a/x11/multi-gnome-terminal/Makefile b/x11/multi-gnome-terminal/Makefile
index e11fb29378b..bbf5efca53b 100644
--- a/x11/multi-gnome-terminal/Makefile
+++ b/x11/multi-gnome-terminal/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.4 2002/01/03 14:13:25 damon Exp $
+# $NetBSD: Makefile,v 1.5 2002/03/13 17:37:59 fredb Exp $
 
 DISTNAME=	multi-gnome-terminal-1.3.4
+PKGREVISION=	1
 CATEGORIES=	gnome x11
 MASTER_SITES=	http://multignometerm.sourceforge.net/
 
diff --git a/x11/py-wxWindows/Makefile b/x11/py-wxWindows/Makefile
index a5954e70153..7e81565b375 100644
--- a/x11/py-wxWindows/Makefile
+++ b/x11/py-wxWindows/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.9 2002/01/18 10:50:42 drochner Exp $
+# $NetBSD: Makefile,v 1.10 2002/03/13 17:37:59 fredb Exp $
 #
 
 DISTNAME=	wxPython-2.2.2
 PKGNAME=	${PYPKGPREFIX}-wxWindows-2.2.2
+PKGREVISION=	1
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=wxpython/}
 
diff --git a/x11/pygtk/Makefile b/x11/pygtk/Makefile
index 35058da3139..987b945152d 100644
--- a/x11/pygtk/Makefile
+++ b/x11/pygtk/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.1.1.1 2002/02/18 11:55:02 drochner Exp $
+# $NetBSD: Makefile,v 1.2 2002/03/13 17:37:59 fredb Exp $
 #
 
 DISTNAME=	pygtk-0.6.9
 PKGNAME=	${PYPKGPREFIX}-gtk-0.6.9
+PKGREVISION=	1
 CATEGORIES=	x11
 MASTER_SITES=	ftp://ftp.gtk.org/pub/gtk/python/
 
diff --git a/x11/qt2-designer-kde/Makefile b/x11/qt2-designer-kde/Makefile
index 54a19482d1c..11b06769ce1 100644
--- a/x11/qt2-designer-kde/Makefile
+++ b/x11/qt2-designer-kde/Makefile
@@ -1,16 +1,16 @@
-# $NetBSD: Makefile,v 1.8 2001/11/29 01:12:52 hubertf Exp $
+# $NetBSD: Makefile,v 1.9 2002/03/13 17:38:01 fredb Exp $
 #
 
 .include "../qt2-libs/Makefile.common"
 
 PKGNAME=		qt2-designer-kde-${QTVERSION}
-PKGREVISION=	1
+PKGREVISION=		2
 COMMENT=		Visual (WYSIWYG) QT GUI builder with KDE widget support
 
 CONFLICTS+=		qt2-designer-[0-9]*
 
 USE_BUILDLINK_ONLY=		yes
-BUILDLINK_DEPENDS.qt2-libs=	qt2-libs>=${QTVERSION}
+BUILDLINK_DEPENDS.qt2-libs=	qt2-libs>=${QTVERSION}nb2
 
 ALL_TARGET=		sub-tools
 
diff --git a/x11/qt2-designer/Makefile b/x11/qt2-designer/Makefile
index 5691ce53e8d..8e55a32f581 100644
--- a/x11/qt2-designer/Makefile
+++ b/x11/qt2-designer/Makefile
@@ -1,16 +1,16 @@
-# $NetBSD: Makefile,v 1.15 2001/11/29 01:12:52 hubertf Exp $
+# $NetBSD: Makefile,v 1.16 2002/03/13 17:38:01 fredb Exp $
 #
 
 .include "../qt2-libs/Makefile.common"
 
 PKGNAME=		qt2-designer-${QTVERSION}
-PKGREVISION=	1
+PKGREVISION=		2
 COMMENT=		Visual (WYSIWYG) QT GUI builder
 
 CONFLICTS+=		qt2-designer-kde-[0-9]*
 
 USE_BUILDLINK_ONLY=		yes
-BUILDLINK_DEPENDS.qt2-libs=	qt2-libs>=${QTVERSION}
+BUILDLINK_DEPENDS.qt2-libs=	qt2-libs>=${QTVERSION}nb2
 
 ALL_TARGET=		sub-tools
 
diff --git a/x11/qt2-designer/buildlink.mk b/x11/qt2-designer/buildlink.mk
index 92c97f7e430..34f7a660cb5 100644
--- a/x11/qt2-designer/buildlink.mk
+++ b/x11/qt2-designer/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.8 2002/01/06 10:37:43 skrll Exp $
+# $NetBSD: buildlink.mk,v 1.9 2002/03/13 17:38:01 fredb Exp $
 #
 # This Makefile fragment is included by packages that use qt2-designer.
 #
@@ -18,7 +18,7 @@ QT2_DESIGNER_BUILDLINK_MK=	# defined
 .include "../../mk/bsd.buildlink.mk"
 
 BUILDLINK_DEPENDS.qt2-designer?= \
-		{qt2-designer>=2.2.4,qt2-designer-kde>=2.3.1nb1}
+		{qt2-designer>=2.3.1nb2,qt2-designer-kde>=2.3.1nb2}
 DEPENDS+=	${BUILDLINK_DEPENDS.qt2-designer}:../../x11/qt2-designer
 
 EVAL_PREFIX+=			BUILDLINK_PREFIX.qt2-designer=qt2-designer
diff --git a/x11/qt2-docs/Makefile b/x11/qt2-docs/Makefile
index 4eb8ea23d13..fbe6cfd64b9 100644
--- a/x11/qt2-docs/Makefile
+++ b/x11/qt2-docs/Makefile
@@ -1,13 +1,14 @@
-# $NetBSD: Makefile,v 1.11 2001/11/16 09:09:34 jlam Exp $
+# $NetBSD: Makefile,v 1.12 2002/03/13 17:38:01 fredb Exp $
 #
 
 PKGNAME=	qt2-docs-${QTVERSION}
+PKGREVISION=	2
 COMMENT=	Documentation for the QT C++ X GUI toolkit
 
 .include "../qt2-libs/Makefile.common"
 
 USE_BUILDLINK_ONLY=		yes
-BUILDLINK_DEPENDS.qt2-libs=	qt2-libs>=${QTVERSION}
+BUILDLINK_DEPENDS.qt2-libs=	qt2-libs>=${QTVERSION}nb2
 
 NO_PATCH=	yes
 NO_CONFIGURE=	yes
diff --git a/x11/qt2-examples/Makefile b/x11/qt2-examples/Makefile
index 93d665395e6..0e13d59c9e8 100644
--- a/x11/qt2-examples/Makefile
+++ b/x11/qt2-examples/Makefile
@@ -1,13 +1,14 @@
-# $NetBSD: Makefile,v 1.6 2001/11/16 09:09:34 jlam Exp $
+# $NetBSD: Makefile,v 1.7 2002/03/13 17:38:02 fredb Exp $
 #
 
 PKGNAME=	qt2-examples-${QTVERSION}
+PKGREVISION=	2
 COMMENT=	QT2 Tutorial, example code and HTML documentation
 
 .include "../qt2-libs/Makefile.common"
 
 USE_BUILDLINK_ONLY=		yes
-BUILDLINK_DEPENDS.qt2-libs=	qt2-libs>=${QTVERSION}
+BUILDLINK_DEPENDS.qt2-libs=	qt2-libs>=${QTVERSION}nb2
 
 CONFIGURE_ENV+=	QTDIR=${QTPREFIX}
 
diff --git a/x11/qt2-libs/Makefile b/x11/qt2-libs/Makefile
index 341311c267b..26e206fb083 100644
--- a/x11/qt2-libs/Makefile
+++ b/x11/qt2-libs/Makefile
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.16 2001/11/29 01:12:52 hubertf Exp $
+# $NetBSD: Makefile,v 1.17 2002/03/13 17:38:02 fredb Exp $
 #
 #USE_MESA=		yes
 
 .include "../qt2-libs/Makefile.common"
 
 PKGNAME=		qt2-libs-${QTVERSION}
-PKGREVISION=	1
+PKGREVISION=		2
 COMMENT=		C++ X GUI toolkit
 
 USE_BUILDLINK_ONLY=	yes
diff --git a/x11/qt2-libs/buildlink.mk b/x11/qt2-libs/buildlink.mk
index a5a335efdcd..2db4c0278ac 100644
--- a/x11/qt2-libs/buildlink.mk
+++ b/x11/qt2-libs/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.9 2001/07/27 13:33:38 jlam Exp $
+# $NetBSD: buildlink.mk,v 1.10 2002/03/13 17:38:02 fredb Exp $
 #
 # This Makefile fragment is included by packages that use qt2-libs.
 #
@@ -17,7 +17,7 @@ QT2_LIBS_BUILDLINK_MK=	# defined
 
 .include "../../mk/bsd.buildlink.mk"
 
-BUILDLINK_DEPENDS.qt2-libs?=	qt2-libs>=2.2.4
+BUILDLINK_DEPENDS.qt2-libs?=	qt2-libs>=2.3.1nb2
 DEPENDS+=	${BUILDLINK_DEPENDS.qt2-libs}:../../x11/qt2-libs
 
 EVAL_PREFIX+=			BUILDLINK_PREFIX.qt2-libs=qt2-libs
diff --git a/x11/qt2/Makefile b/x11/qt2/Makefile
index 06c6fab0e67..e02614aafdf 100644
--- a/x11/qt2/Makefile
+++ b/x11/qt2/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.9 2001/11/16 09:11:38 jlam Exp $
+# $NetBSD: Makefile,v 1.10 2002/03/13 17:38:00 fredb Exp $
 #
 
-DISTNAME=	qt2-${QTVERSION}nb2
+DISTNAME=	qt2-${QTVERSION}
+PKGREVISION=	3
 CATEGORIES=	x11
 MASTER_SITES=	# empty
 DISTFILES=	# empty
@@ -10,10 +11,10 @@ COMMENT=	"meta-package" for the QT GUI C++ toolkit
 
 .include "Makefile.common"
 
-DEPENDS+=	qt2-libs-${QTVERSION}nb1:../../x11/qt2-libs
-DEPENDS+=	{qt2-designer-${QTVERSION}nb1,qt2-designer-kde-${QTVERSION}nb1}:../../x11/qt2-designer
-DEPENDS+=	qt2-docs-${QTVERSION}:../../x11/qt2-docs
-DEPENDS+=	qt2-examples-${QTVERSION}:../../x11/qt2-examples
+DEPENDS+=	qt2-libs-${QTVERSION}nb2:../../x11/qt2-libs
+DEPENDS+=	{qt2-designer-${QTVERSION}nb2,qt2-designer-kde-${QTVERSION}nb2}:../../x11/qt2-designer
+DEPENDS+=	qt2-docs-${QTVERSION}nb2:../../x11/qt2-docs
+DEPENDS+=	qt2-examples-${QTVERSION}nb2:../../x11/qt2-examples
 
 USE_X11BASE=	yes
 EXTRACT_ONLY=	# empty
diff --git a/x11/qt3-docs/Makefile b/x11/qt3-docs/Makefile
index e44ab7a3f26..e36ee87d47e 100644
--- a/x11/qt3-docs/Makefile
+++ b/x11/qt3-docs/Makefile
@@ -1,13 +1,14 @@
-# $NetBSD: Makefile,v 1.1.1.1 2002/01/07 08:10:34 skrll Exp $
+# $NetBSD: Makefile,v 1.2 2002/03/13 17:38:02 fredb Exp $
 #
 
 .include "../qt3-libs/Makefile.common"
 
 PKGNAME=	qt3-docs-${QTVERSION}
+PKGREVISION=	1
 COMMENT=	Documentation for the QT C++ X GUI toolkit
 
 NO_BUILDLINK_ONLY=		yes
-BUILDLINK_DEPENDS.qt3-libs=	qt3-libs-${QTVERSION}
+BUILDLINK_DEPENDS.qt3-libs=	qt3-libs-${QTVERSION}nb1
 
 NO_PATCH=	yes
 NO_CONFIGURE=	yes
diff --git a/x11/qt3-libs/Makefile b/x11/qt3-libs/Makefile
index 215f0e15ee8..fa5e31242a2 100644
--- a/x11/qt3-libs/Makefile
+++ b/x11/qt3-libs/Makefile
@@ -1,9 +1,10 @@
-# $NetBSD: Makefile,v 1.1.1.1 2002/01/07 08:07:57 skrll Exp $
+# $NetBSD: Makefile,v 1.2 2002/03/13 17:38:02 fredb Exp $
 #
 
 .include "../qt3-libs/Makefile.common"
 
 PKGNAME=		qt3-libs-${QTVERSION}
+PKGREVISION=		1
 COMMENT=		C++ X GUI toolkit
 
 USE_BUILDLINK_ONLY=	yes
diff --git a/x11/qt3-libs/Makefile.common b/x11/qt3-libs/Makefile.common
index 8f24a639b18..0641da67ea9 100644
--- a/x11/qt3-libs/Makefile.common
+++ b/x11/qt3-libs/Makefile.common
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile.common,v 1.1.1.1 2002/01/07 08:07:58 skrll Exp $
+# $NetBSD: Makefile.common,v 1.2 2002/03/13 17:38:03 fredb Exp $
 #
 DISTNAME=               qt-x11-free-${QTVERSION}
+PKGREVISION=		1
 CATEGORIES=             x11
 MASTER_SITES=   \
 	ftp://ftp.trolltech.com/qt/source/ \
diff --git a/x11/qt3-libs/buildlink.mk b/x11/qt3-libs/buildlink.mk
index 65c701c6b10..37191b13339 100644
--- a/x11/qt3-libs/buildlink.mk
+++ b/x11/qt3-libs/buildlink.mk
@@ -17,7 +17,7 @@ QT3_LIBS_BUILDLINK_MK=	# defined
 
 .include "../../mk/bsd.buildlink.mk"
 
-BUILDLINK_DEPENDS.qt3-libs?=	qt3-libs>=3.0.1
+BUILDLINK_DEPENDS.qt3-libs?=	qt3-libs>=3.0.1nb1
 DEPENDS+=			${BUILDLINK_DEPENDS.qt3-libs}:../../x11/qt3-libs
 
 EVAL_PREFIX+=			BUILDLINK_PREFIX.qt3-libs=qt3-libs
diff --git a/x11/qt3-tools/Makefile b/x11/qt3-tools/Makefile
index cc906a56d46..f504c13dfa0 100644
--- a/x11/qt3-tools/Makefile
+++ b/x11/qt3-tools/Makefile
@@ -1,16 +1,17 @@
-# $NetBSD: Makefile,v 1.1.1.1 2002/01/07 08:09:16 skrll Exp $
+# $NetBSD: Makefile,v 1.2 2002/03/13 17:38:03 fredb Exp $
 #
 
 .include "../qt3-libs/Makefile.common"
 
 PKGNAME=		qt3-tools-${QTVERSION}
+PKGREVISION=		1
 COMMENT=		QT GUI (WYSIWYG) builder and other tools
 
 CONFIGURE_ARGS+=	-I${BUILDLINK_QTDIR}/include \
 			-L${BUILDLINK_QTDIR}/lib
 
 USE_BUILDLINK_ONLY=		yes
-BUILDLINK_DEPENDS.qt3-libs=	qt3-libs-${QTVERSION}
+BUILDLINK_DEPENDS.qt3-libs=	qt3-libs-${QTVERSION}nb1
 
 ALL_TARGET=		sub-tools
 
diff --git a/x11/qt3-tools/buildlink.mk b/x11/qt3-tools/buildlink.mk
index 767c5c9e426..7204934eeb3 100644
--- a/x11/qt3-tools/buildlink.mk
+++ b/x11/qt3-tools/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.1.1.1 2002/01/07 08:09:16 skrll Exp $
+# $NetBSD: buildlink.mk,v 1.2 2002/03/13 17:38:03 fredb Exp $
 #
 # This Makefile fragment is included by packages that use qt3-tools.
 #
@@ -17,7 +17,7 @@ QT3_TOOLS_BUILDLINK_MK=	# defined
 
 .include "../../mk/bsd.buildlink.mk"
 
-BUILDLINK_DEPENDS.qt3-tools?= qt3-tools>=3.0.1
+BUILDLINK_DEPENDS.qt3-tools?= qt3-tools>=3.0.1nb1
 DEPENDS+=	${BUILDLINK_DEPENDS.qt3-tools}:../../x11/qt3-tools
 
 EVAL_PREFIX+=			BUILDLINK_PREFIX.qt3-tools=qt3-tools
diff --git a/x11/qt3/Makefile b/x11/qt3/Makefile
index 0883d4e71be..a57b61bb613 100644
--- a/x11/qt3/Makefile
+++ b/x11/qt3/Makefile
@@ -2,6 +2,7 @@
 #
 
 DISTNAME=	qt3-${QTVERSION}
+PKGREVISION=	1
 CATEGORIES=	x11
 MASTER_SITES=	# empty
 DISTFILES=	# empty
@@ -10,9 +11,9 @@ COMMENT=	"meta-package" for the QT GUI C++ toolkit
 
 .include "./Makefile.common"
 
-DEPENDS+=	qt3-libs-${QTVERSION}:../../x11/qt3-libs
-DEPENDS+=	qt3-tools-${QTVERSION}:../../x11/qt3-tools
-DEPENDS+=	qt3-docs-${QTVERSION}:../../x11/qt3-docs
+DEPENDS+=	qt3-libs-${QTVERSION}nb1:../../x11/qt3-libs
+DEPENDS+=	qt3-tools-${QTVERSION}nb1:../../x11/qt3-tools
+DEPENDS+=	qt3-docs-${QTVERSION}nb1:../../x11/qt3-docs
 
 USE_X11BASE=	yes
 EXTRACT_ONLY=	# empty
diff --git a/x11/qtarch/Makefile b/x11/qtarch/Makefile
index a3dd170ccab..0101051d5c3 100644
--- a/x11/qtarch/Makefile
+++ b/x11/qtarch/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.14 2001/12/20 15:39:46 skrll Exp $
+# $NetBSD: Makefile,v 1.15 2002/03/13 17:38:03 fredb Exp $
 #
 
 DISTNAME=	qtarch-2.1-1
 PKGNAME=	qtarch-2.1
+PKGREVISION=	1
 WRKSRC=		${WRKDIR}/${PKGNAME}
 CATEGORIES=	x11 devel
 MASTER_SITES=	ftp://qtarch.sourceforge.net/pub/qtarch/
@@ -11,8 +12,8 @@ MAINTAINER=	packages@netbsd.org
 HOMEPAGE=	http://qtarch.sourceforge.net/
 COMMENT=	Graphical dialog editor for the Qt widget set
 
-DEPENDS+=	qt2-libs-[0-9]*:../../x11/qt2-libs
-DEPENDS+=	png>=1.0.11:../../graphics/png
+DEPENDS+=	qt2-libs-2.3.1nb2:../../x11/qt2-libs
+DEPENDS+=	png>=1.2.1:../../graphics/png
 
 USE_X11=	yes
 USE_GMAKE=	yes
diff --git a/x11/qwt/Makefile b/x11/qwt/Makefile
index 3870782c9dd..257bbbb1933 100644
--- a/x11/qwt/Makefile
+++ b/x11/qwt/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.13 2001/10/24 22:11:14 jlam Exp $
+# $NetBSD: Makefile,v 1.14 2002/03/13 17:38:03 fredb Exp $
 
 DISTNAME=	qwt-0.3.0
+PKGREVISION=	1
 CATEGORIES=	x11
 MASTER_SITES=   ${MASTER_SITE_SOURCEFORGE:=qwt/}
 
@@ -8,7 +9,7 @@ MAINTAINER=	packages@netbsd.org
 HOMEPAGE=	http://sourceforge.net/projects/qwt
 COMMENT=	Qt widget library for technical purposes
 
-BUILDLINK_DEPENDS.qt2-libs=	qt2-libs>=2.3.0
+BUILDLINK_DEPENDS.qt2-libs=	qt2-libs>=2.3.1nb2
 USE_BUILDLINK_ONLY=		yes
 
 USE_X11BASE=	yes
diff --git a/x11/rep-gtk/Makefile b/x11/rep-gtk/Makefile
index 4f7e6aece08..360a54bfde1 100644
--- a/x11/rep-gtk/Makefile
+++ b/x11/rep-gtk/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.10 2001/10/22 02:27:38 mycroft Exp $
+# $NetBSD: Makefile,v 1.11 2002/03/13 17:38:03 fredb Exp $
 #
 
 DISTNAME=		rep-gtk-0.15
+PKGREVISION=		1
 CATEGORIES=		x11 lang
 MASTER_SITES=		http://prdownloads.sourceforge.net/rep-gtk/
 
@@ -11,9 +12,9 @@ COMMENT=		librep bindings for gtk (used by sawmill)
 
 DEPENDS+=		gtk+-1.2.*:../../x11/gtk
 DEPENDS+=		librep>=0.15:../../lang/librep
-DEPENDS+=		libglade-[0-9]*:../../devel/libglade
-DEPENDS+=		gnome-libs-[0-9]*:../../x11/gnome-libs
-DEPENDS+=		gdk-pixbuf-gnome>=0.9.0:../../graphics/gdk-pixbuf-gnome
+DEPENDS+=		libglade-0.17nb1:../../devel/libglade
+DEPENDS+=		gnome-libs>=1.4.1.2nb1:../gnome-libs
+DEPENDS+=		gdk-pixbuf-gnome>=0.11.0nb4:../../graphics/gdk-pixbuf-gnome
 
 USE_X11=		# defined
 USE_GMAKE=		# defined
diff --git a/x11/ruby-fox/Makefile b/x11/ruby-fox/Makefile
index 52c5766c3dd..2f77217111f 100644
--- a/x11/ruby-fox/Makefile
+++ b/x11/ruby-fox/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.2 2001/09/27 23:19:02 jlam Exp $
+# $NetBSD: Makefile,v 1.3 2002/03/13 17:38:04 fredb Exp $
 
 DISTNAME=	FXRuby-0.99.174
 PKGNAME=	${RUBY_PKGNAMEPREFIX}fox-0.99.174
+PKGREVISION=	1
 CATEGORIES=	x11
 MASTER_SITES=	http://prdownloads.sourceforge.net/fxruby/
 
diff --git a/x11/ruby-gtk/Makefile b/x11/ruby-gtk/Makefile
index 6ce4573ef0e..9eef3c95813 100644
--- a/x11/ruby-gtk/Makefile
+++ b/x11/ruby-gtk/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.13 2001/12/16 08:18:57 jmc Exp $
+# $NetBSD: Makefile,v 1.14 2002/03/13 17:38:04 fredb Exp $
 # FreeBSD: ports/x11-toolkits/ruby-gtk/Makefile,v 1.16 2000/10/15 15:45:59 knu Exp
 
 DISTNAME=	ruby-gtk-0.25
 PKGNAME=	${RUBY_PKGNAMEPREFIX}gtk-0.25
+PKGREVISION=	1
 CATEGORIES=	x11
 MASTER_SITES=	http://www.ruby-lang.org/gtk/download/
 
@@ -17,7 +18,7 @@ USE_RUBY_EXTCONF= yes
 
 INSTALL_TARGET=	site-install
 
-DEPENDS+=	imlib-[0-9]*:../../graphics/imlib
+DEPENDS+=	imlib>=1.9.11nb1:../../graphics/imlib
 
 DOCS_EN=	README README.EXT doc/rbbr.rb
 DOCS_JA=	README.ja README.EXT.ja
diff --git a/x11/wmessage/Makefile b/x11/wmessage/Makefile
index 80f0916cadd..0b1856d566c 100644
--- a/x11/wmessage/Makefile
+++ b/x11/wmessage/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.15 2001/10/24 22:11:15 jlam Exp $
+# $NetBSD: Makefile,v 1.16 2002/03/13 17:38:04 fredb Exp $
 
 DISTNAME=	wmessage-0.10
+PKGREVISION=	1
 CATEGORIES=	x11
 MASTER_SITES=	http://www.ozemail.com.au/~crn/wmessage/
 
diff --git a/x11/wterm/Makefile b/x11/wterm/Makefile
index f1e4cf60442..9f8cb07ef0d 100644
--- a/x11/wterm/Makefile
+++ b/x11/wterm/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.18 2001/11/01 09:48:19 tron Exp $
+# $NetBSD: Makefile,v 1.19 2002/03/13 17:38:04 fredb Exp $
 
 DISTNAME=	wterm-6.2.9
+PKGREVISION=	1
 CATEGORIES=	x11
 MASTER_SITES=	http://largo.windowmaker.org/files/
 EXTRACT_SUFX=	.tar.bz2
diff --git a/x11/wxGTK/Makefile b/x11/wxGTK/Makefile
index e3e545da807..74a351568dc 100644
--- a/x11/wxGTK/Makefile
+++ b/x11/wxGTK/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.13 2001/12/08 11:36:26 jmc Exp $
+# $NetBSD: Makefile,v 1.14 2002/03/13 17:38:04 fredb Exp $
 #
 
 DISTNAME=		wxGTK-2.2.7
+PKGREVISION=		1
 CATEGORIES=		x11
 MASTER_SITES=		ftp://wesley.informatik.uni-freiburg.de/pub/linux/wxxt/source/
 
diff --git a/x11/wxGTK/buildlink.mk b/x11/wxGTK/buildlink.mk
index 57b8f4cbc26..090608e7a45 100644
--- a/x11/wxGTK/buildlink.mk
+++ b/x11/wxGTK/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.9 2001/10/03 20:56:55 jlam Exp $
+# $NetBSD: buildlink.mk,v 1.10 2002/03/13 17:38:05 fredb Exp $
 #
 # This Makefile fragment is included by packages that use wxGTK.
 #
@@ -17,7 +17,7 @@ WXGTK_BUILDLINK_MK=	# defined
 
 .include "../../mk/bsd.buildlink.mk"
 
-BUILDLINK_DEPENDS.wxGTK?=	wxGTK>=2.2.2
+BUILDLINK_DEPENDS.wxGTK?=	wxGTK>=2.2.7nb1
 DEPENDS+=			${BUILDLINK_DEPENDS.wxGTK}:../../x11/wxGTK
 
 EVAL_PREFIX+=			BUILDLINK_PREFIX.wxGTK=wxGTK
diff --git a/x11/xdaemon2/Makefile b/x11/xdaemon2/Makefile
index 53355e6aa5e..1444cf9fe9c 100644
--- a/x11/xdaemon2/Makefile
+++ b/x11/xdaemon2/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.4 2001/05/17 08:32:14 abs Exp $
+# $NetBSD: Makefile,v 1.5 2002/03/13 17:38:05 fredb Exp $
 
 DISTNAME=	xdaemon-2.0
+PKGREVISION=	1
 CATEGORIES=	games x11
 MASTER_SITES=	${MASTER_SITE_LOCAL}
 DISTFILES=	${PIX} Daemon.README
diff --git a/x11/xfce/Makefile b/x11/xfce/Makefile
index a90cc588917..82d854f3b40 100644
--- a/x11/xfce/Makefile
+++ b/x11/xfce/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.23 2002/03/05 10:06:15 martti Exp $
+# $NetBSD: Makefile,v 1.24 2002/03/13 17:38:05 fredb Exp $
 
 DISTNAME=		xfce-3.8.14
+PKGREVISION=		1
 CATEGORIES=		x11
 MASTER_SITES=		http://www.xfce.org/archive/
 
@@ -10,7 +11,7 @@ COMMENT=		Lightweight desktop environment with CDE look and feel
 
 BUILD_USES_MSGFMT=	yes
 DEPENDS+=		gtk+-1.2.*:../../x11/gtk
-DEPENDS+=		imlib-1.9.*:../../graphics/imlib
+DEPENDS+=		imlib>=1.9.11nb1:../../graphics/imlib
 
 GCC_VERSION!=		gcc --version
 .if (${GCC_VERSION:C/-.*$$//} == egcs) && (${MACHINE_ARCH} == alpha)
diff --git a/x11/xscreensaver-gnome/Makefile b/x11/xscreensaver-gnome/Makefile
index f06b49fdd46..c8cdb1e637f 100644
--- a/x11/xscreensaver-gnome/Makefile
+++ b/x11/xscreensaver-gnome/Makefile
@@ -1,11 +1,12 @@
-# $NetBSD: Makefile,v 1.7 2002/02/09 21:12:57 wiz Exp $
+# $NetBSD: Makefile,v 1.8 2002/03/13 17:38:05 fredb Exp $
 #
 
 PKGNAME=	${DISTNAME:S/-/-gnome-/}
+PKGREVISION=	1
 
 COMMENT=	Screen saver and locker for the X window system (with GNOME support)
 
-DEPENDS+=	control-center>=1.2.0:../../x11/controlcenter
+DEPENDS+=	control-center>=1.4.0.1nb1:../../x11/controlcenter
 
 CONFLICTS+=	xscreensaver-[0-9]*
 
diff --git a/x11/xscreensaver/Makefile.common b/x11/xscreensaver/Makefile.common
index 1696df4333c..f9ed4b86bfc 100644
--- a/x11/xscreensaver/Makefile.common
+++ b/x11/xscreensaver/Makefile.common
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile.common,v 1.25 2002/03/01 13:27:35 fredb Exp $
+# $NetBSD: Makefile.common,v 1.26 2002/03/13 17:38:05 fredb Exp $
 #
 
 DISTNAME=		xscreensaver-4.01
+PKGREVISION=		1
 CATEGORIES=		x11
 MASTER_SITES=		${HOMEPAGE} \
 			ftp://ftp.fu-berlin.de/unix/X11/graphics/xscreensaver/
@@ -11,7 +12,7 @@ HOMEPAGE=		http://www.jwz.org/xscreensaver/
 
 DEPENDS+=		gtk+-1.2.*:../../x11/gtk
 DEPENDS+=		gle-[0-9]*:../../graphics/gle
-DEPENDS+=		gdk-pixbuf>=0.10.1:../../graphics/gdk-pixbuf
+DEPENDS+=		gdk-pixbuf>=0.11.0nb1:../../graphics/gdk-pixbuf
 DEPENDS+=		jpeg-6b:../../graphics/jpeg
 DEPENDS+=		libxml-1.8.16:../../textproc/libxml
 
diff --git a/x11/xteddy2/Makefile b/x11/xteddy2/Makefile
index c7527a8b592..112fe88727d 100644
--- a/x11/xteddy2/Makefile
+++ b/x11/xteddy2/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.9 2001/10/24 22:11:17 jlam Exp $
+# $NetBSD: Makefile,v 1.10 2002/03/13 17:38:06 fredb Exp $
 
 DISTNAME=	xteddy-2.0.1
+PKGREVISION=	1
 CATEGORIES=	x11 games
 MASTER_SITES=	http://www.ITN.LiU.SE/~stegu/xteddy/