Index: Makefile
===================================================================
RCS file: /home/pcvs/ports/x11-wm/wmii/Makefile,v
retrieving revision 1.8
diff -u -r1.8 Makefile
--- Makefile	28 Jun 2006 13:17:16 -0000	1.8
+++ Makefile	17 Feb 2007 21:03:14 -0000
@@ -6,31 +6,24 @@
 #
 
 PORTNAME=	wmii
-DISTVERSION=	3.1
+DISTVERSION=	3.6-rc2
 CATEGORIES=	x11-wm
-MASTER_SITES=	http://wmii.de/download/
+MASTER_SITES=	http://www.suckless.org/download/ GENTOO/distfiles
 
 MAINTAINER=	danfe@FreeBSD.org
-COMMENT=	A dynamic, minimalist window manager for X11
+COMMENT=	A dynamic minimalist window manager
 
-USE_X_PREFIX=	yes
+LIB_DEPENDS=	ixp.0:${PORTSDIR}/devel/libixp
+RUN_DEPENDS=	dmenu:${PORTSDIR}/x11/dmenu
 
 MAKE_ARGS=	PREFIX="${PREFIX}" X11LIB="${X11BASE}/lib" \
 		X11INC="${X11BASE}/include" CC="${CC}" \
 		MANPREFIX="${MANPREFIX}/man"
 
-MAN1=		wmii.1 wmiimenu.1 wmiir.1 wmiiwm.1
+MAN1=		wmii.1 wmiir.1 wmiiwm.1
 
 post-patch:
-	@${REINPLACE_CMD} -E 's|-O3|${CFLAGS}|; \
-		s|(-[LI])\$${PREFIX}|\1${LOCALBASE}|' \
-		${WRKSRC}/config.mk
-	@${REINPLACE_CMD} -e 's|cp -f $${M|${INSTALL_MAN} $${M|' \
-		${WRKSRC}/Makefile
-
-pre-install:
-.for b in wm/wmiiwm wmiimenu wmiipsel wmiir wmiisetsid wmiiwarp
-	@${STRIP_CMD} ${WRKSRC}/cmd/${b}
-.endfor
+	@${REINPLACE_CMD} -e '/-[LI]/s|PREFIX|LOCALBASE|g;/^[CL].*FLAGS/s|=|+=|' ${WRKSRC}/config.mk
+	@${REINPLACE_CMD} -e '/cp -f wmiiwm/s|cp -f|${INSTALL_PROGRAM}|' ${WRKSRC}/Makefile
 
 .include <bsd.port.mk>
Index: distinfo
===================================================================
RCS file: /home/pcvs/ports/x11-wm/wmii/distinfo,v
retrieving revision 1.5
diff -u -r1.5 distinfo
--- distinfo	28 Jun 2006 13:17:16 -0000	1.5
+++ distinfo	17 Feb 2007 21:03:14 -0000
@@ -1,3 +1,3 @@
-MD5 (wmii-3.1.tar.gz) = 108147a4283bd76d2a76e47bb0c96bac
-SHA256 (wmii-3.1.tar.gz) = 93428a4defcff9e14f28b907f227d5657066a983a9ef5f4a6d4e5fab56e7716b
-SIZE (wmii-3.1.tar.gz) = 60935
+MD5 (wmii-3.6-rc2.tar.gz) = 9c9945385be9d9e8edb30d4ba10f4704
+SHA256 (wmii-3.6-rc2.tar.gz) = 603b0eba443d1db6aeb577f6c1e89ff29cf3d9c8e62f33071ecb6206063c47f0
+SIZE (wmii-3.6-rc2.tar.gz) = 42890
Index: pkg-descr
===================================================================
RCS file: /home/pcvs/ports/x11-wm/wmii/pkg-descr,v
retrieving revision 1.4
diff -u -r1.4 pkg-descr
--- pkg-descr	28 Jun 2006 13:17:16 -0000	1.4
+++ pkg-descr	17 Feb 2007 21:03:14 -0000
@@ -6,4 +6,4 @@
 (including all shipped utilities and libraries), to enforce simplicity and
 clarity.
 
-WWW: http://wmii.de/
+WWW: http://www.suckless.org/wiki/wmii
Index: pkg-plist
===================================================================
RCS file: /home/pcvs/ports/x11-wm/wmii/pkg-plist,v
retrieving revision 1.3
diff -u -r1.3 pkg-plist
--- pkg-plist	28 Jun 2006 13:17:16 -0000	1.3
+++ pkg-plist	17 Feb 2007 21:03:14 -0000
@@ -1,12 +1,8 @@
 bin/wmii
-bin/wmiimenu
-bin/wmiipsel
 bin/wmiir
-bin/wmiisetsid
-bin/wmiiwarp
 bin/wmiiwm
-etc/wmii-3/quit
-etc/wmii-3/status
-etc/wmii-3/welcome
-etc/wmii-3/wmiirc
-@dirrm etc/wmii-3
+etc/wmii-3.5/quit
+etc/wmii-3.5/status
+etc/wmii-3.5/welcome
+etc/wmii-3.5/wmiirc
+@dirrm etc/wmii-3.5
Index: files/patch-fbsd4
===================================================================
RCS file: files/patch-fbsd4
diff -N files/patch-fbsd4
--- files/patch-fbsd4	3 Oct 2006 23:22:04 -0000	1.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,41 +0,0 @@
---- cmd/wm/client.c.orig	Sat Jun 17 18:44:30 2006
-+++ cmd/wm/client.c	Wed Oct  4 06:17:02 2006
-@@ -129,15 +129,20 @@
- void
- focus_client(Client *c, Bool restack)
- {
-+	Client *old, *old_in_area;
-+	Frame *f;
-+	View *v;
-+	int i;
-+	static char buf[256];
-+
- 	if (!sel_screen)
- 		return;
- 
--	Client *old = sel_client();
--	Frame *f = c->frame.data[c->sel];
--	Client *old_in_area = sel_client_of_area(f->area);
--	View *v = f->area->view;
--	int i = idx_of_area(f->area);
--	static char buf[256];
-+	old = sel_client();
-+	f = c->frame.data[c->sel];
-+	old_in_area = sel_client_of_area(f->area);
-+	v = f->area->view;
-+	i = idx_of_area(f->area);
- 
- 	v->sel = i;
- 	f->area->sel = idx_of_frame(f);
---- libixp/client.c.orig	Sat Jun 17 18:44:30 2006
-+++ libixp/client.c	Wed Oct  4 06:17:14 2006
-@@ -6,8 +6,8 @@
- #include <stdio.h>
- #include <stdlib.h>
- #include <string.h>
--#include <sys/socket.h>
- #include <sys/types.h>
-+#include <sys/socket.h>
- #include <unistd.h>
- 
- #include "ixp.h"