- Update to version 3.1

- Provide better COMMENT and port description

8 files changed, 70 insertions, 214 deletions

diff --git a/x11-wm/wmii-devel/Makefile b/x11-wm/wmii-devel/Makefile
index 3895421d922b..937fb603e005 100644
--- a/x11-wm/wmii-devel/Makefile
+++ b/x11-wm/wmii-devel/Makefile
@@ -6,45 +6,31 @@
 #
 
 PORTNAME=	wmii
-DISTVERSION=	2
-PORTREVISION=	1
+DISTVERSION=	3.1
 CATEGORIES=	x11-wm
 MASTER_SITES=	http://wmii.de/download/
 
 MAINTAINER=	danfe@FreeBSD.org
-COMMENT=	The next generation of WMI window manager
+COMMENT=	A dynamic, minimalist window manager for X11
 
 USE_X_PREFIX=	yes
 
-MAKE_ARGS=	PREFIX="${PREFIX}" X11DIR="${X11BASE}" CC="${CC}" \
-		MANPREFIX="${PREFIX}/man"
+MAKE_ARGS=	PREFIX="${PREFIX}" X11LIB="${X11BASE}/lib" \
+		X11INC="${X11BASE}/include" CC="${CC}" \
+		MANPREFIX="${MANPREFIX}/man"
 
-OPTIONS=	CAIRO	"Enable Cairo rendering backend"	off \
-		STRL	"Use strlcpy()/strlcat() functions"	off
-
-MAN1=		wmibar.1 wmifs.1 wmii.1 wmikeys.1 wmimenu.1 wmir.1
-MAN5=		wmii.rc.5
-
-.include <bsd.port.pre.mk>
-
-# The cairo backend is not recommended in production use, because the cairo
-# library is still very buggy and causes crashes often.
-.if defined(WITH_CAIRO)
-LIB_DEPENDS=	cairo.2:${PORTSDIR}/graphics/cairo
-MAKE_ARGS+=	DRAW=cairo
-.endif
-
-.if defined(WITH_STRL)
-MAKE_ARGS+=	STRLCPY="strlcpy" STRLCAT="strlcat"
-.endif
+MAN1=		wmii.1 wmiimenu.1 wmiir.1 wmiiwm.1
 
 post-patch:
-	@${REINPLACE_CMD} -e 's|/usr/include|${LOCALBASE}/include|' \
-		-e 's|/usr/lib|${LOCALBASE}/lib|' \
-		-e 's|-O0 -g -Wall -pedantic|${CFLAGS}|; s|-g||' \
+	@${REINPLACE_CMD} -E 's|-O3|${CFLAGS}|; \
+		s|(-[LI])\$${PREFIX}|\1${LOCALBASE}|' \
 		${WRKSRC}/config.mk
-.if defined(WITH_CAIRO)
-	@${REINPLACE_CMD} -e 's,^#CAIRO,CAIRO,' ${WRKSRC}/config.mk
-.endif
+	@${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
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/x11-wm/wmii-devel/distinfo b/x11-wm/wmii-devel/distinfo
index c6e5d591c09b..2e7bcf03c57a 100644
--- a/x11-wm/wmii-devel/distinfo
+++ b/x11-wm/wmii-devel/distinfo
@@ -1,3 +1,3 @@
-MD5 (wmii-2.tar.gz) = e03379bb991260f11aab7f7c4d761dd3
-SHA256 (wmii-2.tar.gz) = c8c0b9dca00be16b83d8494559fe605f1ad0570e10158bd59cabc76261ff9d56
-SIZE (wmii-2.tar.gz) = 85475
+MD5 (wmii-3.1.tar.gz) = 108147a4283bd76d2a76e47bb0c96bac
+SHA256 (wmii-3.1.tar.gz) = 93428a4defcff9e14f28b907f227d5657066a983a9ef5f4a6d4e5fab56e7716b
+SIZE (wmii-3.1.tar.gz) = 60935
diff --git a/x11-wm/wmii-devel/pkg-descr b/x11-wm/wmii-devel/pkg-descr
index a35dc8fa6894..a0c91a63c876 100644
--- a/x11-wm/wmii-devel/pkg-descr
+++ b/x11-wm/wmii-devel/pkg-descr
@@ -1,14 +1,9 @@
-Window Manager Improved 2 is the next generation of the WMI project.  Due
-to a complete rewrite it is highly modularized and uses a new configuration
-and inter-process communication interface which is based on the 9p protocol
-from the Plan 9 operating system.  It achieves following goals:
+WMII is a dynamic window manager for X11.  It supports classic and dynamic
+window management with extended keyboard, mouse, and filesystem based remote
+control.  It replaces the workspace paradigm with a new tagging approach.
 
-  * Reduction of compile time
-  * Reduction of memory usage
-  * Reduction of lines of code
-  * Performance improvements
-  * Improved rendering capabilities (optional Cairo)
-  * Improved configuration and IPC interface (Libixp)
-  * Modularized components
+Its minimalist philosophy attempts to not exceed 10.000 lines of code
+(including all shipped utilities and libraries), to enforce simplicity and
+clarity.
 
 WWW: http://wmii.de/
diff --git a/x11-wm/wmii-devel/pkg-plist b/x11-wm/wmii-devel/pkg-plist
index f314f7a34054..263e0fb26f3b 100644
--- a/x11-wm/wmii-devel/pkg-plist
+++ b/x11-wm/wmii-devel/pkg-plist
@@ -1,65 +1,12 @@
-bin/wmibar
-bin/wmifs
 bin/wmii
+bin/wmiimenu
+bin/wmiipsel
+bin/wmiir
+bin/wmiisetsid
+bin/wmiiwarp
 bin/wmiiwm
-bin/wmikeys
-bin/wmimenu
-bin/wmiplumb
-bin/wmir
-bin/wmira
-bin/wmirefcard
-bin/wmiwarp
-etc/wmii/action/actions
-etc/wmii/action/www
-etc/wmii/action/term
-etc/wmii/action/tab
-etc/wmii/action/scr
-etc/wmii/action/quit
-etc/wmii/action/ptoggle
-etc/wmii/action/programs
-etc/wmii/action/presize
-etc/wmii/action/premove
-etc/wmii/action/pprev
-etc/wmii/action/pnext
-etc/wmii/action/pnew
-etc/wmii/action/plumburl
-etc/wmii/action/plumbgoogle
-etc/wmii/action/pageupdate
-etc/wmii/action/pager
-etc/wmii/action/p
-etc/wmii/action/mouse
-etc/wmii/action/max
-etc/wmii/action/lvsplit
-etc/wmii/action/ltiled
-etc/wmii/action/lock
-etc/wmii/action/lmax
-etc/wmii/action/lgrid
-etc/wmii/action/lfloat
-etc/wmii/action/kresize
-etc/wmii/action/knorm
-etc/wmii/action/kmove
-etc/wmii/action/kbare
-etc/wmii/action/icons
-etc/wmii/action/ftoggle
-etc/wmii/action/fresize
-etc/wmii/action/fprev
-etc/wmii/action/fnext
-etc/wmii/action/detach
-etc/wmii/action/cprev
-etc/wmii/action/cnext
-etc/wmii/action/close
-etc/wmii/action/clientupdate
-etc/wmii/action/border
-etc/wmii/action/attach
-etc/wmii/action/zoom
-etc/wmii/bar
-etc/wmii/menu
-etc/wmii/keys
-etc/wmii/rc
-etc/wmii/rc.conf
-etc/wmii/status.sh
-etc/wmii/wm
-@dirrm etc/wmii/action
-@dirrm etc/wmii
-%%DATADIR%%/welcome.txt
-@dirrm %%DATADIR%%
+etc/wmii-3/quit
+etc/wmii-3/status
+etc/wmii-3/welcome
+etc/wmii-3/wmiirc
+@dirrm etc/wmii-3
diff --git a/x11-wm/wmii/Makefile b/x11-wm/wmii/Makefile
index 3895421d922b..937fb603e005 100644
--- a/x11-wm/wmii/Makefile
+++ b/x11-wm/wmii/Makefile
@@ -6,45 +6,31 @@
 #
 
 PORTNAME=	wmii
-DISTVERSION=	2
-PORTREVISION=	1
+DISTVERSION=	3.1
 CATEGORIES=	x11-wm
 MASTER_SITES=	http://wmii.de/download/
 
 MAINTAINER=	danfe@FreeBSD.org
-COMMENT=	The next generation of WMI window manager
+COMMENT=	A dynamic, minimalist window manager for X11
 
 USE_X_PREFIX=	yes
 
-MAKE_ARGS=	PREFIX="${PREFIX}" X11DIR="${X11BASE}" CC="${CC}" \
-		MANPREFIX="${PREFIX}/man"
+MAKE_ARGS=	PREFIX="${PREFIX}" X11LIB="${X11BASE}/lib" \
+		X11INC="${X11BASE}/include" CC="${CC}" \
+		MANPREFIX="${MANPREFIX}/man"
 
-OPTIONS=	CAIRO	"Enable Cairo rendering backend"	off \
-		STRL	"Use strlcpy()/strlcat() functions"	off
-
-MAN1=		wmibar.1 wmifs.1 wmii.1 wmikeys.1 wmimenu.1 wmir.1
-MAN5=		wmii.rc.5
-
-.include <bsd.port.pre.mk>
-
-# The cairo backend is not recommended in production use, because the cairo
-# library is still very buggy and causes crashes often.
-.if defined(WITH_CAIRO)
-LIB_DEPENDS=	cairo.2:${PORTSDIR}/graphics/cairo
-MAKE_ARGS+=	DRAW=cairo
-.endif
-
-.if defined(WITH_STRL)
-MAKE_ARGS+=	STRLCPY="strlcpy" STRLCAT="strlcat"
-.endif
+MAN1=		wmii.1 wmiimenu.1 wmiir.1 wmiiwm.1
 
 post-patch:
-	@${REINPLACE_CMD} -e 's|/usr/include|${LOCALBASE}/include|' \
-		-e 's|/usr/lib|${LOCALBASE}/lib|' \
-		-e 's|-O0 -g -Wall -pedantic|${CFLAGS}|; s|-g||' \
+	@${REINPLACE_CMD} -E 's|-O3|${CFLAGS}|; \
+		s|(-[LI])\$${PREFIX}|\1${LOCALBASE}|' \
 		${WRKSRC}/config.mk
-.if defined(WITH_CAIRO)
-	@${REINPLACE_CMD} -e 's,^#CAIRO,CAIRO,' ${WRKSRC}/config.mk
-.endif
+	@${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
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/x11-wm/wmii/distinfo b/x11-wm/wmii/distinfo
index c6e5d591c09b..2e7bcf03c57a 100644
--- a/x11-wm/wmii/distinfo
+++ b/x11-wm/wmii/distinfo
@@ -1,3 +1,3 @@
-MD5 (wmii-2.tar.gz) = e03379bb991260f11aab7f7c4d761dd3
-SHA256 (wmii-2.tar.gz) = c8c0b9dca00be16b83d8494559fe605f1ad0570e10158bd59cabc76261ff9d56
-SIZE (wmii-2.tar.gz) = 85475
+MD5 (wmii-3.1.tar.gz) = 108147a4283bd76d2a76e47bb0c96bac
+SHA256 (wmii-3.1.tar.gz) = 93428a4defcff9e14f28b907f227d5657066a983a9ef5f4a6d4e5fab56e7716b
+SIZE (wmii-3.1.tar.gz) = 60935
diff --git a/x11-wm/wmii/pkg-descr b/x11-wm/wmii/pkg-descr
index a35dc8fa6894..a0c91a63c876 100644
--- a/x11-wm/wmii/pkg-descr
+++ b/x11-wm/wmii/pkg-descr
@@ -1,14 +1,9 @@
-Window Manager Improved 2 is the next generation of the WMI project.  Due
-to a complete rewrite it is highly modularized and uses a new configuration
-and inter-process communication interface which is based on the 9p protocol
-from the Plan 9 operating system.  It achieves following goals:
+WMII is a dynamic window manager for X11.  It supports classic and dynamic
+window management with extended keyboard, mouse, and filesystem based remote
+control.  It replaces the workspace paradigm with a new tagging approach.
 
-  * Reduction of compile time
-  * Reduction of memory usage
-  * Reduction of lines of code
-  * Performance improvements
-  * Improved rendering capabilities (optional Cairo)
-  * Improved configuration and IPC interface (Libixp)
-  * Modularized components
+Its minimalist philosophy attempts to not exceed 10.000 lines of code
+(including all shipped utilities and libraries), to enforce simplicity and
+clarity.
 
 WWW: http://wmii.de/
diff --git a/x11-wm/wmii/pkg-plist b/x11-wm/wmii/pkg-plist
index f314f7a34054..263e0fb26f3b 100644
--- a/x11-wm/wmii/pkg-plist
+++ b/x11-wm/wmii/pkg-plist
@@ -1,65 +1,12 @@
-bin/wmibar
-bin/wmifs
 bin/wmii
+bin/wmiimenu
+bin/wmiipsel
+bin/wmiir
+bin/wmiisetsid
+bin/wmiiwarp
 bin/wmiiwm
-bin/wmikeys
-bin/wmimenu
-bin/wmiplumb
-bin/wmir
-bin/wmira
-bin/wmirefcard
-bin/wmiwarp
-etc/wmii/action/actions
-etc/wmii/action/www
-etc/wmii/action/term
-etc/wmii/action/tab
-etc/wmii/action/scr
-etc/wmii/action/quit
-etc/wmii/action/ptoggle
-etc/wmii/action/programs
-etc/wmii/action/presize
-etc/wmii/action/premove
-etc/wmii/action/pprev
-etc/wmii/action/pnext
-etc/wmii/action/pnew
-etc/wmii/action/plumburl
-etc/wmii/action/plumbgoogle
-etc/wmii/action/pageupdate
-etc/wmii/action/pager
-etc/wmii/action/p
-etc/wmii/action/mouse
-etc/wmii/action/max
-etc/wmii/action/lvsplit
-etc/wmii/action/ltiled
-etc/wmii/action/lock
-etc/wmii/action/lmax
-etc/wmii/action/lgrid
-etc/wmii/action/lfloat
-etc/wmii/action/kresize
-etc/wmii/action/knorm
-etc/wmii/action/kmove
-etc/wmii/action/kbare
-etc/wmii/action/icons
-etc/wmii/action/ftoggle
-etc/wmii/action/fresize
-etc/wmii/action/fprev
-etc/wmii/action/fnext
-etc/wmii/action/detach
-etc/wmii/action/cprev
-etc/wmii/action/cnext
-etc/wmii/action/close
-etc/wmii/action/clientupdate
-etc/wmii/action/border
-etc/wmii/action/attach
-etc/wmii/action/zoom
-etc/wmii/bar
-etc/wmii/menu
-etc/wmii/keys
-etc/wmii/rc
-etc/wmii/rc.conf
-etc/wmii/status.sh
-etc/wmii/wm
-@dirrm etc/wmii/action
-@dirrm etc/wmii
-%%DATADIR%%/welcome.txt
-@dirrm %%DATADIR%%
+etc/wmii-3/quit
+etc/wmii-3/status
+etc/wmii-3/welcome
+etc/wmii-3/wmiirc
+@dirrm etc/wmii-3