Import wmx-6.0pre6 as wmx-current with PKGNAME wmx-5.0.6.

Changes from version 5.0 include bugfixes, shaped window
support, and partial GNOME compliance (compile-time option).

9 files changed, 119 insertions, 0 deletions

diff --git a/wm/wmx-current/Makefile b/wm/wmx-current/Makefile
new file mode 100644
index 00000000000..753673237cf
--- /dev/null
+++ b/wm/wmx-current/Makefile
@@ -0,0 +1,5 @@
+# $NetBSD: Makefile,v 1.1.1.1 2001/01/18 20:17:11 jlam Exp $
+
+PKGNAME=	wmx-${WMX_VERS}
+
+.include "../../wm/wmx-current/Makefile.common"
diff --git a/wm/wmx-current/Makefile.common b/wm/wmx-current/Makefile.common
new file mode 100644
index 00000000000..4703bcd314b
--- /dev/null
+++ b/wm/wmx-current/Makefile.common
@@ -0,0 +1,36 @@
+# $NetBSD: Makefile.common,v 1.1.1.1 2001/01/18 20:17:11 jlam Exp $
+
+DISTNAME=	wmx-6pre6
+WMX_VERS=	5.0.6
+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/
+
+CONFLICTS+=	wmx-*
+
+USE_X11BASE=	# defined
+USE_XPM=	# defined
+EVAL_PREFIX=	XPMDIR=xpm
+
+GNU_CONFIGURE=	# defined
+CONFIGURE_ENV+=	CPPFLAGS="${CPPFLAGS}"
+CONFIGURE_ENV+=	CXXFLAGS="${CXXFLAGS}"
+CPPFLAGS+=	-I${XPMDIR}/include
+CXXFLAGS+=	-I${XPMDIR}/include
+
+ALL_TARGET=	depend all
+
+FILESDIR=	${.CURDIR}/../../wm/wmx-current/files
+PATCHDIR=	${.CURDIR}/../../wm/wmx-current/patches
+PLIST_SRC=	${.CURDIR}/../../wm/wmx-current/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 "../../mk/bsd.pkg.mk"
diff --git a/wm/wmx-current/files/md5 b/wm/wmx-current/files/md5
new file mode 100644
index 00000000000..78771b4343b
--- /dev/null
+++ b/wm/wmx-current/files/md5
@@ -0,0 +1,3 @@
+$NetBSD: md5,v 1.1.1.1 2001/01/18 20:17:11 jlam Exp $
+
+MD5 (wmx-6pre6.tar.gz) = bd84d6e421117ea4194551031389e26a
diff --git a/wm/wmx-current/files/patch-sum b/wm/wmx-current/files/patch-sum
new file mode 100644
index 00000000000..3cfaada444f
--- /dev/null
+++ b/wm/wmx-current/files/patch-sum
@@ -0,0 +1,4 @@
+$NetBSD: patch-sum,v 1.1.1.1 2001/01/18 20:17:11 jlam Exp $
+
+MD5 (patch-aa) = bb9aca9dee37499b3eca2c1fc10d2c8b
+MD5 (patch-ab) = b9868c457808edc7058ec304318198cb
diff --git a/wm/wmx-current/patches/patch-aa b/wm/wmx-current/patches/patch-aa
new file mode 100644
index 00000000000..325b962f2af
--- /dev/null
+++ b/wm/wmx-current/patches/patch-aa
@@ -0,0 +1,44 @@
+$NetBSD: patch-aa,v 1.1.1.1 2001/01/18 20:17:11 jlam Exp $
+
+--- Config.h.orig	Wed May 24 11:48:59 2000
++++ Config.h
+@@ -75,8 +75,8 @@
+ 
+ // 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>)
+ 
++#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-current/patches/patch-ab b/wm/wmx-current/patches/patch-ab
new file mode 100644
index 00000000000..b16d1ef98fc
--- /dev/null
+++ b/wm/wmx-current/patches/patch-ab
@@ -0,0 +1,13 @@
+$NetBSD: patch-ab,v 1.1.1.1 2001/01/18 20:17:11 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-current/pkg/COMMENT b/wm/wmx-current/pkg/COMMENT
new file mode 100644
index 00000000000..ca851528eed
--- /dev/null
+++ b/wm/wmx-current/pkg/COMMENT
@@ -0,0 +1 @@
+another X11 window manager based on wm2
diff --git a/wm/wmx-current/pkg/DESCR b/wm/wmx-current/pkg/DESCR
new file mode 100644
index 00000000000..50b4167e8d6
--- /dev/null
+++ b/wm/wmx-current/pkg/DESCR
@@ -0,0 +1,6 @@
+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
+conventional managers in the most simplistic implementations
+imaginable.  wmx is, however, still barely configurable except by
+editing the source and recompiling the code.
diff --git a/wm/wmx-current/pkg/PLIST b/wm/wmx-current/pkg/PLIST
new file mode 100644
index 00000000000..4b05689a18e
--- /dev/null
+++ b/wm/wmx-current/pkg/PLIST
@@ -0,0 +1,7 @@
+@comment $NetBSD: PLIST,v 1.1.1.1 2001/01/18 20:17:11 jlam Exp $
+bin/wmx
+share/doc/wmx/README
+share/doc/wmx/README.contrib
+@dirrm share/doc/wmx
+@exec	mkdir -p %D/etc/wmx
+@unexec	rmdir -p %D/etc/wmx 2>/dev/null || true