Bump BUILDLINK_RECOMMENDED of textproc/expat to 2.0.0 because

of the shlib major bump.
PKGREVISION++ for the dependencies.

113 files changed, 228 insertions, 184 deletions

diff --git a/www/album/Makefile b/www/album/Makefile
index 37e4937b3d4..60d0565d53e 100644
--- a/www/album/Makefile
+++ b/www/album/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.6 2005/07/23 10:36:18 hira Exp $
+# $NetBSD: Makefile,v 1.7 2006/01/24 07:32:41 wiz Exp $
 #
 
 DISTNAME=	album
 ALBUMREV=	3.07
 PKGNAME=	${DISTNAME}-${ALBUMREV}
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	www
 MASTER_SITES=	http://marginalhacks.com/bin/
 
diff --git a/www/album_themes/Makefile b/www/album_themes/Makefile
index 73d38268315..8dbcf620ace 100644
--- a/www/album_themes/Makefile
+++ b/www/album_themes/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.8 2005/12/05 20:51:10 rillig Exp $
+# $NetBSD: Makefile,v 1.9 2006/01/24 07:32:41 wiz Exp $
 #
 
 DISTNAME=	album_themes
 PKGNAME=	album_themes-20050507
+PKGREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	http://marginalhacks.com/bin/
 
diff --git a/www/amaya/Makefile b/www/amaya/Makefile
index f8ef1d45afd..f5813febe5c 100644
--- a/www/amaya/Makefile
+++ b/www/amaya/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.41 2005/07/14 08:06:57 adam Exp $
+# $NetBSD: Makefile,v 1.42 2006/01/24 07:32:41 wiz Exp $
 
 DISTNAME=	amaya-fullsrc-9.2.1
 PKGNAME=	${DISTNAME:S/-fullsrc//}
+PKGREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	http://www.w3.org/Amaya/Distribution/ \
 		ftp://ftp.w3.org/pub/amaya/ \
diff --git a/www/ap-Embperl/Makefile b/www/ap-Embperl/Makefile
index 3b986eaf952..3db86cc853c 100644
--- a/www/ap-Embperl/Makefile
+++ b/www/ap-Embperl/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.13 2005/08/06 06:19:35 jlam Exp $
+# $NetBSD: Makefile,v 1.14 2006/01/24 07:32:41 wiz Exp $
 #
 
 DISTNAME=       HTML-Embperl-1.2.0
 PKGNAME=        ap-Embperl-1.2.0
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	www perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=HTML/} \
 		ftp://ftp.dev.ecos.de/pub/perl/embperl/
diff --git a/www/ap-access-referer/Makefile b/www/ap-access-referer/Makefile
index 36b55d59fc4..73a5cb498f7 100644
--- a/www/ap-access-referer/Makefile
+++ b/www/ap-access-referer/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.5 2005/04/11 21:47:49 tv Exp $
+# $NetBSD: Makefile,v 1.6 2006/01/24 07:32:41 wiz Exp $
 #
 
 DISTNAME=	mod_access_referer-1.0.2
 PKGNAME=	ap-access-referer-1.0.2
+PKGREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=accessreferer/}
 
diff --git a/www/ap-auth-cookie/Makefile b/www/ap-auth-cookie/Makefile
index 7f0e74f9c23..7e0d531b7e7 100644
--- a/www/ap-auth-cookie/Makefile
+++ b/www/ap-auth-cookie/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.35 2005/12/05 20:51:10 rillig Exp $
+# $NetBSD: Makefile,v 1.36 2006/01/24 07:32:41 wiz Exp $
 #
 # There are a few more mod_auth_cookie's out there doing slightly
 # different things.  This one pkg would be a good place to dump them all in
@@ -6,6 +6,7 @@
 
 DISTNAME=	mod_auth_cookie.c
 PKGNAME=	ap-auth-cookie-1.9
+PKGREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	ftp://ftp.kciLink.com/pub/
 EXTRACT_SUFX=	.gz
diff --git a/www/ap-auth-ldap/Makefile b/www/ap-auth-ldap/Makefile
index 28048b787e8..1c1c7aca7f6 100644
--- a/www/ap-auth-ldap/Makefile
+++ b/www/ap-auth-ldap/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.24 2006/01/15 16:25:41 kleink Exp $
+# $NetBSD: Makefile,v 1.25 2006/01/24 07:32:41 wiz Exp $
 
 DISTNAME=	auth_ldap-1.6.1
 PKGNAME=	ap-auth-ldap-1.6.1
+PKGREVISION=	1
 SVR4_PKGNAME=	apldap
 CATEGORIES=	www databases
 MASTER_SITES=	http://www.rudedog.org/auth_ldap/
diff --git a/www/ap-auth-mysql/Makefile b/www/ap-auth-mysql/Makefile
index 9ee6613235c..e88a97115c7 100644
--- a/www/ap-auth-mysql/Makefile
+++ b/www/ap-auth-mysql/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.9 2006/01/08 18:35:11 xtraeme Exp $
+# $NetBSD: Makefile,v 1.10 2006/01/24 07:32:41 wiz Exp $
 #
 
 DISTNAME=		libapache-mod-auth-mysql_4.3.1
 PKGNAME=		${DISTNAME:S/libapache-mod/ap/:S/_/-/}
-PKGREVISION=		2
+PKGREVISION=		3
 WRKSRC=			${WRKDIR}/${DISTNAME:S/_/-/}
 CATEGORIES=		www databases security
 MASTER_SITES=		${MASTER_SITE_DEBIAN:=pool/main/liba/libapache-mod-auth-mysql/}
diff --git a/www/ap-auth-pam/Makefile b/www/ap-auth-pam/Makefile
index 2603e594e3f..7c22360573e 100644
--- a/www/ap-auth-pam/Makefile
+++ b/www/ap-auth-pam/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.10 2005/04/11 21:47:50 tv Exp $
+# $NetBSD: Makefile,v 1.11 2006/01/24 07:32:41 wiz Exp $
 
 DISTNAME=	mod_auth_pam-1.0a
 PKGNAME=	ap-auth-pam-1.0a
+PKGREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	http://pam.sourceforge.net/mod_auth_pam/dist/
 
diff --git a/www/ap-auth-pgsql/Makefile b/www/ap-auth-pgsql/Makefile
index 19e9c6e6c3a..f31cae94d3c 100644
--- a/www/ap-auth-pgsql/Makefile
+++ b/www/ap-auth-pgsql/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.6 2005/04/11 21:47:50 tv Exp $
+# $NetBSD: Makefile,v 1.7 2006/01/24 07:32:41 wiz Exp $
 
 DISTNAME=	mod_auth_pgsql-0.9.12
 PKGNAME=	ap-auth-pgsql-0.9.12
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	www databases
 MASTER_SITES=	http://www.giuseppetanzilli.it/mod_auth_pgsql/dist/
 
diff --git a/www/ap-auth-postgresql/Makefile b/www/ap-auth-postgresql/Makefile
index 9a932762382..3592b47abfc 100644
--- a/www/ap-auth-postgresql/Makefile
+++ b/www/ap-auth-postgresql/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.24 2005/04/11 21:47:50 tv Exp $
+# $NetBSD: Makefile,v 1.25 2006/01/24 07:32:41 wiz Exp $
 
 DISTNAME=	AuthPG-1.4
 PKGNAME=	ap-auth-postgresql-1.4
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	www databases
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=authpg/}
 
diff --git a/www/ap-auth-radius/Makefile b/www/ap-auth-radius/Makefile
index 4d08aeedbd9..357e2c3a464 100644
--- a/www/ap-auth-radius/Makefile
+++ b/www/ap-auth-radius/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.2 2005/04/11 21:47:50 tv Exp $
+# $NetBSD: Makefile,v 1.3 2006/01/24 07:32:41 wiz Exp $
 #
 
 DISTNAME=	mod_auth_radius-1.5.7
+PKGREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	ftp://ftp.freeradius.org/pub/radius/
 EXTRACT_SUFX=	.tar
diff --git a/www/ap-auth-script/Makefile b/www/ap-auth-script/Makefile
index bd2b0e453ef..2eb0800e533 100644
--- a/www/ap-auth-script/Makefile
+++ b/www/ap-auth-script/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.5 2005/04/11 21:47:50 tv Exp $
+# $NetBSD: Makefile,v 1.6 2006/01/24 07:32:42 wiz Exp $
 #
 
 DISTNAME=	mod_auth_script-alpha1.3
 PKGNAME=	ap-auth-script-1.3
+PKGREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=mod-auth-script/}
 
diff --git a/www/ap-bandwidth/Makefile b/www/ap-bandwidth/Makefile
index 044477a44b7..9bdc8b3c234 100644
--- a/www/ap-bandwidth/Makefile
+++ b/www/ap-bandwidth/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.9 2005/12/05 20:51:10 rillig Exp $
+# $NetBSD: Makefile,v 1.10 2006/01/24 07:32:42 wiz Exp $
 #
 
 DISTNAME=	mod_bandwidth.c
 PKGNAME=	ap-bandwidth-2.0.6
+PKGREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	ftp://ftp.cohprog.com/pub/apache/module/
 EXTRACT_SUFX=	# empty
diff --git a/www/ap-dav/Makefile b/www/ap-dav/Makefile
index e28bb9c98e0..514b64175cb 100644
--- a/www/ap-dav/Makefile
+++ b/www/ap-dav/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.15 2005/12/05 20:51:10 rillig Exp $
+# $NetBSD: Makefile,v 1.16 2006/01/24 07:32:42 wiz Exp $
 
 DISTNAME=		mod_dav-1.0.3-1.3.6
 PKGNAME=		ap-dav-1.0.3
-PKGREVISION=		2
+PKGREVISION=		3
 CATEGORIES=		www
 MASTER_SITES=		http://www.webdav.org/mod_dav/
 
diff --git a/www/ap-dtcl/Makefile b/www/ap-dtcl/Makefile
index 5dbe5f8a492..c179a0a4341 100644
--- a/www/ap-dtcl/Makefile
+++ b/www/ap-dtcl/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.24 2005/12/05 20:51:10 rillig Exp $
+# $NetBSD: Makefile,v 1.25 2006/01/24 07:32:42 wiz Exp $
 
 DISTNAME=	mod_dtcl-0.11.6
 PKGNAME=	ap-dtcl-0.11.2
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	www
 MASTER_SITES=	http://tcl.apache.org/mod_dtcl/download/
 
diff --git a/www/ap-fastcgi/Makefile b/www/ap-fastcgi/Makefile
index 6d0f991db87..1165dd2a34d 100644
--- a/www/ap-fastcgi/Makefile
+++ b/www/ap-fastcgi/Makefile
@@ -1,9 +1,10 @@
-# $NetBSD: Makefile,v 1.27 2004/10/28 21:01:50 cube Exp $
+# $NetBSD: Makefile,v 1.28 2006/01/24 07:32:42 wiz Exp $
 #
 
 .include "Makefile.common"
 
 PKGNAME=	${DISTNAME:S/mod_/ap-/}
+PKGREVISION=	1
 
 APACHE_MODULE=	yes
 APACHE_MODULE_NAME=	mod_fastcgi.so
diff --git a/www/ap-gzip/Makefile b/www/ap-gzip/Makefile
index 6565e39d033..47453076f7a 100644
--- a/www/ap-gzip/Makefile
+++ b/www/ap-gzip/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.11 2005/04/11 21:47:50 tv Exp $
+# $NetBSD: Makefile,v 1.12 2006/01/24 07:32:42 wiz Exp $
 #
 
 DISTNAME=	mod_gzip-1.3.26.1a
 PKGNAME=	${DISTNAME:C|mod_|ap-|}
+PKGREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=mod-gzip/}
 EXTRACT_SUFX=	.tgz
diff --git a/www/ap-iasp/Makefile b/www/ap-iasp/Makefile
index 326622aa41f..1450b5440b7 100644
--- a/www/ap-iasp/Makefile
+++ b/www/ap-iasp/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.8 2005/12/05 20:51:10 rillig Exp $
+# $NetBSD: Makefile,v 1.9 2006/01/24 07:32:42 wiz Exp $
 
 .include "../../www/iasp/Makefile.common"
 
 PKGNAME=	ap-iasp-${IASP_VERSION}
+PKGREVISION=	1
 COMMENT=	Apache connector for accessing a iASP proxy server
 
 DEPENDS+=	{iasp-${IASP_VERSION},iasp-${IASP_VERSION}nb*}:../../www/iasp
diff --git a/www/ap-jk/Makefile b/www/ap-jk/Makefile
index bcbfad0ef96..2a8bc9615e1 100644
--- a/www/ap-jk/Makefile
+++ b/www/ap-jk/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.31 2006/01/04 04:29:08 schmonz Exp $
+# $NetBSD: Makefile,v 1.32 2006/01/24 07:32:42 wiz Exp $
 
 DISTNAME=	jakarta-tomcat-connectors-${JK_VERSION}-src
 PKGNAME=	ap-jk-${JK_VERSION}
 JK_VERSION=	1.2.8
+PKGREVISION=	1
 CATEGORIES=	www java
 MASTER_SITES=	http://www.apache.org/dist/jakarta/tomcat-connectors/jk/source/jk-${JK_VERSION}/
 
diff --git a/www/ap-layout/Makefile b/www/ap-layout/Makefile
index 1642e23e11e..b516b708104 100644
--- a/www/ap-layout/Makefile
+++ b/www/ap-layout/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.11 2005/04/11 21:47:50 tv Exp $
+# $NetBSD: Makefile,v 1.12 2006/01/24 07:32:42 wiz Exp $
 #
 
 DISTNAME=	mod_layout-3.2
 PKGNAME=	${DISTNAME:C|mod_|ap-|}
+PKGREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	ftp://ftp.tangent.org/pub/apache/ \
 		http://software.tangent.org/download/
diff --git a/www/ap-mp3/Makefile b/www/ap-mp3/Makefile
index 55088ff66b2..284c5458315 100644
--- a/www/ap-mp3/Makefile
+++ b/www/ap-mp3/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.9 2005/04/11 21:47:50 tv Exp $
+# $NetBSD: Makefile,v 1.10 2006/01/24 07:32:42 wiz Exp $
 #
 
 DISTNAME=	mod_mp3-0.35
 PKGNAME=	${DISTNAME:C|mod_|ap-|}
+PKGREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	ftp://ftp.tangent.org/pub/apache/ \
 		http://software.tangent.org/download/
diff --git a/www/ap-perl/Makefile b/www/ap-perl/Makefile
index 20eba1e1df6..f937406e275 100644
--- a/www/ap-perl/Makefile
+++ b/www/ap-perl/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.38 2005/08/06 06:19:35 jlam Exp $
+# $NetBSD: Makefile,v 1.39 2006/01/24 07:32:42 wiz Exp $
 #
 
 DISTNAME=		mod_perl-1.29
 PKGNAME=		ap-perl-1.29
-PKGREVISION=		3
+PKGREVISION=		4
 CATEGORIES=		www perl5
 MASTER_SITES=		${MASTER_SITE_PERL_CPAN:=Apache/} \
 			http://perl.apache.org/dist/
diff --git a/www/ap-perl/buildlink3.mk b/www/ap-perl/buildlink3.mk
index f14a7e73d6f..e3fbcb05224 100644
--- a/www/ap-perl/buildlink3.mk
+++ b/www/ap-perl/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2005/08/06 06:19:35 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2006/01/24 07:32:42 wiz Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 AP_PERL_BUILDLINK3_MK:=	${AP_PERL_BUILDLINK3_MK}+
@@ -12,6 +12,7 @@ BUILDLINK_PACKAGES+=	ap-perl
 
 .if !empty(AP_PERL_BUILDLINK3_MK:M+)
 BUILDLINK_DEPENDS.ap-perl+=	ap-perl>=1.29nb3
+BUILDLINK_RECOMMENDED.ap-perl?=	ap-perl>=1.29nb4
 BUILDLINK_PKGSRCDIR.ap-perl?=	../../www/ap-perl
 
 BUILDLINK_FILES.ap-perl+=	lib/httpd/mod_perl.*
diff --git a/www/ap-php/Makefile b/www/ap-php/Makefile
index 8fa055f52a1..3a8e289a468 100644
--- a/www/ap-php/Makefile
+++ b/www/ap-php/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.6 2005/11/08 20:33:55 bouyer Exp $
+# $NetBSD: Makefile,v 1.7 2006/01/24 07:32:42 wiz Exp $
 #
 
 PKGNAME=		ap-php-${PHP_BASE_VERS}
-PKGREVISION=		3
+PKGREVISION=		4
 COMMENT=		Apache (${PKG_APACHE}) module for ${PKG_PHP}
 
 APACHE_MODULE=		YES
diff --git a/www/ap-python/Makefile b/www/ap-python/Makefile
index ae1235c2a57..159349239d8 100644
--- a/www/ap-python/Makefile
+++ b/www/ap-python/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.14 2005/12/05 20:51:10 rillig Exp $
+# $NetBSD: Makefile,v 1.15 2006/01/24 07:32:42 wiz Exp $
 #
 
 DISTNAME=		mod_python-2.7.10
 PKGNAME=		ap-python-2.7.10
+PKGREVISION=		1
 CATEGORIES=		www
 MASTER_SITES=		${MASTER_SITE_APACHE:=httpd/modpython/}
 EXTRACT_SUFX=		.tgz
diff --git a/www/ap-rivet/Makefile b/www/ap-rivet/Makefile
index fe0efe54578..81798090e0e 100644
--- a/www/ap-rivet/Makefile
+++ b/www/ap-rivet/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.3 2006/01/13 00:36:29 rillig Exp $
+# $NetBSD: Makefile,v 1.4 2006/01/24 07:32:42 wiz Exp $
 
 DISTNAME=	rivet_0.4.0-1
 PKGNAME=	ap-rivet-0.4.0.1
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_APACHE:=tcl/rivet/}
 
diff --git a/www/ap-ruby/Makefile b/www/ap-ruby/Makefile
index 80d0cce0186..ed20872a9df 100644
--- a/www/ap-ruby/Makefile
+++ b/www/ap-ruby/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.26 2006/01/03 15:07:30 taca Exp $
+# $NetBSD: Makefile,v 1.27 2006/01/24 07:32:42 wiz Exp $
 #
 
 DISTNAME=	mod_ruby-${VERSION}
 PKGNAME=	ap-${RUBY_PKGPREFIX}-${VERSION}
-PKGREVISION=	3
+PKGREVISION=	4
 CATEGORIES=	www ruby
 MASTER_SITES=	http://www.modruby.net/archive/
 
diff --git a/www/ap-ssl/Makefile b/www/ap-ssl/Makefile
index 0b29777746c..ddea38ca4dd 100644
--- a/www/ap-ssl/Makefile
+++ b/www/ap-ssl/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.96 2006/01/05 21:21:54 joerg Exp $
+# $NetBSD: Makefile,v 1.97 2006/01/24 07:32:42 wiz Exp $
 
 DISTNAME=		mod_ssl-2.8.25-1.3.34
 PKGNAME=		ap-ssl-2.8.25
+PKGREVISION=		1
 CATEGORIES=		www security
 MASTER_SITES=		http://www.modssl.org/source/ \
 			ftp://ftp.pca.dfn.de/pub/tools/net/mod_ssl/source/ \
diff --git a/www/ap-throttle/Makefile b/www/ap-throttle/Makefile
index eedcf174eef..cb183850f8c 100644
--- a/www/ap-throttle/Makefile
+++ b/www/ap-throttle/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.10 2005/04/11 21:47:51 tv Exp $
+# $NetBSD: Makefile,v 1.11 2006/01/24 07:32:42 wiz Exp $
 
 DISTNAME=	mod_throttle312
 PKGNAME=	ap-throttle-3.1.2
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	www
 MASTER_SITES=	http://www.snert.com/Software/mod_throttle/
 EXTRACT_SUFX=	.tgz
diff --git a/www/ap-xslt/Makefile b/www/ap-xslt/Makefile
index 962ae0babbb..3fbc0f89ee6 100644
--- a/www/ap-xslt/Makefile
+++ b/www/ap-xslt/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.28 2005/04/11 21:47:51 tv Exp $
+# $NetBSD: Makefile,v 1.29 2006/01/24 07:32:43 wiz Exp $
 
 DISTNAME=	modxslt-1.1
 PKGNAME=	ap-xslt-1.1
-PKGREVISION=	9
+PKGREVISION=	10
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=modxslt/}
 
diff --git a/www/ap2-auth-ldap/Makefile b/www/ap2-auth-ldap/Makefile
index 843d23fc79b..9002c7d8a60 100644
--- a/www/ap2-auth-ldap/Makefile
+++ b/www/ap2-auth-ldap/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.8 2006/01/06 15:10:07 wiz Exp $
+# $NetBSD: Makefile,v 1.9 2006/01/24 07:32:43 wiz Exp $
 
 DISTNAME=	mod_auth_ldap3.05
 PKGNAME=	ap2-auth-ldap-3.05
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	www databases
 MASTER_SITES=	http://www.muquit.com/muquit/software/mod_auth_ldap/
 
diff --git a/www/ap2-auth-mysql/Makefile b/www/ap2-auth-mysql/Makefile
index 8f22b8e6e0a..f21fe953661 100644
--- a/www/ap2-auth-mysql/Makefile
+++ b/www/ap2-auth-mysql/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.11 2006/01/08 18:35:11 xtraeme Exp $
+# $NetBSD: Makefile,v 1.12 2006/01/24 07:32:43 wiz Exp $
 #
 
 DISTNAME=		mod_auth_mysql.c
 PKGNAME=		ap2-auth-mysql-1.11.12
-PKGREVISION=		4
+PKGREVISION=		5
 CATEGORIES=		www databases
 MASTER_SITES=		ftp://ftp.kcilink.com/pub/
 DISTFILES=		${DISTNAME}.gz mysql-group-auth.txt
diff --git a/www/ap2-auth-pgsql/Makefile b/www/ap2-auth-pgsql/Makefile
index 2c1274689a4..c05e32aea40 100644
--- a/www/ap2-auth-pgsql/Makefile
+++ b/www/ap2-auth-pgsql/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.10 2006/01/21 13:27:21 rillig Exp $
+# $NetBSD: Makefile,v 1.11 2006/01/24 07:32:43 wiz Exp $
 
 DISTNAME=		mod_auth_pgsql-2.0.3
 PKGNAME=		ap2-auth-pgsql-2.0.3
+PKGREVISION=		1
 CATEGORIES=		www databases
 MASTER_SITES=		http://www.giuseppetanzilli.it/mod_auth_pgsql2/dist/
 
diff --git a/www/ap2-bw/Makefile b/www/ap2-bw/Makefile
index 59ca5035caf..fbb10bf180a 100644
--- a/www/ap2-bw/Makefile
+++ b/www/ap2-bw/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.2 2005/06/17 03:50:40 jlam Exp $
+# $NetBSD: Makefile,v 1.3 2006/01/24 07:32:43 wiz Exp $
 #
 
 DISTNAME=		bw_mod-0.6
 PKGNAME=		${DISTNAME:S/bw_mod/ap2-bw/}
+PKGREVISION=		1
 CATEGORIES=		www
 MASTER_SITES=		http://ivn.cl/apache/
 EXTRACT_SUFX=		.tgz
diff --git a/www/ap2-chroot/Makefile b/www/ap2-chroot/Makefile
index c19cd71bb05..d753fcaebd9 100644
--- a/www/ap2-chroot/Makefile
+++ b/www/ap2-chroot/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.2 2005/04/11 21:47:51 tv Exp $
+# $NetBSD: Makefile,v 1.3 2006/01/24 07:32:43 wiz Exp $
 
 DISTNAME=	mod_chroot-0.3
 PKGNAME=	ap2-chroot-0.3
+PKGREVISION=	1
 CATEGORIES=	www security
 MASTER_SITES=	http://core.segfault.pl/~hobbit/mod_chroot/dist/
 
diff --git a/www/ap2-fastcgi/Makefile b/www/ap2-fastcgi/Makefile
index f6707f32fb0..a82ea48e78b 100644
--- a/www/ap2-fastcgi/Makefile
+++ b/www/ap2-fastcgi/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.4 2005/09/20 18:25:47 tv Exp $
+# $NetBSD: Makefile,v 1.5 2006/01/24 07:32:43 wiz Exp $
 
 .include "../../www/ap-fastcgi/Makefile.common"
 
 PKGNAME=		${DISTNAME:S/mod_/ap2-/}
-PKGREVISION=		1
+PKGREVISION=		2
 PKG_APACHE_ACCEPTED=	apache2
 APACHE_MANUAL=		manual
 APACHE_MODULE=		# defined
diff --git a/www/ap2-perl/Makefile b/www/ap2-perl/Makefile
index 0ad6aca2fc7..c1be29ad467 100644
--- a/www/ap2-perl/Makefile
+++ b/www/ap2-perl/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.20 2005/08/17 16:54:14 tv Exp $
+# $NetBSD: Makefile,v 1.21 2006/01/24 07:32:43 wiz Exp $
 
 DISTNAME=	mod_perl-2.0.1
 PKGNAME=	${DISTNAME:S/mod_/ap2-/}
+PKGREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	http://perl.apache.org/dist/
 
diff --git a/www/ap2-perl/buildlink3.mk b/www/ap2-perl/buildlink3.mk
index bfdcf386d50..2ba772473f9 100644
--- a/www/ap2-perl/buildlink3.mk
+++ b/www/ap2-perl/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2005/08/17 16:54:14 tv Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2006/01/24 07:32:43 wiz Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 AP2_PERL_BUILDLINK3_MK:=	${AP2_PERL_BUILDLINK3_MK}+
@@ -12,6 +12,7 @@ BUILDLINK_PACKAGES+=	ap2-perl
 
 .if !empty(AP2_PERL_BUILDLINK3_MK:M+)
 BUILDLINK_DEPENDS.ap2-perl+=	ap2-perl>=2.0.1
+BUILDLINK_RECOMMENDED.ap2-perl?=	ap2-perl>=2.0.1nb1
 BUILDLINK_PKGSRCDIR.ap2-perl?=	../../www/ap2-perl
 .endif	# AP2_PERL_BUILDLINK3_MK
 
diff --git a/www/ap2-python/Makefile b/www/ap2-python/Makefile
index b93ea9b0277..34e33e31333 100644
--- a/www/ap2-python/Makefile
+++ b/www/ap2-python/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.13 2005/12/29 06:22:21 jlam Exp $
+# $NetBSD: Makefile,v 1.14 2006/01/24 07:32:43 wiz Exp $
 
 DISTNAME=	mod_python-${VERSION}
 PKGNAME=	ap2-${PYPKGPREFIX}-python-${VERSION}
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	www python
 MASTER_SITES=	${MASTER_SITE_APACHE:=httpd/modpython/}
 EXTRACT_SUFX=	.tgz
diff --git a/www/ap2-ruby/Makefile b/www/ap2-ruby/Makefile
index 05e47b44e49..7214e5b881c 100644
--- a/www/ap2-ruby/Makefile
+++ b/www/ap2-ruby/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.17 2006/01/03 15:07:30 taca Exp $
+# $NetBSD: Makefile,v 1.18 2006/01/24 07:32:43 wiz Exp $
 
 DISTNAME=	mod_ruby-${VERSION}
 PKGNAME=	ap2-${RUBY_PKGPREFIX}-${VERSION}
-PKGREVISION=	3
+PKGREVISION=	4
 CATEGORIES=	www ruby
 MASTER_SITES=	http://www.modruby.net/archive/
 
diff --git a/www/ap2-subversion/Makefile b/www/ap2-subversion/Makefile
index 369dcbd894c..be4e0e68722 100644
--- a/www/ap2-subversion/Makefile
+++ b/www/ap2-subversion/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.19 2005/12/05 23:55:22 rillig Exp $
+# $NetBSD: Makefile,v 1.20 2006/01/24 07:32:43 wiz Exp $
 
 PKGNAME=	ap2-subversion-${SVNVER}
+PKGREVISION=	1
 COMMENT=	WebDAV server (Apache module) for Subversion
 
 .include "../../devel/subversion/Makefile.common"
diff --git a/www/ap2-suphp/Makefile b/www/ap2-suphp/Makefile
index e652daf6f95..7bb313385c5 100644
--- a/www/ap2-suphp/Makefile
+++ b/www/ap2-suphp/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.3 2005/12/29 06:22:21 jlam Exp $
+# $NetBSD: Makefile,v 1.4 2006/01/24 07:32:43 wiz Exp $
 #
 
 DISTNAME=		suphp-0.6.0
 PKGNAME=		ap2-${DISTNAME}
+PKGREVISION=		1
 CATEGORIES=		www
 MASTER_SITES=		http://www.suphp.org/download/
 
diff --git a/www/ap2-transform/Makefile b/www/ap2-transform/Makefile
index 540a42ef7b5..981895a7086 100644
--- a/www/ap2-transform/Makefile
+++ b/www/ap2-transform/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.9 2005/12/05 23:55:22 rillig Exp $
+# $NetBSD: Makefile,v 1.10 2006/01/24 07:32:43 wiz Exp $
 #
 
 DISTNAME=	mod_transform-0.4.0
 PKGNAME=	${DISTNAME:S/mod_/ap2-/}
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	www
 MASTER_SITES=	http://www.outoforder.cc/downloads/mod_transform/
 
diff --git a/www/apache/Makefile b/www/apache/Makefile
index c3f8767e6e5..85f7287f8a0 100644
--- a/www/apache/Makefile
+++ b/www/apache/Makefile
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.180 2006/01/09 00:51:03 joerg Exp $
+# $NetBSD: Makefile,v 1.181 2006/01/24 07:32:43 wiz Exp $
 #
 # This pkg does not compile in mod_ssl, only the `mod_ssl EAPI' (a set of
 # code hooks that allow mod_ssl to be compiled separately later, if desired).
 
 DISTNAME=		apache_1.3.34
 PKGNAME=		${DISTNAME:S/_/-/}
-PKGREVISION=		3
+PKGREVISION=		4
 CATEGORIES=		www
 MASTER_SITES=		${MASTER_SITE_APACHE:=httpd/} \
 			${MASTER_SITE_APACHE:=httpd/old/}
diff --git a/www/apache/buildlink3.mk b/www/apache/buildlink3.mk
index 36f173106ef..648f84f3d22 100644
--- a/www/apache/buildlink3.mk
+++ b/www/apache/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.11 2005/12/05 23:55:22 rillig Exp $
+# $NetBSD: buildlink3.mk,v 1.12 2006/01/24 07:32:45 wiz Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 APACHE_BUILDLINK3_MK:=	${APACHE_BUILDLINK3_MK}+
@@ -12,6 +12,7 @@ BUILDLINK_PACKAGES+=	apache
 
 .if !empty(APACHE_BUILDLINK3_MK:M+)
 BUILDLINK_DEPENDS.apache+=	apache{,6}-1.3.*
+BUILDLINK_RECOMMENDED.apache?=	apache>=1.3.34nb4
 BUILDLINK_PKGSRCDIR.apache?=	../../www/apache
 
 .if defined(APACHE_MODULE)
diff --git a/www/apache2/Makefile b/www/apache2/Makefile
index f58e446a3a8..e1a14374ea4 100644
--- a/www/apache2/Makefile
+++ b/www/apache2/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.92 2006/01/21 13:02:21 tron Exp $
+# $NetBSD: Makefile,v 1.93 2006/01/24 07:32:45 wiz Exp $
 
 .include "Makefile.common"
 
 PKGNAME=	apache-${APACHE_VERSION}
-PKGREVISION=	5
+PKGREVISION=	6
 CATEGORIES=	www
 
 HOMEPAGE=	http://httpd.apache.org/
diff --git a/www/apache2/buildlink3.mk b/www/apache2/buildlink3.mk
index b19ee10d14b..68067f4a386 100644
--- a/www/apache2/buildlink3.mk
+++ b/www/apache2/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.14 2005/12/05 23:55:22 rillig Exp $
+# $NetBSD: buildlink3.mk,v 1.15 2006/01/24 07:32:46 wiz Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 APACHE_BUILDLINK3_MK:=	${APACHE_BUILDLINK3_MK}+
@@ -12,7 +12,7 @@ BUILDLINK_PACKAGES+=	apache
 
 .if !empty(APACHE_BUILDLINK3_MK:M+)
 BUILDLINK_DEPENDS.apache+=	apache>=2.0.51
-BUILDLINK_RECOMMENDED.apache+=	apache>=2.0.52nb5
+BUILDLINK_RECOMMENDED.apache+=	apache>=2.0.55nb6
 BUILDLINK_PKGSRCDIR.apache?=	../../www/apache2
 BUILDLINK_DEPMETHOD.apache?=	build
 .  if defined(APACHE_MODULE)
diff --git a/www/bins/Makefile b/www/bins/Makefile
index 6369e243110..9d9d2cb8118 100644
--- a/www/bins/Makefile
+++ b/www/bins/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.36 2005/10/04 19:12:01 wiz Exp $
+# $NetBSD: Makefile,v 1.37 2006/01/24 07:32:46 wiz Exp $
 #
 
 DISTNAME=	bins-1.1.29
+PKGREVISION=	1
 CATEGORIES=	www graphics
 MASTER_SITES=	http://zubro.chez.tiscali.fr/BINS/
 EXTRACT_SUFX=	.tar.bz2
diff --git a/www/bluefish/Makefile b/www/bluefish/Makefile
index 2abdea28002..64e0aadbd2e 100644
--- a/www/bluefish/Makefile
+++ b/www/bluefish/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.60 2005/12/31 12:32:47 wiz Exp $
+# $NetBSD: Makefile,v 1.61 2006/01/24 07:32:46 wiz Exp $
 
 DISTNAME=	bluefish-1.0.4
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	www
 MASTER_SITES=	http://pkedu.fbt.eitn.wau.nl/~olivier/downloads/	\
 		ftp://bluefish.advancecreations.com/bluefish/downloads/ \
diff --git a/www/blur6ex/Makefile b/www/blur6ex/Makefile
index d0ae6542e5f..6a10b975de6 100644
--- a/www/blur6ex/Makefile
+++ b/www/blur6ex/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.5 2006/01/23 15:13:08 xtraeme Exp $
+# $NetBSD: Makefile,v 1.6 2006/01/24 07:32:46 wiz Exp $
 #
 
 DISTNAME=	blur6ex-0.1.198
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	www
 MASTER_SITES=	http://www.blursoft.com/releases/
 
diff --git a/www/browser-bookmarks-menu/Makefile b/www/browser-bookmarks-menu/Makefile
index d4e9b4df42a..1bed372c359 100644
--- a/www/browser-bookmarks-menu/Makefile
+++ b/www/browser-bookmarks-menu/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.5 2006/01/20 16:15:54 jmmv Exp $
+# $NetBSD: Makefile,v 1.6 2006/01/24 07:32:46 wiz Exp $
 #
 
 DISTNAME=	browser-bookmarks-menu-0.3
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	www gnome
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=browserbookapp/}
 
diff --git a/www/cadaver/Makefile b/www/cadaver/Makefile
index da80b9d28f9..d523e3b5044 100644
--- a/www/cadaver/Makefile
+++ b/www/cadaver/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.33 2005/04/11 21:47:52 tv Exp $
+# $NetBSD: Makefile,v 1.34 2006/01/24 07:32:46 wiz Exp $
 
 DISTNAME=		cadaver-0.22.2
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=		www
 MASTER_SITES=		http://www.webdav.org/cadaver/
 
diff --git a/www/drivel/Makefile b/www/drivel/Makefile
index b73f1bfedc0..af1958b151f 100644
--- a/www/drivel/Makefile
+++ b/www/drivel/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.23 2006/01/20 16:15:54 jmmv Exp $
+# $NetBSD: Makefile,v 1.24 2006/01/24 07:32:46 wiz Exp $
 #
 
 DISTNAME=	drivel-2.0.2
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	www gnome
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=drivel/}
 EXTRACT_SUFX=	.tar.bz2
diff --git a/www/drupal/Makefile b/www/drupal/Makefile
index e3d7b5998be..0b487b426f9 100644
--- a/www/drupal/Makefile
+++ b/www/drupal/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.3 2006/01/08 18:35:11 xtraeme Exp $
+# $NetBSD: Makefile,v 1.4 2006/01/24 07:32:47 wiz Exp $
 
 DISTNAME=	drupal-4.6.5
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	www
 MASTER_SITES=	http://drupal.org/files/projects/
 
diff --git a/www/epiphany-extensions/Makefile b/www/epiphany-extensions/Makefile
index 70267750875..2457b77d8ea 100644
--- a/www/epiphany-extensions/Makefile
+++ b/www/epiphany-extensions/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.20 2006/01/20 16:15:54 jmmv Exp $
+# $NetBSD: Makefile,v 1.21 2006/01/24 07:32:47 wiz Exp $
 #
 
 DISTNAME=	epiphany-extensions-1.8.1
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	www gnome
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/epiphany-extensions/1.8/}
 EXTRACT_SUFX=	.tar.bz2
diff --git a/www/epiphany/Makefile b/www/epiphany/Makefile
index b2f0e097224..0412b0c0f32 100644
--- a/www/epiphany/Makefile
+++ b/www/epiphany/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.46 2006/01/20 13:33:42 jmmv Exp $
+# $NetBSD: Makefile,v 1.47 2006/01/24 07:32:47 wiz Exp $
 #
 
 DISTNAME=	epiphany-1.8.3
+PKGREVISION=	1
 CATEGORIES=	www gnome
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/epiphany/1.8/}
 EXTRACT_SUFX=	.tar.bz2
diff --git a/www/epiphany/buildlink3.mk b/www/epiphany/buildlink3.mk
index 9d3a8108bad..a04d62fd2db 100644
--- a/www/epiphany/buildlink3.mk
+++ b/www/epiphany/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.11 2005/12/31 12:32:47 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.12 2006/01/24 07:32:47 wiz Exp $
 #
 # This Makefile fragment is included by packages that use epiphany.
 #
@@ -15,7 +15,7 @@ BUILDLINK_DEPENDS+=	epiphany
 .if !empty(EPIPHANY_BUILDLINK3_MK:M+)
 BUILDLINK_PACKAGES+=			epiphany
 BUILDLINK_DEPENDS.epiphany+=		epiphany>=1.8.2
-BUILDLINK_RECOMMENDED.epiphany?=		epiphany>=1.8.2nb1
+BUILDLINK_RECOMMENDED.epiphany?=		epiphany>=1.8.3nb1
 BUILDLINK_PKGSRCDIR.epiphany?=		../../www/epiphany
 
 .include "../../mk/bsd.prefs.mk"
diff --git a/www/firefox-gtk1/Makefile b/www/firefox-gtk1/Makefile
index 23570432ac5..f8f9a279259 100644
--- a/www/firefox-gtk1/Makefile
+++ b/www/firefox-gtk1/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.6 2005/12/23 00:29:57 joerg Exp $
+# $NetBSD: Makefile,v 1.7 2006/01/24 07:32:48 wiz Exp $
 
-PKGREVISION=	1
+PKGREVISION=	2
 MOZILLA=	firefox-gtk1
 COMMENT=	Lightweight gecko-based web browser built with GTK+-1.x
 
diff --git a/www/firefox-gtk1/buildlink3.mk b/www/firefox-gtk1/buildlink3.mk
index fc6e6e48496..69630c7f1da 100644
--- a/www/firefox-gtk1/buildlink3.mk
+++ b/www/firefox-gtk1/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.6 2005/12/10 13:47:22 taya Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2006/01/24 07:32:48 wiz Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 FIREFOX_GTK2_BUILDLINK3_MK:=	${FIREFOX_GTK2_BUILDLINK3_MK}+
@@ -12,7 +12,7 @@ BUILDLINK_PACKAGES+=	firefox-gtk1
 
 .if !empty(FIREFOX_GTK2_BUILDLINK3_MK:M+)
 BUILDLINK_DEPENDS.firefox-gtk1+=	firefox-gtk1>=1.5
-BUILDLINK_RECOMMENDED.firefox-gtk1+=	firefox-gtk1>=1.5
+BUILDLINK_RECOMMENDED.firefox-gtk1+=	firefox-gtk1>=1.5nb2
 BUILDLINK_PKGSRCDIR.firefox-gtk1?=	../../www/firefox-gtk1
 .endif	# FIREFOX_GTK2_BUILDLINK3_MK
 
diff --git a/www/firefox/Makefile b/www/firefox/Makefile
index 38d363c1e97..a1404cc407b 100644
--- a/www/firefox/Makefile
+++ b/www/firefox/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.26 2005/12/28 18:11:56 jmmv Exp $
+# $NetBSD: Makefile,v 1.27 2006/01/24 07:32:47 wiz Exp $
 
-PKGREVISION=	2
+PKGREVISION=	3
 MOZILLA=	firefox
 EXTRACT_SUFX=	.tar.bz2
 COMMENT=	Lightweight gecko-based web browser
diff --git a/www/firefox/buildlink3.mk b/www/firefox/buildlink3.mk
index da6ce24223a..81930b9e743 100644
--- a/www/firefox/buildlink3.mk
+++ b/www/firefox/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.7 2005/12/10 13:47:22 taya Exp $
+# $NetBSD: buildlink3.mk,v 1.8 2006/01/24 07:32:47 wiz Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 FIREFOX_BUILDLINK3_MK:=	${FIREFOX_BUILDLINK3_MK}+
@@ -12,7 +12,7 @@ BUILDLINK_PACKAGES+=	firefox
 
 .if !empty(FIREFOX_BUILDLINK3_MK:M+)
 BUILDLINK_DEPENDS.firefox+=	firefox>=1.5
-BUILDLINK_RECOMMENDED.firefox+=	firefox>=1.5
+BUILDLINK_RECOMMENDED.firefox+=	firefox>=1.5nb3
 BUILDLINK_PKGSRCDIR.firefox?=	../../www/firefox
 .endif	# FIREFOX_BUILDLINK3_MK
 
diff --git a/www/firefox/distinfo b/www/firefox/distinfo
index 7a1bb6fef63..a822283dcd9 100644
--- a/www/firefox/distinfo
+++ b/www/firefox/distinfo
@@ -1,8 +1,10 @@
-$NetBSD: distinfo,v 1.41 2005/12/10 13:51:27 taya Exp $
+$NetBSD: distinfo,v 1.42 2006/01/24 07:32:47 wiz Exp $
 
 SHA1 (firefox-1.5/firefox-1.5-source.tar.bz2) = 7437c6a351787ec8762e598ae1852e22bcca3220
 RMD160 (firefox-1.5/firefox-1.5-source.tar.bz2) = 5e7475846e9c92e36167a384e1e8a3d699b0b62f
 Size (firefox-1.5/firefox-1.5-source.tar.bz2) = 34491496 bytes
+SHA1 (patch-bugzilla-319004) = d13f4c20cd74bfd6f8caae4a135f7f82361ce986
+SHA1 (patch-bugzilla-319004) = d13f4c20cd74bfd6f8caae4a135f7f82361ce986
 SHA1 (patch-aa) = 5095449d4e979085fc5791b9d0251076b9c969c3
 SHA1 (patch-ab) = bcc480ab0f7d1760bf4f26b6464db6b69fa3b4d6
 SHA1 (patch-ac) = d35b8da8ee1a6b42068ece31a1f4659e153b29cd
@@ -48,6 +50,7 @@ SHA1 (patch-cn) = 56e346b892c475d8b8e5c7521a34700338186437
 SHA1 (patch-db) = f10187cf9de4466e49a967b79875eb01c5afd69f
 SHA1 (patch-dc) = ba7b06f04460d4966e115a9ffdeafc1ebf555972
 SHA1 (patch-dd) = de9d705fdc3cb9879a19d58dfd170d104ca379f7
+SHA1 (patch-debug) = 16d144ba2635304a955d62a2078d7db898274312
 SHA1 (patch-df) = 17912d183f754ab6661d2be8092e6a07d142632b
 SHA1 (patch-dh) = 7592a6238acd5ef6e802d32103c897acb576825a
 SHA1 (patch-dj) = 70360dffb20dd1029866d2e81899d003c9e17473
diff --git a/www/galeon/Makefile b/www/galeon/Makefile
index b9701b41c27..7bb6973481d 100644
--- a/www/galeon/Makefile
+++ b/www/galeon/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.89 2006/01/04 04:29:08 schmonz Exp $
+# $NetBSD: Makefile,v 1.90 2006/01/24 07:32:48 wiz Exp $
 #
 
 DISTNAME=	galeon-1.3.21
-PKGREVISION=	3
+PKGREVISION=	4
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=galeon/}
 EXTRACT_SUFX=	.tar.bz2
diff --git a/www/galeon12/Makefile b/www/galeon12/Makefile
index 4da79304217..ce844490d0f 100644
--- a/www/galeon12/Makefile
+++ b/www/galeon12/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.11 2005/12/05 23:55:22 rillig Exp $
+# $NetBSD: Makefile,v 1.12 2006/01/24 07:32:48 wiz Exp $
 
 DISTNAME=	galeon-1.2.14
-PKGREVISION=	4
+PKGREVISION=	5
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=galeon/}
 
diff --git a/www/ganglia-webfrontend/Makefile b/www/ganglia-webfrontend/Makefile
index 553e7f3ddf0..6ca571cf6bd 100644
--- a/www/ganglia-webfrontend/Makefile
+++ b/www/ganglia-webfrontend/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.3 2005/04/03 19:15:20 jschauma Exp $
+# $NetBSD: Makefile,v 1.4 2006/01/24 07:32:48 wiz Exp $
 #
 
 DISTNAME=	ganglia-3.0.1
 PKGNAME=	ganglia-webfrontend-3.0.1
+PKGREVISION=	1
 CATEGORIES=	www parallel
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=ganglia/}
 EXTRACT_SUFX=	.tar.bz2
diff --git a/www/gtkhtml/Makefile b/www/gtkhtml/Makefile
index 30d52f2e044..e9705cedb95 100644
--- a/www/gtkhtml/Makefile
+++ b/www/gtkhtml/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.45 2005/12/06 15:55:57 joerg Exp $
+# $NetBSD: Makefile,v 1.46 2006/01/24 07:32:48 wiz Exp $
 
 DISTNAME=		gtkhtml-1.1.10
-PKGREVISION=		5
+PKGREVISION=		6
 CATEGORIES=		www gnome
 MASTER_SITES=		${MASTER_SITE_GNOME:=sources/gtkhtml/1.1/}
 EXTRACT_SUFX=		.tar.bz2
diff --git a/www/gtkhtml/buildlink3.mk b/www/gtkhtml/buildlink3.mk
index a52ecb12a72..490d3503ed7 100644
--- a/www/gtkhtml/buildlink3.mk
+++ b/www/gtkhtml/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2005/05/31 22:12:18 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2006/01/24 07:32:48 wiz Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 GTKHTML_BUILDLINK3_MK:=	${GTKHTML_BUILDLINK3_MK}+
@@ -12,6 +12,7 @@ BUILDLINK_PACKAGES+=	gtkhtml
 
 .if !empty(GTKHTML_BUILDLINK3_MK:M+)
 BUILDLINK_DEPENDS.gtkhtml?=	gtkhtml>=1.1.10nb5
+BUILDLINK_RECOMMENDED.gtkhtml?=	gtkhtml>=1.1.10nb6
 BUILDLINK_PKGSRCDIR.gtkhtml?=	../../www/gtkhtml
 .endif	# GTKHTML_BUILDLINK3_MK
 
diff --git a/www/gtkhtml30/Makefile b/www/gtkhtml30/Makefile
index 18997a67353..439312ec61b 100644
--- a/www/gtkhtml30/Makefile
+++ b/www/gtkhtml30/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.9 2005/12/31 12:32:47 wiz Exp $
+# $NetBSD: Makefile,v 1.10 2006/01/24 07:32:48 wiz Exp $
 #
 
 DISTNAME=	gtkhtml-3.0.10
 PKGNAME=	${DISTNAME:S/gtkhtml/gtkhtml30/}
-PKGREVISION=	4
+PKGREVISION=	5
 CATEGORIES=	www gnome
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/gtkhtml/3.0/}
 EXTRACT_SUFX=	.tar.bz2
diff --git a/www/gtkhtml30/buildlink3.mk b/www/gtkhtml30/buildlink3.mk
index 8b17be62c5e..fa15cf3d493 100644
--- a/www/gtkhtml30/buildlink3.mk
+++ b/www/gtkhtml30/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2005/12/31 12:32:47 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2006/01/24 07:32:48 wiz Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 GTKHTML30_BUILDLINK3_MK:=	${GTKHTML30_BUILDLINK3_MK}+
@@ -12,7 +12,7 @@ BUILDLINK_PACKAGES+=	gtkhtml30
 
 .if !empty(GTKHTML30_BUILDLINK3_MK:M+)
 BUILDLINK_DEPENDS.gtkhtml30+=	gtkhtml30>=3.0.10
-BUILDLINK_RECOMMENDED.gtkhtml30?=	gtkhtml30>=3.0.10nb4
+BUILDLINK_RECOMMENDED.gtkhtml30?=	gtkhtml30>=3.0.10nb5
 BUILDLINK_PKGSRCDIR.gtkhtml30?=	../../www/gtkhtml30
 .endif	# GTKHTML30_BUILDLINK3_MK
 
diff --git a/www/gtkhtml36/Makefile b/www/gtkhtml36/Makefile
index 1d52c96a2be..8604903aaa9 100644
--- a/www/gtkhtml36/Makefile
+++ b/www/gtkhtml36/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.8 2005/12/31 12:32:47 wiz Exp $
+# $NetBSD: Makefile,v 1.9 2006/01/24 07:32:48 wiz Exp $
 #
 
 DISTNAME=	gtkhtml-3.6.2
 PKGNAME=	${DISTNAME:S/gtkhtml/gtkhtml36/}
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	www gnome
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/gtkhtml/3.6/}
 EXTRACT_SUFX=	.tar.bz2
diff --git a/www/gtkhtml36/buildlink3.mk b/www/gtkhtml36/buildlink3.mk
index f4256851940..358382f5435 100644
--- a/www/gtkhtml36/buildlink3.mk
+++ b/www/gtkhtml36/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2005/12/31 12:32:47 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2006/01/24 07:32:48 wiz Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 GTKHTML36_BUILDLINK3_MK:=	${GTKHTML36_BUILDLINK3_MK}+
@@ -12,7 +12,7 @@ BUILDLINK_PACKAGES+=	gtkhtml36
 
 .if !empty(GTKHTML36_BUILDLINK3_MK:M+)
 BUILDLINK_DEPENDS.gtkhtml36+=	gtkhtml36>=3.6.0
-BUILDLINK_RECOMMENDED.gtkhtml36?=	gtkhtml36>=3.6.2nb1
+BUILDLINK_RECOMMENDED.gtkhtml36?=	gtkhtml36>=3.6.2nb2
 BUILDLINK_PKGSRCDIR.gtkhtml36?=	../../www/gtkhtml36
 .endif	# GTKHTML36_BUILDLINK3_MK
 
diff --git a/www/gtkhtml38/Makefile b/www/gtkhtml38/Makefile
index bda5cb81f36..f7748cd46a9 100644
--- a/www/gtkhtml38/Makefile
+++ b/www/gtkhtml38/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.2 2005/12/31 12:32:47 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2006/01/24 07:32:48 wiz Exp $
 #
 
 DISTNAME=	gtkhtml-3.8.1
 PKGNAME=	${DISTNAME:S/gtkhtml/gtkhtml38/}
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	www gnome
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/gtkhtml/3.8/}
 EXTRACT_SUFX=	.tar.bz2
diff --git a/www/gtkhtml38/buildlink3.mk b/www/gtkhtml38/buildlink3.mk
index 6d94e8ece59..6338cf19fed 100644
--- a/www/gtkhtml38/buildlink3.mk
+++ b/www/gtkhtml38/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2005/12/31 12:32:47 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2006/01/24 07:32:48 wiz Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 GTKHTML38_BUILDLINK3_MK:=	${GTKHTML38_BUILDLINK3_MK}+
@@ -12,7 +12,7 @@ BUILDLINK_PACKAGES+=	gtkhtml38
 
 .if !empty(GTKHTML38_BUILDLINK3_MK:M+)
 BUILDLINK_DEPENDS.gtkhtml38+=	gtkhtml38>=3.8.0
-BUILDLINK_RECOMMENDED.gtkhtml38?=	gtkhtml38>=3.8.1nb1
+BUILDLINK_RECOMMENDED.gtkhtml38?=	gtkhtml38>=3.8.1nb2
 BUILDLINK_PKGSRCDIR.gtkhtml38?=	../../www/gtkhtml38
 .endif	# GTKHTML38_BUILDLINK3_MK
 
diff --git a/www/horde3/Makefile b/www/horde3/Makefile
index b571e98e2dd..649a2b0fb16 100644
--- a/www/horde3/Makefile
+++ b/www/horde3/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.16 2006/01/08 18:35:11 xtraeme Exp $
+# $NetBSD: Makefile,v 1.17 2006/01/24 07:32:48 wiz Exp $
 
 DISTNAME=	horde-3.0.9
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	www
 MASTER_SITES=	ftp://ftp.horde.org/pub/horde/tarballs/
 
diff --git a/www/kazehakase/Makefile b/www/kazehakase/Makefile
index 2c1c5a58a99..753fb337f41 100644
--- a/www/kazehakase/Makefile
+++ b/www/kazehakase/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.9 2006/01/21 11:55:14 rxg Exp $
+# $NetBSD: Makefile,v 1.10 2006/01/24 07:32:48 wiz Exp $
 #
 
 DISTNAME=	kazehakase-0.3.3
+PKGREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE_JP:=kazehakase/17700/}
 
diff --git a/www/kdewebdev3/Makefile b/www/kdewebdev3/Makefile
index a8cea22b632..a0ad975595e 100644
--- a/www/kdewebdev3/Makefile
+++ b/www/kdewebdev3/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.12 2006/01/06 15:10:07 wiz Exp $
+# $NetBSD: Makefile,v 1.13 2006/01/24 07:32:48 wiz Exp $
 
 DISTNAME=	kdewebdev-${_KDE_VERSION}
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	www
 COMMENT= 	HTML editor and tools suitable for experienced web developers
 
diff --git a/www/libgtkhtml/Makefile b/www/libgtkhtml/Makefile
index 72b542320dc..aec305f1cbc 100644
--- a/www/libgtkhtml/Makefile
+++ b/www/libgtkhtml/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.33 2005/12/31 12:32:48 wiz Exp $
+# $NetBSD: Makefile,v 1.34 2006/01/24 07:32:48 wiz Exp $
 #
 
 DISTNAME=	libgtkhtml-2.6.3
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	www devel gnome
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/libgtkhtml/2.6/}
 EXTRACT_SUFX=	.tar.bz2
diff --git a/www/libgtkhtml/buildlink3.mk b/www/libgtkhtml/buildlink3.mk
index b40485e2be7..3d47d86ea2f 100644
--- a/www/libgtkhtml/buildlink3.mk
+++ b/www/libgtkhtml/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.8 2005/12/31 12:32:48 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.9 2006/01/24 07:32:48 wiz Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 LIBGTKHTML_BUILDLINK3_MK:=	${LIBGTKHTML_BUILDLINK3_MK}+
@@ -12,7 +12,7 @@ BUILDLINK_PACKAGES+=	libgtkhtml
 
 .if !empty(LIBGTKHTML_BUILDLINK3_MK:M+)
 BUILDLINK_DEPENDS.libgtkhtml+=		libgtkhtml>=2.6.0
-BUILDLINK_RECOMMENDED.libgtkhtml+=	libgtkhtml>=2.6.3nb1
+BUILDLINK_RECOMMENDED.libgtkhtml+=	libgtkhtml>=2.6.3nb2
 BUILDLINK_PKGSRCDIR.libgtkhtml?=	../../www/libgtkhtml
 .endif	# LIBGTKHTML_BUILDLINK3_MK
 
diff --git a/www/liferea/Makefile b/www/liferea/Makefile
index 78e00aa1429..97b99c05f09 100644
--- a/www/liferea/Makefile
+++ b/www/liferea/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.26 2006/01/22 11:18:30 wiz Exp $
+# $NetBSD: Makefile,v 1.27 2006/01/24 07:32:48 wiz Exp $
 
 DISTNAME=		liferea-1.0.1
+PKGREVISION=		1
 CATEGORIES=		www
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=liferea/}
 
diff --git a/www/make_album/Makefile b/www/make_album/Makefile
index e4a0475f0a6..e611f9a5260 100644
--- a/www/make_album/Makefile
+++ b/www/make_album/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.12 2005/10/23 18:27:45 jdolecek Exp $
+# $NetBSD: Makefile,v 1.13 2006/01/24 07:32:48 wiz Exp $
 #
 
 DISTNAME=	make_album_1_6
 PKGNAME=	make_album-1.6
-PKGREVISION=	4
+PKGREVISION=	5
 CATEGORIES=	www
 MASTER_SITES=	http://www.burren.cx/david/files/
 
diff --git a/www/mozilla-gtk2/Makefile b/www/mozilla-gtk2/Makefile
index d1bb5c6a5ea..619cddfb517 100644
--- a/www/mozilla-gtk2/Makefile
+++ b/www/mozilla-gtk2/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.31 2005/12/08 09:52:16 rillig Exp $
+# $NetBSD: Makefile,v 1.32 2006/01/24 07:32:49 wiz Exp $
 
 MOZILLA=	mozilla-gtk2
 MOZILLA_BIN=	mozilla-bin
 MOZ_VER=	1.7.12
-PKGREVISION=	1
+PKGREVISION=	2
 EXTRACT_SUFX=	.tar.bz2
 
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX}
diff --git a/www/mozilla-gtk2/buildlink3.mk b/www/mozilla-gtk2/buildlink3.mk
index a16509b894f..5e67ba939d7 100644
--- a/www/mozilla-gtk2/buildlink3.mk
+++ b/www/mozilla-gtk2/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.12 2005/10/01 04:42:09 taya Exp $
+# $NetBSD: buildlink3.mk,v 1.13 2006/01/24 07:32:49 wiz Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 MOZILLA_GTK2_BUILDLINK3_MK:=	${MOZILLA_GTK2_BUILDLINK3_MK}+
@@ -12,7 +12,7 @@ BUILDLINK_PACKAGES+=	mozilla-gtk2
 
 .if !empty(MOZILLA_GTK2_BUILDLINK3_MK:M+)
 BUILDLINK_DEPENDS.mozilla-gtk2+=	mozilla-gtk2>=1.7.5
-BUILDLINK_RECOMMENDED.mozilla-gtk2+=	mozilla-gtk2>=1.7.12
+BUILDLINK_RECOMMENDED.mozilla-gtk2+=	mozilla-gtk2>=1.7.12nb2
 BUILDLINK_PKGSRCDIR.mozilla-gtk2?=	../../www/mozilla-gtk2
 .endif	# MOZILLA_GTK2_BUILDLINK3_MK
 
diff --git a/www/mozilla/Makefile b/www/mozilla/Makefile
index 800df723497..dfaeff8d180 100644
--- a/www/mozilla/Makefile
+++ b/www/mozilla/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.153 2005/12/08 09:52:16 rillig Exp $
+# $NetBSD: Makefile,v 1.154 2006/01/24 07:32:48 wiz Exp $
 
 MOZILLA=	mozilla
 MOZILLA_BIN=	mozilla-bin
 MOZ_VER=	1.7.12
-PKGREVISION=	1
+PKGREVISION=	2
 EXTRACT_SUFX=	.tar.bz2
 
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX}
diff --git a/www/mozilla/buildlink3.mk b/www/mozilla/buildlink3.mk
index aba1184a183..0b1c4effadb 100644
--- a/www/mozilla/buildlink3.mk
+++ b/www/mozilla/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.14 2005/10/01 04:42:09 taya Exp $
+# $NetBSD: buildlink3.mk,v 1.15 2006/01/24 07:32:49 wiz Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 MOZILLA_BUILDLINK3_MK:=	${MOZILLA_BUILDLINK3_MK}+
@@ -12,7 +12,7 @@ BUILDLINK_PACKAGES+=	mozilla
 
 .if !empty(MOZILLA_BUILDLINK3_MK:M+)
 BUILDLINK_DEPENDS.mozilla+=	mozilla>=1.7.5
-BUILDLINK_RECOMMENDED.mozilla+=	mozilla>=1.7.12
+BUILDLINK_RECOMMENDED.mozilla+=	mozilla>=1.7.12nb2
 BUILDLINK_PKGSRCDIR.mozilla?=	../../www/mozilla
 .endif	# MOZILLA_BUILDLINK3_MK
 
diff --git a/www/neon/Makefile b/www/neon/Makefile
index 273a3294a48..6ec70e91cdd 100644
--- a/www/neon/Makefile
+++ b/www/neon/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.32 2006/01/23 03:19:42 epg Exp $
+# $NetBSD: Makefile,v 1.33 2006/01/24 07:32:49 wiz Exp $
 
 DISTNAME=		neon-0.25.5
+PKGREVISION=		1
 CATEGORIES=		www
 MASTER_SITES=		http://www.webdav.org/neon/
 
diff --git a/www/neon/buildlink3.mk b/www/neon/buildlink3.mk
index 3372f8dfe5e..ec1147bd935 100644
--- a/www/neon/buildlink3.mk
+++ b/www/neon/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2004/10/03 00:18:26 tv Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2006/01/24 07:32:49 wiz Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 NEON_BUILDLINK3_MK:=	${NEON_BUILDLINK3_MK}+
@@ -12,7 +12,7 @@ BUILDLINK_PACKAGES+=	neon
 
 .if !empty(NEON_BUILDLINK3_MK:M+)
 BUILDLINK_DEPENDS.neon+=	neon>=0.24.4
-BUILDLINK_RECOMMENDED.neon+=	neon>=0.24.7nb1
+BUILDLINK_RECOMMENDED.neon+=	neon>=0.25.5nb1
 BUILDLINK_PKGSRCDIR.neon?=	../../www/neon
 .endif	# NEON_BUILDLINK3_MK
 
diff --git a/www/netscape/Makefile b/www/netscape/Makefile
index 746b3522f1c..8154990951a 100644
--- a/www/netscape/Makefile
+++ b/www/netscape/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.20 2005/06/17 03:50:41 jlam Exp $
+# $NetBSD: Makefile,v 1.21 2006/01/24 07:32:49 wiz Exp $
 #
 
 DISTNAME=	netscape-20040123
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	www
 MASTER_SITES=	# empty
 DISTFILES=	# empty
diff --git a/www/p5-Apache-ASP/Makefile b/www/p5-Apache-ASP/Makefile
index 291880b5597..1689dda3a54 100644
--- a/www/p5-Apache-ASP/Makefile
+++ b/www/p5-Apache-ASP/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.24 2005/08/06 06:19:35 jlam Exp $
+# $NetBSD: Makefile,v 1.25 2006/01/24 07:32:49 wiz Exp $
 #
 
 DISTNAME=	Apache-ASP-2.21
 PKGNAME=	p5-${DISTNAME}
-PKGREVISION=	3
+PKGREVISION=	4
 SVR4_PKGNAME=	p5aas
 CATEGORIES=	www perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=Apache/}
diff --git a/www/p5-Apache-AuthCookie/Makefile b/www/p5-Apache-AuthCookie/Makefile
index e62f034c9c7..94ab387c8a1 100644
--- a/www/p5-Apache-AuthCookie/Makefile
+++ b/www/p5-Apache-AuthCookie/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.10 2005/08/06 06:19:35 jlam Exp $
+# $NetBSD: Makefile,v 1.11 2006/01/24 07:32:49 wiz Exp $
 #
 
 DISTNAME=	Apache-AuthCookie-3.06
 PKGNAME=	p5-${DISTNAME}
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	www perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=Apache/}
 
diff --git a/www/p5-Apache-AuthCookieDBI/Makefile b/www/p5-Apache-AuthCookieDBI/Makefile
index d9d6b87aa53..18168517e8a 100644
--- a/www/p5-Apache-AuthCookieDBI/Makefile
+++ b/www/p5-Apache-AuthCookieDBI/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.7 2005/08/06 06:19:36 jlam Exp $
+# $NetBSD: Makefile,v 1.8 2006/01/24 07:32:49 wiz Exp $
 #
 
 DISTNAME=	Apache-AuthCookieDBI-1.19
 PKGNAME=	p5-${DISTNAME}
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	www perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=Apache/}
 
diff --git a/www/p5-Apache-Filter/Makefile b/www/p5-Apache-Filter/Makefile
index cd33ba24abd..2766ad7c197 100644
--- a/www/p5-Apache-Filter/Makefile
+++ b/www/p5-Apache-Filter/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.13 2005/08/06 06:19:36 jlam Exp $
+# $NetBSD: Makefile,v 1.14 2006/01/24 07:32:49 wiz Exp $
 
 DISTNAME=	Apache-Filter-1.022
 PKGNAME=	p5-${DISTNAME}
+PKGREVISION=	3
 SVR4_PKGNAME=	p5afi
-PKGREVISION=	2
 CATEGORIES=	www perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=Apache/}
 
diff --git a/www/p5-Apache-Gallery/Makefile b/www/p5-Apache-Gallery/Makefile
index 0c1bcef1191..60afacaf8dc 100644
--- a/www/p5-Apache-Gallery/Makefile
+++ b/www/p5-Apache-Gallery/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.31 2006/01/05 23:03:37 joerg Exp $
+# $NetBSD: Makefile,v 1.32 2006/01/24 07:32:49 wiz Exp $
 #
 
 DISTNAME=	Apache-Gallery-0.9.1
 PKGNAME=	p5-${DISTNAME}
-PKGREVISION=	1
+PKGREVISION=	2
 SVR4_PKGNAME=	p5aga
 CATEGORIES=	www graphics perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=Apache/}
diff --git a/www/p5-Apache-SSI/Makefile b/www/p5-Apache-SSI/Makefile
index cdc9b2a781b..a574c864102 100644
--- a/www/p5-Apache-SSI/Makefile
+++ b/www/p5-Apache-SSI/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.12 2005/08/06 06:19:36 jlam Exp $
+# $NetBSD: Makefile,v 1.13 2006/01/24 07:32:49 wiz Exp $
 
 DISTNAME=	Apache-SSI-2.16
 PKGNAME=	p5-${DISTNAME}
+PKGREVISION=	3
 SVR4_PKGNAME=	p5ass
-PKGREVISION=	2
 CATEGORIES=	www perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=Apache/}
 
diff --git a/www/p5-HTML-Mason/Makefile b/www/p5-HTML-Mason/Makefile
index e80cdb74427..e345a3bf0cb 100644
--- a/www/p5-HTML-Mason/Makefile
+++ b/www/p5-HTML-Mason/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.21 2005/09/26 16:57:57 cube Exp $
+# $NetBSD: Makefile,v 1.22 2006/01/24 07:32:49 wiz Exp $
 
 DISTNAME=		HTML-Mason-1.3101
 PKGNAME=		p5-HTML-Mason-1.31.1
+PKGREVISION=		1
 SVR4_PKGNAME=		p5hma
 CATEGORIES=		www perl5
 MASTER_SITES=		${MASTER_SITE_PERL_CPAN:=HTML/}
diff --git a/www/p5-HTTP-DAV/Makefile b/www/p5-HTTP-DAV/Makefile
index 05a83b17d28..a64760ca660 100644
--- a/www/p5-HTTP-DAV/Makefile
+++ b/www/p5-HTTP-DAV/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.9 2005/08/06 06:19:39 jlam Exp $
+# $NetBSD: Makefile,v 1.10 2006/01/24 07:32:49 wiz Exp $
 #
 
 DISTNAME=	HTTP-DAV-0.31
 PKGNAME=	p5-${DISTNAME}
-PKGREVISION=	3
+PKGREVISION=	4
 SVR4_PKGNAME=	p5htd
 CATEGORIES=	www perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=HTTP/}
diff --git a/www/p5-MasonX-Request-WithApacheSession/Makefile b/www/p5-MasonX-Request-WithApacheSession/Makefile
index a846ce30361..9b86064fab0 100644
--- a/www/p5-MasonX-Request-WithApacheSession/Makefile
+++ b/www/p5-MasonX-Request-WithApacheSession/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.9 2005/08/06 06:19:40 jlam Exp $
+# $NetBSD: Makefile,v 1.10 2006/01/24 07:32:49 wiz Exp $
 
 DISTNAME=	MasonX-Request-WithApacheSession-0.30
 PKGNAME=	p5-${DISTNAME}
+PKGREVISION=	3
 SVR4_PKGNAME=	p5mxa
-PKGREVISION=	2
 CATEGORIES=	www perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=MasonX/}
 
diff --git a/www/p5-SVN-Web/Makefile b/www/p5-SVN-Web/Makefile
index f20a29317a6..09d96e29bf5 100644
--- a/www/p5-SVN-Web/Makefile
+++ b/www/p5-SVN-Web/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.15 2005/12/04 13:52:30 mjl Exp $
+# $NetBSD: Makefile,v 1.16 2006/01/24 07:32:49 wiz Exp $
 
 DISTNAME=	SVN-Web-0.41
 PKGNAME=	p5-${DISTNAME}
 # PKGREVISION=	4
+PKGREVISION=	1
 CATEGORIES=	perl5 www
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=../../authors/id/N/NI/NIKC/}
 
diff --git a/www/p5-Template-Extract/Makefile b/www/p5-Template-Extract/Makefile
index d4db793a69d..a5d81184aa9 100644
--- a/www/p5-Template-Extract/Makefile
+++ b/www/p5-Template-Extract/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.10 2005/11/11 18:50:25 tonio Exp $
+# $NetBSD: Makefile,v 1.11 2006/01/24 07:32:49 wiz Exp $
 
 DISTNAME=		Template-Extract-0.25
 PKGNAME=		p5-${DISTNAME}
-PKGREVISION=		4
+PKGREVISION=		5
 SVR4_PKGNAME=		p5tex
 CATEGORIES=		www perl5
 MASTER_SITES=		${MASTER_SITE_PERL_CPAN:=Template/}
diff --git a/www/p5-Template-Generate/Makefile b/www/p5-Template-Generate/Makefile
index d29fc767eb2..f9b04dfa6ad 100644
--- a/www/p5-Template-Generate/Makefile
+++ b/www/p5-Template-Generate/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.10 2005/11/11 18:50:25 tonio Exp $
+# $NetBSD: Makefile,v 1.11 2006/01/24 07:32:49 wiz Exp $
 
 DISTNAME=		Template-Generate-0.04
 PKGNAME=		p5-${DISTNAME}
-PKGREVISION=		4
+PKGREVISION=		5
 SVR4_PKGNAME=		p5tge
 CATEGORIES=		www perl5
 MASTER_SITES=		${MASTER_SITE_PERL_CPAN:=Template/}
diff --git a/www/p5-libapreq/Makefile b/www/p5-libapreq/Makefile
index 1b121336614..09756b341db 100644
--- a/www/p5-libapreq/Makefile
+++ b/www/p5-libapreq/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.14 2005/08/06 06:19:40 jlam Exp $
+# $NetBSD: Makefile,v 1.15 2006/01/24 07:32:49 wiz Exp $
 
 DISTNAME=	libapreq-1.33
 PKGNAME=	p5-${DISTNAME}
+PKGREVISION=	2
 SVR4_PKGNAME=	p5lap
-PKGREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=Apache/}
 
diff --git a/www/p5-libapreq2/Makefile b/www/p5-libapreq2/Makefile
index 0fc3d8b29a2..cd03c8f0aa6 100644
--- a/www/p5-libapreq2/Makefile
+++ b/www/p5-libapreq2/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.13 2005/11/03 13:46:21 rillig Exp $
+# $NetBSD: Makefile,v 1.14 2006/01/24 07:32:50 wiz Exp $
 
 DISTNAME=	libapreq2-2.06-dev
 PKGNAME=	p5-libapreq2-2.06
-PKGREVISION=	1
+PKGREVISION=	2
 SVR4_PKGNAME=	p5la2
 CATEGORIES=	www perl5
 MASTER_SITES=	${MASTER_SITE_APACHE:=httpd/libapreq/}
diff --git a/www/py-nevow/Makefile b/www/py-nevow/Makefile
index 8279c17b975..53d671629d9 100644
--- a/www/py-nevow/Makefile
+++ b/www/py-nevow/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.1.1.1 2005/11/05 01:58:41 minskim Exp $
+# $NetBSD: Makefile,v 1.2 2006/01/24 07:32:50 wiz Exp $
 #
 
 DISTNAME=		nevow-0.3
 PKGNAME=		${PYPKGPREFIX}-${DISTNAME}
+PKGREVISION=		1
 CATEGORIES=		www python
 MASTER_SITES=		http://www.divmod.org/users/release/divmod/
 
diff --git a/www/skipstone/Makefile b/www/skipstone/Makefile
index 86ef046e2ff..3d6ae120512 100644
--- a/www/skipstone/Makefile
+++ b/www/skipstone/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.18 2005/12/28 15:47:30 ghen Exp $
+# $NetBSD: Makefile,v 1.19 2006/01/24 07:32:50 wiz Exp $
 
 DISTNAME=		skipstone-0.9.3
-PKGREVISION=		1
+PKGREVISION=		2
 CATEGORIES=		www
 MASTER_SITES=		${HOMEPAGE}
 
diff --git a/www/snownews/Makefile b/www/snownews/Makefile
index 43b3bfc0a89..a26fe29edac 100644
--- a/www/snownews/Makefile
+++ b/www/snownews/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.22 2005/12/05 23:55:23 rillig Exp $
+# $NetBSD: Makefile,v 1.23 2006/01/24 07:32:50 wiz Exp $
 
 DISTNAME=	snownews-1.5.7
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	www
 MASTER_SITES=	http://kiza.kcore.de/software/snownews/download/
 
diff --git a/www/trac/Makefile b/www/trac/Makefile
index 2158a2df0b8..792b46760a3 100644
--- a/www/trac/Makefile
+++ b/www/trac/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.16 2006/01/12 22:42:58 wiz Exp $
+# $NetBSD: Makefile,v 1.17 2006/01/24 07:32:50 wiz Exp $
 #
 
 DISTNAME=	trac-0.9.3
+PKGREVISION=	1
 CATEGORIES=	devel www
 MASTER_SITES=	http://ftp.edgewall.com/pub/trac/ \
 		ftp://ftp.edgewall.com/pub/trac/
diff --git a/www/websvn/Makefile b/www/websvn/Makefile
index 780493bd77c..9b911957eb4 100644
--- a/www/websvn/Makefile
+++ b/www/websvn/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.10 2005/12/29 06:22:25 jlam Exp $
+# $NetBSD: Makefile,v 1.11 2006/01/24 07:32:50 wiz Exp $
 #
 
 DISTNAME=	WebSVN_161
 PKGNAME=	websvn-1.61
-PKGREVISION=	3
+PKGREVISION=	4
 CATEGORIES=	www
 MASTER_SITES=	http://websvn.tigris.org/files/documents/1380/14334/
 
diff --git a/www/zope25-ParsedXML/Makefile b/www/zope25-ParsedXML/Makefile
index 0b67fc43b5d..cf0725e3f8f 100644
--- a/www/zope25-ParsedXML/Makefile
+++ b/www/zope25-ParsedXML/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.12 2005/04/11 21:48:03 tv Exp $
+# $NetBSD: Makefile,v 1.13 2006/01/24 07:32:50 wiz Exp $
 
 DISTNAME=	ParsedXML-1.3.1
-PKGREVISION=	3
+PKGREVISION=	4
 PKGNAME=	zope25-ParsedXML-1.3.1
 CATEGORIES=	www
 MASTER_SITES=	http://www.zope.org/Members/faassen/ParsedXML/
diff --git a/www/zope25-Photo/Makefile b/www/zope25-Photo/Makefile
index db72dfb7c3f..40ef92f88a2 100644
--- a/www/zope25-Photo/Makefile
+++ b/www/zope25-Photo/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.9 2005/04/11 21:48:03 tv Exp $
+# $NetBSD: Makefile,v 1.10 2006/01/24 07:32:50 wiz Exp $
 
 DISTNAME=	Photo-1.2.3
 PKGNAME=	zope25-Photo-1.2.3
-PKGREVISION=	4
+PKGREVISION=	5
 CATEGORIES=	www
 MASTER_SITES=	http://www.zope.org/Members/rbickers/Photo/
 EXTRACT_SUFX=	.tgz
diff --git a/www/zope25-RenderableCharts/Makefile b/www/zope25-RenderableCharts/Makefile
index b013429ceda..acab0c415c5 100644
--- a/www/zope25-RenderableCharts/Makefile
+++ b/www/zope25-RenderableCharts/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.5 2005/04/11 21:48:03 tv Exp $
+# $NetBSD: Makefile,v 1.6 2006/01/24 07:32:50 wiz Exp $
 #
 
 DISTNAME=	RenderableCharts-0.6
 PKGNAME=	zope25-RenderableCharts-0.6
+PKGREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	http://www.zope.org/Members/Dirk.Datzert/RenderableCharts/
 
diff --git a/www/zope25-Silva/Makefile b/www/zope25-Silva/Makefile
index e9d10ffe09a..207576c2e0d 100644
--- a/www/zope25-Silva/Makefile
+++ b/www/zope25-Silva/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.9 2003/07/26 15:54:02 drochner Exp $
+# $NetBSD: Makefile,v 1.10 2006/01/24 07:32:50 wiz Exp $
 
 DISTNAME=	Silva-0.9.2.2
 PKGNAME=	zope25-Silva-0.9.2.2
+PKGREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	http://www.zope.org/Members/infrae/Silva/
 EXTRACT_SUFX=	.tgz
diff --git a/www/zope25-XMLWidgets/Makefile b/www/zope25-XMLWidgets/Makefile
index 726f84e0c30..33cb0450c12 100644
--- a/www/zope25-XMLWidgets/Makefile
+++ b/www/zope25-XMLWidgets/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.9 2003/07/22 04:14:46 martti Exp $
+# $NetBSD: Makefile,v 1.10 2006/01/24 07:32:50 wiz Exp $
 
 DISTNAME=	XMLWidgets-0.8.5
 PKGNAME=	zope25-XMLWidgets-0.8.5
+PKGREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	http://www.zope.org/Members/faassen/XMLWidgets/
 EXTRACT_SUFX=	.tgz
diff --git a/www/zope3/Makefile b/www/zope3/Makefile
index 9ff335f6c6b..d14601236de 100644
--- a/www/zope3/Makefile
+++ b/www/zope3/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.7 2006/01/07 19:28:00 wiz Exp $
+# $NetBSD: Makefile,v 1.8 2006/01/24 07:32:50 wiz Exp $
 #
 
 DISTNAME=		Zope-3.2.0
 PKGNAME=		zope3-3.2.0
+PKGREVISION=		1
 CATEGORIES=		www
 MASTER_SITES=		http://www.zope.org/Products/Zope3/3.2.0final/
 EXTRACT_SUFX=		.tgz