- Update `devel/libixp' to version 0.4 [1]

- Update `x11-wm/wmii' to version 3.6 [2]
- Remove CENKES as they do not carry new distfiles
- Minor tweaks in pkg-descr for `devel/libixp'

PRs:		ports/119281 [1]
		ports/119282 [2]
Submitted by:	Daniel Roethlisberger
Reworked by:	danfe (myself)
Go ahead from:	sat (maintainer) [1]

6 files changed, 61 insertions, 40 deletions

diff --git a/devel/libixp/Makefile b/devel/libixp/Makefile
index 9f90a768b04e..393d930d9885 100644
--- a/devel/libixp/Makefile
+++ b/devel/libixp/Makefile
@@ -6,29 +6,45 @@
 #
 
 PORTNAME=	libixp
-PORTVERSION=	0.2.${CHANGESET}
+PORTVERSION=	0.4
 CATEGORIES=	devel
-MASTER_SITES=	CENKES
+MASTER_SITES=	http://www.suckless.org/download/
 
 MAINTAINER=	infofarmer@FreeBSD.org
 COMMENT=	Standalone client/server 9P library
 
-CHANGESET=	42
 USE_LDCONFIG=	yes
-USE_BZIP2=	yes
-CFLAGS+=	-I. -fPIC
-LDFLAGS+=	-L.
-MAKE_ARGS=	PREFIX="${PREFIX}" CC="${CC}" MANPREFIX="${MANPREFIX}/man" \
+CFLAGS+=	-I. -I${WRKSRC}/include -fPIC
+LDFLAGS+=	-L. -L${WRKSRC}/lib
+MAKE_ARGS=	PREFIX="${PREFIX}" CC="${CC} -c" LD="${CC}" \
 		CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}"
-MAN1=	ixpc.1
-PLIST_FILES=	bin/ixpc include/ixp.h include/ixp_fcall.h lib/libixp.so lib/libixp.so.0
 
-post-patch:
-	@${REINPLACE_CMD} -e 's|\.a|.so|g;/RANLIB/d;s|{AR}|{CC} -shared -fPIC -o|;s|AR|CC|'\
-		${WRKSRC}/Makefile
-	@${REINPLACE_CMD} -e 's|"VERSION"|${PORTVERSION}|' ${WRKSRC}/ixpc.c
+MAN1=		ixpc.1
+PLIST_FILES=	bin/ixpc include/ixp.h include/ixp_fcall.h \
+		lib/libixp.so lib/libixp.so.1 \
+		lib/libixp_pthread.so lib/libixp_pthread.so.1
 
-post-install:
-	@${LN} -sf ${PREFIX}/lib/libixp.so ${PREFIX}/lib/libixp.so.0
+post-patch: .SILENT
+	${REINPLACE_CMD} -e 's|\.a|.so|g; s|{AR}|{LD} -shared -fPIC -o|' \
+		${WRKSRC}/mk/lib.mk ${WRKSRC}/mk/hdr.mk
+# Fix garbled "awk" strings after previous sed(1) invocation
+	${REINPLACE_CMD} -e 's|\.sowk|.awk|' ${WRKSRC}/mk/hdr.mk
+	${REINPLACE_CMD} -e 's|\(echo.*\)AR|\1LD|' ${WRKSRC}/mk/lib.mk
+	${REINPLACE_CMD} -e 's|$${ROOT}/lib/libixp.a|-lixp|' \
+		${WRKSRC}/cmd/Makefile
+	${REINPLACE_CMD} -e 's|VERSION|"${PORTVERSION}"|' \
+		${WRKSRC}/cmd/ixpc.c
+
+# XXX Apparently, vendor's install: target is broken for us XXX
+do-install:
+	${INSTALL_DATA} ${WRKSRC}/include/ixp.h ${PREFIX}/include
+	${INSTALL_DATA} ${WRKSRC}/include/ixp_fcall.h ${PREFIX}/include
+	${INSTALL_PROGRAM} ${WRKSRC}/lib/libixp.so ${PREFIX}/lib/libixp.so.1
+	${INSTALL_PROGRAM} ${WRKSRC}/lib/libixp_pthread.so \
+		${PREFIX}/lib/libixp_pthread.so.1
+	${LN} -sf libixp.so.1 ${PREFIX}/lib/libixp.so
+	${LN} -sf libixp_pthread.so.1 ${PREFIX}/lib/libixp_pthread.so
+	${INSTALL_PROGRAM} ${WRKSRC}/cmd/ixpc.O ${PREFIX}/bin/ixpc
+	${INSTALL_MAN} ${WRKSRC}/man/ixpc.1 ${MANPREFIX}/man/man1
 
 .include <bsd.port.mk>
diff --git a/devel/libixp/distinfo b/devel/libixp/distinfo
index f51ba334b354..2fb7dab928c4 100644
--- a/devel/libixp/distinfo
+++ b/devel/libixp/distinfo
@@ -1,3 +1,3 @@
-MD5 (libixp-0.2.42.tar.bz2) = fd282b80b69fe3046c464a49ccd5bc07
-SHA256 (libixp-0.2.42.tar.bz2) = a459adc9bf7dff737a1c88c19d2ce7a9c8edbce12df2bd11525d5bb3e3caccd2
-SIZE (libixp-0.2.42.tar.bz2) = 19964
+MD5 (libixp-0.4.tar.gz) = 59d9e918adffaf4413b32ac4f66724fd
+SHA256 (libixp-0.4.tar.gz) = 171878dfb67ecf47866843c2d25882aeae44b2efd9a0d685f3b7ffba79ba842c
+SIZE (libixp-0.4.tar.gz) = 130229
diff --git a/devel/libixp/pkg-descr b/devel/libixp/pkg-descr
index e10f9b62e437..f42918ebd88e 100644
--- a/devel/libixp/pkg-descr
+++ b/devel/libixp/pkg-descr
@@ -1,8 +1,8 @@
 libixp is a stand-alone client/server 9P library including ixpc client
-which behaves like wmiir in the past. It consists of less than 2000
+which behaves like wmiir in the past.  It consists of less than 2000
 lines of code (including ixpc).
 
-libixp's server api is based heavily on that of Plan 9's lib9p, and the
+libixp's server API is based heavily on that of Plan 9's lib9p, and the
 two libraries export virtually identical data structures.
 
 WWW: http://www.suckless.org/wiki/libs
diff --git a/x11-wm/wmii/Makefile b/x11-wm/wmii/Makefile
index bf27f07cebee..427e5a38d049 100644
--- a/x11-wm/wmii/Makefile
+++ b/x11-wm/wmii/Makefile
@@ -6,33 +6,36 @@
 #
 
 PORTNAME=	wmii
-DISTVERSION=	3.5.1
+DISTVERSION=	3.6
 CATEGORIES=	x11-wm
-MASTER_SITES=	http://www.suckless.org/download/ CENKES
+MASTER_SITES=	http://www.suckless.org/download/
 
 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_ICONV=	yes
 USE_XLIB=	yes
 
-MAKE_ARGS=	PREFIX="${PREFIX}" X11LIB="${X11BASE}/lib" \
-		X11INC="${X11BASE}/include" CC="${CC}" \
-		MANPREFIX="${MANPREFIX}/man"
+MAKE_ARGS=	PREFIX="${PREFIX}" INCLUDE="${LOCALBASE}/include" \
+		INCX11="-I${X11BASE}/include" LIBX11="-L${X11BASE}/lib" \
+		CC="${CC} -c" LD="${CC}" LIBIXP="-lixp" STATIC="" \
+		LIBICONV="-liconv" 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}|' \
-		${WRKSRC}/config.mk
-	# Catch up with recent libixp
-	${REINPLACE_CMD} -E 's|\.data\.[[:alpha:]]+||g' \
-		${WRKSRC}/fs.c
+	${REINPLACE_CMD} -e 's|-lfmt -lutf|$${LIBX11} & -lX11|' \
+		${WRKSRC}/cmd/Makefile
+# Strip debug build options
+	${REINPLACE_CMD} -E 's| -g( -O0)?||' ${WRKSRC}/config.mk
+# Make actual compile/link command appear in the build log
+	${REINPLACE_CMD} -e 's|^COMPILE=|& noisycc=yes | ; \
+		s|^LINK=|& noisycc=yes |' ${WRKSRC}/mk/hdr.mk
 
 .include <bsd.port.mk>
diff --git a/x11-wm/wmii/distinfo b/x11-wm/wmii/distinfo
index 56a2a03714de..407d8d8992af 100644
--- a/x11-wm/wmii/distinfo
+++ b/x11-wm/wmii/distinfo
@@ -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 --git a/x11-wm/wmii/pkg-plist b/x11-wm/wmii/pkg-plist
index cb3da8002778..266899b8e5a5 100644
--- a/x11-wm/wmii/pkg-plist
+++ b/x11-wm/wmii/pkg-plist
@@ -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
+bin/wmiistartrc
+etc/wmii-3.5/rc.wmii
 etc/wmii-3.5/welcome
 etc/wmii-3.5/wmiirc
 @dirrm etc/wmii-3.5