recursive bump from gettext-lib shlib bump.

57 files changed, 118 insertions, 98 deletions

diff --git a/www/amaya/Makefile b/www/amaya/Makefile
index 25d1cf21844..80af9be7d95 100644
--- a/www/amaya/Makefile
+++ b/www/amaya/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.62 2011/01/13 13:39:36 wiz Exp $
+# $NetBSD: Makefile,v 1.63 2011/04/22 13:44:56 obache Exp $
 
 DISTNAME=	amaya-fullsrc-10.0.1
 PKGNAME=	${DISTNAME:S/-fullsrc//}
-PKGREVISION=	7
+PKGREVISION=	8
 CATEGORIES=	www
 MASTER_SITES=	http://www.w3.org/Amaya/Distribution/ \
 		ftp://ftp.w3.org/pub/amaya/ \
diff --git a/www/ap-mono/Makefile b/www/ap-mono/Makefile
index 198030b28bd..0306e488728 100644
--- a/www/ap-mono/Makefile
+++ b/www/ap-mono/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.17 2011/01/09 02:44:47 obache Exp $
+# $NetBSD: Makefile,v 1.18 2011/04/22 13:44:57 obache Exp $
 
 DISTNAME=	mod_mono-2.8.2
 PKGNAME=	${APACHE_PKG_PREFIX}-${DISTNAME:S/mod_//}
+PKGREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	http://ftp.novell.com/pub/mono/sources/mod_mono/
 EXTRACT_SUFX=	.tar.bz2
diff --git a/www/ap2-auth-mellon/Makefile b/www/ap2-auth-mellon/Makefile
index dad981af936..3bc70c5c161 100644
--- a/www/ap2-auth-mellon/Makefile
+++ b/www/ap2-auth-mellon/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.15 2011/04/04 08:45:43 manu Exp $
+# $NetBSD: Makefile,v 1.16 2011/04/22 13:44:57 obache Exp $
 #
 
 PKGNAME=	${APACHE_PKG_PREFIX}-${DISTNAME:S/mod_//:S/_/-/}
 DISTNAME=	mod_auth_mellon-0.3.0
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	www security
 MASTER_SITES=	http://modmellon.googlecode.com/files/
 
diff --git a/www/ap2-subversion/Makefile b/www/ap2-subversion/Makefile
index 6e70310f621..3c377576bc1 100644
--- a/www/ap2-subversion/Makefile
+++ b/www/ap2-subversion/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.42 2010/09/19 16:10:47 sno Exp $
+# $NetBSD: Makefile,v 1.43 2011/04/22 13:45:18 obache Exp $
 
 PKGNAME=	${APACHE_PKG_PREFIX}-subversion-${SVNVER}
-#PKGREVISION=	1
+PKGREVISION=	1
 COMMENT=	WebDAV server (Apache module) for Subversion
 
 PKG_DESTDIR_SUPPORT=	user-destdir
diff --git a/www/ap2-transform/Makefile b/www/ap2-transform/Makefile
index 89368c844e5..d85ed13338e 100644
--- a/www/ap2-transform/Makefile
+++ b/www/ap2-transform/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.15 2011/03/18 08:11:03 obache Exp $
+# $NetBSD: Makefile,v 1.16 2011/04/22 13:44:57 obache Exp $
 #
 
 DISTNAME=	mod_transform-0.4.0
 PKGNAME=	${APACHE_PKG_PREFIX}-${DISTNAME:S/mod_//}
-PKGREVISION=	4
+PKGREVISION=	5
 CATEGORIES=	www
 MASTER_SITES=	http://www.outoforder.cc/downloads/mod_transform/
 
diff --git a/www/ap2-xslt2/Makefile b/www/ap2-xslt2/Makefile
index deb6a6e5db6..711cec0877c 100644
--- a/www/ap2-xslt2/Makefile
+++ b/www/ap2-xslt2/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.11 2010/07/08 16:05:34 joerg Exp $
+# $NetBSD: Makefile,v 1.12 2011/04/22 13:44:57 obache Exp $
 #
 
 DISTNAME=	modxslt-${DIST_VER}
 PKGNAME=	${APACHE_PKG_PREFIX}-xslt2-${DIST_VER}
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	www
 MASTER_SITES=	http://www.mod-xslt2.com/software/archive/${DIST_VER}/
 
diff --git a/www/ap22-dnssd/Makefile b/www/ap22-dnssd/Makefile
index c33895f739f..4e7916f55fb 100644
--- a/www/ap22-dnssd/Makefile
+++ b/www/ap22-dnssd/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.9 2011/01/13 13:39:36 wiz Exp $
+# $NetBSD: Makefile,v 1.10 2011/04/22 13:44:57 obache Exp $
 #
 
 DISTNAME=	mod_dnssd-0.5
 PKGNAME=	${APACHE_PKG_PREFIX}-${DISTNAME:S/mod_//}
-PKGREVISION=	5
+PKGREVISION=	6
 CATEGORIES=	www
 MASTER_SITES=	http://0pointer.de/lennart/projects/mod_dnssd/
 
diff --git a/www/bkedit/Makefile b/www/bkedit/Makefile
index c2949d621b5..53f2d107613 100644
--- a/www/bkedit/Makefile
+++ b/www/bkedit/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.18 2009/06/30 00:07:24 joerg Exp $
+# $NetBSD: Makefile,v 1.19 2011/04/22 13:44:57 obache Exp $
 #
 
 DISTNAME=		bk_edit-0.6.23
 PKGNAME=		${DISTNAME:S/_//}
-PKGREVISION=		2
+PKGREVISION=		3
 CATEGORIES=		www
 MASTER_SITES=		http://www.vakuumverpackt.de/nettools/bk_edit/
 
diff --git a/www/bluefish/Makefile b/www/bluefish/Makefile
index 66780e2c8fa..eb7dece4c95 100644
--- a/www/bluefish/Makefile
+++ b/www/bluefish/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.89 2011/04/03 10:07:07 drochner Exp $
+# $NetBSD: Makefile,v 1.90 2011/04/22 13:44:57 obache Exp $
 
 DISTNAME=	bluefish-2.0.3
+PKGREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	http://bluefish.mrball.net/stable/source/               \
 		http://www.bennewitz.com/bluefish/stable/source/
diff --git a/www/browser-bookmarks-menu/Makefile b/www/browser-bookmarks-menu/Makefile
index 1ade9ed8685..6e89b074199 100644
--- a/www/browser-bookmarks-menu/Makefile
+++ b/www/browser-bookmarks-menu/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.22 2011/01/13 13:39:36 wiz Exp $
+# $NetBSD: Makefile,v 1.23 2011/04/22 13:44:57 obache Exp $
 #
 
 DISTNAME=	browser-bookmarks-menu-0.6
-PKGREVISION=	8
+PKGREVISION=	9
 CATEGORIES=	www gnome
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=browserbookapp/}
 
diff --git a/www/cadaver/Makefile b/www/cadaver/Makefile
index fb4cceb5b60..e7d91d0f932 100644
--- a/www/cadaver/Makefile
+++ b/www/cadaver/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.42 2011/01/01 03:10:10 obache Exp $
+# $NetBSD: Makefile,v 1.43 2011/04/22 13:44:57 obache Exp $
 
 DISTNAME=		cadaver-0.23.3
+PKGREVISION=		1
 CATEGORIES=		www
 MASTER_SITES=		http://www.webdav.org/cadaver/
 
diff --git a/www/curl/Makefile b/www/curl/Makefile
index ea0f1aefca3..1579a4de142 100644
--- a/www/curl/Makefile
+++ b/www/curl/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.103 2011/03/09 19:22:24 asau Exp $
+# $NetBSD: Makefile,v 1.104 2011/04/22 13:42:07 obache Exp $
 
 DISTNAME=	curl-7.21.4
+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 b812f7e3aad..3b02f1058f9 100644
--- a/www/curl/buildlink3.mk
+++ b/www/curl/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.23 2010/01/17 12:02:48 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.24 2011/04/22 13:42:07 obache Exp $
 
 BUILDLINK_TREE+=	curl
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=	curl
 CURL_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.curl+=	curl>=7.12.3
-BUILDLINK_ABI_DEPENDS.curl+=	curl>=7.19.7nb1
+BUILDLINK_ABI_DEPENDS.curl+=	curl>=7.21.4nb1
 BUILDLINK_PKGSRCDIR.curl?=	../../www/curl
 
 pkgbase:= curl
diff --git a/www/drivel/Makefile b/www/drivel/Makefile
index 69c36445a03..2236a86cc7c 100644
--- a/www/drivel/Makefile
+++ b/www/drivel/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.54 2011/01/13 13:39:37 wiz Exp $
+# $NetBSD: Makefile,v 1.55 2011/04/22 13:44:58 obache Exp $
 #
 
 DISTNAME=	drivel-2.0.3
-PKGREVISION=	16
+PKGREVISION=	17
 CATEGORIES=	www gnome
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=drivel/}
 EXTRACT_SUFX=	.tar.bz2
diff --git a/www/elinks/Makefile b/www/elinks/Makefile
index 5fcec3cbc0c..91cbb2b27ca 100644
--- a/www/elinks/Makefile
+++ b/www/elinks/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.44 2010/04/01 10:42:37 obache Exp $
+# $NetBSD: Makefile,v 1.45 2011/04/22 13:44:58 obache Exp $
 
 DISTNAME=		elinks-0.12pre2
 PKGNAME=		${DISTNAME:S/pre/rc/}
-PKGREVISION=		3
+PKGREVISION=		4
 CATEGORIES=		www
 MASTER_SITES=		http://elinks.or.cz/download/ \
 			http://ftp.icm.edu.pl/packages/elinks/
diff --git a/www/epiphany-extensions/Makefile b/www/epiphany-extensions/Makefile
index d568d905f3b..85c1d3e48f5 100644
--- a/www/epiphany-extensions/Makefile
+++ b/www/epiphany-extensions/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.64 2011/01/13 13:39:37 wiz Exp $
+# $NetBSD: Makefile,v 1.65 2011/04/22 13:44:58 obache Exp $
 #
 
 DISTNAME=	epiphany-extensions-2.32.0
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	www gnome
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/epiphany-extensions/2.32/}
 EXTRACT_SUFX=	.tar.bz2
diff --git a/www/epiphany/Makefile b/www/epiphany/Makefile
index 84934d8ab7c..aaf5fded349 100644
--- a/www/epiphany/Makefile
+++ b/www/epiphany/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.115 2011/03/12 13:04:15 drochner Exp $
+# $NetBSD: Makefile,v 1.116 2011/04/22 13:42:32 obache Exp $
 #
 
 DISTNAME=	epiphany-2.30.6
-PKGREVISION=	3
+PKGREVISION=	4
 CATEGORIES=	www gnome
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/epiphany/2.30/}
 EXTRACT_SUFX=	.tar.bz2
diff --git a/www/epiphany/buildlink3.mk b/www/epiphany/buildlink3.mk
index 75911d36a2a..f38897136df 100644
--- a/www/epiphany/buildlink3.mk
+++ b/www/epiphany/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.38 2011/01/13 13:36:15 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.39 2011/04/22 13:42:32 obache Exp $
 #
 
 BUILDLINK_TREE+=	epiphany
@@ -7,7 +7,7 @@ BUILDLINK_TREE+=	epiphany
 EPIPHANY_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.epiphany+=		epiphany>=2.28
-BUILDLINK_ABI_DEPENDS.epiphany?=		epiphany>=2.30.6nb2
+BUILDLINK_ABI_DEPENDS.epiphany?=		epiphany>=2.30.6nb4
 BUILDLINK_PKGSRCDIR.epiphany?=		../../www/epiphany
 
 .include "../../mk/bsd.fast.prefs.mk"
diff --git a/www/firefox/Makefile b/www/firefox/Makefile
index 50868e35987..d2d1c28739c 100644
--- a/www/firefox/Makefile
+++ b/www/firefox/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.83 2011/03/05 11:57:16 tnn Exp $
+# $NetBSD: Makefile,v 1.84 2011/04/22 13:44:58 obache Exp $
 
 .include "../../devel/xulrunner/dist.mk"
 PKGNAME=	firefox-${FIREFOX_VER}
+PKGREVISION=	1
 CATEGORIES=	www
 
 MAINTAINER=	tnn@NetBSD.org
diff --git a/www/gtkasp2php/Makefile b/www/gtkasp2php/Makefile
index ac11792ecbc..d6f161c438f 100644
--- a/www/gtkasp2php/Makefile
+++ b/www/gtkasp2php/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.17 2010/02/12 19:37:50 joerg Exp $
+# $NetBSD: Makefile,v 1.18 2011/04/22 13:44:58 obache Exp $
 #
 
 DISTNAME=	asp2php-0.76.17
 PKGNAME=	gtk${DISTNAME}
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	www
 MASTER_SITES=	http://65.108.58.129/asp2php/
 
diff --git a/www/gtkhtml314/Makefile b/www/gtkhtml314/Makefile
index 6f6efa975de..59f588afb2e 100644
--- a/www/gtkhtml314/Makefile
+++ b/www/gtkhtml314/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.42 2011/03/10 09:45:41 drochner Exp $
+# $NetBSD: Makefile,v 1.43 2011/04/22 13:42:34 obache Exp $
 #
 # PKGNAME derives from the supported API (still from
 # release 3.14). See also PLIST.
@@ -6,6 +6,7 @@
 
 DISTNAME=	gtkhtml-3.32.2
 PKGNAME=	${DISTNAME:S/gtkhtml/gtkhtml314/}
+PKGREVISION=	1
 CATEGORIES=	www gnome
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/gtkhtml/3.32/}
 EXTRACT_SUFX=	.tar.bz2
diff --git a/www/gtkhtml314/buildlink3.mk b/www/gtkhtml314/buildlink3.mk
index d002a4a35d4..fd0f489c589 100644
--- a/www/gtkhtml314/buildlink3.mk
+++ b/www/gtkhtml314/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.14 2010/11/18 23:59:15 obache Exp $
+# $NetBSD: buildlink3.mk,v 1.15 2011/04/22 13:42:34 obache Exp $
 
 BUILDLINK_TREE+=	gtkhtml314
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=	gtkhtml314
 GTKHTML314_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.gtkhtml314+=	gtkhtml314>=3.24.0
-BUILDLINK_ABI_DEPENDS.gtkhtml314?=	gtkhtml314>=3.32.1
+BUILDLINK_ABI_DEPENDS.gtkhtml314?=	gtkhtml314>=3.32.2nb1
 BUILDLINK_PKGSRCDIR.gtkhtml314?=	../../www/gtkhtml314
 
 .include "../../devel/GConf/buildlink3.mk"
diff --git a/www/kazehakase/Makefile b/www/kazehakase/Makefile
index 8e4013c1bbe..7752b25cb26 100644
--- a/www/kazehakase/Makefile
+++ b/www/kazehakase/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.39 2011/01/13 13:39:38 wiz Exp $
+# $NetBSD: Makefile,v 1.40 2011/04/22 13:44:58 obache Exp $
 #
 
 DISTNAME=	kazehakase-0.5.8
-PKGREVISION=	7
+PKGREVISION=	8
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE_JP:=kazehakase/43802/}
 
diff --git a/www/kdewebdev3/Makefile b/www/kdewebdev3/Makefile
index 50a9721b648..5f943664dbe 100644
--- a/www/kdewebdev3/Makefile
+++ b/www/kdewebdev3/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.34 2011/01/13 13:39:38 wiz Exp $
+# $NetBSD: Makefile,v 1.35 2011/04/22 13:44:58 obache Exp $
 
 DISTNAME=	kdewebdev-${_KDE_VERSION}
-PKGREVISION=	7
+PKGREVISION=	8
 CATEGORIES=	www
 COMMENT=	HTML editor and tools suitable for experienced web developers
 
diff --git a/www/kdewebdev4/Makefile b/www/kdewebdev4/Makefile
index 758e7541343..f3c0c9abf18 100644
--- a/www/kdewebdev4/Makefile
+++ b/www/kdewebdev4/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.14 2011/01/23 07:55:15 markd Exp $
+# $NetBSD: Makefile,v 1.15 2011/04/22 13:44:58 obache Exp $
 
 DISTNAME=	kdewebdev-${_KDE_VERSION}
+PKGREVISION=	1
 CATEGORIES=	www
 COMMENT=	HTML editor and tools suitable for experienced web developers
 
diff --git a/www/konq-plugins/Makefile b/www/konq-plugins/Makefile
index 01bc74abd19..97d6cf9a68e 100644
--- a/www/konq-plugins/Makefile
+++ b/www/konq-plugins/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.10 2011/01/13 13:39:38 wiz Exp $
+# $NetBSD: Makefile,v 1.11 2011/04/22 13:44:58 obache Exp $
 #
 
 DISTNAME=	konq-plugins-4.4.0
-PKGREVISION=	6
+PKGREVISION=	7
 CATEGORIES=	www kde
 MASTER_SITES=	${MASTER_SITE_KDE:=4.4.0/src/extragear/}
 EXTRACT_SUFX=	.tar.bz2
diff --git a/www/libgtkhtml/Makefile b/www/libgtkhtml/Makefile
index e361a1d700e..811773fbf45 100644
--- a/www/libgtkhtml/Makefile
+++ b/www/libgtkhtml/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.54 2011/01/13 13:36:42 wiz Exp $
+# $NetBSD: Makefile,v 1.55 2011/04/22 13:42:47 obache Exp $
 #
 
 DISTNAME=	libgtkhtml-2.6.3
-PKGREVISION=	16
+PKGREVISION=	17
 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 99956809fe3..3490f19e801 100644
--- a/www/libgtkhtml/buildlink3.mk
+++ b/www/libgtkhtml/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.27 2011/01/13 13:36:42 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.28 2011/04/22 13:42:47 obache Exp $
 
 BUILDLINK_TREE+=	libgtkhtml
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=	libgtkhtml
 LIBGTKHTML_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.libgtkhtml+=		libgtkhtml>=2.6.0
-BUILDLINK_ABI_DEPENDS.libgtkhtml+=	libgtkhtml>=2.6.3nb16
+BUILDLINK_ABI_DEPENDS.libgtkhtml+=	libgtkhtml>=2.6.3nb17
 BUILDLINK_PKGSRCDIR.libgtkhtml?=	../../www/libgtkhtml
 
 .include "../../textproc/libxml2/buildlink3.mk"
diff --git a/www/librest/Makefile b/www/librest/Makefile
index be99a9c4557..91b0351f033 100644
--- a/www/librest/Makefile
+++ b/www/librest/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.1.1.1 2011/01/18 19:11:01 drochner Exp $
+# $NetBSD: Makefile,v 1.2 2011/04/22 13:42:22 obache Exp $
 #
 
 DISTNAME=	rest-0.6
 PKGNAME=	librest-0.6
+PKGREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	http://moblin.org/sites/all/files/
 #http://meego.gitorious.org/meego-middleware/librest
diff --git a/www/librest/buildlink3.mk b/www/librest/buildlink3.mk
index 5de905d8492..ca528b70625 100644
--- a/www/librest/buildlink3.mk
+++ b/www/librest/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1.1.1 2011/01/18 19:11:01 drochner Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2011/04/22 13:42:22 obache Exp $
 
 BUILDLINK_TREE+=	librest
 
@@ -6,6 +6,7 @@ BUILDLINK_TREE+=	librest
 LIBREST_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.librest+=	librest>=0.6
+BUILDLINK_ABI_DEPENDS.librest?=	librest>=0.6nb1
 BUILDLINK_PKGSRCDIR.librest?=	../../www/librest
 
 .include "../../devel/glib2/buildlink3.mk"
diff --git a/www/liferea-current/Makefile b/www/liferea-current/Makefile
index d02ffca4900..1c81e6af1f1 100644
--- a/www/liferea-current/Makefile
+++ b/www/liferea-current/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.20 2011/01/13 13:39:39 wiz Exp $
+# $NetBSD: Makefile,v 1.21 2011/04/22 13:44:59 obache Exp $
 
 DISTNAME=		liferea-1.6.5
-PKGREVISION=		3
+PKGREVISION=		4
 CATEGORIES=		www
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=liferea/}
 
diff --git a/www/liferea/Makefile b/www/liferea/Makefile
index 0fd12f87351..ffa6d913285 100644
--- a/www/liferea/Makefile
+++ b/www/liferea/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.93 2011/01/13 13:39:39 wiz Exp $
+# $NetBSD: Makefile,v 1.94 2011/04/22 13:44:59 obache Exp $
 
 DISTNAME=		liferea-1.4.28
-PKGREVISION=		9
+PKGREVISION=		10
 CATEGORIES=		www
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=liferea/}
 
diff --git a/www/lua-curl/Makefile b/www/lua-curl/Makefile
index 147b5b13a0a..bf5748ba2cb 100644
--- a/www/lua-curl/Makefile
+++ b/www/lua-curl/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.1.1.1 2010/02/26 22:03:00 agc Exp $
+# $NetBSD: Makefile,v 1.2 2011/04/22 13:44:59 obache Exp $
 #
 
 DISTNAME=	lua-curl-0.2
+PKGREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	http://luaforge.net/frs/download.php/2634/
 
diff --git a/www/lynx/Makefile b/www/lynx/Makefile
index 2702c3cac8e..0d9fcd8bfcb 100644
--- a/www/lynx/Makefile
+++ b/www/lynx/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.108 2010/05/26 01:32:33 obache Exp $
+# $NetBSD: Makefile,v 1.109 2011/04/22 13:44:59 obache Exp $
 
 DISTNAME=	lynx2.8.7
 PKGNAME=	lynx-2.8.7
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	www
 MASTER_SITES=	http://lynx.isc.org/${SUBDIR:Q}/ \
 		ftp://ftp.cyf-kr.edu.pl/pub/unix/lynx/${SUBDIR:Q}/
diff --git a/www/midori/Makefile b/www/midori/Makefile
index 7010e4c9ba3..34d94698200 100644
--- a/www/midori/Makefile
+++ b/www/midori/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.29 2011/04/08 20:02:13 drochner Exp $
+# $NetBSD: Makefile,v 1.30 2011/04/22 13:44:59 obache Exp $
 
 DISTNAME=	midori-0.3.3
+PKGREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	http://archive.xfce.org/src/apps/midori/0.3/
 
diff --git a/www/mono-xsp/Makefile b/www/mono-xsp/Makefile
index fc9362f1739..ccbc0c1afb1 100644
--- a/www/mono-xsp/Makefile
+++ b/www/mono-xsp/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.22 2011/01/08 18:06:00 kefren Exp $
+# $NetBSD: Makefile,v 1.23 2011/04/22 13:42:30 obache Exp $
 
 DISTNAME=	xsp-2.8.2
 PKGNAME=	mono-${DISTNAME}
+PKGREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	http://ftp.novell.com/pub/mono/sources/xsp/
 EXTRACT_SUFX=	.tar.bz2
diff --git a/www/mono-xsp/buildlink3.mk b/www/mono-xsp/buildlink3.mk
index 02074c3e2de..18761f35283 100644
--- a/www/mono-xsp/buildlink3.mk
+++ b/www/mono-xsp/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2009/08/12 02:31:20 obache Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2011/04/22 13:42:30 obache Exp $
 
 BUILDLINK_TREE+=	mono-xsp
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=	mono-xsp
 MONO_XSP_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.mono-xsp+=	mono-xsp>=2.0
-BUILDLINK_ABI_DEPENDS.mono-xsp?=	mono-xsp>=2.4.2nb1
+BUILDLINK_ABI_DEPENDS.mono-xsp?=	mono-xsp>=2.8.2nb1
 BUILDLINK_PKGSRCDIR.mono-xsp?=	../../www/mono-xsp
 
 .include "../../databases/sqlite3/buildlink3.mk"
diff --git a/www/neon/Makefile b/www/neon/Makefile
index bb84fe60009..f0e22750ed8 100644
--- a/www/neon/Makefile
+++ b/www/neon/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.52 2010/03/11 12:24:58 gdt Exp $
+# $NetBSD: Makefile,v 1.53 2011/04/22 13:44:59 obache Exp $
 
 DISTNAME=	neon-0.29.3
+PKGREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	http://www.webdav.org/neon/
 
diff --git a/www/netsurf/Makefile b/www/netsurf/Makefile
index 4ca7f51e174..ef0c5447034 100644
--- a/www/netsurf/Makefile
+++ b/www/netsurf/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.12 2011/01/13 13:39:39 wiz Exp $
+# $NetBSD: Makefile,v 1.13 2011/04/22 13:44:59 obache Exp $
 #
 
 DISTNAME=	netsurf-1.2-src
 PKGNAME=	${DISTNAME:S/-src$//}
-PKGREVISION=	7
+PKGREVISION=	8
 CATEGORIES=	www
 MASTER_SITES=	http://www.netsurf-browser.org/downloads/releases/
 
diff --git a/www/nspluginwrapper/Makefile b/www/nspluginwrapper/Makefile
index c68a06711e3..5d90533d580 100644
--- a/www/nspluginwrapper/Makefile
+++ b/www/nspluginwrapper/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.24 2011/01/20 13:06:15 pooka Exp $
+# $NetBSD: Makefile,v 1.25 2011/04/22 13:44:59 obache Exp $
 #
 
 DISTNAME=       nspluginwrapper-1.2.2
-PKGREVISION=    8
+PKGREVISION=    9
 CATEGORIES=     www
 MASTER_SITES=   http://gwenole.beauchesne.info/projects/nspluginwrapper/files/
 EXTRACT_SUFX=   .tar.bz2
diff --git a/www/nvu/Makefile b/www/nvu/Makefile
index 18c267d79d5..e71830fa9b0 100644
--- a/www/nvu/Makefile
+++ b/www/nvu/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.6 2011/03/17 13:24:07 obache Exp $
+# $NetBSD: Makefile,v 1.7 2011/04/22 13:44:59 obache Exp $
 #
 
 DISTNAME=	nvu-1.0-sources
 PKGNAME=	${DISTNAME:S/-sources//}
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	www
 MASTER_SITES=	http://cvs.nvu.com/download/
 EXTRACT_SUFX=	.tar.bz2
diff --git a/www/p5-WWW-Curl/Makefile b/www/p5-WWW-Curl/Makefile
index 44eccd00ced..e0e27f33f23 100644
--- a/www/p5-WWW-Curl/Makefile
+++ b/www/p5-WWW-Curl/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.19 2010/12/02 12:32:42 wiz Exp $
+# $NetBSD: Makefile,v 1.20 2011/04/22 13:45:00 obache Exp $
 #
 
 DISTNAME=	WWW-Curl-4.15
 PKGNAME=	p5-${DISTNAME}
+PKGREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=WWW/}
 
diff --git a/www/php-curl/Makefile b/www/php-curl/Makefile
index daaacef7fb8..b5c9bc2abf5 100644
--- a/www/php-curl/Makefile
+++ b/www/php-curl/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.16 2010/02/27 03:35:12 taca Exp $
+# $NetBSD: Makefile,v 1.17 2011/04/22 13:45:00 obache Exp $
 
 MODNAME=		curl
+PKGREVISION=		1
 CATEGORIES+=		www
 COMMENT=		PHP extension for curl functions
 
diff --git a/www/py-curl/Makefile b/www/py-curl/Makefile
index 14b3a111f0e..fe753e1e3a5 100644
--- a/www/py-curl/Makefile
+++ b/www/py-curl/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.39 2010/01/17 12:02:50 wiz Exp $
+# $NetBSD: Makefile,v 1.40 2011/04/22 13:45:00 obache Exp $
 
 DISTNAME=	pycurl-7.16.4
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME:S/py//}
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	www python
 MASTER_SITES=	http://pycurl.sourceforge.net/download/
 
diff --git a/www/ruby-gnome2-gtkmozembed/Makefile b/www/ruby-gnome2-gtkmozembed/Makefile
index eb39b195920..c01f28017ed 100644
--- a/www/ruby-gnome2-gtkmozembed/Makefile
+++ b/www/ruby-gnome2-gtkmozembed/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.18 2011/03/04 13:14:06 obache Exp $
+# $NetBSD: Makefile,v 1.19 2011/04/22 13:45:00 obache Exp $
 #
 
 PKGNAME=		${RUBY_PKGPREFIX}-gnome2-gtkmozembed-${VERSION}
 COMMENT=		Ruby binding of gtkmozembed
+PKGREVISION=		1
 CATEGORIES=		www
 
 CONFLICTS+=		ruby[0-9][0-9]-gnome2-gtkmozembed-[0-9]*
diff --git a/www/ruby-patron/Makefile b/www/ruby-patron/Makefile
index 8e96cd05a68..1eda5fccc5f 100644
--- a/www/ruby-patron/Makefile
+++ b/www/ruby-patron/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.7 2011/03/23 16:41:03 taca Exp $
+# $NetBSD: Makefile,v 1.8 2011/04/22 13:45:00 obache Exp $
 
 DISTNAME=	patron-0.4.11
+PKGREVISION=	1
 CATEGORIES=	www
 
 MAINTAINER=	filip@joyent.com
diff --git a/www/shibboleth-sp/Makefile b/www/shibboleth-sp/Makefile
index ec3ced22e52..84cb571e129 100644
--- a/www/shibboleth-sp/Makefile
+++ b/www/shibboleth-sp/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.1.1.1 2011/03/15 13:15:37 pettai Exp $
+# $NetBSD: Makefile,v 1.2 2011/04/22 13:45:00 obache Exp $
 #
 
-DISTNAME=	shibboleth-sp-${PKGVERSION}
-PKGVERSION=	2.4.2
+DISTNAME=	shibboleth-sp-2.4.2
+PKGREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	http://shibboleth.internet2.edu/downloads/shibboleth/cppsp/latest/
 
@@ -19,7 +19,7 @@ GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=	--with-xmltooling=${PREFIX:Q}
 CONFIGURE_ARGS+=	--localstatedir=${VARBASE}
 
-WRKSRC=		${WRKDIR}/shibboleth-2.4.2
+WRKSRC=		${WRKDIR}/shibboleth-${PKGVERSION_NOREV}
 EGDIR=		${PREFIX}/share/examples/shibboleth
 SHIB_CONFDIR=	${PKG_SYSCONFDIR}/shibboleth
 
@@ -86,8 +86,8 @@ INSTALLATION_DIRS+=     ${PREFIX}/include/shibsp/metadata
 INSTALLATION_DIRS+=	${PREFIX}/include/shibsp/remoting
 INSTALLATION_DIRS+=	${PREFIX}/include/shibsp/security
 INSTALLATION_DIRS+=	${PREFIX}/include/shibsp/util
-INSTALLATION_DIRS+=	${PREFIX}/share/doc/shibboleth-${PKGVERSION}
-INSTALLATION_DIRS+=     ${PREFIX}/share/doc/shibboleth-${PKGVERSION}/api
+INSTALLATION_DIRS+=	${PREFIX}/share/doc/shibboleth-${PKGVERSION_NOREV}
+INSTALLATION_DIRS+=     ${PREFIX}/share/doc/shibboleth-${PKGVERSION_NOREV}/api
 INSTALLATION_DIRS+=     ${PREFIX}/share/xml/shibboleth
 INSTALLATION_DIRS+=     ${PREFIX}/lib/shibboleth
 INSTALLATION_DIRS+=	${EGDIR} ${SHIB_CONFDIR}
diff --git a/www/sitecopy/Makefile b/www/sitecopy/Makefile
index a23e542cdad..7cd732fc1dc 100644
--- a/www/sitecopy/Makefile
+++ b/www/sitecopy/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.43 2010/03/14 21:06:15 gls Exp $
+# $NetBSD: Makefile,v 1.44 2011/04/22 13:45:00 obache Exp $
 
 DISTNAME=		sitecopy-0.16.6
+PKGREVISION=		1
 CATEGORIES=		www
 MASTER_SITES=		http://www.manyfish.co.uk/sitecopy/
 
diff --git a/www/skipstone/Makefile b/www/skipstone/Makefile
index 556e20a6d04..23c007d2436 100644
--- a/www/skipstone/Makefile
+++ b/www/skipstone/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.33 2011/01/13 13:39:41 wiz Exp $
+# $NetBSD: Makefile,v 1.34 2011/04/22 13:45:00 obache Exp $
 
 DISTNAME=		skipstone-0.9.6
-PKGREVISION=		7
+PKGREVISION=		8
 CATEGORIES=		www
 MASTER_SITES=		${HOMEPAGE}
 
diff --git a/www/snownews/Makefile b/www/snownews/Makefile
index ab96e9adaef..96d4b26d419 100644
--- a/www/snownews/Makefile
+++ b/www/snownews/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.34 2009/06/01 11:56:43 obache Exp $
+# $NetBSD: Makefile,v 1.35 2011/04/22 13:45:00 obache Exp $
 
 DISTNAME=	snownews-1.5.11
+PKGREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	http://kiza.kcore.de/software/snownews/download/
 
diff --git a/www/swiggle/Makefile b/www/swiggle/Makefile
index 76b541f7803..ab552a81253 100644
--- a/www/swiggle/Makefile
+++ b/www/swiggle/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.14 2010/12/23 11:44:59 dsainty Exp $
+# $NetBSD: Makefile,v 1.15 2011/04/22 13:45:01 obache Exp $
 
 DISTNAME=	swiggle-0.4
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	www graphics
 MASTER_SITES=	http://homepage.univie.ac.at/l.ertl/swiggle/files/
 
diff --git a/www/thy/Makefile b/www/thy/Makefile
index 439672bb300..65deb18c556 100644
--- a/www/thy/Makefile
+++ b/www/thy/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.20 2009/07/03 11:01:01 drochner Exp $
+# $NetBSD: Makefile,v 1.21 2011/04/22 13:45:01 obache Exp $
 
 DISTNAME=	thy-0.9.4
-PKGREVISION=	6
+PKGREVISION=	7
 CATEGORIES=	www
 MASTER_SITES=	ftp://bonehunter.rulez.org/pub/thy/stable/
 
diff --git a/www/w3m-img/Makefile b/www/w3m-img/Makefile
index c92feab35f2..59ada0ebdb0 100644
--- a/www/w3m-img/Makefile
+++ b/www/w3m-img/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.22 2011/04/05 05:55:30 uebayasi Exp $
+# $NetBSD: Makefile,v 1.23 2011/04/22 13:45:23 obache Exp $
 
 PKGNAME=	w3m-img-${W3M_VERS}
-PKGREVISION=	1
+PKGREVISION=	2
 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 704bd0bb10b..a7bf5e45596 100644
--- a/www/w3m/Makefile
+++ b/www/w3m/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.60 2011/04/05 05:55:29 uebayasi Exp $
+# $NetBSD: Makefile,v 1.61 2011/04/22 13:45:01 obache Exp $
 
 PKGNAME=	w3m-${W3M_VERS}
-PKGREVISION=	1
+PKGREVISION=	2
 COMMENT=	Multilingualized version of a pager/text-based browser w3m
 
 CONFLICTS+=	w3m-img-[0-9]*
diff --git a/www/webkit-gtk/Makefile b/www/webkit-gtk/Makefile
index 3a8bc13c602..a164740d7ce 100644
--- a/www/webkit-gtk/Makefile
+++ b/www/webkit-gtk/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.40 2011/04/14 18:11:45 drochner Exp $
+# $NetBSD: Makefile,v 1.41 2011/04/22 13:42:34 obache Exp $
 
 DISTNAME=	webkit-1.2.7
 PKGNAME=	${DISTNAME:S/webkit/webkit-gtk/}
-PKGREVISION=	3
+PKGREVISION=	4
 CATEGORIES=	www
 MASTER_SITES=	http://www.webkitgtk.org/
 
diff --git a/www/webkit-gtk/buildlink3.mk b/www/webkit-gtk/buildlink3.mk
index f2ee43a42fe..f05050bb7fd 100644
--- a/www/webkit-gtk/buildlink3.mk
+++ b/www/webkit-gtk/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.15 2011/01/13 13:36:13 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.16 2011/04/22 13:42:34 obache Exp $
 
 BUILDLINK_TREE+=	webkit-gtk
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=	webkit-gtk
 WEBKIT_GTK_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.webkit-gtk+=	webkit-gtk>=1.1.3
-BUILDLINK_ABI_DEPENDS.webkit-gtk?=	webkit-gtk>=1.2.6nb1
+BUILDLINK_ABI_DEPENDS.webkit-gtk?=	webkit-gtk>=1.2.7nb4
 BUILDLINK_PKGSRCDIR.webkit-gtk?=	../../www/webkit-gtk
 
 .include "../../databases/sqlite3/buildlink3.mk"
diff --git a/www/weex/Makefile b/www/weex/Makefile
index b7b2619ea1b..c4e4af388a0 100644
--- a/www/weex/Makefile
+++ b/www/weex/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.11 2008/07/10 12:46:43 joerg Exp $
+# $NetBSD: Makefile,v 1.12 2011/04/22 13:45:01 obache Exp $
 
 DISTNAME=	weex-2.6.1.5
+PKGREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=weex/}