Update WindowMaker to 0.95.4

Changes since 0.92.0:
- Left Half / Right Half Maximize, tiled maximization
- New mouse-resizing functionality
- History and TAB completion in dialogs
- Bouncing appicon effect
- New applications (wmgenmenu and wmmenugen) to generate the root menu
  automatically by looking which applications you have on your $PATH
- Automatic detection of configuration changes through inotify
- Improved dockapp recognition
- many trivial things which reduce little annoyances one might have
- Added keyboard shortcut to uncover/cover the dock
- Mac OS X-style window cycling
- Preliminary XRandR support
- lots of bug fixes

19 files changed, 280 insertions, 361 deletions

diff --git a/wm/windowmaker/Makefile b/wm/windowmaker/Makefile
index 1def22115f6..7403d264422 100644
--- a/wm/windowmaker/Makefile
+++ b/wm/windowmaker/Makefile
@@ -1,12 +1,10 @@
-# $NetBSD: Makefile,v 1.97 2013/02/16 11:18:02 wiz Exp $
+# $NetBSD: Makefile,v 1.98 2013/05/21 14:38:40 hans Exp $
 
-DISTNAME=	WindowMaker-0.92.0
+DISTNAME=	WindowMaker-0.95.4
 PKGNAME=	${DISTNAME:S/WindowMaker/windowmaker/}
-PKGREVISION=	21
 CATEGORIES=	x11 wm windowmaker
-MASTER_SITES=	http://windowmaker.info/pub/source/release/ \
-	ftp://ftp.dti.ad.jp/pub/X/WindowMaker/source/release/
-EXTRACT_SUFX=	.tar.bz2
+MASTER_SITES=	http://windowmaker.info/pub/source/release/
+EXTRACT_SUFX=	.tar.gz
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.windowmaker.info/
@@ -23,7 +21,7 @@ CONFIGURE_ARGS+=	--enable-xinerama
 CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFBASEDIR}
 CONFIGURE_ARGS+=	--with-gnustepdir=${PREFIX}/share/GNUstep
 CONFIGURE_ARGS+=	--with-nlsdir=${PREFIX}/${PKGLOCALEDIR}/locale
-CONFIGURE_ENV+=		LINGUAS=yes
+CONFIGURE_ENV+=		LINGUAS="bg ca cs cz da de el es et fi fr gl he hr hu it ja ko nl ms no pl pt ro ru se sk sl sv tr zh_CN zh_TW"
 CONFIGURE_ENV+=		CPP_PATH=${CPP:Q}
 USE_TOOLS+=		perl:run
 REPLACE_PERL+=		util/wkdemenu.pl
@@ -56,12 +54,9 @@ CONF_FILES+=		${EGDIR}/${f} ${PKG_SYSCONFDIR}/${f}
 # WINDOWMAKER_OPTIONS is a space-separated list of compile-time options
 # to support.  Currently supported options:
 #
-#	kde		enable support for kde/kwm window manager hints
-#	gnome		enable support for GNOME window manager hints
-#	openlook	enable support for OPEN LOOK(tm) window manager hints
 #	vdesktop	enable support for virtual desktop.
 
-WINDOWMAKER_OPTIONS?=	gnome kde openlook vdesktop
+WINDOWMAKER_OPTIONS?=	vdesktop
 
 BUILD_DEFS+=		WINDOWMAKER_OPTIONS
 
@@ -107,6 +102,7 @@ post-install:
 .include "../../x11/libXext/buildlink3.mk"
 .include "../../x11/libXft/buildlink3.mk"
 .include "../../x11/libXinerama/buildlink3.mk"
+.include "../../x11/libXmu/buildlink3.mk"
 .include "../../x11/libXpm/buildlink3.mk"
 BUILDLINK_DEPMETHOD.libXt?=	build
 .include "../../x11/libXt/buildlink3.mk"
diff --git a/wm/windowmaker/PLIST b/wm/windowmaker/PLIST
index 47dec45be3d..909f8050c9d 100644
--- a/wm/windowmaker/PLIST
+++ b/wm/windowmaker/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.17 2009/06/14 21:40:05 joerg Exp $
+@comment $NetBSD: PLIST,v 1.18 2013/05/21 14:38:40 hans Exp $
 bin/convertfonts
 bin/get-wings-flags
 bin/get-wraster-flags
@@ -14,35 +14,63 @@ bin/wm-oldmenu2new
 bin/wmagnify
 bin/wmaker
 bin/wmaker.inst
+bin/wmgenmenu
+bin/wmmenugen
 bin/wmsetbg
-bin/wmsetup
 bin/wxcopy
 bin/wxpaste
 include/WINGs/WINGs.h
 include/WINGs/WINGsP.h
 include/WINGs/WUtil.h
-include/WINGs/proplist-compat.h
-include/WINGs/wtabledelegates.h
-include/WINGs/wtableview.h
 include/WMaker.h
 include/wraster.h
-lib/libExtraWINGs.a
+lib/libWINGs.la
 lib/libWINGs.a
 lib/libWMaker.a
+lib/libWMaker.la
 lib/libWUtil.a
+lib/libWUtil.la
 lib/libwraster.la
 lib/pkgconfig/WINGs.pc
-lib/pkgconfig/wmlib.pc
 lib/pkgconfig/wrlib.pc
+man/man1/WPrefs.1
+man/man1/WindowMaker.1
+man/man1/get-wings-flags.1
+man/man1/get-wraster-flags.1
+man/man1/get-wutil-flags.1
 man/man1/geticonset.1
 man/man1/getstyle.1
 man/man1/seticons.1
 man/man1/setstyle.1
 man/man1/wdwrite.1
+man/man1/wdread.1
+man/man1/wmagnify.1
 man/man1/wmaker.1
+man/man1/wmgenmenu.1
+man/man1/wmmenugen.1
 man/man1/wmsetbg.1
 man/man1/wxcopy.1
 man/man1/wxpaste.1
+man/man8/upgrade-windowmaker-defaults.8
+man/cs/man1/geticonset.1
+man/cs/man1/getstyle.1
+man/cs/man1/seticons.1
+man/cs/man1/setstyle.1
+man/cs/man1/wdwrite.1
+man/cs/man1/wmaker.1
+man/cs/man1/wmaker.1
+man/cs/man1/wmsetbg.1
+man/cs/man1/wxcopy.1
+man/cs/man1/wxpaste.1
+man/ru/man1/geticonset.1
+man/ru/man1/getstyle.1
+man/ru/man1/seticons.1
+man/ru/man1/setstyle.1
+man/ru/man1/wdwrite.1
+man/ru/man1/wmaker.1
+man/ru/man1/wmsetbg.1
+man/ru/man1/wxcopy.1
+man/ru/man1/wxpaste.1
 man/sk/man1/geticonset.1
 man/sk/man1/getstyle.1
 man/sk/man1/seticons.1
@@ -74,6 +102,7 @@ share/GNUstep/Applications/WPrefs.app/tiff/menualign1.tiff
 share/GNUstep/Applications/WPrefs.app/tiff/menualign2.tiff
 share/GNUstep/Applications/WPrefs.app/tiff/menuprefs.tiff
 share/GNUstep/Applications/WPrefs.app/tiff/menus.tiff
+share/GNUstep/Applications/WPrefs.app/tiff/miscprefs2.tiff
 share/GNUstep/Applications/WPrefs.app/tiff/moreanim.tiff
 share/GNUstep/Applications/WPrefs.app/tiff/mousesettings.tiff
 share/GNUstep/Applications/WPrefs.app/tiff/mousespeed.tiff
@@ -81,9 +110,12 @@ share/GNUstep/Applications/WPrefs.app/tiff/msty1.tiff
 share/GNUstep/Applications/WPrefs.app/tiff/msty2.tiff
 share/GNUstep/Applications/WPrefs.app/tiff/msty3.tiff
 share/GNUstep/Applications/WPrefs.app/tiff/newstyle.tiff
+share/GNUstep/Applications/WPrefs.app/tiff/nextstyle.tiff
 share/GNUstep/Applications/WPrefs.app/tiff/nonopaque.tiff
+share/GNUstep/Applications/WPrefs.app/tiff/noopaqueresize.tiff
 share/GNUstep/Applications/WPrefs.app/tiff/oldstyle.tiff
 share/GNUstep/Applications/WPrefs.app/tiff/opaque.tiff
+share/GNUstep/Applications/WPrefs.app/tiff/opaqueresize.tiff
 share/GNUstep/Applications/WPrefs.app/tiff/paths.tiff
 share/GNUstep/Applications/WPrefs.app/tiff/smooth.tiff
 share/GNUstep/Applications/WPrefs.app/tiff/sound.tiff
@@ -99,6 +131,7 @@ share/GNUstep/Applications/WPrefs.app/tiff/speed4.tiff
 share/GNUstep/Applications/WPrefs.app/tiff/speed4s.tiff
 share/GNUstep/Applications/WPrefs.app/tiff/tdel.tiff
 share/GNUstep/Applications/WPrefs.app/tiff/tedit.tiff
+share/GNUstep/Applications/WPrefs.app/tiff/temp.tiff
 share/GNUstep/Applications/WPrefs.app/tiff/textr.tiff
 share/GNUstep/Applications/WPrefs.app/tiff/theme.tiff
 share/GNUstep/Applications/WPrefs.app/tiff/timer0.tiff
@@ -127,7 +160,7 @@ share/WindowMaker/Backgrounds/BlueImage.jpeg
 share/WindowMaker/IconSets/Default.iconset
 share/WindowMaker/Icons/BitchX.tiff
 share/WindowMaker/Icons/BitchX.xpm
-share/WindowMaker/Icons/DefaultAppIcon.tiff
+share/WindowMaker/Icons/Ear.png
 share/WindowMaker/Icons/Ftp.png
 share/WindowMaker/Icons/GNUstep.tiff
 share/WindowMaker/Icons/GNUstep.xpm
@@ -140,10 +173,13 @@ share/WindowMaker/Icons/GNUterm.xpm
 share/WindowMaker/Icons/GreenWilber.png
 share/WindowMaker/Icons/ICQ.png
 share/WindowMaker/Icons/Jabber.png
+share/WindowMaker/Icons/Magnify.tiff
+share/WindowMaker/Icons/Magnify.xpm
+share/WindowMaker/Icons/Mouth.png
 share/WindowMaker/Icons/Mozilla.png
-share/WindowMaker/Icons/Netscape.png
 share/WindowMaker/Icons/Pen.png
 share/WindowMaker/Icons/Pencil.png
+share/WindowMaker/Icons/README
 share/WindowMaker/Icons/Real.png
 share/WindowMaker/Icons/Shell.png
 share/WindowMaker/Icons/Speaker.png
@@ -153,6 +189,7 @@ share/WindowMaker/Icons/TerminalGNUstep.tiff
 share/WindowMaker/Icons/TerminalGNUstep.xpm
 share/WindowMaker/Icons/TerminalLinux.tiff
 share/WindowMaker/Icons/TerminalLinux.xpm
+share/WindowMaker/Icons/Wine.png
 share/WindowMaker/Icons/XChat.png
 share/WindowMaker/Icons/clip.tiff
 share/WindowMaker/Icons/clip.xpm
@@ -176,8 +213,6 @@ share/WindowMaker/Icons/real.tiff
 share/WindowMaker/Icons/real.xpm
 share/WindowMaker/Icons/sgiterm.tiff
 share/WindowMaker/Icons/sgiterm.xpm
-share/WindowMaker/Icons/sound.tiff
-share/WindowMaker/Icons/sound.xpm
 share/WindowMaker/Icons/staroffice2.tiff
 share/WindowMaker/Icons/staroffice2.xpm
 share/WindowMaker/Icons/timer.tiff
@@ -234,11 +269,14 @@ share/WindowMaker/Styles/Spring.style
 share/WindowMaker/Styles/Summer.style
 share/WindowMaker/Styles/Traditional.style
 share/WindowMaker/Styles/VioletBlue.style
+share/WindowMaker/Themes/Blau.style
 share/WindowMaker/Themes/Default.style
 share/WindowMaker/Themes/OpenStep.style
 share/WindowMaker/Themes/Pastel.style
 share/WindowMaker/Themes/SteelBlueSilk.style
+share/WindowMaker/appearance.menu
 share/WindowMaker/autostart.sh
+share/WindowMaker/background.menu
 share/WindowMaker/exitscript.sh
 share/WindowMaker/menu
 share/WindowMaker/menu.bg
@@ -286,7 +324,6 @@ share/WindowMaker/plmenu.sk
 share/WindowMaker/plmenu.zh_CN
 share/WindowMaker/plmenu.zh_TW
 share/WindowMaker/wmmacros
-share/WindowMaker/xtree.dat
 share/doc/WindowMaker/FAQ
 share/doc/WindowMaker/FAQ.I18N
 share/doc/WindowMaker/README
@@ -300,6 +337,8 @@ share/locale/bg/LC_MESSAGES/WINGs.mo
 share/locale/bg/LC_MESSAGES/WPrefs.mo
 share/locale/bg/LC_MESSAGES/WindowMaker.mo
 share/locale/ca/LC_MESSAGES/WINGs.mo
+share/locale/ca/LC_MESSAGES/WPrefs.mo
+share/locale/ca/LC_MESSAGES/WindowMaker.mo
 share/locale/cs/LC_MESSAGES/WINGs.mo
 share/locale/cs/LC_MESSAGES/WPrefs.mo
 share/locale/cs/LC_MESSAGES/WindowMaker.mo
@@ -307,9 +346,11 @@ share/locale/da/LC_MESSAGES/WindowMaker.mo
 share/locale/de/LC_MESSAGES/WINGs.mo
 share/locale/de/LC_MESSAGES/WPrefs.mo
 share/locale/de/LC_MESSAGES/WindowMaker.mo
+share/locale/de/LC_MESSAGES/wmgenmenu.mo
 share/locale/el/LC_MESSAGES/WindowMaker.mo
 share/locale/es/LC_MESSAGES/WPrefs.mo
 share/locale/es/LC_MESSAGES/WindowMaker.mo
+share/locale/es/LC_MESSAGES/wmgenmenu.mo
 share/locale/et/LC_MESSAGES/WPrefs.mo
 share/locale/et/LC_MESSAGES/WindowMaker.mo
 share/locale/fi/LC_MESSAGES/WPrefs.mo
@@ -317,6 +358,7 @@ share/locale/fi/LC_MESSAGES/WindowMaker.mo
 share/locale/fr/LC_MESSAGES/WINGs.mo
 share/locale/fr/LC_MESSAGES/WPrefs.mo
 share/locale/fr/LC_MESSAGES/WindowMaker.mo
+share/locale/fr/LC_MESSAGES/wmgenmenu.mo
 share/locale/gl/LC_MESSAGES/WindowMaker.mo
 share/locale/hr/LC_MESSAGES/WPrefs.mo
 share/locale/hr/LC_MESSAGES/WindowMaker.mo
@@ -334,6 +376,7 @@ share/locale/no/LC_MESSAGES/WindowMaker.mo
 share/locale/pl/LC_MESSAGES/WindowMaker.mo
 share/locale/pt/LC_MESSAGES/WPrefs.mo
 share/locale/pt/LC_MESSAGES/WindowMaker.mo
+share/locale/pt/LC_MESSAGES/wmgenmenu.mo
 share/locale/ro/LC_MESSAGES/WindowMaker.mo
 share/locale/ru/LC_MESSAGES/WPrefs.mo
 share/locale/ru/LC_MESSAGES/WindowMaker.mo
@@ -344,3 +387,5 @@ share/locale/sv/LC_MESSAGES/WindowMaker.mo
 share/locale/tr/LC_MESSAGES/WindowMaker.mo
 share/locale/zh_CN/LC_MESSAGES/WPrefs.mo
 share/locale/zh_CN/LC_MESSAGES/WindowMaker.mo
+share/locale/zh_TW/LC_MESSAGES/WPrefs.mo
+share/locale/zh_TW/LC_MESSAGES/WindowMaker.mo
diff --git a/wm/windowmaker/buildlink3.mk b/wm/windowmaker/buildlink3.mk
index 96b04006f43..611d7ffafe8 100644
--- a/wm/windowmaker/buildlink3.mk
+++ b/wm/windowmaker/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.27 2013/02/16 11:18:02 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.28 2013/05/21 14:38:40 hans 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.0nb21
+BUILDLINK_ABI_DEPENDS.windowmaker+=	windowmaker>=0.95.4
 BUILDLINK_PKGSRCDIR.windowmaker?=	../../wm/windowmaker
 
 .include "../../devel/gettext-lib/buildlink3.mk"
diff --git a/wm/windowmaker/distinfo b/wm/windowmaker/distinfo
index a8ba6290d91..26c5a47e06a 100644
--- a/wm/windowmaker/distinfo
+++ b/wm/windowmaker/distinfo
@@ -1,19 +1,17 @@
-$NetBSD: distinfo,v 1.30 2011/05/17 10:36:45 hans Exp $
+$NetBSD: distinfo,v 1.31 2013/05/21 14:38:40 hans Exp $
 
-SHA1 (WindowMaker-0.92.0.tar.bz2) = 4f7fea6f40b9ba9f870d2e2f0ce46274750edb2c
-RMD160 (WindowMaker-0.92.0.tar.bz2) = c161eee64092fafb4868181fe2a0b6db96ed6de0
-Size (WindowMaker-0.92.0.tar.bz2) = 2202748 bytes
-SHA1 (patch-aa) = d62ab8e22f14888739717b628b7b20aaade686de
-SHA1 (patch-ab) = 533a22d64c30a27335a6abca5717047c6696adfb
-SHA1 (patch-ac) = 709866bb1db30a3d83fee6ad38f632bbbfd4fe71
-SHA1 (patch-ad) = 183b529289bbcb8dd7590296e546c166aef8da0a
-SHA1 (patch-ae) = 67c478b4fbee07ac832f59a7ad21bbbf137f5f86
-SHA1 (patch-af) = d754e2a195f1d58ea8a55f2e7bb375d18dd67e5e
-SHA1 (patch-ag) = 706d6261f58bae4cd810a77fd65dfb57d870bcab
-SHA1 (patch-ah) = b391a48f723c62335448007a89c6958a7d922d86
+SHA1 (WindowMaker-0.95.4.tar.gz) = 1477954668012010cf7991cb8139205768205717
+RMD160 (WindowMaker-0.95.4.tar.gz) = 9316c30d9d2ebd1080711596ec1b97158997fa3a
+Size (WindowMaker-0.95.4.tar.gz) = 2789390 bytes
+SHA1 (patch-aa) = 5f463c922570ff3dc8fa7e35edd93416f9af1199
+SHA1 (patch-ab) = 794946828ede1816ea3b6a4c17f00465e1ae06c9
+SHA1 (patch-ac) = 0a2843e3f8e8456080082d1f3e57f58a5d440d18
+SHA1 (patch-ad) = ec668c0e40289e87e92ec85d26810ef358d2407a
+SHA1 (patch-ae) = 65d6df46e8ef6550be8be403a6b27a73ef4cc0f0
+SHA1 (patch-af) = 87c1ddd22f4afae10ae60f012d12a41de44b0f12
+SHA1 (patch-ag) = 4447310218e73ab0b78e563dabc9ce9614d68cfd
 SHA1 (patch-ai) = 44a6a63bad867e6bc614b58688d59aa610b8553b
-SHA1 (patch-aj) = 9d993770f77cd53d005b1f2c81baff49831fe96a
-SHA1 (patch-ak) = aca311941e7c2fa7860934cd029ff87fde96c8ff
-SHA1 (patch-al) = b900fcc52c3fb5b5184b28e22c29e111317ea7ad
-SHA1 (patch-am) = b25f546dc8192cfa910461e3dc5111703aecc586
-SHA1 (patch-ao) = bdff72c638f6bef666b46a8ad6300742fe3cb12d
+SHA1 (patch-aj) = 248d7088ee2ce861898a7474cde8a08f4b879ee9
+SHA1 (patch-ak) = 10ba26239b1d85746e42ac1fad983bc3cd11d0a7
+SHA1 (patch-doc_cs_Makefile.in) = ab0b42a60863fec8fba0de0e8a2ae74fa3cf8103
+SHA1 (patch-doc_ru_Makefile.in) = 7c0b861c6bbe457e8e55e0265335195b95bbe031
diff --git a/wm/windowmaker/patches/patch-aa b/wm/windowmaker/patches/patch-aa
index 0d2b56e61c7..2c0dbd7df43 100644
--- a/wm/windowmaker/patches/patch-aa
+++ b/wm/windowmaker/patches/patch-aa
@@ -1,13 +1,42 @@
-$NetBSD: patch-aa,v 1.9 2005/07/08 09:47:02 adam Exp $
+$NetBSD: patch-aa,v 1.10 2013/05/21 14:38:40 hans Exp $
 
---- doc/Makefile.in.orig	2005-06-19 03:23:01.000000000 +0000
+--- doc/Makefile.in.orig	2013-01-09 21:43:07.000000000 +0000
 +++ doc/Makefile.in
-@@ -114,7 +114,7 @@ wprefs_datadir = @wprefs_datadir@
- 
- SUBDIRS = sk
- 
--man_MANS =  	geticonset.1x 	getstyle.1x 	seticons.1x 	setstyle.1x 	wdwrite.1x 	wmaker.1x 	wmsetbg.1x 	wxcopy.1x 	wxpaste.1x
-+man_MANS =  	geticonset.1 	getstyle.1 	seticons.1 	setstyle.1 	wdwrite.1 	wmaker.1 	wmsetbg.1 	wxcopy.1 	wxpaste.1
- 
+@@ -279,25 +279,25 @@ wprefs_bindir = @wprefs_bindir@
+ wprefs_datadir = @wprefs_datadir@
+ SUBDIRS = sk cs ru
+ man_MANS = \
+-	geticonset.1x \
+-	getstyle.1x \
++	geticonset.1 \
++	getstyle.1 \
+ 	get-wings-flags.1 \
+ 	get-wraster-flags.1 \
+ 	get-wutil-flags.1 \
+-	seticons.1x \
+-	setstyle.1x \
++	seticons.1 \
++	setstyle.1 \
+ 	upgrade-windowmaker-defaults.8 \
+ 	wdread.1 \
+-	wdwrite.1x \
+-	WindowMaker.1x \
+-	wmagnify.1x \
+-	wmaker.1x \
++	wdwrite.1 \
++	WindowMaker.1 \
++	wmagnify.1 \
++	wmaker.1 \
+ 	wmgenmenu.1 \
+ 	wmmenugen.1 \
+-	wmsetbg.1x \
+-	WPrefs.1x \
+-	wxcopy.1x \
+-	wxpaste.1x
++	wmsetbg.1 \
++	WPrefs.1 \
++	wxcopy.1 \
++	wxpaste.1
  
  EXTRA_DIST = $(man_MANS)
+ all: all-recursive
diff --git a/wm/windowmaker/patches/patch-ab b/wm/windowmaker/patches/patch-ab
index f201ce8eb94..3d80b288ee9 100644
--- a/wm/windowmaker/patches/patch-ab
+++ b/wm/windowmaker/patches/patch-ab
@@ -1,81 +1,16 @@
-$NetBSD: patch-ab,v 1.13 2005/07/08 09:47:02 adam Exp $
+$NetBSD: patch-ab,v 1.14 2013/05/21 14:38:40 hans Exp $
 
---- configure.orig	2005-06-19 03:23:02.000000000 +0000
+--- configure.orig	2013-01-09 21:43:05.000000000 +0000
 +++ configure
-@@ -21634,46 +21634,21 @@ fi
+@@ -11613,9 +11613,9 @@ test "x$exec_prefix" = xNONE && exec_pre
+ _bindir=`eval echo $bindir`
+ _bindir=`eval echo $_bindir`
  
+-lib_search_path='-L${libdir}'
++lib_search_path="-L${BUILDLINK_DIR}/lib -L${BUILDLINK_X11_DIR}/lib"
  
+-inc_search_path='-I${includedir}'
++inc_search_path="-I${BUILDLINK_DIR}/include -I${BUILDLINK_X11_DIR}/include"
  
--supported_locales="be bg bs ca cs da de el es et fi fr gl hr hu it ja ko ms nl no pl pt ro ru sk sv tr zh_CN zh_TW"
--supported_wprefs_locales="bg ca cs de es et fi fr hr hu it ja ko pt ru sk zh_CN zh_TW"
-+supported_locales="bg cs da de el es et fi fr gl hr hu it ja ko ms nl no pl pt ro ru sk sv tr zh_CN"
-+supported_wprefs_locales="bg cs de es et fi fr hr hu it ja ko pt ru sk zh_CN"
- supported_wings_locales="bg ca cs de fr sk"
- 
--for lang in $LINGUAS; do
--	ok=0
--	for l in $supported_locales; do
--		if test "$l" = "$lang"; then
--			ok=1
--			break
--		fi
--	done
--	if test "$ok" = 1; then
--		MOFILES="$MOFILES $lang.mo"
--	else
--		echo "Locale $lang is not supported."
--	fi
--	ok=0
--	for l in $supported_wprefs_locales; do
--		if test "$l" = "$lang"; then
--			ok=1
--			break
--		fi
--	done
--	if test "$ok" = 1; then
--		WPMOFILES="$WPMOFILES $lang.mo"
--	fi
--	ok=0
--	for l in $supported_wings_locales; do
--		if test "$l" = "$lang"; then
--			ok=1
--			break
--		fi
--	done
--	if test "$ok" = 1; then
--		WINGSMOFILES="$WINGSMOFILES $lang.mo"
--	fi
-+for lang in $supported_locales; do
-+       MOFILES="$MOFILES $lang.mo"
- done
- 
-+for lang in $supported_wprefs_locales; do
-+       WPMOFILES="$WPMOFILES $lang.mo"
-+done
- 
-+for lang in $supported_wings_locales; do
-+       WINGSMOFILES="$WINGSMOFILES $lang.mo"
-+done
- 
- case $host_os in
- 	freebsd*)
-@@ -26060,8 +26035,8 @@ _ACEOF
-     fi
- fi
- 
--LIBRARY_SEARCH_PATH="$lib_search_path"
--HEADER_SEARCH_PATH="$inc_search_path"
-+LIBRARY_SEARCH_PATH="-L${BUILDLINK_DIR}/lib -L${BUILDLINK_X11_DIR}/lib"
-+HEADER_SEARCH_PATH="-I${BUILDLINK_DIR}/include -I${BUILDLINK_X11_DIR}/include"
- 
- 
- 
-@@ -27661,7 +27636,7 @@ cat <<EOF >get-wraster-flags
- 
- WCFLAGS="$inc_search_path"
- WLFLAGS="$lib_search_path"
--WLIBS="-lwraster $GFXLIBS $XLIBS -lm"
-+WLIBS="-lwraster $GFXLIBS $XLIBS $XFTLIBS -lm"
- 
- usage="Usage: get-wraster-flags #lp#--cflags#rp# #lp#--ldflags#rp# #lp#--libs#rp#"
  
+ # Check whether --with-libs-from was given.
diff --git a/wm/windowmaker/patches/patch-ac b/wm/windowmaker/patches/patch-ac
index 4e55f5db068..df9b70e241b 100644
--- a/wm/windowmaker/patches/patch-ac
+++ b/wm/windowmaker/patches/patch-ac
@@ -1,13 +1,13 @@
-$NetBSD: patch-ac,v 1.7 2005/07/08 09:47:02 adam Exp $
+$NetBSD: patch-ac,v 1.8 2013/05/21 14:38:40 hans Exp $
 
---- wrlib/Makefile.in.orig	2005-06-19 03:23:01.000000000 +0000
-+++ wrlib/Makefile.in
-@@ -118,7 +118,7 @@ AUTOMAKE_OPTIONS = no-dependencies
- 
+--- wrlib/Makefile.in	2013-05-14 22:11:11.000000000 +0000
++++ wrlib/Makefile.in.orig
+@@ -321,7 +321,7 @@ SUBDIRS = .
+ AUTOMAKE_OPTIONS = 
+ EXTRA_DIST = tests libwraster.map get-wraster-flags.in
  lib_LTLIBRARIES = libwraster.la
- 
--libwraster_la_LDFLAGS = -version-info 4:0:1
-+libwraster_la_LDFLAGS =  @LIBRARY_SEARCH_PATH@ @GFXLIBS@ @XLIBS@ -lm -version-info 4:0:1
- 
+-libwraster_la_LDFLAGS = -version-info @WRASTER_VERSION@ \
++libwraster_la_LDFLAGS = @LIBRARY_SEARCH_PATH@ @GFXLIBS@ @XLIBS@ -lm -version-info @WRASTER_VERSION@ \
+ 	$(am__append_1)
  bin_SCRIPTS = get-wraster-flags
- 
+ include_HEADERS = wraster.h
diff --git a/wm/windowmaker/patches/patch-ad b/wm/windowmaker/patches/patch-ad
index 226e3d80caa..b23e0b737d0 100644
--- a/wm/windowmaker/patches/patch-ad
+++ b/wm/windowmaker/patches/patch-ad
@@ -1,8 +1,8 @@
-$NetBSD: patch-ad,v 1.8 2004/11/05 11:51:35 adam Exp $
+$NetBSD: patch-ad,v 1.9 2013/05/21 14:38:40 hans Exp $
 
---- src/main.c.orig	2004-10-25 01:32:51.000000000 +0000
+--- src/main.c.orig	2013-01-09 21:42:49.000000000 +0000
 +++ src/main.c
-@@ -28,6 +28,7 @@
+@@ -31,6 +31,7 @@
  #include <sys/stat.h>
  #include <sys/types.h>
  #include <fcntl.h>
@@ -10,16 +10,16 @@ $NetBSD: patch-ad,v 1.8 2004/11/05 11:51:35 adam Exp $
  
  #include <X11/Xlib.h>
  #include <X11/Xutil.h>
-@@ -233,6 +234,12 @@ SetupEnvironment(WScreen *scr)
+@@ -315,6 +316,12 @@ void SetupEnvironment(WScreen * scr)
  {
-     char *tmp, *ptr;
-     char buf[16];
-+    struct sigaction sa;
+ 	char *tmp, *ptr;
+ 	char buf[16];
++	struct sigaction sa;
 +
-+    sa.sa_handler = SIG_DFL;
-+    sigemptyset(&sa.sa_mask);
-+    /* sa.sa_mask = 0; */
-+    sigaction(SIGPIPE, &sa, NULL);
++	sa.sa_handler = SIG_DFL;
++	sigemptyset(&sa.sa_mask);
++	/* sa.sa_mask = 0; */
++	sigaction(SIGPIPE, &sa, NULL);
  
-     if (multiHead) {
-         int len = strlen(DisplayName)+64;
+ 	if (multiHead) {
+ 		int len = strlen(DisplayName) + 64;
diff --git a/wm/windowmaker/patches/patch-ae b/wm/windowmaker/patches/patch-ae
index 744f5709dd8..2c4f8cd5623 100644
--- a/wm/windowmaker/patches/patch-ae
+++ b/wm/windowmaker/patches/patch-ae
@@ -1,13 +1,29 @@
-$NetBSD: patch-ae,v 1.6 2005/07/08 09:47:02 adam Exp $
+$NetBSD: patch-ae,v 1.7 2013/05/21 14:38:40 hans Exp $
 
---- doc/sk/Makefile.in.orig	2005-06-19 03:23:01.000000000 +0000
+--- doc/sk/Makefile.in.orig	2013-01-09 21:43:07.000000000 +0000
 +++ doc/sk/Makefile.in
-@@ -113,7 +113,7 @@ wprefs_datadir = @wprefs_datadir@
- 
- mandir = @mandir@/sk
- 
--man_MANS =  	geticonset.1x 	setstyle.1x 	wxpaste.1x 	getstyle.1x 	wdwrite.1x 	wmsetbg.1x 	seticons.1x 	wmaker.1x 	wxcopy.1x
-+man_MANS =  	geticonset.1 	setstyle.1 	wxpaste.1 	getstyle.1 	wdwrite.1 	wmsetbg.1 	seticons.1 	wmaker.1	wxcopy.1
- 
+@@ -237,15 +237,15 @@ top_srcdir = @top_srcdir@
+ wprefs_bindir = @wprefs_bindir@
+ wprefs_datadir = @wprefs_datadir@
+ man_MANS = \
+-	geticonset.1x \
+-	setstyle.1x \
+-	wxpaste.1x \
+-	getstyle.1x \
+-	wdwrite.1x \
+-	wmsetbg.1x \
+-	seticons.1x \
+-	wmaker.1x \
+-	wxcopy.1x
++	geticonset.1 \
++	setstyle.1 \
++	wxpaste.1 \
++	getstyle.1 \
++	wdwrite.1 \
++	wmsetbg.1 \
++	seticons.1 \
++	wmaker.1 \
++	wxcopy.1
  
  EXTRA_DIST = $(man_MANS)
+ all: all-am
diff --git a/wm/windowmaker/patches/patch-af b/wm/windowmaker/patches/patch-af
index ea370a9f33e..be1b14156e5 100644
--- a/wm/windowmaker/patches/patch-af
+++ b/wm/windowmaker/patches/patch-af
@@ -1,13 +1,13 @@
-$NetBSD: patch-af,v 1.5 2005/07/08 09:47:02 adam Exp $
+$NetBSD: patch-af,v 1.6 2013/05/21 14:38:40 hans Exp $
 
---- WindowMaker/Defaults/Makefile.in.orig	2005-06-19 03:23:01.000000000 +0000
+--- WindowMaker/Defaults/Makefile.in.orig	2013-01-09 21:43:07.000000000 +0000
 +++ WindowMaker/Defaults/Makefile.in
-@@ -112,7 +112,7 @@ supported_locales = @supported_locales@
+@@ -235,7 +235,7 @@ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
  wprefs_bindir = @wprefs_bindir@
  wprefs_datadir = @wprefs_datadir@
- 
 -defsdatadir = $(sysconfdir)/WindowMaker
 +defsdatadir = $(datadir)/examples/WindowMaker
- 
  defsdata_DATA = WMRootMenu WMWindowAttributes WindowMaker WMState WMGLOBAL
- 
+ wpexecbindir = @wprefs_bindir@
+ EXTRA_DIST = WMGLOBAL WMWindowAttributes.in WindowMaker.in WMState.in
diff --git a/wm/windowmaker/patches/patch-ag b/wm/windowmaker/patches/patch-ag
index 25ae7f657bc..47d450c2ab7 100644
--- a/wm/windowmaker/patches/patch-ag
+++ b/wm/windowmaker/patches/patch-ag
@@ -1,19 +1,16 @@
-$NetBSD: patch-ag,v 1.6 2007/06/21 00:00:23 minskim Exp $
+$NetBSD: patch-ag,v 1.7 2013/05/21 14:38:40 hans Exp $
 
---- WINGs/Examples/Makefile.in.orig	2007-06-20 16:28:40.000000000 -0700
+--- WINGs/Examples/Makefile.in.orig	2013-01-09 21:43:06.000000000 +0000
 +++ WINGs/Examples/Makefile.in
-@@ -127,12 +127,12 @@ puzzle_DEPENDENCIES = $(top_builddir)/WI
+@@ -262,9 +262,9 @@ colorpick_DEPENDENCIES = $(top_builddir)
+ fontl_DEPENDENCIES = $(top_builddir)/WINGs/libWINGs.la
+ puzzle_DEPENDENCIES = $(top_builddir)/WINGs/libWINGs.la
+ connect_DEPENDENCIES = $(top_builddir)/WINGs/libWUtil.la
+-connect_LDADD = $(top_builddir)/WINGs/libWUtil.la @LIBRARY_SEARCH_PATH@ @INTLIBS@
++connect_LDADD = $(top_builddir)/WINGs/libWUtil.la @LIBRARY_SEARCH_PATH@ @INTLIBS@ @XLIBS@
+ server_DEPENDENCIES = $(top_builddir)/WINGs/libWUtil.la
+-server_LDADD = $(top_builddir)/WINGs/libWUtil.la @LIBRARY_SEARCH_PATH@ @INTLIBS@
++server_LDADD = $(top_builddir)/WINGs/libWUtil.la @LIBRARY_SEARCH_PATH@ @INTLIBS@ @XLIBS@
+ AM_CPPFLAGS = -I$(top_srcdir)/WINGs -I$(top_srcdir)/wrlib -I$(top_srcdir)/src \
+ 	-DRESOURCE_PATH=\"$(datadir)/WINGs\" @HEADER_SEARCH_PATH@
  
- connect_DEPENDENCIES = $(top_builddir)/WINGs/libWUtil.a
- 
--connect_LDADD = $(top_builddir)/WINGs/libWUtil.a @LIBRARY_SEARCH_PATH@ 	@NETLIBS@ @INTLIBS@
-+connect_LDADD = $(top_builddir)/WINGs/libWUtil.a @LIBRARY_SEARCH_PATH@ 	@NETLIBS@ @INTLIBS@ @XLIBS@
- 
- 
- server_DEPENDENCIES = $(top_builddir)/WINGs/libWUtil.a
- 
--server_LDADD = $(top_builddir)/WINGs/libWUtil.a @LIBRARY_SEARCH_PATH@ 	@NETLIBS@ @INTLIBS@
-+server_LDADD = $(top_builddir)/WINGs/libWUtil.a @LIBRARY_SEARCH_PATH@ 	@NETLIBS@ @INTLIBS@ @XLIBS@
- 
- 
- INCLUDES = -I$(top_srcdir)/WINGs -I$(top_srcdir)/wrlib -I$(top_srcdir)/src 	-DRESOURCE_PATH=\"$(datadir)/WINGs\" @HEADER_SEARCH_PATH@ -DDEBUG
diff --git a/wm/windowmaker/patches/patch-ah b/wm/windowmaker/patches/patch-ah
deleted file mode 100644
index 091fe1522ee..00000000000
--- a/wm/windowmaker/patches/patch-ah
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-ah,v 1.2 2004/11/05 11:51:35 adam Exp $
-
---- src/properties.c.orig	2004-10-27 17:41:34.000000000 +1000
-+++ src/properties.c	2004-10-27 17:42:09.000000000 +1000
-@@ -81,8 +81,8 @@
- 
-     class_hint = XAllocClassHint();
-     if (XGetClassHint(dpy,window,class_hint) == 0) {
--        *wm_class = NULL;
--        *wm_instance = NULL;
-+        *wm_class = strdup("default");
-+        *wm_instance = strdup("default");
-         XFree(class_hint);
-         return False;
-     }
diff --git a/wm/windowmaker/patches/patch-aj b/wm/windowmaker/patches/patch-aj
index 687dfa3edd7..f7cdce4affd 100644
--- a/wm/windowmaker/patches/patch-aj
+++ b/wm/windowmaker/patches/patch-aj
@@ -1,9 +1,9 @@
-$NetBSD: patch-aj,v 1.2 2005/07/08 09:47:02 adam Exp $
+$NetBSD: patch-aj,v 1.3 2013/05/21 14:38:40 hans Exp $
 
---- src/switchpanel.c.orig	2004-10-30 07:16:04.000000000 +0000
+--- src/switchpanel.c.orig	2013-01-09 21:42:49.000000000 +0000
 +++ src/switchpanel.c
-@@ -36,6 +36,8 @@
- #include "xinerama.h"
+@@ -37,6 +37,8 @@
+ extern Atom _XA_WM_IGNORE_FOCUS_EVENTS;
  
  #ifdef SHAPE
 +#include <X11/Xlib.h>
diff --git a/wm/windowmaker/patches/patch-ak b/wm/windowmaker/patches/patch-ak
index e0b5d5fd7a0..7204f0f81a1 100644
--- a/wm/windowmaker/patches/patch-ak
+++ b/wm/windowmaker/patches/patch-ak
@@ -1,40 +1,32 @@
-$NetBSD: patch-ak,v 1.3 2007/06/21 00:00:24 minskim Exp $
+$NetBSD: patch-ak,v 1.4 2013/05/21 14:38:40 hans Exp $
 
---- util/Makefile.in.orig	2007-06-20 16:28:40.000000000 -0700
+--- util/Makefile.in.orig	2013-01-09 21:43:07.000000000 +0000
 +++ util/Makefile.in
-@@ -126,15 +126,15 @@ INCLUDES = $(DFLAGS) -I$(top_srcdir)/WIN
+@@ -374,21 +374,21 @@ AM_CPPFLAGS = -DLOCALEDIR=\"$(NLSDIR)\" 
+ 	-DETCDIR=\"sysconfdir\" -DDATADIR=\"pkgdatadir\"
  
  liblist = @LIBRARY_SEARCH_PATH@ @INTLIBS@
- 
--wdwrite_LDADD = $(top_builddir)/WINGs/libWUtil.a $(liblist)
-+wdwrite_LDADD = $(top_builddir)/WINGs/libWUtil.a @XLFLAGS@ @XLIBS@ $(liblist)
- 
--wdread_LDADD = $(top_builddir)/WINGs/libWUtil.a $(liblist)
-+wdread_LDADD = $(top_builddir)/WINGs/libWUtil.a @XLFLAGS@ @XLIBS@ $(liblist)
- 
+-wdwrite_LDADD = $(top_builddir)/WINGs/libWUtil.la $(liblist)
+-wdread_LDADD = $(top_builddir)/WINGs/libWUtil.la $(liblist)
++wdwrite_LDADD = $(top_builddir)/WINGs/libWUtil.la @XLFLAGS@ @XLIBS@ $(liblist)
++wdread_LDADD = $(top_builddir)/WINGs/libWUtil.la @XLFLAGS@ @XLIBS@ $(liblist)
  wxcopy_LDADD = @XLFLAGS@ @XLIBS@ 
- 
  wxpaste_LDADD = @XLFLAGS@ @XLIBS@
- 
--getstyle_LDADD = $(top_builddir)/WINGs/libWUtil.a $(liblist)
-+getstyle_LDADD = $(top_builddir)/WINGs/libWUtil.a @XLFLAGS@ @XLIBS@ $(liblist)
- 
+-getstyle_LDADD = $(top_builddir)/WINGs/libWUtil.la $(liblist)
++getstyle_LDADD = $(top_builddir)/WINGs/libWUtil.la @XLFLAGS@ @XLIBS@ $(liblist)
  getstyle_SOURCES = getstyle.c fontconv.c
- 
-@@ -143,13 +143,13 @@ setstyle_LDADD =  	$(top_builddir)/WINGs
+ setstyle_LDADD = \
+ 	$(top_builddir)/WINGs/libWUtil.la \
+ 	@XLFLAGS@ @XLIBS@ $(liblist)
  
  setstyle_SOURCES = setstyle.c fontconv.c
- 
--convertfonts_LDADD = $(top_builddir)/WINGs/libWUtil.a $(liblist)
-+convertfonts_LDADD = $(top_builddir)/WINGs/libWUtil.a @XLFLAGS@ @XLIBS@ $(liblist)
- 
+-convertfonts_LDADD = $(top_builddir)/WINGs/libWUtil.la $(liblist)
++convertfonts_LDADD = $(top_builddir)/WINGs/libWUtil.la @XLFLAGS@ @XLIBS@ $(liblist)
  convertfonts_SOURCES = convertfonts.c fontconv.c
- 
--seticons_LDADD = $(top_builddir)/WINGs/libWUtil.a $(liblist)
-+seticons_LDADD = $(top_builddir)/WINGs/libWUtil.a @XLFLAGS@ @XLIBS@ $(liblist)
- 
--geticonset_LDADD = $(top_builddir)/WINGs/libWUtil.a $(liblist)
-+geticonset_LDADD = $(top_builddir)/WINGs/libWUtil.a @XLFLAGS@ @XLIBS@ $(liblist)
- 
- wmagnify_LDADD =  	$(top_builddir)/WINGs/libWINGs.a 	$(top_builddir)/wrlib/libwraster.la 	@XFTLIBS@ @INTLIBS@ @DLLIBS@
- 
+-seticons_LDADD = $(top_builddir)/WINGs/libWUtil.la $(liblist)
+-geticonset_LDADD = $(top_builddir)/WINGs/libWUtil.la $(liblist)
++seticons_LDADD = $(top_builddir)/WINGs/libWUtil.la @XLFLAGS@ @XLIBS@$(liblist)
++geticonset_LDADD = $(top_builddir)/WINGs/libWUtil.la @XLFLAGS@ @XLIBS@ $(liblist)
+ wmagnify_LDADD = \
+ 	$(top_builddir)/WINGs/libWINGs.la \
+ 	$(top_builddir)/WINGs/libWUtil.la \
diff --git a/wm/windowmaker/patches/patch-al b/wm/windowmaker/patches/patch-al
deleted file mode 100644
index bd1b96fb4ff..00000000000
--- a/wm/windowmaker/patches/patch-al
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD: patch-al,v 1.2 2005/01/04 21:34:01 sekiya Exp $
-
---- WINGs/wwindow.c.orig	2004-10-24 11:58:20.000000000 +0900
-+++ WINGs/wwindow.c	2005-01-04 23:17:30.000000000 +0900
-@@ -254,14 +254,14 @@
- setMiniwindow(WMWindow *win, RImage *image)
- {
-     WMScreen *scr= win->view->screen;
--    CARD32 *data;
-+    unsigned long *data;
-     int x, y;
-     int o;
- 
-     if (!image)
-       return;
- 
--    data = wmalloc((image->width * image->height + 2) * sizeof(CARD32));
-+    data = wmalloc((image->width * image->height + 2) * sizeof(unsigned long));
- 
-     o= 0;
-     data[o++] = image->width;
diff --git a/wm/windowmaker/patches/patch-am b/wm/windowmaker/patches/patch-am
deleted file mode 100644
index 7790cc2e15d..00000000000
--- a/wm/windowmaker/patches/patch-am
+++ /dev/null
@@ -1,96 +0,0 @@
-$NetBSD: patch-am,v 1.1 2010/04/21 05:43:28 wiz Exp $
-
-Fix Qt applications on 64bit platforms. PR 43178.
-
---- src/wmspec.c.orig	2005-05-15 16:41:09.000000000 +0000
-+++ src/wmspec.c
-@@ -35,6 +35,7 @@
- 
- #include <X11/Xlib.h>
- #include <X11/Xatom.h>
-+#include <X11/Xarch.h>
- #include <string.h>
- 
- #include "WindowMaker.h"
-@@ -322,15 +323,15 @@ setSupportedHints(WScreen *scr)
- void
- wNETWMUpdateDesktop(WScreen *scr)
- {
--    CARD32 *views, sizes[2];
-+    long *views, sizes[2];
-     int count, i;
- 
-     if (scr->workspace_count==0)
-         return;
- 
-     count = scr->workspace_count * 2;
--    views = wmalloc(sizeof(CARD32) * count);
--    /*memset(views, 0, sizeof(CARD32) * count);*/
-+    views = wmalloc(sizeof(long) * count);
-+    /*memset(views, 0, sizeof(long) * count);*/
- 
- #ifdef VIRTUAL_DESKTOP
-     sizes[0] = scr->workspaces[scr->current_workspace]->width;
-@@ -370,7 +371,7 @@ wNETWMGetCurrentDesktopFromHint(WScreen 
-                                0, 1, &count);
-     if (prop)
-     {
--        int desktop= *(CARD32*)prop;
-+       int desktop= *(long*)prop;
-         XFree(prop);
-         return desktop;
-     }
-@@ -487,7 +488,7 @@ updateIconImage(WScreen *scr, WWindow *w
- static void
- updateShowDesktop(WScreen * scr, Bool show)
- {
--    CARD32 foo;
-+    long foo;
- 
-     foo = (show == True);
-     XChangeProperty(dpy, scr->root_win, net_showing_desktop, XA_CARDINAL, 32,
-@@ -660,7 +661,7 @@ wNETWMUpdateActions(WWindow *wwin, Bool 
- void
- wNETWMUpdateWorkarea(WScreen *scr, WArea usableArea)
- {
--    CARD32 *area;
-+    long *area;
-     int count, i;
- 
-     /* XXX: not Xinerama compatible,
-@@ -670,7 +671,7 @@ wNETWMUpdateWorkarea(WScreen *scr, WArea
-         return;
- 
-     count = scr->workspace_count * 4;
--    area = wmalloc(sizeof(CARD32) * count);
-+    area = wmalloc(sizeof(long) * count);
-     for (i=0; i<scr->workspace_count; i++) {
-         area[4*i + 0] = usableArea.x1;
-         area[4*i + 1] = usableArea.y1;
-@@ -793,7 +794,7 @@ updateClientListStacking(WScreen *scr, W
- static void
- updateWorkspaceCount(WScreen *scr) /* changeable */
- {
--    CARD32 count;
-+    long count;
- 
-     count = scr->workspace_count;
- 
-@@ -805,7 +806,7 @@ updateWorkspaceCount(WScreen *scr) /* ch
- static void
- updateCurrentWorkspace(WScreen *scr) /* changeable */
- {
--    CARD32 count;
-+    long count;
- 
-     count = scr->current_workspace;
- 
-@@ -852,7 +853,7 @@ updateFocusHint(WScreen *scr, WWindow *w
- static void
- updateWorkspaceHint(WWindow *wwin, Bool fake, Bool del)
- {
--    CARD32 l;
-+    long l;
- 
-     if (del) {
-         XDeleteProperty(dpy, wwin->client_win, net_wm_desktop);
diff --git a/wm/windowmaker/patches/patch-ao b/wm/windowmaker/patches/patch-ao
deleted file mode 100644
index 0a19989f318..00000000000
--- a/wm/windowmaker/patches/patch-ao
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-ao,v 1.2 2011/05/17 10:36:45 hans Exp $
-
-Fix build with "png" 1.5.1beta01 and newer.
-
---- wrlib/png.c.orig	2004-10-12 19:22:04.000000000 +0100
-+++ wrlib/png.c	2011-01-14 19:38:22.000000000 +0000
-@@ -97,7 +97,7 @@
-     }
- 
-     RErrorCode = RERR_INTERNAL;
--    if (setjmp(png->jmpbuf)) {
-+    if (setjmp(png_jmpbuf(png))) {
-         fclose(f);
-         png_destroy_read_struct(&png, &pinfo, &einfo);
-         if (image)
diff --git a/wm/windowmaker/patches/patch-doc_cs_Makefile.in b/wm/windowmaker/patches/patch-doc_cs_Makefile.in
new file mode 100644
index 00000000000..478dd9de057
--- /dev/null
+++ b/wm/windowmaker/patches/patch-doc_cs_Makefile.in
@@ -0,0 +1,29 @@
+$NetBSD: patch-doc_cs_Makefile.in,v 1.1 2013/05/21 14:38:40 hans Exp $
+
+--- doc/cs/Makefile.in.orig	2013-05-14 22:33:35.000000000 +0000
++++ doc/cs/Makefile.in
+@@ -237,15 +237,15 @@ top_srcdir = @top_srcdir@
+ wprefs_bindir = @wprefs_bindir@
+ wprefs_datadir = @wprefs_datadir@
+ man_MANS = \
+-	geticonset.1x \
+-	setstyle.1x \
+-	wxpaste.1x \
+-	getstyle.1x \
+-	wdwrite.1x \
+-	wmsetbg.1x \
+-	seticons.1x \
+-	wmaker.1x \
+-	wxcopy.1x
++	geticonset.1 \
++	setstyle.1 \
++	wxpaste.1 \
++	getstyle.1 \
++	wdwrite.1 \
++	wmsetbg.1 \
++	seticons.1 \
++	wmaker.1 \
++	wxcopy.1
+ 
+ EXTRA_DIST = $(man_MANS)
+ all: all-am
diff --git a/wm/windowmaker/patches/patch-doc_ru_Makefile.in b/wm/windowmaker/patches/patch-doc_ru_Makefile.in
new file mode 100644
index 00000000000..fac417ae820
--- /dev/null
+++ b/wm/windowmaker/patches/patch-doc_ru_Makefile.in
@@ -0,0 +1,29 @@
+$NetBSD: patch-doc_ru_Makefile.in,v 1.1 2013/05/21 14:38:40 hans Exp $
+
+--- doc/ru/Makefile.in.orig	2013-05-14 22:33:35.000000000 +0000
++++ doc/ru/Makefile.in
+@@ -237,15 +237,15 @@ top_srcdir = @top_srcdir@
+ wprefs_bindir = @wprefs_bindir@
+ wprefs_datadir = @wprefs_datadir@
+ man_MANS = \
+-	geticonset.1x \
+-	setstyle.1x \
+-	wxpaste.1x \
+-	getstyle.1x \
+-	wdwrite.1x \
+-	wmsetbg.1x \
+-	seticons.1x \
+-	wmaker.1x \
+-	wxcopy.1x
++	geticonset.1 \
++	setstyle.1 \
++	wxpaste.1 \
++	getstyle.1 \
++	wdwrite.1 \
++	wmsetbg.1 \
++	seticons.1 \
++	wmaker.1 \
++	wxcopy.1
+ 
+ EXTRA_DIST = $(man_MANS)
+ all: all-am