Index: head/x11-wm/wmii/Makefile
===================================================================
--- head/x11-wm/wmii/Makefile	(revision 433636)
+++ head/x11-wm/wmii/Makefile	(revision 433637)
@@ -1,57 +1,57 @@
 # Created by: Alexey Dokuchaev <danfe@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	wmii
 DISTVERSION=	3.6	# this is stable version; for 3.9.x, use -devel port
 PORTREVISION=	4
 CATEGORIES=	x11-wm
 MASTER_SITES=	http://dl.suckless.org/wmii/
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Dynamic, minimalist window manager for X11
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 LIB_DEPENDS=	libixp.so:devel/libixp
 RUN_DEPENDS=	dmenu:x11/dmenu
 
-CONFLICTS=	wmii-3.9*
+CONFLICTS=	wmii-devel-[0-9]*
 
 USE_XORG=	x11 xextproto xt xext
 
 MAKE_ARGS=	PREFIX="${PREFIX}" MAN="${MANPREFIX}/man" \
 		INCLUDE="${LOCALBASE}/include" \
 		INCX11="-I${LOCALBASE}/include" \
 		LIBX11="-L${LOCALBASE}/lib -lX11 -lixp" \
 		CC="${CC} -c" LD="${CC}" LIBIXP="" STATIC=""
 
 OPTIONS_DEFINE=	SLIM_LAYOUT_BOX UTF8
 SLIM_LAYOUT_BOX_DESC=	Build with slim layout boxes
 
 UTF8_USES=	iconv
 UTF8_MAKE_ARGS=	LIBICONV="${ICONV_LIB}"
 UTF8_MAKE_ARGS_OFF=	-DNO_UTF8
 
 SLIM_LAYOUT_BOX_EXTRA_PATCHES=	${FILESDIR}/extra-patch-slim-layout-boxes
 
 post-patch: .SILENT
 	${REINPLACE_CMD} -e 's|-lfmt -lutf|$${LIBX11} & -lX11|' \
 		${WRKSRC}/cmd/Makefile
 	${REINPLACE_CMD} -e '/_XOPEN_SOURCE/d' ${WRKSRC}/cmd/wmii/dat.h
 # Strip debug build options
 	${REINPLACE_CMD} -E 's| -g( -O0)?||' ${WRKSRC}/config.mk
 	${REINPLACE_CMD} -e 's|CFLAGS += -DIXPlint|& -DIXP_NEEDAPI=89|' \
 		${WRKSRC}/config.mk
 # Fix brain-damaged piece of code which breaks on arches where `size_t'
 # is not 32-bit unsigned integer (e.g. amd64, sparc64)
 	${REINPLACE_CMD} -e '/wmii_strlcat/d' ${WRKSRC}/include/util.h
 	${REINPLACE_CMD} -e 's|strlcat|wmii_&|' ${WRKSRC}/include/util.h \
 		${WRKSRC}/cmd/util.c ${WRKSRC}/cmd/wmii/client.c
 
 post-install:
 .for f in wmii wmii9menu wmiir
-	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/${f}
+	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/${f}
 .endfor
 
 .include <bsd.port.mk>
Index: head/x11-wm/wmii/files/patch-mk-common.mk
===================================================================
--- head/x11-wm/wmii/files/patch-mk-common.mk	(revision 433636)
+++ head/x11-wm/wmii/files/patch-mk-common.mk	(revision 433637)
@@ -1,15 +1,15 @@
---- mk/common.mk.orig	2007-11-16 21:59:15 +0800
+--- mk/common.mk.orig	2007-11-16 13:59:15 UTC
 +++ mk/common.mk
 @@ -4,9 +4,9 @@ install: all
  
  MANDIRS=${MAN}/man1
  mkdirs:
 -	for i in ${BIN} ${ETC} ${LIBDIR} ${MANDIRS} ${INCLUDE} ${DIRS}; do \
 -		test -d $$i || echo MKDIR $$i; \
 -		mkdir -pm 0755 $$i; \
 +	for i in ${BIN} ${ETC} ${LIBDIR} ${MANDIRS} ${INCLUDE}; do \
 +		test -d ${DESTDIR}$$i || echo MKDIR ${DESTDIR}$$i; \
 +		mkdir -pm 0755 ${DESTDIR}$$i; \
  	done
  
  cleandep:
Index: head/x11-wm/wmii/files/patch-mk-hdr.mk
===================================================================
--- head/x11-wm/wmii/files/patch-mk-hdr.mk	(revision 433636)
+++ head/x11-wm/wmii/files/patch-mk-hdr.mk	(revision 433637)
@@ -1,54 +1,54 @@
---- mk/hdr.mk.orig	2007-11-16 21:59:15 +0800
+--- mk/hdr.mk.orig	2007-11-16 13:59:15 UTC
 +++ mk/hdr.mk
 @@ -26,32 +26,32 @@ all:
  
  .O.install:
  	echo INSTALL ${BASE}$*
 -	cp -f $< ${BIN}/$*
 -	chmod 0755 ${BIN}/$* 
 +	cp -f $< ${DESTDIR}${BIN}/$*
 +	chmod 0755 ${DESTDIR}${BIN}/$* 
  .O.uninstall:
  	echo UNINSTALL ${BASE}$*
  	rm -f ${BIN}/$* 
  
  .a.install:
  	echo INSTALL ${BASE}$<
 -	cp -f $< ${LIBDIR}/$<
 -	chmod 0644 ${LIBDIR}/$<
 +	cp -f $< ${DESTDIR}${LIBDIR}/$<
 +	chmod 0644 ${DESTDIR}${LIBDIR}/$<
  .a.uninstall:
  	echo UNINSTALL ${BASE}$<
  	rm -f ${LIBDIR}/$<
  
  .h.install:
  	echo INSTALL ${BASE}$<
 -	cp -f $< ${INCLUDE}/$<
 -	chmod 0644 ${INCLUDE}/$<
 +	cp -f $< ${DESTDIR}${INCLUDE}/$<
 +	chmod 0644 ${DESTDIR}${INCLUDE}/$<
  .h.uninstall:
  	echo UNINSTALL ${BASE}$<
  	rm -f ${INCLUDE}/$<
  
  .1.install:
  	echo INSTALL man $*'(1)'
 -	${FILTER} $< >${MAN}/man1/$<
 -	chmod 0644 ${MAN}/man1/$<
 +	${FILTER} $< >${DESTDIR}${MAN}/man1/$<
 +	chmod 0644 ${DESTDIR}${MAN}/man1/$<
  .1.uninstall:
  	echo UNINSTALL man $*'(1)'
  	rm -f ${MAN}/man1/$<
 @@ -69,8 +69,8 @@ install: printinstall mkdirs
  depend: cleandep
  
  FILTER = cat
 -COMPILE= CC="${CC}" CFLAGS="${CFLAGS}" ${ROOT}/util/compile
 -LINK= LD="${LD}" LDFLAGS="${LDFLAGS}" ${ROOT}/util/link
 +COMPILE= noisycc=yes CC="${CC}" CFLAGS="${CFLAGS}" ${ROOT}/util/compile
 +LINK= noisycc=yes LD="${LD}" LDFLAGS="${LDFLAGS}" ${ROOT}/util/link
  
  include ${ROOT}/config.mk
  CFLAGS += -I$$(echo ${INCPATH}|sed 's/:/ -I/g')
Index: head/x11-wm/wmii/files/patch-no-utf8
===================================================================
--- head/x11-wm/wmii/files/patch-no-utf8	(revision 433636)
+++ head/x11-wm/wmii/files/patch-no-utf8	(revision 433637)
@@ -1,104 +1,104 @@
---- cmd/wmii/Makefile.orig
+--- cmd/wmii/Makefile.orig	2007-11-16 13:59:15 UTC
 +++ cmd/wmii/Makefile
-@@ -8,8 +8,16 @@
+@@ -8,8 +8,16 @@ TARG =	wmii
  HFILES=	dat.h fns.h x11.h
  
  LIB =	${LIBIXP}
 -LDFLAGS += -lm ${LIBX11} -lXext ${LIBICONV} -lregexp9 -lbio -lfmt -lutf
 -CFLAGS += ${INCX11} ${INCICONV} -DVERSION=\"${VERSION}\"
 +LDFLAGS += -lm ${LIBX11} -lXext -lregexp9 -lbio -lfmt -lutf
 +CFLAGS += ${INCX11} -DVERSION=\"${VERSION}\"
 +
 +.ifdef NO_UTF8
 +CFLAGS += -DNO_UTF8
 +.else
 +LDFLAGS += ${LIBICONV}
 +CFLAGS += ${INCICONV}
 +.endif
 +
  OBJ =	area	\
  	bar	\
  	client	\
---- cmd/wmii/utf.c.orig
+--- cmd/wmii/utf.c.orig	2007-11-16 13:59:15 UTC
 +++ cmd/wmii/utf.c
 @@ -1,12 +1,17 @@
  /* Public Domain --Kris Maglione */
  #include "dat.h"
  #include <errno.h>
 +#ifndef NO_UTF8
  #include <iconv.h>
 +#endif
  #include <string.h>
  #include "fns.h"
  
  char*
  toutf8n(char *str, size_t nstr) {
 +#ifdef NO_UTF8
 +	return strndup(str, nstr);
 +#else
  	static iconv_t cd;
  	char *buf, *pos;
  	size_t nbuf, bsize;
-@@ -30,6 +35,7 @@
+@@ -30,6 +35,7 @@ toutf8n(char *str, size_t nstr) {
  			break;
  	*pos = '\0';
  	return buf;
 +#endif
  }
  
  char*
---- cmd/wmii/x11.c.orig
+--- cmd/wmii/x11.c.orig	2007-11-16 13:59:15 UTC
 +++ cmd/wmii/x11.c
-@@ -18,6 +18,12 @@
+@@ -18,6 +18,12 @@ static Map wmap, amap;
  static MapEnt *wbucket[137];
  static MapEnt *abucket[137];
  
 +#ifdef NO_UTF8
 +#define	XTEXT(func)	Xmb##func
 +#else
 +#define	XTEXT(func)	Xutf8##func
 +#endif
 +
  XRectangle
  XRect(Rectangle r) {
  	XRectangle xr;
-@@ -444,7 +450,7 @@
+@@ -444,7 +450,7 @@ drawstring(Image *dst, Font *font,
  
  	setgccol(dst, col);
  	if(font->set)
 -		Xutf8DrawString(display, dst->image, 
 +		XTEXT(DrawString)(display, dst->image, 
  				font->set, dst->gc,
  				x, y,
  				buf, len);
-@@ -552,7 +558,7 @@
+@@ -552,7 +558,7 @@ textwidth_l(Font *font, char *text, uint
  	XRectangle r;
  
  	if(font->set) {
 -		Xutf8TextExtents(font->set, text, len, &r, nil);
 +		XTEXT(TextExtents)(font->set, text, len, &r, nil);
  		return r.width;
  	}
  	return XTextWidth(font->xfont, text, len);
-@@ -638,7 +644,7 @@
+@@ -638,7 +644,7 @@ gettextlistproperty(Window *w, char *nam
  
  	XGetTextProperty(display, w->w, &prop, xatom(name));
  	if(prop.nitems > 0) {
 -		if(Xutf8TextPropertyToTextList(display, &prop, &list, &n) == Success)
 +		if(XTEXT(TextPropertyToTextList)(display, &prop, &list, &n) == Success)
  			*ret = list;
  		XFree(prop.value);
  	}
-@@ -653,9 +659,10 @@
+@@ -653,9 +659,10 @@ gettextproperty(Window *w, char *name) {
  	str = nil;
  
  	n = gettextlistproperty(w, name, &list);
 -	if(n > 0)
 +	if(n > 0 && list) {
  		str = estrdup(*list);
 -	freestringlist(list);
 +		freestringlist(list);
 +	}
  
  	return str;
  }