Updated to 20051114. Patch provided by Leonard Schmidt in PR 32096.

Changes:
- removed some more actions.
- the new wmibar layout has been improved.

5 files changed, 51 insertions, 59 deletions

diff --git a/wm/wmii/Makefile b/wm/wmii/Makefile
index 0f3b6304cf2..8da5f593543 100644
--- a/wm/wmii/Makefile
+++ b/wm/wmii/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.4 2005/12/05 20:51:10 rillig Exp $
+# $NetBSD: Makefile,v 1.5 2005/12/06 18:55:32 rillig Exp $
 #
 
-DISTNAME=	wmii-20051031
+DISTNAME=	wmii-20051114
 CATEGORIES=	wm x11
 MASTER_SITES=	http://wmii.de/snaps/
 
@@ -24,8 +24,7 @@ SUBST_SED.vars+=	-e 's|9PREFIX|${PREFIX}|g'
 
 PKG_SYSCONFSUBDIR=	wmii-3
 EGDIR=			${PREFIX}/share/examples/wmii-3
-EGFILES=		_clabel extern progmenu rcmenu status	\
-			wmirc _plabel kmode quit rmpg welcome
+EGFILES=		extern kmode quit status welcome wmirc
 .for f in ${EGFILES}
 CONF_FILES+=		${EGDIR}/${f} ${PKG_SYSCONFDIR}/${f}
 .endfor
diff --git a/wm/wmii/PLIST b/wm/wmii/PLIST
index 64ba394452e..47476bda636 100644
--- a/wm/wmii/PLIST
+++ b/wm/wmii/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2005/11/03 02:47:58 minskim Exp $
+@comment $NetBSD: PLIST,v 1.3 2005/12/06 18:55:32 rillig Exp $
 bin/wmibar
 bin/wmifs
 bin/wmii
@@ -15,14 +15,9 @@ man/man1/wmiiwm.1
 man/man1/wmikeys.1
 man/man1/wmimenu.1
 man/man1/wmir.1
-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
diff --git a/wm/wmii/distinfo b/wm/wmii/distinfo
index c7fe5c8cd60..62de90ffa03 100644
--- a/wm/wmii/distinfo
+++ b/wm/wmii/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.2 2005/11/03 02:47:58 minskim Exp $
+$NetBSD: distinfo,v 1.3 2005/12/06 18:55:32 rillig Exp $
 
-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
+SHA1 (wmii-20051114.tar.gz) = 15c3020f900726f5017b364d277ade399e096faa
+RMD160 (wmii-20051114.tar.gz) = caf1e5f52e51e1381911c993b8b14b9ede02cfb1
+Size (wmii-20051114.tar.gz) = 84336 bytes
+SHA1 (patch-aa) = 18f4d4cb3cbfdf7ab4811478337bc32b0296d1db
+SHA1 (patch-ab) = af9761bf50e07c9c3c95eac8bee06b43b56372d3
diff --git a/wm/wmii/patches/patch-aa b/wm/wmii/patches/patch-aa
index 1c7af46091a..cc3bea02937 100644
--- a/wm/wmii/patches/patch-aa
+++ b/wm/wmii/patches/patch-aa
@@ -1,45 +1,43 @@
-$NetBSD: patch-aa,v 1.2 2005/11/03 02:47:58 minskim Exp $
+$NetBSD: patch-aa,v 1.3 2005/12/06 18:55:32 rillig Exp $
 
---- config.mk.orig	2005-10-31 12:34:04.000000000 +0000
+--- config.mk.orig	2005-11-14 10:28:57.000000000 +0000
 +++ config.mk
 @@ -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}/${PKGMANDIR}
-+9PREFIX     = ${PREFIX}
+-PREFIX = /usr/local
+-CONFPREFIX = ${PREFIX}/etc
+-MANPREFIX = ${PREFIX}/share/man
+-9PREFIX = ${PREFIX}/9
++#PREFIX = /usr/local
++CONFPREFIX = ${PREFIX}/share/examples
++MANPREFIX = ${PREFIX}/${PKGMANDIR}
++9PREFIX = ${PREFIX}
  
- INCDIR      = ${PREFIX}/include
- LIBDIR      = ${PREFIX}/lib
--X11INC      = /usr/X11R6/include
--X11LIB      = /usr/X11R6/lib
-+X11INC      = ${X11BASE}/include
-+X11LIB      = ${X11BASE}/lib
+ INCDIR = ${PREFIX}/include
+ LIBDIR = ${PREFIX}/lib
+-X11INC = /usr/X11R6/include
+-X11LIB = /usr/X11R6/lib
++X11INC = ${X11BASE}/include
++X11LIB = ${X11BASE}/lib
  
  # includes and libs
- INCLUDES    = -I. -I${INCDIR} -I/usr/include -I${X11INC}
-@@ -17,14 +17,14 @@ LIBS        = -L${LIBDIR} -L/usr/lib -lc
- VERSION     = 20051031
+ INCLUDES = -I. -I${INCDIR} -I/usr/include -I${X11INC}
+@@ -17,12 +17,12 @@ LIBS = -L${LIBDIR} -L/usr/lib -lc -lm -L
+ VERSION = 20051114
  
  # flags
--CFLAGS      = -O0 -g -Wall ${INCLUDES} -DVERSION=\"${VERSION}\"
--LDFLAGS     = -g ${LIBS}
-+CFLAGS      += ${INCLUDES} -DVERSION=\"${VERSION}\"
-+LDFLAGS     += ${LIBS}
+-CFLAGS = -O0 -g -Wall ${INCLUDES} -DVERSION=\"${VERSION}\"
+-LDFLAGS = -g ${LIBS}
++CFLAGS += ${INCLUDES} -DVERSION=\"${VERSION}\"
++LDFLAGS += ${LIBS}
  
  # compiler
  # Note: - under Solaris add -D__EXTENSIONS__ to CFLAGS
--MAKE		= make
-+#MAKE		= make
- AR          = ar cr
--CC          = cc
-+#CC          = cc
- RANLIB      = ranlib
- 
- # code formatting
+-MAKE = make
++#MAKE = make
+ AR = ar cr
+-CC = cc
++#CC = cc
+ RANLIB = ranlib
diff --git a/wm/wmii/patches/patch-ab b/wm/wmii/patches/patch-ab
index 732b72ba22f..b36eaea7218 100644
--- a/wm/wmii/patches/patch-ab
+++ b/wm/wmii/patches/patch-ab
@@ -1,20 +1,20 @@
-$NetBSD: patch-ab,v 1.2 2005/11/03 02:47:58 minskim Exp $
+$NetBSD: patch-ab,v 1.3 2005/12/06 18:55:32 rillig Exp $
 
---- Makefile.orig	2005-10-29 23:41:59.000000000 +0000
+--- Makefile.orig	2005-11-14 10:28:57.000000000 +0000
 +++ Makefile
 @@ -5,7 +5,7 @@ include config.mk
  
- SUBDIRS     = libcext liblitz libixp libixp2 libwmii cmd
+ SUBDIRS = libcext liblitz libixp libixp2 libwmii cmd
  
--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
+-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        = cmd/wm/wmii.1 cmd/wm/wmiiwm.1 cmd/wmibar.1 cmd/wmifs.1 \
-@@ -46,25 +46,15 @@ clean:
+ MAN1 = cmd/wm/wmii.1 cmd/wm/wmiiwm.1 cmd/wmibar.1 cmd/wmifs.1 \
+@@ -38,25 +38,15 @@ clean:
+ 	rm -rf wmii-${VERSION}*
  
  install: all
- 	@echo Installing executable files to ${DESTDIR}${PREFIX}/bin
 -	@mkdir -p ${DESTDIR}${PREFIX}/bin
 -	@cp -f ${BIN} ${DESTDIR}${PREFIX}/bin
 -	@sed 's|CONFPREFIX|${CONFPREFIX}|; s|9PREFIX|${9PREFIX}|' <cmd/wm/wmii >${DESTDIR}${PREFIX}/bin/wmii
@@ -24,7 +24,7 @@ $NetBSD: patch-ab,v 1.2 2005/11/03 02:47:58 minskim Exp $
 +	@${BSD_INSTALL_PROGRAM_DIR} ${DESTDIR}${PREFIX}/bin
 +	@${BSD_INSTALL_PROGRAM} ${BIN} ${DESTDIR}${PREFIX}/bin
 +	@${BSD_INSTALL_SCRIPT} cmd/wm/wmii ${DESTDIR}${PREFIX}/bin
- 	@echo Installing rc scripts to ${DESTDIR}${CONFPREFIX}/wmii-3
+ 	@echo installed executable files to ${DESTDIR}${PREFIX}/bin
 -	@mkdir -p ${DESTDIR}${CONFPREFIX}/wmii-3
 -	@cd rc; for i in *; do \
 -		sed 's|9PREFIX|${9PREFIX}|' <$$i >${DESTDIR}${CONFPREFIX}/wmii-3/$$i; \
@@ -32,7 +32,7 @@ $NetBSD: patch-ab,v 1.2 2005/11/03 02:47:58 minskim Exp $
 -	done
 +	@${BSD_INSTALL_SCRIPT_DIR} ${DESTDIR}${CONFPREFIX}/wmii-3
 +	@${BSD_INSTALL_SCRIPT} rc/* ${DESTDIR}${CONFPREFIX}/wmii-3
- 	@echo Installing manual pages to ${DESTDIR}${MANPREFIX}/man1
+ 	@echo installed rc scripts to ${DESTDIR}${CONFPREFIX}/wmii-3
 -	@mkdir -p ${DESTDIR}${MANPREFIX}/man1
 -	@cp -f ${MAN1} ${DESTDIR}${MANPREFIX}/man1
 -	@sed 's|CONFPREFIX|${CONFPREFIX}|' <cmd/wm/wmii.1 >${DESTDIR}${MANPREFIX}/man1/wmii.1
@@ -41,6 +41,6 @@ $NetBSD: patch-ab,v 1.2 2005/11/03 02:47:58 minskim Exp $
 -	done
 +	@${BSD_INSTALL_MAN_DIR} ${DESTDIR}${MANPREFIX}/man1
 +	@${BSD_INSTALL_MAN} ${MAN1} ${DESTDIR}${MANPREFIX}/man1
- 	@echo "wmii successfully installed"
+ 	@echo installed manual pages to ${DESTDIR}${MANPREFIX}/man1
  
  uninstall: