Rather belatedly, but still:

- Update to version 3.5.1
- Forget about USE_X_PREFIX
- Remove 4.X support

4 files changed, 20 insertions, 67 deletions

diff --git a/x11-wm/wmii/Makefile b/x11-wm/wmii/Makefile
index b102d163d19c..b487e6214d5f 100644
--- a/x11-wm/wmii/Makefile
+++ b/x11-wm/wmii/Makefile
@@ -6,33 +6,31 @@
 #
 
 PORTNAME=	wmii
-DISTVERSION=	3.1
-PORTREVISION=	1
+DISTVERSION=	3.5.1
 CATEGORIES=	x11-wm
 MASTER_SITES=	http://www.suckless.org/download/ CENKES
 
 MAINTAINER=	danfe@FreeBSD.org
 COMMENT=	A dynamic, minimalist window manager for X11
 
-USE_X_PREFIX=	yes
-CONFLICTS=	wmii-3.[2-9]*
+LIB_DEPENDS=	ixp.0:${PORTSDIR}/devel/libixp
+RUN_DEPENDS=	dmenu:${PORTSDIR}/x11/dmenu \
+		${LOCALBASE}/9/bin/rc:${PORTSDIR}/devel/9base
+
+CONFLICTS=	wmii-3.5.[2-9]*
 
 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}|; \
+post-patch: .SILENT
+	${REINPLACE_CMD} -E 's|-Os|${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
+	# Catch up with recent libixp
+	${REINPLACE_CMD} -E 's|\.data\.[[:alpha:]]+||g' \
+		${WRKSRC}/fs.c
 
 .include <bsd.port.mk>
diff --git a/x11-wm/wmii/distinfo b/x11-wm/wmii/distinfo
index 2e7bcf03c57a..56a2a03714de 100644
--- a/x11-wm/wmii/distinfo
+++ b/x11-wm/wmii/distinfo
@@ -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.5.1.tar.gz) = 26705a7b59945b7d269921b45ac15cdf
+SHA256 (wmii-3.5.1.tar.gz) = 6ce10c0805c2ff05952f7566b9af134ae76fdeb518dc7d9c413f0dd58635e6d1
+SIZE (wmii-3.5.1.tar.gz) = 41658
diff --git a/x11-wm/wmii/files/patch-fbsd4 b/x11-wm/wmii/files/patch-fbsd4
deleted file mode 100644
index 061880d192c7..000000000000
--- a/x11-wm/wmii/files/patch-fbsd4
+++ /dev/null
@@ -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"
diff --git a/x11-wm/wmii/pkg-plist b/x11-wm/wmii/pkg-plist
index 263e0fb26f3b..cb3da8002778 100644
--- a/x11-wm/wmii/pkg-plist
+++ b/x11-wm/wmii/pkg-plist
@@ -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