Per the process outlined in revbump(1), perform a recursive revbump

on packages that are affected by the switch from the openssl 0.9.7
branch to the 0.9.8 branch. ok jlam@

53 files changed, 106 insertions, 87 deletions

diff --git a/www/ap-auth-ldap/Makefile b/www/ap-auth-ldap/Makefile
index 0196d237e92..40692d7ac90 100644
--- a/www/ap-auth-ldap/Makefile
+++ b/www/ap-auth-ldap/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.30 2006/06/02 18:27:58 joerg Exp $
+# $NetBSD: Makefile,v 1.31 2008/01/18 05:09:47 tnn Exp $
 
 DISTNAME=	auth_ldap-1.6.1
 PKGNAME=	ap13-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-ssl/Makefile b/www/ap-ssl/Makefile
index e5908de8f28..aaf13d5aefb 100644
--- a/www/ap-ssl/Makefile
+++ b/www/ap-ssl/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.105 2007/12/02 12:31:16 wiz Exp $
+# $NetBSD: Makefile,v 1.106 2008/01/18 05:09:47 tnn Exp $
 
 DISTNAME=		mod_ssl-2.8.28-1.3.37
 PKGNAME=		ap13-ssl-2.8.28
+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-xslt/Makefile b/www/ap-xslt/Makefile
index 94d74ead3d7..c3dc58af877 100644
--- a/www/ap-xslt/Makefile
+++ b/www/ap-xslt/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.33 2007/02/22 19:27:18 wiz Exp $
+# $NetBSD: Makefile,v 1.34 2008/01/18 05:09:47 tnn Exp $
 
 DISTNAME=	modxslt-1.1
 PKGNAME=	ap13-xslt-1.1
+PKGREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=modxslt/}
 
diff --git a/www/ap2-auth-ldap/Makefile b/www/ap2-auth-ldap/Makefile
index 4d48276a6da..24f29a6fe6a 100644
--- a/www/ap2-auth-ldap/Makefile
+++ b/www/ap2-auth-ldap/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.16 2007/06/30 14:35:11 joerg Exp $
+# $NetBSD: Makefile,v 1.17 2008/01/18 05:09:47 tnn Exp $
 
 DISTNAME=	mod_auth_ldap3.05
 PKGNAME=	ap2-auth-ldap-3.05
-PKGREVISION=	4
+PKGREVISION=	5
 CATEGORIES=	www databases
 MASTER_SITES=	http://www.muquit.com/muquit/software/mod_auth_ldap/
 
diff --git a/www/ap2-auth-radius/Makefile b/www/ap2-auth-radius/Makefile
index 393c05190f6..013c96cd23a 100644
--- a/www/ap2-auth-radius/Makefile
+++ b/www/ap2-auth-radius/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.6 2007/06/30 16:09:07 joerg Exp $
+# $NetBSD: Makefile,v 1.7 2008/01/18 05:09:47 tnn Exp $
 
 DISTNAME=	mod_auth_radius
 PKGNAME=	${APACHE_PKG_PREFIX}-auth-radius-1.5.7
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	www databases
 MASTER_SITES=	ftp://ftp.freeradius.org/pub/radius/
 
diff --git a/www/ap2-subversion/Makefile b/www/ap2-subversion/Makefile
index 24db982e296..8536f029da4 100644
--- a/www/ap2-subversion/Makefile
+++ b/www/ap2-subversion/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.30 2007/06/30 16:09:09 joerg Exp $
+# $NetBSD: Makefile,v 1.31 2008/01/18 05:09:47 tnn Exp $
 
 PKGNAME=	${APACHE_PKG_PREFIX}-subversion-${SVNVER}
+PKGREVISION=	1
 COMMENT=	WebDAV server (Apache module) for Subversion
 
 .include "../../devel/subversion/Makefile.common"
diff --git a/www/apache2/Makefile b/www/apache2/Makefile
index 3f23d9b42de..cd92097ddd7 100644
--- a/www/apache2/Makefile
+++ b/www/apache2/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.119 2008/01/12 11:36:30 adam Exp $
+# $NetBSD: Makefile,v 1.120 2008/01/18 05:09:47 tnn Exp $
 
 .include "Makefile.common"
 
 PKGNAME=	apache-${APACHE_VERSION}
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	www
 
 HOMEPAGE=	http://httpd.apache.org/
diff --git a/www/apache2/buildlink3.mk b/www/apache2/buildlink3.mk
index 7bfe9a18232..c4e66b62965 100644
--- a/www/apache2/buildlink3.mk
+++ b/www/apache2/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.25 2008/01/12 11:36:30 adam Exp $
+# $NetBSD: buildlink3.mk,v 1.26 2008/01/18 05:09:48 tnn Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 APACHE_BUILDLINK3_MK:=	${APACHE_BUILDLINK3_MK}+
@@ -13,7 +13,7 @@ BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}apache
 
 .if !empty(APACHE_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.apache+=	apache>=2.0.51<2.2
-BUILDLINK_ABI_DEPENDS.apache+=	apache>=2.0.61nb1
+BUILDLINK_ABI_DEPENDS.apache+=	apache>=2.0.61nb2
 BUILDLINK_PKGSRCDIR.apache?=	../../www/apache2
 BUILDLINK_DEPMETHOD.apache?=	build
 .  if defined(APACHE_MODULE)
diff --git a/www/apache22/Makefile b/www/apache22/Makefile
index 790cd4d220d..387361a68d7 100644
--- a/www/apache22/Makefile
+++ b/www/apache22/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.22 2008/01/12 11:36:30 adam Exp $
+# $NetBSD: Makefile,v 1.23 2008/01/18 05:09:48 tnn Exp $
 
 .include "Makefile.common"
 
 PKGNAME=	apache-${APACHE_VERSION}
-PKGREVISION=	3
+PKGREVISION=	4
 CATEGORIES=	www
 
 HOMEPAGE=	http://httpd.apache.org/
diff --git a/www/apache22/buildlink3.mk b/www/apache22/buildlink3.mk
index b4dad1a61ce..8560375b741 100644
--- a/www/apache22/buildlink3.mk
+++ b/www/apache22/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2008/01/12 11:36:30 adam Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2008/01/18 05:09:48 tnn Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 APACHE_BUILDLINK3_MK:=	${APACHE_BUILDLINK3_MK}+
@@ -13,7 +13,7 @@ BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}apache
 
 .if !empty(APACHE_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.apache+=	apache>=2.2.3
-BUILDLINK_ABI_DEPENDS.apache?=	apache>=2.2.6nb3
+BUILDLINK_ABI_DEPENDS.apache?=	apache>=2.2.6nb4
 BUILDLINK_PKGSRCDIR.apache?=	../../www/apache22
 BUILDLINK_DEPMETHOD.apache?=	build
 .  if defined(APACHE_MODULE)
diff --git a/www/bozohttpd/Makefile b/www/bozohttpd/Makefile
index 80c42bb5c56..7fb0620ed01 100644
--- a/www/bozohttpd/Makefile
+++ b/www/bozohttpd/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.59 2007/09/08 01:44:51 jlam Exp $
+# $NetBSD: Makefile,v 1.60 2008/01/18 05:09:48 tnn Exp $
 #
 
 DISTNAME=	bozohttpd-20060517
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_LOCAL}
 EXTRACT_SUFX=	.tar.bz2
diff --git a/www/cadaver/Makefile b/www/cadaver/Makefile
index 8d69b7ff124..a3263fd8410 100644
--- a/www/cadaver/Makefile
+++ b/www/cadaver/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.36 2006/03/04 21:30:57 jlam Exp $
+# $NetBSD: Makefile,v 1.37 2008/01/18 05:09:48 tnn Exp $
 
 DISTNAME=		cadaver-0.22.2
-PKGREVISION=	3
+PKGREVISION=	4
 CATEGORIES=		www
 MASTER_SITES=		http://www.webdav.org/cadaver/
 
diff --git a/www/cherokee/Makefile b/www/cherokee/Makefile
index 400f4b41d78..a967372eb55 100644
--- a/www/cherokee/Makefile
+++ b/www/cherokee/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.6 2007/06/05 05:37:38 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2008/01/18 05:09:48 tnn Exp $
 #
 
 DISTNAME=	cherokee-0.5.3
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	www
 MASTER_SITES=	http://www.cherokee-project.com/download/0.5/0.5.3/
 
diff --git a/www/curl/Makefile b/www/curl/Makefile
index 25abc311f2e..e22468cb095 100644
--- a/www/curl/Makefile
+++ b/www/curl/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.77 2007/11/12 00:15:45 wiz Exp $
+# $NetBSD: Makefile,v 1.78 2008/01/18 05:09:48 tnn Exp $
 
 DISTNAME=	curl-7.17.1
+PKGREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	http://curl.haxx.se/download/ \
 		ftp://ftp.sunet.se/pub/www/utilities/curl/
diff --git a/www/curl/buildlink3.mk b/www/curl/buildlink3.mk
index 8d3ddf5f0cf..3a7e3d3c68f 100644
--- a/www/curl/buildlink3.mk
+++ b/www/curl/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.17 2006/11/19 11:50:23 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.18 2008/01/18 05:09:48 tnn Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 CURL_BUILDLINK3_MK:=	${CURL_BUILDLINK3_MK}+
@@ -13,7 +13,7 @@ BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}curl
 
 .if !empty(CURL_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.curl+=	curl>=7.12.3
-BUILDLINK_ABI_DEPENDS.curl+=	curl>=7.16.0
+BUILDLINK_ABI_DEPENDS.curl+=	curl>=7.17.1nb1
 BUILDLINK_PKGSRCDIR.curl?=	../../www/curl
 .endif	# CURL_BUILDLINK3_MK
 
diff --git a/www/drivel/Makefile b/www/drivel/Makefile
index 1c934d18d2d..c4dd0c096df 100644
--- a/www/drivel/Makefile
+++ b/www/drivel/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.40 2007/09/21 13:04:26 wiz Exp $
+# $NetBSD: Makefile,v 1.41 2008/01/18 05:09:49 tnn Exp $
 #
 
 DISTNAME=	drivel-2.0.3
-PKGREVISION=	6
+PKGREVISION=	7
 CATEGORIES=	www gnome
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=drivel/}
 EXTRACT_SUFX=	.tar.bz2
diff --git a/www/elinks/Makefile b/www/elinks/Makefile
index 2210f6371b4..1a6c98c69db 100644
--- a/www/elinks/Makefile
+++ b/www/elinks/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.34 2008/01/09 03:48:07 bjs Exp $
+# $NetBSD: Makefile,v 1.35 2008/01/18 05:09:49 tnn Exp $
 
 DISTNAME=		elinks-0.11-20080109
-PKGREVISION=		1
+PKGREVISION=		2
 PKGNAME=		${DISTNAME:R}.${DISTNAME:E:S/-/./}
 CATEGORIES=		www
 MASTER_SITES=		${MASTER_SITE_LOCAL}
diff --git a/www/epiphany/Makefile b/www/epiphany/Makefile
index 5f115f0812f..34414baf6de 100644
--- a/www/epiphany/Makefile
+++ b/www/epiphany/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.80 2008/01/11 13:42:56 drochner Exp $
+# $NetBSD: Makefile,v 1.81 2008/01/18 05:09:49 tnn Exp $
 #
 
 DISTNAME=	epiphany-2.20.3
+PKGREVISION=	1
 CATEGORIES=	www gnome
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/epiphany/2.20/}
 EXTRACT_SUFX=	.tar.bz2
diff --git a/www/galeon/Makefile b/www/galeon/Makefile
index b2b8b66d47d..ee4491406a5 100644
--- a/www/galeon/Makefile
+++ b/www/galeon/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.112 2007/12/17 19:14:25 drochner Exp $
+# $NetBSD: Makefile,v 1.113 2008/01/18 05:09:49 tnn Exp $
 #
 
 DISTNAME=		galeon-2.0.4
+PKGREVISION=		1
 CATEGORIES=		www
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=galeon/}
 EXTRACT_SUFX=		.tar.bz2
diff --git a/www/gtkhtml314/Makefile b/www/gtkhtml314/Makefile
index 9a497570312..d6f411c6d35 100644
--- a/www/gtkhtml314/Makefile
+++ b/www/gtkhtml314/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.9 2008/01/11 12:49:13 drochner Exp $
+# $NetBSD: Makefile,v 1.10 2008/01/18 05:09:49 tnn Exp $
 #
 
 DISTNAME=	gtkhtml-3.16.3
 PKGNAME=	${DISTNAME:S/gtkhtml/gtkhtml314/}
+PKGREVISION=	1
 CATEGORIES=	www gnome
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/gtkhtml/3.16/}
 EXTRACT_SUFX=	.tar.bz2
diff --git a/www/gtkhtml314/buildlink3.mk b/www/gtkhtml314/buildlink3.mk
index 11df9e3b5ce..0cf2abcfd14 100644
--- a/www/gtkhtml314/buildlink3.mk
+++ b/www/gtkhtml314/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2007/09/21 13:04:27 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2008/01/18 05:09:49 tnn Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 GTKHTML314_BUILDLINK3_MK:=	${GTKHTML314_BUILDLINK3_MK}+
@@ -13,7 +13,7 @@ BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}gtkhtml314
 
 .if !empty(GTKHTML314_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.gtkhtml314+=	gtkhtml314>=3.14.0
-BUILDLINK_ABI_DEPENDS.gtkhtml314?=	gtkhtml314>=3.14.1nb1
+BUILDLINK_ABI_DEPENDS.gtkhtml314?=	gtkhtml314>=3.16.3nb1
 BUILDLINK_PKGSRCDIR.gtkhtml314?=	../../www/gtkhtml314
 .endif	# GTKHTML314_BUILDLINK3_MK
 
diff --git a/www/gtkhtml38/Makefile b/www/gtkhtml38/Makefile
index 7c4766cabe8..a3c6aeded4b 100644
--- a/www/gtkhtml38/Makefile
+++ b/www/gtkhtml38/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.22 2007/09/21 13:04:27 wiz Exp $
+# $NetBSD: Makefile,v 1.23 2008/01/18 05:09:49 tnn Exp $
 #
 
 DISTNAME=	gtkhtml-3.12.3
 PKGNAME=	${DISTNAME:S/gtkhtml/gtkhtml38/}
-PKGREVISION=	4
+PKGREVISION=	5
 CATEGORIES=	www gnome
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/gtkhtml/3.12/}
 EXTRACT_SUFX=	.tar.bz2
diff --git a/www/gtkhtml38/buildlink3.mk b/www/gtkhtml38/buildlink3.mk
index 384a8cea2b8..d0b6ad5b839 100644
--- a/www/gtkhtml38/buildlink3.mk
+++ b/www/gtkhtml38/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.17 2007/09/21 13:04:28 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.18 2008/01/18 05:09:49 tnn Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 GTKHTML38_BUILDLINK3_MK:=	${GTKHTML38_BUILDLINK3_MK}+
@@ -13,7 +13,7 @@ BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}gtkhtml38
 
 .if !empty(GTKHTML38_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.gtkhtml38+=	gtkhtml38>=3.8.0
-BUILDLINK_ABI_DEPENDS.gtkhtml38?=	gtkhtml38>=3.12.3nb2
+BUILDLINK_ABI_DEPENDS.gtkhtml38?=	gtkhtml38>=3.12.3nb5
 BUILDLINK_PKGSRCDIR.gtkhtml38?=	../../www/gtkhtml38
 .endif	# GTKHTML38_BUILDLINK3_MK
 
diff --git a/www/htmldoc-x11/Makefile b/www/htmldoc-x11/Makefile
index 85de9630557..befd50d2dbd 100644
--- a/www/htmldoc-x11/Makefile
+++ b/www/htmldoc-x11/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.11 2006/12/15 20:33:03 joerg Exp $
+# $NetBSD: Makefile,v 1.12 2008/01/18 05:09:50 tnn Exp $
 #
 
 .include "../../www/htmldoc/Makefile.common"
 
 PKGNAME=	htmldoc-x11-${HTMLDOC_VERSION}
-PKGREVISION=	5
+PKGREVISION=	6
 COMMENT=	Converts HTML to indexed HTML, PDF and/or PostScript (GUI available)
 
 CONFLICTS=		htmldoc-[0-9]*
diff --git a/www/htmldoc/Makefile b/www/htmldoc/Makefile
index ddf48856bae..523f6e85f64 100644
--- a/www/htmldoc/Makefile
+++ b/www/htmldoc/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.22 2006/04/17 14:52:12 wiz Exp $
+# $NetBSD: Makefile,v 1.23 2008/01/18 05:09:49 tnn Exp $
 #
 
 .include "Makefile.common"
 
 PKGNAME=	htmldoc-${HTMLDOC_VERSION}
-PKGREVISION=	3
+PKGREVISION=	4
 COMMENT=	Converts HTML to indexed HTML, PDF and/or PostScript
 
 CONFLICTS=		htmldoc-x11-[0-9]*
diff --git a/www/http_load/Makefile b/www/http_load/Makefile
index bdfa26a93a8..1d14b57e674 100644
--- a/www/http_load/Makefile
+++ b/www/http_load/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.13 2006/03/04 21:30:58 jlam Exp $
+# $NetBSD: Makefile,v 1.14 2008/01/18 05:09:50 tnn Exp $
 
 DISTNAME=	http_load-04jan2002
 PKGNAME=	http_load-20020104
-PKGREVISION=	4
+PKGREVISION=	5
 CATEGORIES=	www
 MASTER_SITES=	http://www.acme.com/software/http_load/
 
diff --git a/www/kdewebdev3/Makefile b/www/kdewebdev3/Makefile
index bb2049f1b2c..1a4fe1b1e2b 100644
--- a/www/kdewebdev3/Makefile
+++ b/www/kdewebdev3/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.24 2007/11/30 21:55:11 wiz Exp $
+# $NetBSD: Makefile,v 1.25 2008/01/18 05:09:50 tnn 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/lhs/Makefile b/www/lhs/Makefile
index 6018d202ce3..12e68585058 100644
--- a/www/lhs/Makefile
+++ b/www/lhs/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.11 2007/09/07 22:12:26 jlam Exp $
+# $NetBSD: Makefile,v 1.12 2008/01/18 05:09:50 tnn Exp $
 #
 
 DISTNAME=	lhs-0.1
-PKGREVISION=	3
+PKGREVISION=	4
 CATEGORIES=	www
 MASTER_SITES=	ftp://dev.null.pl/pub/
 
diff --git a/www/libwww/Makefile b/www/libwww/Makefile
index 7d3f5f8548f..e2d087cc3dc 100644
--- a/www/libwww/Makefile
+++ b/www/libwww/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.75 2007/10/16 23:48:58 tnn Exp $
+# $NetBSD: Makefile,v 1.76 2008/01/18 05:09:51 tnn Exp $
 
 DISTNAME=		w3c-libwww-5.4.0
 PKGNAME=		libwww-5.4.0
-PKGREVISION=		5
+PKGREVISION=		6
 CATEGORIES=		www devel
 MASTER_SITES=		http://www.w3.org/Library/Distribution/
 EXTRACT_SUFX=		.tgz
diff --git a/www/libwww/buildlink3.mk b/www/libwww/buildlink3.mk
index 0a4b61de326..430e8215f77 100644
--- a/www/libwww/buildlink3.mk
+++ b/www/libwww/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.13 2007/05/30 08:54:31 rillig Exp $
+# $NetBSD: buildlink3.mk,v 1.14 2008/01/18 05:09:51 tnn Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 LIBWWW_BUILDLINK3_MK:=	${LIBWWW_BUILDLINK3_MK}+
@@ -13,7 +13,7 @@ BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libwww
 
 .if !empty(LIBWWW_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.libwww+=	libwww>=5.3.2nb2
-BUILDLINK_ABI_DEPENDS.libwww+=	libwww>=5.4.0nb5
+BUILDLINK_ABI_DEPENDS.libwww+=	libwww>=5.4.0nb6
 BUILDLINK_PKGSRCDIR.libwww?=	../../www/libwww
 .endif	# LIBWWW_BUILDLINK3_MK
 
diff --git a/www/lighttpd/Makefile b/www/lighttpd/Makefile
index 0e7302b27ca..5f19fd25643 100644
--- a/www/lighttpd/Makefile
+++ b/www/lighttpd/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.17 2007/11/23 19:12:08 joerg Exp $
+# $NetBSD: Makefile,v 1.18 2008/01/18 05:09:51 tnn Exp $
 
 DISTNAME=	lighttpd-1.4.18
+PKGREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	http://www.lighttpd.net/download/
 
diff --git a/www/links-gui/Makefile b/www/links-gui/Makefile
index cd233b4ff33..bb0bee9f969 100644
--- a/www/links-gui/Makefile
+++ b/www/links-gui/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.51 2007/11/08 19:39:34 wiz Exp $
+# $NetBSD: Makefile,v 1.52 2008/01/18 05:09:51 tnn Exp $
 #
 
 PKGNAME=	links-gui-2.1.0.31
-
+PKGREVISION=	1
 COMMENT=	Lynx-like text and graphics WWW browser
 
 CONFLICTS+=	links-[0-9]* elinks-0.3*
diff --git a/www/links/Makefile b/www/links/Makefile
index 701956b6f6e..a55bb9129c6 100644
--- a/www/links/Makefile
+++ b/www/links/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.50 2008/01/15 22:43:26 wiz Exp $
+# $NetBSD: Makefile,v 1.51 2008/01/18 05:09:51 tnn Exp $
 #
 
 PKGNAME=	links-2.1.0.32
+PKGREVISION=	1
 COMMENT=	Lynx-like text WWW browser
 
 CONFLICTS+=	links-gui-[0-9]* elinks-0.3*
diff --git a/www/lynx/Makefile b/www/lynx/Makefile
index 9d1d7f622aa..22a85a691bb 100644
--- a/www/lynx/Makefile
+++ b/www/lynx/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.102 2007/12/12 20:42:31 wiz Exp $
+# $NetBSD: Makefile,v 1.103 2008/01/18 05:09:51 tnn Exp $
 
 #
 # NOTE: Please do not enable the lynxcgi feature unless it is lynx
@@ -8,7 +8,7 @@
 
 DISTNAME=	lynx2.8.6rel.5
 PKGNAME=	lynx-2.8.6.5
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	www
 MASTER_SITES=	http://lynx.isc.org/${SUBDIR:Q}/ \
 		ftp://ftp.nl.uu.net/pub/unix/www/lynx/${SUBDIR:Q}/ \
diff --git a/www/mini_httpd/Makefile b/www/mini_httpd/Makefile
index c2abd52e952..03690bdc6b6 100644
--- a/www/mini_httpd/Makefile
+++ b/www/mini_httpd/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.16 2007/09/09 02:12:49 jlam Exp $
+# $NetBSD: Makefile,v 1.17 2008/01/18 05:09:52 tnn Exp $
 
 DISTNAME=	mini_httpd-1.19
-PKGREVISION=	4
+PKGREVISION=	5
 CATEGORIES=	www
 MASTER_SITES=	http://www.acme.com/software/mini_httpd/
 
diff --git a/www/neon/Makefile b/www/neon/Makefile
index 4c427993df7..c0a56c15453 100644
--- a/www/neon/Makefile
+++ b/www/neon/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.42 2007/11/08 16:16:11 rillig Exp $
+# $NetBSD: Makefile,v 1.43 2008/01/18 05:09:52 tnn Exp $
 
 # Note: when upgrading neon to >=0.27, make sure that subversion still
 # works. 1.4.5 does not.
 DISTNAME=	neon-0.26.3
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	www
 MASTER_SITES=	http://www.webdav.org/neon/
 
diff --git a/www/neon/buildlink3.mk b/www/neon/buildlink3.mk
index e91483b1cda..8cb5ff41b2b 100644
--- a/www/neon/buildlink3.mk
+++ b/www/neon/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.12 2007/03/12 16:22:24 tv Exp $
+# $NetBSD: buildlink3.mk,v 1.13 2008/01/18 05:09:52 tnn Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 NEON_BUILDLINK3_MK:=	${NEON_BUILDLINK3_MK}+
@@ -13,7 +13,7 @@ BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}neon
 
 .if !empty(NEON_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.neon+=	neon>=0.24.4
-BUILDLINK_ABI_DEPENDS.neon+=	neon>=0.26.0
+BUILDLINK_ABI_DEPENDS.neon+=	neon>=0.26.3nb2
 BUILDLINK_PKGSRCDIR.neon?=	../../www/neon
 .endif	# NEON_BUILDLINK3_MK
 
diff --git a/www/nginx/Makefile b/www/nginx/Makefile
index d623b915704..00d664b6810 100644
--- a/www/nginx/Makefile
+++ b/www/nginx/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.4 2008/01/09 14:42:54 ghen Exp $
+# $NetBSD: Makefile,v 1.5 2008/01/18 05:09:52 tnn Exp $
 
 DISTNAME=		nginx-0.5.35
+PKGREVISION=		1
 CATEGORIES=		www
 MASTER_SITES=		http://sysoev.ru/nginx/
 
diff --git a/www/ocsigen/Makefile b/www/ocsigen/Makefile
index 9d8271b9799..89d17292345 100644
--- a/www/ocsigen/Makefile
+++ b/www/ocsigen/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.1.1.1 2007/04/10 20:24:43 tonio Exp $
+# $NetBSD: Makefile,v 1.2 2008/01/18 05:09:52 tnn Exp $
 #
 
 DISTNAME=	ocsigen-0.6.0
+PKGREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	http://www.ocsigen.org/download/
 
diff --git a/www/p5-WWW-Curl/Makefile b/www/p5-WWW-Curl/Makefile
index 8c636bf6740..aa4b3651ce3 100644
--- a/www/p5-WWW-Curl/Makefile
+++ b/www/p5-WWW-Curl/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.6 2006/11/19 11:50:25 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2008/01/18 05:09:52 tnn Exp $
 #
 
 DISTNAME=	WWW-Curl-2.0
 PKGNAME=	p5-${DISTNAME}
-PKGREVISION=	3
+PKGREVISION=	4
 CATEGORIES=	www perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=WWW/}
 
diff --git a/www/php-curl/Makefile b/www/php-curl/Makefile
index 3a03fb64314..178c3cf427c 100644
--- a/www/php-curl/Makefile
+++ b/www/php-curl/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.12 2006/11/19 11:50:25 wiz Exp $
+# $NetBSD: Makefile,v 1.13 2008/01/18 05:09:52 tnn Exp $
 
 MODNAME=		curl
-PKGREVISION=		1
+PKGREVISION=		2
 CATEGORIES+=		www
 COMMENT=		PHP extension for curl functions
 
diff --git a/www/php4/Makefile b/www/php4/Makefile
index 9fde48bc156..6765862db90 100644
--- a/www/php4/Makefile
+++ b/www/php4/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.80 2008/01/04 10:07:52 adrianp Exp $
+# $NetBSD: Makefile,v 1.81 2008/01/18 05:09:52 tnn Exp $
 
 PKGNAME=		php-${PHP_BASE_VERS}
+PKGREVISION=		1
 CATEGORIES+=		lang
 COMMENT=		HTML-embedded scripting language
 
diff --git a/www/pound/Makefile b/www/pound/Makefile
index 0ca09d1e664..0159274ea1e 100644
--- a/www/pound/Makefile
+++ b/www/pound/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.1.1.1 2007/09/07 19:08:09 jlam Exp $
+# $NetBSD: Makefile,v 1.2 2008/01/18 05:09:53 tnn Exp $
 
 DISTNAME=	Pound-2.3.2
 PKGNAME=	${DISTNAME:S/Pound/pound/}
+PKGREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	http://www.apsis.ch/pound/
 EXTRACT_SUFX=	.tgz
diff --git a/www/py-curl/Makefile b/www/py-curl/Makefile
index 8feca9c4316..a12060b3ac2 100644
--- a/www/py-curl/Makefile
+++ b/www/py-curl/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.34 2007/09/30 17:45:26 wiz Exp $
+# $NetBSD: Makefile,v 1.35 2008/01/18 05:09:53 tnn Exp $
 
 DISTNAME=	pycurl-7.16.4
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME:S/py//}
+PKGREVISION=	1
 CATEGORIES=	www python
 MASTER_SITES=	http://pycurl.sourceforge.net/download/
 
diff --git a/www/screws/Makefile b/www/screws/Makefile
index 763bc6400c2..f4fd6915903 100644
--- a/www/screws/Makefile
+++ b/www/screws/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.20 2007/12/31 07:05:00 obache Exp $
+# $NetBSD: Makefile,v 1.21 2008/01/18 05:09:53 tnn Exp $
 #
 
 DISTNAME=	screws-0.56
-PKGREVISION=	4
+PKGREVISION=	5
 CATEGORIES=	www
 MASTER_SITES=	ftp://ftp.nopcode.org/prj/screws/
 
diff --git a/www/serf/Makefile b/www/serf/Makefile
index 141e90c46ce..8817615f2fa 100644
--- a/www/serf/Makefile
+++ b/www/serf/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.5 2008/01/12 11:36:30 adam Exp $
+# $NetBSD: Makefile,v 1.6 2008/01/18 05:09:53 tnn Exp $
 #
 
 DISTNAME=	serf-0.1.2
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	www
 MASTER_SITES=	http://serf.googlecode.com/files/
 EXTRACT_SUFX=	.tar.bz2
diff --git a/www/serf/buildlink3.mk b/www/serf/buildlink3.mk
index 496147d0f3f..c4c3ec6715f 100644
--- a/www/serf/buildlink3.mk
+++ b/www/serf/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2008/01/12 11:36:30 adam Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2008/01/18 05:09:53 tnn Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 SERF_BUILDLINK3_MK:=	${SERF_BUILDLINK3_MK}+
@@ -13,7 +13,7 @@ BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}serf
 
 .if ${SERF_BUILDLINK3_MK} == "+"
 BUILDLINK_API_DEPENDS.serf+=	serf>=0.1.0
-BUILDLINK_ABI_DEPENDS.serf?=	serf>=0.1.2nb1
+BUILDLINK_ABI_DEPENDS.serf?=	serf>=0.1.2nb2
 BUILDLINK_PKGSRCDIR.serf?=	../../www/serf
 .endif	# SERF_BUILDLINK3_MK
 
diff --git a/www/sitecopy/Makefile b/www/sitecopy/Makefile
index b5efb136fb3..d4ad4e6d1b1 100644
--- a/www/sitecopy/Makefile
+++ b/www/sitecopy/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.38 2007/09/08 21:58:02 jlam Exp $
+# $NetBSD: Makefile,v 1.39 2008/01/18 05:09:53 tnn Exp $
 
 DISTNAME=		sitecopy-0.16.2
+PKGREVISION=		1
 CATEGORIES=		www
 MASTER_SITES=		http://www.lyra.org/sitecopy/
 
diff --git a/www/sope/Makefile b/www/sope/Makefile
index 5889ee7e11e..c38a7022cb4 100644
--- a/www/sope/Makefile
+++ b/www/sope/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.11 2006/12/28 12:12:59 joerg Exp $
+# $NetBSD: Makefile,v 1.12 2008/01/18 05:09:53 tnn Exp $
 #
 
 DISTNAME=		sope-4.5.4-nevermind-r878
 PKGNAME=		sope-4.5.4
-PKGREVISION=		5
+PKGREVISION=		6
 CATEGORIES=		www gnustep
 MASTER_SITES=		ftp://ftp.opengroupware.org/nightly/sources/releases/ \
 			http://download.opengroupware.org/nightly/sources/releases/
diff --git a/www/squid/Makefile b/www/squid/Makefile
index 45074220c54..91a8d9cbcb5 100644
--- a/www/squid/Makefile
+++ b/www/squid/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.201 2008/01/12 06:20:45 taca Exp $
+# $NetBSD: Makefile,v 1.202 2008/01/18 05:09:53 tnn Exp $
 
 DISTNAME=	squid-2.6.STABLE18
 PKGNAME=	${DISTNAME:S/STABLE//}
+PKGREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	http://www.squid-cache.org/Versions/v2/2.6/
 EXTRACT_SUFX=	.tar.bz2
diff --git a/www/tinyproxy/Makefile b/www/tinyproxy/Makefile
index 12c3e2919cf..d3e39e3687b 100644
--- a/www/tinyproxy/Makefile
+++ b/www/tinyproxy/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.23 2007/07/04 20:55:06 jlam Exp $
+# $NetBSD: Makefile,v 1.24 2008/01/18 05:09:54 tnn Exp $
 #
 
 DISTNAME=	tinyproxy-1.6.2
-PKGREVISION=	4
+PKGREVISION=	5
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=tinyproxy/}
 
diff --git a/www/w3m-img/Makefile b/www/w3m-img/Makefile
index 796aceb6663..2716568982d 100644
--- a/www/w3m-img/Makefile
+++ b/www/w3m-img/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.14 2007/06/02 02:35:44 uebayasi Exp $
+# $NetBSD: Makefile,v 1.15 2008/01/18 05:09:54 tnn Exp $
 #
 
 PKGNAME=	w3m-img-${W3M_VERS}
+PKGREVISION=	1
 COMMENT=	Multilingualized version of a pager/text-based browser w3m with inline image support
 
 CONFLICTS+=	w3m-[0-9]*
diff --git a/www/w3m/Makefile b/www/w3m/Makefile
index 7e56838038c..ae8a5d84455 100644
--- a/www/w3m/Makefile
+++ b/www/w3m/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.53 2007/06/02 02:35:42 uebayasi Exp $
+# $NetBSD: Makefile,v 1.54 2008/01/18 05:09:54 tnn Exp $
 #
 
 PKGNAME=	w3m-${W3M_VERS}
+PKGREVISION=	1
 COMMENT=	Multilingualized version of a pager/text-based browser w3m
 
 CONFLICTS+=	w3m-img-[0-9]*