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.

36 files changed, 83 insertions, 62 deletions

diff --git a/wm/3ddesktop/Makefile b/wm/3ddesktop/Makefile
index 11cfd8ffcff..ab7475eeb7a 100644
--- a/wm/3ddesktop/Makefile
+++ b/wm/3ddesktop/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.24 2010/01/18 09:59:28 wiz Exp $
+# $NetBSD: Makefile,v 1.25 2010/06/13 22:45:29 wiz Exp $
 #
 
 DISTNAME=		3ddesktop-0.2.9
-PKGREVISION=		3
+PKGREVISION=		4
 CATEGORIES=		wm
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=desk3d/}
 
diff --git a/wm/afterstep/Makefile b/wm/afterstep/Makefile
index 613950973c5..5c2e27b2be2 100644
--- a/wm/afterstep/Makefile
+++ b/wm/afterstep/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.44 2010/01/18 09:59:28 wiz Exp $
+# $NetBSD: Makefile,v 1.45 2010/06/13 22:45:29 wiz Exp $
 
 DISTNAME=	AfterStep-2.1.2
 PKGNAME=	${DISTNAME:S/AfterStep/afterstep/}
-PKGREVISION=	9
+PKGREVISION=	10
 CATEGORIES=	wm
 MASTER_SITES=	ftp://ftp.afterstep.org/stable/v2.1/
 EXTRACT_SUFX=	.tar.bz2
diff --git a/wm/awesome/Makefile b/wm/awesome/Makefile
index fd1f43c7833..c39412538cb 100644
--- a/wm/awesome/Makefile
+++ b/wm/awesome/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.17 2010/02/10 19:17:47 joerg Exp $
+# $NetBSD: Makefile,v 1.18 2010/06/13 22:45:29 wiz Exp $
 #
 
 DISTNAME=		awesome-2.3.6
-PKGREVISION=		3
+PKGREVISION=		4
 CATEGORIES=		wm
 MASTER_SITES=		http://awesome.naquadah.org/download/
 
diff --git a/wm/compiz-fusion-plugins-extra/Makefile b/wm/compiz-fusion-plugins-extra/Makefile
index 012e043a605..8f2d8eccdfe 100644
--- a/wm/compiz-fusion-plugins-extra/Makefile
+++ b/wm/compiz-fusion-plugins-extra/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.6 2010/01/18 09:59:29 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2010/06/13 22:45:29 wiz Exp $
 #
 
 PKGVER=		0.8.4
 PKGNAME=	compiz-fusion-plugins-extra-${PKGVER}
 DISTNAME=	compiz-plugins-extra-${PKGVER}
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	wm x11
 MASTER_SITES=	http://releases.compiz.org/${PKGVER}/
 
diff --git a/wm/compiz-fusion-plugins-main/Makefile b/wm/compiz-fusion-plugins-main/Makefile
index f20dcfb8b87..c887be18770 100644
--- a/wm/compiz-fusion-plugins-main/Makefile
+++ b/wm/compiz-fusion-plugins-main/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.8 2010/01/18 09:59:29 wiz Exp $
+# $NetBSD: Makefile,v 1.9 2010/06/13 22:45:30 wiz Exp $
 #
 
 PKGVER=		0.8.4
 PKGNAME=	compiz-fusion-plugins-main-${PKGVER}
 DISTNAME=	compiz-plugins-main-${PKGVER}
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	wm x11
 MASTER_SITES=	http://releases.compiz.org/${PKGVER}/
 
diff --git a/wm/compiz-fusion-plugins-main/buildlink3.mk b/wm/compiz-fusion-plugins-main/buildlink3.mk
index c735863fa70..a3940167f06 100644
--- a/wm/compiz-fusion-plugins-main/buildlink3.mk
+++ b/wm/compiz-fusion-plugins-main/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2009/08/26 19:57:07 sno Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2010/06/13 22:45:30 wiz Exp $
 
 BUILDLINK_TREE+=	compiz-fusion-plugins-main
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=	compiz-fusion-plugins-main
 COMPIZ_FUSION_PLUGINS_MAIN_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.compiz-fusion-plugins-main+=	compiz-fusion-plugins-main>=0.6.0nb1
-BUILDLINK_ABI_DEPENDS.compiz-fusion-plugins-main?=	compiz-fusion-plugins-main>=0.6.0nb3
+BUILDLINK_ABI_DEPENDS.compiz-fusion-plugins-main?=	compiz-fusion-plugins-main>=0.8.4nb2
 BUILDLINK_PKGSRCDIR.compiz-fusion-plugins-main?=	../../wm/compiz-fusion-plugins-main
 
 .include "../../wm/compiz/buildlink3.mk"
diff --git a/wm/compiz/Makefile b/wm/compiz/Makefile
index 8fd18865aa0..9e219749967 100644
--- a/wm/compiz/Makefile
+++ b/wm/compiz/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.29 2010/01/18 09:59:29 wiz Exp $
+# $NetBSD: Makefile,v 1.30 2010/06/13 22:45:29 wiz Exp $
 #
 
 PKGVER=		0.8.4
 DISTNAME=	compiz-${PKGVER}
-PKGREVISION=		3
+PKGREVISION=		4
 CATEGORIES=	wm x11
 MASTER_SITES=	http://releases.compiz.org/${PKGVER}/
 
diff --git a/wm/compiz/buildlink3.mk b/wm/compiz/buildlink3.mk
index 2f6c23a5219..ac5c298e28a 100644
--- a/wm/compiz/buildlink3.mk
+++ b/wm/compiz/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2009/08/26 19:56:55 sno Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2010/06/13 22:45:29 wiz Exp $
 
 BUILDLINK_TREE+=	compiz
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=	compiz
 COMPIZ_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.compiz+=	compiz>=0.6.2
-BUILDLINK_ABI_DEPENDS.compiz?=	compiz>=0.6.2nb5
+BUILDLINK_ABI_DEPENDS.compiz?=	compiz>=0.8.4nb4
 BUILDLINK_PKGSRCDIR.compiz?=	../../wm/compiz
 
 .include "../../devel/libwnck/buildlink3.mk"
diff --git a/wm/e16menuedit2/Makefile b/wm/e16menuedit2/Makefile
index 732a87a8e23..79d6d4bc614 100644
--- a/wm/e16menuedit2/Makefile
+++ b/wm/e16menuedit2/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.23 2009/08/26 19:58:23 sno Exp $
+# $NetBSD: Makefile,v 1.24 2010/06/13 22:45:30 wiz Exp $
 #
 
 DISTNAME=		e16menuedit2-0.0.3
-PKGREVISION=		3
+PKGREVISION=		4
 CATEGORIES=		wm x11
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=enlightenment/}
 
diff --git a/wm/enlightenment/Makefile b/wm/enlightenment/Makefile
index 2a96687df9b..38a019243d6 100644
--- a/wm/enlightenment/Makefile
+++ b/wm/enlightenment/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.44 2010/01/18 09:59:29 wiz Exp $
+# $NetBSD: Makefile,v 1.45 2010/06/13 22:45:30 wiz Exp $
 
 DISTNAME=	e16-0.16.8.8
 PKGNAME=	${DISTNAME:S/e16/enlightenment/}
-PKGREVISION=	3
+PKGREVISION=	4
 CATEGORIES=	x11 gnome wm
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=enlightenment/}
 
diff --git a/wm/fluxconf/Makefile b/wm/fluxconf/Makefile
index 54edc8ca611..a3393e68dfe 100644
--- a/wm/fluxconf/Makefile
+++ b/wm/fluxconf/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.5 2009/08/26 19:58:23 sno Exp $
+# $NetBSD: Makefile,v 1.6 2010/06/13 22:45:30 wiz Exp $
 #
 
 DISTNAME=	fluxconf-0.9.9
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	wm
 MASTER_SITES=	http://devaux.fabien.free.fr/flux/
 
diff --git a/wm/flwm/Makefile b/wm/flwm/Makefile
index aa1c4d8a67d..20e21928ca9 100644
--- a/wm/flwm/Makefile
+++ b/wm/flwm/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.23 2009/07/07 20:04:17 joerg Exp $
+# $NetBSD: Makefile,v 1.24 2010/06/13 22:45:30 wiz Exp $
 #
 
 DISTNAME=	flwm-1.02
+PKGREVISION=	1
 CATEGORIES=	x11 wm
 MASTER_SITES=	http://flwm.sourceforge.net/
 EXTRACT_SUFX=	.tgz
diff --git a/wm/fvwm-devel/Makefile b/wm/fvwm-devel/Makefile
index ba574bbc9f8..d69586be563 100644
--- a/wm/fvwm-devel/Makefile
+++ b/wm/fvwm-devel/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.33 2010/05/28 09:33:12 martti Exp $
+# $NetBSD: Makefile,v 1.34 2010/06/13 22:45:30 wiz Exp $
 
 DISTNAME=	fvwm-${FVWM_VER}
 #PKGREVISION=	1
+PKGREVISION=	1
 CATEGORIES=	x11 wm
 MASTER_SITES=	ftp://ftp.fvwm.org/pub/fvwm/version-2/
 EXTRACT_SUFX=	.tar.bz2
diff --git a/wm/icecc/Makefile b/wm/icecc/Makefile
index ca0d3c90841..c28e717cb7a 100644
--- a/wm/icecc/Makefile
+++ b/wm/icecc/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.19 2010/02/10 19:17:47 joerg Exp $
+# $NetBSD: Makefile,v 1.20 2010/06/13 22:45:30 wiz Exp $
 
 # Package version reflects icecc version, with PKGREVISION incremented
 # for any tool updates, according to the authors scheme.
 DISTNAME=		icecc-2.9
-PKGREVISION=		9
+PKGREVISION=		10
 CATEGORIES=		wm
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=icecc/}
 DISTFILES=		icecc-2.9.tar.bz2		\
diff --git a/wm/icewm-imlib/Makefile b/wm/icewm-imlib/Makefile
index a1b20b5dbea..b325880ed9e 100644
--- a/wm/icewm-imlib/Makefile
+++ b/wm/icewm-imlib/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.30 2010/01/18 09:59:29 wiz Exp $
+# $NetBSD: Makefile,v 1.31 2010/06/13 22:45:30 wiz Exp $
 
 PKGNAME=		${DISTNAME:S/-/-imlib-/}
-PKGREVISION=		3
+PKGREVISION=		4
 COMMENT=		Small, fast and light-weight window manager (imlib version)
 
 CONFLICTS+=		icewm-[0-9]* icewm-gnome-[0-9]*
diff --git a/wm/matchbox-wm/Makefile b/wm/matchbox-wm/Makefile
index 779002f3a5c..2a3cef8542e 100644
--- a/wm/matchbox-wm/Makefile
+++ b/wm/matchbox-wm/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.10 2010/02/12 20:37:53 joerg Exp $
+# $NetBSD: Makefile,v 1.11 2010/06/13 22:45:30 wiz Exp $
 #
 
 DISTNAME=		matchbox-window-manager-1.1
 PKGNAME=		${DISTNAME:S/window-manager/wm/}
+PKGREVISION=		1
 CATEGORIES=		wm x11
 MASTER_SITES=		http://projects.o-hand.com/matchbox/sources/matchbox-window-manager/1.1/
 
diff --git a/wm/metacity/Makefile b/wm/metacity/Makefile
index 89b75f528c5..77ae9d420b1 100644
--- a/wm/metacity/Makefile
+++ b/wm/metacity/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.85 2010/02/11 18:19:13 drochner Exp $
+# $NetBSD: Makefile,v 1.86 2010/06/13 22:45:30 wiz Exp $
 #
 
 DISTNAME=	metacity-2.28.1
+PKGREVISION=	1
 CATEGORIES=	wm x11 gnome
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/metacity/2.28/}
 EXTRACT_SUFX=	.tar.bz2
diff --git a/wm/metacity/buildlink3.mk b/wm/metacity/buildlink3.mk
index 6f1e4e6ed59..d327e01f0fa 100644
--- a/wm/metacity/buildlink3.mk
+++ b/wm/metacity/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.21 2009/08/26 19:57:01 sno Exp $
+# $NetBSD: buildlink3.mk,v 1.22 2010/06/13 22:45:30 wiz Exp $
 
 BUILDLINK_TREE+=	metacity
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=	metacity
 METACITY_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.metacity+=	metacity>=2.8.5
-BUILDLINK_ABI_DEPENDS.metacity+=	metacity>=2.26.0nb1
+BUILDLINK_ABI_DEPENDS.metacity+=	metacity>=2.28.1nb1
 BUILDLINK_PKGSRCDIR.metacity?=	../../wm/metacity
 
 .include "../../devel/gettext-lib/buildlink3.mk"
diff --git a/wm/metisse/Makefile b/wm/metisse/Makefile
index 8226ab3ebac..459ce20aed1 100644
--- a/wm/metisse/Makefile
+++ b/wm/metisse/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.12 2010/01/18 09:59:29 wiz Exp $
+# $NetBSD: Makefile,v 1.13 2010/06/13 22:45:30 wiz Exp $
 #
 
 DISTNAME=	metisse-0.4.1
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	wm x11
 MASTER_SITES=	http://insitu.lri.fr/metisse/download/metisse/
 EXTRACT_SUFX=	.tar.bz2
diff --git a/wm/metisse/distinfo b/wm/metisse/distinfo
index 7b214672783..90c807ff1ed 100644
--- a/wm/metisse/distinfo
+++ b/wm/metisse/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.4 2009/07/24 12:10:18 obache Exp $
+$NetBSD: distinfo,v 1.5 2010/06/13 22:45:30 wiz Exp $
 
 SHA1 (metisse-0.4.1.tar.bz2) = acf97b125905d91988955560a9b14b06a530eed6
 RMD160 (metisse-0.4.1.tar.bz2) = 7487322f22a3655d756b5d3d3cc59afbf277d137
@@ -10,3 +10,4 @@ SHA1 (patch-ad) = 6c8f66b54c96f18b3e835fea490d5eb444514b52
 SHA1 (patch-ae) = eab55e17f7e3518434d4ad42e7637c18cef5bf72
 SHA1 (patch-af) = 45cf852490bd30d17cac341916d83b0688f7bce0
 SHA1 (patch-ag) = b7159e56a1d1f1b5b12ea99ca60de0071bcf5294
+SHA1 (patch-ah) = 6afe0c047a67f83149a4130b4eae55612e437ad0
diff --git a/wm/metisse/patches/patch-ah b/wm/metisse/patches/patch-ah
new file mode 100644
index 00000000000..3824b8d41ad
--- /dev/null
+++ b/wm/metisse/patches/patch-ah
@@ -0,0 +1,13 @@
+$NetBSD: patch-ah,v 1.1 2010/06/13 22:45:30 wiz Exp $
+
+--- fvwm-insitu/libs/Fpng.h.orig	2008-12-09 12:52:20.000000000 +0000
++++ fvwm-insitu/libs/Fpng.h
+@@ -444,7 +444,7 @@ typedef Fpng_struct  **Fpng_structpp;
+ #define Fpng_set_packing(a) png_set_packing(a)
+ #define Fpng_set_gray_to_rgb(a) png_set_gray_to_rgb(a)
+ #define Fpng_get_bit_depth(a,b) png_get_bit_depth(a,b)
+-#define Fpng_set_gray_1_2_4_to_8(a) png_set_gray_1_2_4_to_8(a)
++#define Fpng_set_gray_1_2_4_to_8(a) png_set_expand_gray_1_2_4_to_8(a)
+ #define Fpng_get_valid(a,b,c) png_get_valid(a,b,c)
+ #define Fpng_read_end(a,b) png_read_end(a,b)
+ #define Fpng_set_interlace_handling(a) png_set_interlace_handling(a)
diff --git a/wm/obconf/Makefile b/wm/obconf/Makefile
index bd7970b9e31..d482c152ad9 100644
--- a/wm/obconf/Makefile
+++ b/wm/obconf/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.31 2010/05/31 23:11:57 dholland Exp $
+# $NetBSD: Makefile,v 1.32 2010/06/13 22:45:31 wiz Exp $
 
 DISTNAME=		obconf-2.0.3
-PKGREVISION=		3
+PKGREVISION=		4
 DIST_SUBDIR=		obconf-2.0.3.orig
 CATEGORIES=		wm
 MASTER_SITES=		http://openbox.org/dist/obconf/
diff --git a/wm/openbox/Makefile b/wm/openbox/Makefile
index 346990b722a..efb038e25b8 100644
--- a/wm/openbox/Makefile
+++ b/wm/openbox/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.61 2010/06/05 11:43:51 wiz Exp $
+# $NetBSD: Makefile,v 1.62 2010/06/13 22:45:31 wiz Exp $
 
 DISTNAME=	openbox-3.4.11.2
+PKGREVISION=	1
 CATEGORIES=	wm x11
 MASTER_SITES=	http://openbox.org/dist/openbox/
 
diff --git a/wm/oroborox/Makefile b/wm/oroborox/Makefile
index edfb5f52126..87394d4b294 100644
--- a/wm/oroborox/Makefile
+++ b/wm/oroborox/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.20 2010/02/10 19:17:47 joerg Exp $
+# $NetBSD: Makefile,v 1.21 2010/06/13 22:45:31 wiz Exp $
 #
 
 DISTNAME=	OroboROX-0.9.8
 PKGNAME=	oroborox-0.9.8
-PKGREVISION=	4
+PKGREVISION=	5
 CATEGORIES=	wm
 MASTER_SITES=	http://roxos.sunsite.dk/dev-contrib/guido/
 EXTRACT_SUFX=	.tar.bz2
diff --git a/wm/pekwm/Makefile b/wm/pekwm/Makefile
index a65fcdbc271..5ecd1e0e76e 100644
--- a/wm/pekwm/Makefile
+++ b/wm/pekwm/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.36 2010/04/17 10:07:17 gls Exp $
+# $NetBSD: Makefile,v 1.37 2010/06/13 22:45:31 wiz Exp $
 #
 
 DISTNAME=	pekwm-0.1.12
+PKGREVISION=	1
 CATEGORIES=	wm
 MASTER_SITES=	http://www.pekwm.org/projects/pekwm/files/
 
diff --git a/wm/qvwm/Makefile b/wm/qvwm/Makefile
index 577d17ca87e..bd8ae4d851a 100644
--- a/wm/qvwm/Makefile
+++ b/wm/qvwm/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.37 2010/01/18 09:59:29 wiz Exp $
+# $NetBSD: Makefile,v 1.38 2010/06/13 22:45:31 wiz Exp $
 #
 
 DISTNAME=	qvwm-1.1.12
-PKGREVISION=	10
+PKGREVISION=	11
 CATEGORIES=	wm
 MASTER_SITES=	http://www.csg.is.titech.ac.jp/~kourai/qvwm/archive/qvwm/ \
 		ftp://ftp.chg.ru/pub/X11/windowmanagers/qvwm/
diff --git a/wm/sawfish/Makefile b/wm/sawfish/Makefile
index aa00841a666..e5a789195ba 100644
--- a/wm/sawfish/Makefile
+++ b/wm/sawfish/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.53 2010/03/24 19:43:29 asau Exp $
+# $NetBSD: Makefile,v 1.54 2010/06/13 22:45:31 wiz Exp $
 #
 
 DISTNAME=		sawfish-1.5.0
-PKGREVISION=		2
+PKGREVISION=		3
 CATEGORIES=		x11 wm
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=sawmill/}
 EXTRACT_SUFX=		.tar.bz2
diff --git a/wm/selectwm/Makefile b/wm/selectwm/Makefile
index 7116c1c09c5..0cff4d7c0ce 100644
--- a/wm/selectwm/Makefile
+++ b/wm/selectwm/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.10 2009/08/26 19:58:24 sno Exp $
+# $NetBSD: Makefile,v 1.11 2010/06/13 22:45:31 wiz Exp $
 #
 
 DISTNAME=     selectwm-0.4.1
-PKGREVISION=  6
+PKGREVISION=  7
 CATEGORIES=   wm
 MASTER_SITES= http://ordiluc.net/selectwm/
 
diff --git a/wm/skippy/Makefile b/wm/skippy/Makefile
index 1bb83edafd3..60db84504d8 100644
--- a/wm/skippy/Makefile
+++ b/wm/skippy/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.17 2010/01/18 09:59:30 wiz Exp $
+# $NetBSD: Makefile,v 1.18 2010/06/13 22:45:31 wiz Exp $
 #
 
 DISTNAME=	skippy-0.5.0
-PKGREVISION=	7
+PKGREVISION=	8
 CATEGORIES=	wm
 MASTER_SITES=	http://thegraveyard.org/files/
 EXTRACT_SUFX=	.tar.bz2
diff --git a/wm/waimea/Makefile b/wm/waimea/Makefile
index 666dbf25ae6..914a6885ef4 100644
--- a/wm/waimea/Makefile
+++ b/wm/waimea/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.35 2010/01/18 09:59:30 wiz Exp $
+# $NetBSD: Makefile,v 1.36 2010/06/13 22:45:31 wiz Exp $
 #
 
 DISTNAME=	waimea-0.4.0
-PKGREVISION=	15
+PKGREVISION=	16
 CATEGORIES=	wm
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=waimea/}
 
diff --git a/wm/whiteBOX/Makefile b/wm/whiteBOX/Makefile
index d46789b2833..738db6213b0 100644
--- a/wm/whiteBOX/Makefile
+++ b/wm/whiteBOX/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.24 2010/01/18 09:59:30 wiz Exp $
+# $NetBSD: Makefile,v 1.25 2010/06/13 22:45:31 wiz Exp $
 #
 
 DISTNAME=	whiteBOX-0.5
-PKGREVISION=	8
+PKGREVISION=	9
 CATEGORIES=	wm x11
 MASTER_SITES=	http://whitebox.sourceforge.net/dist/
 
diff --git a/wm/windowmaker/Makefile b/wm/windowmaker/Makefile
index a610931be51..9b603f4fc27 100644
--- a/wm/windowmaker/Makefile
+++ b/wm/windowmaker/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.82 2010/04/21 05:43:28 wiz Exp $
+# $NetBSD: Makefile,v 1.83 2010/06/13 22:45:31 wiz Exp $
 
 DISTNAME=	WindowMaker-0.92.0
 PKGNAME=	${DISTNAME:S/WindowMaker/windowmaker/}
-PKGREVISION=	11
+PKGREVISION=	12
 CATEGORIES=	x11 wm windowmaker
 MASTER_SITES=	http://windowmaker.info/pub/source/release/ \
 	ftp://ftp.dti.ad.jp/pub/X/WindowMaker/source/release/
diff --git a/wm/windowmaker/buildlink3.mk b/wm/windowmaker/buildlink3.mk
index be5c84003ad..34e88bd26fd 100644
--- a/wm/windowmaker/buildlink3.mk
+++ b/wm/windowmaker/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.18 2010/01/18 09:59:30 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.19 2010/06/13 22:45:31 wiz Exp $
 
 BUILDLINK_TREE+=	windowmaker
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=	windowmaker
 WINDOWMAKER_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.windowmaker+=		windowmaker>=0.80.2nb3
-BUILDLINK_ABI_DEPENDS.windowmaker+=	windowmaker>=0.92.0nb10
+BUILDLINK_ABI_DEPENDS.windowmaker+=	windowmaker>=0.92.0nb12
 BUILDLINK_PKGSRCDIR.windowmaker?=	../../wm/windowmaker
 
 .include "../../devel/gettext-lib/buildlink3.mk"
diff --git a/wm/wmakerconf/Makefile b/wm/wmakerconf/Makefile
index a3dfd3284bf..1403e93dc78 100644
--- a/wm/wmakerconf/Makefile
+++ b/wm/wmakerconf/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.45 2010/02/12 20:31:32 joerg Exp $
+# $NetBSD: Makefile,v 1.46 2010/06/13 22:45:31 wiz Exp $
 
 DISTNAME=	wmakerconf-2.11
-PKGREVISION=	11
+PKGREVISION=	12
 CATEGORIES=	x11 wm windowmaker
 MASTER_SITES=	http://starplot.org/wmakerconf/
 
diff --git a/wm/wmdrawer/Makefile b/wm/wmdrawer/Makefile
index 3b70000c5cc..297454bbd97 100644
--- a/wm/wmdrawer/Makefile
+++ b/wm/wmdrawer/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.14 2010/01/18 09:59:30 wiz Exp $
+# $NetBSD: Makefile,v 1.15 2010/06/13 22:45:32 wiz Exp $
 #
 
 DISTNAME=		wmdrawer-0.10.5
-PKGREVISION=		5
+PKGREVISION=		6
 CATEGORIES=		misc
 MASTER_SITES=		http://people.easter-eggs.org/~valos/wmdrawer/
 
diff --git a/wm/xfce4-wm/Makefile b/wm/xfce4-wm/Makefile
index 21e79c3a3cc..1b4b3775fb2 100644
--- a/wm/xfce4-wm/Makefile
+++ b/wm/xfce4-wm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.30 2009/09/16 01:15:34 reed Exp $
+# $NetBSD: Makefile,v 1.31 2010/06/13 22:45:32 wiz Exp $
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
@@ -6,6 +6,7 @@ PKG_DESTDIR_SUPPORT=	user-destdir
 
 DISTNAME=	xfwm4-${XFCE4_VERSION}
 PKGNAME=	xfce4-wm-${XFCE4_VERSION}
+PKGREVISION=	1
 CATEGORIES=	wm
 COMMENT=	Xfce window manager