diff --git a/x11/wmii/Makefile b/x11/wmii/Makefile index 9836ca2f581..69464c4f53b 100644 --- a/x11/wmii/Makefile +++ b/x11/wmii/Makefile @@ -1,12 +1,12 @@ -# $OpenBSD: Makefile,v 1.7 2007/09/15 20:04:25 merdely Exp $ +# $OpenBSD: Makefile,v 1.8 2008/03/15 12:52:50 mcbride Exp $ COMMENT= dynamic window manager -DISTNAME= wmii-3.1 -PKGNAME= ${DISTNAME}p2 +DISTNAME= wmii-3.6 +PKGNAME= ${DISTNAME} CATEGORIES= x11 -HOMEPAGE= http://wmii.suckless.org +HOMEPAGE= http://www.suckless.org # MIT/X PERMIT_PACKAGE_CDROM= Yes @@ -18,15 +18,16 @@ MASTER_SITES= ${HOMEPAGE}/download/ WANTLIB= X11 c m +LIB_DEPENDS= ixp.>=0.4::devel/libixp \ + iconv.>=4.0::converters/libiconv + +RUN_DEPENDS= ::x11/dmenu + 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 +FAKE_FLAGS= PREFIX=${WRKINST}/usr/local \ + MAN=${WRKINST}/usr/local/man .include diff --git a/x11/wmii/distinfo b/x11/wmii/distinfo index a3bb6591e0c..2c0a2693f61 100644 --- a/x11/wmii/distinfo +++ b/x11/wmii/distinfo @@ -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-3.6.tar.gz) = nRegmHH62pmLTZidkxi79Q== +RMD160 (wmii-3.6.tar.gz) = KUYrnsx9aOjgDl8+7ILCpG4milI= +SHA1 (wmii-3.6.tar.gz) = SOJPhPYLnGzjf3FaRrwy410ghvM= +SHA256 (wmii-3.6.tar.gz) = RvObeIxe9GlQQLNsx9nFOdsDBrr8TYzv3FmA7UMxshY= +SIZE (wmii-3.6.tar.gz) = 208249 diff --git a/x11/wmii/patches/patch-cmd_wm_area_c b/x11/wmii/patches/patch-cmd_wm_area_c deleted file mode 100644 index 4e4de5134d4..00000000000 --- a/x11/wmii/patches/patch-cmd_wm_area_c +++ /dev/null @@ -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]; - diff --git a/x11/wmii/patches/patch-config_mk b/x11/wmii/patches/patch-config_mk index ff60409a36c..00cc2ee4046 100644 --- a/x11/wmii/patches/patch-config_mk +++ b/x11/wmii/patches/patch-config_mk @@ -1,22 +1,29 @@ ---- config.mk.orig Sat Jun 17 13:44:29 2006 -+++ config.mk Sat Jun 17 19:28:41 2006 -@@ -2,8 +2,8 @@ +$OpenBSD: patch-config_mk,v 1.3 2008/03/15 12:52:50 mcbride Exp $ +--- config.mk.orig Fri Nov 16 06:59:15 2007 ++++ config.mk Tue Feb 19 03:56:08 2008 +@@ -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/ + 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 +@@ -31,9 +31,8 @@ P9PATHS = ${PLAN9}:"'$${HOME}/plan9'":/usr/local/plan9 - # 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} + INCX11 = -I/usr/X11R6/include + LIBX11 = -L/usr/X11R6/lib -lX11 +-LIBICONV = # Leave blank if your libc includes iconv (glibc does) +-LIBIXP = ${ROOT}/libixp/libixp.a +-LIBIXP = ${LIBDIR}/libixp.a ++LIBICONV = /usr/local/lib/libiconv.a ++LIBIXP = /usr/local/lib/libixp.a + # Solaris + #CFLAGS = -fast ${INCS} -DVERSION=\"${VERSION}\" diff --git a/x11/wmii/patches/patch-libcext_Makefile b/x11/wmii/patches/patch-libcext_Makefile deleted file mode 100644 index d3f37994594..00000000000 --- a/x11/wmii/patches/patch-libcext_Makefile +++ /dev/null @@ -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} - diff --git a/x11/wmii/patches/patch-libcext_cext_h b/x11/wmii/patches/patch-libcext_cext_h deleted file mode 100644 index 641fd497f57..00000000000 --- a/x11/wmii/patches/patch-libcext_cext_h +++ /dev/null @@ -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 - -+#include -+#include -+ - #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); diff --git a/x11/wmii/pkg/PLIST b/x11/wmii/pkg/PLIST index e4a787b5279..18df287b787 100644 --- a/x11/wmii/pkg/PLIST +++ b/x11/wmii/pkg/PLIST @@ -1,23 +1,19 @@ -@comment $OpenBSD: PLIST,v 1.1.1.1 2006/06/16 21:36:03 steven Exp $ +@comment $OpenBSD: PLIST,v 1.2 2008/03/15 12:52:50 mcbride Exp $ 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 -@man man/man1/wmiimenu.1 +@man man/man1/wmiiloop.1 @man man/man1/wmiir.1 -@man man/man1/wmiiwm.1 -share/examples/wmii-3/ -@sample ${SYSCONFDIR}/wmii-3/ +share/examples/wmii-3.5/ +@sample ${SYSCONFDIR}/wmii-3.5/ @mode 755 -share/examples/wmii-3/quit -@sample ${SYSCONFDIR}/wmii-3/quit -share/examples/wmii-3/status -@sample ${SYSCONFDIR}/wmii-3/status -share/examples/wmii-3/welcome -@sample ${SYSCONFDIR}/wmii-3/welcome -share/examples/wmii-3/wmiirc -@sample ${SYSCONFDIR}/wmii-3/wmiirc +share/examples/wmii-3.5/rc.wmii +@sample ${SYSCONFDIR}/wmii-3.5/rc.wmii +share/examples/wmii-3.5/welcome +@sample ${SYSCONFDIR}/wmii-3.5/welcome +share/examples/wmii-3.5/wmiirc +@sample ${SYSCONFDIR}/wmii-3.5/wmiirc