5 files changed, 60 insertions, 54 deletions
diff --git a/wm/wmii/Makefile b/wm/wmii/Makefile
index cad06dcbf20..42e349c9b40 100644
--- a/wm/wmii/Makefile
+++ b/wm/wmii/Makefile
@@ -1,31 +1,33 @@
-# $NetBSD: Makefile,v 1.14 2007/02/01 17:53:40 joerg Exp $
-#
+# $NetBSD: Makefile,v 1.15 2008/01/06 21:55:38 ghen Exp $
 
-DISTNAME=		wmii-3.1
+DISTNAME=		wmii-3.6
 CATEGORIES=		wm
-MASTER_SITES=		http://suckless.org/download/
+MASTER_SITES=		http://www.suckless.org/download/
 
 MAINTAINER=		ghen@NetBSD.org
 HOMEPAGE=		http://wmii.suckless.org/
 COMMENT=		Modular and keyboard-friendly window manager
 
+DEPENDS+=		dmenu>=3.4:../../x11/dmenu
+
 NO_CONFIGURE=		yes
 
 BUILD_DEFS+=		PKG_SYSCONFBASE
+MAKE_ENV+=		PKG_SYSCONFBASE=${PKG_SYSCONFBASE}
 
-SUBST_CLASSES+=		path
-SUBST_STAGE.path=	post-patch
-SUBST_FILES.path=	cmd/wm/wmii rc/wmiirc cmd/wm/wmii.1
-SUBST_SED.path+=	-e 's|CONFPREFIX|${PKG_SYSCONFBASE}|g'
+# see ${WRKSRC}/mk/wmii.mk
+CONFVERSION=		3.5
+PLIST_SUBST+=		CONFVERSION=${CONFVERSION}
 
-PKG_SYSCONFSUBDIR=	wmii-3
+PKG_SYSCONFSUBDIR=	wmii-${CONFVERSION}
 EGDIR=			${PREFIX}/share/examples/${PKG_SYSCONFSUBDIR}
-EGFILES=		quit status welcome wmiirc
+EGFILES=		rc.wmii welcome wmiirc
 CONF_FILES_MODE=	0755
 
 .for f in ${EGFILES}
 CONF_FILES+=		${EGDIR}/${f} ${PKG_SYSCONFDIR}/${f}
 .endfor
 
+.include "../../devel/libixp/buildlink3.mk"
 .include "../../x11/libX11/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/wm/wmii/PLIST b/wm/wmii/PLIST
index 3f1449819a1..025595b18e8 100644
--- a/wm/wmii/PLIST
+++ b/wm/wmii/PLIST
@@ -1,17 +1,14 @@
-@comment $NetBSD: PLIST,v 1.5 2007/01/15 11:39:10 ghen Exp $
+@comment $NetBSD: PLIST,v 1.6 2008/01/06 21:55:38 ghen Exp $
 bin/wmii
-bin/wmiimenu
-bin/wmiipsel
+bin/wmii9menu
+bin/wmii9rc
+bin/wmiiloop
 bin/wmiir
-bin/wmiisetsid
-bin/wmiiwarp
-bin/wmiiwm
+bin/wmiistartrc
 man/man1/wmii.1
-man/man1/wmiimenu.1
+man/man1/wmiiloop.1
 man/man1/wmiir.1
-man/man1/wmiiwm.1
-share/examples/wmii-3/quit
-share/examples/wmii-3/status
-share/examples/wmii-3/welcome
-share/examples/wmii-3/wmiirc
-@dirrm share/examples/wmii-3
+share/examples/wmii-${CONFVERSION}/rc.wmii
+share/examples/wmii-${CONFVERSION}/welcome
+share/examples/wmii-${CONFVERSION}/wmiirc
+@dirrm share/examples/wmii-${CONFVERSION}
diff --git a/wm/wmii/distinfo b/wm/wmii/distinfo
index 5d89745a242..1d6d134deec 100644
--- a/wm/wmii/distinfo
+++ b/wm/wmii/distinfo
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.5 2007/01/15 11:39:10 ghen Exp $
+$NetBSD: distinfo,v 1.6 2008/01/06 21:55:38 ghen Exp $
 
-SHA1 (wmii-3.1.tar.gz) = 363b52207d2505d5921adbcda98136ee240a673d
-RMD160 (wmii-3.1.tar.gz) = c5abaa0982b036b8dafa224751b80d8265c19f59
-Size (wmii-3.1.tar.gz) = 60935 bytes
-SHA1 (patch-aa) = ad3d271229b869e25f74bda2d819ba7fac55c278
+SHA1 (wmii-3.6.tar.gz) = 48e24f84f60b9c6ce37f715a46bc32e35d2086f3
+RMD160 (wmii-3.6.tar.gz) = 29462b9ecc7d68e8e00e5f3eec82c2a46e268a52
+Size (wmii-3.6.tar.gz) = 208249 bytes
+SHA1 (patch-aa) = 71d5bb9d546e0cc562f463c03af458464fd4e782
+SHA1 (patch-ab) = 64d8f1b79d2ebf307c3189d0e5bcfc53957e3fcf
diff --git a/wm/wmii/patches/patch-aa b/wm/wmii/patches/patch-aa
index 9f201b57e53..42f9876601c 100644
--- a/wm/wmii/patches/patch-aa
+++ b/wm/wmii/patches/patch-aa
@@ -1,35 +1,28 @@
-$NetBSD: patch-aa,v 1.5 2007/01/15 11:39:10 ghen Exp $
+$NetBSD: patch-aa,v 1.6 2008/01/06 21:55:38 ghen Exp $
 
---- config.mk.orig	2006-06-17 13:44:29.000000000 +0200
+--- config.mk.orig	2007-11-16 14:59:15.000000000 +0100
 +++ config.mk
-@@ -1,22 +1,21 @@
- # Customize to fit your system
+@@ -1,10 +1,9 @@
+ # Customize below to fit your system
  
  # paths
 -PREFIX = /usr/local
--CONFPREFIX = ${PREFIX}/etc
--MANPREFIX = ${PREFIX}/share/man
-+#PREFIX = /usr/local
-+CONFPREFIX = ${PREFIX}/share/examples
-+MANPREFIX = ${PREFIX}/${PKGMANDIR}
+ BIN = ${PREFIX}/bin
+-MAN = ${PREFIX}/share/man
+-ETC = ${PREFIX}/etc
++MAN = ${PREFIX}/${PKGMANDIR}
++ETC = ${PKG_SYSCONFBASE}
+ LIBDIR = ${PREFIX}/lib
+ INCLUDE = ${PREFIX}/include
  
--X11INC = /usr/X11R6/include
--X11LIB = /usr/X11R6/lib
-+X11INC = ${X11BASE}/include
-+X11LIB = ${X11BASE}/lib
+@@ -14,8 +13,8 @@ LIBS = -L/usr/lib -lc -L${ROOT}/lib
  
- VERSION = 3.1
- 
- # includes and libs
--LIBS = -L${PREFIX}/lib -L/usr/lib -lc -L${X11LIB} -lX11
-+LIBS = -lc -lX11
- 
- # Linux/BSD
--CFLAGS = -O3 -I. -I${PREFIX}/include -I/usr/include -I${X11INC} \
--	-DVERSION=\"${VERSION}\"
--LDFLAGS = ${LIBS}
-+CFLAGS += -DVERSION=\"${VERSION}\"
+ # Flags
+ include ${ROOT}/mk/gcc.mk
+-CFLAGS += -g -O0 -DIXPlint
+-LDFLAGS += -g ${LIBS}
++CFLAGS += -DIXPlint
 +LDFLAGS += ${LIBS}
+ STATIC = -static
+ MKDEP = cpp -M
  
- # Solaris
- #CFLAGS = -fast -xtarget=ultra ${INCLUDES} -DVERSION=\"${VERSION}\"
diff --git a/wm/wmii/patches/patch-ab b/wm/wmii/patches/patch-ab
new file mode 100644
index 00000000000..03c0ef5484d
--- /dev/null
+++ b/wm/wmii/patches/patch-ab
@@ -0,0 +1,13 @@
+$NetBSD: patch-ab,v 1.5 2008/01/06 21:55:39 ghen Exp $
+
+--- rc/Makefile.orig	2007-11-16 14:59:15.000000000 +0100
++++ rc/Makefile
+@@ -2,7 +2,7 @@ ROOT=..
+ include ${ROOT}/mk/hdr.mk
+ include ${ROOT}/mk/wmii.mk
+ 
+-BIN = ${ETC}/wmii-${CONFVERSION}
++BIN = ${PREFIX}/share/examples/wmii-${CONFVERSION}
+ TARG =	rc.wmii   \
+ 	wmiirc    \
+ 	welcome