Bump PKGREVISION for libpng shlib name change.

Also add some patches to remove use of deprecated symbols and fix other
problems when looking for or compiling against libpng-1.4.x.

66 files changed, 133 insertions, 110 deletions

diff --git a/net/amule/Makefile b/net/amule/Makefile
index 6955963c888..df9cd6c8354 100644
--- a/net/amule/Makefile
+++ b/net/amule/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.42 2010/03/30 13:06:53 obache Exp $
+# $NetBSD: Makefile,v 1.43 2010/06/13 22:45:08 wiz Exp $
 
 DISTNAME=	aMule-2.2.6
 PKGNAME=	${DISTNAME:S/aMule/amule/}
+PKGREVISION=	1
 CATEGORIES=	net
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=amule/}
 EXTRACT_SUFX=	.tar.bz2
diff --git a/net/avahi/Makefile b/net/avahi/Makefile
index 0a8af590520..8a2ce04c247 100644
--- a/net/avahi/Makefile
+++ b/net/avahi/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.15 2009/12/01 18:53:54 tonio Exp $
+# $NetBSD: Makefile,v 1.16 2010/06/13 22:45:08 wiz Exp $
 
 DISTNAME=		avahi-0.6.25
-PKGREVISION=		2
+PKGREVISION=		3
 CATEGORIES=		net
 MASTER_SITES=		http://avahi.org/download/
 
diff --git a/net/avahi/buildlink3.mk b/net/avahi/buildlink3.mk
index e590d2bfdf6..90ef5dfeff9 100644
--- a/net/avahi/buildlink3.mk
+++ b/net/avahi/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2009/08/26 19:56:58 sno Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2010/06/13 22:45:08 wiz Exp $
 
 BUILDLINK_TREE+=	avahi
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=	avahi
 AVAHI_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.avahi+=	avahi>=0.6.23
-BUILDLINK_ABI_DEPENDS.avahi?=	avahi>=0.6.25nb1
+BUILDLINK_ABI_DEPENDS.avahi?=	avahi>=0.6.25nb3
 BUILDLINK_PKGSRCDIR.avahi?=	../../net/avahi
 
 pkgbase := avahi
diff --git a/net/bittornado-gui/Makefile b/net/bittornado-gui/Makefile
index 5a2fec4ded3..1bf756ca8d2 100644
--- a/net/bittornado-gui/Makefile
+++ b/net/bittornado-gui/Makefile
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.19 2010/02/10 19:17:43 joerg Exp $
+# $NetBSD: Makefile,v 1.20 2010/06/13 22:45:08 wiz Exp $
 #
 PKG_DESTDIR_SUPPORT=	user-destdir
 
 .include "../../net/bittornado/Makefile.common"
 
 PKGNAME=	${DISTNAME:S/Tornado/Tornado-gui/}
-PKGREVISION=	4
+PKGREVISION=	5
 
 COMMENT+=	(wxGTK GUI)
 
diff --git a/net/bittorrent-gui/Makefile b/net/bittorrent-gui/Makefile
index e092b2b11fc..c7c164d90ac 100644
--- a/net/bittorrent-gui/Makefile
+++ b/net/bittorrent-gui/Makefile
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.24 2010/02/10 19:17:43 joerg Exp $
+# $NetBSD: Makefile,v 1.25 2010/06/13 22:45:08 wiz Exp $
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
 .include "../../net/bittorrent/Makefile.common"
 
 PKGNAME=	${DISTNAME:S/BitTorrent/bittorrent-gui/}
-PKGREVISION=	6
+PKGREVISION=	7
 
 COMMENT+=	(GTK+ GUI)
 
diff --git a/net/bug-buddy/Makefile b/net/bug-buddy/Makefile
index 95878df7f23..d9e04b488bb 100644
--- a/net/bug-buddy/Makefile
+++ b/net/bug-buddy/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.68 2009/08/26 19:58:08 sno Exp $
+# $NetBSD: Makefile,v 1.69 2010/06/13 22:45:08 wiz Exp $
 #
 
 DISTNAME=		bug-buddy-2.26.0
-PKGREVISION=		1
+PKGREVISION=		2
 CATEGORIES=		net gnome
 MASTER_SITES=		${MASTER_SITE_GNOME:=sources/bug-buddy/2.26/}
 EXTRACT_SUFX=		.tar.bz2
diff --git a/net/dc_gui2/Makefile b/net/dc_gui2/Makefile
index a7774d625f5..947e106c25a 100644
--- a/net/dc_gui2/Makefile
+++ b/net/dc_gui2/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.48 2010/06/02 13:08:22 adam Exp $
+# $NetBSD: Makefile,v 1.49 2010/06/13 22:45:08 wiz Exp $
 
 DISTNAME=	dc_gui2-0.80
+PKGREVISION=	1
 CATEGORIES=	net
 MASTER_SITES=	http://ac2i.homelinux.com/dctc/
 
diff --git a/net/dcsharp/Makefile b/net/dcsharp/Makefile
index 55dc54abbf2..ae8243e2715 100644
--- a/net/dcsharp/Makefile
+++ b/net/dcsharp/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.11 2010/02/11 20:41:53 joerg Exp $
+# $NetBSD: Makefile,v 1.12 2010/06/13 22:45:08 wiz Exp $
 
 DISTNAME=	dcsharp-0.11.1
-PKGREVISION=	8
+PKGREVISION=	9
 CATEGORIES=	net
 MASTER_SITES=	http://dcsharp.googlecode.com/files/
 EXTRACT_SUFX=	.tar.bz2
diff --git a/net/dhcpcd-gtk/Makefile b/net/dhcpcd-gtk/Makefile
index 40a824e6365..a6a6d1e289b 100644
--- a/net/dhcpcd-gtk/Makefile
+++ b/net/dhcpcd-gtk/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.11 2010/05/24 21:12:53 roy Exp $
+# $NetBSD: Makefile,v 1.12 2010/06/13 22:45:09 wiz Exp $
 #
 
 DISTNAME=		dhcpcd-ui-0.5.0
 PKGNAME=		dhcpcd-gtk-0.5.0
+PKGREVISION=		1
 CATEGORIES=		net
 MASTER_SITES=		ftp://roy.marples.name/pub/dhcpcd/
 MASTER_SITES+=		http://roy.aydogan.net/dhcpcd/
diff --git a/net/ed2k-gtk-gui/Makefile b/net/ed2k-gtk-gui/Makefile
index 1d6afbf921a..51e5a746a7f 100644
--- a/net/ed2k-gtk-gui/Makefile
+++ b/net/ed2k-gtk-gui/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.22 2009/08/26 19:58:09 sno Exp $
+# $NetBSD: Makefile,v 1.23 2010/06/13 22:45:09 wiz Exp $
 
 DISTNAME=		ed2k-gtk-gui-0.6.3
-PKGREVISION=		5
+PKGREVISION=		6
 CATEGORIES=		net
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=ed2k-gtk-gui/}
 
diff --git a/net/ekiga/Makefile b/net/ekiga/Makefile
index 82642bfc614..0cd961cbf35 100644
--- a/net/ekiga/Makefile
+++ b/net/ekiga/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.16 2010/01/18 09:59:19 wiz Exp $
+# $NetBSD: Makefile,v 1.17 2010/06/13 22:45:09 wiz Exp $
 #
 
 DISTNAME=		ekiga-3.2.6
-PKGREVISION=		2
+PKGREVISION=		3
 CATEGORIES=		net comms
 MASTER_SITES=		${MASTER_SITE_GNOME:=sources/ekiga/3.2/}
 EXTRACT_SUFX=		.tar.bz2
diff --git a/net/etherape/Makefile b/net/etherape/Makefile
index 9e6862464f7..199a4b4e497 100644
--- a/net/etherape/Makefile
+++ b/net/etherape/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.53 2010/01/19 20:51:48 drochner Exp $
+# $NetBSD: Makefile,v 1.54 2010/06/13 22:45:09 wiz Exp $
 
 DISTNAME=	etherape-0.9.9
+PKGREVISION=	1
 CATEGORIES=	gnome net
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=etherape/}
 
diff --git a/net/filezilla/Makefile b/net/filezilla/Makefile
index 5cd11631071..22cd718c00e 100644
--- a/net/filezilla/Makefile
+++ b/net/filezilla/Makefile
@@ -1,9 +1,10 @@
-# $NetBSD: Makefile,v 1.13 2010/03/23 22:28:55 zafer Exp $
+# $NetBSD: Makefile,v 1.14 2010/06/13 22:45:09 wiz Exp $
 #
 
 VERSION=	3.3.2.1
 DISTNAME=	FileZilla_${VERSION}_src
 PKGNAME=	filezilla-${VERSION}
+PKGREVISION=	1
 CATEGORIES=	net x11
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=filezilla/}
 EXTRACT_SUFX=	.tar.bz2
diff --git a/net/gkrellm-multiping/Makefile b/net/gkrellm-multiping/Makefile
index f226515a56a..b9d0e62a434 100644
--- a/net/gkrellm-multiping/Makefile
+++ b/net/gkrellm-multiping/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.18 2010/01/17 12:02:31 wiz Exp $
+# $NetBSD: Makefile,v 1.19 2010/06/13 22:45:09 wiz Exp $
 #
 
 DISTNAME=	gkrellm-multiping-2.0.8
-PKGREVISION=	8
+PKGREVISION=	9
 CATEGORIES=	net
 MASTER_SITES=	http://kmlinux.fjfi.cvut.cz/~makovick/gkrellm/
 EXTRACT_SUFX=	.tgz
diff --git a/net/gkrellm-snmp/Makefile b/net/gkrellm-snmp/Makefile
index ef595af6f07..dd514c501be 100644
--- a/net/gkrellm-snmp/Makefile
+++ b/net/gkrellm-snmp/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.26 2010/01/17 12:02:31 wiz Exp $
+# $NetBSD: Makefile,v 1.27 2010/06/13 22:45:09 wiz Exp $
 #
 
 DISTNAME=	gkrellm_snmp-0.21
 PKGNAME=	${DISTNAME:S/_/-/}
-PKGREVISION=	8
+PKGREVISION=	9
 CATEGORIES=	net
 MASTER_SITES=	http://triq.net/gkrellm/
 
diff --git a/net/gkrellm-wireless/Makefile b/net/gkrellm-wireless/Makefile
index 5e21e962a31..521103588f0 100644
--- a/net/gkrellm-wireless/Makefile
+++ b/net/gkrellm-wireless/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.25 2010/01/17 12:02:31 wiz Exp $
+# $NetBSD: Makefile,v 1.26 2010/06/13 22:45:09 wiz Exp $
 
 DISTNAME=		gkrellmwireless-2.0.3
 PKGNAME=		${DISTNAME:S/gkrellm/gkrellm-/}
-PKGREVISION=		8
+PKGREVISION=		9
 CATEGORIES=		net sysutils
 MASTER_SITES=		http://gkrellm.luon.net/files/
 
diff --git a/net/gnome-netstatus/Makefile b/net/gnome-netstatus/Makefile
index e03b68c8228..64118a76cfc 100644
--- a/net/gnome-netstatus/Makefile
+++ b/net/gnome-netstatus/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.41 2010/01/18 09:59:19 wiz Exp $
+# $NetBSD: Makefile,v 1.42 2010/06/13 22:45:09 wiz Exp $
 #
 
 DISTNAME=	gnome-netstatus-2.26.0
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	net gnome
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/gnome-netstatus/2.26/}
 EXTRACT_SUFX=	.tar.bz2
diff --git a/net/gnome-nettool/Makefile b/net/gnome-nettool/Makefile
index 47056d424be..f45b145e193 100644
--- a/net/gnome-nettool/Makefile
+++ b/net/gnome-nettool/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.9 2009/08/26 19:58:09 sno Exp $
+# $NetBSD: Makefile,v 1.10 2010/06/13 22:45:09 wiz Exp $
 #
 
 DISTNAME=	gnome-nettool-2.26.2
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	net gnome
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/gnome-nettool/2.26/}
 EXTRACT_SUFX=	.tar.bz2
diff --git a/net/gssdp/Makefile b/net/gssdp/Makefile
index c6b02105dc4..ad02dce35ea 100644
--- a/net/gssdp/Makefile
+++ b/net/gssdp/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.4 2010/05/02 11:11:10 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2010/06/13 22:45:09 wiz Exp $
 #
 
 DISTNAME=	gssdp-0.7.2
+PKGREVISION=	1
 CATEGORIES=	net
 MASTER_SITES=	http://www.gupnp.org/sources/gssdp/
 
diff --git a/net/gssdp/buildlink3.mk b/net/gssdp/buildlink3.mk
index 23c6b7ac79b..1b436bd2f3d 100644
--- a/net/gssdp/buildlink3.mk
+++ b/net/gssdp/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2010/01/20 13:44:02 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2010/06/13 22:45:09 wiz Exp $
 
 BUILDLINK_TREE+=	gssdp
 
@@ -6,6 +6,7 @@ BUILDLINK_TREE+=	gssdp
 GSSDP_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.gssdp+=	gssdp>=0.7.1
+BUILDLINK_ABI_DEPENDS.gssdp?=	gssdp>=0.7.2nb1
 BUILDLINK_PKGSRCDIR.gssdp?=	../../net/gssdp
 
 .include "../../devel/glib2/buildlink3.mk"
diff --git a/net/gst-plugins0.10-soup/Makefile b/net/gst-plugins0.10-soup/Makefile
index 686f3047010..8f43a79d683 100644
--- a/net/gst-plugins0.10-soup/Makefile
+++ b/net/gst-plugins0.10-soup/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2008/10/17 11:30:38 drochner Exp $
+# $NetBSD: Makefile,v 1.2 2010/06/13 22:45:10 wiz Exp $
 #
 
 GST_PLUGINS0.10_NAME=	soup
@@ -8,5 +8,7 @@ PKG_DESTDIR_SUPPORT=	user-destdir
 
 .include "../../multimedia/gst-plugins0.10-good/Makefile.common"
 
+PKGREVISION=		1
+
 .include "../../net/libsoup24/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/gtk-vnc/Makefile b/net/gtk-vnc/Makefile
index 03eb189bdb5..bfad674eb55 100644
--- a/net/gtk-vnc/Makefile
+++ b/net/gtk-vnc/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.4 2010/01/21 17:05:59 drochner Exp $
+# $NetBSD: Makefile,v 1.5 2010/06/13 22:45:10 wiz Exp $
 #
 
 DISTNAME=	gtk-vnc-0.3.10
+PKGREVISION=	1
 CATEGORIES=	net
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/gtk-vnc/0.3/}
 
diff --git a/net/gtk-vnc/buildlink3.mk b/net/gtk-vnc/buildlink3.mk
index 1dbef2cceb1..4f1cefde130 100644
--- a/net/gtk-vnc/buildlink3.mk
+++ b/net/gtk-vnc/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2010/01/21 17:05:59 drochner Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2010/06/13 22:45:10 wiz Exp $
 
 BUILDLINK_TREE+=	gtk-vnc
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=	gtk-vnc
 GTK_VNC_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.gtk-vnc+=	gtk-vnc>=0.3.7
-BUILDLINK_ABI_DEPENDS.gtk-vnc?=	gtk-vnc>=0.3.8nb2
+BUILDLINK_ABI_DEPENDS.gtk-vnc?=	gtk-vnc>=0.3.10nb1
 BUILDLINK_PKGSRCDIR.gtk-vnc?=	../../net/gtk-vnc
 
 pkgbase := gtk-vnc
diff --git a/net/gupnp-av/Makefile b/net/gupnp-av/Makefile
index e745686ce29..5cc1180f1fd 100644
--- a/net/gupnp-av/Makefile
+++ b/net/gupnp-av/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.3 2010/02/16 15:29:50 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2010/06/13 22:45:10 wiz Exp $
 #
 
 DISTNAME=	gupnp-av-0.5.4
+PKGREVISION=	1
 CATEGORIES=	net
 MASTER_SITES=	http://www.gupnp.org/sources/gupnp-av/
 
diff --git a/net/gupnp-av/buildlink3.mk b/net/gupnp-av/buildlink3.mk
index 48516c0df15..74447e7887c 100644
--- a/net/gupnp-av/buildlink3.mk
+++ b/net/gupnp-av/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2010/02/16 15:29:50 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2010/06/13 22:45:10 wiz Exp $
 
 BUILDLINK_TREE+=	gupnp-av
 
@@ -6,6 +6,7 @@ BUILDLINK_TREE+=	gupnp-av
 GUPNP_AV_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.gupnp-av+=	gupnp-av>=0.5.4
+BUILDLINK_ABI_DEPENDS.gupnp-av?=	gupnp-av>=0.5.4nb1
 BUILDLINK_PKGSRCDIR.gupnp-av?=	../../net/gupnp-av
 
 .include "../../net/gupnp/buildlink3.mk"
diff --git a/net/gupnp-igd/Makefile b/net/gupnp-igd/Makefile
index 1c3961c0b31..5606b4212bb 100644
--- a/net/gupnp-igd/Makefile
+++ b/net/gupnp-igd/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.3 2010/02/10 19:17:43 joerg Exp $
+# $NetBSD: Makefile,v 1.4 2010/06/13 22:45:10 wiz Exp $
 #
 
 DISTNAME=	gupnp-igd-0.1.6
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	net devel
 MASTER_SITES=	http://www.gupnp.org/sources/gupnp-igd/
 
diff --git a/net/gupnp-igd/buildlink3.mk b/net/gupnp-igd/buildlink3.mk
index 59ea3d108a1..3ffbded0478 100644
--- a/net/gupnp-igd/buildlink3.mk
+++ b/net/gupnp-igd/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2010/01/20 14:04:53 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2010/06/13 22:45:10 wiz Exp $
 
 BUILDLINK_TREE+=	gupnp-igd
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=	gupnp-igd
 GUPNP_IGD_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.gupnp-igd+=	gupnp-igd>=0.1.3
-BUILDLINK_ABI_DEPENDS.gupnp-igd?=	gupnp-igd>=0.1.6
+BUILDLINK_ABI_DEPENDS.gupnp-igd?=	gupnp-igd>=0.1.6nb2
 BUILDLINK_PKGSRCDIR.gupnp-igd?=	../../net/gupnp-igd
 
 .include "../../net/gupnp/buildlink3.mk"
diff --git a/net/gupnp-tools/Makefile b/net/gupnp-tools/Makefile
index 72b81bc341e..349605ffd70 100644
--- a/net/gupnp-tools/Makefile
+++ b/net/gupnp-tools/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.5 2010/02/16 15:33:02 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2010/06/13 22:45:10 wiz Exp $
 #
 
 DISTNAME=	gupnp-tools-0.8
+PKGREVISION=	1
 CATEGORIES=	net
 MASTER_SITES=	http://www.gupnp.org/sources/gupnp-tools/
 
diff --git a/net/gupnp/Makefile b/net/gupnp/Makefile
index 75afad79001..b830e0b2256 100644
--- a/net/gupnp/Makefile
+++ b/net/gupnp/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.4 2010/05/02 11:20:06 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2010/06/13 22:45:10 wiz Exp $
 #
 
 DISTNAME=	gupnp-0.13.3
+PKGREVISION=	1
 CATEGORIES=	net
 MASTER_SITES=	http://www.gupnp.org/sources/gupnp/
 
diff --git a/net/gupnp/buildlink3.mk b/net/gupnp/buildlink3.mk
index f627a765843..75942397bf1 100644
--- a/net/gupnp/buildlink3.mk
+++ b/net/gupnp/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2010/01/20 14:04:53 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2010/06/13 22:45:10 wiz Exp $
 
 BUILDLINK_TREE+=	gupnp
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=	gupnp
 GUPNP_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.gupnp+=	gupnp>=0.13.2
-BUILDLINK_ABI_DEPENDS.gupnp?=	gupnp>=0.13.2
+BUILDLINK_ABI_DEPENDS.gupnp?=	gupnp>=0.13.3nb1
 BUILDLINK_PKGSRCDIR.gupnp?=	../../net/gupnp
 
 .include "../../devel/glib2/buildlink3.mk"
diff --git a/net/hobbitmon/Makefile b/net/hobbitmon/Makefile
index 1538104da20..eb0983e21c1 100644
--- a/net/hobbitmon/Makefile
+++ b/net/hobbitmon/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.26 2010/02/06 13:58:06 spz Exp $
+# $NetBSD: Makefile,v 1.27 2010/06/13 22:45:10 wiz Exp $
 #
 
 DISTNAME=	hobbit-4.0-beta6
 PKGNAME=	hobbit-4.0b6
-PKGREVISION=	13
+PKGREVISION=	14
 CATEGORIES=	net
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=hobbitmon/}
 
diff --git a/net/jigdo/Makefile b/net/jigdo/Makefile
index 02e18ea615a..eddfc868db6 100644
--- a/net/jigdo/Makefile
+++ b/net/jigdo/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.21 2010/01/17 12:02:32 wiz Exp $
+# $NetBSD: Makefile,v 1.22 2010/06/13 22:45:10 wiz Exp $
 
 DISTNAME=		jigdo-0.7.3
-PKGREVISION=		3
+PKGREVISION=		4
 CATEGORIES=		net
 MASTER_SITES=		http://atterer.net/jigdo/
 EXTRACT_SUFX=		.tar.bz2
diff --git a/net/kdenetwork3/Makefile b/net/kdenetwork3/Makefile
index 412cd24fe05..27e9089df94 100644
--- a/net/kdenetwork3/Makefile
+++ b/net/kdenetwork3/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.74 2010/01/18 09:59:19 wiz Exp $
+# $NetBSD: Makefile,v 1.75 2010/06/13 22:45:10 wiz Exp $
 
 DISTNAME=	kdenetwork-${_KDE_VERSION}
-PKGREVISION=	6
+PKGREVISION=	7
 CATEGORIES=	net
 COMMENT=	Network modules for the KDE integrated X11 desktop
 
diff --git a/net/kdenetwork3/buildlink3.mk b/net/kdenetwork3/buildlink3.mk
index a8fcf986a17..2bca3a28289 100644
--- a/net/kdenetwork3/buildlink3.mk
+++ b/net/kdenetwork3/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.20 2010/01/18 09:59:19 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.21 2010/06/13 22:45:10 wiz Exp $
 
 BUILDLINK_TREE+=	kdenetwork
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=	kdenetwork
 KDENETWORK_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.kdenetwork+=	kdenetwork>=3.5.0nb1
-BUILDLINK_ABI_DEPENDS.kdenetwork?=	kdenetwork>=3.5.10nb6
+BUILDLINK_ABI_DEPENDS.kdenetwork?=	kdenetwork>=3.5.10nb7
 BUILDLINK_PKGSRCDIR.kdenetwork?=	../../net/kdenetwork3
 
 .include "../../converters/uulib/buildlink3.mk"
diff --git a/net/kdenetwork4/Makefile b/net/kdenetwork4/Makefile
index fcde9c979b3..8a4c8e18914 100644
--- a/net/kdenetwork4/Makefile
+++ b/net/kdenetwork4/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.11 2010/06/02 10:14:15 markd Exp $
+# $NetBSD: Makefile,v 1.12 2010/06/13 22:45:10 wiz Exp $
 
 DISTNAME=	kdenetwork-${_KDE_VERSION}
+PKGREVISION=	1
 CATEGORIES=	net
 COMMENT=	Network modules for the KDE integrated X11 desktop
 
diff --git a/net/kftpgrabber/Makefile b/net/kftpgrabber/Makefile
index d8d850d57c6..1ef32a84178 100644
--- a/net/kftpgrabber/Makefile
+++ b/net/kftpgrabber/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.26 2010/01/18 09:59:19 wiz Exp $
+# $NetBSD: Makefile,v 1.27 2010/06/13 22:45:10 wiz Exp $
 
 DISTNAME=	kftpgrabber-0.8.1
-PKGREVISION=	7
+PKGREVISION=	8
 CATEGORIES=	net kde
 MASTER_SITES=	http://www.kftp.org/uploads/files/
 EXTRACT_SUFX=	.tar.bz2
diff --git a/net/kiax/Makefile b/net/kiax/Makefile
index 4d02ac35cc9..099279bfe8f 100644
--- a/net/kiax/Makefile
+++ b/net/kiax/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.16 2010/01/18 09:59:19 wiz Exp $
+# $NetBSD: Makefile,v 1.17 2010/06/13 22:45:11 wiz Exp $
 
 DISTNAME=	kiax-0.8.51-src
 PKGNAME=	${DISTNAME:S/-src//}
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	comms net audio
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=kiax/}
 
diff --git a/net/kmldonkey-kde3/Makefile b/net/kmldonkey-kde3/Makefile
index fa3639ec223..ca68244a6cf 100644
--- a/net/kmldonkey-kde3/Makefile
+++ b/net/kmldonkey-kde3/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.2 2010/02/15 15:31:38 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2010/06/13 22:45:11 wiz Exp $
 
 DISTNAME=	kmldonkey-0.11
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	net
 MASTER_SITES=	${MASTER_SITE_KDE:=apps/KDE3.x/network/}
 
diff --git a/net/kmldonkey/Makefile b/net/kmldonkey/Makefile
index e9aa52ebd04..b001b68ede5 100644
--- a/net/kmldonkey/Makefile
+++ b/net/kmldonkey/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.6 2010/04/10 03:04:47 markd Exp $
+# $NetBSD: Makefile,v 1.7 2010/06/13 22:45:11 wiz Exp $
 #
 
 DISTNAME=	kmldonkey-2.0.2-kde4.4.0
 PKGNAME=	${DISTNAME:S/-kde/./}
+PKGREVISION=	1
 CATEGORIES=	net
 MASTER_SITES=	${MASTER_SITE_KDE:=4.4.0/src/extragear/}
 EXTRACT_SUFX=	.tar.bz2
diff --git a/net/kphone/Makefile b/net/kphone/Makefile
index 92ccc2111cd..e748ceebc5b 100644
--- a/net/kphone/Makefile
+++ b/net/kphone/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.28 2010/01/18 09:59:20 wiz Exp $
+# $NetBSD: Makefile,v 1.29 2010/06/13 22:45:11 wiz Exp $
 
 DISTNAME=		kphone-4.2
-PKGREVISION=		8
+PKGREVISION=		9
 CATEGORIES=		net comms
 MASTER_SITES=		http://www.wirlab.net/kphone/
 
diff --git a/net/ktorrent-kde3/Makefile b/net/ktorrent-kde3/Makefile
index 4614aec4c6c..87443db948d 100644
--- a/net/ktorrent-kde3/Makefile
+++ b/net/ktorrent-kde3/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.2 2010/03/24 19:43:28 asau Exp $
+# $NetBSD: Makefile,v 1.3 2010/06/13 22:45:11 wiz Exp $
 
 DISTNAME=	ktorrent-${KTORRENT_VER}
-PKGREVISION=	5
+PKGREVISION=	6
 CATEGORIES=	net kde
 MASTER_SITES=	http://ktorrent.org/downloads/${KTORRENT_VER}/
 EXTRACT_SUFX=	.tar.bz2
diff --git a/net/ktorrent/Makefile b/net/ktorrent/Makefile
index 96c0514a909..d6f223083f0 100644
--- a/net/ktorrent/Makefile
+++ b/net/ktorrent/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.25 2010/05/01 09:56:46 abs Exp $
+# $NetBSD: Makefile,v 1.26 2010/06/13 22:45:11 wiz Exp $
 
 DISTNAME=	ktorrent-${KTORRENT_VER}
-PKGREVISION=	5
+PKGREVISION=	6
 CATEGORIES=	net kde
 MASTER_SITES=	http://ktorrent.org/downloads/${KTORRENT_VER}/
 EXTRACT_SUFX=	.tar.bz2
diff --git a/net/libgdata/Makefile b/net/libgdata/Makefile
index 54ceb9241e2..86c212983d0 100644
--- a/net/libgdata/Makefile
+++ b/net/libgdata/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.3 2010/05/14 16:40:07 drochner Exp $
+# $NetBSD: Makefile,v 1.4 2010/06/13 22:45:11 wiz Exp $
 #
 
 DISTNAME=	libgdata-0.5.2
+PKGREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/libgdata/0.5/}
 EXTRACT_SUFX=	.tar.bz2
diff --git a/net/libgdata/buildlink3.mk b/net/libgdata/buildlink3.mk
index 39000b7fdc7..155d12c1d64 100644
--- a/net/libgdata/buildlink3.mk
+++ b/net/libgdata/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1.1.1 2009/10/21 18:48:21 drochner Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2010/06/13 22:45:11 wiz Exp $
 
 BUILDLINK_TREE+=	libgdata
 
@@ -6,6 +6,7 @@ BUILDLINK_TREE+=	libgdata
 LIBGDATA_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.libgdata+=	libgdata>=0.1.1
+BUILDLINK_ABI_DEPENDS.libgdata?=	libgdata>=0.5.2nb1
 BUILDLINK_PKGSRCDIR.libgdata?=	../../net/libgdata
 
 
diff --git a/net/libnice/Makefile b/net/libnice/Makefile
index b099a6a45ac..e8b8e4f9ab9 100644
--- a/net/libnice/Makefile
+++ b/net/libnice/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.4 2010/05/02 11:45:35 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2010/06/13 22:45:11 wiz Exp $
 #
 
 DISTNAME=	libnice-0.0.11
+PKGREVISION=	1
 CATEGORIES=	net devel
 MASTER_SITES=	http://nice.freedesktop.org/releases/
 
diff --git a/net/libnice/buildlink3.mk b/net/libnice/buildlink3.mk
index a126f3e020b..b03e546756b 100644
--- a/net/libnice/buildlink3.mk
+++ b/net/libnice/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2010/01/20 14:04:53 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2010/06/13 22:45:11 wiz Exp $
 
 BUILDLINK_TREE+=	libnice
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=	libnice
 LIBNICE_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.libnice+=	libnice>=0.0.9
-BUILDLINK_ABI_DEPENDS.libnice?=	libnice>=0.0.10nb1
+BUILDLINK_ABI_DEPENDS.libnice?=	libnice>=0.0.11nb1
 BUILDLINK_PKGSRCDIR.libnice?=	../../net/libnice
 
 .include "../../devel/glib2/buildlink3.mk"
diff --git a/net/libsoup24/buildlink3.mk b/net/libsoup24/buildlink3.mk
index 7db10a363fb..a4de49a003d 100644
--- a/net/libsoup24/buildlink3.mk
+++ b/net/libsoup24/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.10 2010/03/27 01:40:22 obache Exp $
+# $NetBSD: buildlink3.mk,v 1.11 2010/06/13 22:45:11 wiz Exp $
 
 BUILDLINK_TREE+=	libsoup24
 
@@ -7,7 +7,7 @@ LIBSOUP24_BUILDLINK3_MK:=
 
 # API 2.4.0 but 2.28.0 due to buildlink dependency change
 BUILDLINK_API_DEPENDS.libsoup24+=	libsoup24>=2.28.0
-BUILDLINK_ABI_DEPENDS.libsoup24?=	libsoup24>=2.26.0
+BUILDLINK_ABI_DEPENDS.libsoup24?=	libsoup24>=2.30.1
 BUILDLINK_PKGSRCDIR.libsoup24?=		../../net/libsoup24
 
 .include "../../databases/sqlite3/buildlink3.mk"
diff --git a/net/logjam/Makefile b/net/logjam/Makefile
index 7bb71fb8ca3..d2cf5a82c7d 100644
--- a/net/logjam/Makefile
+++ b/net/logjam/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.17 2010/01/17 12:02:33 wiz Exp $
+# $NetBSD: Makefile,v 1.18 2010/06/13 22:45:11 wiz Exp $
 #
 
 DISTNAME=	logjam-4.5.3
-PKGREVISION=	11
+PKGREVISION=	12
 CATEGORIES=	net
 MASTER_SITES=	http://logjam.danga.com/download/
 EXTRACT_SUFX=	.tar.bz2
diff --git a/net/mldonkey/Makefile b/net/mldonkey/Makefile
index 42b42ce9bf6..6dd3616da1e 100644
--- a/net/mldonkey/Makefile
+++ b/net/mldonkey/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.51 2010/01/18 09:59:20 wiz Exp $
+# $NetBSD: Makefile,v 1.52 2010/06/13 22:45:11 wiz Exp $
 #
 
 .include "Makefile.common"
-PKGREVISION=		1
+PKGREVISION=		2
 
 RCD_SCRIPTS=		mldonkey
 
diff --git a/net/monsoon/Makefile b/net/monsoon/Makefile
index 1c1e3d6f195..090921a855e 100644
--- a/net/monsoon/Makefile
+++ b/net/monsoon/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.8 2010/01/18 09:59:20 wiz Exp $
+# $NetBSD: Makefile,v 1.9 2010/06/13 22:45:12 wiz Exp $
 
 DISTNAME=	monsoon-0.20
-PKGREVISION=	3
+PKGREVISION=	4
 CATEGORIES=	net
 MASTER_SITES=	http://www.monsoon-project.org/jaws/data/files/
 
diff --git a/net/mrtg/Makefile b/net/mrtg/Makefile
index 2ec98303f6c..29301cd2683 100644
--- a/net/mrtg/Makefile
+++ b/net/mrtg/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.96 2010/03/20 21:32:41 adrianp Exp $
+# $NetBSD: Makefile,v 1.97 2010/06/13 22:45:12 wiz Exp $
 
 DISTNAME=	mrtg-2.16.2
-PKGREVISION=	4
+PKGREVISION=	5
 CATEGORIES=	net
 MASTER_SITES=	http://oss.oetiker.ch/mrtg/pub/ \
 		http://oss.oetiker.ch/mrtg/pub/old/
diff --git a/net/nagios-base/Makefile b/net/nagios-base/Makefile
index 6861d4dbc9b..40bbfd0cbb4 100644
--- a/net/nagios-base/Makefile
+++ b/net/nagios-base/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.27 2010/01/18 09:59:20 wiz Exp $
+# $NetBSD: Makefile,v 1.28 2010/06/13 22:45:12 wiz Exp $
 #
 
 DISTNAME=		nagios-3.1.2
 PKGNAME=		${DISTNAME:S/-/-base-/}
-PKGREVISION=		1
+PKGREVISION=		2
 CATEGORIES=		net sysutils
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=nagios/}
 
diff --git a/net/nagstamon/Makefile b/net/nagstamon/Makefile
index 347e47e66a9..370303514ad 100644
--- a/net/nagstamon/Makefile
+++ b/net/nagstamon/Makefile
@@ -1,9 +1,10 @@
-# $NetBSD: Makefile,v 1.1.1.1 2010/04/11 09:24:20 imil Exp $
+# $NetBSD: Makefile,v 1.2 2010/06/13 22:45:12 wiz Exp $
 #
 
 VERSION=	0.9.2
 DISTNAME=	nagstamon_${VERSION}
 PKGNAME=	${DISTNAME:S/_/-/}
+PKGREVISION=	1
 CATEGORIES=	net python
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=nagstamon/}
 
diff --git a/net/nfdump/Makefile b/net/nfdump/Makefile
index 2e9cb774f39..6e0ff6cf32f 100644
--- a/net/nfdump/Makefile
+++ b/net/nfdump/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.7 2010/02/11 22:18:47 joerg Exp $
+# $NetBSD: Makefile,v 1.8 2010/06/13 22:45:12 wiz Exp $
 #
 
 DISTNAME=	nfdump-1.5.7
 #PKGREVISION=	1
+PKGREVISION=	1
 CATEGORIES=	net
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=nfdump/}
 
diff --git a/net/nicotine/Makefile b/net/nicotine/Makefile
index bc44125acf0..87049412da2 100644
--- a/net/nicotine/Makefile
+++ b/net/nicotine/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.31 2009/08/26 19:58:11 sno Exp $
+# $NetBSD: Makefile,v 1.32 2010/06/13 22:45:12 wiz Exp $
 #
 
 DISTNAME=	nicotine-1.0.8
-PKGREVISION=	7
+PKGREVISION=	8
 CATEGORIES=	net audio x11
 MASTER_SITES=	http://nicotine.thegraveyard.org/
 EXTRACT_SUFX=	.tar.bz2
diff --git a/net/ntop/Makefile b/net/ntop/Makefile
index 2e93293d383..501f8d2d1f5 100644
--- a/net/ntop/Makefile
+++ b/net/ntop/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.58 2010/02/11 22:24:33 joerg Exp $
+# $NetBSD: Makefile,v 1.59 2010/06/13 22:45:12 wiz Exp $
 
 DISTNAME=	ntop-3.3.10
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	net
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=ntop/}
 
diff --git a/net/tsclient/Makefile b/net/tsclient/Makefile
index a67bce8aa80..6dc0e2cf958 100644
--- a/net/tsclient/Makefile
+++ b/net/tsclient/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.46 2010/01/18 09:59:21 wiz Exp $
+# $NetBSD: Makefile,v 1.47 2010/06/13 22:45:12 wiz Exp $
 #
 
 DISTNAME=		tsclient-0.132
-PKGREVISION=		24
+PKGREVISION=		25
 CATEGORIES=		net
 MASTER_SITES=		http://www.gnomepro.com/tsclient/
 
diff --git a/net/twitux/Makefile b/net/twitux/Makefile
index 94fb6b433c3..2d35422b5a0 100644
--- a/net/twitux/Makefile
+++ b/net/twitux/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.6 2009/12/21 20:34:06 joerg Exp $
+# $NetBSD: Makefile,v 1.7 2010/06/13 22:45:12 wiz Exp $
 #
 
 DISTNAME=		twitux-0.69
-PKGREVISION=		1
+PKGREVISION=		2
 CATEGORIES=		net gnome
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=twitux/}
 EXTRACT_SUFX=		.tar.bz2
diff --git a/net/urlgfe/Makefile b/net/urlgfe/Makefile
index 5164a0696a1..3d43530e7d6 100644
--- a/net/urlgfe/Makefile
+++ b/net/urlgfe/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.7 2010/01/17 12:02:36 wiz Exp $
+# $NetBSD: Makefile,v 1.8 2010/06/13 22:45:12 wiz Exp $
 #
 
 DISTNAME=		urlgfe-1.0.1
-PKGREVISION=		3
+PKGREVISION=		4
 CATEGORIES=		net
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=urlget/}
 
diff --git a/net/vinagre/Makefile b/net/vinagre/Makefile
index 8d1a4781bfe..ad64c0c122c 100644
--- a/net/vinagre/Makefile
+++ b/net/vinagre/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.9 2010/01/19 20:02:40 drochner Exp $
+# $NetBSD: Makefile,v 1.10 2010/06/13 22:45:13 wiz Exp $
 #
 
 DISTNAME=	vinagre-2.28.1
-PKGREVISION=	3
+PKGREVISION=	4
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/vinagre/2.28/}
 
diff --git a/net/vino/Makefile b/net/vino/Makefile
index 8371ba4c11b..fa5f89976d5 100644
--- a/net/vino/Makefile
+++ b/net/vino/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.37 2010/01/21 18:20:43 drochner Exp $
+# $NetBSD: Makefile,v 1.38 2010/06/13 22:45:13 wiz Exp $
 
 DISTNAME=	vino-2.28.1
+PKGREVISION=	1
 CATEGORIES=	net gnome
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/vino/2.28/}
 EXTRACT_SUFX=	.tar.bz2
diff --git a/net/wistumbler2-gtk/Makefile b/net/wistumbler2-gtk/Makefile
index 5944bd579ef..579b64d1115 100644
--- a/net/wistumbler2-gtk/Makefile
+++ b/net/wistumbler2-gtk/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2009/08/26 19:58:11 sno Exp $
+# $NetBSD: Makefile,v 1.11 2010/06/13 22:45:13 wiz Exp $
 #
 
 PKG_DESTDIR_SUPPORT=	user-destdir
@@ -6,7 +6,7 @@ PKG_DESTDIR_SUPPORT=	user-destdir
 .include "../../net/wistumbler2/Makefile.common"
 
 PKGNAME=		${DISTNAME:S/wistumbler2-/wistumbler2-gtk-/}
-PKGREVISION=		4
+PKGREVISION=		5
 
 CONFLICTS+=		wistumbler2-[0-9]*
 
diff --git a/net/wpa_gui/Makefile b/net/wpa_gui/Makefile
index 62498adaba3..efd0003be4f 100644
--- a/net/wpa_gui/Makefile
+++ b/net/wpa_gui/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.8 2010/01/18 09:59:21 wiz Exp $
+# $NetBSD: Makefile,v 1.9 2010/06/13 22:45:13 wiz Exp $
 
 DISTNAME=	wpa_supplicant-0.6.9
 PKGNAME=	${DISTNAME:S/supplicant/gui/}
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	net
 MASTER_SITES=	http://hostap.epitest.fi/releases/
 
diff --git a/net/xfce4-wavelan-plugin/Makefile b/net/xfce4-wavelan-plugin/Makefile
index c091e18a385..8247483feba 100644
--- a/net/xfce4-wavelan-plugin/Makefile
+++ b/net/xfce4-wavelan-plugin/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2009/08/26 19:57:05 sno Exp $
+# $NetBSD: Makefile,v 1.15 2010/06/13 22:45:13 wiz Exp $
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
@@ -8,7 +8,7 @@ XFCE4_VERSION=	0.5.4
 
 DISTNAME=	xfce4-wavelan-plugin-${XFCE4_VERSION}
 #PKGREVISION=	1
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	sysutils
 MASTER_SITES=	http://goodies.xfce.org/releases/xfce4-wavelan-plugin/
 EXTRACT_SUFX=	.tar.gz
diff --git a/net/xfce4-wavelan-plugin/buildlink3.mk b/net/xfce4-wavelan-plugin/buildlink3.mk
index 8172235a4d4..f9729ac60a9 100644
--- a/net/xfce4-wavelan-plugin/buildlink3.mk
+++ b/net/xfce4-wavelan-plugin/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.17 2009/09/16 01:31:12 reed Exp $
+# $NetBSD: buildlink3.mk,v 1.18 2010/06/13 22:45:13 wiz Exp $
 
 BUILDLINK_TREE+=	xfce4-wavelan-plugin
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=	xfce4-wavelan-plugin
 XFCE4_WAVELAN_PLUGIN_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.xfce4-wavelan-plugin+=	xfce4-wavelan-plugin>=0.5.3
-BUILDLINK_ABI_DEPENDS.xfce4-wavelan-plugin?=	xfce4-wavelan-plugin>=0.5.4nb1
+BUILDLINK_ABI_DEPENDS.xfce4-wavelan-plugin?=	xfce4-wavelan-plugin>=0.5.4nb2
 BUILDLINK_PKGSRCDIR.xfce4-wavelan-plugin?=	../../net/xfce4-wavelan-plugin
 
 .include "../../x11/xfce4-panel/buildlink3.mk"
diff --git a/net/xymon/Makefile b/net/xymon/Makefile
index c8e3571fc01..f8fc511b92a 100644
--- a/net/xymon/Makefile
+++ b/net/xymon/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.3 2010/04/14 19:50:48 spz Exp $
+# $NetBSD: Makefile,v 1.4 2010/06/13 22:45:13 wiz Exp $
 #
 
 DISTNAME=		xymon-4.3.0-beta2
 PKGNAME=		xymon-4.3.0b2
+PKGREVISION=		1
 CATEGORIES=		net
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=hobbitmon/}