Update wmii to 20051031. Patches provided by Leonard Schmidt

(maintainer) in PR pkg/31961.

Changes:
- many actions were removed to only have those available that are
  absolutely necessary.
- ~/.wmii-3 is the new configuration directory.
- simplified the drawing routine and style stuff to allow only 1
  border colour (removed approximately 150 lines of code).
- changed wmibar and wmimenu to test some prototypical behavior for
  the upcoming 9P versions of those tools (removed about 150 lines of code).

6 files changed, 56 insertions, 110 deletions

diff --git a/wm/wmii/DESCR b/wm/wmii/DESCR
index 98e95b7db07..d048dae95da 100644
--- a/wm/wmii/DESCR
+++ b/wm/wmii/DESCR
@@ -4,7 +4,7 @@ conventional window management through layouts.
 
 wmii consists of components that are independent processes and
 communicate via a socket-based virtual filesystem which is oriented on
-the "everything is a file" paradigm of the plan9 operating system.
+the "everything is a file" paradigm of the Plan 9 operating system.
 
 The core distribution of wmii contains the window manager itself, a
 master file system routing utility (wmifs), a generic bar (wmibar), a
diff --git a/wm/wmii/Makefile b/wm/wmii/Makefile
index 9f059bf4d7b..673fe3f408d 100644
--- a/wm/wmii/Makefile
+++ b/wm/wmii/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.2 2005/10/29 16:12:37 minskim Exp $
+# $NetBSD: Makefile,v 1.3 2005/11/03 02:47:58 minskim Exp $
 #
 
-DISTNAME=	wmii-20051017
-PKGREVISION=	1
+DISTNAME=	wmii-20051031
 CATEGORIES=	wm x11
 MASTER_SITES=	http://wmii.de/snaps/
 
@@ -19,22 +18,14 @@ CFLAGS.SunOS+=		-D__EXTENSIONS__
 
 SUBST_CLASSES+=		vars
 SUBST_STAGE.vars=	post-patch
-SUBST_FILES.vars=	base/wmii util/wmirefcard action/* base/wmii.1
-SUBST_SED.vars=		-e 's|SHAREPREFIX|${PREFIX}/share|g'
-SUBST_SED.vars+=	-e 's|CONFPREFIX|${PREFIX}/share/examples|g'
+SUBST_FILES.vars=	cmd/wm/wmii rc/* cmd/wm/wmii.1
+SUBST_SED.vars=		-e 's|CONFPREFIX|${PREFIX}/share/examples|g'
 SUBST_SED.vars+=	-e 's|9PREFIX|${PREFIX}|g'
 
-PKG_SYSCONFSUBDIR=	wmii
-EGDIR=			${PREFIX}/share/examples/wmii
-EGFILES=		actions attach border clientupdate	\
-			close cnext cprev detach fnext fprev	\
-			fresize ftoggle	icons kbare kmove 	\
-			knorm kresize lfloat lgrid lmax lock	\
-			ltiled lvsplit max p pager pageupdate	\
-			plumbgoogle plumburl pnew pnext pprev 	\
-			premove presize programs ptoggle quit	\
-			scr status tab term wmirc wmire www	\
-			zoom
+PKG_SYSCONFSUBDIR=	wmii-3
+EGDIR=			${PREFIX}/share/examples/wmii-3
+EGFILES=		_clabel extern progmenu rcmenu status	\
+			wmirc _plabel kmode quit rmpg welcome
 .for f in ${EGFILES}
 CONF_FILES+=		${EGDIR}/${f} ${PKG_SYSCONFDIR}/${f}
 .endfor
diff --git a/wm/wmii/PLIST b/wm/wmii/PLIST
index 13dbfa0eaf6..64ba394452e 100644
--- a/wm/wmii/PLIST
+++ b/wm/wmii/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2005/10/23 20:39:03 minskim Exp $
+@comment $NetBSD: PLIST,v 1.2 2005/11/03 02:47:58 minskim Exp $
 bin/wmibar
 bin/wmifs
 bin/wmii
@@ -7,7 +7,6 @@ bin/wmikeys
 bin/wmimenu
 bin/wmiplumb
 bin/wmir
-bin/wmirefcard
 bin/wmiwarp
 man/man1/wmibar.1
 man/man1/wmifs.1
@@ -16,51 +15,15 @@ man/man1/wmiiwm.1
 man/man1/wmikeys.1
 man/man1/wmimenu.1
 man/man1/wmir.1
-share/examples/wmii/actions
-share/examples/wmii/attach
-share/examples/wmii/border
-share/examples/wmii/clientupdate
-share/examples/wmii/close
-share/examples/wmii/cnext
-share/examples/wmii/cprev
-share/examples/wmii/detach
-share/examples/wmii/fnext
-share/examples/wmii/fprev
-share/examples/wmii/fresize
-share/examples/wmii/ftoggle
-share/examples/wmii/icons
-share/examples/wmii/kbare
-share/examples/wmii/kmove
-share/examples/wmii/knorm
-share/examples/wmii/kresize
-share/examples/wmii/lfloat
-share/examples/wmii/lgrid
-share/examples/wmii/lmax
-share/examples/wmii/lock
-share/examples/wmii/ltiled
-share/examples/wmii/lvsplit
-share/examples/wmii/max
-share/examples/wmii/p
-share/examples/wmii/pager
-share/examples/wmii/pageupdate
-share/examples/wmii/plumbgoogle
-share/examples/wmii/plumburl
-share/examples/wmii/pnew
-share/examples/wmii/pnext
-share/examples/wmii/pprev
-share/examples/wmii/premove
-share/examples/wmii/presize
-share/examples/wmii/programs
-share/examples/wmii/ptoggle
-share/examples/wmii/quit
-share/examples/wmii/scr
-share/examples/wmii/status
-share/examples/wmii/tab
-share/examples/wmii/term
-share/examples/wmii/wmirc
-share/examples/wmii/wmire
-share/examples/wmii/www
-share/examples/wmii/zoom
-share/wmii/README
-@dirrm share/wmii
-@dirrm share/examples/wmii
+share/examples/wmii-3/_clabel
+share/examples/wmii-3/_plabel
+share/examples/wmii-3/extern
+share/examples/wmii-3/kmode
+share/examples/wmii-3/progmenu
+share/examples/wmii-3/quit
+share/examples/wmii-3/rcmenu
+share/examples/wmii-3/rmpg
+share/examples/wmii-3/status
+share/examples/wmii-3/welcome
+share/examples/wmii-3/wmirc
+@dirrm share/examples/wmii-3
diff --git a/wm/wmii/distinfo b/wm/wmii/distinfo
index bf7b491dde4..c7fe5c8cd60 100644
--- a/wm/wmii/distinfo
+++ b/wm/wmii/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.1.1.1 2005/10/23 20:39:03 minskim Exp $
+$NetBSD: distinfo,v 1.2 2005/11/03 02:47:58 minskim Exp $
 
-SHA1 (wmii-20051017.tar.gz) = 41b2b9f820fd247c25f123b76133648dc3df30b7
-RMD160 (wmii-20051017.tar.gz) = f7d63c4539b162201571558fc710b85becf7c95a
-Size (wmii-20051017.tar.gz) = 79781 bytes
-SHA1 (patch-aa) = 6b3e66a305590e3a86020e5002f56dae81dd3b76
-SHA1 (patch-ab) = 196581727542a6e22578a680213f164736a84eb2
+SHA1 (wmii-20051031.tar.gz) = 3e0f92570c1beb74c461376e55539f958f0eb645
+RMD160 (wmii-20051031.tar.gz) = 64e551b5d2ec72e2492483f727ad219bd194f496
+Size (wmii-20051031.tar.gz) = 82697 bytes
+SHA1 (patch-aa) = a024289b26285d7f02aab95684ee51897d92747b
+SHA1 (patch-ab) = f4623665d6fcd61a52777d7455cbe35218c1bf0c
diff --git a/wm/wmii/patches/patch-aa b/wm/wmii/patches/patch-aa
index ca757b909ed..1c7af46091a 100644
--- a/wm/wmii/patches/patch-aa
+++ b/wm/wmii/patches/patch-aa
@@ -1,19 +1,18 @@
-$NetBSD: patch-aa,v 1.1.1.1 2005/10/23 20:39:03 minskim Exp $
+$NetBSD: patch-aa,v 1.2 2005/11/03 02:47:58 minskim Exp $
 
---- config.mk.orig	2005-10-17 14:17:01.000000000 +0000
+--- config.mk.orig	2005-10-31 12:34:04.000000000 +0000
 +++ config.mk
-@@ -1,16 +1,16 @@
+@@ -1,15 +1,15 @@
  # Customize to fit your system
  
  # paths
 -PREFIX      = /usr/local
 -CONFPREFIX  = ${PREFIX}/etc
 -MANPREFIX   = ${PREFIX}/share/man
+-9PREFIX     = ${PREFIX}/9
 +#PREFIX      = /usr/local
 +CONFPREFIX  = ${PREFIX}/share/examples
-+MANPREFIX   = ${PREFIX}/man
- SHAREPREFIX = ${PREFIX}/share
--9PREFIX     = ${PREFIX}/9
++MANPREFIX   = ${PREFIX}/${PKGMANDIR}
 +9PREFIX     = ${PREFIX}
  
  INCDIR      = ${PREFIX}/include
@@ -25,8 +24,8 @@ $NetBSD: patch-aa,v 1.1.1.1 2005/10/23 20:39:03 minskim Exp $
  
  # includes and libs
  INCLUDES    = -I. -I${INCDIR} -I/usr/include -I${X11INC}
-@@ -18,14 +18,14 @@ LIBS        = -L${LIBDIR} -L/usr/lib -lc
- VERSION     = 20051017
+@@ -17,14 +17,14 @@ LIBS        = -L${LIBDIR} -L/usr/lib -lc
+ VERSION     = 20051031
  
  # flags
 -CFLAGS      = -O0 -g -Wall ${INCLUDES} -DVERSION=\"${VERSION}\"
@@ -36,7 +35,8 @@ $NetBSD: patch-aa,v 1.1.1.1 2005/10/23 20:39:03 minskim Exp $
  
  # compiler
  # Note: - under Solaris add -D__EXTENSIONS__ to CFLAGS
- MAKE		= make
+-MAKE		= make
++#MAKE		= make
  AR          = ar cr
 -CC          = cc
 +#CC          = cc
diff --git a/wm/wmii/patches/patch-ab b/wm/wmii/patches/patch-ab
index 9a443425e48..732b72ba22f 100644
--- a/wm/wmii/patches/patch-ab
+++ b/wm/wmii/patches/patch-ab
@@ -1,49 +1,41 @@
-$NetBSD: patch-ab,v 1.1.1.1 2005/10/23 20:39:03 minskim Exp $
+$NetBSD: patch-ab,v 1.2 2005/11/03 02:47:58 minskim Exp $
 
---- Makefile.orig	2005-10-17 14:17:01.000000000 +0000
+--- Makefile.orig	2005-10-29 23:41:59.000000000 +0000
 +++ Makefile
-@@ -5,9 +5,9 @@ include config.mk
+@@ -5,7 +5,7 @@ include config.mk
  
- SUBDIRS     = libcext liblitz libixp libixp2 libwmii base util
+ SUBDIRS     = libcext liblitz libixp libixp2 libwmii cmd
  
--BIN         = base/wmii base/wmiiwm util/wmibar util/wmifs \
-+BIN         = base/wmiiwm util/wmibar util/wmifs \
-               util/wmikeys util/wmimenu util/wmiplumb util/wmir \
--              util/wmirefcard util/wmiwarp
-+              util/wmiwarp
+-BIN         = cmd/wm/wmii cmd/wm/wmiiwm cmd/wmibar cmd/wmifs \
++BIN         = cmd/wm/wmiiwm cmd/wmibar cmd/wmifs \
+               cmd/wmikeys cmd/wmimenu cmd/wmiplumb cmd/wmir cmd/wmiwarp
  
- MAN1        = base/wmii.1 base/wmiiwm.1 util/wmibar.1 util/wmifs.1 \
-               util/wmikeys.1 util/wmimenu.1 util/wmir.1
-@@ -47,28 +47,17 @@ clean:
+ MAN1        = cmd/wm/wmii.1 cmd/wm/wmiiwm.1 cmd/wmibar.1 cmd/wmifs.1 \
+@@ -46,25 +46,15 @@ clean:
  
  install: all
  	@echo Installing executable files to ${DESTDIR}${PREFIX}/bin
 -	@mkdir -p ${DESTDIR}${PREFIX}/bin
 -	@cp -f ${BIN} ${DESTDIR}${PREFIX}/bin
--	@sed 's|SHAREPREFIX|${SHAREPREFIX}|; s|CONFPREFIX|${CONFPREFIX}|; s|9PREFIX|${9PREFIX}|' <base/wmii >${DESTDIR}${PREFIX}/bin/wmii
--	@sed 's|9PREFIX|${9PREFIX}|' <util/wmirefcard >${DESTDIR}${PREFIX}/bin/wmirefcard
+-	@sed 's|CONFPREFIX|${CONFPREFIX}|; s|9PREFIX|${9PREFIX}|' <cmd/wm/wmii >${DESTDIR}${PREFIX}/bin/wmii
 -	@for i in ${BIN}; do \
 -		chmod 755 ${DESTDIR}${PREFIX}/bin/`basename $$i`; \
 -	done
 +	@${BSD_INSTALL_PROGRAM_DIR} ${DESTDIR}${PREFIX}/bin
 +	@${BSD_INSTALL_PROGRAM} ${BIN} ${DESTDIR}${PREFIX}/bin
-+	@${BSD_INSTALL_SCRIPT} util/wmirefcard base/wmii ${DESTDIR}${PREFIX}/bin
- 	@echo Installing actions to ${DESTDIR}${CONFPREFIX}/wmii
--	@mkdir -p ${DESTDIR}${CONFPREFIX}/wmii
--	@cd action; for i in *; do \
--		sed 's|9PREFIX|${9PREFIX}|' <$$i >${DESTDIR}${CONFPREFIX}/wmii/$$i; \
--		chmod 755 ${DESTDIR}${CONFPREFIX}/wmii/$$i; \
++	@${BSD_INSTALL_SCRIPT} cmd/wm/wmii ${DESTDIR}${PREFIX}/bin
+ 	@echo Installing rc scripts to ${DESTDIR}${CONFPREFIX}/wmii-3
+-	@mkdir -p ${DESTDIR}${CONFPREFIX}/wmii-3
+-	@cd rc; for i in *; do \
+-		sed 's|9PREFIX|${9PREFIX}|' <$$i >${DESTDIR}${CONFPREFIX}/wmii-3/$$i; \
+-		chmod 755 ${DESTDIR}${CONFPREFIX}/wmii-3/$$i; \
 -	done
--	@mkdir -p ${DESTDIR}${SHAREPREFIX}/wmii
--	@cp -f README ${DESTDIR}${SHAREPREFIX}/wmii
-+	@${BSD_INSTALL_DATA_DIR} ${DESTDIR}${CONFPREFIX}/wmii
-+	@${BSD_INSTALL_SCRIPT} action/* ${DESTDIR}${CONFPREFIX}/wmii
-+	@${BSD_INSTALL_DATA_DIR} ${DESTDIR}${SHAREPREFIX}/wmii
-+	@${BSD_INSTALL_DATA} README ${DESTDIR}${SHAREPREFIX}/wmii
++	@${BSD_INSTALL_SCRIPT_DIR} ${DESTDIR}${CONFPREFIX}/wmii-3
++	@${BSD_INSTALL_SCRIPT} rc/* ${DESTDIR}${CONFPREFIX}/wmii-3
  	@echo Installing manual pages to ${DESTDIR}${MANPREFIX}/man1
 -	@mkdir -p ${DESTDIR}${MANPREFIX}/man1
 -	@cp -f ${MAN1} ${DESTDIR}${MANPREFIX}/man1
--	@sed 's|CONFPREFIX|${CONFPREFIX}|' <base/wmii.1 >${DESTDIR}${MANPREFIX}/man1/wmii.1
+-	@sed 's|CONFPREFIX|${CONFPREFIX}|' <cmd/wm/wmii.1 >${DESTDIR}${MANPREFIX}/man1/wmii.1
 -	@for i in ${MAN1}; do \
 -		chmod 444 ${DESTDIR}${MANPREFIX}/man1/`basename $$i`; \
 -	done