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).

2 files changed, 28 insertions, 36 deletions

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