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.

134 files changed, 316 insertions, 220 deletions

diff --git a/devel/ArX/Makefile b/devel/ArX/Makefile
index 66d53d0974c..7eefbda740e 100644
--- a/devel/ArX/Makefile
+++ b/devel/ArX/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.21 2009/04/26 10:08:49 rillig Exp $
+# $NetBSD: Makefile,v 1.22 2010/06/13 22:44:02 wiz Exp $
 #
 
 DISTNAME=	ArX-2.2.4
-PKGREVISION=	9
+PKGREVISION=	10
 CATEGORIES=	devel scm
 MASTER_SITES=	http://savannah.nongnu.org/download/arx/
 
diff --git a/devel/GConf-ui/Makefile b/devel/GConf-ui/Makefile
index 53d51f4dc92..731c991c025 100644
--- a/devel/GConf-ui/Makefile
+++ b/devel/GConf-ui/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2009/11/02 17:28:55 joerg Exp $
+# $NetBSD: Makefile,v 1.8 2010/06/13 22:44:02 wiz Exp $
 #
 
 MAKE_JOBS_SAFE=	no
@@ -6,6 +6,7 @@ MAKE_JOBS_SAFE=	no
 .include "../../devel/GConf/Makefile.common"
 
 PKGNAME=	${DISTNAME:S/GConf/GConf-ui/}
+PKGREVISION=	1
 
 BUILDLINK_API_DEPENDS.GConf+=	GConf>=${GCONF_VERSION}
 
diff --git a/devel/GConf-ui/buildlink3.mk b/devel/GConf-ui/buildlink3.mk
index f085125a112..6039962164d 100644
--- a/devel/GConf-ui/buildlink3.mk
+++ b/devel/GConf-ui/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2009/08/26 19:56:59 sno Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2010/06/13 22:44:02 wiz Exp $
 
 BUILDLINK_TREE+=	GConf-ui
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=	GConf-ui
 GCONF_UI_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.GConf-ui+=	GConf-ui>=2.8.0.1
-BUILDLINK_ABI_DEPENDS.GConf-ui?=	GConf-ui>=2.26.2
+BUILDLINK_ABI_DEPENDS.GConf-ui?=	GConf-ui>=2.28.0nb1
 BUILDLINK_PKGSRCDIR.GConf-ui?=	../../devel/GConf-ui
 
 .include "../../devel/GConf/buildlink3.mk"
diff --git a/devel/SDL_Pango/Makefile b/devel/SDL_Pango/Makefile
index 0d888864855..75bb68a6134 100644
--- a/devel/SDL_Pango/Makefile
+++ b/devel/SDL_Pango/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.4 2009/08/08 06:44:53 tnn Exp $
+# $NetBSD: Makefile,v 1.5 2010/06/13 22:44:02 wiz Exp $
 #
 
 DISTNAME=	SDL_Pango-0.1.2
+PKGREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=sdlpango/}
 
diff --git a/devel/SDL_Pango/buildlink3.mk b/devel/SDL_Pango/buildlink3.mk
index 912732e3ea1..82ac9449d71 100644
--- a/devel/SDL_Pango/buildlink3.mk
+++ b/devel/SDL_Pango/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:24:08 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2010/06/13 22:44:02 wiz Exp $
 
 BUILDLINK_TREE+=	SDL_Pango
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=	SDL_Pango
 SDL_PANGO_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.SDL_Pango+=	SDL_Pango>=0.1.2
-BUILDLINK_ABI_DEPENDS.SDL_Pango+=	SDL_Pango>=0.1.2
+BUILDLINK_ABI_DEPENDS.SDL_Pango+=	SDL_Pango>=0.1.2nb1
 BUILDLINK_PKGSRCDIR.SDL_Pango?=		../../devel/SDL_Pango
 
 # Seems to be unnecessary, pkg-config does not show anything from SDL
diff --git a/devel/accerciser/Makefile b/devel/accerciser/Makefile
index 485995b8bb5..81e3db8475d 100644
--- a/devel/accerciser/Makefile
+++ b/devel/accerciser/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.7 2009/08/26 19:57:19 sno Exp $
+# $NetBSD: Makefile,v 1.8 2010/06/13 22:44:02 wiz Exp $
 #
 
 DISTNAME=	accerciser-1.6.1
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	misc
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/accerciser/1.6/}
 EXTRACT_SUFX=	.tar.bz2
diff --git a/devel/anjuta/Makefile b/devel/anjuta/Makefile
index 5d62fe400f2..372e1e31976 100644
--- a/devel/anjuta/Makefile
+++ b/devel/anjuta/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.73 2010/01/18 09:58:43 wiz Exp $
+# $NetBSD: Makefile,v 1.74 2010/06/13 22:44:02 wiz Exp $
 
 DISTNAME=	anjuta-2.24.2
-PKGREVISION=	6
+PKGREVISION=	7
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/anjuta/2.24/}
 #MASTER_SITES+=	${MASTER_SITE_SOURCEFORGE:=anjuta/}
diff --git a/devel/at-spi/Makefile b/devel/at-spi/Makefile
index a23b1f9b2f7..95d302d922f 100644
--- a/devel/at-spi/Makefile
+++ b/devel/at-spi/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.54 2010/06/05 11:05:58 wiz Exp $
+# $NetBSD: Makefile,v 1.55 2010/06/13 22:44:02 wiz Exp $
 #
 
 DISTNAME=		at-spi-1.30.1
+PKGREVISION=		1
 CATEGORIES=		devel
 MASTER_SITES=		${MASTER_SITE_GNOME:=sources/at-spi/1.30/}
 EXTRACT_SUFX=		.tar.bz2
diff --git a/devel/at-spi/buildlink3.mk b/devel/at-spi/buildlink3.mk
index a1ee6a466a0..0a9e3e49601 100644
--- a/devel/at-spi/buildlink3.mk
+++ b/devel/at-spi/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.19 2009/10/25 10:48:09 ahoka Exp $
+# $NetBSD: buildlink3.mk,v 1.20 2010/06/13 22:44:02 wiz Exp $
 
 BUILDLINK_TREE+=	at-spi
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=	at-spi
 AT_SPI_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.at-spi+=	at-spi>=1.6.0
-BUILDLINK_ABI_DEPENDS.at-spi+=	at-spi>=1.26.0nb1
+BUILDLINK_ABI_DEPENDS.at-spi+=	at-spi>=1.30.1nb1
 BUILDLINK_PKGSRCDIR.at-spi?=	../../devel/at-spi
 
 .include "../../devel/atk/buildlink3.mk"
diff --git a/devel/automoc4/Makefile b/devel/automoc4/Makefile
index ff2220fe0b7..a0a9b47f6b2 100644
--- a/devel/automoc4/Makefile
+++ b/devel/automoc4/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.7 2010/01/18 09:58:43 wiz Exp $
+# $NetBSD: Makefile,v 1.8 2010/06/13 22:44:02 wiz Exp $
 
 DISTNAME=	automoc4-0.9.88
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_KDE:=automoc4/0.9.88/}
 EXTRACT_SUFX=	.tar.bz2
diff --git a/devel/blib/Makefile b/devel/blib/Makefile
index 8da3027c684..f2695316591 100644
--- a/devel/blib/Makefile
+++ b/devel/blib/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.16 2009/08/26 19:56:55 sno Exp $
+# $NetBSD: Makefile,v 1.17 2010/06/13 22:44:02 wiz Exp $
 #
 
 DISTNAME=		blib-1.0.2
-PKGREVISION=		7
+PKGREVISION=		8
 CATEGORIES=		devel graphics
 MASTER_SITES=		http://sven.gimp.org/blinkenlights/old/
 
diff --git a/devel/blib/buildlink3.mk b/devel/blib/buildlink3.mk
index 4fb355b0acc..2e973b92aac 100644
--- a/devel/blib/buildlink3.mk
+++ b/devel/blib/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.11 2009/08/26 19:56:55 sno Exp $
+# $NetBSD: buildlink3.mk,v 1.12 2010/06/13 22:44:02 wiz Exp $
 
 BUILDLINK_TREE+=	blib
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=	blib
 BLIB_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.blib+=	blib>=1.0.2nb1
-BUILDLINK_ABI_DEPENDS.blib+=	blib>=1.0.2nb7
+BUILDLINK_ABI_DEPENDS.blib+=	blib>=1.0.2nb8
 BUILDLINK_PKGSRCDIR.blib?=	../../devel/blib
 
 .include "../../x11/gtk2/buildlink3.mk"
diff --git a/devel/boa-constructor/Makefile b/devel/boa-constructor/Makefile
index 33ea14bb934..578d1ae3a4a 100644
--- a/devel/boa-constructor/Makefile
+++ b/devel/boa-constructor/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.4 2010/02/10 19:17:34 joerg Exp $
+# $NetBSD: Makefile,v 1.5 2010/06/13 22:44:03 wiz Exp $
 #
 
 VERSION=		0.6.1
 DISTNAME=		boa-constructor-${VERSION}.src
 PKGNAME=		boa-constructor-${VERSION}
-PKGREVISION=		2
+PKGREVISION=		3
 CATEGORIES=		devel
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=boa-constructor/}
 EXTRACT_SUFX=		.zip
diff --git a/devel/bouml/Makefile b/devel/bouml/Makefile
index e6e9621a2e0..36e7bb29d0e 100644
--- a/devel/bouml/Makefile
+++ b/devel/bouml/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.9 2010/01/18 09:58:43 wiz Exp $
+# $NetBSD: Makefile,v 1.10 2010/06/13 22:44:03 wiz Exp $
 #
 
 DISTNAME=		bouml_${BOUMLVERSION}
 PKGNAME=		bouml-${BOUMLVERSION}
-PKGREVISION=		1
+PKGREVISION=		2
 CATEGORIES=		devel
 MASTER_SITES=		http://bouml.free.fr/
 
diff --git a/devel/cmake/Makefile b/devel/cmake/Makefile
index ae5b26e1663..8bbe3476563 100644
--- a/devel/cmake/Makefile
+++ b/devel/cmake/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.50 2010/04/09 13:25:34 adam Exp $
+# $NetBSD: Makefile,v 1.51 2010/06/13 22:44:03 wiz Exp $
 
 DISTNAME=	cmake-${CMAKE_API}.1
+PKGREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	http://www.cmake.org/files/v2.8/
 
@@ -42,6 +43,9 @@ SUBST_VARS.cmake=	X11BASE
 post-patch:
 	${RM} ${WRKSRC}/Modules/*.orig
 
+post-install:
+	${RM} -f ${DESTDIR}${PREFIX}/share/cmake-${CMAKE_API}/Modules/Platform/UnixPaths.cmake.orig
+
 .include "../../devel/ncurses/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../textproc/xmlrpc-c/buildlink3.mk"
diff --git a/devel/cmake/PLIST b/devel/cmake/PLIST
index 03b8cb98f24..571081de3f0 100644
--- a/devel/cmake/PLIST
+++ b/devel/cmake/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.19 2010/04/09 13:25:34 adam Exp $
+@comment $NetBSD: PLIST,v 1.20 2010/06/13 22:44:03 wiz Exp $
 bin/ccmake
 bin/cmake
 bin/cpack
@@ -397,7 +397,6 @@ share/cmake-${CMAKE_API}/Modules/Platform/Tru64.cmake
 share/cmake-${CMAKE_API}/Modules/Platform/ULTRIX.cmake
 share/cmake-${CMAKE_API}/Modules/Platform/UNIX_SV.cmake
 share/cmake-${CMAKE_API}/Modules/Platform/UnixPaths.cmake
-share/cmake-${CMAKE_API}/Modules/Platform/UnixPaths.cmake.orig
 share/cmake-${CMAKE_API}/Modules/Platform/UnixWare.cmake
 share/cmake-${CMAKE_API}/Modules/Platform/Windows-Borland-C.cmake
 share/cmake-${CMAKE_API}/Modules/Platform/Windows-Borland-CXX.cmake
diff --git a/devel/cmake/distinfo b/devel/cmake/distinfo
index 4c8b5053ada..04ebb404cd2 100644
--- a/devel/cmake/distinfo
+++ b/devel/cmake/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.24 2010/04/09 13:25:34 adam Exp $
+$NetBSD: distinfo,v 1.25 2010/06/13 22:44:03 wiz Exp $
 
 SHA1 (cmake-2.8.1.tar.gz) = e9f99cfccf8ec4fb5bbd8ca7d499771a2f1d4ebe
 RMD160 (cmake-2.8.1.tar.gz) = 71e216704ee4313640efdbefcc65c6576071ef82
@@ -6,3 +6,4 @@ Size (cmake-2.8.1.tar.gz) = 3605586 bytes
 SHA1 (patch-aa) = b093f4992a7fea099d7c26a90b150ac0d057067a
 SHA1 (patch-ab) = f7372942f7e28b01c26794ce1a94914b68d1b24e
 SHA1 (patch-ac) = e5127b9e28375528e977898c59cb6b5044d76ebe
+SHA1 (patch-ad) = a3c705c01dc7de4354756092fc5f3ad3b9a8090c
diff --git a/devel/cmake/patches/patch-ad b/devel/cmake/patches/patch-ad
new file mode 100644
index 00000000000..b56d5b8652f
--- /dev/null
+++ b/devel/cmake/patches/patch-ad
@@ -0,0 +1,13 @@
+$NetBSD: patch-ad,v 1.7 2010/06/13 22:44:03 wiz Exp $
+
+--- Modules/FindPNG.cmake.orig	2010-04-06 14:45:31.000000000 +0000
++++ Modules/FindPNG.cmake
+@@ -33,7 +33,7 @@ if(ZLIB_FOUND)
+   /usr/local/include/libpng             # OpenBSD
+   )
+ 
+-  set(PNG_NAMES ${PNG_NAMES} png libpng png12 libpng12)
++  set(PNG_NAMES ${PNG_NAMES} png libpng png12 libpng12 png14 libpng14)
+   find_library(PNG_LIBRARY NAMES ${PNG_NAMES} )
+ 
+   if (PNG_LIBRARY AND PNG_PNG_INCLUDE_DIR)
diff --git a/devel/coconut/Makefile b/devel/coconut/Makefile
index 9c750fe2448..fb6300fff93 100644
--- a/devel/coconut/Makefile
+++ b/devel/coconut/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.37 2009/08/26 19:57:20 sno Exp $
+# $NetBSD: Makefile,v 1.38 2010/06/13 22:44:03 wiz Exp $
 #
 
 DISTNAME=	coconut-0.3.0
-PKGREVISION=	17
+PKGREVISION=	18
 CATEGORIES=	devel
 MASTER_SITES=	# ${MASTER_SITE_SOURCEFORGE:=coconut-lib/}
 
diff --git a/devel/compizconfig-backend-gconf/Makefile b/devel/compizconfig-backend-gconf/Makefile
index 0cd2ebc41a0..3916d151b29 100644
--- a/devel/compizconfig-backend-gconf/Makefile
+++ b/devel/compizconfig-backend-gconf/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.4 2009/11/26 20:08:53 imil Exp $
+# $NetBSD: Makefile,v 1.5 2010/06/13 22:44:03 wiz Exp $
 #
 
 PKGVER=		0.8.4
 DISTNAME=	compizconfig-backend-gconf-${PKGVER}
+PKGREVISION=	1
 CATEGORIES=	devel gnome
 MASTER_SITES=	http://releases.compiz.org/${PKGVER}/
 
diff --git a/devel/cvsgraph/Makefile b/devel/cvsgraph/Makefile
index 950fa24b051..2445e423fad 100644
--- a/devel/cvsgraph/Makefile
+++ b/devel/cvsgraph/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.34 2010/03/20 21:32:40 adrianp Exp $
+# $NetBSD: Makefile,v 1.35 2010/06/13 22:44:03 wiz Exp $
 #
 
 DISTNAME=	cvsgraph-1.6.1
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	devel scm
 MASTER_SITES=	http://www.akhphd.au.dk/~bertho/cvsgraph/release/
 
diff --git a/devel/devIL/Makefile b/devel/devIL/Makefile
index 8bcbffa584b..17c3402e466 100644
--- a/devel/devIL/Makefile
+++ b/devel/devIL/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.25 2010/01/18 09:58:44 wiz Exp $
+# $NetBSD: Makefile,v 1.26 2010/06/13 22:44:03 wiz Exp $
 #
 
 DISTNAME=	DevIL-${DEVIL_VERSION}
 PKGNAME=	${DISTNAME:S/D/d/}
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=openil/}
 
diff --git a/devel/devIL/buildlink3.mk b/devel/devIL/buildlink3.mk
index a1a7e8e7ce4..c4b6ee555dc 100644
--- a/devel/devIL/buildlink3.mk
+++ b/devel/devIL/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.18 2010/01/18 09:58:44 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.19 2010/06/13 22:44:03 wiz Exp $
 
 BUILDLINK_TREE+=	devIL
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=	devIL
 DEVIL_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.devIL+=	devIL>=1.7.8
-BUILDLINK_ABI_DEPENDS.devIL+=	devIL>=1.7.8nb2
+BUILDLINK_ABI_DEPENDS.devIL+=	devIL>=1.7.8nb3
 BUILDLINK_PKGSRCDIR.devIL?=	../../devel/devIL
 
 .include "../../devel/SDL/buildlink3.mk"
diff --git a/devel/devIL/distinfo b/devel/devIL/distinfo
index 5144bf0e295..eb034befb44 100644
--- a/devel/devIL/distinfo
+++ b/devel/devIL/distinfo
@@ -1,7 +1,9 @@
-$NetBSD: distinfo,v 1.6 2009/12/15 10:29:35 tnn Exp $
+$NetBSD: distinfo,v 1.7 2010/06/13 22:44:03 wiz Exp $
 
 SHA1 (DevIL-1.7.8.tar.gz) = bc27e3e830ba666a3af03548789700d10561fcb1
 RMD160 (DevIL-1.7.8.tar.gz) = a3cdb14fcca5e75ada240a53cbdc3e749a759da5
 Size (DevIL-1.7.8.tar.gz) = 2051993 bytes
 SHA1 (patch-aa) = 2784234ee79ada44f04219c5f49d5ea2c9e6bf4c
 SHA1 (patch-ab) = 995f402fa98cbfe96d43b98f6c409e484a53bf09
+SHA1 (patch-ac) = b540afa8baca5bb5e71edc63291ce49eb2fafd23
+SHA1 (patch-ad) = c8885607457c9af2d89dcf2d9e163fd224e0fa35
diff --git a/devel/devIL/patches/patch-ac b/devel/devIL/patches/patch-ac
new file mode 100644
index 00000000000..3312228f3e3
--- /dev/null
+++ b/devel/devIL/patches/patch-ac
@@ -0,0 +1,13 @@
+$NetBSD: patch-ac,v 1.1 2010/06/13 22:44:03 wiz Exp $
+
+--- src-IL/src/il_png.c.orig	2009-03-08 07:10:09.000000000 +0000
++++ src-IL/src/il_png.c
+@@ -278,7 +278,7 @@ ILboolean readpng_get_image(ILdouble dis
+ 
+ 	// Expand low-bit-depth grayscale images to 8 bits
+ 	if (png_color_type == PNG_COLOR_TYPE_GRAY && bit_depth < 8) {
+-		png_set_gray_1_2_4_to_8(png_ptr);
++		png_set_expand_gray_1_2_4_to_8(png_ptr);
+ 	}
+ 
+ 	// Expand RGB images with transparency to full alpha channels
diff --git a/devel/devIL/patches/patch-ad b/devel/devIL/patches/patch-ad
new file mode 100644
index 00000000000..0c232514932
--- /dev/null
+++ b/devel/devIL/patches/patch-ad
@@ -0,0 +1,13 @@
+$NetBSD: patch-ad,v 1.1 2010/06/13 22:44:03 wiz Exp $
+
+--- src-IL/src/il_icon.c.orig	2009-03-08 07:10:09.000000000 +0000
++++ src-IL/src/il_icon.c
+@@ -525,7 +525,7 @@ ILboolean ico_readpng_get_image(ICOIMAGE
+ 
+ 	// Expand low-bit-depth grayscale images to 8 bits
+ 	if (ico_color_type == PNG_COLOR_TYPE_GRAY && bit_depth < 8) {
+-		png_set_gray_1_2_4_to_8(ico_png_ptr);
++		png_set_expand_gray_1_2_4_to_8(ico_png_ptr);
+ 	}
+ 
+ 	// Expand RGB images with transparency to full alpha channels
diff --git a/devel/devhelp/Makefile b/devel/devhelp/Makefile
index 65a57f8c15a..88897ed6b88 100644
--- a/devel/devhelp/Makefile
+++ b/devel/devhelp/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.58 2010/03/19 11:27:07 obache Exp $
+# $NetBSD: Makefile,v 1.59 2010/06/13 22:44:03 wiz Exp $
 
 DISTNAME=		devhelp-2.28.1
-PKGREVISION=		2
+PKGREVISION=		3
 CATEGORIES=		devel x11
 MASTER_SITES=		${MASTER_SITE_GNOME:=sources/devhelp/2.28/}
 EXTRACT_SUFX=		.tar.bz2
diff --git a/devel/devhelp/buildlink3.mk b/devel/devhelp/buildlink3.mk
index 57751ab6d3a..71ba809161b 100644
--- a/devel/devhelp/buildlink3.mk
+++ b/devel/devhelp/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.6 2010/01/18 09:58:44 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2010/06/13 22:44:03 wiz Exp $
 
 BUILDLINK_TREE+=	devhelp
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=	devhelp
 DEVHELP_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.devhelp+=	devhelp>=0.12nb1
-BUILDLINK_ABI_DEPENDS.devhelp?=	devhelp>=2.28.1nb1
+BUILDLINK_ABI_DEPENDS.devhelp?=	devhelp>=2.28.1nb3
 BUILDLINK_PKGSRCDIR.devhelp?=	../../devel/devhelp
 
 .include "../../devel/gettext-lib/buildlink3.mk"
diff --git a/devel/diffuse/Makefile b/devel/diffuse/Makefile
index 91270fac4ce..5d2f1070f91 100644
--- a/devel/diffuse/Makefile
+++ b/devel/diffuse/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.20 2010/04/16 09:55:30 wiz Exp $
+# $NetBSD: Makefile,v 1.21 2010/06/13 22:44:04 wiz Exp $
 #
 
 DISTNAME=	diffuse-0.4.3
+PKGREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=diffuse/}
 EXTRACT_SUFX=	.tar.bz2
diff --git a/devel/distccmon-gnome/Makefile b/devel/distccmon-gnome/Makefile
index 879014440a8..2b6ff1e88a1 100644
--- a/devel/distccmon-gnome/Makefile
+++ b/devel/distccmon-gnome/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.20 2010/01/18 09:58:44 wiz Exp $
+# $NetBSD: Makefile,v 1.21 2010/06/13 22:44:04 wiz Exp $
 
 PKGNAME=	${DISTNAME:S/-/-gnome-/}
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES+=	gnome
 COMMENT=	Graphical monitor for distcc, the distributed C/C++ compiler
 
diff --git a/devel/distccmon-gtk/Makefile b/devel/distccmon-gtk/Makefile
index 954b435e7b9..a0813bfa8e9 100644
--- a/devel/distccmon-gtk/Makefile
+++ b/devel/distccmon-gtk/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.10 2009/08/26 19:57:20 sno Exp $
+# $NetBSD: Makefile,v 1.11 2010/06/13 22:44:04 wiz Exp $
 
 PKGNAME=	${DISTNAME:S/-/-gtk-/}
-PKGREVISION=	1
+PKGREVISION=	2
 COMMENT=	Graphical monitor for distcc, the distributed C/C++ compiler
 
 PKG_DESTDIR_SUPPORT=	user-destdir
diff --git a/devel/eel/Makefile b/devel/eel/Makefile
index d19145b0477..8a5491e23b0 100644
--- a/devel/eel/Makefile
+++ b/devel/eel/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.51 2009/08/26 19:56:46 sno Exp $
+# $NetBSD: Makefile,v 1.52 2010/06/13 22:44:04 wiz Exp $
 
 DISTNAME=	eel-2.26.0
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	devel gnome
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/eel/2.26/}
 EXTRACT_SUFX=	.tar.bz2
diff --git a/devel/eel/buildlink3.mk b/devel/eel/buildlink3.mk
index 9a6a97476d9..41f81b7a9c0 100644
--- a/devel/eel/buildlink3.mk
+++ b/devel/eel/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.8 2009/10/26 09:46:22 drochner Exp $
+# $NetBSD: buildlink3.mk,v 1.9 2010/06/13 22:44:04 wiz Exp $
 
 BUILDLINK_TREE+=	eel
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=	eel
 EEL_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.eel+=	eel>=2.10.0
-BUILDLINK_ABI_DEPENDS.eel?=	eel>=2.26.0nb1
+BUILDLINK_ABI_DEPENDS.eel?=	eel>=2.26.0nb2
 BUILDLINK_PKGSRCDIR.eel?=	../../devel/eel
 
 .include "../../devel/GConf/buildlink3.mk"
diff --git a/devel/eric4/Makefile b/devel/eric4/Makefile
index 3cb97a1ea99..e77b137c6a3 100644
--- a/devel/eric4/Makefile
+++ b/devel/eric4/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.2 2010/05/17 15:48:48 drochner Exp $
+# $NetBSD: Makefile,v 1.3 2010/06/13 22:44:04 wiz Exp $
 #
 
 VERS=			4.4.4a
 DISTNAME=		eric4-${VERS}
+PKGREVISION=		1
 CATEGORIES=		devel
 MASTER_SITES=	http://downloads.sourceforge.net/project/eric-ide/eric4/stable/${VERS}/
 
diff --git a/devel/frama-c/Makefile b/devel/frama-c/Makefile
index 181ff309bdd..0dce94febd7 100644
--- a/devel/frama-c/Makefile
+++ b/devel/frama-c/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.5 2010/01/18 09:58:44 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2010/06/13 22:44:04 wiz Exp $
 #
 
 DISTNAME=	frama-c-Beryllium-20090901
 PKGNAME=	${DISTNAME:S/-Beryllium//}
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	devel
 MASTER_SITES=	http://frama-c.cea.fr/download/
 
diff --git a/devel/gconfmm/Makefile b/devel/gconfmm/Makefile
index a1505a17fad..2f467eca69f 100644
--- a/devel/gconfmm/Makefile
+++ b/devel/gconfmm/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.35 2009/10/22 09:40:10 adam Exp $
+# $NetBSD: Makefile,v 1.36 2010/06/13 22:44:04 wiz Exp $
 
 DISTNAME=	gconfmm-2.28.0
+PKGREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/gconfmm/2.28/}
 EXTRACT_SUFX=	.tar.bz2
diff --git a/devel/gconfmm/buildlink3.mk b/devel/gconfmm/buildlink3.mk
index 711a2841cb6..d747892a607 100644
--- a/devel/gconfmm/buildlink3.mk
+++ b/devel/gconfmm/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.14 2009/08/26 19:57:07 sno Exp $
+# $NetBSD: buildlink3.mk,v 1.15 2010/06/13 22:44:04 wiz Exp $
 
 BUILDLINK_TREE+=	gconfmm
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=	gconfmm
 GCONFMM_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.gconfmm+=	gconfmm>=2.10.0
-BUILDLINK_ABI_DEPENDS.gconfmm+=	gconfmm>=2.24.0nb1
+BUILDLINK_ABI_DEPENDS.gconfmm+=	gconfmm>=2.28.0nb1
 BUILDLINK_PKGSRCDIR.gconfmm?=	../../devel/gconfmm
 
 .include "../../devel/GConf/buildlink3.mk"
diff --git a/devel/gdl/Makefile b/devel/gdl/Makefile
index c94931530e6..74cea57a34d 100644
--- a/devel/gdl/Makefile
+++ b/devel/gdl/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.17 2010/01/18 09:58:44 wiz Exp $
+# $NetBSD: Makefile,v 1.18 2010/06/13 22:44:04 wiz Exp $
 
 DISTNAME=	gdl-2.26.2
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	devel gnome
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/gdl/2.26/}
 EXTRACT_SUFX=	.tar.bz2
diff --git a/devel/gdl/buildlink3.mk b/devel/gdl/buildlink3.mk
index 9a7955531d0..17b2d358a28 100644
--- a/devel/gdl/buildlink3.mk
+++ b/devel/gdl/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.7 2010/01/18 09:58:44 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.8 2010/06/13 22:44:04 wiz Exp $
 
 BUILDLINK_TREE+=	gdl
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=	gdl
 GDL_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.gdl+=	gdl>=0.6.1
-BUILDLINK_ABI_DEPENDS.gdl?=	gdl>=2.26.2nb2
+BUILDLINK_ABI_DEPENDS.gdl?=	gdl>=2.26.2nb3
 BUILDLINK_PKGSRCDIR.gdl?=	../../devel/gdl
 
 .include "../../devel/libglade/buildlink3.mk"
diff --git a/devel/geany/Makefile b/devel/geany/Makefile
index 33890f1e93a..0b711d63eb5 100644
--- a/devel/geany/Makefile
+++ b/devel/geany/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.13 2009/08/26 19:57:20 sno Exp $
+# $NetBSD: Makefile,v 1.14 2010/06/13 22:44:04 wiz Exp $
 
 DISTNAME=	geany-0.17
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=geany/}
 
diff --git a/devel/giblib/Makefile b/devel/giblib/Makefile
index 6c1644483d5..75a9d50caef 100644
--- a/devel/giblib/Makefile
+++ b/devel/giblib/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.25 2010/01/18 09:58:44 wiz Exp $
+# $NetBSD: Makefile,v 1.26 2010/06/13 22:44:04 wiz Exp $
 
 DISTNAME=		giblib-1.2.4
-PKGREVISION=		7
+PKGREVISION=		8
 CATEGORIES=		devel
 MASTER_SITES=		http://linuxbrit.co.uk/downloads/
 
diff --git a/devel/giblib/buildlink3.mk b/devel/giblib/buildlink3.mk
index ca0ff935b32..875a63a938f 100644
--- a/devel/giblib/buildlink3.mk
+++ b/devel/giblib/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.13 2010/01/18 09:58:44 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.14 2010/06/13 22:44:04 wiz Exp $
 
 BUILDLINK_TREE+=	giblib
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=	giblib
 GIBLIB_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.giblib+=	giblib>=1.2.3nb3
-BUILDLINK_ABI_DEPENDS.giblib+=	giblib>=1.2.4nb7
+BUILDLINK_ABI_DEPENDS.giblib+=	giblib>=1.2.4nb8
 BUILDLINK_PKGSRCDIR.giblib?=	../../devel/giblib
 
 .include "../../graphics/imlib2/buildlink3.mk"
diff --git a/devel/glade/Makefile b/devel/glade/Makefile
index de698bebb9b..2e9d47c1b74 100644
--- a/devel/glade/Makefile
+++ b/devel/glade/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.62 2009/08/26 19:57:20 sno Exp $
+# $NetBSD: Makefile,v 1.63 2010/06/13 22:44:04 wiz Exp $
 
 DISTNAME=	glade-2.12.2
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/glade/2.12/}
 EXTRACT_SUFX=	.tar.bz2
diff --git a/devel/glade3/Makefile b/devel/glade3/Makefile
index 330b6da05c4..ef169872415 100644
--- a/devel/glade3/Makefile
+++ b/devel/glade3/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.11 2010/01/18 09:58:44 wiz Exp $
+# $NetBSD: Makefile,v 1.12 2010/06/13 22:44:05 wiz Exp $
 #
 
 DISTNAME=		glade3-3.4.5
-PKGREVISION=		2
+PKGREVISION=		3
 CATEGORIES=		devel
 MASTER_SITES=		${MASTER_SITE_GNOME:=sources/glade3/3.4/}
 EXTRACT_SUFX=		.tar.bz2
diff --git a/devel/glade3/buildlink3.mk b/devel/glade3/buildlink3.mk
index beb762d6f24..7c07306c615 100644
--- a/devel/glade3/buildlink3.mk
+++ b/devel/glade3/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2009/08/26 19:57:00 sno Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2010/06/13 22:44:05 wiz Exp $
 
 BUILDLINK_TREE+=	glade3
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=	glade3
 GLADE3_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.glade3+=	glade3>=3.4.0
-BUILDLINK_ABI_DEPENDS.glade3?=	glade3>=3.4.5nb1
+BUILDLINK_ABI_DEPENDS.glade3?=	glade3>=3.4.5nb3
 BUILDLINK_PKGSRCDIR.glade3?=	../../devel/glade3
 
 .include "../../x11/gtk2/buildlink3.mk"
diff --git a/devel/gnome-build/Makefile b/devel/gnome-build/Makefile
index 46b94befa27..547c0f3a8ae 100644
--- a/devel/gnome-build/Makefile
+++ b/devel/gnome-build/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.17 2010/01/18 09:58:44 wiz Exp $
+# $NetBSD: Makefile,v 1.18 2010/06/13 22:44:05 wiz Exp $
 #
 
 DISTNAME=	gnome-build-2.24.1
-PKGREVISION=	3
+PKGREVISION=	4
 CATEGORIES=	devel gnome
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/gnome-build/2.24/}
 EXTRACT_SUFX=	.tar.bz2
diff --git a/devel/gnome-build/buildlink3.mk b/devel/gnome-build/buildlink3.mk
index 457af1c5ef7..82696b9b6cf 100644
--- a/devel/gnome-build/buildlink3.mk
+++ b/devel/gnome-build/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.9 2010/01/18 09:58:44 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.10 2010/06/13 22:44:05 wiz Exp $
 
 BUILDLINK_TREE+=	gnome-build
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=	gnome-build
 GNOME_BUILD_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.gnome-build+=	gnome-build>=0.1.3
-BUILDLINK_ABI_DEPENDS.gnome-build?=	gnome-build>=2.24.1nb3
+BUILDLINK_ABI_DEPENDS.gnome-build?=	gnome-build>=2.24.1nb4
 BUILDLINK_PKGSRCDIR.gnome-build?=	../../devel/gnome-build
 
 .include "../../devel/gdl/buildlink3.mk"
diff --git a/devel/gst-plugins0.10-pango/Makefile b/devel/gst-plugins0.10-pango/Makefile
index 1bdef9a151f..5f2e26b6943 100644
--- a/devel/gst-plugins0.10-pango/Makefile
+++ b/devel/gst-plugins0.10-pango/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2008/06/20 01:09:13 joerg Exp $
+# $NetBSD: Makefile,v 1.3 2010/06/13 22:44:05 wiz Exp $
 #
 
 GST_PLUGINS0.10_NAME=	pango
@@ -9,5 +9,7 @@ PKG_DESTDIR_SUPPORT=	user-destdir
 
 .include "../../multimedia/gst-plugins0.10-base/Makefile.common"
 
+PKGREVISION=		1
+
 .include "../../devel/pango/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/guile-gnome/Makefile b/devel/guile-gnome/Makefile
index 4cf779babae..2527f19c54e 100644
--- a/devel/guile-gnome/Makefile
+++ b/devel/guile-gnome/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.16 2010/03/24 19:43:23 asau Exp $
+# $NetBSD: Makefile,v 1.17 2010/06/13 22:44:05 wiz Exp $
 
 DISTNAME=	guile-gnome-platform-2.16.1
-PKGREVISION=	5
+PKGREVISION=	6
 CATEGORIES=	devel
 MASTER_SITES=	http://ftp.gnu.org/gnu/guile-gnome/guile-gnome-platform/
 
diff --git a/devel/guile-gtk/Makefile b/devel/guile-gtk/Makefile
index 744b72fc6ad..7b4ca28babc 100644
--- a/devel/guile-gtk/Makefile
+++ b/devel/guile-gtk/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.40 2010/03/24 19:43:23 asau Exp $
+# $NetBSD: Makefile,v 1.41 2010/06/13 22:44:05 wiz Exp $
 #
 
 DISTNAME=		guile-gtk-0.60
-PKGREVISION=		5
+PKGREVISION=		6
 CATEGORIES=		devel x11
 MASTER_SITES=		${MASTER_SITE_GNU:=guile-gtk/}
 
diff --git a/devel/guile16-gtk/Makefile b/devel/guile16-gtk/Makefile
index 3418c1d7f66..eb96444c4ac 100644
--- a/devel/guile16-gtk/Makefile
+++ b/devel/guile16-gtk/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.6 2010/01/18 09:58:45 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2010/06/13 22:44:05 wiz Exp $
 #
 
 DISTNAME=		guile-gtk-0.5
 PKGNAME=		guile16-gtk-0.5
-PKGREVISION=		4
+PKGREVISION=		5
 CATEGORIES=		devel x11
 MASTER_SITES=		${MASTER_SITE_GNU:=guile-gtk/}
 
diff --git a/devel/kdbg/Makefile b/devel/kdbg/Makefile
index e80921a772d..d45b91aa89a 100644
--- a/devel/kdbg/Makefile
+++ b/devel/kdbg/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.73 2010/01/18 09:58:45 wiz Exp $
+# $NetBSD: Makefile,v 1.74 2010/06/13 22:44:05 wiz Exp $
 
 DISTNAME=	kdbg-2.1.1
-PKGREVISION=	3
+PKGREVISION=	4
 CATEGORIES=	devel kde
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=kdbg/}
 
diff --git a/devel/kdesdk3/Makefile b/devel/kdesdk3/Makefile
index 5b6771b289c..6a73df343ad 100644
--- a/devel/kdesdk3/Makefile
+++ b/devel/kdesdk3/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.70 2010/06/02 12:26:13 adam Exp $
+# $NetBSD: Makefile,v 1.71 2010/06/13 22:44:05 wiz Exp $
 
 DISTNAME=	kdesdk-${_KDE_VERSION}
-PKGREVISION=	7
+PKGREVISION=	8
 CATEGORIES=	devel
 COMMENT=	Support applications and tools used by KDE developers
 
diff --git a/devel/kdesdk3/buildlink3.mk b/devel/kdesdk3/buildlink3.mk
index 0df0bcd30ae..2a642f41ae4 100644
--- a/devel/kdesdk3/buildlink3.mk
+++ b/devel/kdesdk3/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.25 2010/06/02 12:26:13 adam Exp $
+# $NetBSD: buildlink3.mk,v 1.26 2010/06/13 22:44:05 wiz Exp $
 
 BUILDLINK_TREE+=	kdesdk
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=	kdesdk
 KDESDK_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.kdesdk+=	kdesdk>=3.5.0nb1
-BUILDLINK_ABI_DEPENDS.kdesdk?=	kdesdk>=3.5.10nb6
+BUILDLINK_ABI_DEPENDS.kdesdk?=	kdesdk>=3.5.10nb8
 BUILDLINK_PKGSRCDIR.kdesdk?=	../../devel/kdesdk3
 
 BDB_ACCEPTED?=		db4 db5
diff --git a/devel/kdesdk4/Makefile b/devel/kdesdk4/Makefile
index afc7e1003cc..25db9041a73 100644
--- a/devel/kdesdk4/Makefile
+++ b/devel/kdesdk4/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.7 2010/04/11 08:22:40 mrg Exp $
+# $NetBSD: Makefile,v 1.8 2010/06/13 22:44:05 wiz Exp $
 
 DISTNAME=	kdesdk-${_KDE_VERSION}
+PKGREVISION=	1
 CATEGORIES=	devel
 COMMENT=	Support applications and tools used by KDE developers
 
diff --git a/devel/kdevelop-base/Makefile b/devel/kdevelop-base/Makefile
index ba2d89ea524..ac9bc09d131 100644
--- a/devel/kdevelop-base/Makefile
+++ b/devel/kdevelop-base/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.85 2010/06/11 12:42:55 wiz Exp $
+# $NetBSD: Makefile,v 1.86 2010/06/13 22:44:05 wiz Exp $
 
 DISTNAME=	kdevelop_3.5.5.orig
 PKGNAME=	kdevelop-base-3.5.5
-PKGREVISION=	6
+PKGREVISION=	7
 CATEGORIES=	devel kde
 MASTER_SITES=	http://download.opensuse.org/repositories/home:/amilcarlucas/xUbuntu_6.06/
 EXTRACT_SUFX=	.tar.gz
diff --git a/devel/kdevelop4/Makefile b/devel/kdevelop4/Makefile
index a2f65e1d82c..f13cd2a5b9a 100644
--- a/devel/kdevelop4/Makefile
+++ b/devel/kdevelop4/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.1.1.1 2010/06/01 21:38:38 markd Exp $
+# $NetBSD: Makefile,v 1.2 2010/06/13 22:44:06 wiz Exp $
 #
 
 DISTNAME=	kdevelop-4.0.0
 PKGNAME=	kdevelop4-4.0.0
+PKGREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_KDE:=kdevelop/4.0.0/src/}
 EXTRACT_SUFX=	.tar.bz2
diff --git a/devel/kdevplatform/Makefile b/devel/kdevplatform/Makefile
index eaa90ce9132..d67f834bf7b 100644
--- a/devel/kdevplatform/Makefile
+++ b/devel/kdevplatform/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.1.1.1 2010/06/01 21:35:51 markd Exp $
+# $NetBSD: Makefile,v 1.2 2010/06/13 22:44:06 wiz Exp $
 #
 
 DISTNAME=	kdevplatform-1.0.0
+PKGREVISION=	1
 CATEGORIES=	devel kde
 MASTER_SITES=	${MASTER_SITE_KDE:=kdevelop/4.0.0/src/}
 EXTRACT_SUFX=	.tar.bz2
diff --git a/devel/kdiff3/Makefile b/devel/kdiff3/Makefile
index be1924662dc..50866fc5340 100644
--- a/devel/kdiff3/Makefile
+++ b/devel/kdiff3/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.9 2010/01/18 09:58:46 wiz Exp $
+# $NetBSD: Makefile,v 1.10 2010/06/13 22:44:06 wiz Exp $
 
 DISTNAME=		kdiff3-0.9.91
-PKGREVISION=		6
+PKGREVISION=		7
 CATEGORIES=		devel kde
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=kdiff3/}
 
diff --git a/devel/kscope/Makefile b/devel/kscope/Makefile
index eedb9ab077b..58cbdddd05c 100644
--- a/devel/kscope/Makefile
+++ b/devel/kscope/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.24 2010/01/29 19:05:18 joerg Exp $
+# $NetBSD: Makefile,v 1.25 2010/06/13 22:44:06 wiz Exp $
 #
 
 DISTNAME=		kscope-1.6.0
-PKGREVISION=		5
+PKGREVISION=		6
 CATEGORIES=		devel kde
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=kscope/}
 
diff --git a/devel/libast/Makefile b/devel/libast/Makefile
index 7efde803aa6..84afe834934 100644
--- a/devel/libast/Makefile
+++ b/devel/libast/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.28 2010/01/18 09:58:46 wiz Exp $
+# $NetBSD: Makefile,v 1.29 2010/06/13 22:44:06 wiz Exp $
 
 DISTNAME=	libast-0.7
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	devel
 MASTER_SITES=	http://www.eterm.org/download/
 
diff --git a/devel/libast/buildlink3.mk b/devel/libast/buildlink3.mk
index 0b1eddaadc1..463b5c48e35 100644
--- a/devel/libast/buildlink3.mk
+++ b/devel/libast/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.14 2010/01/18 09:58:46 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.15 2010/06/13 22:44:06 wiz Exp $
 
 BUILDLINK_TREE+=	libast
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=	libast
 LIBAST_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.libast+=	libast>=0.5nb5
-BUILDLINK_ABI_DEPENDS.libast+=	libast>=0.7nb2
+BUILDLINK_ABI_DEPENDS.libast+=	libast>=0.7nb3
 BUILDLINK_PKGSRCDIR.libast?=	../../devel/libast
 
 .include "../../devel/pcre/buildlink3.mk"
diff --git a/devel/libbonoboui/Makefile b/devel/libbonoboui/Makefile
index 3f0ef68a50b..b79d664d397 100644
--- a/devel/libbonoboui/Makefile
+++ b/devel/libbonoboui/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.74 2010/06/11 13:31:10 drochner Exp $
+# $NetBSD: Makefile,v 1.75 2010/06/13 22:44:06 wiz Exp $
 #
 
 DISTNAME=	libbonoboui-2.24.3
+PKGREVISION=	1
 CATEGORIES=	devel gnome
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/libbonoboui/2.24/}
 EXTRACT_SUFX=	.tar.bz2
diff --git a/devel/libbonoboui/buildlink3.mk b/devel/libbonoboui/buildlink3.mk
index af60bfa69a4..503959c1026 100644
--- a/devel/libbonoboui/buildlink3.mk
+++ b/devel/libbonoboui/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.23 2009/10/29 23:08:33 drochner Exp $
+# $NetBSD: buildlink3.mk,v 1.24 2010/06/13 22:44:06 wiz Exp $
 
 BUILDLINK_TREE+=	libbonoboui
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=	libbonoboui
 LIBBONOBOUI_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.libbonoboui+=		libbonoboui>=2.8.0
-BUILDLINK_ABI_DEPENDS.libbonoboui+=	libbonoboui>=2.24.1nb1
+BUILDLINK_ABI_DEPENDS.libbonoboui+=	libbonoboui>=2.24.3nb1
 BUILDLINK_PKGSRCDIR.libbonoboui?=	../../devel/libbonoboui
 
 .include "../../devel/GConf/buildlink3.mk"
diff --git a/devel/libcompizconfig/Makefile b/devel/libcompizconfig/Makefile
index aa1bdb7b383..9914d174ac5 100644
--- a/devel/libcompizconfig/Makefile
+++ b/devel/libcompizconfig/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.5 2009/11/26 19:51:14 imil Exp $
+# $NetBSD: Makefile,v 1.6 2010/06/13 22:44:06 wiz Exp $
 #
 
 PKGVER=		0.8.4
 DISTNAME=	libcompizconfig-${PKGVER}
+PKGREVISION=	1
 CATEGORIES=	devel gnome
 MASTER_SITES=	http://releases.compiz.org/${PKGVER}/
 
diff --git a/devel/libextractor/Makefile b/devel/libextractor/Makefile
index bda9baf91a9..eb32fab6632 100644
--- a/devel/libextractor/Makefile
+++ b/devel/libextractor/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.42 2009/12/15 21:40:01 joerg Exp $
+# $NetBSD: Makefile,v 1.43 2010/06/13 22:44:06 wiz Exp $
 
 DISTNAME=	libextractor-0.5.20c
-PKGREVISION=	3
+PKGREVISION=	4
 CATEGORIES=	devel
 MASTER_SITES=	http://gnunet.org/libextractor/download/
 
diff --git a/devel/libgail-gnome/Makefile b/devel/libgail-gnome/Makefile
index 3956f709a9a..519d6f9188a 100644
--- a/devel/libgail-gnome/Makefile
+++ b/devel/libgail-gnome/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.30 2010/01/18 09:58:46 wiz Exp $
+# $NetBSD: Makefile,v 1.31 2010/06/13 22:44:06 wiz Exp $
 #
 
 DISTNAME=	libgail-gnome-1.20.1
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	devel gnome
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/libgail-gnome/1.20/}
 EXTRACT_SUFX=	.tar.bz2
diff --git a/devel/libgail-gnome/buildlink3.mk b/devel/libgail-gnome/buildlink3.mk
index c4e594f28d8..d11fcbe0283 100644
--- a/devel/libgail-gnome/buildlink3.mk
+++ b/devel/libgail-gnome/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.21 2010/01/18 09:58:46 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.22 2010/06/13 22:44:06 wiz Exp $
 
 BUILDLINK_TREE+=	libgail-gnome
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=	libgail-gnome
 LIBGAIL_GNOME_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.libgail-gnome+=	libgail-gnome>=1.1.1nb2
-BUILDLINK_ABI_DEPENDS.libgail-gnome?=	libgail-gnome>=1.20.1nb2
+BUILDLINK_ABI_DEPENDS.libgail-gnome?=	libgail-gnome>=1.20.1nb3
 BUILDLINK_PKGSRCDIR.libgail-gnome?=	../../devel/libgail-gnome
 
 .include "../../devel/at-spi/buildlink3.mk"
diff --git a/devel/libglade/Makefile b/devel/libglade/Makefile
index 4accdbcce93..b217272b850 100644
--- a/devel/libglade/Makefile
+++ b/devel/libglade/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.69 2010/01/30 16:28:00 heinz Exp $
+# $NetBSD: Makefile,v 1.70 2010/06/13 22:44:06 wiz Exp $
 #
 
 DISTNAME=		libglade-2.6.4
-PKGREVISION=		1
+PKGREVISION=		2
 CATEGORIES=		devel gnome
 MASTER_SITES=		${MASTER_SITE_GNOME:=sources/libglade/2.6/}
 EXTRACT_SUFX=		.tar.bz2
diff --git a/devel/libglade/buildlink3.mk b/devel/libglade/buildlink3.mk
index 44c61d02394..10f516deda0 100644
--- a/devel/libglade/buildlink3.mk
+++ b/devel/libglade/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.16 2009/08/26 19:56:55 sno Exp $
+# $NetBSD: buildlink3.mk,v 1.17 2010/06/13 22:44:06 wiz Exp $
 
 BUILDLINK_TREE+=	libglade
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=	libglade
 LIBGLADE_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.libglade+=	libglade>=2.3.6
-BUILDLINK_ABI_DEPENDS.libglade+=	libglade>=2.6.4nb1
+BUILDLINK_ABI_DEPENDS.libglade+=	libglade>=2.6.4nb2
 BUILDLINK_PKGSRCDIR.libglade?=	../../devel/libglade
 
 .include "../../textproc/libxml2/buildlink3.mk"
diff --git a/devel/libglademm/Makefile b/devel/libglademm/Makefile
index 97db54f255e..6bdaad62e92 100644
--- a/devel/libglademm/Makefile
+++ b/devel/libglademm/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.15 2009/08/26 19:57:07 sno Exp $
+# $NetBSD: Makefile,v 1.16 2010/06/13 22:44:07 wiz Exp $
 
 DISTNAME=	libglademm-2.6.7
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/libglademm/2.6/}
 EXTRACT_SUFX=	.tar.bz2
diff --git a/devel/libglademm/buildlink3.mk b/devel/libglademm/buildlink3.mk
index f4c6effeb06..859640c08ba 100644
--- a/devel/libglademm/buildlink3.mk
+++ b/devel/libglademm/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.12 2009/08/26 19:57:07 sno Exp $
+# $NetBSD: buildlink3.mk,v 1.13 2010/06/13 22:44:07 wiz Exp $
 
 BUILDLINK_TREE+=	libglademm
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=	libglademm
 LIBGLADEMM_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.libglademm+=	libglademm>=2.6.0
-BUILDLINK_ABI_DEPENDS.libglademm+=	libglademm>=2.6.7nb1
+BUILDLINK_ABI_DEPENDS.libglademm+=	libglademm>=2.6.7nb2
 BUILDLINK_PKGSRCDIR.libglademm?=	../../devel/libglademm
 
 .include "../../devel/libglade/buildlink3.mk"
diff --git a/devel/libgnome/Makefile b/devel/libgnome/Makefile
index 72989672f9e..e3cebbb3fe5 100644
--- a/devel/libgnome/Makefile
+++ b/devel/libgnome/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.77 2010/06/11 13:23:56 drochner Exp $
+# $NetBSD: Makefile,v 1.78 2010/06/13 22:44:07 wiz Exp $
 #
 
 DISTNAME=	libgnome-2.30.0
+PKGREVISION=	1
 CATEGORIES=	devel gnome
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/libgnome/2.30/}
 EXTRACT_SUFX=	.tar.bz2
diff --git a/devel/libgnome/buildlink3.mk b/devel/libgnome/buildlink3.mk
index 2d0ebee6b48..0f05cf60c84 100644
--- a/devel/libgnome/buildlink3.mk
+++ b/devel/libgnome/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.22 2009/10/29 23:05:00 drochner Exp $
+# $NetBSD: buildlink3.mk,v 1.23 2010/06/13 22:44:07 wiz Exp $
 
 BUILDLINK_TREE+=	libgnome
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=	libgnome
 LIBGNOME_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.libgnome+=	libgnome>=2.8.0
-BUILDLINK_ABI_DEPENDS.libgnome+=	libgnome>=2.20.1.1nb1
+BUILDLINK_ABI_DEPENDS.libgnome+=	libgnome>=2.30.0nb1
 BUILDLINK_PKGSRCDIR.libgnome?=	../../devel/libgnome
 
 .include "../../mk/bsd.fast.prefs.mk"
diff --git a/devel/libgnomemm/Makefile b/devel/libgnomemm/Makefile
index b4186cd8183..a1fd5a9a4e0 100644
--- a/devel/libgnomemm/Makefile
+++ b/devel/libgnomemm/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.25 2009/10/29 23:14:13 drochner Exp $
+# $NetBSD: Makefile,v 1.26 2010/06/13 22:44:07 wiz Exp $
 
 DISTNAME=	libgnomemm-2.28.0
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/libgnomemm/2.28/}
 EXTRACT_SUFX=	.tar.bz2
diff --git a/devel/libgnomemm/buildlink3.mk b/devel/libgnomemm/buildlink3.mk
index b09fff8901c..77505ee3933 100644
--- a/devel/libgnomemm/buildlink3.mk
+++ b/devel/libgnomemm/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.17 2009/10/22 15:46:49 adam Exp $
+# $NetBSD: buildlink3.mk,v 1.18 2010/06/13 22:44:07 wiz Exp $
 
 BUILDLINK_TREE+=	libgnomemm
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=	libgnomemm
 LIBGNOMEMM_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.libgnomemm+=	libgnomemm>=2.10.0
-BUILDLINK_ABI_DEPENDS.libgnomemm+=	libgnomemm>=2.28.0
+BUILDLINK_ABI_DEPENDS.libgnomemm+=	libgnomemm>=2.28.0nb2
 BUILDLINK_PKGSRCDIR.libgnomemm?=	../../devel/libgnomemm
 
 .include "../../devel/libgnome/buildlink3.mk"
diff --git a/devel/libgnomeui/Makefile b/devel/libgnomeui/Makefile
index bf97d28c342..3fb3ed607e1 100644
--- a/devel/libgnomeui/Makefile
+++ b/devel/libgnomeui/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.90 2010/06/11 13:34:29 drochner Exp $
+# $NetBSD: Makefile,v 1.91 2010/06/13 22:44:07 wiz Exp $
 #
 
 DISTNAME=	libgnomeui-2.24.3
+PKGREVISION=	1
 CATEGORIES=	devel gnome
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/libgnomeui/2.24/}
 EXTRACT_SUFX=	.tar.bz2
diff --git a/devel/libgnomeui/buildlink3.mk b/devel/libgnomeui/buildlink3.mk
index dd6752ac371..6b68b8a80dc 100644
--- a/devel/libgnomeui/buildlink3.mk
+++ b/devel/libgnomeui/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.29 2010/06/11 13:34:29 drochner Exp $
+# $NetBSD: buildlink3.mk,v 1.30 2010/06/13 22:44:07 wiz Exp $
 
 BUILDLINK_TREE+=	libgnomeui
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=	libgnomeui
 LIBGNOMEUI_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.libgnomeui+=		libgnomeui>=2.8.0
-BUILDLINK_ABI_DEPENDS.libgnomeui+=	libgnomeui>=2.24.2nb3
+BUILDLINK_ABI_DEPENDS.libgnomeui+=	libgnomeui>=2.24.3nb1
 BUILDLINK_PKGSRCDIR.libgnomeui?=	../../devel/libgnomeui
 
 .include "../../devel/GConf/buildlink3.mk"
diff --git a/devel/libgnomeuimm/Makefile b/devel/libgnomeuimm/Makefile
index 83523ef3b74..3ada02f5c64 100644
--- a/devel/libgnomeuimm/Makefile
+++ b/devel/libgnomeuimm/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.26 2010/01/18 09:58:46 wiz Exp $
+# $NetBSD: Makefile,v 1.27 2010/06/13 22:44:07 wiz Exp $
 
 DISTNAME=	libgnomeuimm-2.28.0
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/libgnomeuimm/2.28/}
 EXTRACT_SUFX=	.tar.bz2
diff --git a/devel/libgnomeuimm/buildlink3.mk b/devel/libgnomeuimm/buildlink3.mk
index cf5f1033bd3..ca93813c58e 100644
--- a/devel/libgnomeuimm/buildlink3.mk
+++ b/devel/libgnomeuimm/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.18 2010/01/18 09:58:46 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.19 2010/06/13 22:44:07 wiz Exp $
 
 BUILDLINK_TREE+=	libgnomeuimm
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=	libgnomeuimm
 LIBGNOMEUIMM_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.libgnomeuimm+=	libgnomeuimm>=2.10.0
-BUILDLINK_ABI_DEPENDS.libgnomeuimm+=	libgnomeuimm>=2.28.0nb2
+BUILDLINK_ABI_DEPENDS.libgnomeuimm+=	libgnomeuimm>=2.28.0nb3
 BUILDLINK_PKGSRCDIR.libgnomeuimm?=	../../devel/libgnomeuimm
 
 .include "../../devel/gconfmm/buildlink3.mk"
diff --git a/devel/libgsf-gnome/Makefile b/devel/libgsf-gnome/Makefile
index 31da96ddd6d..fdf32106acf 100644
--- a/devel/libgsf-gnome/Makefile
+++ b/devel/libgsf-gnome/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.5 2010/04/22 02:41:29 dsainty Exp $
+# $NetBSD: Makefile,v 1.6 2010/06/13 22:44:07 wiz Exp $
 #
 
 DISTNAME=	libgsf-1.14.18
 PKGNAME=	libgsf-gnome-1.14.18
+PKGREVISION=	1
 CATEGORIES=	devel gnome
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/libgsf/1.14/}
 EXTRACT_SUFX=	.tar.bz2
diff --git a/devel/libgsf-gnome/buildlink3.mk b/devel/libgsf-gnome/buildlink3.mk
index 46bbbb0531f..b9a97713b57 100644
--- a/devel/libgsf-gnome/buildlink3.mk
+++ b/devel/libgsf-gnome/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2009/08/02 10:52:06 drochner Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2010/06/13 22:44:07 wiz Exp $
 
 BUILDLINK_TREE+=	libgsf-gnome
 
@@ -6,6 +6,7 @@ BUILDLINK_TREE+=	libgsf-gnome
 LIBGSF_GNOME_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.libgsf-gnome+=	libgsf-gnome>=1.14.15
+BUILDLINK_ABI_DEPENDS.libgsf-gnome?=	libgsf-gnome>=1.14.18nb1
 BUILDLINK_PKGSRCDIR.libgsf-gnome?=	../../devel/libgsf-gnome
 
 .include "../../archivers/bzip2/buildlink3.mk"
diff --git a/devel/libgweather/Makefile b/devel/libgweather/Makefile
index 23ce6a3608d..98017291f21 100644
--- a/devel/libgweather/Makefile
+++ b/devel/libgweather/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.17 2010/03/26 17:48:56 zafer Exp $
+# $NetBSD: Makefile,v 1.18 2010/06/13 22:44:07 wiz Exp $
 #
 
 DISTNAME=	libgweather-2.28.0
+PKGREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/libgweather/2.28/}
 EXTRACT_SUFX=	.tar.bz2
diff --git a/devel/libgweather/buildlink3.mk b/devel/libgweather/buildlink3.mk
index e91b459aa19..5c7eae4f6ea 100644
--- a/devel/libgweather/buildlink3.mk
+++ b/devel/libgweather/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2009/10/21 15:53:23 drochner Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2010/06/13 22:44:07 wiz Exp $
 
 BUILDLINK_TREE+=	libgweather
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=	libgweather
 LIBGWEATHER_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.libgweather+=	libgweather>=2.22.0
-BUILDLINK_ABI_DEPENDS.libgweather?=	libgweather>=2.26.2.1nb1
+BUILDLINK_ABI_DEPENDS.libgweather?=	libgweather>=2.28.0nb1
 BUILDLINK_PKGSRCDIR.libgweather?=	../../devel/libgweather
 
 .include "../../net/libsoup24/buildlink3.mk"
diff --git a/devel/libmatchbox/Makefile b/devel/libmatchbox/Makefile
index 2b3e0cbe08e..fb6931e8217 100644
--- a/devel/libmatchbox/Makefile
+++ b/devel/libmatchbox/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.20 2009/07/16 21:17:45 zafer Exp $
+# $NetBSD: Makefile,v 1.21 2010/06/13 22:44:07 wiz Exp $
 #
 
 DISTNAME=	libmatchbox-1.9
+PKGREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	http://matchbox-project.org/sources/libmatchbox/1.9/
 
diff --git a/devel/libmatchbox/buildlink3.mk b/devel/libmatchbox/buildlink3.mk
index d88cb765222..f17813bed17 100644
--- a/devel/libmatchbox/buildlink3.mk
+++ b/devel/libmatchbox/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.14 2009/03/20 19:24:20 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.15 2010/06/13 22:44:07 wiz Exp $
 
 BUILDLINK_TREE+=	libmatchbox
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=	libmatchbox
 LIBMATCHBOX_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.libmatchbox+=	libmatchbox>=1.4
-BUILDLINK_ABI_DEPENDS.libmatchbox+=	libmatchbox>=1.7nb3
+BUILDLINK_ABI_DEPENDS.libmatchbox+=	libmatchbox>=1.9nb1
 BUILDLINK_PKGSRCDIR.libmatchbox?=	../../devel/libmatchbox
 
 .include "../../graphics/png/buildlink3.mk"
diff --git a/devel/libsexy/Makefile b/devel/libsexy/Makefile
index 6cf1b38bec5..a4fe7273991 100644
--- a/devel/libsexy/Makefile
+++ b/devel/libsexy/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.7 2009/08/26 19:56:59 sno Exp $
+# $NetBSD: Makefile,v 1.8 2010/06/13 22:44:07 wiz Exp $
 #
 
 DISTNAME=	libsexy-0.1.11
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	devel gnome
 MASTER_SITES=	http://releases.chipx86.com/libsexy/libsexy/
 
diff --git a/devel/libsexy/buildlink3.mk b/devel/libsexy/buildlink3.mk
index e11549b5c2e..a6868e7d16c 100644
--- a/devel/libsexy/buildlink3.mk
+++ b/devel/libsexy/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.7 2009/08/26 19:56:59 sno Exp $
+# $NetBSD: buildlink3.mk,v 1.8 2010/06/13 22:44:07 wiz Exp $
 
 BUILDLINK_TREE+=	libsexy
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=	libsexy
 LIBSEXY_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.libsexy+=	libsexy>=0.1.8
-BUILDLINK_ABI_DEPENDS.libsexy?=	libsexy>=0.1.11nb1
+BUILDLINK_ABI_DEPENDS.libsexy?=	libsexy>=0.1.11nb2
 BUILDLINK_PKGSRCDIR.libsexy?=	../../devel/libsexy
 
 .include "../../devel/glib2/buildlink3.mk"
diff --git a/devel/libsexymm/Makefile b/devel/libsexymm/Makefile
index 80532c5add6..3fc0fb70fee 100644
--- a/devel/libsexymm/Makefile
+++ b/devel/libsexymm/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.5 2009/08/26 19:57:06 sno Exp $
+# $NetBSD: Makefile,v 1.6 2010/06/13 22:44:08 wiz Exp $
 #
 
 DISTNAME=	libsexymm-0.1.9
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	devel
 MASTER_SITES=	http://releases.chipx86.com/libsexy/libsexymm/
 
diff --git a/devel/libsexymm/buildlink3.mk b/devel/libsexymm/buildlink3.mk
index 2d61f0809d3..60dc9e6c78a 100644
--- a/devel/libsexymm/buildlink3.mk
+++ b/devel/libsexymm/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2009/08/26 19:57:06 sno Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2010/06/13 22:44:08 wiz Exp $
 
 BUILDLINK_TREE+=	libsexymm
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=	libsexymm
 LIBSEXYMM_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.libsexymm+=	libsexymm>=0.1.9
-BUILDLINK_ABI_DEPENDS.libsexymm?=	libsexymm>=0.1.9nb2
+BUILDLINK_ABI_DEPENDS.libsexymm?=	libsexymm>=0.1.9nb3
 BUILDLINK_PKGSRCDIR.libsexymm?=	../../devel/libsexymm
 
 .include "../../x11/gtkmm/buildlink3.mk"
diff --git a/devel/libslang2/buildlink3.mk b/devel/libslang2/buildlink3.mk
index 7d0cf1485c7..c027216489c 100644
--- a/devel/libslang2/buildlink3.mk
+++ b/devel/libslang2/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:24:23 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2010/06/13 22:44:08 wiz Exp $
 
 BUILDLINK_TREE+=	libslang2
 
@@ -6,6 +6,7 @@ BUILDLINK_TREE+=	libslang2
 LIBSLANG2_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.libslang2+=	libslang2>=2.1.3
+BUILDLINK_ABI_DEPENDS.libslang2?=	libslang2>=2.2.2
 BUILDLINK_PKGSRCDIR.libslang2?=	../../devel/libslang2
 BUILDLINK_FNAME_TRANSFORM.libslang2+=	-e 's|include/slang2/|include/|g'
 BUILDLINK_TRANSFORM+=		l:slang:slang2
diff --git a/devel/libview/Makefile b/devel/libview/Makefile
index 19f6914aa49..f3fe93c5180 100644
--- a/devel/libview/Makefile
+++ b/devel/libview/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.1.1.1 2009/10/26 11:29:45 drochner Exp $
+# $NetBSD: Makefile,v 1.2 2010/06/13 22:44:08 wiz Exp $
 #
 
 DISTNAME=	libview-0.6.4
+PKGREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=view/}
 
diff --git a/devel/libview/buildlink3.mk b/devel/libview/buildlink3.mk
index 6767b46d49a..705cf54b6b0 100644
--- a/devel/libview/buildlink3.mk
+++ b/devel/libview/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1.1.1 2009/10/26 11:29:45 drochner Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2010/06/13 22:44:08 wiz Exp $
 
 BUILDLINK_TREE+=	libview
 
@@ -6,6 +6,7 @@ BUILDLINK_TREE+=	libview
 LIBVIEW_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.libview+=	libview>=0.6.4
+BUILDLINK_ABI_DEPENDS.libview?=	libview>=0.6.4nb1
 BUILDLINK_PKGSRCDIR.libview?=	../../devel/libview
 
 .include "../../x11/gtk2/buildlink3.mk"
diff --git a/devel/libwnck/Makefile b/devel/libwnck/Makefile
index f4820cd6c92..9ac0b24e476 100644
--- a/devel/libwnck/Makefile
+++ b/devel/libwnck/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.68 2010/03/31 03:50:25 dsainty Exp $
+# $NetBSD: Makefile,v 1.69 2010/06/13 22:44:08 wiz Exp $
 #
 
 DISTNAME=	libwnck-2.28.0
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	devel x11 gnome
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/libwnck/2.28/}
 EXTRACT_SUFX=	.tar.bz2
diff --git a/devel/libwnck/buildlink3.mk b/devel/libwnck/buildlink3.mk
index 4a0f8f16f59..aa65b2e4f1f 100644
--- a/devel/libwnck/buildlink3.mk
+++ b/devel/libwnck/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.19 2010/03/31 04:04:10 dsainty Exp $
+# $NetBSD: buildlink3.mk,v 1.20 2010/06/13 22:44:08 wiz Exp $
 
 BUILDLINK_TREE+=	libwnck
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=	libwnck
 LIBWNCK_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.libwnck+=	libwnck>=2.20.0
-BUILDLINK_ABI_DEPENDS.libwnck?=	libwnck>=2.26.2nb1
+BUILDLINK_ABI_DEPENDS.libwnck?=	libwnck>=2.28.0nb2
 BUILDLINK_PKGSRCDIR.libwnck?=	../../devel/libwnck
 
 .include "../../devel/gettext-lib/buildlink3.mk"
diff --git a/devel/m17n-lib/buildlink3.mk b/devel/m17n-lib/buildlink3.mk
index cd5dacb4153..0ab463094f7 100644
--- a/devel/m17n-lib/buildlink3.mk
+++ b/devel/m17n-lib/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2010/01/18 09:58:46 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2010/06/13 22:44:08 wiz Exp $
 
 BUILDLINK_TREE+=	m17n-lib
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=	m17n-lib
 M17N_LIB_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.m17n-lib+=	m17n-lib>=1.5.1
-BUILDLINK_ABI_DEPENDS.m17n-lib?=	m17n-lib>=1.5.5
+BUILDLINK_ABI_DEPENDS.m17n-lib?=	m17n-lib>=1.6.1
 BUILDLINK_PKGSRCDIR.m17n-lib?=	../../devel/m17n-lib
 
 pkgbase := m17n-lib
diff --git a/devel/mono-tools/Makefile b/devel/mono-tools/Makefile
index 180d0bd9cca..8dad9854e5b 100644
--- a/devel/mono-tools/Makefile
+++ b/devel/mono-tools/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.21 2010/04/09 16:03:08 kefren Exp $
+# $NetBSD: Makefile,v 1.22 2010/06/13 22:44:08 wiz Exp $
 
 DISTNAME=	mono-tools-2.6.2
+PKGREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	http://ftp.novell.com/pub/mono/sources/mono-tools/
 EXTRACT_SUFX=	.tar.bz2
diff --git a/devel/monodevelop/Makefile b/devel/monodevelop/Makefile
index 7fd72e7c755..7e40a1f8864 100644
--- a/devel/monodevelop/Makefile
+++ b/devel/monodevelop/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.32 2010/04/17 17:11:04 kefren Exp $
+# $NetBSD: Makefile,v 1.33 2010/06/13 22:44:08 wiz Exp $
 
 DISTNAME=	monodevelop-2.2.2
+PKGREVISION=	3
 CATEGORIES=	devel
-PKGREVISION=	2
 MASTER_SITES=	http://ftp.novell.com/pub/mono/sources/monodevelop/
 EXTRACT_SUFX=	.tar.bz2
 
diff --git a/devel/monotone-viz/Makefile b/devel/monotone-viz/Makefile
index c128cbb0ccc..49c8a59bfd5 100644
--- a/devel/monotone-viz/Makefile
+++ b/devel/monotone-viz/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.24 2010/01/17 12:02:13 wiz Exp $
+# $NetBSD: Makefile,v 1.25 2010/06/13 22:44:08 wiz Exp $
 #
 
 DISTNAME=		monotone-viz-1.0.1-nolablgtk
 PKGNAME=		${DISTNAME:S/-nolablgtk//}
-PKGREVISION=		3
+PKGREVISION=		4
 CATEGORIES=		devel scm
 MASTER_SITES=		http://oandrieu.nerim.net/monotone-viz/
 
diff --git a/devel/ogre/Makefile b/devel/ogre/Makefile
index d03c7955a7d..267aad4ceda 100644
--- a/devel/ogre/Makefile
+++ b/devel/ogre/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.27 2010/01/18 09:58:46 wiz Exp $
+# $NetBSD: Makefile,v 1.28 2010/06/13 22:44:08 wiz Exp $
 #
 
 DISTNAME=	ogre-v1-6-3
 PKGNAME=	ogre-1.6.3
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=ogre/}
 EXTRACT_SUFX=	.tar.bz2
diff --git a/devel/ogre/buildlink3.mk b/devel/ogre/buildlink3.mk
index e2105a617e2..6b9f4902134 100644
--- a/devel/ogre/buildlink3.mk
+++ b/devel/ogre/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.17 2010/01/18 09:58:46 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.18 2010/06/13 22:44:08 wiz Exp $
 
 BUILDLINK_TREE+=	ogre
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=	ogre
 OGRE_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.ogre+=	ogre>=1.6.3
-BUILDLINK_ABI_DEPENDS.ogre+=	ogre>=1.6.3nb1
+BUILDLINK_ABI_DEPENDS.ogre+=	ogre>=1.6.3nb2
 BUILDLINK_PKGSRCDIR.ogre?=	../../devel/ogre
 
 .include "../../archivers/zziplib/buildlink3.mk"
diff --git a/devel/p5-Gtk2-GladeXML/Makefile b/devel/p5-Gtk2-GladeXML/Makefile
index ac9a4ffb1e2..1041f13f450 100644
--- a/devel/p5-Gtk2-GladeXML/Makefile
+++ b/devel/p5-Gtk2-GladeXML/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.5 2009/08/26 19:57:22 sno Exp $
+# $NetBSD: Makefile,v 1.6 2010/06/13 22:44:09 wiz Exp $
 
 DISTNAME=	Gtk2-GladeXML-1.007
 PKGNAME=	p5-${DISTNAME}
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	x11 perl5
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=gtk2-perl/}
 
diff --git a/devel/p5-SDL/Makefile b/devel/p5-SDL/Makefile
index d54c7b3918f..e6d2118d292 100644
--- a/devel/p5-SDL/Makefile
+++ b/devel/p5-SDL/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.39 2010/01/18 09:58:47 wiz Exp $
+# $NetBSD: Makefile,v 1.40 2010/06/13 22:44:09 wiz Exp $
 #
 
 DISTNAME=	SDL_Perl-2.1.2
 PKGNAME=	p5-SDL-2.1.2
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	devel perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=../../authors/id/D/DG/DGOEHRIG/}
 
diff --git a/devel/p5-Wx-Perl-DataWalker/Makefile b/devel/p5-Wx-Perl-DataWalker/Makefile
index cc7b7e59ae9..42efea9adc8 100644
--- a/devel/p5-Wx-Perl-DataWalker/Makefile
+++ b/devel/p5-Wx-Perl-DataWalker/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.2 2010/02/03 11:30:15 sno Exp $
+# $NetBSD: Makefile,v 1.3 2010/06/13 22:44:09 wiz Exp $
 #
 
 DISTNAME=	Wx-Perl-DataWalker-0.02
 PKGNAME=	p5-${DISTNAME}
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	x11 perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=Wx/}
 
diff --git a/devel/p5-pango/Makefile b/devel/p5-pango/Makefile
index b90ee761008..72c08d401e8 100644
--- a/devel/p5-pango/Makefile
+++ b/devel/p5-pango/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.2 2009/05/24 05:45:47 kefren Exp $
+# $NetBSD: Makefile,v 1.3 2010/06/13 22:44:09 wiz Exp $
 #
 
 DISTNAME=	Pango-${DIST_VER}
 PKGNAME=	p5-pango-${DIST_VER}
+PKGREVISION=	1
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=gtk2-perl/}
 
diff --git a/devel/p5-pango/buildlink3.mk b/devel/p5-pango/buildlink3.mk
index 36447e57c35..870f3809bbd 100644
--- a/devel/p5-pango/buildlink3.mk
+++ b/devel/p5-pango/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1.1.1 2009/05/21 19:24:44 sno Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2010/06/13 22:44:09 wiz Exp $
 
 BUILDLINK_TREE+=	p5-pango
 
@@ -6,6 +6,7 @@ BUILDLINK_TREE+=	p5-pango
 P5_PANGO_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.p5-pango+=	p5-pango>=1.200
+BUILDLINK_ABI_DEPENDS.p5-pango?=		p5-pango>=1.220nb1
 BUILDLINK_PKGSRCDIR.p5-pango?=		../../devel/p5-pango
 
 .include "../../devel/pango/buildlink3.mk"
diff --git a/devel/pango/Makefile b/devel/pango/Makefile
index 7d6453ee124..302a3a5711b 100644
--- a/devel/pango/Makefile
+++ b/devel/pango/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.142 2010/05/31 17:57:37 drochner Exp $
+# $NetBSD: Makefile,v 1.143 2010/06/13 22:44:09 wiz Exp $
 
 DISTNAME=		pango-1.28.0
+PKGREVISION=		1
 CATEGORIES=		devel fonts
 MASTER_SITES=		${MASTER_SITE_GNOME:=sources/pango/1.28/}
 EXTRACT_SUFX=		.tar.bz2
diff --git a/devel/pango/buildlink3.mk b/devel/pango/buildlink3.mk
index fc41af569d0..7a3d2145706 100644
--- a/devel/pango/buildlink3.mk
+++ b/devel/pango/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.22 2009/03/20 19:24:26 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.23 2010/06/13 22:44:09 wiz Exp $
 
 BUILDLINK_TREE+=	pango
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=	pango
 PANGO_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.pango+=	pango>=1.6.0
-BUILDLINK_ABI_DEPENDS.pango+=	pango>=1.12.1nb1
+BUILDLINK_ABI_DEPENDS.pango+=	pango>=1.28.0nb1
 BUILDLINK_PKGSRCDIR.pango?=	../../devel/pango
 
 .include "../../mk/bsd.fast.prefs.mk"
diff --git a/devel/pangomm/Makefile b/devel/pangomm/Makefile
index 0868f343e5b..8d3aa80f4b5 100644
--- a/devel/pangomm/Makefile
+++ b/devel/pangomm/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.8 2010/06/02 16:45:11 adam Exp $
+# $NetBSD: Makefile,v 1.9 2010/06/13 22:44:09 wiz Exp $
 
 DISTNAME=	pangomm-2.26.2
+PKGREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/pangomm/2.26/}
 EXTRACT_SUFX=	.tar.bz2
diff --git a/devel/pangomm/buildlink3.mk b/devel/pangomm/buildlink3.mk
index 72a1a10806a..51fd43db875 100644
--- a/devel/pangomm/buildlink3.mk
+++ b/devel/pangomm/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2010/06/02 16:45:11 adam Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2010/06/13 22:44:09 wiz Exp $
 
 BUILDLINK_TREE+=	pangomm
 
@@ -6,6 +6,7 @@ BUILDLINK_TREE+=	pangomm
 PANGOMM_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.pangomm+=	pangomm>=2.26.2
+BUILDLINK_ABI_DEPENDS.pangomm?=	pangomm>=2.26.2nb1
 BUILDLINK_PKGSRCDIR.pangomm?=	../../devel/pangomm
 
 .include "../../devel/glibmm/buildlink3.mk"
diff --git a/devel/py-at-spi/Makefile b/devel/py-at-spi/Makefile
index 5dd733b8cc5..16deadf0f73 100644
--- a/devel/py-at-spi/Makefile
+++ b/devel/py-at-spi/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.15 2010/06/10 19:24:35 wiz Exp $
+# $NetBSD: Makefile,v 1.16 2010/06/13 22:44:09 wiz Exp $
 #
 
 DISTNAME=		at-spi-1.30.1
 PKGNAME=		${PYPKGPREFIX}-${DISTNAME}
+PKGREVISION=		1
 CATEGORIES=		devel
 MASTER_SITES=		${MASTER_SITE_GNOME:=sources/at-spi/1.30/}
 EXTRACT_SUFX=		.tar.bz2
diff --git a/devel/py-at-spi/buildlink3.mk b/devel/py-at-spi/buildlink3.mk
index a345e522e98..cf0f74abc2d 100644
--- a/devel/py-at-spi/buildlink3.mk
+++ b/devel/py-at-spi/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2009/08/27 18:53:36 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2010/06/13 22:44:09 wiz Exp $
 
 BUILDLINK_TREE+=	py-at-spi
 
@@ -8,7 +8,7 @@ PY_AT_SPI_BUILDLINK3_MK:=
 .include "../../lang/python/pyversion.mk"
 
 BUILDLINK_API_DEPENDS.py-at-spi+=	${PYPKGPREFIX}-at-spi>=1.20.1
-BUILDLINK_ABI_DEPENDS.py-at-spi?=		${PYPKGPREFIX}-at-spi>=1.26.0nb1
+BUILDLINK_ABI_DEPENDS.py-at-spi?=	${PYPKGPREFIX}-at-spi>=1.30.1nb1
 BUILDLINK_PKGSRCDIR.py-at-spi?=		../../devel/py-at-spi
 
 .include "../../devel/at-spi/buildlink3.mk"
diff --git a/devel/py-compizconfig/Makefile b/devel/py-compizconfig/Makefile
index e019f2936bb..ed93877adc4 100644
--- a/devel/py-compizconfig/Makefile
+++ b/devel/py-compizconfig/Makefile
@@ -1,9 +1,10 @@
-# $NetBSD: Makefile,v 1.6 2010/02/14 18:08:48 joerg Exp $
+# $NetBSD: Makefile,v 1.7 2010/06/13 22:44:09 wiz Exp $
 #
 
 PKGVER=			0.8.4
 DISTNAME=		compizconfig-python-${PKGVER}
 PKGNAME=		${PYPKGPREFIX}-compizconfig-${PKGVER}
+PKGREVISION=		1
 CATEGORIES=		devel gnome
 MASTER_SITES=		http://releases.compiz.org/${PKGVER}/
 
diff --git a/devel/py-game/Makefile b/devel/py-game/Makefile
index 4553f26a9cf..eee2d831cd8 100644
--- a/devel/py-game/Makefile
+++ b/devel/py-game/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.16 2010/01/18 09:58:47 wiz Exp $
+# $NetBSD: Makefile,v 1.17 2010/06/13 22:44:09 wiz Exp $
 #
 
 DISTNAME=		pygame-1.8.1release
 PKGNAME=		${PYPKGPREFIX}-game-1.8.1
-PKGREVISION=		4
+PKGREVISION=		5
 CATEGORIES=		devel
 MASTER_SITES=		http://pygame.org/ftp/
 
diff --git a/devel/py-game/buildlink3.mk b/devel/py-game/buildlink3.mk
index 69152806e5e..55da1feeeba 100644
--- a/devel/py-game/buildlink3.mk
+++ b/devel/py-game/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.15 2010/01/18 09:58:47 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.16 2010/06/13 22:44:09 wiz Exp $
 
 BUILDLINK_TREE+=	${PYPKGPREFIX}-game
 
@@ -8,7 +8,7 @@ PY_GAME_BUILDLINK3_MK:=
 .include "../../lang/python/pyversion.mk"
 
 BUILDLINK_API_DEPENDS.${PYPKGPREFIX}-game+=	${PYPKGPREFIX}-game>=1.6
-BUILDLINK_ABI_DEPENDS.${PYPKGPREFIX}-game?=	${PYPKGPREFIX}-game>=1.8.1nb4
+BUILDLINK_ABI_DEPENDS.${PYPKGPREFIX}-game?=	${PYPKGPREFIX}-game>=1.8.1nb5
 BUILDLINK_PKGSRCDIR.${PYPKGPREFIX}-game?=	../../devel/py-game
 
 .include "../../audio/SDL_mixer/buildlink3.mk"
diff --git a/devel/py-windbg/Makefile b/devel/py-windbg/Makefile
index 07271ad1b6b..1c03c4971b3 100644
--- a/devel/py-windbg/Makefile
+++ b/devel/py-windbg/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.2 2010/01/18 09:58:47 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2010/06/13 22:44:09 wiz Exp $
 #
 
 DISTNAME=		winpdb-1.4.6
 PKGNAME=		${PYPKGPREFIX}-${DISTNAME}
-PKGREVISION=		1
+PKGREVISION=		2
 CATEGORIES=		devel python
 MASTER_SITES=		http://winpdb.googlecode.com/files/
 
diff --git a/devel/qconf/Makefile b/devel/qconf/Makefile
index 897b3046aaf..e8e6b885284 100644
--- a/devel/qconf/Makefile
+++ b/devel/qconf/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.6 2010/01/18 09:58:47 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2010/06/13 22:44:10 wiz Exp $
 #
 
 DISTNAME=		qconf-1.4
-PKGREVISION=		2
+PKGREVISION=		3
 CATEGORIES=		devel
 MASTER_SITES=		http://delta.affinix.com/download/
 EXTRACT_SUFX=		.tar.bz2
diff --git a/devel/qtscriptgenerator/Makefile b/devel/qtscriptgenerator/Makefile
index 8fd93be9fc8..b985b3eaf05 100644
--- a/devel/qtscriptgenerator/Makefile
+++ b/devel/qtscriptgenerator/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.1.1.1 2010/02/15 15:57:48 wiz Exp $
+# $NetBSD: Makefile,v 1.2 2010/06/13 22:44:10 wiz Exp $
 #
 
 DISTNAME=	qtscriptgenerator-src-0.1.0
 PKGNAME=	${DISTNAME:S/-src//}
-PKGREVISION=	3
+PKGREVISION=	4
 CATEGORIES=	devel
 MASTER_SITES=	http://qtscriptgenerator.googlecode.com/files/
 
diff --git a/devel/qtscriptgenerator/buildlink3.mk b/devel/qtscriptgenerator/buildlink3.mk
index d084e87d24a..901eb6a1a3d 100644
--- a/devel/qtscriptgenerator/buildlink3.mk
+++ b/devel/qtscriptgenerator/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1.1.1 2010/02/15 15:57:49 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2010/06/13 22:44:10 wiz Exp $
 
 BUILDLINK_TREE+=	qtscriptgenerator
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=	qtscriptgenerator
 QTSCRIPTGENERATOR_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.qtscriptgenerator+=	qtscriptgenerator>=0.1.0
-BUILDLINK_ABI_DEPENDS.qtscriptgenerator?=	qtscriptgenerator>=0.1.0nb2
+BUILDLINK_ABI_DEPENDS.qtscriptgenerator?=	qtscriptgenerator>=0.1.0nb4
 BUILDLINK_PKGSRCDIR.qtscriptgenerator?=	../../devel/qtscriptgenerator
 
 .include "../../x11/qt4-libs/buildlink3.mk"
diff --git a/devel/rapidsvn/Makefile b/devel/rapidsvn/Makefile
index a3b82c59ba6..e0a730b4e58 100644
--- a/devel/rapidsvn/Makefile
+++ b/devel/rapidsvn/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.44 2010/01/18 09:58:47 wiz Exp $
+# $NetBSD: Makefile,v 1.45 2010/06/13 22:44:10 wiz Exp $
 
 DISTNAME=		rapidsvn-0.10.0-1
 PKGNAME=		${DISTNAME:S/-1$/.1/}
-PKGREVISION=		3
+PKGREVISION=		4
 CATEGORIES=		devel x11 scm
 MASTER_SITES=		http://rapidsvn.org/download/release/0.10/
 
diff --git a/devel/rox-lib/Makefile b/devel/rox-lib/Makefile
index ce6faf11a50..a8f2d69d466 100644
--- a/devel/rox-lib/Makefile
+++ b/devel/rox-lib/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.10 2010/02/10 19:17:36 joerg Exp $
+# $NetBSD: Makefile,v 1.11 2010/06/13 22:44:10 wiz Exp $
 #
 
 DISTNAME=	rox-lib-2.0.2
-PKGREVISION=	8
+PKGREVISION=	9
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=rox/}
 EXTRACT_SUFX=	.tgz
diff --git a/devel/ruby-SDL/Makefile b/devel/ruby-SDL/Makefile
index 28070369f0d..d4e7e7aff33 100644
--- a/devel/ruby-SDL/Makefile
+++ b/devel/ruby-SDL/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.5 2010/01/18 09:58:47 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2010/06/13 22:44:10 wiz Exp $
 
 DISTNAME=	rubysdl-2.0.1
 PKGNAME=	${RUBY_PKGPREFIX}-${DISTNAME:S/rubysdl/SDL/}
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	devel audio graphics
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
diff --git a/devel/ruby-gnome2-bonobo/Makefile b/devel/ruby-gnome2-bonobo/Makefile
index 3b40176a405..2e4faa335d6 100644
--- a/devel/ruby-gnome2-bonobo/Makefile
+++ b/devel/ruby-gnome2-bonobo/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.4 2009/10/12 03:09:31 obache Exp $
+# $NetBSD: Makefile,v 1.5 2010/06/13 22:44:10 wiz Exp $
 #
 
 PKGNAME=		${RUBY_PKGPREFIX}-gnome2-bonobo-${VERSION}
 COMMENT=		Ruby binding of libbonobo-2.x or later
+PKGREVISION=		1
 CATEGORIES=		devel
 
 PKG_DESTDIR_SUPPORT=	user-destdir
diff --git a/devel/ruby-gnome2-bonoboui/Makefile b/devel/ruby-gnome2-bonoboui/Makefile
index e7f60290cb4..da403eedad8 100644
--- a/devel/ruby-gnome2-bonoboui/Makefile
+++ b/devel/ruby-gnome2-bonoboui/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.5 2010/01/18 09:58:47 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2010/06/13 22:44:10 wiz Exp $
 #
 
 PKGNAME=		${RUBY_PKGPREFIX}-gnome2-bonoboui-${VERSION}
 COMMENT=		Ruby binding of libbonoboui-2.x or later
-PKGREVISION=		1
+PKGREVISION=		2
 CATEGORIES=		devel
 
 PKG_DESTDIR_SUPPORT=	user-destdir
diff --git a/devel/ruby-gnome2-libglade/Makefile b/devel/ruby-gnome2-libglade/Makefile
index ee1182febf8..d159b30cbc4 100644
--- a/devel/ruby-gnome2-libglade/Makefile
+++ b/devel/ruby-gnome2-libglade/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.5 2009/10/12 03:09:31 obache Exp $
+# $NetBSD: Makefile,v 1.6 2010/06/13 22:44:10 wiz Exp $
 #
 
 PKGNAME=		${RUBY_PKGPREFIX}-gnome2-libglade-${VERSION}
 COMMENT=		Ruby binding of libglade
+PKGREVISION=		1
 CATEGORIES=		devel
 
 PKG_DESTDIR_SUPPORT=	user-destdir
diff --git a/devel/ruby-gnome2-pango/Makefile b/devel/ruby-gnome2-pango/Makefile
index f2ba7f9c841..9a0771467c4 100644
--- a/devel/ruby-gnome2-pango/Makefile
+++ b/devel/ruby-gnome2-pango/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.11 2009/08/12 12:43:09 obache Exp $
+# $NetBSD: Makefile,v 1.12 2010/06/13 22:44:10 wiz Exp $
 #
 
 PKGNAME=		${RUBY_PKGPREFIX}-gnome2-pango-${VERSION}
 COMMENT=		Ruby binding of pango-1.x
+PKGREVISION=		1
 CATEGORIES=		devel fonts
 
 CONFLICTS+=		ruby-gnome2-pango-[0-9]*
diff --git a/devel/ruby-gnome2-pango/buildlink3.mk b/devel/ruby-gnome2-pango/buildlink3.mk
index c9ae329b60e..7486f3e2fda 100644
--- a/devel/ruby-gnome2-pango/buildlink3.mk
+++ b/devel/ruby-gnome2-pango/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.11 2009/03/20 19:24:29 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.12 2010/06/13 22:44:10 wiz Exp $
 
 BUILDLINK_TREE+=	ruby-gnome2-pango
 
@@ -6,6 +6,7 @@ BUILDLINK_TREE+=	ruby-gnome2-pango
 RUBY_GNOME2_PANGO_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.ruby-gnome2-pango+=	${RUBY_PKGPREFIX}-gnome2-pango>=0.16.0
+BUILDLINK_ABI_DEPENDS.ruby-gnome2-pango?=	ruby18-gnome2-pango>=0.19.4nb1
 BUILDLINK_PKGSRCDIR.ruby-gnome2-pango?=	../../devel/ruby-gnome2-pango
 
 .include "../../devel/ruby-gnome2-glib/buildlink3.mk"
diff --git a/devel/swt/Makefile b/devel/swt/Makefile
index c499bb91544..cf7d21735ce 100644
--- a/devel/swt/Makefile
+++ b/devel/swt/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2010/06/10 19:25:28 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2010/06/13 22:44:10 wiz Exp $
 #
 
 SWTREL=		3.5.1
@@ -7,6 +7,7 @@ SWTDATE=	200909170800
 
 PKGNAME=	swt-${SWTREL}.${SWTVER}
 DISTNAME=	swt-${SWTREL}-gtk-linux-x86
+PKGREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	http://download.eclipse.org/eclipse/downloads/drops/R-${SWTREL}-${SWTDATE}/
 EXTRACT_SUFX=	.zip
diff --git a/devel/teem/Makefile b/devel/teem/Makefile
index e9959b720a0..116fa7f1a4f 100644
--- a/devel/teem/Makefile
+++ b/devel/teem/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.15 2009/03/17 21:40:45 darcy Exp $
+# $NetBSD: Makefile,v 1.16 2010/06/13 22:44:10 wiz Exp $
 #
 
 DISTNAME=		teem-1.8.0-src
 PKGNAME=		${DISTNAME:C/-src//}
-PKGREVISION=		2
+PKGREVISION=		3
 CATEGORIES=		devel
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=teem/}
 
diff --git a/devel/teem/distinfo b/devel/teem/distinfo
index bcaf0452c04..56cbda2375c 100644
--- a/devel/teem/distinfo
+++ b/devel/teem/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.4 2006/01/09 16:32:11 joerg Exp $
+$NetBSD: distinfo,v 1.5 2010/06/13 22:44:10 wiz Exp $
 
 SHA1 (teem-1.8.0-src.tar.gz) = fd57c40136d877d33cb45b2afc54a95564e67225
 RMD160 (teem-1.8.0-src.tar.gz) = 7154b1a7b12a08f7267017e213794673f6192827
@@ -6,3 +6,4 @@ Size (teem-1.8.0-src.tar.gz) = 1127914 bytes
 SHA1 (patch-aa) = ebb0d5be710416276fbc028ee8e635b669eaa378
 SHA1 (patch-ab) = 0dbbe8290711e18d4c1312a452aaee19a13b5a04
 SHA1 (patch-ac) = 5e3f9a3fcf2c3807025fec65f5bb034691ba9457
+SHA1 (patch-ad) = 8a342c486f4bbbce1ac7c54ded5ebcf7eca63bdd
diff --git a/devel/teem/patches/patch-ad b/devel/teem/patches/patch-ad
new file mode 100644
index 00000000000..9ced11c3e9b
--- /dev/null
+++ b/devel/teem/patches/patch-ad
@@ -0,0 +1,13 @@
+$NetBSD: patch-ad,v 1.1 2010/06/13 22:44:11 wiz Exp $
+
+--- src/nrrd/formatPNG.c.orig	2005-03-01 22:27:40.000000000 +0000
++++ src/nrrd/formatPNG.c
+@@ -216,7 +216,7 @@ _nrrdFormatPNG_read(FILE *file, Nrrd *nr
+     png_set_palette_to_rgb(png);
+   /* expand grayscale images to 8 bits from 1, 2, or 4 bits */
+   if (type == PNG_COLOR_TYPE_GRAY && depth < 8)
+-    png_set_gray_1_2_4_to_8(png);
++    png_set_expand_gray_1_2_4_to_8(png);
+   /* expand paletted or rgb images with transparency to full alpha
+      channels so the data will be available as rgba quartets */
+   if (png_get_valid(png, info, PNG_INFO_tRNS))
diff --git a/devel/valide/Makefile b/devel/valide/Makefile
index 6e0ebffac8c..bb3c7fbd509 100644
--- a/devel/valide/Makefile
+++ b/devel/valide/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.6 2010/05/07 08:34:22 ahoka Exp $
+# $NetBSD: Makefile,v 1.7 2010/06/13 22:44:11 wiz Exp $
 #
 
 DISTNAME=	valide-0.4.0
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	devel
 MASTER_SITES=	http://valide.googlecode.com/files/
 
diff --git a/devel/xfconf/buildlink3.mk b/devel/xfconf/buildlink3.mk
index 22a24f8332c..3546cd69adf 100644
--- a/devel/xfconf/buildlink3.mk
+++ b/devel/xfconf/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1.1.1 2009/09/16 01:06:30 reed Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2010/06/13 22:44:11 wiz Exp $
 
 BUILDLINK_TREE+=	xfconf
 
@@ -6,6 +6,7 @@ BUILDLINK_TREE+=	xfconf
 XFCONF_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.xfconf+=	xfconf>=4.6.0
+BUILDLINK_ABI_DEPENDS.xfconf?=	xfconf>=4.6.1
 BUILDLINK_PKGSRCDIR.xfconf?=	../../devel/xfconf
 
 .include "../../devel/glib2/buildlink3.mk"
diff --git a/devel/xulrunner/buildlink3.mk b/devel/xulrunner/buildlink3.mk
index f68c7b0c772..5885aeb35bb 100644
--- a/devel/xulrunner/buildlink3.mk
+++ b/devel/xulrunner/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.7 2010/03/16 15:57:02 tnn Exp $
+# $NetBSD: buildlink3.mk,v 1.8 2010/06/13 22:44:11 wiz Exp $
 
 BUILDLINK_TREE+=	xulrunner
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=	xulrunner
 XULRUNNER_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.xulrunner+=	xulrunner>=1.9.2.2
-BUILDLINK_ABI_DEPENDS.xulrunner?=	xulrunner>=1.9.2.2
+BUILDLINK_ABI_DEPENDS.xulrunner?=	xulrunner>=1.9.2.3
 BUILDLINK_PKGSRCDIR.xulrunner?=		../../devel/xulrunner
 
 pkgbase := xulrunner