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.

7 files changed, 92 insertions, 93 deletions

diff --git a/wm/wmx/Makefile b/wm/wmx/Makefile
index 040d3b3df4a..1dc480c78e2 100644
--- a/wm/wmx/Makefile
+++ b/wm/wmx/Makefile
@@ -1,32 +1,9 @@
-# $NetBSD: Makefile,v 1.3 2001/02/25 04:18:21 hubertf Exp $
+# $NetBSD: Makefile,v 1.4 2001/07/27 20:39:59 jlam Exp $
 
-DISTNAME=	wmx-5
-PKGNAME=	wmx-5.0
-CATEGORIES=	x11 wm
-MASTER_SITES=	http://www.all-day-breakfast.com/wmx/
-
-MAINTAINER=	kuebart@mathematik.uni-ulm.de
-HOMEPAGE=	http://www.all-day-breakfast.com/wmx/
+PKGNAME=	wmx-${WMX_VERS}
 COMMENT=	another X11 window manager based on wm2
 
-USE_X11BASE=	YES
-USE_XPM=	YES
-EVAL_PREFIX=	XPMDIR=xpm
-
-MAKE_ENV+=	XPMDIR=${XPMDIR}
-
-do-configure:
-	cd ${WRKSRC}; \
-	  ${MV} Config.h Config.h.dist; \
-	  ${SED} '/SYSTEM_COMMAND_MENU/s|/usr/local/lib/wmx/menu|${PREFIX}/etc/wmx|' \
-	    < Config.h.dist > Config.h; \
-	  ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} ${MAKE_FLAGS} depend
-
-do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/wmx ${PREFIX}/bin
-	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/wmx
-	${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/wmx
-	${INSTALL_DATA} ${WRKSRC}/README.contrib ${PREFIX}/share/doc/wmx
-	${INSTALL_DATA_DIR} ${PREFIX}/etc/wmx
+USE_BUILDLINK_ONLY=	# defined
 
+.include "../../wm/wmx/Makefile.common"
 .include "../../mk/bsd.pkg.mk"
diff --git a/wm/wmx/Makefile.common b/wm/wmx/Makefile.common
new file mode 100644
index 00000000000..6a93bafdd35
--- /dev/null
+++ b/wm/wmx/Makefile.common
@@ -0,0 +1,28 @@
+# $NetBSD: Makefile.common,v 1.1 2001/07/27 20:40:00 jlam Exp $
+
+DISTNAME=	wmx-6
+WMX_VERS=	6.0
+CATEGORIES+=	x11 wm
+MASTER_SITES=	http://www.all-day-breakfast.com/wmx/
+
+MAINTAINER=	jlam@netbsd.org
+HOMEPAGE=	http://www.all-day-breakfast.com/wmx/
+
+CONFLICTS+=	wmx-[0-9]* wmx-gnome-[0-9]*
+
+USE_X11BASE=	# defined
+GNU_CONFIGURE=	# defined
+ALL_TARGET=	depend all
+
+DISTINFO_FILE=	${.CURDIR}/../../wm/wmx/distinfo
+PATCHDIR=	${.CURDIR}/../../wm/wmx/patches
+PLIST_SRC=	${.CURDIR}/../../wm/wmx/pkg/PLIST
+
+do-install:
+	${INSTALL_PROGRAM} ${WRKSRC}/wmx ${PREFIX}/bin
+	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/wmx
+	${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/wmx
+	${INSTALL_DATA} ${WRKSRC}/README.contrib ${PREFIX}/share/doc/wmx
+	${INSTALL_DATA_DIR} ${PREFIX}/etc/wmx
+
+.include "../../graphics/xpm/buildlink.mk"
diff --git a/wm/wmx/distinfo b/wm/wmx/distinfo
index d8618eb5a9d..1b9151954e7 100644
--- a/wm/wmx/distinfo
+++ b/wm/wmx/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.2 2001/04/17 16:03:50 agc Exp $
+$NetBSD: distinfo,v 1.3 2001/07/27 20:40:00 jlam Exp $
 
-SHA1 (wmx-5.tar.gz) = 4ed23cc9e07c65e0034da4a8a25c3016360a5971
-Size (wmx-5.tar.gz) = 60184 bytes
-SHA1 (patch-aa) = 1985cba1ccb8d24c05ccdc9cadfc04335d241b91
-SHA1 (patch-ab) = df34a077fdbad3e4459cf8957d0f558d06a8ef73
+SHA1 (wmx-6.tar.gz) = 89563c8c2af1d3ffbee06197928123fd03ae9c54
+Size (wmx-6.tar.gz) = 86515 bytes
+SHA1 (patch-aa) = 6314e4d3b9b92c169d16b1db339782f8f773995c
+SHA1 (patch-ab) = 2f210b6965248be688a640472fb018d62e5197d0
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
  
diff --git a/wm/wmx/pkg/DESCR b/wm/wmx/pkg/DESCR
index e653ceca574..50b4167e8d6 100644
--- a/wm/wmx/pkg/DESCR
+++ b/wm/wmx/pkg/DESCR
@@ -1,7 +1,3 @@
-
-wmx -- another window manager
-=============================
-
 wmx is another window manager for X.  It is based on wm2 and provides
 a similarly unusual style of window decoration; but in place of wm2's
 minimal functionality, it offers many of the features of more
diff --git a/wm/wmx/pkg/PLIST b/wm/wmx/pkg/PLIST
index a131576db9a..a569277d4bd 100644
--- a/wm/wmx/pkg/PLIST
+++ b/wm/wmx/pkg/PLIST
@@ -1,7 +1,7 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2000/12/12 02:03:49 wiz Exp $
+@comment $NetBSD: PLIST,v 1.2 2001/07/27 20:40:00 jlam Exp $
 bin/wmx
 share/doc/wmx/README
 share/doc/wmx/README.contrib
-@exec mkdir -p %D/etc/wmx
-@unexec (rmdir %D/etc/wmx && echo "Removed empty directory %D/etc/wmx") || true
 @dirrm share/doc/wmx
+@exec	mkdir -p %D/etc/wmx
+@unexec	rmdir -p %D/etc/wmx 2>/dev/null || true