diff -ruN wmii.orig/Makefile wmii/Makefile
--- wmii.orig/Makefile	Fri Jun  8 19:47:08 2007
+++ wmii/Makefile	Wed Jan  2 23:26:10 2008
@@ -6,33 +6,43 @@
 #
 
 PORTNAME=	wmii
-DISTVERSION=	3.5.1
+DISTVERSION=	3.6
 CATEGORIES=	x11-wm
 MASTER_SITES=	http://www.suckless.org/download/ CENKES
 
 MAINTAINER=	danfe@FreeBSD.org
 COMMENT=	A dynamic, minimalist window manager for X11
 
-LIB_DEPENDS=	ixp.0:${PORTSDIR}/devel/libixp
+LIB_DEPENDS=	ixp.1:${PORTSDIR}/devel/libixp
 RUN_DEPENDS=	dmenu:${PORTSDIR}/x11/dmenu \
 		${LOCALBASE}/9/bin/rc:${PORTSDIR}/devel/9base
 
-CONFLICTS=	wmii-3.5.[2-9]*
+CONFLICTS=	wmii-3.5.*
 
 USE_XLIB=	yes
+USE_ICONV=	yes
 
-MAKE_ARGS=	PREFIX="${PREFIX}" X11LIB="${X11BASE}/lib" \
-		X11INC="${X11BASE}/include" CC="${CC}" \
-		MANPREFIX="${MANPREFIX}/man"
+CFLAGS+=	-I${LOCALBASE}/include -I${WRKSRC}/include -DIXPlint
+LDFLAGS+=	-L${LOCALBASE}/lib -L${WRKSRC}/lib
+MAKE_ARGS=	PREFIX="${PREFIX}" LIBX11="-L${X11BASE}/lib -lX11" \
+		INCX11="-I${X11BASE}/include" LIBIXP="-lixp" STATIC="" \
+		CC="${CC} -c" LD="${CC}" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" \
+		MAN="${MANPREFIX}/man"
 
-MAN1=		wmii.1 wmiir.1 wmiiwm.1
+MAN1=		wmii.1 wmiiloop.1 wmiir.1
 
 post-patch: .SILENT
-	${REINPLACE_CMD} -E 's|-Os|${CFLAGS}|; \
-		s|(-[LI])\$${PREFIX}|\1${LOCALBASE}|' \
+	${REINPLACE_CMD} -E 's|-Os|${CFLAGS}|g; \
+		s|(-[LI])\$${PREFIX}|\1${LOCALBASE}|g' \
 		${WRKSRC}/config.mk
-	# Catch up with recent libixp
-	${REINPLACE_CMD} -E 's|\.data\.[[:alpha:]]+||g' \
-		${WRKSRC}/fs.c
+	${REINPLACE_CMD} -E 's|\$${LINK} \$$@|$${LINK} $$@ -lfmt -lutf|g' \
+		${WRKSRC}/cmd/Makefile
+	${REINPLACE_CMD} -E 's|^(LIB =.*)$$|\1 -lm -lXext -liconv -lregexp9 -lbio -lfmt -lutf|' \
+		${WRKSRC}/cmd/wmii/Makefile
+	${REINPLACE_CMD} -E 's|VERSION|"${DISTVERSION}"|g' \
+		${WRKSRC}/cmd/*.c ${WRKSRC}/cmd/wmii/main.c
+#	# Catch up with recent libixp
+#	${REINPLACE_CMD} -E 's|\.data\.[[:alpha:]]+||g' \
+#		${WRKSRC}/cmd/wmii/fs.c
 
 .include <bsd.port.mk>
diff -ruN wmii.orig/distinfo wmii/distinfo
--- wmii.orig/distinfo	Tue Jun  5 22:15:32 2007
+++ wmii/distinfo	Wed Jan  2 16:44:37 2008
@@ -1,3 +1,3 @@
-MD5 (wmii-3.5.1.tar.gz) = 26705a7b59945b7d269921b45ac15cdf
-SHA256 (wmii-3.5.1.tar.gz) = 6ce10c0805c2ff05952f7566b9af134ae76fdeb518dc7d9c413f0dd58635e6d1
-SIZE (wmii-3.5.1.tar.gz) = 41658
+MD5 (wmii-3.6.tar.gz) = 9d17a09871fada998b4d989d9318bbf5
+SHA256 (wmii-3.6.tar.gz) = 46f39b788c5ef4695040b36cc7d9c539db0306bafc4d8cefdc5980ed4331b216
+SIZE (wmii-3.6.tar.gz) = 208249
diff -ruN wmii.orig/pkg-plist wmii/pkg-plist
--- wmii.orig/pkg-plist	Tue Jun  5 22:15:32 2007
+++ wmii/pkg-plist	Wed Jan  2 23:29:39 2008
@@ -1,8 +1,10 @@
 bin/wmii
+bin/wmii9menu
+bin/wmii9rc
+bin/wmiiloop
 bin/wmiir
-bin/wmiiwm
-etc/wmii-3.5/quit
-etc/wmii-3.5/status
-etc/wmii-3.5/welcome
+bin/wmiistartrc
+etc/wmii-3.5/rc.wmii
 etc/wmii-3.5/wmiirc
+etc/wmii-3.5/welcome
 @dirrm etc/wmii-3.5