On Thu, Sep 13, 2007 at 11:43:11AM +0200, Catalin Stoian wrote: > Can someone please update this wm in the ports tree to the latest > version ? It is still a very old and unsupported version being present > at the moment (3.1). There's already an unofficial one here: > http://marc.info/?l=openbsd-ports&m=118151081820139&w=2 that I've > tested and works, but it's not in the ports tree yet. I think the 4.2 > release would really deserve to have such a wonderful window manager > in the official ports tree and as a package. Thanks in advance,
way, way too late for 4.2 release. here's that port as a diff against the x11/wmii in-tree port, with some tweaks. testing on amd64 looks good so far. Benoit, are you going to take over maintainership of this? -- [EMAIL PROTECTED] SDF Public Access UNIX System - http://sdf.lonestar.org Index: Makefile =================================================================== RCS file: /home/cvs/OpenBSD/ports/x11/wmii/Makefile,v retrieving revision 1.6 diff -u -r1.6 Makefile --- Makefile 17 Jun 2007 09:06:03 -0000 1.6 +++ Makefile 13 Sep 2007 10:23:08 -0000 @@ -1,12 +1,12 @@ -# $OpenBSD: Makefile,v 1.6 2007/06/17 09:06:03 steven Exp $ +# $OpenBSD$ -COMMENT= "dynamic window manager" +COMMENT= dynamic window manager -DISTNAME= wmii-3.1 -PKGNAME= ${DISTNAME}p2 -CATEGORIES= x11 +DISTNAME= wmii+ixp-20070516 +PKGNAME= ${DISTNAME:S/+ixp//} +CATEGORIES= x11 -HOMEPAGE= http://wmii.suckless.org +HOMEPAGE= http://www.suckless.org/wiki/wmii # MIT/X PERMIT_PACKAGE_CDROM= Yes @@ -14,19 +14,13 @@ PERMIT_DISTFILES_CDROM= Yes PERMIT_DISTFILES_FTP= Yes -MASTER_SITES= ${HOMEPAGE}/download/ +WANTLIB= X11 Xext c m -WANTLIB= X11 c m +MASTER_SITES= http://www.suckless.org/snaps/ +EXTRACT_SUFX= .tgz -USE_X11= Yes - -NO_REGRESS= Yes - -FAKE_FLAGS= SYSCONFDIR=${SYSCONFDIR} - -post-install: - ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/wmii-3 - ${INSTALL_DATA} ${WRKINST}${SYSCONFDIR}/wmii-3/* \ - ${PREFIX}/share/examples/wmii-3 +USE_X11= Yes +NO_REGRESS= Yes .include <bsd.port.mk> + Index: distinfo =================================================================== RCS file: /home/cvs/OpenBSD/ports/x11/wmii/distinfo,v retrieving revision 1.3 diff -u -r1.3 distinfo --- distinfo 5 Apr 2007 17:36:25 -0000 1.3 +++ distinfo 13 Sep 2007 10:23:08 -0000 @@ -1,5 +1,5 @@ -MD5 (wmii-3.1.tar.gz) = EIFHpCg7120qduR7sMlrrA== -RMD160 (wmii-3.1.tar.gz) = xauqCYKwNrja+iJHUbgNgmXBn1k= -SHA1 (wmii-3.1.tar.gz) = NjtSIH0lBdWSGtvNqYE27iQKZz0= -SHA256 (wmii-3.1.tar.gz) = k0KKTe/P+eFPKLkH8ifVZXBmqYOp719KbU5fq1bncWs= -SIZE (wmii-3.1.tar.gz) = 60935 +MD5 (wmii+ixp-20070516.tgz) = LQvXOHCk0811xEVOBNvT2w== +RMD160 (wmii+ixp-20070516.tgz) = bl2myZt3Aj6z6F+NKnfV9duk8tQ= +SHA1 (wmii+ixp-20070516.tgz) = n1AfIwU+FaAWHAUNm3sRul+wBsE= +SHA256 (wmii+ixp-20070516.tgz) = iuxAcxx794J7VzOvHad4fQJzS6Vrv+RZjpy/4iRGkQQ= +SIZE (wmii+ixp-20070516.tgz) = 84114 Index: patches/patch-cmd_wm_area_c =================================================================== RCS file: patches/patch-cmd_wm_area_c diff -N patches/patch-cmd_wm_area_c --- patches/patch-cmd_wm_area_c 17 Jun 2006 17:42:03 -0000 1.2 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,11 +0,0 @@ ---- cmd/wm/area.c.orig Sat Jun 17 13:44:30 2006 -+++ cmd/wm/area.c Sat Jun 17 19:39:01 2006 -@@ -150,7 +150,7 @@ place_client(Area *a, Client *c) - static unsigned int mx, my; - static Bool *field = nil; - Bool fit = False; -- unsigned int i, j, k, x, y, maxx, maxy, dx, dy, cx, cy, diff; -+ unsigned int i, j, k, x, y, maxx, maxy, dx, dy, cx = 0, cy = 0, diff; - XPoint p1 = {0, 0}, p2 = {0, 0}; - Frame *f = c->frame.data[c->sel]; - Index: patches/patch-config_mk =================================================================== RCS file: /home/cvs/OpenBSD/ports/x11/wmii/patches/patch-config_mk,v retrieving revision 1.2 diff -u -r1.2 patch-config_mk --- patches/patch-config_mk 17 Jun 2006 17:42:03 -0000 1.2 +++ patches/patch-config_mk 13 Sep 2007 10:23:08 -0000 @@ -1,22 +1,28 @@ ---- config.mk.orig Sat Jun 17 13:44:29 2006 -+++ config.mk Sat Jun 17 19:28:41 2006 -@@ -2,8 +2,8 @@ +$OpenBSD$ +--- config.mk.orig Wed May 9 19:04:41 2007 ++++ config.mk Sun Jun 10 22:23:06 2007 +@@ -1,10 +1,10 @@ + # Customize below to fit your system # paths - PREFIX = /usr/local --CONFPREFIX = ${PREFIX}/etc --MANPREFIX = ${PREFIX}/share/man -+CONFPREFIX = ${SYSCONFDIR} -+MANPREFIX = ${PREFIX}/man +-PREFIX = /usr/local ++#PREFIX = /usr/local + BIN = ${PREFIX}/bin +-MAN = ${PREFIX}/share/man +-ETC = ${PREFIX}/etc ++MAN = ${PREFIX}/man ++ETC = ${PREFIX}/share/examples/wmii + LIBDIR = ${PREFIX}/lib + INCLUDE = ${PREFIX}/include - X11INC = /usr/X11R6/include - X11LIB = /usr/X11R6/lib -@@ -14,7 +14,7 @@ VERSION = 3.1 - LIBS = -L${PREFIX}/lib -L/usr/lib -lc -L${X11LIB} -lX11 +@@ -29,8 +29,8 @@ AR = ar crs - # Linux/BSD --CFLAGS = -O3 -I. -I${PREFIX}/include -I/usr/include -I${X11INC} \ -+CFLAGS+= -I. -I${PREFIX}/include -I/usr/include -I${X11INC} \ - -DVERSION=\"${VERSION}\" - LDFLAGS = ${LIBS} + P9PATHS = /usr/local/plan9 /usr/local/9 /opt/plan9 /opt/9 /usr/plan9 /usr/9 +-INCX11 = -I/usr/X11R6/include +-LIBX11 = -L/usr/X11R6/lib -lX11 ++INCX11 = -I${X11BASE}/include ++LIBX11 = -L${X11BASE}/lib -lX11 + LIBIXP = ${ROOT}/libixp/libixp.a + + # Solaris Index: patches/patch-libcext_Makefile =================================================================== RCS file: patches/patch-libcext_Makefile diff -N patches/patch-libcext_Makefile --- patches/patch-libcext_Makefile 17 Jun 2006 17:42:03 -0000 1.2 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,11 +0,0 @@ ---- libcext/Makefile.orig Sat Jun 17 17:32:13 2006 -+++ libcext/Makefile Sat Jun 17 17:32:36 2006 -@@ -3,7 +3,7 @@ - - include ../config.mk - --SRC = emallocz.c strlcat.c strlcpy.c strtonum.c tokenize.c trim.c vector.c -+SRC = emallocz.c tokenize.c trim.c vector.c - - OBJ = ${SRC:.c=.o} - Index: patches/patch-libcext_cext_h =================================================================== RCS file: patches/patch-libcext_cext_h diff -N patches/patch-libcext_cext_h --- patches/patch-libcext_cext_h 17 Jun 2006 17:42:03 -0000 1.2 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,37 +0,0 @@ ---- libcext/cext.h.orig Sat Jun 17 13:44:30 2006 -+++ libcext/cext.h Sat Jun 17 19:39:01 2006 -@@ -5,6 +5,9 @@ - - #include <sys/types.h> - -+#include <string.h> -+#include <stdlib.h> -+ - #ifndef nil - #define nil (void *)0 - #endif -@@ -12,15 +15,18 @@ - /* emallocz.c */ - void *cext_emallocz(unsigned int size); - --/* strlcat.c */ --unsigned int cext_strlcat(char *dst, const char *src, unsigned int siz); -+/* strlcat.c -+unsigned int cext_strlcat(char *dst, const char *src, unsigned int siz); */ -+#define cext_strlcat strlcat - --/* strlcpy.c */ --unsigned int cext_strlcpy(char *dst, const char *src, unsigned int siz); -+/* strlcpy.c -+unsigned int cext_strlcpy(char *dst, const char *src, unsigned int siz); */ -+#define cext_strlcpy strlcpy - --/* strtonum.c */ -+/* strtonum.c - long long cext_strtonum(const char *numstr, long long minval, -- long long maxval, const char **errstrp); -+ long long maxval, const char **errstrp); */ -+#define cext_strtonum strtonum - - /* tokenize.c */ - unsigned int cext_tokenize(char **result, unsigned int reslen, char *str, char delim); Index: pkg/DESCR =================================================================== RCS file: /home/cvs/OpenBSD/ports/x11/wmii/pkg/DESCR,v retrieving revision 1.1.1.1 diff -u -r1.1.1.1 DESCR --- pkg/DESCR 16 Jun 2006 21:36:03 -0000 1.1.1.1 +++ pkg/DESCR 13 Sep 2007 10:23:08 -0000 @@ -1,4 +1,8 @@ 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. +dynamic window management with extended keyboard, mouse, and filesystem +based remote control. It replaces the workspace paradigm with a new +tagging approach. + +Its minimalist philosophy attempts not to exceed 10.000 lines of code +(including all shipped utilities and libraries), to enforce simplicity +and clarity. Index: pkg/PLIST =================================================================== RCS file: /home/cvs/OpenBSD/ports/x11/wmii/pkg/PLIST,v retrieving revision 1.1.1.1 diff -u -r1.1.1.1 PLIST --- pkg/PLIST 16 Jun 2006 21:36:03 -0000 1.1.1.1 +++ pkg/PLIST 13 Sep 2007 10:23:08 -0000 @@ -1,23 +1,20 @@ [EMAIL PROTECTED] $OpenBSD: PLIST,v 1.1.1.1 2006/06/16 21:36:03 steven Exp $ [EMAIL PROTECTED] $OpenBSD$ bin/wmii -bin/wmiimenu -bin/wmiipsel +bin/wmii9menu +bin/wmii9rc +bin/wmiiloop bin/wmiir -bin/wmiisetsid -bin/wmiiwarp -bin/wmiiwm +bin/wmiistartrc @man man/man1/wmii.1 [EMAIL PROTECTED] man/man1/wmiimenu.1 [EMAIL PROTECTED] man/man1/wmiiloop.1 @man man/man1/wmiir.1 @man man/man1/wmiiwm.1 -share/examples/wmii-3/ [EMAIL PROTECTED] ${SYSCONFDIR}/wmii-3/ [EMAIL PROTECTED] 755 -share/examples/wmii-3/quit [EMAIL PROTECTED] ${SYSCONFDIR}/wmii-3/quit -share/examples/wmii-3/status [EMAIL PROTECTED] ${SYSCONFDIR}/wmii-3/status -share/examples/wmii-3/welcome [EMAIL PROTECTED] ${SYSCONFDIR}/wmii-3/welcome -share/examples/wmii-3/wmiirc [EMAIL PROTECTED] ${SYSCONFDIR}/wmii-3/wmiirc +share/examples/wmii/ +share/examples/wmii/wmii-3.5/ +share/examples/wmii/wmii-3.5/rc.wmii +share/examples/wmii/wmii-3.5/welcome +share/examples/wmii/wmii-3.5/wmiirc [EMAIL PROTECTED] ${SYSCONFDIR}/wmii-3.5/ [EMAIL PROTECTED] ${SYSCONFDIR}/wmii-3.5/rc.wmii [EMAIL PROTECTED] ${SYSCONFDIR}/wmii-3.5/welcome [EMAIL PROTECTED] ${SYSCONFDIR}/wmii-3.5/wmiirc
