DEPENDS and PKGREVISION bumps because db4's library name changed.

118 files changed, 236 insertions, 214 deletions

diff --git a/audio/amarok/Makefile b/audio/amarok/Makefile
index 2c1e1b6fc0f..858951f5083 100644
--- a/audio/amarok/Makefile
+++ b/audio/amarok/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.24 2005/12/31 12:32:31 wiz Exp $
+# $NetBSD: Makefile,v 1.25 2006/01/06 15:10:01 wiz Exp $
 
 DISTNAME=		amarok-1.3.7
-PKGREVISION=		1
+PKGREVISION=		2
 CATEGORIES=		audio kde
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=amarok/}
 EXTRACT_SUFX=		.tar.bz2
diff --git a/chat/gnomeicu/Makefile b/chat/gnomeicu/Makefile
index a9365ae52c9..3cabe341e6a 100644
--- a/chat/gnomeicu/Makefile
+++ b/chat/gnomeicu/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.36 2005/12/31 12:32:32 wiz Exp $
+# $NetBSD: Makefile,v 1.37 2006/01/06 15:10:01 wiz Exp $
 
 DISTNAME=	gnomeicu-0.99.5
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	chat gnome
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=gnomeicu/}
 EXTRACT_SUFX=	.tar.bz2
diff --git a/comms/gnome-pilot/Makefile b/comms/gnome-pilot/Makefile
index b949a3eeefb..d7d6446bf3a 100644
--- a/comms/gnome-pilot/Makefile
+++ b/comms/gnome-pilot/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.24 2005/12/31 12:32:32 wiz Exp $
+# $NetBSD: Makefile,v 1.25 2006/01/06 15:10:01 wiz Exp $
 #
 
 DISTNAME=		gnome-pilot-2.0.12
-PKGREVISION=		1
+PKGREVISION=		2
 CATEGORIES=		comms gnome
 MASTER_SITES=		${MASTER_SITE_GNOME:=sources/gnome-pilot/2.0/}
 
diff --git a/comms/gnome-pilot/buildlink3.mk b/comms/gnome-pilot/buildlink3.mk
index e8f75e2ce11..1648aad7f8f 100644
--- a/comms/gnome-pilot/buildlink3.mk
+++ b/comms/gnome-pilot/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.6 2005/12/31 12:32:32 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2006/01/06 15:10:01 wiz Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 GNOME_PILOT_BUILDLINK3_MK:=	${GNOME_PILOT_BUILDLINK3_MK}+
@@ -11,8 +11,7 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ngnome-pilot}
 BUILDLINK_PACKAGES+=	gnome-pilot
 
 .if !empty(GNOME_PILOT_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.gnome-pilot?=		gnome-pilot>=2.0.12
-BUILDLINK_RECOMMENDED.gnome-pilot?=	gnome-pilot>=2.0.12nb1
+BUILDLINK_DEPENDS.gnome-pilot?=		gnome-pilot>=2.0.12nb2
 BUILDLINK_PKGSRCDIR.gnome-pilot?=	../../comms/gnome-pilot
 .endif	# GNOME_PILOT_BUILDLINK3_MK
 
diff --git a/databases/bdb-xml/Makefile b/databases/bdb-xml/Makefile
index a8e8f15f6d4..898688e4b3a 100644
--- a/databases/bdb-xml/Makefile
+++ b/databases/bdb-xml/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.5 2006/01/02 17:32:13 joerg Exp $
+# $NetBSD: Makefile,v 1.6 2006/01/06 15:10:01 wiz Exp $
 
 DISTNAME=	dbxml-1.2.1
 PKGNAME=	${DISTNAME:S/db/bdb-/}
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	databases
 MASTER_SITES=	http://www.sleepycat.com/update/snapshot/
 
diff --git a/databases/bdb-xml/buildlink3.mk b/databases/bdb-xml/buildlink3.mk
index 7fcac6ad42a..60f7efe9507 100644
--- a/databases/bdb-xml/buildlink3.mk
+++ b/databases/bdb-xml/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2004/10/03 00:13:18 tv Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2006/01/06 15:10:01 wiz Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 BDB_XML_BUILDLINK3_MK:=	${BDB_XML_BUILDLINK3_MK}+
@@ -11,8 +11,7 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nbdb-xml}
 BUILDLINK_PACKAGES+=	bdb-xml
 
 .if !empty(BDB_XML_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.bdb-xml+=	bdb-xml>=1.2.0
-BUILDLINK_RECOMMENDED.bdb-xml+=	bdb-xml>=1.2.1nb1
+BUILDLINK_DEPENDS.bdb-xml+=	bdb-xml>=1.2.1nb3
 BUILDLINK_PKGSRCDIR.bdb-xml?=	../../databases/bdb-xml
 .endif	# BDB_XML_BUILDLINK3_MK
 
diff --git a/databases/gq/Makefile b/databases/gq/Makefile
index d7bd2fd7c7a..f5cfd591b3d 100644
--- a/databases/gq/Makefile
+++ b/databases/gq/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.26 2005/08/10 20:56:13 jlam Exp $
+# $NetBSD: Makefile,v 1.27 2006/01/06 15:10:01 wiz Exp $
 #
 
 DISTNAME=	gq-1.0beta1
-PKGREVISION=	5
+PKGREVISION=	6
 CATEGORIES=	databases net
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=gqclient/}
 
diff --git a/databases/gramps2/Makefile b/databases/gramps2/Makefile
index cd8f7983575..425633fe84a 100644
--- a/databases/gramps2/Makefile
+++ b/databases/gramps2/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.8 2005/12/31 12:32:32 wiz Exp $
+# $NetBSD: Makefile,v 1.9 2006/01/06 15:10:01 wiz Exp $
 #
 
 DISTNAME=		gramps-2.0.8
-PKGREVISION=		1
+PKGREVISION=		2
 CATEGORIES=		databases
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=gramps/}
 
diff --git a/databases/kmysqladmin/Makefile b/databases/kmysqladmin/Makefile
index 155f58fbeb6..3ab444444cb 100644
--- a/databases/kmysqladmin/Makefile
+++ b/databases/kmysqladmin/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.21 2005/04/11 21:45:11 tv Exp $
+# $NetBSD: Makefile,v 1.22 2006/01/06 15:10:01 wiz Exp $
 
 DISTNAME=	kmysqladmin-0.7.0
+PKGREVISION=	1
 CATEGORIES=	databases kde
 MASTER_SITES=	http://www.alwins-world.de/programs/download/kmysqladmin/
 
diff --git a/databases/luma/Makefile b/databases/luma/Makefile
index d63e3c25090..3eb09e37cf4 100644
--- a/databases/luma/Makefile
+++ b/databases/luma/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.5 2006/01/05 10:08:59 ghen Exp $
+# $NetBSD: Makefile,v 1.6 2006/01/06 15:10:02 wiz Exp $
 #
 
 DISTNAME=		luma-2.2.1
+PKGREVISION=		1
 CATEGORIES=		databases
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=luma/}
 EXTRACT_SUFX=		.tar.bz2
diff --git a/databases/nss_ldap/Makefile b/databases/nss_ldap/Makefile
index 31379f50d9f..bd54c8b3211 100644
--- a/databases/nss_ldap/Makefile
+++ b/databases/nss_ldap/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.6 2005/12/29 06:21:35 jlam Exp $
+# $NetBSD: Makefile,v 1.7 2006/01/06 15:10:02 wiz Exp $
 #
 
 DISTNAME=		nss_ldap-240
+PKGREVISION=		1
 CATEGORIES=		databases
 MASTER_SITES=		http://www.padl.com/download/
 
diff --git a/databases/openldap/Makefile b/databases/openldap/Makefile
index c19fd937b3d..f0a12c06e67 100644
--- a/databases/openldap/Makefile
+++ b/databases/openldap/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.107 2005/12/29 06:21:35 jlam Exp $
+# $NetBSD: Makefile,v 1.108 2006/01/06 15:10:02 wiz Exp $
 
 DISTNAME=	openldap-2.3.11
-PKGREVISION=	1
+PKGREVISION=	2
 SVR4_PKGNAME=	oldap
 CATEGORIES=	databases
 MASTER_SITES=	ftp://ftp.openldap.org/pub/OpenLDAP/openldap-release/
diff --git a/databases/openldap/buildlink3.mk b/databases/openldap/buildlink3.mk
index 1b9eed15382..b918f81acf4 100644
--- a/databases/openldap/buildlink3.mk
+++ b/databases/openldap/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.21 2005/10/26 15:08:13 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.22 2006/01/06 15:10:02 wiz Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 OPENLDAP_BUILDLINK3_MK:=	${OPENLDAP_BUILDLINK3_MK}+
@@ -13,8 +13,7 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nopenldap}
 BUILDLINK_PACKAGES+=	openldap
 
 .if !empty(OPENLDAP_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.openldap+=		openldap>=2.1.22
-BUILDLINK_RECOMMENDED.openldap+=	openldap>=2.3.11
+BUILDLINK_DEPENDS.openldap+=		openldap>=2.3.11nb2
 BUILDLINK_PKGSRCDIR.openldap?=		../../databases/openldap
 
 # Export the deprecated API from the openldap-2.2.x releases.
diff --git a/databases/p5-BerkeleyDB/Makefile b/databases/p5-BerkeleyDB/Makefile
index 5b9b812470b..674ddd7a027 100644
--- a/databases/p5-BerkeleyDB/Makefile
+++ b/databases/p5-BerkeleyDB/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.14 2005/12/05 20:49:58 rillig Exp $
+# $NetBSD: Makefile,v 1.15 2006/01/06 15:10:02 wiz Exp $
 #
 
 DISTNAME=	BerkeleyDB-0.26
 PKGNAME=	p5-${DISTNAME}
+PKGREVISION=	3
 SVR4_PKGNAME=	p5bdb
-PKGREVISION=	2
 CATEGORIES=	databases perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=BerkeleyDB/}
 
diff --git a/databases/php-ldap/Makefile b/databases/php-ldap/Makefile
index 1bc5027bf7e..9caee818e3b 100644
--- a/databases/php-ldap/Makefile
+++ b/databases/php-ldap/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.5 2005/10/07 21:09:28 jdolecek Exp $
+# $NetBSD: Makefile,v 1.6 2006/01/06 15:10:02 wiz Exp $
 
 MODNAME=		ldap
-PKGREVISION=		1
+PKGREVISION=		2
 CATEGORIES+=		databases
 COMMENT=		PHP extension for LDAP database access
 
diff --git a/databases/phpldapadmin/Makefile b/databases/phpldapadmin/Makefile
index 07f553f948e..796a90608d7 100644
--- a/databases/phpldapadmin/Makefile
+++ b/databases/phpldapadmin/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.15 2005/12/29 06:21:36 jlam Exp $
+# $NetBSD: Makefile,v 1.16 2006/01/06 15:10:02 wiz Exp $
 
 DISTNAME=	phpldapadmin-${VERSION}
-PKGREVISION=	5
+PKGREVISION=	6
 CATEGORIES=	databases www
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=phpldapadmin/}
 
diff --git a/databases/py-bdb-xml/Makefile b/databases/py-bdb-xml/Makefile
index 20554ace03b..99cfd7abe83 100644
--- a/databases/py-bdb-xml/Makefile
+++ b/databases/py-bdb-xml/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.5 2005/04/11 21:45:15 tv Exp $
+# $NetBSD: Makefile,v 1.6 2006/01/06 15:10:02 wiz Exp $
 
 DISTNAME=	dbxml-1.2.1
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME:S/db/bdb-/}
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	databases python
 MASTER_SITES=	http://www.sleepycat.com/update/snapshot/
 
diff --git a/databases/py-bsddb3/Makefile b/databases/py-bsddb3/Makefile
index e9434877f99..aad68ae3301 100644
--- a/databases/py-bsddb3/Makefile
+++ b/databases/py-bsddb3/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.15 2005/08/05 18:21:04 drochner Exp $
+# $NetBSD: Makefile,v 1.16 2006/01/06 15:10:02 wiz Exp $
 #
 
 DISTNAME=	bsddb3-4.3.3
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
+PKGREVISION=	1
 CATEGORIES=	databases python
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=pybsddb/}
 
diff --git a/databases/py-bsddb3/buildlink3.mk b/databases/py-bsddb3/buildlink3.mk
index d72d4cf4bd5..700e950b7ab 100644
--- a/databases/py-bsddb3/buildlink3.mk
+++ b/databases/py-bsddb3/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2005/01/24 16:58:13 seb Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2006/01/06 15:10:02 wiz Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 PY_BSDDB3_BUILDLINK3_MK:=	${PY_BSDDB3_BUILDLINK3_MK}+
@@ -17,7 +17,7 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Npy-bsddb3}
 BUILDLINK_PACKAGES+=	py-bsddb3
 
 .if !empty(PY_BSDDB3_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.py-bsddb3+=	${PYPKGPREFIX}-bsddb3>=4.2.4nb1
+BUILDLINK_DEPENDS.py-bsddb3+=	${PYPKGPREFIX}-bsddb3>=4.3.3nb1
 BUILDLINK_PKGSRCDIR.py-bsddb3?=	../../databases/py-bsddb3
 .endif	# PY_BSDDB3_BUILDLINK3_MK
 
diff --git a/databases/py-ldap/Makefile b/databases/py-ldap/Makefile
index ec5f6dcc5fd..c8b5e1183f0 100644
--- a/databases/py-ldap/Makefile
+++ b/databases/py-ldap/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.24 2005/10/25 17:09:33 drochner Exp $
+# $NetBSD: Makefile,v 1.25 2006/01/06 15:10:02 wiz Exp $
 
 DISTNAME=	python-ldap-2.0.10
 PKGNAME=	${DISTNAME:S/python/${PYPKGPREFIX}/}
+PKGREVISION=	1
 CATEGORIES=	databases python
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=python-ldap/}
 
diff --git a/databases/py-ldap/buildlink3.mk b/databases/py-ldap/buildlink3.mk
index 42228e9ed99..607f3aec62e 100644
--- a/databases/py-ldap/buildlink3.mk
+++ b/databases/py-ldap/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2005/07/29 15:51:40 drochner Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2006/01/06 15:10:02 wiz Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 PY_LDAP_BUILDLINK3_MK:=	${PY_LDAP_BUILDLINK3_MK}+
@@ -13,7 +13,7 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Npyldap}
 BUILDLINK_PACKAGES+=	pyldap
 
 .if !empty(PY_LDAP_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.pyldap+=	${PYPKGPREFIX}-ldap-*
+BUILDLINK_DEPENDS.pyldap+=	${PYPKGPREFIX}-ldap>=2.0.10nb1
 BUILDLINK_PKGSRCDIR.pyldap?=	../../databases/py-ldap
 .endif	# PY_LDAP_BUILDLINK3_MK
 
diff --git a/devel/c-cpp-reference/Makefile b/devel/c-cpp-reference/Makefile
index 9be06e938de..a64d5abfbf0 100644
--- a/devel/c-cpp-reference/Makefile
+++ b/devel/c-cpp-reference/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.14 2005/05/22 20:07:49 jlam Exp $
+# $NetBSD: Makefile,v 1.15 2006/01/06 15:10:02 wiz Exp $
 #
 
 DISTNAME=	c_cpp_reference-2.0.2
 PKGNAME=	${DISTNAME:S/_/-/g}
-PKGREVISION=	4
+PKGREVISION=	5
 CATEGORIES=	devel kde
 MASTER_SITES=	ftp://ftp.e-technik.fh-muenchen.de/pub/unix/ide/KDevelop/
 
diff --git a/devel/codeville/Makefile b/devel/codeville/Makefile
index 0b98a574656..ce909da2649 100644
--- a/devel/codeville/Makefile
+++ b/devel/codeville/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.8 2005/10/25 17:26:08 drochner Exp $
+# $NetBSD: Makefile,v 1.9 2006/01/06 15:10:02 wiz Exp $
 
 DISTNAME=	Codeville-0.1.13
 PKGNAME=	codeville-0.1.13
+PKGREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	http://codeville.org/download/
 
diff --git a/devel/cvs2svn/Makefile b/devel/cvs2svn/Makefile
index 22258c2958d..c18bd727ea5 100644
--- a/devel/cvs2svn/Makefile
+++ b/devel/cvs2svn/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.8 2005/12/27 13:54:57 seb Exp $
+# $NetBSD: Makefile,v 1.9 2006/01/06 15:10:02 wiz Exp $
 
 DISTNAME=	cvs2svn-1.2.1
+PKGREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	http://cvs2svn.tigris.org/files/documents/1462/20727/
 
diff --git a/devel/kdbg/Makefile b/devel/kdbg/Makefile
index 8575703d15c..9993bdb07ce 100644
--- a/devel/kdbg/Makefile
+++ b/devel/kdbg/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.52 2005/05/22 20:07:52 jlam Exp $
+# $NetBSD: Makefile,v 1.53 2006/01/06 15:10:02 wiz Exp $
 
 DISTNAME=	kdbg-1.2.10
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	devel kde
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=kdbg/} \
 		ftp://ftp.eudaptics.com/pub/people/jsixt/
diff --git a/devel/kdesdk3/Makefile b/devel/kdesdk3/Makefile
index ac61cabe3be..fdb19555861 100644
--- a/devel/kdesdk3/Makefile
+++ b/devel/kdesdk3/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.40 2005/12/11 11:52:33 markd Exp $
+# $NetBSD: Makefile,v 1.41 2006/01/06 15:10:02 wiz Exp $
 
 DISTNAME=	kdesdk-${_KDE_VERSION}
+PKGREVISION=	1
 CATEGORIES=	devel
 COMMENT=	Support applications and tools used by KDE developers
 
diff --git a/devel/kdesdk3/buildlink3.mk b/devel/kdesdk3/buildlink3.mk
index 4b7bc5c5eb4..f5d80e75bcc 100644
--- a/devel/kdesdk3/buildlink3.mk
+++ b/devel/kdesdk3/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2005/03/23 22:33:47 markd Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2006/01/06 15:10:02 wiz Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 KDESDK_BUILDLINK3_MK:=	${KDESDK_BUILDLINK3_MK}+
@@ -11,8 +11,7 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nkdesdk}
 BUILDLINK_PACKAGES+=	kdesdk
 
 .if !empty(KDESDK_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.kdesdk+=	kdesdk>=3.2.0
-BUILDLINK_RECOMMENDED.kdesdk?=	kdesdk>=3.4.0
+BUILDLINK_DEPENDS.kdesdk+=	kdesdk>=3.5.0nb1
 BUILDLINK_PKGSRCDIR.kdesdk?=	../../devel/kdesdk3
 .endif	# KDESDK_BUILDLINK3_MK
 
diff --git a/devel/kdevelop-base/Makefile b/devel/kdevelop-base/Makefile
index 86133f958ad..b3b547c4eb2 100644
--- a/devel/kdevelop-base/Makefile
+++ b/devel/kdevelop-base/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.48 2005/12/19 08:34:11 markd Exp $
+# $NetBSD: Makefile,v 1.49 2006/01/06 15:10:02 wiz Exp $
 
 DISTNAME=	kdevelop-3.3.0
 PKGNAME=	kdevelop-base-3.3.0
+PKGREVISION=	1
 CATEGORIES=	devel kde
 
 HOMEPAGE=       http://www.kdevelop.org/
diff --git a/devel/kdevelop/Makefile b/devel/kdevelop/Makefile
index 62892210d71..13e0a43cfb7 100644
--- a/devel/kdevelop/Makefile
+++ b/devel/kdevelop/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.54 2005/12/27 18:08:51 reed Exp $
+# $NetBSD: Makefile,v 1.55 2006/01/06 15:10:02 wiz Exp $
 
 DISTNAME=	kdevelop-3.3.0
+PKGREVISION=	1
 CATEGORIES=	devel kde meta-pkgs
 MASTER_SITES=	# empty
 DISTFILES=	# empty
diff --git a/devel/kscope/Makefile b/devel/kscope/Makefile
index 0d226590716..329269125ba 100644
--- a/devel/kscope/Makefile
+++ b/devel/kscope/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.3 2005/05/22 20:07:52 jlam Exp $
+# $NetBSD: Makefile,v 1.4 2006/01/06 15:10:03 wiz Exp $
 #
 
 DISTNAME=		kscope-1.0
-PKGREVISION=		1
+PKGREVISION=		2
 CATEGORIES=		devel kde
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=kscope/}
 
diff --git a/devel/libgail-gnome/Makefile b/devel/libgail-gnome/Makefile
index 24ae8e8e3e3..e1b7b3aa44a 100644
--- a/devel/libgail-gnome/Makefile
+++ b/devel/libgail-gnome/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.9 2005/12/31 12:32:33 wiz Exp $
+# $NetBSD: Makefile,v 1.10 2006/01/06 15:10:03 wiz Exp $
 #
 
 DISTNAME=	libgail-gnome-1.1.1
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	devel gnome
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/libgail-gnome/1.1/}
 EXTRACT_SUFX=	.tar.bz2
diff --git a/devel/libgail-gnome/buildlink3.mk b/devel/libgail-gnome/buildlink3.mk
index da1795ec56c..9355ed13718 100644
--- a/devel/libgail-gnome/buildlink3.mk
+++ b/devel/libgail-gnome/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2005/12/31 12:32:33 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2006/01/06 15:10:03 wiz Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 LIBGAIL_GNOME_BUILDLINK3_MK:=	${LIBGAIL_GNOME_BUILDLINK3_MK}+
@@ -11,8 +11,7 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibgail-gnome}
 BUILDLINK_PACKAGES+=	libgail-gnome
 
 .if !empty(LIBGAIL_GNOME_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libgail-gnome+=	libgail-gnome>=1.1.0
-BUILDLINK_RECOMMENDED.libgail-gnome+=	libgail-gnome>=1.1.1nb1
+BUILDLINK_DEPENDS.libgail-gnome+=	libgail-gnome>=1.1.1nb2
 BUILDLINK_PKGSRCDIR.libgail-gnome?=	../../devel/libgail-gnome
 .endif	# LIBGAIL_GNOME_BUILDLINK3_MK
 
diff --git a/devel/monotone-viz/Makefile b/devel/monotone-viz/Makefile
index 120c7b614d7..73593a60ee2 100644
--- a/devel/monotone-viz/Makefile
+++ b/devel/monotone-viz/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.6 2005/12/31 12:32:34 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2006/01/06 15:10:03 wiz Exp $
 #
 
 DISTNAME=		monotone-viz-0.12
-PKGREVISION=		3
+PKGREVISION=		4
 CATEGORIES=		devel
 MASTER_SITES=		http://oandrieu.nerim.net/monotone-viz/
 
diff --git a/editors/kile/Makefile b/editors/kile/Makefile
index 07076d822d8..59ce4be1af3 100644
--- a/editors/kile/Makefile
+++ b/editors/kile/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.31 2005/06/04 23:51:39 markd Exp $
+# $NetBSD: Makefile,v 1.32 2006/01/06 15:10:03 wiz Exp $
 
 DISTNAME=		kile-1.8.1
+PKGREVISION=		1
 CATEGORIES=		editors kde
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=kile/}
 EXTRACT_SUFX=		.tar.bz2
diff --git a/editors/poedit/Makefile b/editors/poedit/Makefile
index 322061c7865..0173db58c15 100644
--- a/editors/poedit/Makefile
+++ b/editors/poedit/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.9 2005/10/09 18:33:17 minskim Exp $
+# $NetBSD: Makefile,v 1.10 2006/01/06 15:10:03 wiz Exp $
 #
 
 DISTNAME=	poedit-1.3.4
+PKGREVISION=	1
 CATEGORIES=	editors
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=poedit/}
 
diff --git a/editors/vim-kde/Makefile b/editors/vim-kde/Makefile
index 514fc17b56d..f65771ebc14 100644
--- a/editors/vim-kde/Makefile
+++ b/editors/vim-kde/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.29 2006/01/04 04:29:06 schmonz Exp $
+# $NetBSD: Makefile,v 1.30 2006/01/06 15:10:03 wiz Exp $
 
 DISTNAME=	kvim-${KVIM_VERSION}
 PKGNAME=	vim-kde-${KVIM_VERSION}
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	editors kde
 MASTER_SITES=	ftp://ftp.rutgers.edu/pub/kde/stable/apps/KDE3.x/utils/ \
 		ftp://ftp.kde.org/pub/kde/stable/apps/KDE3.x/utils/ \
diff --git a/emulators/wine/Makefile b/emulators/wine/Makefile
index 0265b9e6ae3..950c78729ac 100644
--- a/emulators/wine/Makefile
+++ b/emulators/wine/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.94 2005/12/05 20:50:13 rillig Exp $
+# $NetBSD: Makefile,v 1.95 2006/01/06 15:10:03 wiz Exp $
 
 DISTNAME=	wine-0.9
+PKGREVISION=	1
 CATEGORIES=	emulators
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=wine/} \
 		http://ibiblio.org/pub/linux/system/emulators/wine/
diff --git a/emulators/wine/buildlink3.mk b/emulators/wine/buildlink3.mk
index cfd63100b55..d69ffcd97b7 100644
--- a/emulators/wine/buildlink3.mk
+++ b/emulators/wine/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2004/10/03 00:14:41 tv Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2006/01/06 15:10:03 wiz Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 WINE_BUILDLINK3_MK:=	${WINE_BUILDLINK3_MK}+
@@ -11,8 +11,7 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nwine}
 BUILDLINK_PACKAGES+=	wine
 
 .if !empty(WINE_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.wine+=	wine>=20040309
-BUILDLINK_RECOMMENDED.wine+=	wine>=20040505nb1
+BUILDLINK_DEPENDS.wine+=	wine>=0.9nb1
 BUILDLINK_PKGSRCDIR.wine?=	../../emulators/wine
 .endif	# WINE_BUILDLINK3_MK
 
diff --git a/finance/kmymoney2/Makefile b/finance/kmymoney2/Makefile
index e79b6af339e..b03a1c955a3 100644
--- a/finance/kmymoney2/Makefile
+++ b/finance/kmymoney2/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.22 2005/10/09 12:33:58 markd Exp $
+# $NetBSD: Makefile,v 1.23 2006/01/06 15:10:03 wiz Exp $
 
 DISTNAME=	kmymoney2-0.8
+PKGREVISION=	1
 CATEGORIES=	finance kde
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=kmymoney2/}
 EXTRACT_SUFX=	.tar.bz2
diff --git a/games/boson/Makefile b/games/boson/Makefile
index 19b8545b19f..ac004151083 100644
--- a/games/boson/Makefile
+++ b/games/boson/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.14 2005/12/11 09:40:40 wiz Exp $
+# $NetBSD: Makefile,v 1.15 2006/01/06 15:10:03 wiz Exp $
 #
 
 DISTNAME=		boson-all-0.8
 PKGNAME=		${DISTNAME:S/-all//}
-PKGREVISION=		6
+PKGREVISION=		7
 CATEGORIES=		games
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=boson/}
 EXTRACT_SUFX=		.tar.bz2
diff --git a/games/kdegames3/Makefile b/games/kdegames3/Makefile
index b05cce69a18..11b8b8e54c8 100644
--- a/games/kdegames3/Makefile
+++ b/games/kdegames3/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.33 2005/10/13 13:19:50 markd Exp $
+# $NetBSD: Makefile,v 1.34 2006/01/06 15:10:03 wiz Exp $
 
 DISTNAME=	kdegames-${_KDE_VERSION}
+PKGREVISION=	1
 CATEGORIES=	games
 COMMENT=	Games for the KDE integrated X11 desktop
 
diff --git a/games/kdegames3/buildlink3.mk b/games/kdegames3/buildlink3.mk
index 773336e0498..d9e8822a05e 100644
--- a/games/kdegames3/buildlink3.mk
+++ b/games/kdegames3/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2005/03/23 22:28:09 markd Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2006/01/06 15:10:03 wiz Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 KDEGAMES_BUILDLINK3_MK:=	${KDEGAMES_BUILDLINK3_MK}+
@@ -11,8 +11,7 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nkdegames}
 BUILDLINK_PACKAGES+=	kdegames
 
 .if !empty(KDEGAMES_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.kdegames+=	kdegames>=3.2.0
-BUILDLINK_RECOMMENDED.kdegames?=	kdegames>=3.4.0
+BUILDLINK_DEPENDS.kdegames+=	kdegames>=3.5.0nb1
 BUILDLINK_PKGSRCDIR.kdegames?=	../../games/kdegames3
 .endif	# KDEGAMES_BUILDLINK3_MK
 
diff --git a/games/kdetoys3/Makefile b/games/kdetoys3/Makefile
index ed136d43a44..171e77586ae 100644
--- a/games/kdetoys3/Makefile
+++ b/games/kdetoys3/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.28 2005/04/11 21:45:51 tv Exp $
+# $NetBSD: Makefile,v 1.29 2006/01/06 15:10:03 wiz Exp $
 
 DISTNAME=	kdetoys-${_KDE_VERSION}
+PKGREVISION=	1
 CATEGORIES=	games
 COMMENT=	Toys for the KDE integrated X11 desktop
 
diff --git a/games/knights/Makefile b/games/knights/Makefile
index f979809b6e2..eb0523cbe69 100644
--- a/games/knights/Makefile
+++ b/games/knights/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.21 2005/05/22 20:08:02 jlam Exp $
+# $NetBSD: Makefile,v 1.22 2006/01/06 15:10:03 wiz Exp $
 
 DISTNAME=	knights-0.6
+PKGREVISION=	1
 CATEGORIES=	games kde
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=knights/}
 
diff --git a/graphics/kdegraphics3/Makefile b/graphics/kdegraphics3/Makefile
index e48a393c42a..dc1154ccc4c 100644
--- a/graphics/kdegraphics3/Makefile
+++ b/graphics/kdegraphics3/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.55 2006/01/05 10:20:43 markd Exp $
+# $NetBSD: Makefile,v 1.56 2006/01/06 15:10:03 wiz Exp $
 
 DISTNAME=	kdegraphics-${_KDE_VERSION}
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	graphics
 COMMENT=	Graphics programs for the KDE integrated X11 desktop
 
diff --git a/graphics/kdegraphics3/buildlink3.mk b/graphics/kdegraphics3/buildlink3.mk
index 21b6d493633..fdb848fa867 100644
--- a/graphics/kdegraphics3/buildlink3.mk
+++ b/graphics/kdegraphics3/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2005/03/23 22:26:26 markd Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2006/01/06 15:10:03 wiz Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 KDEGRAPHICS_BUILDLINK3_MK:=	${KDEGRAPHICS_BUILDLINK3_MK}+
@@ -11,8 +11,7 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nkdegraphics}
 BUILDLINK_PACKAGES+=	kdegraphics
 
 .if !empty(KDEGRAPHICS_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.kdegraphics+=	kdegraphics>=3.2.0
-BUILDLINK_RECOMMENDED.kdegraphics?=	kdegraphics>=3.4.0
+BUILDLINK_DEPENDS.kdegraphics+=	kdegraphics>=3.5.0nb2
 BUILDLINK_PKGSRCDIR.kdegraphics?=	../../graphics/kdegraphics3
 .endif	# KDEGRAPHICS_BUILDLINK3_MK
 
diff --git a/graphics/pixieplus/Makefile b/graphics/pixieplus/Makefile
index ca9551fa261..2e297072e8b 100644
--- a/graphics/pixieplus/Makefile
+++ b/graphics/pixieplus/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.18 2005/11/14 08:42:44 markd Exp $
+# $NetBSD: Makefile,v 1.19 2006/01/06 15:10:03 wiz Exp $
 #
 
 DISTNAME=	pixieplus-0.5.4
-PKGREVISION=	8
+PKGREVISION=	9
 CATEGORIES=	graphics
 MASTER_SITES=	http://people.fruitsalad.org/avleeuwen/distfiles/pixieplus/ \
 		http://www.mosfet.org/pixie/
diff --git a/graphics/showimg/Makefile b/graphics/showimg/Makefile
index 5a66fcc7b16..75cf9138231 100644
--- a/graphics/showimg/Makefile
+++ b/graphics/showimg/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.8 2005/08/10 20:56:18 jlam Exp $
+# $NetBSD: Makefile,v 1.9 2006/01/06 15:10:03 wiz Exp $
 #
 
 DISTNAME=	showimg-0.9.4-1
 PKGNAME=	showimg-0.9.4.1
+PKGREVISION=	1
 CATEGORIES=	kde graphics x11
 MASTER_SITES=	http://www.jalix.org/projects/showimg/download/0.9.4-1/
 EXTRACT_SUFX=	.tar.bz2
diff --git a/inputmethod/imhangul_status_applet/Makefile b/inputmethod/imhangul_status_applet/Makefile
index 341771b732a..c3344fbc9cd 100644
--- a/inputmethod/imhangul_status_applet/Makefile
+++ b/inputmethod/imhangul_status_applet/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.14 2005/12/31 12:32:38 wiz Exp $
+# $NetBSD: Makefile,v 1.15 2006/01/06 15:10:03 wiz Exp $
 #
 
 DISTNAME=		imhangul_status_applet-0.3
-PKGREVISION=		1
+PKGREVISION=		2
 CATEGORIES=		korean inputmethod
 MASTER_SITES=		http://download.kldp.net/imhangul/imhangul_status_applet/0.3/
 
diff --git a/mail/bogofilter/Makefile b/mail/bogofilter/Makefile
index c44f126bee4..2506e21475d 100644
--- a/mail/bogofilter/Makefile
+++ b/mail/bogofilter/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.33 2005/12/29 06:21:47 jlam Exp $
+# $NetBSD: Makefile,v 1.34 2006/01/06 15:10:03 wiz Exp $
 
 DISTNAME=	bogofilter-0.96.6
+PKGREVISION=	1
 CATEGORIES=	mail
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=bogofilter/}
 EXTRACT_SUFX=	.tar.bz2
diff --git a/mail/cyrus-imapd/Makefile b/mail/cyrus-imapd/Makefile
index b0477c3686b..d3bdeb924d6 100644
--- a/mail/cyrus-imapd/Makefile
+++ b/mail/cyrus-imapd/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.59 2005/12/29 06:21:48 jlam Exp $
+# $NetBSD: Makefile,v 1.60 2006/01/06 15:10:04 wiz Exp $
 
 DISTNAME=	cyrus-imapd-2.2.12
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	mail
 MASTER_SITES=	ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/ \
 		ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/OLD-VERSIONS/imap/
diff --git a/mail/etpan/Makefile b/mail/etpan/Makefile
index 42c3b744c16..a1040eb0b35 100644
--- a/mail/etpan/Makefile
+++ b/mail/etpan/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.1.1.1 2005/08/06 05:32:19 xtraeme Exp $
+# $NetBSD: Makefile,v 1.2 2006/01/06 15:10:04 wiz Exp $
 #
 
 DISTNAME=	etpan-ng-0.6.1
 PKGNAME=	${DISTNAME:S/-ng//}
+PKGREVISION=	1
 CATEGORIES=	mail
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=libetpan/}
 
diff --git a/mail/evolution-data-server/Makefile b/mail/evolution-data-server/Makefile
index 220af3423d6..a99928d6b7c 100644
--- a/mail/evolution-data-server/Makefile
+++ b/mail/evolution-data-server/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.30 2006/01/01 23:56:01 wiz Exp $
+# $NetBSD: Makefile,v 1.31 2006/01/06 15:10:04 wiz Exp $
 #
 
 DISTNAME=	evolution-data-server-1.4.2.1
+PKGREVISION=	1
 CATEGORIES=	mail gnome
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/evolution-data-server/1.4/}
 EXTRACT_SUFX=	.tar.bz2
diff --git a/mail/evolution-data-server/buildlink3.mk b/mail/evolution-data-server/buildlink3.mk
index 7b154d5fb4b..5b1ef555f0c 100644
--- a/mail/evolution-data-server/buildlink3.mk
+++ b/mail/evolution-data-server/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.11 2005/12/31 12:32:38 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.12 2006/01/06 15:10:04 wiz Exp $
 
 BUILDLINK_DEPTH:=			${BUILDLINK_DEPTH}+
 EVOLUTION_DATA_SERVER_BUILDLINK3_MK:=	${EVOLUTION_DATA_SERVER_BUILDLINK3_MK}+
@@ -11,8 +11,7 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nevolution-data-server}
 BUILDLINK_PACKAGES+=	evolution-data-server
 
 .if !empty(EVOLUTION_DATA_SERVER_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.evolution-data-server+=	evolution-data-server>=1.2.0
-BUILDLINK_RECOMMENDED.evolution-data-server?=	evolution-data-server>=1.4.1nb1
+BUILDLINK_DEPENDS.evolution-data-server+=	evolution-data-server>=1.4.2.1nb1
 BUILDLINK_PKGSRCDIR.evolution-data-server?=	../../mail/evolution-data-server
 .endif	# EVOLUTION_DATA_SERVER_BUILDLINK3_MK
 
diff --git a/mail/evolution-exchange/Makefile b/mail/evolution-exchange/Makefile
index 97480e19bb9..b8d0e710ffd 100644
--- a/mail/evolution-exchange/Makefile
+++ b/mail/evolution-exchange/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.2 2005/12/31 12:32:38 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2006/01/06 15:10:04 wiz Exp $
 #
 
 DISTNAME=	evolution-exchange-2.4.1
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	mail gnome
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/evolution-exchange/2.4/}
 EXTRACT_SUFX=	.tar.bz2
diff --git a/mail/evolution/Makefile b/mail/evolution/Makefile
index 9597b978919..8bea1745ef5 100644
--- a/mail/evolution/Makefile
+++ b/mail/evolution/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.96 2005/12/31 12:32:38 wiz Exp $
+# $NetBSD: Makefile,v 1.97 2006/01/06 15:10:04 wiz Exp $
 
 DISTNAME=		evolution-2.4.1
-PKGREVISION=		2
+PKGREVISION=		3
 CATEGORIES=		mail time gnome
 MASTER_SITES=		${MASTER_SITE_GNOME:=sources/evolution/2.4/}
 EXTRACT_SUFX=		.tar.bz2
diff --git a/mail/evolution/buildlink3.mk b/mail/evolution/buildlink3.mk
index f4ab1128580..53a3f9dbbb7 100644
--- a/mail/evolution/buildlink3.mk
+++ b/mail/evolution/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2005/12/31 12:32:38 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2006/01/06 15:10:04 wiz Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 EVOLUTION_BUILDLINK3_MK:=	${EVOLUTION_BUILDLINK3_MK}+
@@ -11,8 +11,7 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nevolution}
 BUILDLINK_PACKAGES+=	evolution
 
 .if !empty(EVOLUTION_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.evolution+=	evolution>=2.4.0
-BUILDLINK_RECOMMENDED.evolution?=	evolution>=2.4.1nb2
+BUILDLINK_DEPENDS.evolution+=	evolution>=2.4.1nb3
 BUILDLINK_PKGSRCDIR.evolution?=	../../mail/evolution
 .endif	# EVOLUTION_BUILDLINK3_MK
 
diff --git a/mail/evolution14/Makefile b/mail/evolution14/Makefile
index 340fadc0f63..322b1d68050 100644
--- a/mail/evolution14/Makefile
+++ b/mail/evolution14/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.16 2005/12/31 12:32:38 wiz Exp $
+# $NetBSD: Makefile,v 1.17 2006/01/06 15:10:05 wiz Exp $
 
 DISTNAME=		evolution-1.4.6
 PKGNAME=		${DISTNAME:S/evolution/evolution14/}
-PKGREVISION=		5
+PKGREVISION=		6
 CATEGORIES=		mail time gnome
 MASTER_SITES=		ftp://ftp.ximian.com/pub/source/evolution/ \
 			${MASTER_SITE_GNOME:=sources/evolution/1.4/}
diff --git a/mail/isync/Makefile b/mail/isync/Makefile
index ab9f7b88c4d..8f760595854 100644
--- a/mail/isync/Makefile
+++ b/mail/isync/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.14 2005/12/20 16:01:55 tonio Exp $
+# $NetBSD: Makefile,v 1.15 2006/01/06 15:10:05 wiz Exp $
 #
 
 DISTNAME=	isync-1.0.1
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	mail net
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=isync/}
 
diff --git a/mail/libetpan/Makefile b/mail/libetpan/Makefile
index db93898139f..2a99a230de3 100644
--- a/mail/libetpan/Makefile
+++ b/mail/libetpan/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.6 2005/12/05 20:50:33 rillig Exp $
+# $NetBSD: Makefile,v 1.7 2006/01/06 15:10:05 wiz Exp $
 #
 
 DISTNAME=		libetpan-0.38
+PKGREVISION=		1
 CATEGORIES=		mail
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=libetpan/}
 
diff --git a/mail/libetpan/buildlink3.mk b/mail/libetpan/buildlink3.mk
index 0893d6c0950..da57b691c81 100644
--- a/mail/libetpan/buildlink3.mk
+++ b/mail/libetpan/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2005/08/05 20:55:19 xtraeme Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2006/01/06 15:10:05 wiz Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 LIBETPAN_BUILDLINK3_MK:=	${LIBETPAN_BUILDLINK3_MK}+
@@ -11,7 +11,7 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibetpan}
 BUILDLINK_PACKAGES+=	libetpan
 
 .if !empty(LIBETPAN_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libetpan+=	libetpan>=0.38
+BUILDLINK_DEPENDS.libetpan+=	libetpan>=0.38nb1
 BUILDLINK_PKGSRCDIR.libetpan?=	../../mail/libetpan
 .endif	# LIBETPAN_BUILDLINK3_MK
 
diff --git a/mail/postgrey/Makefile b/mail/postgrey/Makefile
index f2c40eb90ba..ebaebdaab0e 100644
--- a/mail/postgrey/Makefile
+++ b/mail/postgrey/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.11 2005/12/29 06:21:52 jlam Exp $
+# $NetBSD: Makefile,v 1.12 2006/01/06 15:10:05 wiz Exp $
 #
 
 DISTNAME=	postgrey-1.21
+PKGREVISION=	1
 CATEGORIES=	mail
 MASTER_SITES=	http://isg.ee.ethz.ch/tools/postgrey/pub/ \
 		http://isg.ee.ethz.ch/tools/postgrey/pub/old/
diff --git a/mail/prayer/Makefile b/mail/prayer/Makefile
index 2aac9109e29..e6cd2ce8863 100644
--- a/mail/prayer/Makefile
+++ b/mail/prayer/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.24 2005/12/29 06:21:52 jlam Exp $
+# $NetBSD: Makefile,v 1.25 2006/01/06 15:10:05 wiz Exp $
 #
 
 DISTNAME=	prayer-1.0.12
+PKGREVISION=	1
 CATEGORIES=	mail www
 MASTER_SITES=	ftp://ftp.csx.cam.ac.uk/pub/software/email/prayer/
 
diff --git a/mail/spamprobe/Makefile b/mail/spamprobe/Makefile
index 481132b8560..48c6d1d32c3 100644
--- a/mail/spamprobe/Makefile
+++ b/mail/spamprobe/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.14 2005/06/29 00:06:58 hubertf Exp $
+# $NetBSD: Makefile,v 1.15 2006/01/06 15:10:05 wiz Exp $
 
 DISTNAME=	spamprobe-1.2a
+PKGREVISION=	1
 CATEGORIES=	mail
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=spamprobe/}
 
diff --git a/meta-pkgs/gnome-base/Makefile b/meta-pkgs/gnome-base/Makefile
index 77cd905dbeb..5b19fae652f 100644
--- a/meta-pkgs/gnome-base/Makefile
+++ b/meta-pkgs/gnome-base/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.25 2005/12/31 12:32:39 wiz Exp $
+# $NetBSD: Makefile,v 1.26 2006/01/06 15:10:05 wiz Exp $
 
 DISTNAME=	gnome-base-2.12.1
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	meta-pkgs x11 gnome
 MASTER_SITES=	# empty
 DISTFILES=	# empty
diff --git a/meta-pkgs/gnome/Makefile b/meta-pkgs/gnome/Makefile
index 14089a5b2d5..bf8eed0fad7 100644
--- a/meta-pkgs/gnome/Makefile
+++ b/meta-pkgs/gnome/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.53 2005/12/31 12:32:39 wiz Exp $
+# $NetBSD: Makefile,v 1.54 2006/01/06 15:10:05 wiz Exp $
 
 DISTNAME=	gnome-2.12.1
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	meta-pkgs x11 gnome
 MASTER_SITES=	# empty
 DISTFILES=	# empty
diff --git a/meta-pkgs/kde3/Makefile b/meta-pkgs/kde3/Makefile
index 80e560969d0..ccaaaf5246a 100644
--- a/meta-pkgs/kde3/Makefile
+++ b/meta-pkgs/kde3/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.46 2005/12/11 10:40:10 markd Exp $
+# $NetBSD: Makefile,v 1.47 2006/01/06 15:10:05 wiz Exp $
 
 DISTNAME=	kde-3.5.0
+PKGREVISION=	1
 CATEGORIES=	meta-pkgs x11 kde
 MASTER_SITES=	# empty
 DISTFILES=	# empty
diff --git a/meta-pkgs/php4-extensions/Makefile b/meta-pkgs/php4-extensions/Makefile
index 9c8adfdf5f1..abb9f42ec6f 100644
--- a/meta-pkgs/php4-extensions/Makefile
+++ b/meta-pkgs/php4-extensions/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.14 2005/11/03 02:00:26 tv Exp $
+# $NetBSD: Makefile,v 1.15 2006/01/06 15:10:05 wiz Exp $
 
 DISTNAME=	php-extensions-4.4
-PKGREVISION=	3
+PKGREVISION=	4
 CATEGORIES=	meta-pkgs www php4
 MASTER_SITES=	# empty
 DISTFILES=	# empty
diff --git a/meta-pkgs/php5-extensions/Makefile b/meta-pkgs/php5-extensions/Makefile
index 00112943e27..fa877e3008f 100644
--- a/meta-pkgs/php5-extensions/Makefile
+++ b/meta-pkgs/php5-extensions/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.14 2005/12/03 19:05:38 jdolecek Exp $
+# $NetBSD: Makefile,v 1.15 2006/01/06 15:10:05 wiz Exp $
 
 DISTNAME=	php-extensions-5.1
 PKGREVISION=	# empty
+PKGREVISION=	1
 CATEGORIES=	meta-pkgs www php5
 MASTER_SITES=	# empty
 DISTFILES=	# empty
diff --git a/misc/gnome2-utils/Makefile b/misc/gnome2-utils/Makefile
index 0283dcc2e61..fb1ab9dc98f 100644
--- a/misc/gnome2-utils/Makefile
+++ b/misc/gnome2-utils/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.46 2005/12/31 12:32:39 wiz Exp $
+# $NetBSD: Makefile,v 1.47 2006/01/06 15:10:05 wiz Exp $
 #
 
 DISTNAME=		gnome-utils-2.12.1
-PKGREVISION=		1
+PKGREVISION=		2
 CATEGORIES=		misc gnome
 MASTER_SITES=		${MASTER_SITE_GNOME:=sources/gnome-utils/2.12/}
 EXTRACT_SUFX=		.tar.bz2
diff --git a/misc/kdeaccessibility3/Makefile b/misc/kdeaccessibility3/Makefile
index 80a9f1c8cbd..5aeb7fc1459 100644
--- a/misc/kdeaccessibility3/Makefile
+++ b/misc/kdeaccessibility3/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.10 2005/08/10 20:56:20 jlam Exp $
+# $NetBSD: Makefile,v 1.11 2006/01/06 15:10:05 wiz Exp $
 
 DISTNAME=	kdeaccessibility-${_KDE_VERSION}
+PKGREVISION=	1
 CATEGORIES=	misc
 COMMENT=	Accessibility support for the KDE integrated X11 desktop
 
diff --git a/misc/kdeaddons3/Makefile b/misc/kdeaddons3/Makefile
index 3c1fe2774cd..52a007fd7c7 100644
--- a/misc/kdeaddons3/Makefile
+++ b/misc/kdeaddons3/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.35 2005/12/11 11:26:25 markd Exp $
+# $NetBSD: Makefile,v 1.36 2006/01/06 15:10:05 wiz Exp $
 
 DISTNAME=	kdeaddons-${_KDE_VERSION}
+PKGREVISION=	1
 CATEGORIES=	misc
 COMMENT=	Add ons for the KDE integrated X11 desktop
 
diff --git a/misc/kdeadmin3/Makefile b/misc/kdeadmin3/Makefile
index 0735579a15f..e1f210af382 100644
--- a/misc/kdeadmin3/Makefile
+++ b/misc/kdeadmin3/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.28 2005/04/11 21:46:35 tv Exp $
+# $NetBSD: Makefile,v 1.29 2006/01/06 15:10:05 wiz Exp $
 
 DISTNAME=	kdeadmin-${_KDE_VERSION}
+PKGREVISION=	1
 CATEGORIES=	misc
 COMMENT=	System administration tools for the KDE integrated X11 desktop
 
diff --git a/misc/kdeartwork3/Makefile b/misc/kdeartwork3/Makefile
index 0f164da9386..6d553ef9bc5 100644
--- a/misc/kdeartwork3/Makefile
+++ b/misc/kdeartwork3/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.29 2005/07/30 11:42:22 markd Exp $
+# $NetBSD: Makefile,v 1.30 2006/01/06 15:10:06 wiz Exp $
 
 DISTNAME=	kdeartwork-${_KDE_VERSION}
+PKGREVISION=	1
 CATEGORIES=	misc
 COMMENT=	Artwork for the KDE integrated X11 desktop
 
diff --git a/misc/kdeedu3/Makefile b/misc/kdeedu3/Makefile
index 19a2848def8..87f8a43eaee 100644
--- a/misc/kdeedu3/Makefile
+++ b/misc/kdeedu3/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.35 2005/12/17 14:51:23 joerg Exp $
+# $NetBSD: Makefile,v 1.36 2006/01/06 15:10:06 wiz Exp $
 
 DISTNAME=	kdeedu-${_KDE_VERSION}
+PKGREVISION=	1
 CATEGORIES=	misc
 COMMENT=	Edu{tainment,cation} tools for the KDE integrated X11 desktop
 
diff --git a/misc/kdepim3/Makefile b/misc/kdepim3/Makefile
index c2c494c7cb3..8431ebc4702 100644
--- a/misc/kdepim3/Makefile
+++ b/misc/kdepim3/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.53 2005/11/02 20:53:38 rillig Exp $
+# $NetBSD: Makefile,v 1.54 2006/01/06 15:10:06 wiz Exp $
 
 DISTNAME=	kdepim-${_KDE_VERSION}
+PKGREVISION=	1
 CATEGORIES=	misc
 COMMENT=	Personal Information Management tools for the KDE desktop
 
diff --git a/misc/kdepim3/buildlink3.mk b/misc/kdepim3/buildlink3.mk
index eecb4336f4d..5426781acd2 100644
--- a/misc/kdepim3/buildlink3.mk
+++ b/misc/kdepim3/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.11 2005/05/11 22:08:18 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.12 2006/01/06 15:10:06 wiz Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 KDEPIM_BUILDLINK3_MK:=	${KDEPIM_BUILDLINK3_MK}+
@@ -11,8 +11,7 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nkdepim}
 BUILDLINK_PACKAGES+=	kdepim
 
 .if !empty(KDEPIM_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.kdepim+=	kdepim>=3.2.2
-BUILDLINK_RECOMMENDED.kdepim+=	kdepim>=3.4.0
+BUILDLINK_DEPENDS.kdepim+=	kdepim>=3.5.0nb1
 BUILDLINK_PKGSRCDIR.kdepim?=	../../misc/kdepim3
 .endif	# KDEPIM_BUILDLINK3_MK
 
diff --git a/misc/kdeutils3/Makefile b/misc/kdeutils3/Makefile
index cc6d740bd2a..eceb033c3cb 100644
--- a/misc/kdeutils3/Makefile
+++ b/misc/kdeutils3/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.47 2005/12/29 06:21:54 jlam Exp $
+# $NetBSD: Makefile,v 1.48 2006/01/06 15:10:06 wiz Exp $
 
 DISTNAME=	kdeutils-${_KDE_VERSION}
+PKGREVISION=	1
 COMMENT=	Utilities for the KDE integrated X11 desktop
 
 .include "../../meta-pkgs/kde3/Makefile.kde3"
diff --git a/misc/koffice/Makefile b/misc/koffice/Makefile
index 73c7bbc2e64..289672ba54c 100644
--- a/misc/koffice/Makefile
+++ b/misc/koffice/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.71 2006/01/05 10:28:27 markd Exp $
+# $NetBSD: Makefile,v 1.72 2006/01/06 15:10:06 wiz Exp $
 
 DISTNAME=	koffice-1.4.2
-PKGREVISION=	4
+PKGREVISION=	5
 CATEGORIES=	misc kde
 MASTER_SITES=	ftp://ftp.kde.org/pub/kde/stable/koffice-1.4.2/src/ \
 		ftp://ftp.us.kde.org/pub/kde/stable/koffice-1.4.2/src/ \
diff --git a/misc/koffice/buildlink3.mk b/misc/koffice/buildlink3.mk
index 61dd5e03582..19899180c9b 100644
--- a/misc/koffice/buildlink3.mk
+++ b/misc/koffice/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2005/12/31 12:32:39 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2006/01/06 15:10:06 wiz Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 KOFFICE_BUILDLINK3_MK:=	${KOFFICE_BUILDLINK3_MK}+
@@ -11,8 +11,7 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nkoffice}
 BUILDLINK_PACKAGES+=	koffice
 
 .if !empty(KOFFICE_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.koffice?=             koffice>=1.4.2nb1
-BUILDLINK_RECOMMENDED.koffice?=	koffice>=1.4.2nb3
+BUILDLINK_DEPENDS.koffice?=	koffice>=1.4.2nb5
 BUILDLINK_PKGSRCDIR.koffice?=	../../misc/koffice
 .endif	# KOFFICE_BUILDLINK3_MK
 
diff --git a/multimedia/kdemultimedia3/Makefile b/multimedia/kdemultimedia3/Makefile
index a79aad4a9ff..532786d01f9 100644
--- a/multimedia/kdemultimedia3/Makefile
+++ b/multimedia/kdemultimedia3/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.35 2006/01/04 22:35:42 wiz Exp $
+# $NetBSD: Makefile,v 1.36 2006/01/06 15:10:06 wiz Exp $
 
 DISTNAME=	kdemultimedia-${_KDE_VERSION}
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	multimedia
 COMMENT=	Multimedia tools for the KDE integrated X11 desktop
 
diff --git a/multimedia/kdemultimedia3/buildlink3.mk b/multimedia/kdemultimedia3/buildlink3.mk
index cb10bd2e6f0..354073ea93b 100644
--- a/multimedia/kdemultimedia3/buildlink3.mk
+++ b/multimedia/kdemultimedia3/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.7 2005/12/11 11:20:51 markd Exp $
+# $NetBSD: buildlink3.mk,v 1.8 2006/01/06 15:10:06 wiz Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 KDEMULTIMEDIA_BUILDLINK3_MK:=	${KDEMULTIMEDIA_BUILDLINK3_MK}+
@@ -11,8 +11,7 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nkdemultimedia}
 BUILDLINK_PACKAGES+=	kdemultimedia
 
 .if !empty(KDEMULTIMEDIA_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.kdemultimedia+=	kdemultimedia>=3.2.2
-BUILDLINK_RECOMMENDED.kdemultimedia+=	kdemultimedia>=3.5.0
+BUILDLINK_DEPENDS.kdemultimedia+=	kdemultimedia>=3.5.0nb2
 BUILDLINK_PKGSRCDIR.kdemultimedia?=	../../multimedia/kdemultimedia3
 .endif	# KDEMULTIMEDIA_BUILDLINK3_MK
 
diff --git a/net/dc_gui2/Makefile b/net/dc_gui2/Makefile
index 866d978ad24..9430b7956a3 100644
--- a/net/dc_gui2/Makefile
+++ b/net/dc_gui2/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.24 2005/12/31 12:32:43 wiz Exp $
+# $NetBSD: Makefile,v 1.25 2006/01/06 15:10:06 wiz Exp $
 #
 
 DISTNAME=	dc_gui2-0.75
-PKGREVISION=	10
+PKGREVISION=	11
 CATEGORIES=	net
 MASTER_SITES=	http://www.ac2i.tzo.com/dctc/ \
 		http://brainz.servebeer.com/dctc/
diff --git a/net/dctc/Makefile b/net/dctc/Makefile
index 509e6c709ca..8ab639357e5 100644
--- a/net/dctc/Makefile
+++ b/net/dctc/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.27 2005/07/16 01:19:15 jlam Exp $
+# $NetBSD: Makefile,v 1.28 2006/01/06 15:10:06 wiz Exp $
 #
 
 DISTNAME=	dctc-0.85.4
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	net
 MASTER_SITES=	http://www.ac2i.tzo.com/dctc/ \
 		http://brainz.servebeer.com/dctc/
diff --git a/net/gift-openft/Makefile b/net/gift-openft/Makefile
index 983f8683e4f..18a6adda957 100644
--- a/net/gift-openft/Makefile
+++ b/net/gift-openft/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.7 2005/04/11 21:46:47 tv Exp $
+# $NetBSD: Makefile,v 1.8 2006/01/06 15:10:06 wiz Exp $
 #
 
 DISTNAME=	gift-openft-0.2.1.3
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	net
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=gift/}
 
diff --git a/net/gnome-netstatus/Makefile b/net/gnome-netstatus/Makefile
index 13c8570a5f3..641f481e5fb 100644
--- a/net/gnome-netstatus/Makefile
+++ b/net/gnome-netstatus/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.14 2005/12/31 12:32:43 wiz Exp $
+# $NetBSD: Makefile,v 1.15 2006/01/06 15:10:06 wiz Exp $
 #
 
 DISTNAME=	gnome-netstatus-2.12.0
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	net gnome
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/gnome-netstatus/2.12/}
 EXTRACT_SUFX=	.tar.bz2
diff --git a/net/hobbitmon/Makefile b/net/hobbitmon/Makefile
index e081c673fa4..70f4ebb5b09 100644
--- a/net/hobbitmon/Makefile
+++ b/net/hobbitmon/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.9 2005/12/29 06:21:59 jlam Exp $
+# $NetBSD: Makefile,v 1.10 2006/01/06 15:10:06 wiz Exp $
 #
 
 DISTNAME=	hobbit-4.0-beta6
 PKGNAME=	hobbit-4.0b6
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	net
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=hobbitmon/}
 
diff --git a/net/ispman/Makefile b/net/ispman/Makefile
index e3c21db1111..8ff16a960ea 100644
--- a/net/ispman/Makefile
+++ b/net/ispman/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.16 2005/07/16 01:19:16 jlam Exp $
+# $NetBSD: Makefile,v 1.17 2006/01/06 15:10:06 wiz Exp $
 #
 
 DISTNAME=	ispman-0.5
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	net
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=ispman/}
 
diff --git a/net/kdenetwork3/Makefile b/net/kdenetwork3/Makefile
index 1a19e53ce0e..f75cfe80ac1 100644
--- a/net/kdenetwork3/Makefile
+++ b/net/kdenetwork3/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.45 2005/10/13 12:48:33 markd Exp $
+# $NetBSD: Makefile,v 1.46 2006/01/06 15:10:06 wiz Exp $
 
 DISTNAME=	kdenetwork-${_KDE_VERSION}
+PKGREVISION=	1
 CATEGORIES=	net
 COMMENT=	Network modules for the KDE integrated X11 desktop
 
diff --git a/net/kdenetwork3/buildlink3.mk b/net/kdenetwork3/buildlink3.mk
index dfa2ea7e29a..2d5985277bc 100644
--- a/net/kdenetwork3/buildlink3.mk
+++ b/net/kdenetwork3/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2005/03/23 21:56:29 markd Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2006/01/06 15:10:06 wiz Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 KDENETWORK_BUILDLINK3_MK:=	${KDENETWORK_BUILDLINK3_MK}+
@@ -11,8 +11,7 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nkdenetwork}
 BUILDLINK_PACKAGES+=	kdenetwork
 
 .if !empty(KDENETWORK_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.kdenetwork+=	kdenetwork>=3.2.0
-BUILDLINK_RECOMMENDED.kdenetwork?=	kdenetwork>=3.4.0
+BUILDLINK_DEPENDS.kdenetwork+=	kdenetwork>=3.5.0nb1
 BUILDLINK_PKGSRCDIR.kdenetwork?=	../../net/kdenetwork3
 .endif	# KDENETWORK_BUILDLINK3_MK
 
diff --git a/net/kftpgrabber/Makefile b/net/kftpgrabber/Makefile
index 8684fa15a38..4d8f00f9386 100644
--- a/net/kftpgrabber/Makefile
+++ b/net/kftpgrabber/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.5 2005/12/05 20:50:46 rillig Exp $
+# $NetBSD: Makefile,v 1.6 2006/01/06 15:10:07 wiz Exp $
 
 DISTNAME=	kftpgrabber-0.6.0
+PKGREVISION=	1
 CATEGORIES=	net kde
 MASTER_SITES=	http://kftpgrabber.sourceforge.net/releases/
 EXTRACT_SUFX=	.tar.bz2
diff --git a/net/mldonkey-gui/Makefile b/net/mldonkey-gui/Makefile
index cea06b57801..1fba62160dc 100644
--- a/net/mldonkey-gui/Makefile
+++ b/net/mldonkey-gui/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.10 2005/12/31 12:32:44 wiz Exp $
+# $NetBSD: Makefile,v 1.11 2006/01/06 15:10:07 wiz Exp $
 #
 
 .include "../../net/mldonkey/Makefile.common"
 
 PKGNAME=		${DISTNAME:S/mldonkey/mldonkey-gui/}
-PKGREVISION=		1
+PKGREVISION=		2
 COMMENT+=		(GTK interface)
 
 DEPENDS+=		mldonkey-[0-9]*:../../net/mldonkey
diff --git a/net/netatalk/Makefile b/net/netatalk/Makefile
index 3419a2b4e09..8bb12e55b51 100644
--- a/net/netatalk/Makefile
+++ b/net/netatalk/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.47 2005/12/29 06:22:00 jlam Exp $
+# $NetBSD: Makefile,v 1.48 2006/01/06 15:10:07 wiz Exp $
 
 DISTNAME=	netatalk-2.0.3
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	net print
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=netatalk/}
 EXTRACT_SUFX=	.tar.bz2
diff --git a/net/netatalk/buildlink3.mk b/net/netatalk/buildlink3.mk
index 921e53ddd7d..461a7fc8bfd 100644
--- a/net/netatalk/buildlink3.mk
+++ b/net/netatalk/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.6 2004/11/26 20:59:08 markd Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2006/01/06 15:10:07 wiz Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 NETATALK_BUILDLINK3_MK:=	${NETATALK_BUILDLINK3_MK}+
@@ -11,7 +11,7 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nnetatalk}
 BUILDLINK_PACKAGES+=	netatalk
 
 .if !empty(NETATALK_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.netatalk+=	netatalk>=2.0.1
+BUILDLINK_DEPENDS.netatalk+=	netatalk>=2.0.3nb2
 BUILDLINK_PKGSRCDIR.netatalk?=	../../net/netatalk
 BUILDLINK_DEPMETHOD.netatalk?=	build
 .endif	# NETATALK_BUILDLINK3_MK
diff --git a/net/tsclient/Makefile b/net/tsclient/Makefile
index e6a7956b6a4..c090b7a8668 100644
--- a/net/tsclient/Makefile
+++ b/net/tsclient/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.26 2005/12/31 12:32:44 wiz Exp $
+# $NetBSD: Makefile,v 1.27 2006/01/06 15:10:07 wiz Exp $
 #
 
 DISTNAME=		tsclient-0.132
-PKGREVISION=		10
+PKGREVISION=		11
 CATEGORIES=		net
 MASTER_SITES=		http://www.gnomepro.com/tsclient/
 
diff --git a/security/amavisd-new/Makefile b/security/amavisd-new/Makefile
index 4c7d3d00859..268a99cbecc 100644
--- a/security/amavisd-new/Makefile
+++ b/security/amavisd-new/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.18 2005/12/29 06:22:09 jlam Exp $
+# $NetBSD: Makefile,v 1.19 2006/01/06 15:10:07 wiz Exp $
 
 DISTNAME=	amavisd-new-${VERSION}${PATCHLEVEL}
 PKGNAME=	amavisd-new-${VERSION}${PATCHLEVEL:S/-//}
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	security mail
 MASTER_SITES=	http://www.ijs.si/software/amavisd/ \
 		http://mirrors.catpipe.net/amavisd-new/ \
diff --git a/security/dirmngr/Makefile b/security/dirmngr/Makefile
index 06486198f12..60a0d05278f 100644
--- a/security/dirmngr/Makefile
+++ b/security/dirmngr/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.15 2006/01/06 10:21:33 shannonjr Exp $
+# $NetBSD: Makefile,v 1.16 2006/01/06 15:10:07 wiz Exp $
 #
 
 DISTNAME=		dirmngr-0.9.3
-#PKGREVISION=		1
+PKGREVISION=		1
 CATEGORIES=		security
 MASTER_SITES=		ftp://ftp.gnupg.org/gcrypt/alpha/dirmngr/
 DISTFILES=		${DISTNAME}${EXTRACT_SUFX}
diff --git a/security/dirmngr/buildlink3.mk b/security/dirmngr/buildlink3.mk
index 2af2a510184..bc105059ee3 100644
--- a/security/dirmngr/buildlink3.mk
+++ b/security/dirmngr/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2005/04/23 12:28:04 shannonjr Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2006/01/06 15:10:07 wiz Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 DIRMNGR_BUILDLINK3_MK:=	${DIRMNGR_BUILDLINK3_MK}+
@@ -11,7 +11,7 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ndirmngr}
 BUILDLINK_PACKAGES+=	dirmngr
 
 .if !empty(DIRMNGR_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.dirmngr+=	dirmngr>=0.9.1
+BUILDLINK_DEPENDS.dirmngr+=	dirmngr>=0.9.3nb1
 BUILDLINK_PKGSRCDIR.dirmngr?=	../../security/dirmngr
 .endif	# DIRMNGR_BUILDLINK3_MK
 
diff --git a/security/kssh/Makefile b/security/kssh/Makefile
index 5ce1152947d..117a5430585 100644
--- a/security/kssh/Makefile
+++ b/security/kssh/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.17 2005/05/22 20:08:30 jlam Exp $
+# $NetBSD: Makefile,v 1.18 2006/01/06 15:10:07 wiz Exp $
 #
 
 DISTNAME=	kssh-0.7
-PKGREVISION=	8
+PKGREVISION=	9
 CATEGORIES=	security kde
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=kssh/}
 
diff --git a/security/pam-ldap/Makefile b/security/pam-ldap/Makefile
index b3b28ce0ad8..17bcbc55f8f 100644
--- a/security/pam-ldap/Makefile
+++ b/security/pam-ldap/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.23 2005/12/29 06:22:11 jlam Exp $
+# $NetBSD: Makefile,v 1.24 2006/01/06 15:10:07 wiz Exp $
 #
 
 DISTNAME=	pam_ldap-180
 PKGNAME=	${DISTNAME:S/_/-/}
+PKGREVISION=	1
 CATEGORIES=	security
 MASTER_SITES=	ftp://ftp.padl.com/pub/
 MASTER_SITES+=	http://www.padl.com/download/
diff --git a/sysutils/adtool/Makefile b/sysutils/adtool/Makefile
index de793c5cd58..7b542f202f2 100644
--- a/sysutils/adtool/Makefile
+++ b/sysutils/adtool/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.5 2005/12/29 06:22:16 jlam Exp $
+# $NetBSD: Makefile,v 1.6 2006/01/06 15:10:07 wiz Exp $
 #
 
 DISTNAME=	adtool-1.2
+PKGREVISION=	1
 CATEGORIES=	sysutils
 MASTER_SITES=	http://c128.org/adtool/
 
diff --git a/sysutils/cfengine2/Makefile b/sysutils/cfengine2/Makefile
index 5a37c5e3355..aac88587327 100644
--- a/sysutils/cfengine2/Makefile
+++ b/sysutils/cfengine2/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.16 2005/12/29 06:22:17 jlam Exp $
+# $NetBSD: Makefile,v 1.17 2006/01/06 15:10:07 wiz Exp $
 #
 
-PKGREVISION=	3
+PKGREVISION=	4
 
 .include "../../sysutils/cfengine2/Makefile.common"
 
diff --git a/time/evolution-webcal/Makefile b/time/evolution-webcal/Makefile
index d7e239fc4d8..3e1c56cdbfd 100644
--- a/time/evolution-webcal/Makefile
+++ b/time/evolution-webcal/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.12 2005/12/31 12:32:46 wiz Exp $
+# $NetBSD: Makefile,v 1.13 2006/01/06 15:10:07 wiz Exp $
 #
 
 DISTNAME=	evolution-webcal-2.4.1
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	time gnome
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/evolution-webcal/2.4/}
 EXTRACT_SUFX=	.tar.bz2
diff --git a/time/gtodo-applet/Makefile b/time/gtodo-applet/Makefile
index fdfc749c5a2..7bf0f2ed9c8 100644
--- a/time/gtodo-applet/Makefile
+++ b/time/gtodo-applet/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.9 2005/12/31 12:32:47 wiz Exp $
+# $NetBSD: Makefile,v 1.10 2006/01/06 15:10:07 wiz Exp $
 #
 
 DISTNAME=	gtodo-applet-0.1
-PKGREVISION=	4
+PKGREVISION=	5
 CATEGORIES=	time gnome
 MASTER_SITES=	http://download.qballcow.nl/programs/gtodo/
 
diff --git a/www/ap-auth-ldap/Makefile b/www/ap-auth-ldap/Makefile
index 1e034c88a39..f1f1980a35f 100644
--- a/www/ap-auth-ldap/Makefile
+++ b/www/ap-auth-ldap/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.22 2005/04/11 21:47:49 tv Exp $
+# $NetBSD: Makefile,v 1.23 2006/01/06 15:10:07 wiz Exp $
 
 DISTNAME=	auth_ldap-1.6.0
-PKGREVISION=	3
+PKGREVISION=	4
 PKGNAME=	ap-auth-ldap-1.6.0
 SVR4_PKGNAME=	apldap
 CATEGORIES=	www databases
diff --git a/www/ap2-auth-ldap/Makefile b/www/ap2-auth-ldap/Makefile
index e0aa8f1cd29..843d23fc79b 100644
--- a/www/ap2-auth-ldap/Makefile
+++ b/www/ap2-auth-ldap/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.7 2005/12/05 23:55:22 rillig Exp $
+# $NetBSD: Makefile,v 1.8 2006/01/06 15:10:07 wiz Exp $
 
 DISTNAME=	mod_auth_ldap3.05
 PKGNAME=	ap2-auth-ldap-3.05
+PKGREVISION=	1
 CATEGORIES=	www databases
 MASTER_SITES=	http://www.muquit.com/muquit/software/mod_auth_ldap/
 
diff --git a/www/kdewebdev3/Makefile b/www/kdewebdev3/Makefile
index bc0158d947a..a8cea22b632 100644
--- a/www/kdewebdev3/Makefile
+++ b/www/kdewebdev3/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.11 2005/10/13 12:44:13 markd Exp $
+# $NetBSD: Makefile,v 1.12 2006/01/06 15:10:07 wiz Exp $
 
 DISTNAME=	kdewebdev-${_KDE_VERSION}
+PKGREVISION=	1
 CATEGORIES=	www
 COMMENT= 	HTML editor and tools suitable for experienced web developers
 
diff --git a/www/sope/Makefile b/www/sope/Makefile
index 0be0f8d65d5..ba88a6187b8 100644
--- a/www/sope/Makefile
+++ b/www/sope/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.4 2005/10/01 00:14:16 rh Exp $
+# $NetBSD: Makefile,v 1.5 2006/01/06 15:10:07 wiz Exp $
 #
 
 DISTNAME=		sope-4.5.4-nevermind-r878
 PKGNAME=		sope-4.5.4
-PKGREVISION=		1
+PKGREVISION=		2
 CATEGORIES=		www gnustep
 MASTER_SITES=		ftp://ftp.opengroupware.org/nightly/sources/releases/ \
 			http://download.opengroupware.org/nightly/sources/releases/
diff --git a/www/sope/buildlink3.mk b/www/sope/buildlink3.mk
index ebc54e307bc..69989bcbf24 100644
--- a/www/sope/buildlink3.mk
+++ b/www/sope/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2005/10/01 00:14:16 rh Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2006/01/06 15:10:08 wiz Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 SOPE_BUILDLINK3_MK:=	${SOPE_BUILDLINK3_MK}+
@@ -11,7 +11,7 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nsope}
 BUILDLINK_PACKAGES+=	sope
 
 .if !empty(SOPE_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.sope+=	sope>=4.5.4nb1
+BUILDLINK_DEPENDS.sope+=	sope>=4.5.4nb2
 BUILDLINK_PKGSRCDIR.sope?=	../../www/sope
 .endif	# SOPE_BUILDLINK3_MK
 
diff --git a/x11/gnome-panel/Makefile b/x11/gnome-panel/Makefile
index 2936009abac..01fa38db82c 100644
--- a/x11/gnome-panel/Makefile
+++ b/x11/gnome-panel/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.59 2005/12/31 12:32:48 wiz Exp $
+# $NetBSD: Makefile,v 1.60 2006/01/06 15:10:08 wiz Exp $
 #
 
 DISTNAME=		gnome-panel-2.12.1
-PKGREVISION=		2
+PKGREVISION=		3
 CATEGORIES=		x11 gnome
 MASTER_SITES=		${MASTER_SITE_GNOME:=sources/gnome-panel/2.12/}
 EXTRACT_SUFX=		.tar.bz2
diff --git a/x11/gnome-panel/buildlink3.mk b/x11/gnome-panel/buildlink3.mk
index 221b6de15da..8a0ebedd08b 100644
--- a/x11/gnome-panel/buildlink3.mk
+++ b/x11/gnome-panel/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.10 2005/12/31 12:32:48 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.11 2006/01/06 15:10:08 wiz Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 GNOME_PANEL_BUILDLINK3_MK:=	${GNOME_PANEL_BUILDLINK3_MK}+
@@ -11,8 +11,7 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ngnome-panel}
 BUILDLINK_PACKAGES+=	gnome-panel
 
 .if !empty(GNOME_PANEL_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.gnome-panel+=		gnome-panel>=2.10.0
-BUILDLINK_RECOMMENDED.gnome-panel?=	gnome-panel>=2.12.1nb2
+BUILDLINK_DEPENDS.gnome-panel+=		gnome-panel>=2.12.1nb3
 BUILDLINK_PKGSRCDIR.gnome-panel?=	../../x11/gnome-panel
 .endif	# GNOME_PANEL_BUILDLINK3_MK
 
diff --git a/x11/gnome2-applets/Makefile b/x11/gnome2-applets/Makefile
index b25f1b8a7a8..bb6a0b68ec4 100644
--- a/x11/gnome2-applets/Makefile
+++ b/x11/gnome2-applets/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.50 2005/12/31 12:32:49 wiz Exp $
+# $NetBSD: Makefile,v 1.51 2006/01/06 15:10:08 wiz Exp $
 #
 
 DISTNAME=		gnome-applets-2.12.0
-PKGREVISION=		2
+PKGREVISION=		3
 CATEGORIES=		x11 gnome
 MASTER_SITES=		${MASTER_SITE_GNOME:=sources/gnome-applets/2.12/}
 EXTRACT_SUFX=		.tar.bz2
diff --git a/x11/kdebase3/Makefile b/x11/kdebase3/Makefile
index 27561c9bd9b..bfff44abdff 100644
--- a/x11/kdebase3/Makefile
+++ b/x11/kdebase3/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.100 2006/01/05 20:57:05 joerg Exp $
+# $NetBSD: Makefile,v 1.101 2006/01/06 15:10:08 wiz Exp $
 
 DISTNAME=	kdebase-${_KDE_VERSION}
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	x11
 COMMENT=	Base modules for the KDE 3 integrated X11 desktop
 
diff --git a/x11/kdebase3/buildlink3.mk b/x11/kdebase3/buildlink3.mk
index 2c4c7759627..d9ad3b3be45 100644
--- a/x11/kdebase3/buildlink3.mk
+++ b/x11/kdebase3/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.12 2005/12/11 11:01:48 markd Exp $
+# $NetBSD: buildlink3.mk,v 1.13 2006/01/06 15:10:08 wiz Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 KDEBASE_BUILDLINK3_MK:=	${KDEBASE_BUILDLINK3_MK}+
@@ -11,8 +11,7 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nkdebase}
 BUILDLINK_PACKAGES+=	kdebase
 
 .if !empty(KDEBASE_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.kdebase+=	kdebase>=3.2.0
-BUILDLINK_RECOMMENDED.kdebase?=	kdebase>=3.5.0
+BUILDLINK_DEPENDS.kdebase+=	kdebase>=3.5.0nb2
 BUILDLINK_PKGSRCDIR.kdebase?=	../../x11/kdebase3
 .endif	# KDEBASE_BUILDLINK3_MK
 
diff --git a/x11/lablgtk2/Makefile b/x11/lablgtk2/Makefile
index 59273074779..7a6a64c67b5 100644
--- a/x11/lablgtk2/Makefile
+++ b/x11/lablgtk2/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.13 2005/12/31 12:32:49 wiz Exp $
+# $NetBSD: Makefile,v 1.14 2006/01/06 15:10:08 wiz Exp $
 #
 
 DISTNAME=	lablgtk-2.6.0
 PKGNAME=	${DISTNAME:S/gtk/gtk2/}
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	x11
 MASTER_SITES=	http://wwwfun.kurims.kyoto-u.ac.jp/soft/olabl/dist/
 
diff --git a/x11/lablgtk2/buildlink3.mk b/x11/lablgtk2/buildlink3.mk
index 8ea8a7f8341..5a7cd69c472 100644
--- a/x11/lablgtk2/buildlink3.mk
+++ b/x11/lablgtk2/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2005/12/31 12:32:49 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2006/01/06 15:10:08 wiz Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 LABLGTK2_BUILDLINK3_MK:=	${LABLGTK2_BUILDLINK3_MK}+
@@ -11,8 +11,7 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlablgtk2}
 BUILDLINK_PACKAGES+=	lablgtk2
 
 .if !empty(LABLGTK2_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.lablgtk2+=	lablgtk2>=2.6.0nb1
-BUILDLINK_RECOMMENDED.lablgtk2?=	lablgtk2>=2.6.0nb2
+BUILDLINK_DEPENDS.lablgtk2+=	lablgtk2>=2.6.0nb3
 BUILDLINK_PKGSRCDIR.lablgtk2?=	../../x11/lablgtk2
 .endif	# LABLGTK2_BUILDLINK3_MK
 
diff --git a/x11/py-gnome2-extras/Makefile b/x11/py-gnome2-extras/Makefile
index a7cbb560b8a..71f96419a92 100644
--- a/x11/py-gnome2-extras/Makefile
+++ b/x11/py-gnome2-extras/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.8 2005/12/31 12:32:49 wiz Exp $
+# $NetBSD: Makefile,v 1.9 2006/01/06 15:10:08 wiz Exp $
 #
 
 DISTNAME=	gnome-python-extras-2.12.0
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME:S/gnome-python/gnome2/}
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	x11 python
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/gnome-python-extras/2.12/}
 EXTRACT_SUFX=	.tar.bz2
diff --git a/x11/py-gnome2-extras/buildlink3.mk b/x11/py-gnome2-extras/buildlink3.mk
index 685f54e1546..7c49f4ecfd6 100644
--- a/x11/py-gnome2-extras/buildlink3.mk
+++ b/x11/py-gnome2-extras/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2005/12/31 12:32:49 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2006/01/06 15:10:08 wiz Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 PY_GNOME2EX_BUILDLINK3_MK:=	${PY_GNOME2EX_BUILDLINK3_MK}+
@@ -13,8 +13,7 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Npygnome2ex}
 BUILDLINK_PACKAGES+=	pygnome2ex
 
 .if !empty(PY_GNOME2EX_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.pygnome2ex+=	${PYPKGPREFIX}-gnome2-extras>=2.12.0nb1
-BUILDLINK_RECOMMENDED.pygnome2ex?=	${PYPKGPREFIX}-gnome2-extras>=2.12.0nb2
+BUILDLINK_DEPENDS.pygnome2ex+=	${PYPKGPREFIX}-gnome2-extras>=2.12.0nb3
 BUILDLINK_PKGSRCDIR.pygnome2ex?=	../../x11/py-gnome2-extras
 .endif	# PY_GNOME2EX_BUILDLINK3_MK