Index: head/x11-wm/wmii-devel/Makefile
===================================================================
--- head/x11-wm/wmii-devel/Makefile	(revision 428550)
+++ head/x11-wm/wmii-devel/Makefile	(revision 428551)
@@ -1,43 +1,43 @@
 # Created by: Alexey Dokuchaev <danfe@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	wmii
 PORTVERSION=	3.9.2
 PORTREVISION=	1
 CATEGORIES=	x11-wm
 MASTER_SITES=	http://dl.suckless.org/wmii/
 PKGNAMESUFFIX=	-devel
 DISTNAME=	${PORTNAME}+ixp-${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Dynamic, minimalist window manager for X11
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 LIB_DEPENDS=	libixp.so:devel/libixp
 
-CONFLICTS=	wmii-3.6*
+CONFLICTS=	wmii-[0-9]*
 
 USES=		pkgconfig tar:tbz
 USE_XORG=	x11 xext xrandr xrender xinerama xft
 
 MAKE_ARGS=	PREFIX="${PREFIX}" INCLUDE="${LOCALBASE}/include" \
 		CC="${CC} -c" LD="${CC}" LIBIXP="-lixp" STATIC="" \
 		MAN="${MANPREFIX}/man" DOC="${DOCSDIR}"
 MAKE_ENV=	noisycc=1	# unmute build commands, useful for logs
 
 OPTIONS_DEFINE=	DOCS
 
 post-patch:
 # Link against `devel/libixp' from ports and drop extraneous build options
 	@${REINPLACE_CMD} -e '/libixp/d' ${WRKSRC}/Makefile
 	@${REINPLACE_CMD} -e 's,/usr/lib,${LOCALBASE}/lib, ; /^CFLAGS +=/d' \
 		${WRKSRC}/config.mk
 
 post-install:
 .for f in bin/wimenu bin/wmii bin/wmii9menu bin/wmiir lib/libwmii_hack.so
-	${STRIP_CMD} ${STAGEDIR}${PREFIX}/${f}
+	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/${f}
 .endfor
 
 .include <bsd.port.mk>
Index: head/x11-wm/wmii-devel/files/patch-cmd__Makefile
===================================================================
--- head/x11-wm/wmii-devel/files/patch-cmd__Makefile	(revision 428550)
+++ head/x11-wm/wmii-devel/files/patch-cmd__Makefile	(revision 428551)
@@ -1,21 +1,21 @@
---- cmd/Makefile..orig
+--- cmd/Makefile.orig	2010-06-10 07:24:01 UTC
 +++ cmd/Makefile
-@@ -20,14 +20,14 @@
+@@ -20,14 +20,14 @@ CFLAGS += $(INCX11)
  include $(ROOT)/mk/many.mk
  include $(ROOT)/mk/dir.mk
  
 -OWMIIR=wmiir.o $(OFILES) $(LIBIXP)
 +OWMIIR=wmiir.o $(OFILES)
  wmiir.out: $(OWMIIR)
 -	$(LINK) $@ $(OWMIIR)
 +	$(LINK) $@ $(OWMIIR) $(LIBIXP)
  
  wmii/x11.o wmii/xext.o wmii/geom.o wmii/map.o: dall
  	true
  
 -O9MENU=wmii9menu.o clientutil.o wmii/x11.o wmii/xext.o wmii/geom.o wmii/map.o $(OFILES) $(LIBIXP)
 +O9MENU=wmii9menu.o clientutil.o wmii/x11.o wmii/xext.o wmii/geom.o wmii/map.o $(OFILES)
  wmii9menu.out: $(O9MENU)
 -	$(LINK) $@ $(O9MENU) $$(pkg-config --libs $(X11PACKAGES) xrandr xinerama) -lXext
 +	$(LINK) $@ $(O9MENU) $$(pkg-config --libs $(X11PACKAGES) xrandr xrender xinerama) -lXext $(LIBIXP)
  
Index: head/x11-wm/wmii-devel/files/patch-cmd__menu__Makefile
===================================================================
--- head/x11-wm/wmii-devel/files/patch-cmd__menu__Makefile	(revision 428550)
+++ head/x11-wm/wmii-devel/files/patch-cmd__menu__Makefile	(revision 428551)
@@ -1,13 +1,13 @@
---- cmd/menu/Makefile.orig
+--- cmd/menu/Makefile.orig	2010-06-10 07:24:01 UTC
 +++ cmd/menu/Makefile
-@@ -14,8 +14,8 @@
+@@ -14,8 +14,8 @@ HFILES=	dat.h fns.h
  
  PACKAGES += $(X11PACKAGES) xext xrandr xrender xinerama
  
 -LIB =	$(LIBIXP)
 -LIBS += -lm $(LIBS9)
 +LIBS += $(LIBIXP)
 +LIBS += -lm $(LIBS9) $(LIBIXP)
  CFLAGS += -DIXP_NEEDAPI=86
  OBJ =	main	\
  	caret	\
Index: head/x11-wm/wmii-devel/files/patch-cmd__wmii__Makefile
===================================================================
--- head/x11-wm/wmii-devel/files/patch-cmd__wmii__Makefile	(revision 428550)
+++ head/x11-wm/wmii-devel/files/patch-cmd__wmii__Makefile	(revision 428551)
@@ -1,11 +1,11 @@
---- cmd/wmii/Makefile.orig
+--- cmd/wmii/Makefile.orig	2010-06-10 07:24:02 UTC
 +++ cmd/wmii/Makefile
-@@ -9,7 +9,7 @@
+@@ -9,7 +9,7 @@ HFILES=	dat.h fns.h
  
  PACKAGES += $(X11PACKAGES) xext xrandr xrender xinerama
  
 -LIB =	$(LIBIXP)
 +LIBS += $(LIBIXP)
  LIBS += -lm $(LIBS9)
  
  CFLAGS += $(INCICONV) -DIXP_NEEDAPI=97