Update wmx to latest stable release wmx-6. Changes from version 5 include:

	* multihead support due to Sven Oliver `SvOlli' Moll
	* shaped window support and window grouping due to Henri
	* some behavioural improvements
	* a few bug fixes

This package obsoletes wm/wmx-current, so remove the latter.

2 files changed, 52 insertions, 54 deletions

diff --git a/wm/wmx/patches/patch-aa b/wm/wmx/patches/patch-aa
index 33aac4a275f..c60ab11c999 100644
--- a/wm/wmx/patches/patch-aa
+++ b/wm/wmx/patches/patch-aa
@@ -1,19 +1,44 @@
-$NetBSD: patch-aa,v 1.1.1.1 2000/12/12 02:03:49 wiz Exp $
+$NetBSD: patch-aa,v 1.2 2001/07/27 20:40:00 jlam Exp $
 
---- Makefile.orig	Wed Jan 13 05:28:43 1999
-+++ Makefile	Sat Jul 22 02:41:55 2000
-@@ -5,12 +5,12 @@
- # If you're not using background pixmaps, remove -lXpm from the LIBS.
- # If your X libraries are somewhere other than /usr/X11/lib, give their
- # location here.
--LIBS	= -L/usr/X11/lib -lXpm -lXext -lX11 -lXmu -lSM -lICE -lm
-+LIBS	= ${LDFLAGS} -lXpm -lXext -lX11 -lXmu -lSM -lICE -lm
+--- Config.h.orig	Wed May 24 11:48:59 2000
++++ Config.h
+@@ -75,8 +75,8 @@
  
- # If your X includes are not in /usr/include/X11, add their location
- # as a -I option here (excluding the X11 bit).  If you're using I18N
- # and Xlocale, please add -DX_LOCALE.
--CFLAGS = -g -O2 -I/usr/include -I/usr/openwin/include
-+CFLAGS = -g -O2 -I${X11BASE}/include -I${XPMDIR}/include
+ // What to run to get a new window (from the "New" menu option)
+ #define CONFIG_NEW_WINDOW_LABEL "New"
+-//#define CONFIG_NEW_WINDOW_COMMAND "xterm"
+-#define CONFIG_NEW_WINDOW_COMMAND "/home/chris/.wmx/terminal"
++#define CONFIG_NEW_WINDOW_COMMAND "xterm"
++//#define CONFIG_NEW_WINDOW_COMMAND "/home/chris/.wmx/terminal"
+ #define CONFIG_NEW_WINDOW_COMMAND_OPTIONS 0
+ // or, for example,
+ //#define CONFIG_NEW_WINDOW_COMMAND_OPTIONS "-ls","-sb","-sl","1024",0
+@@ -91,7 +91,7 @@
+ // middle-button menu
+ #define CONFIG_COMMAND_MENU       ".wmx"
+ // only used if COMMAND_MENU is not found; ignored if invalid directory:
+-#define CONFIG_SYSTEM_COMMAND_MENU	"/usr/local/lib/wmx/menu"
++#define CONFIG_SYSTEM_COMMAND_MENU	PREFIX "/etc/wmx/menu"
+ // append screennumber to COMMAND_MENU directory;
+ // use non screen style as fallback
+ #define CONFIG_ADD_SCREEN_TO_COMMAND_MENU False
+@@ -373,7 +373,9 @@
+ // that you are not currently on, some strange things happen.
+ // (Patch due to Henri Naccache <henri@asu.edu>)
  
- OBJECTS	= Border.o Buttons.o Channel.o Client.o Config.o Events.o Main.o Manager.o Menu.o Rotated.o Session.o
++#ifndef CONFIG_GNOME_COMPLIANCE
+ #define CONFIG_GNOME_COMPLIANCE   False
++#endif
+ 
+ // This lets you choose whether to keep the regular wmx
+ // mouse button behaviour, or go w/ the GNOME-described one.
+@@ -383,7 +385,9 @@
+ // command menu, and the middle mouse button (button2)
+ // acts like the left mouse normally does (list of windows)
+ 
++#ifndef CONFIG_GNOME_BUTTON_COMPLIANCE
+ #define CONFIG_GNOME_BUTTON_COMPLIANCE   False
++#endif
+ 
+ #endif
  
diff --git a/wm/wmx/patches/patch-ab b/wm/wmx/patches/patch-ab
index d2bba637d71..c25c9fc30c4 100644
--- a/wm/wmx/patches/patch-ab
+++ b/wm/wmx/patches/patch-ab
@@ -1,40 +1,13 @@
-$NetBSD: patch-ab,v 1.1.1.1 2000/12/12 02:03:49 wiz Exp $
-
-This patch was culled from the wmx mailing list,
-
-http://ml.42.org/wmx/msg00200.html
-
-
---- Border.C.orig	Wed Jan 13 04:28:43 1999
-+++ Border.C	Fri Sep  1 12:53:46 2000
-@@ -23,8 +23,6 @@
- unsigned long Border::m_borderPixel;
- Pixmap Border::m_backgroundPixmap = None;
- 
--static int borderCounter = 0;
--
- 
- class BorderRectangle // must resemble XRectangle in storage
- {
-@@ -70,7 +68,6 @@
- {
-     m_parent = root();
-     if (m_tabFont == 0) initialiseStatics(c->windowManager());
--    ++borderCounter;
- 
- //#if CONFIG_MAD_FEEDBACK != 0
-     m_feedback = 0;
-@@ -94,13 +91,6 @@
-     }
- 
-     if (m_label) free(m_label);
--
--    if (--borderCounter == 0) {
--	XFreeGC(display(), m_drawGC);
--	if (m_backgroundPixmap != None) {
--	    XFreePixmap(display(), m_backgroundPixmap);
--	}
--    }
- }
- 
+$NetBSD: patch-ab,v 1.2 2001/07/27 20:40:00 jlam Exp $
+
+--- Makefile.in.orig	Tue Aug 31 19:53:08 1999
++++ Makefile.in
+@@ -15,7 +15,7 @@
+ # as a -I option here (excluding the X11 bit).  If you're using I18N
+ # and Xlocale, please add -DX_LOCALE.
+ #CFLAGS = -g -O2 -I/usr/include -I/usr/openwin/include
+-CXXFLAGS=@CXXFLAGS@
++CXXFLAGS=@CXXFLAGS@ -DPREFIX=\"${PREFIX}\"
+ 
+ OBJECTS	= Border.o Buttons.o Channel.o Client.o Config.o Events.o Main.o Manager.o Menu.o Rotated.o Session.o