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.

87 files changed, 176 insertions, 159 deletions

diff --git a/sysutils/bacula-qt-console/Makefile b/sysutils/bacula-qt-console/Makefile
index a8b922cfbe2..cce52c0acfd 100644
--- a/sysutils/bacula-qt-console/Makefile
+++ b/sysutils/bacula-qt-console/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.11 2010/03/09 07:06:01 adam Exp $
+# $NetBSD: Makefile,v 1.12 2010/06/13 22:45:20 wiz Exp $
 
 PKGNAME=	${DISTNAME:S/-/-qt-console-/}
+PKGREVISION=	1
 COMMENT=	Qt-based console for Bacula - The Network Backup Solution
 
 PKG_DESTDIR_SUPPORT=	user-destdir
diff --git a/sysutils/bacula-tray-monitor/Makefile b/sysutils/bacula-tray-monitor/Makefile
index d3142565a7c..3c44b7b9233 100644
--- a/sysutils/bacula-tray-monitor/Makefile
+++ b/sysutils/bacula-tray-monitor/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.13 2009/10/28 09:30:22 adam Exp $
+# $NetBSD: Makefile,v 1.14 2010/06/13 22:45:20 wiz Exp $
 
 PKGNAME=	${DISTNAME:S/-/-tray-monitor-/}
+PKGREVISION=	1
 COMMENT=	System tray monitor for Bacula - The Network Backup Solution
 
 PKG_DESTDIR_SUPPORT=	user-destdir
diff --git a/sysutils/bacula-wx-console/Makefile b/sysutils/bacula-wx-console/Makefile
index 14138176c30..8318dcd7909 100644
--- a/sysutils/bacula-wx-console/Makefile
+++ b/sysutils/bacula-wx-console/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.17 2010/03/09 07:06:01 adam Exp $
+# $NetBSD: Makefile,v 1.18 2010/06/13 22:45:21 wiz Exp $
 
 PKGNAME=	${DISTNAME:S/-/-wx-console-/}
+PKGREVISION=	1
 COMMENT=	wxWindows-based console for Bacula - The Network Backup Solution
 
 PKG_DESTDIR_SUPPORT=	user-destdir
diff --git a/sysutils/brasero-nautilus/Makefile b/sysutils/brasero-nautilus/Makefile
index 45e83035a70..b9ee5d8d58c 100644
--- a/sysutils/brasero-nautilus/Makefile
+++ b/sysutils/brasero-nautilus/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.4 2009/12/16 17:26:48 drochner Exp $
+# $NetBSD: Makefile,v 1.5 2010/06/13 22:45:21 wiz Exp $
 #
 
 DISTNAME=	brasero-2.28.3
 PKGNAME=	brasero-nautilus-2.28.3
+PKGREVISION=	1
 CATEGORIES=	sysutils gnome
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/brasero/2.28/}
 EXTRACT_SUFX=	.tar.bz2
diff --git a/sysutils/brasero/Makefile b/sysutils/brasero/Makefile
index 12aec78add5..a35344c5353 100644
--- a/sysutils/brasero/Makefile
+++ b/sysutils/brasero/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.16 2010/04/09 19:47:32 drochner Exp $
+# $NetBSD: Makefile,v 1.17 2010/06/13 22:45:21 wiz Exp $
 #
 
 DISTNAME=	brasero-2.28.3
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	sysutils gnome
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/brasero/2.28/}
 EXTRACT_SUFX=	.tar.bz2
diff --git a/sysutils/brasero/buildlink3.mk b/sysutils/brasero/buildlink3.mk
index 9cbf391ed35..4718bf76845 100644
--- a/sysutils/brasero/buildlink3.mk
+++ b/sysutils/brasero/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2009/12/09 19:01:05 drochner Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2010/06/13 22:45:21 wiz Exp $
 
 BUILDLINK_TREE+=	brasero
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=	brasero
 BRASERO_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.brasero+=	brasero>=2.26.0
-BUILDLINK_ABI_DEPENDS.brasero?=	brasero>=2.26.3nb1
+BUILDLINK_ABI_DEPENDS.brasero?=	brasero>=2.28.3nb3
 BUILDLINK_PKGSRCDIR.brasero?=	../../sysutils/brasero
 
 .include "../../devel/glib2/buildlink3.mk"
diff --git a/sysutils/btpin-qt/Makefile b/sysutils/btpin-qt/Makefile
index 8262893fa1f..2f63b4e9b05 100644
--- a/sysutils/btpin-qt/Makefile
+++ b/sysutils/btpin-qt/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.5 2010/01/18 09:59:26 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2010/06/13 22:45:21 wiz Exp $
 
 DISTNAME=		btpin-qt-1.4
-PKGREVISION=		2
+PKGREVISION=		3
 CATEGORIES=		sysutils
 MASTER_SITES=		http://homepages.rya-online.net/plunky/
 
diff --git a/sysutils/bubblemon/Makefile b/sysutils/bubblemon/Makefile
index 2f892687e1a..3ea5c880ccd 100644
--- a/sysutils/bubblemon/Makefile
+++ b/sysutils/bubblemon/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.4 2010/05/30 20:43:35 gdt Exp $
+# $NetBSD: Makefile,v 1.5 2010/06/13 22:45:21 wiz Exp $
 #
 
 DISTNAME=		bubblemon-dockapp-1.46
 PKGNAME=		${DISTNAME:S/-dockapp//}
-PKGREVISION=		2
+PKGREVISION=		3
 CATEGORIES=		sysutils
 MASTER_SITES=		http://www.ne.jp/asahi/linux/timecop/software/
 
diff --git a/sysutils/dbus-qt3/Makefile b/sysutils/dbus-qt3/Makefile
index ab4233edd20..5e76abffbc9 100644
--- a/sysutils/dbus-qt3/Makefile
+++ b/sysutils/dbus-qt3/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.5 2010/01/18 09:59:26 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2010/06/13 22:45:21 wiz Exp $
 #
 
 DISTNAME=	dbus-qt3-0.70
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	sysutils
 MASTER_SITES=	${MASTER_SITE_GENTOO:=distfiles/}
 EXTRACT_SUFX=	.tar.bz2
diff --git a/sysutils/dbus-qt3/buildlink3.mk b/sysutils/dbus-qt3/buildlink3.mk
index 676df3ec5e8..6bcfd0f7e23 100644
--- a/sysutils/dbus-qt3/buildlink3.mk
+++ b/sysutils/dbus-qt3/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2010/01/18 09:59:26 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2010/06/13 22:45:21 wiz Exp $
 
 BUILDLINK_TREE+=	dbus-qt3
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=	dbus-qt3
 DBUS_QT3_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.dbus-qt3+=	dbus-qt3>=0.70
-BUILDLINK_ABI_DEPENDS.dbus-qt3?=	dbus-qt3>=0.70nb2
+BUILDLINK_ABI_DEPENDS.dbus-qt3?=	dbus-qt3>=0.70nb3
 BUILDLINK_PKGSRCDIR.dbus-qt3?=	../../sysutils/dbus-qt3
 
 .include "../../sysutils/dbus/buildlink3.mk"
diff --git a/sysutils/dvdisaster/Makefile b/sysutils/dvdisaster/Makefile
index 329d88305b4..f18dd41c9cf 100644
--- a/sysutils/dvdisaster/Makefile
+++ b/sysutils/dvdisaster/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.6 2009/08/26 19:58:17 sno Exp $
+# $NetBSD: Makefile,v 1.7 2010/06/13 22:45:21 wiz Exp $
 #
 
 DISTNAME=		dvdisaster-0.70.6
-PKGREVISION=		1
+PKGREVISION=		2
 CATEGORIES=		sysutils
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=dvdisaster/}
 EXTRACT_SUFX=		.tar.bz2
diff --git a/sysutils/filelight/Makefile b/sysutils/filelight/Makefile
index bc3e5464360..07912c28e74 100644
--- a/sysutils/filelight/Makefile
+++ b/sysutils/filelight/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.18 2010/04/30 08:12:14 wiz Exp $
+# $NetBSD: Makefile,v 1.19 2010/06/13 22:45:21 wiz Exp $
 #
 
 DISTNAME=	filelight-1.0
-PKGREVISION=	12
+PKGREVISION=	13
 CATEGORIES=	sysutils
 MASTER_SITES=	http://www.methylblue.com/filelight/packages/
 EXTRACT_SUFX=	.tar.bz2
diff --git a/sysutils/fsviewer/Makefile b/sysutils/fsviewer/Makefile
index 826c808e124..fe9285c03b4 100644
--- a/sysutils/fsviewer/Makefile
+++ b/sysutils/fsviewer/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.27 2010/01/18 09:59:26 wiz Exp $
+# $NetBSD: Makefile,v 1.28 2010/06/13 22:45:21 wiz Exp $
 
 DISTNAME=	FSViewer.app-0.2.5
 PKGNAME=	FSViewer-0.2.5
-PKGREVISION=	5
+PKGREVISION=	6
 CATEGORIES=	sysutils x11 windowmaker
 MASTER_SITES=	http://www.bayernline.de/~gscholz/linux/fsviewer/
 
diff --git a/sysutils/ftwin/Makefile b/sysutils/ftwin/Makefile
index 2522f9e999d..bbbc664f3ab 100644
--- a/sysutils/ftwin/Makefile
+++ b/sysutils/ftwin/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.7 2010/01/18 09:59:26 wiz Exp $
+# $NetBSD: Makefile,v 1.8 2010/06/13 22:45:21 wiz Exp $
 #
 
 DISTNAME=	ftwin-0.8.5
-PKGREVISION=	3
+PKGREVISION=	4
 CATEGORIES=	sysutils
 MASTER_SITES=	http://download.meroware.org/ftwin/
 EXTRACT_SUFX=	.tar.bz2
diff --git a/sysutils/gcdmaster/Makefile b/sysutils/gcdmaster/Makefile
index 971eee9aade..22de612343c 100644
--- a/sysutils/gcdmaster/Makefile
+++ b/sysutils/gcdmaster/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.46 2010/05/19 18:22:14 drochner Exp $
+# $NetBSD: Makefile,v 1.47 2010/06/13 22:45:21 wiz Exp $
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
 .include "../../sysutils/cdrdao/Makefile.common"
 
-PKGREVISION=	1
+PKGREVISION=	2
 
 PKGNAME=	gcdmaster-${CDRDAO_VER}
 COMMENT=	Gnome UI frontend to cdrdao
diff --git a/sysutils/gkrellm-est/Makefile b/sysutils/gkrellm-est/Makefile
index d19f4c6091a..db673111a47 100644
--- a/sysutils/gkrellm-est/Makefile
+++ b/sysutils/gkrellm-est/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.16 2010/01/27 18:57:54 joerg Exp $
+# $NetBSD: Makefile,v 1.17 2010/06/13 22:45:22 wiz Exp $
 #
 
 DISTNAME=		gkrellm-est-20040710
-PKGREVISION=		7
+PKGREVISION=		8
 CATEGORIES=		sysutils
 MASTER_SITES=		http://cubidou.nerim.net/gkrellm-est/
 
diff --git a/sysutils/gkrellm/Makefile b/sysutils/gkrellm/Makefile
index b085c862c9d..a566ec52bef 100644
--- a/sysutils/gkrellm/Makefile
+++ b/sysutils/gkrellm/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.59 2009/08/26 19:57:01 sno Exp $
+# $NetBSD: Makefile,v 1.60 2010/06/13 22:45:22 wiz Exp $
 .include "Makefile.common"
 
-PKGREVISION=		2
+PKGREVISION=		3
 
 GKRELLM_PKGBASE=	gkrellm
 WRKSRC=			${GKRELLM_SRCDIR}
diff --git a/sysutils/gkrellm/buildlink3.mk b/sysutils/gkrellm/buildlink3.mk
index 9d389d35899..11390f1a743 100644
--- a/sysutils/gkrellm/buildlink3.mk
+++ b/sysutils/gkrellm/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.16 2009/08/26 19:57:01 sno Exp $
+# $NetBSD: buildlink3.mk,v 1.17 2010/06/13 22:45:22 wiz Exp $
 
 BUILDLINK_TREE+=	gkrellm
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=	gkrellm
 GKRELLM_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.gkrellm+=	gkrellm>=2.1.22
-BUILDLINK_ABI_DEPENDS.gkrellm?=	gkrellm>=2.2.10nb2
+BUILDLINK_ABI_DEPENDS.gkrellm?=	gkrellm>=2.2.10nb3
 BUILDLINK_PKGSRCDIR.gkrellm?=	../../sysutils/gkrellm
 
 .include "../../devel/glib2/buildlink3.mk"
diff --git a/sysutils/gnome-commander/Makefile b/sysutils/gnome-commander/Makefile
index b55b48b4dcf..39c5ee5de48 100644
--- a/sysutils/gnome-commander/Makefile
+++ b/sysutils/gnome-commander/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.9 2010/02/24 18:45:43 drochner Exp $
+# $NetBSD: Makefile,v 1.10 2010/06/13 22:45:22 wiz Exp $
 #
 
 DISTNAME=		gnome-commander-1.2.8.5
+PKGREVISION=		1
 CATEGORIES=		sysutils
 MASTER_SITES=		${MASTER_SITE_GNOME:=sources/gnome-commander/1.2/}
 EXTRACT_SUFX=		.tar.bz2
diff --git a/sysutils/gnome-device-manager/Makefile b/sysutils/gnome-device-manager/Makefile
index 030e1732603..def611b6191 100644
--- a/sysutils/gnome-device-manager/Makefile
+++ b/sysutils/gnome-device-manager/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.5 2010/01/27 19:03:58 joerg Exp $
+# $NetBSD: Makefile,v 1.6 2010/06/13 22:45:22 wiz Exp $
 #
 
 DISTNAME=	gnome-device-manager-0.2
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	sysutils gnome
 MASTER_SITES=	http://hal.freedesktop.org/releases/
 EXTRACT_SUFX=	.tar.bz2
diff --git a/sysutils/gnome-mount/Makefile b/sysutils/gnome-mount/Makefile
index 79530c06fdc..0ddcdfa25ff 100644
--- a/sysutils/gnome-mount/Makefile
+++ b/sysutils/gnome-mount/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.6 2009/08/26 19:57:01 sno Exp $
+# $NetBSD: Makefile,v 1.7 2010/06/13 22:45:22 wiz Exp $
 #
 
 DISTNAME=		gnome-mount-0.8
-PKGREVISION=		2
+PKGREVISION=		3
 CATEGORIES=		sysutils gnome
 MASTER_SITES=		http://hal.freedesktop.org/releases/
 
diff --git a/sysutils/gnome-mount/buildlink3.mk b/sysutils/gnome-mount/buildlink3.mk
index 549e2820f9a..3bc62026bd0 100644
--- a/sysutils/gnome-mount/buildlink3.mk
+++ b/sysutils/gnome-mount/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2009/08/26 19:57:01 sno Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2010/06/13 22:45:22 wiz Exp $
 
 BUILDLINK_TREE+=	gnome-mount
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=	gnome-mount
 GNOME_MOUNT_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.gnome-mount+=	gnome-mount>=0.8nb1
-BUILDLINK_ABI_DEPENDS.gnome-mount?=	gnome-mount>=0.8nb2
+BUILDLINK_ABI_DEPENDS.gnome-mount?=	gnome-mount>=0.8nb3
 BUILDLINK_PKGSRCDIR.gnome-mount?=	../../sysutils/gnome-mount
 
 #.include "../../security/gnome-keyring/buildlink3.mk"
diff --git a/sysutils/gnome-nds-thumbnailer/Makefile b/sysutils/gnome-nds-thumbnailer/Makefile
index 55896cb338d..f9eeeac9aff 100644
--- a/sysutils/gnome-nds-thumbnailer/Makefile
+++ b/sysutils/gnome-nds-thumbnailer/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.4 2009/08/26 19:58:18 sno Exp $
+# $NetBSD: Makefile,v 1.5 2010/06/13 22:45:22 wiz Exp $
 #
 
 DISTNAME=	gnome-nds-thumbnailer-1.2.1
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	sysutils graphics emulators
 MASTER_SITES=	http://download.gnome.org/sources/gnome-nds-thumbnailer/1.2/
 EXTRACT_SUFX=	.tar.bz2
diff --git a/sysutils/gnome-pkgview/Makefile b/sysutils/gnome-pkgview/Makefile
index ed017d05f18..8947d84b267 100644
--- a/sysutils/gnome-pkgview/Makefile
+++ b/sysutils/gnome-pkgview/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.29 2010/01/18 09:59:26 wiz Exp $
+# $NetBSD: Makefile,v 1.30 2010/06/13 22:45:22 wiz Exp $
 #
 
 DISTNAME=	gnome-pkgview-1.0.6
-PKGREVISION=	15
+PKGREVISION=	16
 CATEGORIES=	sysutils gnome
 MASTER_SITES=	http://www.greatnorthern.demon.co.uk/packages/gnome-pkgview/
 
diff --git a/sysutils/gnome-power-manager/Makefile b/sysutils/gnome-power-manager/Makefile
index 770261f37df..2439fea8307 100644
--- a/sysutils/gnome-power-manager/Makefile
+++ b/sysutils/gnome-power-manager/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.9 2010/01/18 09:59:26 wiz Exp $
+# $NetBSD: Makefile,v 1.10 2010/06/13 22:45:22 wiz Exp $
 #
 
 DISTNAME=	gnome-power-manager-2.24.4
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	sysutils gnome
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/gnome-power-manager/2.24/}
 EXTRACT_SUFX=	.tar.bz2
diff --git a/sysutils/gnome-settings-daemon/Makefile b/sysutils/gnome-settings-daemon/Makefile
index 0bec7945a9f..db55e0ff67e 100644
--- a/sysutils/gnome-settings-daemon/Makefile
+++ b/sysutils/gnome-settings-daemon/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.17 2010/02/16 13:35:40 wiz Exp $
+# $NetBSD: Makefile,v 1.18 2010/06/13 22:45:22 wiz Exp $
 #
 
 DISTNAME=	gnome-settings-daemon-2.28.1
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	sysutils
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/gnome-settings-daemon/2.28/}
 EXTRACT_SUFX=	.tar.bz2
diff --git a/sysutils/gnome-system-monitor/Makefile b/sysutils/gnome-system-monitor/Makefile
index 8d205104fa4..019c570a6a6 100644
--- a/sysutils/gnome-system-monitor/Makefile
+++ b/sysutils/gnome-system-monitor/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.17 2009/08/26 19:58:18 sno Exp $
+# $NetBSD: Makefile,v 1.18 2010/06/13 22:45:22 wiz Exp $
 #
 
 DISTNAME=	gnome-system-monitor-2.26.2
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	sysutils gnome
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/gnome-system-monitor/2.26/}
 EXTRACT_SUFX=	.tar.bz2
diff --git a/sysutils/gnome-system-tools/Makefile b/sysutils/gnome-system-tools/Makefile
index 8da036b0b29..4afcdf93f89 100644
--- a/sysutils/gnome-system-tools/Makefile
+++ b/sysutils/gnome-system-tools/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.5 2009/08/26 19:58:19 sno Exp $
+# $NetBSD: Makefile,v 1.6 2010/06/13 22:45:22 wiz Exp $
 #
 
 DISTNAME=		gnome-system-tools-2.22.2
-PKGREVISION=		1
+PKGREVISION=		2
 CATEGORIES=		sysutils gnome
 MASTER_SITES=		${MASTER_SITE_GNOME:=sources/gnome-system-tools/2.22/}
 EXTRACT_SUFX=		.tar.bz2
diff --git a/sysutils/gnome-vfs-monikers/Makefile b/sysutils/gnome-vfs-monikers/Makefile
index a9dcae73102..2db3fc8923a 100644
--- a/sysutils/gnome-vfs-monikers/Makefile
+++ b/sysutils/gnome-vfs-monikers/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.6 2008/06/20 01:09:36 joerg Exp $
+# $NetBSD: Makefile,v 1.7 2010/06/13 22:45:23 wiz Exp $
 #
 
 DISTNAME=	gnome-vfs-monikers-2.15.3
-PKGREVISION=	4
+PKGREVISION=	5
 CATEGORIES=	sysutils
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/gnome-vfs-monikers/2.15/}
 EXTRACT_SUFX=	.tar.bz2
diff --git a/sysutils/gnome-vfs/Makefile b/sysutils/gnome-vfs/Makefile
index b83c150cd87..f3993a99693 100644
--- a/sysutils/gnome-vfs/Makefile
+++ b/sysutils/gnome-vfs/Makefile
@@ -1,4 +1,6 @@
-# $NetBSD: Makefile,v 1.78 2010/06/11 13:25:27 drochner Exp $
+# $NetBSD: Makefile,v 1.79 2010/06/13 22:45:22 wiz Exp $
+
+PKGREVISION=		1
 
 PKGCONFIG_OVERRIDE=	gnome-vfs-2.0.pc.in
 PKGCONFIG_OVERRIDE+=	gnome-vfs-module-2.0.pc.in
diff --git a/sysutils/gnome-vfs/buildlink3.mk b/sysutils/gnome-vfs/buildlink3.mk
index 8ae9be506b5..6349bbbf4f7 100644
--- a/sysutils/gnome-vfs/buildlink3.mk
+++ b/sysutils/gnome-vfs/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.22 2009/12/13 09:34:33 obache Exp $
+# $NetBSD: buildlink3.mk,v 1.23 2010/06/13 22:45:23 wiz Exp $
 
 BUILDLINK_TREE+=	gnome-vfs
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=	gnome-vfs
 GNOME_VFS_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.gnome-vfs+=	gnome-vfs>=2.8.0
-BUILDLINK_ABI_DEPENDS.gnome-vfs+=	gnome-vfs>=2.20.1nb1
+BUILDLINK_ABI_DEPENDS.gnome-vfs+=	gnome-vfs>=2.24.3nb1
 BUILDLINK_PKGSRCDIR.gnome-vfs?=		../../sysutils/gnome-vfs
 
 .include "../../devel/GConf/buildlink3.mk"
diff --git a/sysutils/gnome-vfsmm/Makefile b/sysutils/gnome-vfsmm/Makefile
index 33ac4b22b65..88614f1e71e 100644
--- a/sysutils/gnome-vfsmm/Makefile
+++ b/sysutils/gnome-vfsmm/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.21 2009/03/22 10:27:55 wiz Exp $
+# $NetBSD: Makefile,v 1.22 2010/06/13 22:45:23 wiz Exp $
 
 DISTNAME=	gnome-vfsmm-2.26.0
+PKGREVISION=	1
 CATEGORIES=	sysutils
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/gnome-vfsmm/2.26/}
 EXTRACT_SUFX=	.tar.bz2
diff --git a/sysutils/gnome-vfsmm/buildlink3.mk b/sysutils/gnome-vfsmm/buildlink3.mk
index 2491b8c62d5..8a5f453fe02 100644
--- a/sysutils/gnome-vfsmm/buildlink3.mk
+++ b/sysutils/gnome-vfsmm/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.14 2009/03/20 19:25:24 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.15 2010/06/13 22:45:23 wiz Exp $
 
 BUILDLINK_TREE+=	gnome-vfsmm
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=	gnome-vfsmm
 GNOME_VFSMM_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.gnome-vfsmm+=	gnome-vfsmm>=2.10.0
-BUILDLINK_ABI_DEPENDS.gnome-vfsmm+=	gnome-vfsmm>=2.20.0nb1
+BUILDLINK_ABI_DEPENDS.gnome-vfsmm+=	gnome-vfsmm>=2.26.0nb1
 BUILDLINK_PKGSRCDIR.gnome-vfsmm?=	../../sysutils/gnome-vfsmm
 
 .include "../../devel/glibmm/buildlink3.mk"
diff --git a/sysutils/gnome-volume-manager/Makefile b/sysutils/gnome-volume-manager/Makefile
index 9c3338095b4..b199f44748a 100644
--- a/sysutils/gnome-volume-manager/Makefile
+++ b/sysutils/gnome-volume-manager/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.7 2010/01/18 09:59:26 wiz Exp $
+# $NetBSD: Makefile,v 1.8 2010/06/13 22:45:23 wiz Exp $
 #
 
 DISTNAME=	gnome-volume-manager-2.24.1
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	sysutils gnome
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/gnome-volume-manager/2.24/}
 EXTRACT_SUFX=	.tar.bz2
diff --git a/sysutils/grun/Makefile b/sysutils/grun/Makefile
index c83c267ae35..e4b4fe5e1e5 100644
--- a/sysutils/grun/Makefile
+++ b/sysutils/grun/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.21 2009/08/26 20:22:49 wiz Exp $
+# $NetBSD: Makefile,v 1.22 2010/06/13 22:45:23 wiz Exp $
 
 DISTNAME=	grun-0.9.3
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	misc
 MASTER_SITES=	http://grun.googlecode.com/files/
 
diff --git a/sysutils/gst-plugins0.10-gnomevfs/Makefile b/sysutils/gst-plugins0.10-gnomevfs/Makefile
index ec889819179..6591125b6de 100644
--- a/sysutils/gst-plugins0.10-gnomevfs/Makefile
+++ b/sysutils/gst-plugins0.10-gnomevfs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2008/06/20 01:09:36 joerg Exp $
+# $NetBSD: Makefile,v 1.16 2010/06/13 22:45:23 wiz Exp $
 #
 
 GST_PLUGINS0.10_NAME=	gnomevfs
@@ -9,5 +9,7 @@ PKG_DESTDIR_SUPPORT=	user-destdir
 
 .include "../../multimedia/gst-plugins0.10-base/Makefile.common"
 
+PKGREVISION=		1
+
 .include "../../sysutils/gnome-vfs/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/gtk-send-pr/Makefile b/sysutils/gtk-send-pr/Makefile
index 6a19fcc873e..357b8f3151b 100644
--- a/sysutils/gtk-send-pr/Makefile
+++ b/sysutils/gtk-send-pr/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.31 2010/01/27 19:07:31 joerg Exp $
+# $NetBSD: Makefile,v 1.32 2010/06/13 22:45:23 wiz Exp $
 #
 
 DISTNAME=		gtk-send-pr-0.4.9
-PKGREVISION=		3
+PKGREVISION=		4
 CATEGORIES=		sysutils
 MASTER_SITES=		http://download.berlios.de/gtk-send-pr/
 EXTRACT_SUFX=		.tar.bz2
diff --git a/sysutils/gvfs/Makefile b/sysutils/gvfs/Makefile
index 123f273d588..9f496faf45d 100644
--- a/sysutils/gvfs/Makefile
+++ b/sysutils/gvfs/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.25 2010/06/11 13:53:02 drochner Exp $
+# $NetBSD: Makefile,v 1.26 2010/06/13 22:45:23 wiz Exp $
 #
 
 DISTNAME=	gvfs-1.6.2
+PKGREVISION=	1
 CATEGORIES=	sysutils
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/gvfs/1.6/}
 EXTRACT_SUFX=	.tar.bz2
diff --git a/sysutils/idesk/Makefile b/sysutils/idesk/Makefile
index 31974d13746..3231e1feadb 100644
--- a/sysutils/idesk/Makefile
+++ b/sysutils/idesk/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.24 2010/01/27 19:10:29 joerg Exp $
+# $NetBSD: Makefile,v 1.25 2010/06/13 22:45:23 wiz Exp $
 #
 
 DISTNAME=	idesk-0.7.5
-PKGREVISION=	3
+PKGREVISION=	4
 CATEGORIES=	sysutils x11
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=idesk/}
 EXTRACT_SUFX=	.tar.bz2
diff --git a/sysutils/k3b/Makefile b/sysutils/k3b/Makefile
index 1fade2f6b33..14726f72af1 100644
--- a/sysutils/k3b/Makefile
+++ b/sysutils/k3b/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.32 2010/01/18 09:59:27 wiz Exp $
+# $NetBSD: Makefile,v 1.33 2010/06/13 22:45:23 wiz Exp $
 #
 
 DISTNAME=		k3b-1.0.5
-PKGREVISION=		6
+PKGREVISION=		7
 CATEGORIES=		sysutils
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=k3b/}
 EXTRACT_SUFX=		.tar.bz2
diff --git a/sysutils/kdirstat/Makefile b/sysutils/kdirstat/Makefile
index 276a020b1bc..daaf02e6171 100644
--- a/sysutils/kdirstat/Makefile
+++ b/sysutils/kdirstat/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.35 2010/01/18 09:59:27 wiz Exp $
+# $NetBSD: Makefile,v 1.36 2010/06/13 22:45:23 wiz Exp $
 
 DISTNAME=	kdirstat-2.4.4
-PKGREVISION=	6
+PKGREVISION=	7
 CATEGORIES=	sysutils kde
 MASTER_SITES=	http://kdirstat.sourceforge.net/download/
 EXTRACT_SUFX=	.tar.bz2
diff --git a/sysutils/krusader/Makefile b/sysutils/krusader/Makefile
index 03e8b3cec8b..ca78cca6477 100644
--- a/sysutils/krusader/Makefile
+++ b/sysutils/krusader/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.28 2010/01/27 19:27:08 joerg Exp $
+# $NetBSD: Makefile,v 1.29 2010/06/13 22:45:23 wiz Exp $
 #
 
 DISTNAME=	krusader-1.90.0
-PKGREVISION=	5
+PKGREVISION=	6
 CATEGORIES=	kde sysutils
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=krusader/}
 
diff --git a/sysutils/libgksu/Makefile b/sysutils/libgksu/Makefile
index 491f5d1d13f..c743adc26dd 100644
--- a/sysutils/libgksu/Makefile
+++ b/sysutils/libgksu/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.5 2010/01/27 19:12:29 joerg Exp $
+# $NetBSD: Makefile,v 1.6 2010/06/13 22:45:24 wiz Exp $
 #
 
 DISTNAME=	libgksu-2.0.7
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	sysutils
 MASTER_SITES=	http://people.debian.org/~kov/gksu/
 
diff --git a/sysutils/libgksu/buildlink3.mk b/sysutils/libgksu/buildlink3.mk
index 749ac08e5a8..e16b53849eb 100644
--- a/sysutils/libgksu/buildlink3.mk
+++ b/sysutils/libgksu/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2009/08/26 19:56:57 sno Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2010/06/13 22:45:24 wiz Exp $
 
 BUILDLINK_TREE+=	libgksu
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=	libgksu
 LIBGKSU_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.libgksu+=	libgksu>=2.0.7
-BUILDLINK_ABI_DEPENDS.libgksu?=	libgksu>=2.0.7nb2
+BUILDLINK_ABI_DEPENDS.libgksu?=	libgksu>=2.0.7nb3
 BUILDLINK_PKGSRCDIR.libgksu?=	../../sysutils/libgksu
 
 .include "../../security/gnome-keyring/buildlink3.mk"
diff --git a/sysutils/libnotify/Makefile b/sysutils/libnotify/Makefile
index 8d9ac8fe980..ec2fb98b737 100644
--- a/sysutils/libnotify/Makefile
+++ b/sysutils/libnotify/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.10 2009/08/26 19:56:56 sno Exp $
+# $NetBSD: Makefile,v 1.11 2010/06/13 22:45:24 wiz Exp $
 #
 
 DISTNAME=	libnotify-0.4.5
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	sysutils gnome
 MASTER_SITES=	http://www.galago-project.org/files/releases/source/libnotify/
 
diff --git a/sysutils/libnotify/buildlink3.mk b/sysutils/libnotify/buildlink3.mk
index d6e31dc2fc9..cb8175e529b 100644
--- a/sysutils/libnotify/buildlink3.mk
+++ b/sysutils/libnotify/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.8 2009/10/30 16:54:07 drochner Exp $
+# $NetBSD: buildlink3.mk,v 1.9 2010/06/13 22:45:24 wiz Exp $
 
 BUILDLINK_TREE+=	libnotify
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=	libnotify
 LIBNOTIFY_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.libnotify+=	libnotify>=0.3.2
-BUILDLINK_ABI_DEPENDS.libnotify?=	libnotify>=0.4.5nb1
+BUILDLINK_ABI_DEPENDS.libnotify?=	libnotify>=0.4.5nb2
 BUILDLINK_PKGSRCDIR.libnotify?=	../../sysutils/libnotify
 
 .include "../../devel/glib2/buildlink3.mk"
diff --git a/sysutils/nautilus-cd-burner/Makefile b/sysutils/nautilus-cd-burner/Makefile
index 47eb0c7dd89..a2305e8d1ef 100644
--- a/sysutils/nautilus-cd-burner/Makefile
+++ b/sysutils/nautilus-cd-burner/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.59 2010/01/18 09:59:27 wiz Exp $
+# $NetBSD: Makefile,v 1.60 2010/06/13 22:45:24 wiz Exp $
 #
 
 DISTNAME=	nautilus-cd-burner-2.24.0
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	sysutils gnome
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/nautilus-cd-burner/2.24/}
 EXTRACT_SUFX=	.tar.bz2
diff --git a/sysutils/nautilus-sendto/Makefile b/sysutils/nautilus-sendto/Makefile
index 4f7d8f59b3c..9653f86f653 100644
--- a/sysutils/nautilus-sendto/Makefile
+++ b/sysutils/nautilus-sendto/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.8 2010/01/20 14:04:53 wiz Exp $
+# $NetBSD: Makefile,v 1.9 2010/06/13 22:45:24 wiz Exp $
 #
 
 DISTNAME=		nautilus-sendto-1.1.5
-PKGREVISION=		4
+PKGREVISION=		5
 CATEGORIES=		sysutils gnome
 MASTER_SITES=		${MASTER_SITE_GNOME:=sources/nautilus-sendto/1.1/}
 EXTRACT_SUFX=		.tar.bz2
diff --git a/sysutils/nautilus/Makefile b/sysutils/nautilus/Makefile
index ce7271eacb3..ac19d304d98 100644
--- a/sysutils/nautilus/Makefile
+++ b/sysutils/nautilus/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.107 2010/06/11 08:40:03 wiz Exp $
+# $NetBSD: Makefile,v 1.108 2010/06/13 22:45:24 wiz Exp $
 #
 
 DISTNAME=		nautilus-2.28.4
-PKGREVISION=		1
+PKGREVISION=		2
 CATEGORIES=		sysutils gnome
 MASTER_SITES=		${MASTER_SITE_GNOME:=sources/nautilus/2.28/}
 EXTRACT_SUFX=		.tar.bz2
diff --git a/sysutils/nautilus/buildlink3.mk b/sysutils/nautilus/buildlink3.mk
index 02ce8429222..f9e076d2c80 100644
--- a/sysutils/nautilus/buildlink3.mk
+++ b/sysutils/nautilus/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.36 2009/08/26 19:56:54 sno Exp $
+# $NetBSD: buildlink3.mk,v 1.37 2010/06/13 22:45:24 wiz Exp $
 
 BUILDLINK_TREE+=	nautilus
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=	nautilus
 NAUTILUS_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.nautilus+=	nautilus>=2.12.1nb1
-BUILDLINK_ABI_DEPENDS.nautilus?=	nautilus>=2.26.3nb2
+BUILDLINK_ABI_DEPENDS.nautilus?=	nautilus>=2.28.4nb2
 BUILDLINK_PKGSRCDIR.nautilus?=	../../sysutils/nautilus
 
 .include "../../devel/GConf/buildlink3.mk"
diff --git a/sysutils/notification-daemon/Makefile b/sysutils/notification-daemon/Makefile
index 396495b5b93..88fbf566660 100644
--- a/sysutils/notification-daemon/Makefile
+++ b/sysutils/notification-daemon/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.14 2009/08/26 19:58:20 sno Exp $
+# $NetBSD: Makefile,v 1.15 2010/06/13 22:45:24 wiz Exp $
 #
 
 DISTNAME=	notification-daemon-0.4.0
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	sysutils gnome
 MASTER_SITES=	http://www.galago-project.org/files/releases/source/notification-daemon/
 
diff --git a/sysutils/pcmanfm/Makefile b/sysutils/pcmanfm/Makefile
index 7b86d1915a0..d98add2488e 100644
--- a/sysutils/pcmanfm/Makefile
+++ b/sysutils/pcmanfm/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.7 2009/08/26 19:58:20 sno Exp $
+# $NetBSD: Makefile,v 1.8 2010/06/13 22:45:24 wiz Exp $
 #
 
 DISTNAME=	pcmanfm-0.1.8.9
-PKGREVISION=	3
+PKGREVISION=	4
 CATEGORIES=	sysutils
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=pcmanfm/}
 
diff --git a/sysutils/pfstat/Makefile b/sysutils/pfstat/Makefile
index a160b0cd91e..29ebd9adcf1 100644
--- a/sysutils/pfstat/Makefile
+++ b/sysutils/pfstat/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.15 2010/05/25 21:05:22 wiz Exp $
+# $NetBSD: Makefile,v 1.16 2010/06/13 22:45:24 wiz Exp $
 
 DISTNAME=	pfstat-2.3
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	sysutils net
 MASTER_SITES=	http://www.benzedrine.cx/
 
diff --git a/sysutils/py-notify/Makefile b/sysutils/py-notify/Makefile
index ccf90c4d3ca..508e8eb3b1f 100644
--- a/sysutils/py-notify/Makefile
+++ b/sysutils/py-notify/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.12 2010/02/10 21:09:05 joerg Exp $
+# $NetBSD: Makefile,v 1.13 2010/06/13 22:45:25 wiz Exp $
 #
 
 DISTNAME=	notify-python-0.1.1
 PKGNAME=	${PYPKGPREFIX}-notify-0.1.1
-PKGREVISION=	3
+PKGREVISION=	4
 CATEGORIES=	sysutils
 MASTER_SITES= \
  http://www.galago-project.org/files/releases/source/notify-python/
diff --git a/sysutils/py-notify/buildlink3.mk b/sysutils/py-notify/buildlink3.mk
index fb32f49cde1..3a102e65b8f 100644
--- a/sysutils/py-notify/buildlink3.mk
+++ b/sysutils/py-notify/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2009/08/27 18:53:37 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2010/06/13 22:45:25 wiz Exp $
 
 BUILDLINK_TREE+=	py-notify
 
@@ -8,7 +8,7 @@ PY_NOTIFY_BUILDLINK3_MK:=
 .include "../../lang/python/pyversion.mk"
 
 BUILDLINK_API_DEPENDS.py-notify+=	${PYPKGPREFIX}-notify>=0.1.1
-BUILDLINK_ABI_DEPENDS.py-notify?=	${PYPKGPREFIX}-notify>=0.1.1nb2
+BUILDLINK_ABI_DEPENDS.py-notify?=	${PYPKGPREFIX}-notify>=0.1.1nb4
 BUILDLINK_PKGSRCDIR.py-notify?=	../../sysutils/py-notify
 
 .include "../../x11/py-gtk2/buildlink3.mk"
diff --git a/sysutils/rox/Makefile b/sysutils/rox/Makefile
index ccc6065df80..c9a6114fb20 100644
--- a/sysutils/rox/Makefile
+++ b/sysutils/rox/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.49 2009/12/10 16:28:44 joerg Exp $
+# $NetBSD: Makefile,v 1.50 2010/06/13 22:45:25 wiz Exp $
 #
 
 DISTNAME=	rox-filer-2.10
 PKGNAME=	rox-2.10
+PKGREVISION=	1
 CATEGORIES=	sysutils
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=rox/}
 EXTRACT_SUFX=	.tar.bz2
diff --git a/sysutils/ruby-gnome2-gnomevfs/Makefile b/sysutils/ruby-gnome2-gnomevfs/Makefile
index 30282dce2e4..1b409a329b7 100644
--- a/sysutils/ruby-gnome2-gnomevfs/Makefile
+++ b/sysutils/ruby-gnome2-gnomevfs/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.2 2008/10/28 13:43:58 obache Exp $
+# $NetBSD: Makefile,v 1.3 2010/06/13 22:45:25 wiz Exp $
 #
 
 PKGNAME=		${RUBY_PKGPREFIX}-gnome2-gnomevfs-${VERSION}
 COMMENT=		Ruby binding of gnomevfs
+PKGREVISION=		1
 CATEGORIES=		sysutils
 
 PKG_DESTDIR_SUPPORT=	user-destdir
diff --git a/sysutils/screentest/Makefile b/sysutils/screentest/Makefile
index 1a6f6985e1f..00e6665e0c2 100644
--- a/sysutils/screentest/Makefile
+++ b/sysutils/screentest/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.14 2009/12/03 19:10:49 joerg Exp $
+# $NetBSD: Makefile,v 1.15 2010/06/13 22:45:25 wiz Exp $
 
 DISTNAME=	screentest-2.0
+PKGREVISION=	1
 CATEGORIES=	sysutils x11
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=screentest/}
 
diff --git a/sysutils/strigi/Makefile b/sysutils/strigi/Makefile
index 9508a845846..14695f01685 100644
--- a/sysutils/strigi/Makefile
+++ b/sysutils/strigi/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.6 2010/01/18 09:59:27 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2010/06/13 22:45:25 wiz Exp $
 
 DISTNAME=	strigi-0.6.4
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	sysutils
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=strigi/}
 EXTRACT_SUFX=	.tar.bz2
diff --git a/sysutils/ups-nut-cgi/Makefile b/sysutils/ups-nut-cgi/Makefile
index 3f287a47335..697d25d0451 100644
--- a/sysutils/ups-nut-cgi/Makefile
+++ b/sysutils/ups-nut-cgi/Makefile
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.50 2010/02/17 15:39:02 joerg Exp $
+# $NetBSD: Makefile,v 1.51 2010/06/13 22:45:25 wiz Exp $
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
 .include "../../sysutils/ups-nut/Makefile.common"
 
 PKGNAME=		${DISTNAME:S/nut/ups-nut-cgi/}
-PKGREVISION=		2
+PKGREVISION=		3
 COMMENT=		Network UPS Tools CGI scripts
 
 DEPENDS+=		ups-nut-2.*:../../sysutils/ups-nut
diff --git a/sysutils/xcdroast/Makefile b/sysutils/xcdroast/Makefile
index 46ccd860bda..75cf7b60785 100644
--- a/sysutils/xcdroast/Makefile
+++ b/sysutils/xcdroast/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.52 2009/08/26 19:58:20 sno Exp $
+# $NetBSD: Makefile,v 1.53 2010/06/13 22:45:25 wiz Exp $
 
 DISTNAME=	xcdroast-${DIST_VER}
 PKGNAME=	xcdroast-${DIST_VER:S/alpha/a/}
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	sysutils
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=xcdroast/}
 
diff --git a/sysutils/xfce4-appfinder/Makefile b/sysutils/xfce4-appfinder/Makefile
index 2c9d6b76689..6f1bb0ae4b5 100644
--- a/sysutils/xfce4-appfinder/Makefile
+++ b/sysutils/xfce4-appfinder/Makefile
@@ -1,10 +1,11 @@
-# $NetBSD: Makefile,v 1.12 2009/09/16 01:15:34 reed Exp $
+# $NetBSD: Makefile,v 1.13 2010/06/13 22:45:25 wiz Exp $
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
 .include "../../meta-pkgs/xfce4/Makefile.common"
 
 DISTNAME=	xfce4-appfinder-${XFCE4_VERSION}
+PKGREVISION=	1
 CATEGORIES=	sysutils
 COMMENT=	Xfce application finder
 
diff --git a/sysutils/xfce4-battery-plugin/Makefile b/sysutils/xfce4-battery-plugin/Makefile
index ff1a6981749..2d9de4dfacc 100644
--- a/sysutils/xfce4-battery-plugin/Makefile
+++ b/sysutils/xfce4-battery-plugin/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2010/03/22 15:46:02 joerg Exp $
+# $NetBSD: Makefile,v 1.11 2010/06/13 22:45:25 wiz Exp $
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
@@ -7,7 +7,7 @@ PKG_DESTDIR_SUPPORT=	user-destdir
 XFCE4_VERSION=	0.5.1
 
 DISTNAME=	xfce4-battery-plugin-${XFCE4_VERSION}
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	sysutils
 MASTER_SITES=	http://goodies.xfce.org/releases/xfce4-battery-plugin/
 COMMENT=	Xfce battey monitor plugin
diff --git a/sysutils/xfce4-battery-plugin/buildlink3.mk b/sysutils/xfce4-battery-plugin/buildlink3.mk
index 80faadb95da..6fcbb00f7f9 100644
--- a/sysutils/xfce4-battery-plugin/buildlink3.mk
+++ b/sysutils/xfce4-battery-plugin/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.6 2009/09/16 01:31:12 reed Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2010/06/13 22:45:25 wiz Exp $
 
 BUILDLINK_TREE+=	xfce4-battery-plugin
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=	xfce4-battery-plugin
 XFCE4_BATTERY_PLUGIN_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.xfce4-battery-plugin+=	xfce4-battery-plugin>=0.5.0nb2
-BUILDLINK_ABI_DEPENDS.xfce4-battery-plugin?=	xfce4-battery-plugin>=0.5.1nb2
+BUILDLINK_ABI_DEPENDS.xfce4-battery-plugin?=	xfce4-battery-plugin>=0.5.1nb3
 BUILDLINK_PKGSRCDIR.xfce4-battery-plugin?=	../../sysutils/xfce4-battery-plugin
 
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
diff --git a/sysutils/xfce4-cpugraph-plugin/Makefile b/sysutils/xfce4-cpugraph-plugin/Makefile
index 7db114e91a8..793ce1168a4 100644
--- a/sysutils/xfce4-cpugraph-plugin/Makefile
+++ b/sysutils/xfce4-cpugraph-plugin/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2009/08/26 19:57:05 sno Exp $
+# $NetBSD: Makefile,v 1.14 2010/06/13 22:45:25 wiz Exp $
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
@@ -8,7 +8,7 @@ XFCE4_VERSION=	0.3.0
 
 DISTNAME=	xfce4-cpugraph-plugin-${XFCE4_VERSION}
 #PKGREVISION=	1
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	sysutils
 MASTER_SITES=	http://goodies.xfce.org/releases/xfce4-cpugraph-plugin/
 COMMENT=	Xfce CPU load plugin
diff --git a/sysutils/xfce4-cpugraph-plugin/buildlink3.mk b/sysutils/xfce4-cpugraph-plugin/buildlink3.mk
index c4a8a2ecfcc..ead42d83dd6 100644
--- a/sysutils/xfce4-cpugraph-plugin/buildlink3.mk
+++ b/sysutils/xfce4-cpugraph-plugin/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.16 2009/09/16 01:31:12 reed Exp $
+# $NetBSD: buildlink3.mk,v 1.17 2010/06/13 22:45:25 wiz Exp $
 
 BUILDLINK_TREE+=	xfce4-cpugraph-plugin
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=	xfce4-cpugraph-plugin
 XFCE4_CPUGRAPH_PLUGIN_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.xfce4-cpugraph-plugin+=	xfce4-cpugraph-plugin>=0.3.0
-BUILDLINK_ABI_DEPENDS.xfce4-cpugraph-plugin?=	xfce4-cpugraph-plugin>=0.3.0nb1
+BUILDLINK_ABI_DEPENDS.xfce4-cpugraph-plugin?=	xfce4-cpugraph-plugin>=0.3.0nb2
 BUILDLINK_PKGSRCDIR.xfce4-cpugraph-plugin?=	../../sysutils/xfce4-cpugraph-plugin
 
 .include "../../x11/xfce4-panel/buildlink3.mk"
diff --git a/sysutils/xfce4-diskperf-plugin/Makefile b/sysutils/xfce4-diskperf-plugin/Makefile
index 32c789f1c39..28e312a1c21 100644
--- a/sysutils/xfce4-diskperf-plugin/Makefile
+++ b/sysutils/xfce4-diskperf-plugin/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2009/08/26 19:57:03 sno Exp $
+# $NetBSD: Makefile,v 1.18 2010/06/13 22:45:25 wiz Exp $
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
@@ -8,7 +8,7 @@ XFCE4_VERSION=	2.1.0
 
 DISTNAME=	xfce4-diskperf-plugin-${XFCE4_VERSION}
 #PKGREVISION=	1
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	sysutils
 MASTER_SITES=	http://goodies.xfce.org/releases/xfce4-diskperf-plugin/
 COMMENT=	Xfce disk performance plugin
diff --git a/sysutils/xfce4-diskperf-plugin/buildlink3.mk b/sysutils/xfce4-diskperf-plugin/buildlink3.mk
index 92732a2395e..8332614713f 100644
--- a/sysutils/xfce4-diskperf-plugin/buildlink3.mk
+++ b/sysutils/xfce4-diskperf-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:25 wiz Exp $
 
 BUILDLINK_TREE+=	xfce4-diskperf-plugin
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=	xfce4-diskperf-plugin
 XFCE4_DISKPERF_PLUGIN_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.xfce4-diskperf-plugin+=	xfce4-diskperf-plugin>=2.1.0
-BUILDLINK_ABI_DEPENDS.xfce4-diskperf-plugin?=	xfce4-diskperf-plugin>=2.1.0nb1
+BUILDLINK_ABI_DEPENDS.xfce4-diskperf-plugin?=	xfce4-diskperf-plugin>=2.1.0nb2
 BUILDLINK_PKGSRCDIR.xfce4-diskperf-plugin?=	../../sysutils/xfce4-diskperf-plugin
 
 .include "../../x11/xfce4-panel/buildlink3.mk"
diff --git a/sysutils/xfce4-fsguard-plugin/Makefile b/sysutils/xfce4-fsguard-plugin/Makefile
index c00a7949fa7..5f80806a421 100644
--- a/sysutils/xfce4-fsguard-plugin/Makefile
+++ b/sysutils/xfce4-fsguard-plugin/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2009/08/26 19:57:03 sno Exp $
+# $NetBSD: Makefile,v 1.11 2010/06/13 22:45:26 wiz Exp $
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
@@ -8,7 +8,7 @@ XFCE4_VERSION=	0.4.0
 
 DISTNAME=	xfce4-fsguard-plugin-${XFCE4_VERSION}
 #PKGREVISION=	1
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	sysutils
 MASTER_SITES=	http://goodies.xfce.org/releases/xfce4-fsguard-plugin/
 COMMENT=	Xfce disk space plugin
diff --git a/sysutils/xfce4-fsguard-plugin/buildlink3.mk b/sysutils/xfce4-fsguard-plugin/buildlink3.mk
index a43463132fd..fe11beda500 100644
--- a/sysutils/xfce4-fsguard-plugin/buildlink3.mk
+++ b/sysutils/xfce4-fsguard-plugin/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.14 2009/08/26 19:57:03 sno Exp $
+# $NetBSD: buildlink3.mk,v 1.15 2010/06/13 22:45:26 wiz Exp $
 
 BUILDLINK_TREE+=	xfce4-fsguard-plugin
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=	xfce4-fsguard-plugin
 XFCE4_FSGUARD_PLUGIN_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.xfce4-fsguard-plugin+=	xfce4-fsguard-plugin>=0.4.0
-BUILDLINK_ABI_DEPENDS.xfce4-fsguard-plugin?=	xfce4-fsguard-plugin>=0.4.0nb1
+BUILDLINK_ABI_DEPENDS.xfce4-fsguard-plugin?=	xfce4-fsguard-plugin>=0.4.0nb2
 BUILDLINK_PKGSRCDIR.xfce4-fsguard-plugin?=	../../sysutils/xfce4-fsguard-plugin
 
 .include "../../x11/xfce4-panel/buildlink3.mk"
diff --git a/sysutils/xfce4-genmon-plugin/Makefile b/sysutils/xfce4-genmon-plugin/Makefile
index 9d7ef228805..42af189fb19 100644
--- a/sysutils/xfce4-genmon-plugin/Makefile
+++ b/sysutils/xfce4-genmon-plugin/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2009/08/26 19:57:01 sno Exp $
+# $NetBSD: Makefile,v 1.4 2010/06/13 22:45:26 wiz Exp $
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
@@ -7,7 +7,7 @@ PKG_DESTDIR_SUPPORT=	user-destdir
 XFCE4_VERSION=	3.1
 
 DISTNAME=	xfce4-genmon-plugin-${XFCE4_VERSION}
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	sysutils
 MASTER_SITES=	http://goodies.xfce.org/releases/xfce4-genmon-plugin/
 COMMENT=	Xfce general purpose monitor plugin
diff --git a/sysutils/xfce4-genmon-plugin/buildlink3.mk b/sysutils/xfce4-genmon-plugin/buildlink3.mk
index d50f1f308d1..82568ae2f63 100644
--- a/sysutils/xfce4-genmon-plugin/buildlink3.mk
+++ b/sysutils/xfce4-genmon-plugin/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2009/09/16 01:31:12 reed Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2010/06/13 22:45:26 wiz Exp $
 
 BUILDLINK_TREE+=	xfce4-genmon-plugin
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=	xfce4-genmon-plugin
 XFCE4_GENMON_PLUGIN_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.xfce4-genmon-plugin+=	xfce4-genmon-plugin>=3.1
-BUILDLINK_ABI_DEPENDS.xfce4-genmon-plugin?=	xfce4-genmon-plugin>=3.1nb1
+BUILDLINK_ABI_DEPENDS.xfce4-genmon-plugin?=	xfce4-genmon-plugin>=3.1nb2
 BUILDLINK_PKGSRCDIR.xfce4-genmon-plugin?=	../../sysutils/xfce4-genmon-plugin
 
 .include "../../x11/xfce4-panel/buildlink3.mk"
diff --git a/sysutils/xfce4-netload-plugin/Makefile b/sysutils/xfce4-netload-plugin/Makefile
index 9d9c22c9c30..68d9622f273 100644
--- a/sysutils/xfce4-netload-plugin/Makefile
+++ b/sysutils/xfce4-netload-plugin/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2009/08/26 19:57:04 sno Exp $
+# $NetBSD: Makefile,v 1.20 2010/06/13 22:45:26 wiz Exp $
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
@@ -8,7 +8,7 @@ XFCE4_VERSION=	0.4.0
 
 DISTNAME=	xfce4-netload-plugin-${XFCE4_VERSION}
 #PKGREVISION=	1
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	sysutils
 MASTER_SITES=	http://goodies.xfce.org/releases/xfce4-netload-plugin/
 COMMENT=	Xfce network load plugin
diff --git a/sysutils/xfce4-netload-plugin/buildlink3.mk b/sysutils/xfce4-netload-plugin/buildlink3.mk
index bcb7257b29d..da5bd6557d7 100644
--- a/sysutils/xfce4-netload-plugin/buildlink3.mk
+++ b/sysutils/xfce4-netload-plugin/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.20 2009/09/16 01:31:12 reed Exp $
+# $NetBSD: buildlink3.mk,v 1.21 2010/06/13 22:45:26 wiz Exp $
 
 BUILDLINK_TREE+=	xfce4-netload-plugin
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=	xfce4-netload-plugin
 XFCE4_NETLOAD_PLUGIN_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.xfce4-netload-plugin+=	xfce4-netload-plugin>=0.4.0
-BUILDLINK_ABI_DEPENDS.xfce4-netload-plugin?=	xfce4-netload-plugin>=0.4.0nb1
+BUILDLINK_ABI_DEPENDS.xfce4-netload-plugin?=	xfce4-netload-plugin>=0.4.0nb2
 BUILDLINK_PKGSRCDIR.xfce4-netload-plugin?=	../../sysutils/xfce4-netload-plugin
 
 .include "../../x11/xfce4-panel/buildlink3.mk"
diff --git a/sysutils/xfce4-quicklauncher-plugin/Makefile b/sysutils/xfce4-quicklauncher-plugin/Makefile
index 5bdec38353c..b64eb77638a 100644
--- a/sysutils/xfce4-quicklauncher-plugin/Makefile
+++ b/sysutils/xfce4-quicklauncher-plugin/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2009/08/26 19:57:04 sno Exp $
+# $NetBSD: Makefile,v 1.12 2010/06/13 22:45:26 wiz Exp $
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
@@ -8,7 +8,7 @@ XFCE4_VERSION=	1.9.4
 
 DISTNAME=	xfce4-quicklauncher-plugin-${XFCE4_VERSION}
 #PKGREVISION=	1
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	sysutils
 MASTER_SITES=	http://goodies.xfce.org/releases/xfce4-quicklauncher-plugin/
 COMMENT=	Xfce quicklaunch plugin
diff --git a/sysutils/xfce4-quicklauncher-plugin/buildlink3.mk b/sysutils/xfce4-quicklauncher-plugin/buildlink3.mk
index d25d7b146d9..81bcb6a3322 100644
--- a/sysutils/xfce4-quicklauncher-plugin/buildlink3.mk
+++ b/sysutils/xfce4-quicklauncher-plugin/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.16 2009/09/16 01:31:12 reed Exp $
+# $NetBSD: buildlink3.mk,v 1.17 2010/06/13 22:45:26 wiz Exp $
 
 BUILDLINK_TREE+=	xfce4-quicklauncher-plugin
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=	xfce4-quicklauncher-plugin
 XFCE4_QUICKLAUNCHER_PLUGIN_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.xfce4-quicklauncher-plugin+=	xfce4-quicklauncher-plugin>=1.9.4
-BUILDLINK_ABI_DEPENDS.xfce4-quicklauncher-plugin?=	xfce4-quicklauncher-plugin>=1.9.4nb1
+BUILDLINK_ABI_DEPENDS.xfce4-quicklauncher-plugin?=	xfce4-quicklauncher-plugin>=1.9.4nb2
 BUILDLINK_PKGSRCDIR.xfce4-quicklauncher-plugin?=	../../sysutils/xfce4-quicklauncher-plugin
 
 .include "../../x11/xfce4-panel/buildlink3.mk"
diff --git a/sysutils/xfce4-systemload-plugin/Makefile b/sysutils/xfce4-systemload-plugin/Makefile
index 20dcd92403c..c8872e4a01c 100644
--- a/sysutils/xfce4-systemload-plugin/Makefile
+++ b/sysutils/xfce4-systemload-plugin/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2009/08/26 19:57:04 sno Exp $
+# $NetBSD: Makefile,v 1.18 2010/06/13 22:45:26 wiz Exp $
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
@@ -8,7 +8,7 @@ XFCE4_VERSION=	0.4.2
 
 DISTNAME=	xfce4-systemload-plugin-${XFCE4_VERSION}
 #PKGREVISION=	1
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	sysutils
 MASTER_SITES=	http://goodies.xfce.org/releases/xfce4-systemload-plugin/
 COMMENT=	Xfce system load plugin
diff --git a/sysutils/xfce4-systemload-plugin/buildlink3.mk b/sysutils/xfce4-systemload-plugin/buildlink3.mk
index a8768d68120..00cc60bfddc 100644
--- a/sysutils/xfce4-systemload-plugin/buildlink3.mk
+++ b/sysutils/xfce4-systemload-plugin/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.18 2009/09/16 01:31:13 reed Exp $
+# $NetBSD: buildlink3.mk,v 1.19 2010/06/13 22:45:26 wiz Exp $
 
 BUILDLINK_TREE+=	xfce4-systemload-plugin
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=	xfce4-systemload-plugin
 XFCE4_SYSTEMLOAD_PLUGIN_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.xfce4-systemload-plugin+=	xfce4-systemload-plugin>=0.4.2
-BUILDLINK_ABI_DEPENDS.xfce4-systemload-plugin?=	xfce4-systemload-plugin>=0.4.2nb1
+BUILDLINK_ABI_DEPENDS.xfce4-systemload-plugin?=	xfce4-systemload-plugin>=0.4.2nb2
 BUILDLINK_PKGSRCDIR.xfce4-systemload-plugin?=	../../sysutils/xfce4-systemload-plugin
 
 .include "../../x11/xfce4-panel/buildlink3.mk"
diff --git a/sysutils/xfce4-thunar/Makefile b/sysutils/xfce4-thunar/Makefile
index 755429ab4fd..7d7c2206e0a 100644
--- a/sysutils/xfce4-thunar/Makefile
+++ b/sysutils/xfce4-thunar/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2009/09/16 01:15:34 reed Exp $
+# $NetBSD: Makefile,v 1.14 2010/06/13 22:45:26 wiz Exp $
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
@@ -8,6 +8,7 @@ XFCE4_VERSION=	1.0.1
 
 DISTNAME=	Thunar-${XFCE4_VERSION}
 PKGNAME=	xfce4-thunar-${XFCE4_VERSION}
+PKGREVISION=	1
 CATEGORIES=	sysutils
 COMMENT=	Xfce file manager
 
diff --git a/sysutils/xfce4-thunar/buildlink3.mk b/sysutils/xfce4-thunar/buildlink3.mk
index 4e164ec81b0..e44d4aa5a90 100644
--- a/sysutils/xfce4-thunar/buildlink3.mk
+++ b/sysutils/xfce4-thunar/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.9 2009/09/16 01:15:34 reed Exp $
+# $NetBSD: buildlink3.mk,v 1.10 2010/06/13 22:45:26 wiz Exp $
 
 BUILDLINK_TREE+=	xfce4-thunar
 
@@ -6,6 +6,7 @@ BUILDLINK_TREE+=	xfce4-thunar
 XFCE4_THUNAR_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.xfce4-thunar+=	xfce4-thunar>=1.0.0
+BUILDLINK_ABI_DEPENDS.xfce4-thunar?=	xfce4-thunar>=1.0.1nb1
 BUILDLINK_PKGSRCDIR.xfce4-thunar?=	../../sysutils/xfce4-thunar
 
 pkgbase := xfce4-thunar
diff --git a/sysutils/xfce4-volman/Makefile b/sysutils/xfce4-volman/Makefile
index b9261d1b693..fd9753426db 100644
--- a/sysutils/xfce4-volman/Makefile
+++ b/sysutils/xfce4-volman/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2009/11/05 20:15:40 reinoud Exp $
+# $NetBSD: Makefile,v 1.5 2010/06/13 22:45:26 wiz Exp $
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
@@ -8,7 +8,7 @@ XFCE4_VERSION=	0.2.0
 
 DISTNAME=	thunar-volman-${XFCE4_VERSION}
 PKGNAME=	${DISTNAME:S/thunar/xfce4/}
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	sysutils
 MASTER_SITES=	http://goodies.xfce.org/releases/thunar-volman/
 COMMENT=	Thunar volume manager
diff --git a/sysutils/xfce4-xarchiver/Makefile b/sysutils/xfce4-xarchiver/Makefile
index 804c40791cb..07866946ac3 100644
--- a/sysutils/xfce4-xarchiver/Makefile
+++ b/sysutils/xfce4-xarchiver/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2009/08/26 19:57:06 sno Exp $
+# $NetBSD: Makefile,v 1.8 2010/06/13 22:45:26 wiz Exp $
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
@@ -8,7 +8,7 @@ XFCE4_VERSION=	0.5.2
 
 DISTNAME=	xarchiver-${XFCE4_VERSION}
 PKGNAME=	xfce4-xarchiver-${XFCE4_VERSION}
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	sysutils
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=xarchiver/}
 COMMENT=	Xfce archiver handler
diff --git a/sysutils/xfce4-xarchiver/buildlink3.mk b/sysutils/xfce4-xarchiver/buildlink3.mk
index 14dbea76d04..c210f5c26de 100644
--- a/sysutils/xfce4-xarchiver/buildlink3.mk
+++ b/sysutils/xfce4-xarchiver/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2009/09/16 01:31:13 reed Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2010/06/13 22:45:26 wiz Exp $
 
 BUILDLINK_TREE+=	xfce4-xarchiver
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=	xfce4-xarchiver
 XFCE4_XARCHIVER_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.xfce4-xarchiver+=	xfce4-xarchiver>=0.5.2nb1
-BUILDLINK_ABI_DEPENDS.xfce4-xarchiver?=	xfce4-xarchiver>=0.5.2nb2
+BUILDLINK_ABI_DEPENDS.xfce4-xarchiver?=	xfce4-xarchiver>=0.5.2nb3
 BUILDLINK_PKGSRCDIR.xfce4-xarchiver?=	../../sysutils/xfce4-xarchiver
 
 .include "../../x11/libxfce4gui/buildlink3.mk"
diff --git a/sysutils/xfce4-xkb-plugin/Makefile b/sysutils/xfce4-xkb-plugin/Makefile
index 9999cf7522a..9ae3da0fc86 100644
--- a/sysutils/xfce4-xkb-plugin/Makefile
+++ b/sysutils/xfce4-xkb-plugin/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2009/08/26 19:57:04 sno Exp $
+# $NetBSD: Makefile,v 1.15 2010/06/13 22:45:26 wiz Exp $
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
@@ -8,7 +8,7 @@ XFCE4_VERSION=	0.4.3
 
 DISTNAME=	xfce4-xkb-plugin-${XFCE4_VERSION}
 #PKGREVISION=	1
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	sysutils
 MASTER_SITES=	http://goodies.xfce.org/releases/xfce4-xkb-plugin/
 COMMENT=	Xfce Keyboard plugin
diff --git a/sysutils/xfce4-xkb-plugin/buildlink3.mk b/sysutils/xfce4-xkb-plugin/buildlink3.mk
index 834294e2c0e..06c4fb8c3e4 100644
--- a/sysutils/xfce4-xkb-plugin/buildlink3.mk
+++ b/sysutils/xfce4-xkb-plugin/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.17 2009/09/16 01:31:13 reed Exp $
+# $NetBSD: buildlink3.mk,v 1.18 2010/06/13 22:45:26 wiz Exp $
 
 BUILDLINK_TREE+=	xfce4-xkb-plugin
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=	xfce4-xkb-plugin
 XFCE4_XKB_PLUGIN_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.xfce4-xkb-plugin+=	xfce4-xkb-plugin>=0.4.3
-BUILDLINK_ABI_DEPENDS.xfce4-xkb-plugin?=	xfce4-xkb-plugin>=0.4.3nb1
+BUILDLINK_ABI_DEPENDS.xfce4-xkb-plugin?=	xfce4-xkb-plugin>=0.4.3nb2
 BUILDLINK_PKGSRCDIR.xfce4-xkb-plugin?=	../../sysutils/xfce4-xkb-plugin
 
 .include "../../x11/xfce4-panel/buildlink3.mk"
diff --git a/sysutils/xfe/Makefile b/sysutils/xfe/Makefile
index 65350a2d4f2..491972b1de7 100644
--- a/sysutils/xfe/Makefile
+++ b/sysutils/xfe/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.33 2010/01/18 09:59:27 wiz Exp $
+# $NetBSD: Makefile,v 1.34 2010/06/13 22:45:27 wiz Exp $
 
 DISTNAME=	xfe-1.04
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	sysutils
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=xfe/}
 
diff --git a/sysutils/xnc/Makefile b/sysutils/xnc/Makefile
index 7b22f4cd190..d54d9145ffd 100644
--- a/sysutils/xnc/Makefile
+++ b/sysutils/xnc/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.31 2010/01/18 09:59:27 wiz Exp $
+# $NetBSD: Makefile,v 1.32 2010/06/13 22:45:27 wiz Exp $
 
 DISTNAME=	xnc-5.0.4.src
 PKGNAME=	xnc-5.0.4
-PKGREVISION=	7
+PKGREVISION=	8
 CATEGORIES=	sysutils x11
 MASTER_SITES=	http://www.xnc.dubna.su/src-5/