Since the major of libiconv was increased during the update to 1.8,

bump dependency to latest libiconv version; recursively also bump all
dependencies of packages depending on libiconv.
Requested by fredb.

135 files changed, 278 insertions, 238 deletions

diff --git a/cad/oregano/Makefile b/cad/oregano/Makefile
index 067604f88cd..10c7c76301c 100644
--- a/cad/oregano/Makefile
+++ b/cad/oregano/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.8 2002/03/13 17:36:40 fredb Exp $
+# $NetBSD: Makefile,v 1.9 2002/09/10 16:06:32 wiz Exp $
 #
 
 DISTNAME=		oregano-0.20
-PKGREVISION=		1
+PKGREVISION=		2
 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 5789377b95e..4fe65c9bd42 100644
--- a/chat/everybuddy-gnome/Makefile
+++ b/chat/everybuddy-gnome/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.2 2002/03/13 17:36:41 fredb Exp $
+# $NetBSD: Makefile,v 1.3 2002/09/10 16:06:33 wiz Exp $
 
 .include "../everybuddy/Makefile.common"
 
 PKGNAME=	${DISTNAME:S/-/-gnome-/}
-PKGREVISION=	1
+PKGREVISION=	2
 CONFLICTS+=	everybuddy-[0-9]*
 COMMENT+=	with GNOME support
 
diff --git a/chat/everybuddy/Makefile b/chat/everybuddy/Makefile
index 182fd7f4900..6095132e766 100644
--- a/chat/everybuddy/Makefile
+++ b/chat/everybuddy/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.1.1.1 2001/12/19 14:10:04 tron Exp $
+# $NetBSD: Makefile,v 1.2 2002/09/10 16:06:33 wiz Exp $
 
 .include "Makefile.common"
+PKGREVISION=	1
 
 CONFLICTS+=	everybuddy-gnome-[0-9]*
 
diff --git a/chat/gabber/Makefile b/chat/gabber/Makefile
index 831e0ecaa1d..7aaac277435 100644
--- a/chat/gabber/Makefile
+++ b/chat/gabber/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.3 2002/08/09 03:01:24 dmcmahill Exp $
+# $NetBSD: Makefile,v 1.4 2002/09/10 16:06:34 wiz Exp $
 
 DISTNAME=	gabber-0.8.7
+PKGREVISION=	1
 CATEGORIES=	chat
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=gabber/}
 
diff --git a/chat/gaim-gnome/Makefile b/chat/gaim-gnome/Makefile
index f5c23a5cb4f..502b0d74ce7 100644
--- a/chat/gaim-gnome/Makefile
+++ b/chat/gaim-gnome/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.1 2002/07/09 02:13:27 rafal Exp $
+# $NetBSD: Makefile,v 1.2 2002/09/10 16:06:34 wiz Exp $
 
 .include "../gaim/Makefile.common"
 
 PKGNAME=	${DISTNAME:S/-/-gnome-/}
+PKGREVISION=	1
 CONFLICTS+=	gaim-[0-9]*
 COMMENT+=	with GNOME support
 
diff --git a/chat/gnomeicu/Makefile b/chat/gnomeicu/Makefile
index 4d36fdb6671..a8da9f2eeb4 100644
--- a/chat/gnomeicu/Makefile
+++ b/chat/gnomeicu/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.4 2002/03/13 17:36:41 fredb Exp $
+# $NetBSD: Makefile,v 1.5 2002/09/10 16:06:34 wiz Exp $
 
 DISTNAME=	gnomeicu-0.96
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	chat gnome
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=gnomeicu/}
 EXTRACT_SUFX=	.tar.bz2
@@ -12,7 +12,7 @@ COMMENT=	GNOME ICQ client
 
 DEPENDS+=	gdbm>=1.8.0:../../databases/gdbm
 DEPENDS+=	gnome-core>=1.4.0.4nb1:../../x11/gnome-core
-DEPENDS+=	libiconv>=1.5:../../converters/libiconv
+DEPENDS+=	libiconv>=1.8:../../converters/libiconv
 
 GNU_CONFIGURE=	YES
 USE_X11BASE=	YES
diff --git a/chat/xchat-gnome/Makefile b/chat/xchat-gnome/Makefile
index abb67594946..b98653c8bf0 100644
--- a/chat/xchat-gnome/Makefile
+++ b/chat/xchat-gnome/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.1.1.1 2002/07/26 17:31:34 wiz Exp $
+# $NetBSD: Makefile,v 1.2 2002/09/10 16:06:34 wiz Exp $
 
 .include "../xchat/Makefile.common"
 
 PKGNAME=	${DISTNAME:S/-/-gnome-/}
+PKGREVISION=	1
 CONFLICTS+=	xchat-[0-9]*
 COMMENT+=	and GNOME libraries
 
diff --git a/comms/jpilot-expense/Makefile b/comms/jpilot-expense/Makefile
index c0a495be472..46d78334540 100644
--- a/comms/jpilot-expense/Makefile
+++ b/comms/jpilot-expense/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.8 2001/10/24 22:10:48 jlam Exp $
+# $NetBSD: Makefile,v 1.9 2002/09/10 16:06:35 wiz Exp $
 
 DISTNAME=		jpilot-0.99
 PKGNAME=		jpilot-expense-0.99
+PKGREVISION=		1
 WRKSRC=			${WRKDIR}/${DISTNAME}/Expense
 CATEGORIES=		comms
 MASTER_SITES=		http://jpilot.org/
diff --git a/comms/jpilot-syncmal/Makefile b/comms/jpilot-syncmal/Makefile
index 78c862d852b..c95f95bfdf3 100644
--- a/comms/jpilot-syncmal/Makefile
+++ b/comms/jpilot-syncmal/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.10 2001/10/24 22:10:48 jlam Exp $
+# $NetBSD: Makefile,v 1.11 2002/09/10 16:06:35 wiz Exp $
 
 DISTNAME=		jpilot-syncmal_0.60
 PKGNAME=		jpilot-syncmal-0.60
+PKGREVISION=		1
 CATEGORIES=		comms
 MASTER_SITES=		http://people.atl.mediaone.net/jasonday/code/syncmal/
 DISTFILES=		${DISTNAME}${EXTRACT_SUFX}
diff --git a/comms/jpilot-synctime/Makefile b/comms/jpilot-synctime/Makefile
index bbd9155ec32..26ec0d1e7f3 100644
--- a/comms/jpilot-synctime/Makefile
+++ b/comms/jpilot-synctime/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.7 2001/10/24 22:10:49 jlam Exp $
+# $NetBSD: Makefile,v 1.8 2002/09/10 16:06:35 wiz Exp $
 
 DISTNAME=		jpilot-0.99
 PKGNAME=		jpilot-synctime-0.99
+PKGREVISION=		1
 WRKSRC=			${WRKDIR}/${DISTNAME}/SyncTime
 CATEGORIES=		comms
 MASTER_SITES=		http://jpilot.org/
diff --git a/comms/jpilot/Makefile b/comms/jpilot/Makefile
index 7f297b4ab62..a04444f5020 100644
--- a/comms/jpilot/Makefile
+++ b/comms/jpilot/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.27 2002/02/13 22:15:54 skrll Exp $
+# $NetBSD: Makefile,v 1.28 2002/09/10 16:06:34 wiz Exp $
 #
 
 DISTNAME=		jpilot-0.99
-PKGREVISION=		1
+PKGREVISION=		2
 CATEGORIES=		comms
 MASTER_SITES=		http://jpilot.org/
 
diff --git a/comms/jpilot/buildlink.mk b/comms/jpilot/buildlink.mk
index 589429ec25a..9e4592f7c8b 100644
--- a/comms/jpilot/buildlink.mk
+++ b/comms/jpilot/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.6 2001/07/27 13:33:20 jlam Exp $
+# $NetBSD: buildlink.mk,v 1.7 2002/09/10 16:06:34 wiz Exp $
 #
 # This Makefile fragment is included by packages that use jpilot.
 #
@@ -17,7 +17,7 @@ JPILOT_BUILDLINK_MK=	# defined
 
 .include "../../mk/bsd.buildlink.mk"
 
-BUILDLINK_DEPENDS.jpilot?=	jpilot>=0.99
+BUILDLINK_DEPENDS.jpilot?=	jpilot>=0.99nb2
 BUILD_DEPENDS+=			${BUILDLINK_DEPENDS.jpilot}:../../comms/jpilot
 
 EVAL_PREFIX+=			BUILDLINK_PREFIX.jpilot=jpilot
diff --git a/comms/jpilot/buildlink2.mk b/comms/jpilot/buildlink2.mk
index c0f120eb1ab..5b4078f0f68 100644
--- a/comms/jpilot/buildlink2.mk
+++ b/comms/jpilot/buildlink2.mk
@@ -1,10 +1,10 @@
-# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 19:22:00 jlam Exp $
+# $NetBSD: buildlink2.mk,v 1.3 2002/09/10 16:06:35 wiz Exp $
 
 .if !defined(JPILOT_BUILDLINK2_MK)
 JPILOT_BUILDLINK2_MK=	# defined
 
 BUILDLINK_PACKAGES+=		jpilot
-BUILDLINK_DEPENDS.jpilot?=	jpilot>=0.99
+BUILDLINK_DEPENDS.jpilot?=	jpilot>=0.99nb2
 BUILDLINK_PKGSRCDIR.jpilot?=	../../comms/jpilot
 BUILDLINK_DEPMETHOD.jpilot?=	build
 
diff --git a/comms/malsync/Makefile b/comms/malsync/Makefile
index 39fcac085ec..ca6b85576b6 100644
--- a/comms/malsync/Makefile
+++ b/comms/malsync/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.4 2001/06/27 18:07:55 jlam Exp $
+# $NetBSD: Makefile,v 1.5 2002/09/10 16:06:35 wiz Exp $
 #
 
 DISTNAME=	${PKGNAME:S/-/_/}.src
 PKGNAME=	malsync-2.0.5
+PKGREVISION=	1
 WRKSRC=		${WRKDIR}/malsync/mal/client/unix
 CATEGORIES=	comms
 MASTER_SITES=	http://www.tomw.org/malsync/
diff --git a/comms/p5-pilot-link/Makefile b/comms/p5-pilot-link/Makefile
index 2e98b53f37b..7a364959d10 100644
--- a/comms/p5-pilot-link/Makefile
+++ b/comms/p5-pilot-link/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.13 2001/11/26 06:49:39 jlam Exp $
+# $NetBSD: Makefile,v 1.14 2002/09/10 16:06:36 wiz Exp $
 
 DISTNAME=		pilot-link.0.9.5
 PKGNAME=		p5-pilot-link-0.1
+PKGREVISION=		1
 SVR4_PKGNAME=		p5pli
 CATEGORIES=		comms perl5
 MASTER_SITES=		http://www.gnu-designs.com/pilot-link/source/
diff --git a/comms/pilot-link-libs/Makefile b/comms/pilot-link-libs/Makefile
index 6eef95220ee..3b9ec24da46 100644
--- a/comms/pilot-link-libs/Makefile
+++ b/comms/pilot-link-libs/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.4 2002/01/30 10:05:14 dillo Exp $
+# $NetBSD: Makefile,v 1.5 2002/09/10 16:06:36 wiz Exp $
 #
 
 .include "../../comms/pilot-link/Makefile.common"
 
 PKGNAME=		pilot-link-libs-${PILOT_LINK_VERS}
-PKGREVISION=	2
+PKGREVISION=		3
 COMMENT=		Libraries for talking to the 3Com Pilot PDA
 
 CONFLICTS+=		pilot-link-0.8.* pilot-link-0.9.[0-3]
diff --git a/comms/pilot-link-libs/buildlink.mk b/comms/pilot-link-libs/buildlink.mk
index d441a2dbda4..88d484edde0 100644
--- a/comms/pilot-link-libs/buildlink.mk
+++ b/comms/pilot-link-libs/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.5 2001/07/27 13:33:21 jlam Exp $
+# $NetBSD: buildlink.mk,v 1.6 2002/09/10 16:06:36 wiz Exp $
 #
 # This Makefile fragment is included by packages that use pilot-link-libs.
 #
@@ -17,7 +17,7 @@ PILOT_LINK_LIBS_BUILDLINK_MK=	# defined
 
 .include "../../mk/bsd.buildlink.mk"
 
-BUILDLINK_DEPENDS.pilot-link-libs?=	pilot-link-libs>=0.9.5
+BUILDLINK_DEPENDS.pilot-link-libs?=	pilot-link-libs>=0.9.5nb3
 DEPENDS+=	${BUILDLINK_DEPENDS.pilot-link-libs}:../../comms/pilot-link-libs
 
 EVAL_PREFIX+=	BUILDLINK_PREFIX.pilot-link-libs=pilot-link-libs
diff --git a/comms/pilot-link-libs/buildlink2.mk b/comms/pilot-link-libs/buildlink2.mk
index 747200bc94f..efb4c56f211 100644
--- a/comms/pilot-link-libs/buildlink2.mk
+++ b/comms/pilot-link-libs/buildlink2.mk
@@ -1,10 +1,10 @@
-# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 19:22:00 jlam Exp $
+# $NetBSD: buildlink2.mk,v 1.3 2002/09/10 16:06:36 wiz Exp $
 
 .if !defined(PILOT_LINK_LIBS_BUILDLINK2_MK)
 PILOT_LINK_LIBS_BUILDLINK2_MK=	# defined
 
 BUILDLINK_PACKAGES+=			pilot-link-libs
-BUILDLINK_DEPENDS.pilot-link-libs?=	pilot-link-libs>=0.9.5
+BUILDLINK_DEPENDS.pilot-link-libs?=	pilot-link-libs>=0.9.5nb3
 BUILDLINK_PKGSRCDIR.pilot-link-libs?=	../../comms/pilot-link-libs
 
 EVAL_PREFIX+=	BUILDLINK_PREFIX.pilot-link-libs=pilot-link-libs
diff --git a/comms/pilot-link/Makefile b/comms/pilot-link/Makefile
index f48d44e6cfa..3de71b0381a 100644
--- a/comms/pilot-link/Makefile
+++ b/comms/pilot-link/Makefile
@@ -1,9 +1,10 @@
-# $NetBSD: Makefile,v 1.27 2001/11/30 17:32:17 jlam Exp $
+# $NetBSD: Makefile,v 1.28 2002/09/10 16:06:36 wiz Exp $
 #
 
 .include "../../comms/pilot-link/Makefile.common"
 
 PKGNAME=		pilot-link-${PILOT_LINK_VERS}
+PKGREVISION=		1
 COMMENT=		Tools to talk to the 3Com Pilot PDA
 
 BUILDLINK_DEPENDS.pilot-link-libs=	pilot-link-libs>=${PILOT_LINK_VERS}
diff --git a/converters/libiconv/buildlink.mk b/converters/libiconv/buildlink.mk
index 65ad089b980..a3e125511e4 100644
--- a/converters/libiconv/buildlink.mk
+++ b/converters/libiconv/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.13 2002/08/25 18:38:18 jlam Exp $
+# $NetBSD: buildlink.mk,v 1.14 2002/09/10 16:06:36 wiz Exp $
 #
 # This Makefile fragment is included by packages that use libiconv.
 #
@@ -17,7 +17,7 @@ ICONV_BUILDLINK_MK=	# defined
 
 .include "../../mk/bsd.buildlink.mk"
 
-BUILDLINK_DEPENDS.iconv?=	libiconv>=1.7nb2
+BUILDLINK_DEPENDS.iconv?=	libiconv>=1.8
 
 .if defined(USE_GNU_ICONV)
 _NEED_ICONV=		YES
diff --git a/converters/libiconv/buildlink2.mk b/converters/libiconv/buildlink2.mk
index 5cf0950a77f..900f6fa5113 100644
--- a/converters/libiconv/buildlink2.mk
+++ b/converters/libiconv/buildlink2.mk
@@ -1,11 +1,11 @@
-# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 18:38:18 jlam Exp $
+# $NetBSD: buildlink2.mk,v 1.3 2002/09/10 16:06:37 wiz Exp $
 
 .if !defined(ICONV_BUILDLINK2_MK)
 ICONV_BUILDLINK2_MK=	# defined
 
 .include "../../mk/bsd.prefs.mk"
 
-BUILDLINK_DEPENDS.iconv?=	libiconv>=1.7nb2
+BUILDLINK_DEPENDS.iconv?=	libiconv>=1.8
 BUILDLINK_PKGSRCDIR.iconv?=	../../converters/libiconv
 
 .if defined(USE_GNU_ICONV)
diff --git a/converters/p5-Text-Iconv/Makefile b/converters/p5-Text-Iconv/Makefile
index c3dee0adf1f..df2b0b20be4 100644
--- a/converters/p5-Text-Iconv/Makefile
+++ b/converters/p5-Text-Iconv/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.3 2001/11/26 06:49:40 jlam Exp $
+# $NetBSD: Makefile,v 1.4 2002/09/10 16:06:37 wiz Exp $
 #
 
 DISTNAME=	Text-Iconv-1.1
 PKGNAME=	p5-${DISTNAME}
+PKGREVISION=	1
 SVR4_PKGNAME=	p5tic
 CATEGORIES=	converters perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=Text/}
diff --git a/converters/ruby-iconv/Makefile b/converters/ruby-iconv/Makefile
index 077eebb5391..f29da1e19ab 100644
--- a/converters/ruby-iconv/Makefile
+++ b/converters/ruby-iconv/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.1.1.1 2001/07/01 11:21:12 taca Exp $
-# FreeBSD: ports/converters/ruby-iconv/Makefile,v 1.12 2000/11/29 11:46:39 sobomax Exp
+# $NetBSD: Makefile,v 1.2 2002/09/10 16:06:37 wiz Exp $
+#
 
 DISTNAME=	iconv-0.4.4
 PKGNAME=	${RUBY_PKGNAMEPREFIX}${DISTNAME}
+PKGREVISION=	1
 CATEGORIES=	converters
 MASTER_SITES=	http://member.nifty.ne.jp/nokada/archive/
 
diff --git a/converters/wv/Makefile b/converters/wv/Makefile
index f717eb24637..5d5db7ac3ce 100644
--- a/converters/wv/Makefile
+++ b/converters/wv/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.18 2002/03/13 17:36:44 fredb Exp $
+# $NetBSD: Makefile,v 1.19 2002/09/10 16:06:37 wiz Exp $
 #
 
 DISTNAME=		wv-0.7.0
-PKGREVISION=		1
+PKGREVISION=		2
 CATEGORIES=		converters
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=wvware/}
 
diff --git a/converters/wv/buildlink.mk b/converters/wv/buildlink.mk
index 7df5a35c5a7..5b82b4aaaab 100644
--- a/converters/wv/buildlink.mk
+++ b/converters/wv/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.2 2001/08/23 17:47:55 jlam Exp $
+# $NetBSD: buildlink.mk,v 1.3 2002/09/10 16:06:37 wiz Exp $
 #
 # This Makefile fragment is included by packages that use wv.
 #
@@ -17,7 +17,7 @@ WV_BUILDLINK_MK=	# defined
 
 .include "../../mk/bsd.buildlink.mk"
 
-BUILDLINK_DEPENDS.wv?=	wv>=0.6.5
+BUILDLINK_DEPENDS.wv?=	wv>=0.7.0nb2
 BUILD_DEPENDS+=		${BUILDLINK_DEPENDS.wv}:../../converters/wv
 
 EVAL_PREFIX+=			BUILDLINK_PREFIX.wv=wv
diff --git a/converters/wv/buildlink2.mk b/converters/wv/buildlink2.mk
index 18e05420cba..a26182b89a0 100644
--- a/converters/wv/buildlink2.mk
+++ b/converters/wv/buildlink2.mk
@@ -1,10 +1,10 @@
-# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 19:22:03 jlam Exp $
+# $NetBSD: buildlink2.mk,v 1.3 2002/09/10 16:06:37 wiz Exp $
 
 .if !defined(WV_BUILDLINK2_MK)
 WV_BUILDLINK2_MK=	# defined
 
 BUILDLINK_PACKAGES+=		wv
-BUILDLINK_DEPENDS.wv?=		wv>=0.6.5
+BUILDLINK_DEPENDS.wv?=		wv>=0.7.0nb2
 BUILDLINK_PKGSRCDIR.wv?=	../../converters/wv
 
 EVAL_PREFIX+=			BUILDLINK_PREFIX.wv=wv
diff --git a/devel/GConf2/Makefile b/devel/GConf2/Makefile
index 490a73cb6d2..3ebb6530738 100644
--- a/devel/GConf2/Makefile
+++ b/devel/GConf2/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.3 2002/09/07 00:36:53 rh Exp $
+# $NetBSD: Makefile,v 1.4 2002/09/10 16:06:37 wiz Exp $
 #
 
 DISTNAME=		GConf-1.2.1
 PKGNAME=		${DISTNAME:S/GConf/GConf2/}
+PKGREVISION=		1
 CATEGORIES=		devel gnome
 MASTER_SITES=		${MASTER_SITE_GNOME:=2.0.1/sources/GConf/}
 EXTRACT_SUFX=		.tar.bz2
diff --git a/devel/GConf2/buildlink2.mk b/devel/GConf2/buildlink2.mk
index eb0962dd058..8b04a186c72 100644
--- a/devel/GConf2/buildlink2.mk
+++ b/devel/GConf2/buildlink2.mk
@@ -1,10 +1,10 @@
-# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 19:22:16 jlam Exp $
+# $NetBSD: buildlink2.mk,v 1.3 2002/09/10 16:06:37 wiz Exp $
 
 .if !defined(GCONF2_BUILDLINK2_MK)
 GCONF2_BUILDLINK2_MK=	# defined
 
 BUILDLINK_PACKAGES+=		gconf2
-BUILDLINK_DEPENDS.gconf2?=	GConf2>=1.1.10
+BUILDLINK_DEPENDS.gconf2?=	GConf2>=1.2.1nb1
 BUILDLINK_PKGSRCDIR.gconf2?=	../../devel/GConf2
 
 EVAL_PREFIX+=				BUILDLINK_PREFIX.gconf2=GConf2
diff --git a/devel/atk/Makefile b/devel/atk/Makefile
index 5fb3c955bf9..9468188d333 100644
--- a/devel/atk/Makefile
+++ b/devel/atk/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.6 2002/08/23 03:05:16 dmcmahill Exp $
+# $NetBSD: Makefile,v 1.7 2002/09/10 16:06:38 wiz Exp $
 #
 
 DISTNAME=		atk-1.0.3
-PKGREVISION=		1
+PKGREVISION=		2
 CATEGORIES=		devel
 MASTER_SITES=		ftp://ftp.gtk.org/pub/gtk/v2.0/ \
 			ftp://ftp.cs.umn.edu/pub/gimp/gtk/v2.0/ \
diff --git a/devel/atk/buildlink.mk b/devel/atk/buildlink.mk
index 038ea0b6468..1ab39120426 100644
--- a/devel/atk/buildlink.mk
+++ b/devel/atk/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.3 2002/08/25 19:22:21 jlam Exp $
+# $NetBSD: buildlink.mk,v 1.4 2002/09/10 16:06:38 wiz Exp $
 #
 # This Makefile fragment is included by packages that use atk.
 #
@@ -17,7 +17,7 @@ ATK_BUILDLINK_MK=	# defined
 
 .include "../../mk/bsd.buildlink.mk"
 
-BUILDLINK_DEPENDS.atk?=	atk>=1.0.2
+BUILDLINK_DEPENDS.atk?=	atk>=1.0.3nb2
 DEPENDS+=	${BUILDLINK_DEPENDS.atk}:../../devel/atk
 
 EVAL_PREFIX+=		BUILDLINK_PREFIX.atk=atk
diff --git a/devel/atk/buildlink2.mk b/devel/atk/buildlink2.mk
index edd565b5755..60e25785b17 100644
--- a/devel/atk/buildlink2.mk
+++ b/devel/atk/buildlink2.mk
@@ -1,10 +1,10 @@
-# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 19:22:21 jlam Exp $
+# $NetBSD: buildlink2.mk,v 1.3 2002/09/10 16:06:38 wiz Exp $
 
 .if !defined(ATK_BUILDLINK2_MK)
 ATK_BUILDLINK2_MK=	# defined
 
 BUILDLINK_PACKAGES+=		atk
-BUILDLINK_DEPENDS.atk?=		atk>=1.0.2
+BUILDLINK_DEPENDS.atk?=		atk>=1.0.3nb2
 BUILDLINK_PKGSRCDIR.atk?=	../../devel/atk
 
 EVAL_PREFIX+=		BUILDLINK_PREFIX.atk=atk
diff --git a/devel/bonobo-activation/Makefile b/devel/bonobo-activation/Makefile
index 87bdb9cacf2..bbe818080ea 100644
--- a/devel/bonobo-activation/Makefile
+++ b/devel/bonobo-activation/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.6 2002/09/10 13:04:35 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2002/09/10 16:06:38 wiz Exp $
 #
 
 DISTNAME=		bonobo-activation-1.0.2
+PKGREVISION=		1
 CATEGORIES=		devel gnome
 MASTER_SITES=		${MASTER_SITE_GNOME:=2.0.0/sources/bonobo-activation/}
 EXTRACT_SUFX=		.tar.bz2
diff --git a/devel/bonobo-activation/buildlink.mk b/devel/bonobo-activation/buildlink.mk
index 98798c4728c..9ed7a6a39b0 100644
--- a/devel/bonobo-activation/buildlink.mk
+++ b/devel/bonobo-activation/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.3 2002/08/25 19:22:23 jlam Exp $
+# $NetBSD: buildlink.mk,v 1.4 2002/09/10 16:06:38 wiz Exp $
 #
 # This Makefile fragment is included by packages that use bonobo-activation.
 #
@@ -19,7 +19,7 @@ BONOBO_ACTIVATION_BUILDLINK_MK=	# defined
 
 .include "../../mk/bsd.buildlink.mk"
 
-BUILDLINK_DEPENDS.bonobo-activation?=		bonobo-activation>=1.0.2
+BUILDLINK_DEPENDS.bonobo-activation?=		bonobo-activation>=1.0.2nb1
 DEPENDS+=	${BUILDLINK_DEPENDS.bonobo-activation}:../../devel/bonobo-activation
 
 EVAL_PREFIX+=	BUILDLINK_PREFIX.bonobo-activation=bonobo-activation
diff --git a/devel/bonobo-activation/buildlink2.mk b/devel/bonobo-activation/buildlink2.mk
index 3576bc38377..a5d3ba10fe4 100644
--- a/devel/bonobo-activation/buildlink2.mk
+++ b/devel/bonobo-activation/buildlink2.mk
@@ -1,10 +1,10 @@
-# $NetBSD: buildlink2.mk,v 1.3 2002/09/09 19:28:50 wiz Exp $
+# $NetBSD: buildlink2.mk,v 1.4 2002/09/10 16:06:38 wiz Exp $
 
 .if !defined(BONOBO_ACTIVATION_BUILDLINK2_MK)
 BONOBO_ACTIVATION_BUILDLINK2_MK=	# defined
 
 BUILDLINK_PACKAGES+=				bonobo-activation
-BUILDLINK_DEPENDS.bonobo-activation?=		bonobo-activation>=1.0.2
+BUILDLINK_DEPENDS.bonobo-activation?=		bonobo-activation>=1.0.2nb1
 BUILDLINK_PKGSRCDIR.bonobo-activation?=		../../devel/bonobo-activation
 
 EVAL_PREFIX+=	BUILDLINK_PREFIX.bonobo-activation=bonobo-activation
diff --git a/devel/gal/Makefile b/devel/gal/Makefile
index 8305b9a920b..d965973ffdf 100644
--- a/devel/gal/Makefile
+++ b/devel/gal/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.24 2002/08/25 19:22:27 jlam Exp $
+# $NetBSD: Makefile,v 1.25 2002/09/10 16:06:38 wiz Exp $
 
 DISTNAME=		gal-0.19.3
+PKGREVISION=		1
 CATEGORIES=		gnome devel
 MASTER_SITES=		${MASTER_SITE_GNOME:=unstable/sources/gal/}
 EXTRACT_SUFX=		.tar.bz2
diff --git a/devel/gal/buildlink.mk b/devel/gal/buildlink.mk
index 78ccf735d3d..a3ec15767ea 100644
--- a/devel/gal/buildlink.mk
+++ b/devel/gal/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.3 2002/03/13 17:36:49 fredb Exp $
+# $NetBSD: buildlink.mk,v 1.4 2002/09/10 16:06:38 wiz Exp $
 #
 # This Makefile fragment is included by packages that use gal.
 #
@@ -17,7 +17,7 @@ GAL_BUILDLINK_MK=	# defined
 
 .include "../../mk/bsd.buildlink.mk"
 
-BUILDLINK_DEPENDS.gal?=		gal>=0.19nb1
+BUILDLINK_DEPENDS.gal?=		gal>=0.19.3nb1
 DEPENDS+=	${BUILDLINK_DEPENDS.gal}:../../devel/gal
 
 EVAL_PREFIX+=			BUILDLINK_PREFIX.gal=gal
diff --git a/devel/gal/buildlink2.mk b/devel/gal/buildlink2.mk
index 7f06d3b3a8b..e0553f4eb79 100644
--- a/devel/gal/buildlink2.mk
+++ b/devel/gal/buildlink2.mk
@@ -1,10 +1,10 @@
-# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 19:22:27 jlam Exp $
+# $NetBSD: buildlink2.mk,v 1.3 2002/09/10 16:06:38 wiz Exp $
 
 .if !defined(GAL_BUILDLINK2_MK)
 GAL_BUILDLINK2_MK=	# defined
 
 BUILDLINK_PACKAGES+=		gal
-BUILDLINK_DEPENDS.gal?=		gal>=0.19nb1
+BUILDLINK_DEPENDS.gal?=		gal>=0.19.3nb1
 BUILDLINK_PKGSRCDIR.gal?=	../../devel/gal
 
 EVAL_PREFIX+=			BUILDLINK_PREFIX.gal=gal
diff --git a/devel/glade/Makefile b/devel/glade/Makefile
index e55b9f0ccdf..983799f2fad 100644
--- a/devel/glade/Makefile
+++ b/devel/glade/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.26 2002/07/17 12:45:29 rh Exp $
-# FreeBSD Id: Makefile,v 1.10 1998/11/18 17:35:16 vanilla Exp
+# $NetBSD: Makefile,v 1.27 2002/09/10 16:06:39 wiz Exp $
 #
 
 DISTNAME=	glade-0.6.2
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	devel
 MASTER_SITES=   http://glade.pn.org/ \
 		${MASTER_SITE_GNOME:=stable/sources/glade/}
diff --git a/devel/glib2/Makefile b/devel/glib2/Makefile
index 89bdac9da86..6d40622a7ae 100644
--- a/devel/glib2/Makefile
+++ b/devel/glib2/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.6 2002/08/23 02:37:42 dmcmahill Exp $
+# $NetBSD: Makefile,v 1.7 2002/09/10 16:06:39 wiz Exp $
 #
 
 DISTNAME=		glib-2.0.6
 PKGNAME=		${DISTNAME:S/glib/glib2/}
+PKGREVISION=		1
 CATEGORIES=		devel
 MASTER_SITES=		ftp://ftp.gtk.org/pub/gtk/v2.0/ \
 			ftp://ftp.cs.umn.edu/pub/gimp/gtk/v2.0/ \
diff --git a/devel/glib2/buildlink.mk b/devel/glib2/buildlink.mk
index 0cdf2f91c0e..3f24084e54b 100644
--- a/devel/glib2/buildlink.mk
+++ b/devel/glib2/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.5 2002/08/25 19:22:28 jlam Exp $
+# $NetBSD: buildlink.mk,v 1.6 2002/09/10 16:06:39 wiz Exp $
 #
 # This Makefile fragment is included by packages that use glib2.
 #
@@ -17,7 +17,7 @@ GLIB2_BUILDLINK_MK=	# defined
 
 .include "../../mk/bsd.buildlink.mk"
 
-BUILDLINK_DEPENDS.glib2?=	glib2>=2.0.1nb1
+BUILDLINK_DEPENDS.glib2?=	glib2>=2.0.6nb1
 DEPENDS+=	${BUILDLINK_DEPENDS.glib2}:../../devel/glib2
 
 EVAL_PREFIX+=		BUILDLINK_PREFIX.glib2=glib2
diff --git a/devel/glib2/buildlink2.mk b/devel/glib2/buildlink2.mk
index 7c38a68ad69..2c1e42e142c 100644
--- a/devel/glib2/buildlink2.mk
+++ b/devel/glib2/buildlink2.mk
@@ -1,10 +1,10 @@
-# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 19:22:28 jlam Exp $
+# $NetBSD: buildlink2.mk,v 1.3 2002/09/10 16:06:39 wiz Exp $
 
 .if !defined(GLIB2_BUILDLINK2_MK)
 GLIB2_BUILDLINK2_MK=	# defined
 
 BUILDLINK_PACKAGES+=		glib2
-BUILDLINK_DEPENDS.glib2?=	glib2>=2.0.1nb1
+BUILDLINK_DEPENDS.glib2?=	glib2>=2.0.6nb1
 BUILDLINK_PKGSRCDIR.glib2?=	../../devel/glib2
 
 EVAL_PREFIX+=		BUILDLINK_PREFIX.glib2=glib2
diff --git a/devel/gtkdiff/Makefile b/devel/gtkdiff/Makefile
index 072dd8a4523..41f3785f477 100644
--- a/devel/gtkdiff/Makefile
+++ b/devel/gtkdiff/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.6 2002/03/13 17:36:49 fredb Exp $
+# $NetBSD: Makefile,v 1.7 2002/09/10 16:06:39 wiz Exp $
 #
 
 DISTNAME=	gtkdiff-1.6.0
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	devel gnome
 MASTER_SITES=	http://www.ainet.or.jp/~inoue/software/gtkdiff/
 
diff --git a/devel/libbonobo/Makefile b/devel/libbonobo/Makefile
index cf28df1aaad..0899a95a9e5 100644
--- a/devel/libbonobo/Makefile
+++ b/devel/libbonobo/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.2 2002/09/10 14:10:46 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2002/09/10 16:06:39 wiz Exp $
 
 DISTNAME=		libbonobo-2.0.0
+PKGREVISION=		1
 CATEGORIES=		devel gnome
 MASTER_SITES=		${MASTER_SITE_GNOME:=2.0.0/sources/libbonobo/}
 EXTRACT_SUFX=		.tar.bz2
diff --git a/devel/libbonobo/buildlink.mk b/devel/libbonobo/buildlink.mk
index ebe6621ed63..9b194adf604 100644
--- a/devel/libbonobo/buildlink.mk
+++ b/devel/libbonobo/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.1.1.1 2002/07/12 16:22:58 wiz Exp $
+# $NetBSD: buildlink.mk,v 1.2 2002/09/10 16:06:39 wiz Exp $
 #
 # This Makefile fragment is included by packages that use libbonobo.
 #
@@ -17,7 +17,7 @@ LIBBONOBO_BUILDLINK_MK=	# defined
 
 .include "../../mk/bsd.buildlink.mk"
 
-BUILDLINK_DEPENDS.libbonobo?=	libbonobo>=2.0.0
+BUILDLINK_DEPENDS.libbonobo?=	libbonobo>=2.0.0nb1
 DEPENDS+=	${BUILDLINK_DEPENDS.libbonobo}:../../devel/libbonobo
 
 EVAL_PREFIX+=		BUILDLINK_PREFIX.libbonobo=libbonobo
diff --git a/devel/libbonobo/buildlink2.mk b/devel/libbonobo/buildlink2.mk
index 83712e99866..9cb7710567b 100644
--- a/devel/libbonobo/buildlink2.mk
+++ b/devel/libbonobo/buildlink2.mk
@@ -1,10 +1,10 @@
-# $NetBSD: buildlink2.mk,v 1.1 2002/09/07 00:38:38 rh Exp $
+# $NetBSD: buildlink2.mk,v 1.2 2002/09/10 16:06:39 wiz Exp $
 
 .if !defined(LIBBONOBO_BUILDLINK2_MK)
 LIBBONOBO_BUILDLINK2_MK=	# defined
 
 BUILDLINK_PACKAGES+=		libbonobo
-BUILDLINK_DEPENDS.libbonobo?=	libbonobo>=2.0.0
+BUILDLINK_DEPENDS.libbonobo?=	libbonobo>=2.0.0nb1
 BUILDLINK_PKGSRCDIR.libbonobo?=	../../devel/libbonobo
 
 EVAL_PREFIX+=	BUILDLINK_PREFIX.libbonobo=libbonobo
diff --git a/devel/libglade2/Makefile b/devel/libglade2/Makefile
index 8b4fcd63eb4..7d9c14c33b7 100644
--- a/devel/libglade2/Makefile
+++ b/devel/libglade2/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.2 2002/09/07 03:24:12 rh Exp $
+# $NetBSD: Makefile,v 1.3 2002/09/10 16:06:39 wiz Exp $
 #
 
 DISTNAME=		libglade-2.0.1
 PKGNAME=		libglade2-2.0.1
+PKGREVISION=		1
 CATEGORIES=		devel gnome
 MASTER_SITES=		${MASTER_SITE_GNOME:=2.0.1/sources/libglade/}
 
diff --git a/devel/libglade2/buildlink2.mk b/devel/libglade2/buildlink2.mk
index e92475bbcaa..09070dc9466 100644
--- a/devel/libglade2/buildlink2.mk
+++ b/devel/libglade2/buildlink2.mk
@@ -1,10 +1,10 @@
-# $NetBSD: buildlink2.mk,v 1.1 2002/09/07 03:24:12 rh Exp $
+# $NetBSD: buildlink2.mk,v 1.2 2002/09/10 16:06:40 wiz Exp $
 
 .if !defined(LIBGLADE2_BUILDLINK2_MK)
 LIBGLADE2_BUILDLINK2_MK=	# defined
 
 BUILDLINK_PACKAGES+=		libglade2
-BUILDLINK_DEPENDS.libglade2?=	libglade2>=2.0.1
+BUILDLINK_DEPENDS.libglade2?=	libglade2>=2.0.1nb1
 BUILDLINK_PKGSRCDIR.libglade2?=	../../devel/libglade2
 
 EVAL_PREFIX+=			BUILDLINK_PREFIX.libglade2=libglade2
diff --git a/devel/mrproject/Makefile b/devel/mrproject/Makefile
index 5c3029a901f..b777c5d8992 100644
--- a/devel/mrproject/Makefile
+++ b/devel/mrproject/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.4 2002/08/13 10:01:57 agc Exp $
+# $NetBSD: Makefile,v 1.5 2002/09/10 16:06:40 wiz Exp $
 #
 
 DISTNAME=		mrproject-0.5.1
+PKGREVISION=		1
 CATEGORIES=		devel
 MASTER_SITES=		ftp://ftp.codefactory.se/pub/software/mrproject/source/
 
diff --git a/devel/pango/Makefile b/devel/pango/Makefile
index c43884c8dfe..685f3e6035b 100644
--- a/devel/pango/Makefile
+++ b/devel/pango/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.8 2002/08/23 11:47:39 dmcmahill Exp $
+# $NetBSD: Makefile,v 1.9 2002/09/10 16:06:40 wiz Exp $
 #
 
 DISTNAME=		pango-1.0.4
+PKGREVISION=		1
 CATEGORIES=		devel
 MASTER_SITES=		ftp://ftp.gtk.org/pub/gtk/v2.0/ \
 			ftp://ftp.cs.umn.edu/pub/gimp/gtk/v2.0/ \
diff --git a/devel/pango/buildlink.mk b/devel/pango/buildlink.mk
index bf7d48415b5..b8f74842dc0 100644
--- a/devel/pango/buildlink.mk
+++ b/devel/pango/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.4 2002/08/25 19:22:36 jlam Exp $
+# $NetBSD: buildlink.mk,v 1.5 2002/09/10 16:06:40 wiz Exp $
 #
 # This Makefile fragment is included by packages that use pango.
 #
@@ -17,7 +17,7 @@ PANGO_BUILDLINK_MK=	# defined
 
 .include "../../mk/bsd.buildlink.mk"
 
-BUILDLINK_DEPENDS.pango?=	pango>=1.0.3
+BUILDLINK_DEPENDS.pango?=	pango>=1.0.4nb1
 DEPENDS+=	${BUILDLINK_DEPENDS.pango}:../../devel/pango
 
 EVAL_PREFIX+=		BUILDLINK_PREFIX.pango=pango
diff --git a/devel/pango/buildlink2.mk b/devel/pango/buildlink2.mk
index 3650d548edc..db1aa7e627f 100644
--- a/devel/pango/buildlink2.mk
+++ b/devel/pango/buildlink2.mk
@@ -1,10 +1,10 @@
-# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 19:22:36 jlam Exp $
+# $NetBSD: buildlink2.mk,v 1.3 2002/09/10 16:06:40 wiz Exp $
 
 .if !defined(PANGO_BUILDLINK2_MK)
 PANGO_BUILDLINK2_MK=	# defined
 
 BUILDLINK_PACKAGES+=		pango
-BUILDLINK_DEPENDS.pango?=	pango>=1.0.3
+BUILDLINK_DEPENDS.pango?=	pango>=1.0.4nb1
 BUILDLINK_PKGSRCDIR.pango?=	../../devel/pango
 
 EVAL_PREFIX+=		BUILDLINK_PREFIX.pango=pango
diff --git a/editors/abiword/Makefile b/editors/abiword/Makefile
index 1f63d4cb98e..589de4ae28c 100644
--- a/editors/abiword/Makefile
+++ b/editors/abiword/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.47 2002/07/03 21:59:07 hubertf Exp $
+# $NetBSD: Makefile,v 1.48 2002/09/10 16:06:40 wiz Exp $
 #
 # According to AbiSource's explanation of their trademark rights,
 # compilations/distributions of AbiWord not provided by AbiSource must
@@ -7,6 +7,7 @@
 
 DISTNAME=	abiword-${ABIWORD_VERS}
 PKGNAME=	abiword-personal-${ABIWORD_VERS}
+PKGREVISION=	1
 CATEGORIES=	editors
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=abiword/}
 
diff --git a/editors/gnotepad/Makefile b/editors/gnotepad/Makefile
index 2ef18735971..cbade434532 100644
--- a/editors/gnotepad/Makefile
+++ b/editors/gnotepad/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.9 2002/03/13 17:36:52 fredb Exp $
+# $NetBSD: Makefile,v 1.10 2002/09/10 16:06:40 wiz Exp $
 
 DISTNAME=	gnotepad+-1.3.3
 PKGNAME=	${DISTNAME:S/+//}
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	editors
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=gnotepad/}
 
diff --git a/finance/gnucash/Makefile b/finance/gnucash/Makefile
index d03934e75d6..b6d239bcc89 100644
--- a/finance/gnucash/Makefile
+++ b/finance/gnucash/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.25 2002/08/23 11:52:51 mjl Exp $
+# $NetBSD: Makefile,v 1.26 2002/09/10 16:06:41 wiz Exp $
+#
 
 DISTNAME=		gnucash-1.6.8
-# PKGREVISION=		2
+PKGREVISION=		1
 CATEGORIES=		finance
 MASTER_SITES=		http://www.linas.org/pub/gnucash/gnucash/sources/stable/ \
 			ftp://ftp.gnucash.org/pub/gnucash/sources/stable/ \
diff --git a/fonts/oto/Makefile b/fonts/oto/Makefile
index a05938f0f42..c4e31c8a044 100644
--- a/fonts/oto/Makefile
+++ b/fonts/oto/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.1.1.1 2002/07/21 19:20:24 wiz Exp $
+# $NetBSD: Makefile,v 1.2 2002/09/10 16:06:41 wiz Exp $
 #
 
 DISTNAME=	oto-0.4
+PKGREVISION=	1
 CATEGORIES=	fonts
 MASTER_SITES=	ftp://ftp.sourceforge.net/pub/sourceforge/oto/
 
diff --git a/games/gnome-chess/Makefile b/games/gnome-chess/Makefile
index bdad4d7b1c9..be2ab4aa3e2 100644
--- a/games/gnome-chess/Makefile
+++ b/games/gnome-chess/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.9 2002/07/17 13:11:44 rh Exp $
+# $NetBSD: Makefile,v 1.10 2002/09/10 16:06:41 wiz Exp $
 
 DISTNAME=	gnome-chess-0.3.3
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	games gnome
 MASTER_SITES=	${MASTER_SITE_GNOME:=stable/sources/gnome-chess/}
 
diff --git a/games/gnome-games/Makefile b/games/gnome-games/Makefile
index 5696b5b2d1f..870cbd67ded 100644
--- a/games/gnome-games/Makefile
+++ b/games/gnome-games/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.39 2002/08/30 23:26:43 fredb Exp $
+# $NetBSD: Makefile,v 1.40 2002/09/10 16:06:41 wiz Exp $
 
 DISTNAME=		gnome-games-1.4.0.4
-PKGREVISION=		1
+PKGREVISION=		2
 CATEGORIES=		games gnome
 MASTER_SITES=		${MASTER_SITE_GNOME:=stable/sources/gnome-games/}\
 			${MASTER_SITE_LOCAL}
diff --git a/games/gtkballs/Makefile b/games/gtkballs/Makefile
index 876ad8019ff..8d2ef97ef34 100644
--- a/games/gtkballs/Makefile
+++ b/games/gtkballs/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.4 2002/08/30 23:16:27 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2002/09/10 16:06:41 wiz Exp $
 #
 
 DISTNAME=	gtkballs-3.0.1
+PKGREVISION=	1
 CATEGORIES=	games
 MASTER_SITES=	ftp://ftp.antex.ru/pub/unix/dfo/gtkballs/ \
 		http://gtkballs.antex.ru/dist/
diff --git a/graphics/apla/Makefile b/graphics/apla/Makefile
index e9db3ae3b73..503df15c84e 100644
--- a/graphics/apla/Makefile
+++ b/graphics/apla/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.10 2002/08/28 05:31:00 jlam Exp $
+# $NetBSD: Makefile,v 1.11 2002/09/10 16:06:42 wiz Exp $
 #
 
 DISTNAME=	apla-1.0.3
+PKGREVISION=	1
 CATEGORIES=	graphics
 MASTER_SITES=	http://pd37.warszawa.sdi.tpnet.pl/NetBSD/
 
diff --git a/graphics/ee/Makefile b/graphics/ee/Makefile
index 30cb6367a74..4b52b3a4bdc 100644
--- a/graphics/ee/Makefile
+++ b/graphics/ee/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.23 2002/03/13 17:37:05 fredb Exp $
+# $NetBSD: Makefile,v 1.24 2002/09/10 16:06:42 wiz Exp $
 
 DISTNAME=		ee-0.3.12
-PKGREVISION=		1
+PKGREVISION=		2
 CATEGORIES=		x11 gnome
 MASTER_SITES=		${MASTER_SITE_GNOME:=stable/sources/ee/}
 
diff --git a/graphics/gphoto2/Makefile b/graphics/gphoto2/Makefile
index 12919b99871..0ebb5b27519 100644
--- a/graphics/gphoto2/Makefile
+++ b/graphics/gphoto2/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.9 2002/08/27 06:40:01 jlam Exp $
+# $NetBSD: Makefile,v 1.10 2002/09/10 16:06:42 wiz Exp $
 
 DISTNAME=	gphoto2-2.1.0
 PKGNAME=	gphoto-2.1.0
-
+PKGREVISION=	1
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=gphoto/}
 
diff --git a/graphics/gphoto2/buildlink.mk b/graphics/gphoto2/buildlink.mk
index 3229c11d30f..fe241c6a7da 100644
--- a/graphics/gphoto2/buildlink.mk
+++ b/graphics/gphoto2/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.1 2002/02/26 13:14:55 martti Exp $
+# $NetBSD: buildlink.mk,v 1.2 2002/09/10 16:06:42 wiz Exp $
 #
 # This Makefile fragment is included by packages that use gphoto2.
 #
@@ -13,7 +13,7 @@ GPHOTO2_BUILDLINK_MK=	# defined
 
 .include "../../mk/bsd.buildlink.mk"
 
-BUILDLINK_DEPENDS.gphoto2?=	gphoto>=2.0
+BUILDLINK_DEPENDS.gphoto2?=	gphoto>=2.1.0nb1
 DEPENDS+=	${BUILDLINK_DEPENDS.gphoto2}:../../graphics/gphoto2
 
 EVAL_PREFIX+=		BUILDLINK_PREFIX.gphoto2=gphoto2
diff --git a/graphics/gphoto2/buildlink2.mk b/graphics/gphoto2/buildlink2.mk
index cbe5f141e8d..23f142f157f 100644
--- a/graphics/gphoto2/buildlink2.mk
+++ b/graphics/gphoto2/buildlink2.mk
@@ -1,10 +1,10 @@
-# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 19:22:49 jlam Exp $
+# $NetBSD: buildlink2.mk,v 1.3 2002/09/10 16:06:42 wiz Exp $
 
 .if !defined(GPHOTO2_BUILDLINK2_MK)
 GPHOTO2_BUILDLINK2_MK=	# defined
 
 BUILDLINK_PACKAGES+=		gphoto2
-BUILDLINK_DEPENDS.gphoto2?=	gphoto>=2.0
+BUILDLINK_DEPENDS.gphoto2?=	gphoto>=2.1.0nb1
 BUILDLINK_PKGSRCDIR.gphoto2?=	../../graphics/gphoto2
 
 EVAL_PREFIX+=		BUILDLINK_PREFIX.gphoto2=gphoto2
diff --git a/graphics/libwmf/Makefile b/graphics/libwmf/Makefile
index 87d344e7661..f5dc4177398 100644
--- a/graphics/libwmf/Makefile
+++ b/graphics/libwmf/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.29 2002/03/13 17:37:12 fredb Exp $
+# $NetBSD: Makefile,v 1.30 2002/09/10 16:06:42 wiz Exp $
 #
 
 DISTNAME=		libwmf-0.2.2
-PKGREVISION=		1
+PKGREVISION=		2
 CATEGORIES=		graphics devel
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=wvware/}
 
diff --git a/graphics/libwmf/buildlink.mk b/graphics/libwmf/buildlink.mk
index 79b27e6f02b..5254a1cba13 100644
--- a/graphics/libwmf/buildlink.mk
+++ b/graphics/libwmf/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.6 2002/03/13 17:37:12 fredb Exp $
+# $NetBSD: buildlink.mk,v 1.7 2002/09/10 16:06:42 wiz Exp $
 #
 # This Makefile fragment is included by packages that use libwmf.
 #
@@ -17,7 +17,7 @@ LIBWMF_BUILDLINK_MK=	# defined
 
 .include "../../mk/bsd.buildlink.mk"
 
-BUILDLINK_DEPENDS.libwmf?=	libwmf>=0.2.2nb1
+BUILDLINK_DEPENDS.libwmf?=	libwmf>=0.2.2nb2
 BUILD_DEPENDS+=	${BUILDLINK_DEPENDS.libwmf}:../../graphics/libwmf
 
 EVAL_PREFIX+=			BUILDLINK_PREFIX.libwmf=libwmf
diff --git a/graphics/libwmf/buildlink2.mk b/graphics/libwmf/buildlink2.mk
index 62f6464260f..a0401a6faa9 100644
--- a/graphics/libwmf/buildlink2.mk
+++ b/graphics/libwmf/buildlink2.mk
@@ -1,10 +1,10 @@
-# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 19:22:52 jlam Exp $
+# $NetBSD: buildlink2.mk,v 1.3 2002/09/10 16:06:42 wiz Exp $
 
 .if !defined(LIBWMF_BUILDLINK2_MK)
 LIBWMF_BUILDLINK2_MK=	# defined
 
 BUILDLINK_PACKAGES+=		libwmf
-BUILDLINK_DEPENDS.libwmf?=	libwmf>=0.2.2nb1
+BUILDLINK_DEPENDS.libwmf?=	libwmf>=0.2.2nb2
 BUILDLINK_PKGSRCDIR.libwmf?=	../../graphics/libwmf
 
 EVAL_PREFIX+=			BUILDLINK_PREFIX.libwmf=libwmf
diff --git a/graphics/ogle/Makefile b/graphics/ogle/Makefile
index 50cdb4a0150..e0cf6013dc6 100644
--- a/graphics/ogle/Makefile
+++ b/graphics/ogle/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.12 2002/08/31 14:16:39 wiz Exp $
+# $NetBSD: Makefile,v 1.13 2002/09/10 16:06:43 wiz Exp $
 
 DISTNAME=	ogle-0.8.5
+PKGREVISION=	1
 CATEGORIES=	graphics
 MASTER_SITES=	http://www.dtek.chalmers.se/groups/dvd/dist/
 
@@ -8,8 +9,6 @@ MAINTAINER=	packages@netbsd.org
 HOMEPAGE=	http://www.dtek.chalmers.se/groups/dvd/
 COMMENT=	DVD player with menus
 
-BUILDLINK_DEPENDS.libxml2=	libxml2>=2.4.19
-
 ONLY_FOR_PLATFORM=	NetBSD-1.5.[23]*-i386 NetBSD-1.5[Y-Z]*-i386
 ONLY_FOR_PLATFORM+=	NetBSD-1.[6-9]*-i386
 ONLY_FOR_PLATFORM+=	NetBSD-1.6[D-Z]*-powerpc NetBSD-1.[7-9]*-powerpc
diff --git a/graphics/ogle_gui/Makefile b/graphics/ogle_gui/Makefile
index 04a28f44827..0965750d001 100644
--- a/graphics/ogle_gui/Makefile
+++ b/graphics/ogle_gui/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.7 2002/08/20 00:54:57 wiz Exp $
+# $NetBSD: Makefile,v 1.8 2002/09/10 16:06:43 wiz Exp $
 
 DISTNAME=	ogle_gui-0.8.5
+PKGREVISION=	1
 CATEGORIES=	graphics
 MASTER_SITES=	http://www.dtek.chalmers.se/groups/dvd/dist/
 
@@ -22,7 +23,6 @@ GNU_CONFIGURE=		yes
 USE_GMAKE=		yes
 USE_CONFIG_WRAPPER=	yes
 #USE_LIBTOOL=		yes
-BUILDLINK_DEPENDS.libxml2=	libxml2>=2.4.19
 #LTCONFIG_OVERRIDE=	${WRKSRC}/ltconfig
 
 LDFLAGS+=	-Wl,-R${LOCALBASE}/lib/ogle -L${LOCALBASE}/lib/ogle
diff --git a/graphics/sodipodi/Makefile b/graphics/sodipodi/Makefile
index faf884263e6..181c67a363d 100644
--- a/graphics/sodipodi/Makefile
+++ b/graphics/sodipodi/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.6 2002/08/01 06:40:54 jlam Exp $
+# $NetBSD: Makefile,v 1.7 2002/09/10 16:06:43 wiz Exp $
 #
 
 DISTNAME=	sodipodi-0.23
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=sodipodi/}
 
diff --git a/inputmethod/xcin/Makefile b/inputmethod/xcin/Makefile
index 77c9425d00e..307f64100c5 100644
--- a/inputmethod/xcin/Makefile
+++ b/inputmethod/xcin/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.2 2002/07/16 15:40:59 agc Exp $
+# $NetBSD: Makefile,v 1.3 2002/09/10 16:06:44 wiz Exp $
 #
 
 DISTNAME=	xcin-2.5.3.pre2
 PKGNAME=	xcin-2.5.3rc2
+PKGREVISION=	1
 CATEGORIES=	chinese x11
 MASTER_SITES=	ftp://xcin.linux.org.tw/pub/xcin/xcin/devel/
 
diff --git a/lang/gauche/Makefile b/lang/gauche/Makefile
index 895a0bbc4eb..1533e16e8f4 100644
--- a/lang/gauche/Makefile
+++ b/lang/gauche/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.6 2002/05/19 07:58:25 minoura Exp $
+# $NetBSD: Makefile,v 1.7 2002/09/10 16:06:44 wiz Exp $
 #
 
 DISTNAME=	Gauche-0.5.4
+PKGREVISION=	1
 CATEGORIES=	lang
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=gauche/}
 EXTRACT_SUFX=	.tgz
diff --git a/mail/balsa/Makefile b/mail/balsa/Makefile
index 636df520aad..86139a7f804 100644
--- a/mail/balsa/Makefile
+++ b/mail/balsa/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.20 2002/08/21 02:23:53 mjl Exp $
+# $NetBSD: Makefile,v 1.21 2002/09/10 16:06:44 wiz Exp $
 #
 
 DISTNAME=	balsa-1.4.0
-# PKGREVISION=	1
+PKGREVISION=	1
 CATEGORIES=	mail gnome
 MASTER_SITES=	http://www.theochem.kth.se/~pawsa/balsa/ \
 		ftp://ftp.newton.cx/pub/balsa/
diff --git a/mail/evolution/Makefile b/mail/evolution/Makefile
index 44cdf65c163..07ad30af95d 100644
--- a/mail/evolution/Makefile
+++ b/mail/evolution/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.22 2002/09/05 23:25:27 rh Exp $
+# $NetBSD: Makefile,v 1.23 2002/09/10 16:06:44 wiz Exp $
 
 DISTNAME=		evolution-1.0.8
-PKGREVISION=		1
+PKGREVISION=		2
 CATEGORIES=		mail time gnome
 MASTER_SITES=		${MASTER_SITE_GNOME:=stable/sources/evolution/}
 EXTRACT_SUFX=		.tar.bz2
diff --git a/mail/mutt/Makefile b/mail/mutt/Makefile
index 7ec8780d9f8..56d37c5d784 100644
--- a/mail/mutt/Makefile
+++ b/mail/mutt/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.84 2002/09/04 12:48:36 tron Exp $
+# $NetBSD: Makefile,v 1.85 2002/09/10 16:06:44 wiz Exp $
 
 DISTNAME=		mutt-1.4i
 PKGNAME=		${DISTNAME:C/i$//}
+PKGREVISION=		1
 CATEGORIES=		mail
 MASTER_SITES=		ftp://ftp.mutt.org/pub/mutt/ \
 			ftp://ftp.stealth.net/pub/mirrors/ftp.mutt.org/pub/mutt/ \
diff --git a/math/gnumeric/Makefile b/math/gnumeric/Makefile
index 4c44112880b..171f3912efe 100644
--- a/math/gnumeric/Makefile
+++ b/math/gnumeric/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.58 2002/08/27 14:43:16 grant Exp $
+# $NetBSD: Makefile,v 1.59 2002/09/10 16:06:45 wiz Exp $
 #
 
 DISTNAME=		gnumeric-1.0.9
-# PKGREVISION=		1
+PKGREVISION=		1
 CATEGORIES=		math gnome
 MASTER_SITES=		${MASTER_SITE_GNOME:=stable/sources/gnumeric/}
 
diff --git a/math/gnumeric0/Makefile b/math/gnumeric0/Makefile
index de06298ec55..314819c6ffc 100644
--- a/math/gnumeric0/Makefile
+++ b/math/gnumeric0/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.7 2002/07/19 04:32:34 mycroft Exp $
+# $NetBSD: Makefile,v 1.8 2002/09/10 16:06:45 wiz Exp $
 #
 
 DISTNAME=		gnumeric-0.75
-PKGREVISION=		3
+PKGREVISION=		4
 CATEGORIES=		math gnome
 MASTER_SITES=		${MASTER_SITE_GNOME:=stable/sources/gnumeric/}
 
diff --git a/math/guppi/Makefile b/math/guppi/Makefile
index 72c72e8b7f8..f8c2bf9b086 100644
--- a/math/guppi/Makefile
+++ b/math/guppi/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.18 2002/08/12 19:45:37 tron Exp $
+# $NetBSD: Makefile,v 1.19 2002/09/10 16:06:45 wiz Exp $
 
 DISTNAME=	Guppi-0.40.3
 PKGNAME=	${DISTNAME:S/G/g/}
+PKGREVISION=	1
 CATEGORIES=	math graphics
 MASTER_SITES=	${MASTER_SITE_GNOME:=stable/sources/Guppi/}
 EXTRACT_SUFX=	.tar.bz2
diff --git a/math/guppi/buildlink.mk b/math/guppi/buildlink.mk
index 4f07f1bdbc7..f03329589bc 100644
--- a/math/guppi/buildlink.mk
+++ b/math/guppi/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.2 2002/09/09 21:26:05 wiz Exp $
+# $NetBSD: buildlink.mk,v 1.3 2002/09/10 16:06:45 wiz Exp $
 #
 # This Makefile fragment is included by packages that use guppi.
 #
@@ -17,7 +17,7 @@ GUPPI_BUILDLINK_MK=	# defined
 
 .include "../../mk/bsd.buildlink.mk"
 
-BUILDLINK_DEPENDS.guppi?=	guppi>=0.40.3
+BUILDLINK_DEPENDS.guppi?=	guppi>=0.40.3nb1
 DEPENDS+=	${BUILDLINK_DEPENDS.guppi}:../../math/guppi
 
 EVAL_PREFIX+=			BUILDLINK_PREFIX.guppi=guppi
diff --git a/misc/gnome-utils/Makefile b/misc/gnome-utils/Makefile
index 38230727c9a..d6f2f6d951b 100644
--- a/misc/gnome-utils/Makefile
+++ b/misc/gnome-utils/Makefile
@@ -1,7 +1,7 @@
-## $NetBSD: Makefile,v 1.46 2002/07/17 13:47:45 rh Exp $
+## $NetBSD: Makefile,v 1.47 2002/09/10 16:06:45 wiz Exp $
 
 DISTNAME=		gnome-utils-1.4.1
-PKGREVISION=		2
+PKGREVISION=		3
 CATEGORIES=		misc x11 gnome
 MASTER_SITES=		${MASTER_SITE_GNOME:=stable/sources/gnome-utils/}
 
diff --git a/misc/kdepim2/Makefile b/misc/kdepim2/Makefile
index 3b3f32fa250..59d0eb02bea 100644
--- a/misc/kdepim2/Makefile
+++ b/misc/kdepim2/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.8 2002/03/13 17:37:26 fredb Exp $
+# $NetBSD: Makefile,v 1.9 2002/09/10 16:06:46 wiz Exp $
 
 DISTNAME=	kdepim-2.2.2
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	misc
 COMMENT=	Personal Information Management tools for the KDE desktop
 
diff --git a/misc/kdepim3/Makefile b/misc/kdepim3/Makefile
index 3f38568c34f..e065e108b00 100644
--- a/misc/kdepim3/Makefile
+++ b/misc/kdepim3/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.3 2002/08/28 07:15:36 skrll Exp $
+# $NetBSD: Makefile,v 1.4 2002/09/10 16:06:46 wiz Exp $
 
 DISTNAME=	kdepim-3.0.3
+PKGREVISION=	1
 CATEGORIES=	misc
 COMMENT=	Personal Information Management tools for the KDE desktop
 
diff --git a/net/ORBit2/Makefile b/net/ORBit2/Makefile
index 7c37c5d0423..774ca6da861 100644
--- a/net/ORBit2/Makefile
+++ b/net/ORBit2/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.6 2002/08/25 19:23:09 jlam Exp $
+# $NetBSD: Makefile,v 1.7 2002/09/10 16:06:46 wiz Exp $
 #
 
 DISTNAME=		ORBit2-2.4.0
-PKGREVISION=		1
+PKGREVISION=		2
 CATEGORIES=		net gnome
 MASTER_SITES=		${MASTER_SITE_GNOME:=2.0.0/sources/ORBit2/}/
 EXTRACT_SUFX=		.tar.bz2
diff --git a/net/ORBit2/buildlink.mk b/net/ORBit2/buildlink.mk
index 307772af67c..c249b30da83 100644
--- a/net/ORBit2/buildlink.mk
+++ b/net/ORBit2/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.5 2002/08/25 19:23:09 jlam Exp $
+# $NetBSD: buildlink.mk,v 1.6 2002/09/10 16:06:46 wiz Exp $
 #
 # This Makefile fragment is included by packages that use orbit2.
 #
@@ -17,7 +17,7 @@ ORBIT2_BUILDLINK_MK=	# defined
 
 .include "../../mk/bsd.buildlink.mk"
 
-BUILDLINK_DEPENDS.orbit2?=	ORBit2>=2.4.0
+BUILDLINK_DEPENDS.orbit2?=	ORBit2>=2.4.0nb2
 DEPENDS+=	${BUILDLINK_DEPENDS.orbit2}:../../net/ORBit2
 
 EVAL_PREFIX+=		BUILDLINK_PREFIX.orbit2=orbit2
diff --git a/net/ORBit2/buildlink2.mk b/net/ORBit2/buildlink2.mk
index 0da5a7e48fa..bcc92b38b30 100644
--- a/net/ORBit2/buildlink2.mk
+++ b/net/ORBit2/buildlink2.mk
@@ -1,10 +1,10 @@
-# $NetBSD: buildlink2.mk,v 1.3 2002/09/09 19:16:55 wiz Exp $
+# $NetBSD: buildlink2.mk,v 1.4 2002/09/10 16:06:46 wiz Exp $
 
 .if !defined(ORBIT2_BUILDLINK2_MK)
 ORBIT2_BUILDLINK2_MK=	# defined
 
 BUILDLINK_PACKAGES+=		orbit2
-BUILDLINK_DEPENDS.orbit2?=	ORBit2>=2.4.0
+BUILDLINK_DEPENDS.orbit2?=	ORBit2>=2.4.0nb2
 BUILDLINK_PKGSRCDIR.orbit2?=	../../net/ORBit2
 
 EVAL_PREFIX+=				BUILDLINK_PREFIX.orbit2=orbit2
diff --git a/net/gnapster/Makefile b/net/gnapster/Makefile
index f4d51f33aa6..1b9c9077810 100644
--- a/net/gnapster/Makefile
+++ b/net/gnapster/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.18 2002/03/13 17:37:29 fredb Exp $
+# $NetBSD: Makefile,v 1.19 2002/09/10 16:06:46 wiz Exp $
 
 DISTNAME=	gnapster-1.5.0
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	net
 MASTER_SITES=	http://www.faradic.net/~jasta/files/
 
diff --git a/net/gtk-gnutella/Makefile b/net/gtk-gnutella/Makefile
index 1e90a88dec6..1b2191c6362 100644
--- a/net/gtk-gnutella/Makefile
+++ b/net/gtk-gnutella/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.17 2002/08/25 21:49:58 jlam Exp $
+# $NetBSD: Makefile,v 1.18 2002/09/10 16:06:46 wiz Exp $
 #
 
 DISTNAME=		gtk-gnutella-0.90
+PKGREVISION=		1
 CATEGORIES=		net
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=gtk-gnutella/}
 
diff --git a/net/gtm/Makefile b/net/gtm/Makefile
index 7ef3bdfa332..db1478ab0f4 100644
--- a/net/gtm/Makefile
+++ b/net/gtm/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.13 2002/07/18 15:51:16 wiz Exp $
+# $NetBSD: Makefile,v 1.14 2002/09/10 16:06:47 wiz Exp $
+#
 
 DISTNAME=	gtm-0.4.11
-
+PKGREVISION=	1
 CATEGORIES=	net gnome
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=gtm/}
 
diff --git a/net/libIDL/Makefile b/net/libIDL/Makefile
index ad6dbded664..19de7f4766d 100644
--- a/net/libIDL/Makefile
+++ b/net/libIDL/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.3 2002/04/27 11:31:23 rh Exp $
+# $NetBSD: Makefile,v 1.4 2002/09/10 16:06:47 wiz Exp $
 #
 
 DISTNAME=		libIDL-0.7.4
-PKGREVISION=		1
+PKGREVISION=		2
 CATEGORIES=		net gnome
 MASTER_SITES=		${MASTER_SITE_GNOME:=pre-gnome2/sources/libIDL/}
 EXTRACT_SUFX=		.tar.bz2
diff --git a/net/libIDL/buildlink.mk b/net/libIDL/buildlink.mk
index 96d066c9e4f..6d758d0007a 100644
--- a/net/libIDL/buildlink.mk
+++ b/net/libIDL/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.2 2002/04/27 08:49:14 rh Exp $
+# $NetBSD: buildlink.mk,v 1.3 2002/09/10 16:06:47 wiz Exp $
 #
 # This Makefile fragment is included by packages that use idl.
 #
@@ -17,7 +17,7 @@ LIBIDL2_BUILDLINK_MK=	# defined
 
 .include "../../mk/bsd.buildlink.mk"
 
-BUILDLINK_DEPENDS.idl?=	libIDL>=0.7.4nb1
+BUILDLINK_DEPENDS.idl?=	libIDL>=0.7.4nb2
 DEPENDS+=	${BUILDLINK_DEPENDS.idl}:../../net/libIDL
 
 EVAL_PREFIX+=		BUILDLINK_PREFIX.idl=idl
diff --git a/net/libIDL/buildlink2.mk b/net/libIDL/buildlink2.mk
index 2a54cc28945..95a94010a42 100644
--- a/net/libIDL/buildlink2.mk
+++ b/net/libIDL/buildlink2.mk
@@ -1,10 +1,10 @@
-# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 19:23:12 jlam Exp $
+# $NetBSD: buildlink2.mk,v 1.3 2002/09/10 16:06:47 wiz Exp $
 
 .if !defined(LIBIDL2_BUILDLINK2_MK)
 LIBIDL2_BUILDLINK2_MK=	# defined
 
 BUILDLINK_PACKAGES+=		idl
-BUILDLINK_DEPENDS.idl?=		libIDL>=0.7.4nb1
+BUILDLINK_DEPENDS.idl?=		libIDL>=0.7.4nb2
 BUILDLINK_PKGSRCDIR.idl?=	../../net/libIDL
 
 EVAL_PREFIX+=		BUILDLINK_PREFIX.idl=idl
diff --git a/net/linc/Makefile b/net/linc/Makefile
index 211ebb7fc91..0987290c177 100644
--- a/net/linc/Makefile
+++ b/net/linc/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.5 2002/08/25 19:23:13 jlam Exp $
+# $NetBSD: Makefile,v 1.6 2002/09/10 16:06:47 wiz Exp $
 #
 
 DISTNAME=		linc-0.5.0
+PKGREVISION=		1
 CATEGORIES=		net gnome
 MASTER_SITES=		${MASTER_SITE_GNOME:=2.0.0/sources/linc/}
 EXTRACT_SUFX=		.tar.bz2
diff --git a/net/linc/buildlink.mk b/net/linc/buildlink.mk
index c126f25f520..52ac2c91f4b 100644
--- a/net/linc/buildlink.mk
+++ b/net/linc/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.4 2002/08/25 19:23:14 jlam Exp $
+# $NetBSD: buildlink.mk,v 1.5 2002/09/10 16:06:47 wiz Exp $
 #
 # This Makefile fragment is included by packages that use linc.
 #
@@ -17,7 +17,7 @@ LINC_BUILDLINK_MK=	# defined
 
 .include "../../mk/bsd.buildlink.mk"
 
-BUILDLINK_DEPENDS.linc?=	linc>=0.5.0
+BUILDLINK_DEPENDS.linc?=	linc>=0.5.0nb1
 DEPENDS+=	${BUILDLINK_DEPENDS.linc}:../../net/linc
 
 EVAL_PREFIX+=		BUILDLINK_PREFIX.linc=linc
diff --git a/net/linc/buildlink2.mk b/net/linc/buildlink2.mk
index 48191a23306..1a7258475fc 100644
--- a/net/linc/buildlink2.mk
+++ b/net/linc/buildlink2.mk
@@ -1,10 +1,10 @@
-# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 19:23:14 jlam Exp $
+# $NetBSD: buildlink2.mk,v 1.3 2002/09/10 16:06:47 wiz Exp $
 
 .if !defined(LINC_BUILDLINK2_MK)
 LINC_BUILDLINK2_MK=	# defined
 
 BUILDLINK_PACKAGES+=		linc
-BUILDLINK_DEPENDS.linc?=	linc>=0.5.0
+BUILDLINK_DEPENDS.linc?=	linc>=0.5.0nb1
 BUILDLINK_PKGSRCDIR.linc?=	../../net/linc
 
 EVAL_PREFIX+=		BUILDLINK_PREFIX.linc=linc
diff --git a/news/pan/Makefile b/news/pan/Makefile
index 1b60c2ac677..4bed3d5d4a1 100644
--- a/news/pan/Makefile
+++ b/news/pan/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.7 2002/03/13 17:37:33 fredb Exp $
+# $NetBSD: Makefile,v 1.8 2002/09/10 16:06:48 wiz Exp $
 #
 
 DISTNAME=	pan-0.11.2
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	news gnome
 MASTER_SITES=	${MASTER_SITE_GNOME:=stable/sources/pan/} \
 		http://pan.rebelbase.com/download/${DISTNAME:C/pan-//}/SOURCE/
diff --git a/parallel/linda/Makefile b/parallel/linda/Makefile
index a530850e102..5a7c4d90e6a 100644
--- a/parallel/linda/Makefile
+++ b/parallel/linda/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.1.1.1 2002/08/20 16:44:35 agc Exp $
+# $NetBSD: Makefile,v 1.2 2002/09/10 16:06:48 wiz Exp $
 #
 
 DISTNAME=	linda-0.1.1
+PKGREVISION=	1
 CATEGORIES=	parallel
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=linda/}
 
diff --git a/print/ggv/Makefile b/print/ggv/Makefile
index d6b7deee684..120bad203b5 100644
--- a/print/ggv/Makefile
+++ b/print/ggv/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.28 2002/07/17 12:27:05 rh Exp $
+# $NetBSD: Makefile,v 1.29 2002/09/10 16:06:48 wiz Exp $
 #
 
 DISTNAME=	ggv-1.0.2
-PKGREVISION=	3
+PKGREVISION=	4
 CATEGORIES=	print gnome
 MASTER_SITES=	${MASTER_SITE_GNOME:=stable/sources/ggv/}
 
diff --git a/print/libgnomeprint/Makefile b/print/libgnomeprint/Makefile
index ecaafdd518d..8ee565c7ad0 100644
--- a/print/libgnomeprint/Makefile
+++ b/print/libgnomeprint/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.1.1.1 2002/07/12 17:15:54 wiz Exp $
+# $NetBSD: Makefile,v 1.2 2002/09/10 16:06:48 wiz Exp $
 #
 
 DISTNAME=		libgnomeprint-1.115.0
+PKGREVISION=		1
 CATEGORIES=		print gnome
 MASTER_SITES=		${MASTER_SITE_GNOME:=2.0.0/sources/libgnomeprint/}
 
diff --git a/sysutils/fileutils/Makefile b/sysutils/fileutils/Makefile
index d78165d82f3..ce8cd62e96b 100644
--- a/sysutils/fileutils/Makefile
+++ b/sysutils/fileutils/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.19 2002/04/08 19:07:48 tron Exp $
+# $NetBSD: Makefile,v 1.20 2002/09/10 16:06:48 wiz Exp $
 
 DISTNAME=		fileutils-4.1.8
+PKGREVISION=		1
 CATEGORIES=		sysutils
 MASTER_SITES=		ftp://alpha.gnu.org/pub/gnu/fileutils/
 EXTRACT_SUFX=		.tar.bz2
diff --git a/sysutils/rox-session/Makefile b/sysutils/rox-session/Makefile
index d8400b4b68b..b606ed9435a 100644
--- a/sysutils/rox-session/Makefile
+++ b/sysutils/rox-session/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.2 2002/06/01 19:47:32 cjep Exp $
+# $NetBSD: Makefile,v 1.3 2002/09/10 16:06:49 wiz Exp $
 #
 
 DISTNAME=	ROX-Session-0.1.14
 PKGNAME=	rox-session-0.1.14
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	sysutils
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=rox/}
 EXTRACT_SUFX=	.tgz
diff --git a/sysutils/rox/Makefile b/sysutils/rox/Makefile
index 4b593f656bb..38200b56837 100644
--- a/sysutils/rox/Makefile
+++ b/sysutils/rox/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.6 2002/06/30 16:18:31 agc Exp $
+# $NetBSD: Makefile,v 1.7 2002/09/10 16:06:49 wiz Exp $
 #
 
 DISTNAME=	rox-1.2.0
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	sysutils
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=rox/}
 EXTRACT_SUFX=	.tgz
diff --git a/textproc/libxml2/Makefile b/textproc/libxml2/Makefile
index 960e9febed2..9c70c1e6610 100644
--- a/textproc/libxml2/Makefile
+++ b/textproc/libxml2/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.17 2002/08/31 00:49:24 wiz Exp $
+# $NetBSD: Makefile,v 1.18 2002/09/10 16:06:49 wiz Exp $
 
 DISTNAME=	libxml2-${LIBXML_VERSION}
+PKGREVISION=	1
 CATEGORIES=	textproc
 MASTER_SITES=	${MASTER_SITE_GNOME:=stable/sources/libxml/}
 
diff --git a/textproc/libxml2/buildlink.mk b/textproc/libxml2/buildlink.mk
index 33981e9baee..9c70ec944eb 100644
--- a/textproc/libxml2/buildlink.mk
+++ b/textproc/libxml2/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.11 2002/04/28 22:37:11 wiz Exp $
+# $NetBSD: buildlink.mk,v 1.12 2002/09/10 16:06:49 wiz Exp $
 #
 # This Makefile fragment is included by packages that use libxml2.
 #
@@ -17,7 +17,7 @@ LIBXML2_BUILDLINK_MK=	# defined
 
 .include "../../mk/bsd.buildlink.mk"
 
-BUILDLINK_DEPENDS.libxml2?=	libxml2>=2.4.2
+BUILDLINK_DEPENDS.libxml2?=	libxml2>=2.4.24nb1
 DEPENDS+=	${BUILDLINK_DEPENDS.libxml2}:../../textproc/libxml2
 
 EVAL_PREFIX+=			BUILDLINK_PREFIX.libxml2=libxml2
diff --git a/textproc/libxml2/buildlink2.mk b/textproc/libxml2/buildlink2.mk
index 49e82707453..32cd669d2ad 100644
--- a/textproc/libxml2/buildlink2.mk
+++ b/textproc/libxml2/buildlink2.mk
@@ -1,10 +1,10 @@
-# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 18:40:11 jlam Exp $
+# $NetBSD: buildlink2.mk,v 1.3 2002/09/10 16:06:49 wiz Exp $
 
 .if !defined(LIBXML2_BUILDLINK2_MK)
 LIBXML2_BUILDLINK2_MK=	# defined
 
 BUILDLINK_PACKAGES+=		libxml2
-BUILDLINK_DEPENDS.libxml2?=	libxml2>=2.4.2
+BUILDLINK_DEPENDS.libxml2?=	libxml2>=2.4.24nb1
 BUILDLINK_PKGSRCDIR.libxml2?=	../../textproc/libxml2
 
 EVAL_PREFIX+=	BUILDLINK_PREFIX.libxml2=libxml2
diff --git a/textproc/libxslt/Makefile b/textproc/libxslt/Makefile
index bf7ad40405f..04420ba6a61 100644
--- a/textproc/libxslt/Makefile
+++ b/textproc/libxslt/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.8 2002/08/25 18:40:13 jlam Exp $
+# $NetBSD: Makefile,v 1.9 2002/09/10 16:06:49 wiz Exp $
 
 DISTNAME=	libxslt-1.0.19
 PKGNAME=	${DISTNAME}
+PKGREVISION=	1
 CATEGORIES=	textproc
 MASTER_SITES=	${MASTER_SITE_GNOME:=stable/sources/libxslt/}
 
@@ -9,8 +10,6 @@ MAINTAINER=	packages@netbsd.org
 HOMEPAGE=	http://xmlsoft.org/
 COMMENT=	XSLT parser library for GNOME
 
-BUILDLINK_DEPENDS.libxml2=     libxml2>=2.4.10
-
 USE_BUILDLINK2=		yes
 USE_GMAKE=		yes
 USE_LIBTOOL=		yes
@@ -20,8 +19,6 @@ GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--with-libxml-prefix=${BUILDLINK_PREFIX.libxml2}
 CONFIGURE_ARGS+=	--with-html-dir=${PREFIX}/share/doc/html
 
-BUILDLINK_DEPENDS.libxml2=     libxml2>=2.4.17
-
 .include "../../textproc/libxml2/buildlink2.mk"
 .include "../../lang/perl5/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/textproc/libxslt/buildlink.mk b/textproc/libxslt/buildlink.mk
index eefa7192e84..2f2c8c11e2e 100644
--- a/textproc/libxslt/buildlink.mk
+++ b/textproc/libxslt/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.1.1.1 2001/11/23 08:34:25 martti Exp $
+# $NetBSD: buildlink.mk,v 1.2 2002/09/10 16:06:49 wiz Exp $
 #
 # This Makefile fragment is included by packages that use libxslt.
 #
@@ -17,7 +17,7 @@ LIBXSLT_BUILDLINK_MK=	# defined
 
 .include "../../mk/bsd.buildlink.mk"
 
-BUILDLINK_DEPENDS.libxslt?=	libxslt>=1.0.7
+BUILDLINK_DEPENDS.libxslt?=	libxslt>=1.0.19nb1
 DEPENDS+=	${BUILDLINK_DEPENDS.libxslt}:../../textproc/libxslt
 
 EVAL_PREFIX+=			BUILDLINK_PREFIX.libxslt=libxslt
diff --git a/textproc/libxslt/buildlink2.mk b/textproc/libxslt/buildlink2.mk
index ce09e46c9ad..b56eabddf3f 100644
--- a/textproc/libxslt/buildlink2.mk
+++ b/textproc/libxslt/buildlink2.mk
@@ -1,10 +1,10 @@
-# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 18:40:13 jlam Exp $
+# $NetBSD: buildlink2.mk,v 1.3 2002/09/10 16:06:49 wiz Exp $
 
 .if !defined(LIBXSLT_BUILDLINK2_MK)
 LIBXSLT_BUILDLINK2_MK=	# defined
 
 BUILDLINK_PACKAGES+=		libxslt
-BUILDLINK_DEPENDS.libxslt?=	libxslt>=1.0.7
+BUILDLINK_DEPENDS.libxslt?=	libxslt>=1.0.19nb1
 BUILDLINK_PKGSRCDIR.libxslt?=	../../textproc/libxslt
 
 EVAL_PREFIX+=	BUILDLINK_PREFIX.libxslt=libxslt
diff --git a/textproc/p5-XML-LibXML/Makefile b/textproc/p5-XML-LibXML/Makefile
index c7d01e55eb8..1aba868a52a 100644
--- a/textproc/p5-XML-LibXML/Makefile
+++ b/textproc/p5-XML-LibXML/Makefile
@@ -1,8 +1,10 @@
-# $NetBSD: Makefile,v 1.1.1.1 2002/01/30 22:38:36 mjl Exp $
+# $NetBSD: Makefile,v 1.2 2002/09/10 16:06:50 wiz Exp $
+#
 
 DISTNAME=	XML-LibXML-1.31
 PKGNAME=	p5-${DISTNAME}
-#SVR4_PKGNAME=	
+PKGREVISION=	1
+#SVR4_PKGNAME=
 CATEGORIES=	textproc perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=XML/}
 
diff --git a/textproc/php4-domxml/Makefile b/textproc/php4-domxml/Makefile
index 89b54b849b8..f38bb2e68f5 100644
--- a/textproc/php4-domxml/Makefile
+++ b/textproc/php4-domxml/Makefile
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.2 2002/02/28 06:18:48 jlam Exp $
+# $NetBSD: Makefile,v 1.3 2002/09/10 16:06:50 wiz Exp $
 
 MODNAME=		domxml
 CATEGORIES+=		textproc
 PHP_PKG_VERS=		# empty
+PKGREVISION=		1
 COMMENT=		PHP4 extension for DOM support
 
-BUILDLINK_DEPENDS.libxml2=	libxml2>=2.2.7
 USE_BUILDLINK_ONLY=		YES
 
 .include "../../www/php4/Makefile.module"
diff --git a/textproc/php4-xslt/Makefile b/textproc/php4-xslt/Makefile
index 0f901a52220..b9454be920f 100644
--- a/textproc/php4-xslt/Makefile
+++ b/textproc/php4-xslt/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.4 2002/09/10 12:32:11 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2002/09/10 16:06:50 wiz Exp $
 
 MODNAME=		xslt
 CATEGORIES+=		textproc
-PKGREVISION=		# empty
+PKGREVISION=		1
 COMMENT=		PHP4 extension for XSLT functions (Sablotron backend)
 
 USE_BUILDLINK2=		YES
diff --git a/textproc/sablotron/Makefile b/textproc/sablotron/Makefile
index 33a9168f258..55475d943b9 100644
--- a/textproc/sablotron/Makefile
+++ b/textproc/sablotron/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.6 2002/08/25 18:40:14 jlam Exp $
+# $NetBSD: Makefile,v 1.7 2002/09/10 16:06:50 wiz Exp $
 
 DISTNAME=		Sablot-0.71
 PKGNAME=		sablotron-0.71
+PKGREVISION=		1
 CATEGORIES=		textproc
 MASTER_SITES=		http://download-2.gingerall.cz/download/sablot/
 
diff --git a/textproc/sablotron/buildlink2.mk b/textproc/sablotron/buildlink2.mk
index 5ef9f8c5643..cbdc93c4e81 100644
--- a/textproc/sablotron/buildlink2.mk
+++ b/textproc/sablotron/buildlink2.mk
@@ -1,10 +1,10 @@
-# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 18:40:14 jlam Exp $
+# $NetBSD: buildlink2.mk,v 1.3 2002/09/10 16:06:50 wiz Exp $
 
 .if !defined(SABLOTRON_BUILDLINK2_MK)
 SABLOTRON_BUILDLINK2_MK=	# defined
 
 BUILDLINK_PACKAGES+=		sablotron
-BUILDLINK_DEPENDS.sablotron?=	sablotron>=0.71
+BUILDLINK_DEPENDS.sablotron?=	sablotron>=0.71nb1
 BUILDLINK_PKGSRCDIR.sablotron?=	../../textproc/sablotron
 
 EVAL_PREFIX+=		BUILDLINK_PREFIX.sablotron=sablotron
diff --git a/wm/metacity/Makefile b/wm/metacity/Makefile
index ce448f68ad0..781e84a2ae9 100644
--- a/wm/metacity/Makefile
+++ b/wm/metacity/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.1.1.1 2002/06/09 21:58:42 agc Exp $
+# $NetBSD: Makefile,v 1.2 2002/09/10 16:06:50 wiz Exp $
 #
 
 DISTNAME=	metacity-2.3.377
+PKGREVISION=	1
 CATEGORIES=	wm
 MASTER_SITES=	http://people.redhat.com/~hp/metacity/
 
diff --git a/www/ap-xslt/Makefile b/www/ap-xslt/Makefile
index a9272ac2678..0118243dc53 100644
--- a/www/ap-xslt/Makefile
+++ b/www/ap-xslt/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.9 2002/07/24 19:45:30 jlam Exp $
+# $NetBSD: Makefile,v 1.10 2002/09/10 16:06:51 wiz Exp $
 
 DISTNAME=	modxslt
 PKGNAME=	ap-xslt-1.1
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	www
 MASTER_SITES=	http://download.sourceforge.net/modxslt/
 
@@ -11,7 +11,7 @@ HOMEPAGE=	http://modxslt.sourceforge.net/
 COMMENT=	Simple, fast XSLT transformations for apache
 
 DEPENDS+=	apache{,6}-1.3.*:../../www/apache
-DEPENDS+=	sablotron-*:../../textproc/sablotron
+DEPENDS+=	sablotron>=0.71nb1:../../textproc/sablotron
 
 USE_PERL5=	build	# for "apxs"
 
diff --git a/www/galeon/Makefile b/www/galeon/Makefile
index 66947af7f9f..1f4518a7ac8 100644
--- a/www/galeon/Makefile
+++ b/www/galeon/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.35 2002/09/04 14:47:41 agc Exp $
+# $NetBSD: Makefile,v 1.36 2002/09/10 16:06:51 wiz Exp $
 
 DISTNAME=	galeon-1.2.5
+PKGREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=galeon/}
 
diff --git a/www/gtkhtml/Makefile b/www/gtkhtml/Makefile
index 66eb0543453..604b07db24c 100644
--- a/www/gtkhtml/Makefile
+++ b/www/gtkhtml/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.19 2002/04/10 16:56:12 jlam Exp $
+# $NetBSD: Makefile,v 1.20 2002/09/10 16:06:51 wiz Exp $
 
 DISTNAME=		gtkhtml-1.0.1
-PKGREVISION=		1
+PKGREVISION=		2
 CATEGORIES=		www gnome
 MASTER_SITES=		${MASTER_SITE_GNOME:=unstable/sources/gtkhtml/}
 EXTRACT_SUFX=		.tar.bz2
diff --git a/www/gtkhtml/buildlink.mk b/www/gtkhtml/buildlink.mk
index 282d134f487..c375317ddf2 100644
--- a/www/gtkhtml/buildlink.mk
+++ b/www/gtkhtml/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.4 2002/03/13 17:37:51 fredb Exp $
+# $NetBSD: buildlink.mk,v 1.5 2002/09/10 16:06:51 wiz Exp $
 #
 # This Makefile fragment is included by packages that use gtkhtml.
 #
@@ -17,7 +17,7 @@ GTKHTML_BUILDLINK_MK=	# defined
 
 .include "../../mk/bsd.buildlink.mk"
 
-BUILDLINK_DEPENDS.gtkhtml?=		gtkhtml>=1.0.1nb1
+BUILDLINK_DEPENDS.gtkhtml?=		gtkhtml>=1.0.1nb2
 DEPENDS+=	${BUILDLINK_DEPENDS.gtkhtml}:../../www/gtkhtml
 
 EVAL_PREFIX+=			BUILDLINK_PREFIX.gtkhtml=gtkhtml
diff --git a/www/gtkhtml/buildlink2.mk b/www/gtkhtml/buildlink2.mk
index 05eae57a9ae..203dedb3bc1 100644
--- a/www/gtkhtml/buildlink2.mk
+++ b/www/gtkhtml/buildlink2.mk
@@ -1,10 +1,10 @@
-# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 19:23:25 jlam Exp $
+# $NetBSD: buildlink2.mk,v 1.3 2002/09/10 16:06:51 wiz Exp $
 
 .if !defined(GTKHTML_BUILDLINK2_MK)
 GTKHTML_BUILDLINK2_MK=	# defined
 
 BUILDLINK_PACKAGES+=			gtkhtml
-BUILDLINK_DEPENDS.gtkhtml?=		gtkhtml>=1.0.1nb1
+BUILDLINK_DEPENDS.gtkhtml?=		gtkhtml>=1.0.1nb2
 BUILDLINK_PKGSRCDIR.gtkhtml?=		../../www/gtkhtml
 
 EVAL_PREFIX+=			BUILDLINK_PREFIX.gtkhtml=gtkhtml
diff --git a/www/kannel/Makefile b/www/kannel/Makefile
index 9c238159345..23ad42ba2b8 100644
--- a/www/kannel/Makefile
+++ b/www/kannel/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.12 2002/08/25 21:52:10 jlam Exp $
+# $NetBSD: Makefile,v 1.13 2002/09/10 16:06:51 wiz Exp $
 #
 
 DISTNAME=	gateway-${KANNEL_VER}
 PKGNAME=	kannel-${KANNEL_VER}
+PKGREVISION=	1
 CATEGORIES=	www net
 MASTER_SITES=	http://www.kannel.org/download/${KANNEL_VER}/
 
diff --git a/x11/acidlaunch/Makefile b/x11/acidlaunch/Makefile
index 1f75b3fd12f..dd9d7eed8cc 100644
--- a/x11/acidlaunch/Makefile
+++ b/x11/acidlaunch/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.1.1.1 2002/05/22 12:58:57 zuntum Exp $
+# $NetBSD: Makefile,v 1.2 2002/09/10 16:06:52 wiz Exp $
 #
 
 DISTNAME=	acidlaunch-0.5
+PKGREVISION=	1
 CATEGORIES=	x11
 MASTER_SITES=	http://linuxgamers.net/download/
 
diff --git a/x11/gdkxft/Makefile b/x11/gdkxft/Makefile
index 34da07b1949..a592977e3c8 100644
--- a/x11/gdkxft/Makefile
+++ b/x11/gdkxft/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.5 2002/05/12 10:16:51 abs Exp $
+# $NetBSD: Makefile,v 1.6 2002/09/10 16:06:52 wiz Exp $
 #
 
 DISTNAME=		gdkxft-1.5
+PKGREVISION=		1
 CATEGORIES=		x11
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=gdkxft/}
 
diff --git a/x11/gnome-core/Makefile b/x11/gnome-core/Makefile
index fdaef7219e4..f148d386bbc 100644
--- a/x11/gnome-core/Makefile
+++ b/x11/gnome-core/Makefile
@@ -1,6 +1,8 @@
-# $NetBSD: Makefile,v 1.75 2002/04/11 01:31:34 jlam Exp $
+# $NetBSD: Makefile,v 1.76 2002/09/10 16:06:52 wiz Exp $
+#
 
 DISTNAME=		gnome-core-1.4.0.6
+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 f1cfc51a983..b9a788f20ff 100644
--- a/x11/gnome-core/buildlink.mk
+++ b/x11/gnome-core/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.6 2002/08/25 19:23:29 jlam Exp $
+# $NetBSD: buildlink.mk,v 1.7 2002/09/10 16:06:52 wiz 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.4.0.4nb1
+BUILDLINK_DEPENDS.gnome-core?=	gnome-core>=1.4.0.6nb1
 DEPENDS+=	${BUILDLINK_DEPENDS.gnome-core}:../../x11/gnome-core
 
 EVAL_PREFIX+=			BUILDLINK_PREFIX.gnome-core=gnome-core
diff --git a/x11/gnome-core/buildlink2.mk b/x11/gnome-core/buildlink2.mk
index be7d8056926..dc3a7ad0e76 100644
--- a/x11/gnome-core/buildlink2.mk
+++ b/x11/gnome-core/buildlink2.mk
@@ -1,10 +1,10 @@
-# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 19:23:29 jlam Exp $
+# $NetBSD: buildlink2.mk,v 1.3 2002/09/10 16:06:52 wiz Exp $
 
 .if !defined(GNOME_CORE_BUILDLINK2_MK)
 GNOME_CORE_BUILDLINK2_MK=	# defined
 
 BUILDLINK_PACKAGES+=			gnome-core
-BUILDLINK_DEPENDS.gnome-core?=		gnome-core>=1.4.0.4nb1
+BUILDLINK_DEPENDS.gnome-core?=		gnome-core>=1.4.0.6nb1
 BUILDLINK_PKGSRCDIR.gnome-core?=	../../x11/gnome-core
 
 EVAL_PREFIX+=			BUILDLINK_PREFIX.gnome-core=gnome-core
diff --git a/x11/gnome-python/Makefile b/x11/gnome-python/Makefile
index b3947c23a04..bc6f8058107 100644
--- a/x11/gnome-python/Makefile
+++ b/x11/gnome-python/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.25 2002/03/26 08:01:44 tron Exp $
+# $NetBSD: Makefile,v 1.26 2002/09/10 16:06:52 wiz Exp $
 
 DISTNAME=		gnome-python-1.4.0
 PKGNAME=		${PYPKGPREFIX}-gnome-1.4.0
-PKGREVISION=		1
+PKGREVISION=		2
 CATEGORIES=		x11 gnome
 MASTER_SITES=		${MASTER_SITE_GNOME:=stable/sources/gnome-python/}
 
diff --git a/x11/gnome-python/buildlink.mk b/x11/gnome-python/buildlink.mk
index 3b3f2aca898..7db99b89608 100644
--- a/x11/gnome-python/buildlink.mk
+++ b/x11/gnome-python/buildlink.mk
@@ -1,6 +1,6 @@
-# $NetBSD: buildlink.mk,v 1.1 2002/01/19 11:44:20 drochner Exp $
+# $NetBSD: buildlink.mk,v 1.2 2002/09/10 16:06:53 wiz Exp $
 
 .include "../../lang/python/pyversion.mk"
 
-BUILDLINK_DEPENDS.pygnome?= ${PYPKGPREFIX}-gnome-*
+BUILDLINK_DEPENDS.pygnome?= ${PYPKGPREFIX}-gnome>=1.4.0nb2
 DEPENDS+= ${BUILDLINK_DEPENDS.pygnome}:../../x11/gnome-python
diff --git a/x11/gnome-python/buildlink2.mk b/x11/gnome-python/buildlink2.mk
index fcdf0a96c39..ef21d959b82 100644
--- a/x11/gnome-python/buildlink2.mk
+++ b/x11/gnome-python/buildlink2.mk
@@ -1,7 +1,7 @@
-# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 19:23:29 jlam Exp $
+# $NetBSD: buildlink2.mk,v 1.3 2002/09/10 16:06:53 wiz Exp $
 
 .include "../../lang/python/pyversion.mk"
 
 BUILDLINK_PACKAGES+=		pygnome
-BUILDLINK_DEPENDS.pygnome?=	${PYPKGPREFIX}-gnome-*
+BUILDLINK_DEPENDS.pygnome?=	${PYPKGPREFIX}-gnome>=1.4.0nb2
 BUILDLINK_PKGSRCDIR.pygnome?=	../../x11/gnome-python
diff --git a/x11/gtk2/Makefile b/x11/gtk2/Makefile
index 39f02024b49..1a573d71fd2 100644
--- a/x11/gtk2/Makefile
+++ b/x11/gtk2/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.7 2002/09/06 22:33:16 rh Exp $
+# $NetBSD: Makefile,v 1.8 2002/09/10 16:06:53 wiz Exp $
 #
 
 DISTNAME=		gtk+-2.0.6
 PKGNAME=		${DISTNAME:S/gtk/gtk2/}
+PKGREVISION=		1
 CATEGORIES=		x11
 MASTER_SITES=		ftp://ftp.gtk.org/pub/gtk/v2.0/ \
 			ftp://ftp.cs.umn.edu/pub/gimp/gtk/v2.0/ \
@@ -13,8 +14,6 @@ MAINTAINER=		packages@netbsd.org
 HOMEPAGE=		http://www.gtk.org/
 COMMENT=		Gimp toolkit. Libraries for building X11 user interfaces
 
-BUILDLINK_DEPENDS.glib2=glib2>=2.0.6
-
 BUILD_USES_MSGFMT=	yes
 USE_BUILDLINK_ONLY=	yes
 USE_LIBTOOL=		yes
diff --git a/x11/gtk2/buildlink.mk b/x11/gtk2/buildlink.mk
index c3297dcb1c2..34b614cf7a3 100644
--- a/x11/gtk2/buildlink.mk
+++ b/x11/gtk2/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.2 2002/04/28 07:34:40 rh Exp $
+# $NetBSD: buildlink.mk,v 1.3 2002/09/10 16:06:53 wiz Exp $
 #
 # This Makefile fragment is included by packages that use gtk2.
 #
@@ -17,7 +17,7 @@ GTK2_BUILDLINK_MK=	# defined
 
 .include "../../mk/bsd.buildlink.mk"
 
-BUILDLINK_DEPENDS.gtk2?=	gtk2+>=2.0.0
+BUILDLINK_DEPENDS.gtk2?=	gtk2+>=2.0.6nb1
 DEPENDS+=		${BUILDLINK_DEPENDS.gtk2}:../../x11/gtk2
 
 EVAL_PREFIX+=		BUILDLINK_PREFIX.gtk2=gtk2
diff --git a/x11/gtk2/buildlink2.mk b/x11/gtk2/buildlink2.mk
index 2be1d1b65bf..bff2ff45481 100644
--- a/x11/gtk2/buildlink2.mk
+++ b/x11/gtk2/buildlink2.mk
@@ -1,10 +1,10 @@
-# $NetBSD: buildlink2.mk,v 1.3 2002/09/07 03:16:13 rh Exp $
+# $NetBSD: buildlink2.mk,v 1.4 2002/09/10 16:06:53 wiz Exp $
 
 .if !defined(GTK2_BUILDLINK2_MK)
 GTK2_BUILDLINK2_MK=	# defined
 
 BUILDLINK_PACKAGES+=		gtk2
-BUILDLINK_DEPENDS.gtk2?=	gtk2+>=2.0.0
+BUILDLINK_DEPENDS.gtk2?=	gtk2+>=2.0.6nb1
 BUILDLINK_PKGSRCDIR.gtk2?=	../../x11/gtk2
 
 EVAL_PREFIX+=		BUILDLINK_PREFIX.gtk2=gtk2
diff --git a/x11/kdelibs2/Makefile b/x11/kdelibs2/Makefile
index 92946b66435..d6531d078c1 100644
--- a/x11/kdelibs2/Makefile
+++ b/x11/kdelibs2/Makefile
@@ -1,13 +1,12 @@
-# $NetBSD: Makefile,v 1.39 2002/08/25 18:40:35 jlam Exp $
+# $NetBSD: Makefile,v 1.40 2002/09/10 16:06:53 wiz Exp $
 
 DISTNAME=	kdelibs-2.2.2
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	x11
 COMMENT=	Support libraries for the KDE integrated X11 desktop
 
 .include "../../x11/kde2/Makefile.kde2"
 
-BUILDLINK_DEPENDS.libxml2=	libxml2>=2.4.8
 BUILDLINK_DEPENDS.audiofile=	libaudiofile>=0.1.9
 BUILDLINK_DEPENDS.qt2-libs=	qt2-libs>=2.3.1nb2
 
diff --git a/x11/kdelibs2/buildlink.mk b/x11/kdelibs2/buildlink.mk
index 6c970f5d327..1af48d6d46e 100644
--- a/x11/kdelibs2/buildlink.mk
+++ b/x11/kdelibs2/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.22 2002/08/25 18:40:35 jlam Exp $
+# $NetBSD: buildlink.mk,v 1.23 2002/09/10 16:06:54 wiz 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.2.2nb2
+BUILDLINK_DEPENDS.kdelibs2?=	kdelibs>=2.2.2nb3
 DEPENDS+=	${BUILDLINK_DEPENDS.kdelibs2}:../../x11/kdelibs2
 
 .include "../../mk/bsd.prefs.mk"
diff --git a/x11/kdelibs2/buildlink2.mk b/x11/kdelibs2/buildlink2.mk
index 28c6bb286fe..a06b502b641 100644
--- a/x11/kdelibs2/buildlink2.mk
+++ b/x11/kdelibs2/buildlink2.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 18:40:36 jlam Exp $
+# $NetBSD: buildlink2.mk,v 1.3 2002/09/10 16:06:54 wiz Exp $
 
 .if !defined(KDELIBS2_BUILDLINK2_MK)
 KDELIBS2_BUILDLINK2_MK=	# defined
@@ -6,7 +6,7 @@ KDELIBS2_BUILDLINK2_MK=	# defined
 .include "../../mk/bsd.prefs.mk"
 
 BUILDLINK_PACKAGES+=		kdelibs2
-BUILDLINK_DEPENDS.kdelibs2?=	kdelibs>=2.2.2nb2
+BUILDLINK_DEPENDS.kdelibs2?=	kdelibs>=2.2.2nb3
 BUILDLINK_PKGSRCDIR.kdelibs2?=	../../x11/kdelibs2
 
 EVAL_PREFIX+=	BUILDLINK_PREFIX.kdelibs2=kdelibs
diff --git a/x11/kdelibs3/Makefile b/x11/kdelibs3/Makefile
index abde3f97a85..5aae82329ae 100644
--- a/x11/kdelibs3/Makefile
+++ b/x11/kdelibs3/Makefile
@@ -1,12 +1,12 @@
-# $NetBSD: Makefile,v 1.6 2002/08/28 07:15:43 skrll Exp $
+# $NetBSD: Makefile,v 1.7 2002/09/10 16:06:54 wiz Exp $
 
 DISTNAME=	kdelibs-3.0.3
+PKGREVISION=	1
 CATEGORIES=	x11
 COMMENT=	Support libraries for the KDE integrated X11 desktop
 
 .include "../../x11/kde3/Makefile.kde3"
 
-BUILDLINK_DEPENDS.libxml2=	libxml2>=2.4.8
 BUILDLINK_DEPENDS.audiofile=	libaudiofile>=0.1.9
 BUILDLINK_DEPENDS.qt3-libs=	qt3-libs>=3.0.3
 
diff --git a/x11/kdelibs3/buildlink.mk b/x11/kdelibs3/buildlink.mk
index 94e86416f6b..779d7b21087 100644
--- a/x11/kdelibs3/buildlink.mk
+++ b/x11/kdelibs3/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.4 2002/08/25 19:23:50 jlam Exp $
+# $NetBSD: buildlink.mk,v 1.5 2002/09/10 16:06:54 wiz Exp $
 #
 # This Makefile fragment is included by packages that use kdelibs3.
 #
@@ -17,7 +17,7 @@ KDELIBS3_BUILDLINK_MK=	# defined
 
 .include "../../mk/bsd.buildlink.mk"
 
-BUILDLINK_DEPENDS.kdelibs3?=	kdelibs>=3.0.2nb1
+BUILDLINK_DEPENDS.kdelibs3?=	kdelibs>=3.0.3nb1
 DEPENDS+=	${BUILDLINK_DEPENDS.kdelibs3}:../../x11/kdelibs3
 
 .include "../../mk/bsd.prefs.mk"
diff --git a/x11/kdelibs3/buildlink2.mk b/x11/kdelibs3/buildlink2.mk
index ab8e8169cbe..6f4605b61a5 100644
--- a/x11/kdelibs3/buildlink2.mk
+++ b/x11/kdelibs3/buildlink2.mk
@@ -1,10 +1,10 @@
-# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 19:23:50 jlam Exp $
+# $NetBSD: buildlink2.mk,v 1.3 2002/09/10 16:06:55 wiz Exp $
 
 .if !defined(KDELIBS3_BUILDLINK2_MK)
 KDELIBS3_BUILDLINK2_MK=	# defined
 
 BUILDLINK_PACKAGES+=		kdelibs3
-BUILDLINK_DEPENDS.kdelibs3?=	kdelibs>=3.0.2nb1
+BUILDLINK_DEPENDS.kdelibs3?=	kdelibs>=3.0.3nb1
 BUILDLINK_PKGSRCDIR.kdelibs3?=	../../x11/kdelibs3
 
 .include "../../mk/bsd.prefs.mk"