Changes 0.92.0:

* added support for X Input Methods
* improved hiding/unhiding animations to be quicker
  and do less icon shuffling
* fixed gcc and libxft complilation issues
* fixed many bugs

12 files changed, 137 insertions, 181 deletions

diff --git a/wm/windowmaker/Makefile b/wm/windowmaker/Makefile
index 7dd1ec8fed8..552b28b3602 100644
--- a/wm/windowmaker/Makefile
+++ b/wm/windowmaker/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.53 2005/06/01 18:03:26 jlam Exp $
+# $NetBSD: Makefile,v 1.54 2005/07/08 09:47:02 adam Exp $
 
-DISTNAME=	WindowMaker-0.91.0
+DISTNAME=	WindowMaker-0.92.0
 PKGNAME=	${DISTNAME:S/WindowMaker/windowmaker/}
-PKGREVISION=	1
 CATEGORIES=	x11 wm windowmaker
 MASTER_SITES=	ftp://ftp.windowmaker.org/pub/source/release/ \
 		ftp://ftp.ics.es.osaka-u.ac.jp/mirrors/WindowMaker/source/release/
@@ -12,15 +11,16 @@ MAINTAINER=	tech-pkg@NetBSD.org
 HOMEPAGE=	http://www.windowmaker.org/
 COMMENT=	GNUStep-compliant NEXTSTEP(tm) window manager clone
 
-BUILD_USES_MSGFMT=	YES
+BUILD_USES_MSGFMT=	yes
 
-USE_PKGINSTALL=		YES
-USE_PKGLOCALEDIR=	YES
-USE_LIBTOOL=		YES
-GNU_CONFIGURE=		YES
-CONFIGURE_ARGS+=	--enable-usermenu \
-			--sysconfdir=${PKG_SYSCONFBASEDIR} \
-			--with-nlsdir=${PREFIX}/${PKGLOCALEDIR}/locale
+USE_LIBTOOL=		yes
+USE_PKGINSTALL=		yes
+USE_PKGLOCALEDIR=	yes
+GNU_CONFIGURE=		yes
+CONFIGURE_ARGS+=	--enable-usermenu
+CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFBASEDIR}
+CONFIGURE_ARGS+=	--with-nlsdir=${PREFIX}/${PKGLOCALEDIR}/locale
+CONFIGURE_ARGS+=	--without-gnustepdir
 CONFIGURE_ENV+=		LINGUAS=yes
 CONFIGURE_ENV+=		CPP_PATH="${CPP}"
 
@@ -36,7 +36,7 @@ PKG_SYSCONFSUBDIR=	WindowMaker
 EGDIR=			${PREFIX}/share/examples/WindowMaker
 CONF_FILES=
 .for f in WMGLOBAL WMRootMenu WMState WMWindowAttributes WindowMaker
-CONF_FILES+=		${EGDIR}/$f ${PKG_SYSCONFDIR}/$f
+CONF_FILES+=		${EGDIR}/${f} ${PKG_SYSCONFDIR}/${f}
 .endfor
 .undef f
 
diff --git a/wm/windowmaker/PLIST b/wm/windowmaker/PLIST
index 86b44c4c589..2cb6f452e5b 100644
--- a/wm/windowmaker/PLIST
+++ b/wm/windowmaker/PLIST
@@ -1,71 +1,5 @@
-@comment $NetBSD: PLIST,v 1.10 2004/11/05 11:51:35 adam Exp $
-GNUstep/Applications/WPrefs.app/WPrefs
-GNUstep/Applications/WPrefs.app/WPrefs.tiff
-GNUstep/Applications/WPrefs.app/WPrefs.xpm
-GNUstep/Applications/WPrefs.app/tiff/advancetonewworkspace.tiff
-GNUstep/Applications/WPrefs.app/tiff/animations.tiff
-GNUstep/Applications/WPrefs.app/tiff/appearance.tiff
-GNUstep/Applications/WPrefs.app/tiff/clip.tiff
-GNUstep/Applications/WPrefs.app/tiff/configs.tiff
-GNUstep/Applications/WPrefs.app/tiff/cycleworkspaces.tiff
-GNUstep/Applications/WPrefs.app/tiff/dock.tiff
-GNUstep/Applications/WPrefs.app/tiff/dontlinkworkspaces.tiff
-GNUstep/Applications/WPrefs.app/tiff/ergonomic.tiff
-GNUstep/Applications/WPrefs.app/tiff/expert.tiff
-GNUstep/Applications/WPrefs.app/tiff/fonts.tiff
-GNUstep/Applications/WPrefs.app/tiff/iconprefs.tiff
-GNUstep/Applications/WPrefs.app/tiff/keyboard.tiff
-GNUstep/Applications/WPrefs.app/tiff/keyboardprefs.tiff
-GNUstep/Applications/WPrefs.app/tiff/keyshortcuts.tiff
-GNUstep/Applications/WPrefs.app/tiff/menualign1.tiff
-GNUstep/Applications/WPrefs.app/tiff/menualign2.tiff
-GNUstep/Applications/WPrefs.app/tiff/menuprefs.tiff
-GNUstep/Applications/WPrefs.app/tiff/menus.tiff
-GNUstep/Applications/WPrefs.app/tiff/moreanim.tiff
-GNUstep/Applications/WPrefs.app/tiff/mousesettings.tiff
-GNUstep/Applications/WPrefs.app/tiff/mousespeed.tiff
-GNUstep/Applications/WPrefs.app/tiff/msty1.tiff
-GNUstep/Applications/WPrefs.app/tiff/msty2.tiff
-GNUstep/Applications/WPrefs.app/tiff/msty3.tiff
-GNUstep/Applications/WPrefs.app/tiff/newstyle.tiff
-GNUstep/Applications/WPrefs.app/tiff/nonopaque.tiff
-GNUstep/Applications/WPrefs.app/tiff/oldstyle.tiff
-GNUstep/Applications/WPrefs.app/tiff/opaque.tiff
-GNUstep/Applications/WPrefs.app/tiff/paths.tiff
-GNUstep/Applications/WPrefs.app/tiff/smooth.tiff
-GNUstep/Applications/WPrefs.app/tiff/sound.tiff
-GNUstep/Applications/WPrefs.app/tiff/speed0.tiff
-GNUstep/Applications/WPrefs.app/tiff/speed0s.tiff
-GNUstep/Applications/WPrefs.app/tiff/speed1.tiff
-GNUstep/Applications/WPrefs.app/tiff/speed1s.tiff
-GNUstep/Applications/WPrefs.app/tiff/speed2.tiff
-GNUstep/Applications/WPrefs.app/tiff/speed2s.tiff
-GNUstep/Applications/WPrefs.app/tiff/speed3.tiff
-GNUstep/Applications/WPrefs.app/tiff/speed3s.tiff
-GNUstep/Applications/WPrefs.app/tiff/speed4.tiff
-GNUstep/Applications/WPrefs.app/tiff/speed4s.tiff
-GNUstep/Applications/WPrefs.app/tiff/tdel.tiff
-GNUstep/Applications/WPrefs.app/tiff/tedit.tiff
-GNUstep/Applications/WPrefs.app/tiff/textr.tiff
-GNUstep/Applications/WPrefs.app/tiff/theme.tiff
-GNUstep/Applications/WPrefs.app/tiff/timer0.tiff
-GNUstep/Applications/WPrefs.app/tiff/timer0s.tiff
-GNUstep/Applications/WPrefs.app/tiff/timer1.tiff
-GNUstep/Applications/WPrefs.app/tiff/timer1s.tiff
-GNUstep/Applications/WPrefs.app/tiff/timer2.tiff
-GNUstep/Applications/WPrefs.app/tiff/timer2s.tiff
-GNUstep/Applications/WPrefs.app/tiff/timer3.tiff
-GNUstep/Applications/WPrefs.app/tiff/timer3s.tiff
-GNUstep/Applications/WPrefs.app/tiff/timer4.tiff
-GNUstep/Applications/WPrefs.app/tiff/timer4s.tiff
-GNUstep/Applications/WPrefs.app/tiff/timer5.tiff
-GNUstep/Applications/WPrefs.app/tiff/timer5s.tiff
-GNUstep/Applications/WPrefs.app/tiff/tnew.tiff
-GNUstep/Applications/WPrefs.app/tiff/whandling.tiff
-GNUstep/Applications/WPrefs.app/tiff/windowfocus.tiff
-GNUstep/Applications/WPrefs.app/tiff/workspace.tiff
-GNUstep/Applications/WPrefs.app/tiff/workspacename.tiff
-GNUstep/Applications/WPrefs.app/tiff/xis.tiff
+@comment $NetBSD: PLIST,v 1.11 2005/07/08 09:47:02 adam Exp $
+bin/WPrefs
 bin/convertfonts
 bin/get-wings-flags
 bin/get-wraster-flags
@@ -123,6 +57,72 @@ share/WINGs/Images.tiff
 share/WINGs/Images.xpm
 share/WINGs/defaultIcon.tiff
 share/WINGs/defaultIcon.xpm
+share/WPrefs/WPrefs.tiff
+share/WPrefs/WPrefs.xpm
+share/WPrefs/tiff/advancetonewworkspace.tiff
+share/WPrefs/tiff/animations.tiff
+share/WPrefs/tiff/appearance.tiff
+share/WPrefs/tiff/clip.tiff
+share/WPrefs/tiff/configs.tiff
+share/WPrefs/tiff/cycleworkspaces.tiff
+share/WPrefs/tiff/dock.tiff
+share/WPrefs/tiff/dontlinkworkspaces.tiff
+share/WPrefs/tiff/ergonomic.tiff
+share/WPrefs/tiff/expert.tiff
+share/WPrefs/tiff/fonts.tiff
+share/WPrefs/tiff/iconprefs.tiff
+share/WPrefs/tiff/keyboard.tiff
+share/WPrefs/tiff/keyboardprefs.tiff
+share/WPrefs/tiff/keyshortcuts.tiff
+share/WPrefs/tiff/menualign1.tiff
+share/WPrefs/tiff/menualign2.tiff
+share/WPrefs/tiff/menuprefs.tiff
+share/WPrefs/tiff/menus.tiff
+share/WPrefs/tiff/moreanim.tiff
+share/WPrefs/tiff/mousesettings.tiff
+share/WPrefs/tiff/mousespeed.tiff
+share/WPrefs/tiff/msty1.tiff
+share/WPrefs/tiff/msty2.tiff
+share/WPrefs/tiff/msty3.tiff
+share/WPrefs/tiff/newstyle.tiff
+share/WPrefs/tiff/nonopaque.tiff
+share/WPrefs/tiff/oldstyle.tiff
+share/WPrefs/tiff/opaque.tiff
+share/WPrefs/tiff/paths.tiff
+share/WPrefs/tiff/smooth.tiff
+share/WPrefs/tiff/sound.tiff
+share/WPrefs/tiff/speed0.tiff
+share/WPrefs/tiff/speed0s.tiff
+share/WPrefs/tiff/speed1.tiff
+share/WPrefs/tiff/speed1s.tiff
+share/WPrefs/tiff/speed2.tiff
+share/WPrefs/tiff/speed2s.tiff
+share/WPrefs/tiff/speed3.tiff
+share/WPrefs/tiff/speed3s.tiff
+share/WPrefs/tiff/speed4.tiff
+share/WPrefs/tiff/speed4s.tiff
+share/WPrefs/tiff/tdel.tiff
+share/WPrefs/tiff/tedit.tiff
+share/WPrefs/tiff/textr.tiff
+share/WPrefs/tiff/theme.tiff
+share/WPrefs/tiff/timer0.tiff
+share/WPrefs/tiff/timer0s.tiff
+share/WPrefs/tiff/timer1.tiff
+share/WPrefs/tiff/timer1s.tiff
+share/WPrefs/tiff/timer2.tiff
+share/WPrefs/tiff/timer2s.tiff
+share/WPrefs/tiff/timer3.tiff
+share/WPrefs/tiff/timer3s.tiff
+share/WPrefs/tiff/timer4.tiff
+share/WPrefs/tiff/timer4s.tiff
+share/WPrefs/tiff/timer5.tiff
+share/WPrefs/tiff/timer5s.tiff
+share/WPrefs/tiff/tnew.tiff
+share/WPrefs/tiff/whandling.tiff
+share/WPrefs/tiff/windowfocus.tiff
+share/WPrefs/tiff/workspace.tiff
+share/WPrefs/tiff/workspacename.tiff
+share/WPrefs/tiff/xis.tiff
 share/WindowMaker/Backgrounds/BlueImage.jpeg
 share/WindowMaker/IconSets/Default.iconset
 share/WindowMaker/Icons/BitchX.tiff
@@ -354,9 +354,9 @@ ${PKGLOCALEDIR}/locale/zh_CN/LC_MESSAGES/WindowMaker.mo
 @dirrm share/WindowMaker/IconSets
 @dirrm share/WindowMaker/Backgrounds
 @dirrm share/WindowMaker
+@dirrm share/WPrefs/xpm
+@dirrm share/WPrefs/tiff
+@dirrm share/WPrefs
 @dirrm share/WINGs
 @dirrm man/sk/man1
 @dirrm include/WINGs
-@dirrm GNUstep/Applications/WPrefs.app/tiff
-@dirrm GNUstep/Applications/WPrefs.app/xpm
-@dirrm GNUstep/Applications/WPrefs.app
diff --git a/wm/windowmaker/distinfo b/wm/windowmaker/distinfo
index 0705598cc1b..18bdc4231e3 100644
--- a/wm/windowmaker/distinfo
+++ b/wm/windowmaker/distinfo
@@ -1,17 +1,15 @@
-$NetBSD: distinfo,v 1.25 2005/02/23 18:43:55 wiz Exp $
+$NetBSD: distinfo,v 1.26 2005/07/08 09:47:02 adam Exp $
 
-SHA1 (WindowMaker-0.91.0.tar.bz2) = 14fb553943b5cbfaaa867d28405b910e73d3b509
-RMD160 (WindowMaker-0.91.0.tar.bz2) = 6c37a45623eadfd0e63d6b1527a059c122ab5b8c
-Size (WindowMaker-0.91.0.tar.bz2) = 2198266 bytes
-SHA1 (patch-aa) = c6ac4117995c89803f876f402ae07f0ee3e6e4c6
-SHA1 (patch-ab) = 936ab75d67b932df44d4c41023b588a863e283c9
-SHA1 (patch-ac) = 7dfc20cd0b1e8638afb920bf631b44d918e59ac6
+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) = 70f21b44a45fad4b2bf48af75820a22ed1e4e857
-SHA1 (patch-af) = dc749bbbea0c0e8d5b42d7d1be76b60b3af794b2
-SHA1 (patch-ag) = 7a67f76434f61e43faa2dc434f5ee41d94b8ad55
+SHA1 (patch-ae) = 67c478b4fbee07ac832f59a7ad21bbbf137f5f86
+SHA1 (patch-af) = d754e2a195f1d58ea8a55f2e7bb375d18dd67e5e
 SHA1 (patch-ah) = b391a48f723c62335448007a89c6958a7d922d86
-SHA1 (patch-ai) = 03ef51a9dcc6d5b23f325231ea2d71fc0f13706f
-SHA1 (patch-aj) = 69fd44e4fb526a0b3d61ff8c6d958da38178dca7
-SHA1 (patch-ak) = bef271b75dd9164eaea04635b8c2bf48d50f7168
+SHA1 (patch-ai) = 44a6a63bad867e6bc614b58688d59aa610b8553b
+SHA1 (patch-aj) = 9d993770f77cd53d005b1f2c81baff49831fe96a
 SHA1 (patch-al) = b900fcc52c3fb5b5184b28e22c29e111317ea7ad
diff --git a/wm/windowmaker/patches/patch-aa b/wm/windowmaker/patches/patch-aa
index a619605a33a..0d2b56e61c7 100644
--- a/wm/windowmaker/patches/patch-aa
+++ b/wm/windowmaker/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.8 2004/11/05 11:51:35 adam Exp $
+$NetBSD: patch-aa,v 1.9 2005/07/08 09:47:02 adam Exp $
 
---- doc/Makefile.in.orig	2004-10-24 23:02:00.000000000 -0400
-+++ doc/Makefile.in	2004-10-24 23:02:38.000000000 -0400
-@@ -113,7 +113,7 @@
+--- doc/Makefile.in.orig	2005-06-19 03:23:01.000000000 +0000
++++ doc/Makefile.in
+@@ -114,7 +114,7 @@ wprefs_datadir = @wprefs_datadir@
  
  SUBDIRS = sk
  
diff --git a/wm/windowmaker/patches/patch-ab b/wm/windowmaker/patches/patch-ab
index b3021f3e0f1..f201ce8eb94 100644
--- a/wm/windowmaker/patches/patch-ab
+++ b/wm/windowmaker/patches/patch-ab
@@ -1,13 +1,13 @@
-$NetBSD: patch-ab,v 1.12 2004/11/05 11:51:35 adam Exp $
+$NetBSD: patch-ab,v 1.13 2005/07/08 09:47:02 adam Exp $
 
---- configure.orig	2004-10-26 04:10:49.000000000 +0000
+--- configure.orig	2005-06-19 03:23:02.000000000 +0000
 +++ configure
-@@ -21590,46 +21590,21 @@ fi
+@@ -21634,46 +21634,21 @@ fi
  
  
  
--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.Big5"
--supported_wprefs_locales="bg ca cs de es et fi fr hr hu it ja ko pt ru sk zh_CN zh_TW.Big5"
+-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"
@@ -59,7 +59,7 @@ $NetBSD: patch-ab,v 1.12 2004/11/05 11:51:35 adam Exp $
  
  case $host_os in
  	freebsd*)
-@@ -26015,8 +25990,8 @@ _ACEOF
+@@ -26060,8 +26035,8 @@ _ACEOF
      fi
  fi
  
@@ -70,3 +70,12 @@ $NetBSD: patch-ab,v 1.12 2004/11/05 11:51:35 adam Exp $
  
  
  
+@@ -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#"
+ 
diff --git a/wm/windowmaker/patches/patch-ac b/wm/windowmaker/patches/patch-ac
index 1c432f2f229..4e55f5db068 100644
--- a/wm/windowmaker/patches/patch-ac
+++ b/wm/windowmaker/patches/patch-ac
@@ -1,8 +1,8 @@
-$NetBSD: patch-ac,v 1.6 2004/11/05 11:51:35 adam Exp $
+$NetBSD: patch-ac,v 1.7 2005/07/08 09:47:02 adam Exp $
 
---- wrlib/Makefile.in.orig	2004-10-26 04:10:46.000000000 +0000
+--- wrlib/Makefile.in.orig	2005-06-19 03:23:01.000000000 +0000
 +++ wrlib/Makefile.in
-@@ -115,7 +115,7 @@ AUTOMAKE_OPTIONS = no-dependencies
+@@ -118,7 +118,7 @@ AUTOMAKE_OPTIONS = no-dependencies
  
  lib_LTLIBRARIES = libwraster.la
  
diff --git a/wm/windowmaker/patches/patch-ae b/wm/windowmaker/patches/patch-ae
index 49e226b249c..744f5709dd8 100644
--- a/wm/windowmaker/patches/patch-ae
+++ b/wm/windowmaker/patches/patch-ae
@@ -1,8 +1,8 @@
-$NetBSD: patch-ae,v 1.5 2004/11/05 11:51:35 adam Exp $
+$NetBSD: patch-ae,v 1.6 2005/07/08 09:47:02 adam Exp $
 
---- doc/sk/Makefile.in.orig	2004-10-24 23:05:06.000000000 -0400
-+++ doc/sk/Makefile.in	2004-10-24 23:05:39.000000000 -0400
-@@ -112,7 +112,7 @@
+--- doc/sk/Makefile.in.orig	2005-06-19 03:23:01.000000000 +0000
++++ doc/sk/Makefile.in
+@@ -113,7 +113,7 @@ wprefs_datadir = @wprefs_datadir@
  
  mandir = @mandir@/sk
  
diff --git a/wm/windowmaker/patches/patch-af b/wm/windowmaker/patches/patch-af
index ec4362423eb..ea370a9f33e 100644
--- a/wm/windowmaker/patches/patch-af
+++ b/wm/windowmaker/patches/patch-af
@@ -1,10 +1,10 @@
-$NetBSD: patch-af,v 1.4 2004/11/05 11:51:35 adam Exp $
+$NetBSD: patch-af,v 1.5 2005/07/08 09:47:02 adam Exp $
 
---- WindowMaker/Defaults/Makefile.in.orig	2004-10-26 14:10:46.000000000 +1000
-+++ WindowMaker/Defaults/Makefile.in	2004-10-27 18:25:53.000000000 +1000
-@@ -111,7 +111,7 @@
- supported_locales = @supported_locales@
- wprefsdir = @wprefsdir@
+--- WindowMaker/Defaults/Makefile.in.orig	2005-06-19 03:23:01.000000000 +0000
++++ WindowMaker/Defaults/Makefile.in
+@@ -112,7 +112,7 @@ supported_locales = @supported_locales@
+ wprefs_bindir = @wprefs_bindir@
+ wprefs_datadir = @wprefs_datadir@
  
 -defsdatadir = $(sysconfdir)/WindowMaker
 +defsdatadir = $(datadir)/examples/WindowMaker
diff --git a/wm/windowmaker/patches/patch-ag b/wm/windowmaker/patches/patch-ag
deleted file mode 100644
index 61cd0ba43c1..00000000000
--- a/wm/windowmaker/patches/patch-ag
+++ /dev/null
@@ -1,39 +0,0 @@
-$NetBSD: patch-ag,v 1.4 2005/01/04 14:29:19 sekiya Exp $
-
---- src/wmspec.c.orig	2004-10-25 04:36:15.000000000 +0900
-+++ src/wmspec.c	2005-01-04 23:18:46.000000000 +0900
-@@ -382,18 +382,19 @@
-                                 &nitems_return, &bytes_after_return, &prop_return);
- 
-     if (rc==Success && prop_return) {
--        unsigned int *data = (unsigned int *)prop_return;
--        unsigned int pos = 0, len = 0;
--        unsigned int best_pos = 0, best_tmp = ~0;
-+        unsigned long *data = (unsigned int *)prop_return;
-+        unsigned long pos = 0, len = 0;
-+        unsigned long best_pos = 0, best_tmp = ~0;
-         extern WPreferences wPreferences;
--        unsigned int pref_size = wPreferences.icon_size;
--        unsigned int pref_sq = pref_size*pref_size;
-+        unsigned long pref_size = wPreferences.icon_size;
-+        unsigned long pref_sq = pref_size*pref_size;
-         char *src, *dst;
-         RImage *new_rimage;
- 
-         do {
-+            unsigned long tmp;
-             len = data[pos+0]*data[pos+1];
--            unsigned int tmp = pref_sq-len;
-+            tmp = pref_sq-len;
-             if (tmp < best_tmp && tmp > 0) {
-                 best_tmp = tmp;
-                 best_pos = pos;
-@@ -405,7 +406,7 @@
-         len = data[best_pos+0] * data[best_pos+1];
-         src = (char*)&data[best_pos+2];
-         dst = new_rimage->data;
--        for (pos=0; pos<len; ++pos, src+=4, dst+=4) {
-+        for (pos=0; pos<len; ++pos, src+=sizeof(long), dst+=4) {
-             dst[0] = src[2]; /* R */
-             dst[1] = src[1]; /* G */
-             dst[2] = src[0]; /* B */
diff --git a/wm/windowmaker/patches/patch-ai b/wm/windowmaker/patches/patch-ai
index 560b1ce72f9..9bc0f4c4f58 100644
--- a/wm/windowmaker/patches/patch-ai
+++ b/wm/windowmaker/patches/patch-ai
@@ -1,9 +1,10 @@
-$NetBSD: patch-ai,v 1.1 2004/11/15 11:02:51 sketch Exp $
+$NetBSD: patch-ai,v 1.2 2005/07/08 09:47:02 adam Exp $
 
---- WINGs/dragsource.c.orig	2004-11-15 10:24:38.140204000 +0000
-+++ WINGs/dragsource.c	2004-11-15 10:31:35.798026000 +0000
-@@ -1,5 +1,7 @@
- #include "../src/config.h"
+--- WINGs/dragsource.c.orig	2004-10-28 09:29:59.000000000 +0000
++++ WINGs/dragsource.c
+@@ -3,6 +3,8 @@
+ #include "wconfig.h"
+ #include "WINGsP.h"
  
 +#include <X11/Xlib.h>
 +#include <X11/Xutil.h>
diff --git a/wm/windowmaker/patches/patch-aj b/wm/windowmaker/patches/patch-aj
index 03209a62624..687dfa3edd7 100644
--- a/wm/windowmaker/patches/patch-aj
+++ b/wm/windowmaker/patches/patch-aj
@@ -1,9 +1,9 @@
-$NetBSD: patch-aj,v 1.1 2004/11/15 11:02:51 sketch Exp $
+$NetBSD: patch-aj,v 1.2 2005/07/08 09:47:02 adam Exp $
 
---- src/switchpanel.c.orig	2004-11-15 10:44:36.799472000 +0000
-+++ src/switchpanel.c	2004-11-15 10:44:59.875415000 +0000
-@@ -26,6 +26,8 @@
- #include <sys/time.h>
+--- src/switchpanel.c.orig	2004-10-30 07:16:04.000000000 +0000
++++ src/switchpanel.c
+@@ -36,6 +36,8 @@
+ #include "xinerama.h"
  
  #ifdef SHAPE
 +#include <X11/Xlib.h>
diff --git a/wm/windowmaker/patches/patch-ak b/wm/windowmaker/patches/patch-ak
deleted file mode 100644
index f9119ec268b..00000000000
--- a/wm/windowmaker/patches/patch-ak
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ak,v 1.1 2004/11/25 13:13:14 adam Exp $
-
---- configure.orig	2004-11-25 13:31:40.000000000 +0000
-+++ configure
-@@ -27609,7 +27609,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#"
-