Hi, attached you'll find the long due updates to x11/wmii (version 3.9.2) and its dependency devel/libixp (version 0.5).
I stripped all non-essential parts from wmii - especially the alternative wmiirc scripts (written in python, ruby, rc) and libwmii_hack to keep the dependencies to a minimum. If someone wants/needs them, I might have a look into it, but until then it isn't worth the trouble (their custom build system is a mess IMHO). One thing I'm not sure about is ranlib(1): I removed a patch that added a ranlib-run for each library that's built, as ar(1) is run with option 's' anyway. According to the man pages this should be alright, but I might be missing something. Another side note: wmii includes _modified_ versions of libutf, libfmt, libbio and libregexp9. The original libraries are already in the ports tree, but don't work for wmii - even when updated to the "latest" version. Thus I didn't use them to build wmii, which shouldn't be a problem as they're only linked statically. As soon as rsc@plan9port provides proper distfiles I'm going to provide updates for those ports nonetheless. Regards, Oliver Klima P.S.: Part of the included patches have been send upstream, but I haven't got feedback yet.
diff -Naur ports/devel/libixp/Makefile ports.new/devel/libixp/Makefile --- ports/devel/libixp/Makefile Mon Nov 15 20:45:59 2010 +++ ports.new/devel/libixp/Makefile Mon Mar 7 20:55:37 2011 @@ -1,28 +1,29 @@ -# $OpenBSD: Makefile,v 1.6 2010/11/15 19:45:59 espie Exp $ +# $OpenBSD: Makefile,v 1.4 2009/03/11 19:41:03 martin Exp $ -COMMENT= stand-alone client/server 9P library +PORTNAME = libixp +RELEASE = 0.5 -DISTNAME= libixp-0.4 -REVISION = 1 -CATEGORIES= devel +CATEGORIES = devel +COMMENT = stand-alone client/server 9P library -HOMEPAGE= http://www.suckless.org +DISTNAME = ${PORTNAME}-${RELEASE} +REVISION = -# MIT/X, except intmap.c under Plan 9 License -PERMIT_PACKAGE_CDROM= Yes -PERMIT_PACKAGE_FTP= Yes -PERMIT_DISTFILES_CDROM= Yes -PERMIT_DISTFILES_FTP= Yes +HOMEPAGE = http://www.suckless.org/ +MASTER_SITES = http://dl.suckless.org/libs/ -MASTER_SITES= ${HOMEPAGE}/download/ +# MIT/X and Plan 9 License for intmap.c +PERMIT_PACKAGE_CDROM = Yes +PERMIT_PACKAGE_FTP = Yes +PERMIT_DISTFILES_CDROM = Yes +PERMIT_DISTFILES_FTP = Yes -WANTLIB= c +USE_GROFF = Yes -NO_REGRESS= Yes -USE_GROFF = Yes +WANTLIB = c -pre-configure: - @perl -pi -e 's,!!CFLAGS!!,${CFLAGS},g;' \ - -e 's,!!CC!!,${CC},g' ${WRKSRC}/config.mk +MAKE_FLAGS = noisycc=1 + +NO_REGRESS = Yes .include <bsd.port.mk> diff -Naur ports/devel/libixp/distinfo ports.new/devel/libixp/distinfo --- ports/devel/libixp/distinfo Sat Mar 15 13:38:53 2008 +++ ports.new/devel/libixp/distinfo Mon Mar 7 20:54:18 2011 @@ -1,5 +1,5 @@ -MD5 (libixp-0.4.tar.gz) = WdnpGK3/r0QTsyrE9mck/Q== -RMD160 (libixp-0.4.tar.gz) = JA/hyxbqwjzwC/+5PfGxMgHJwbo= -SHA1 (libixp-0.4.tar.gz) = 7Brf60xfUC38sbmfz0QIQezuL5o= -SHA256 (libixp-0.4.tar.gz) = Fxh437Z+z0eGaEPC0liCrq5Esu/ZoNaF87f/unm6hCw= -SIZE (libixp-0.4.tar.gz) = 130229 +MD5 (libixp-0.5.tar.gz) = KjlDEMIJYFulTs9eq1GL/w== +RMD160 (libixp-0.5.tar.gz) = g2cPgpof8YXy33RP0z1WZJsrKzU= +SHA1 (libixp-0.5.tar.gz) = bLnT58YyOs1MOHb2oBrV2K+eHGo= +SHA256 (libixp-0.5.tar.gz) = ZfTwu2foPL0UFPKX4iZIyGf5FOJJi9uuOv3A+DviHks= +SIZE (libixp-0.5.tar.gz) = 142064 diff -Naur ports/devel/libixp/patches/patch-cmd_ixpc_c ports.new/devel/libixp/patches/patch-cmd_ixpc_c --- ports/devel/libixp/patches/patch-cmd_ixpc_c Wed Mar 11 20:41:03 2009 +++ ports.new/devel/libixp/patches/patch-cmd_ixpc_c Thu Jan 1 01:00:00 1970 @@ -1,88 +0,0 @@ -$OpenBSD: patch-cmd_ixpc_c,v 1.1 2009/03/11 19:41:03 martin Exp $ ---- cmd/ixpc.c.orig Mon Nov 5 15:36:22 2007 -+++ cmd/ixpc.c Thu Mar 5 21:22:18 2009 -@@ -14,8 +14,7 @@ - #define fatal(...) ixp_eprint("ixpc: fatal: " __VA_ARGS__); \ - - char *argv0; --#define ARGBEGIN int _argi, _argtmp, _inargv=0; char *_argv; \ -- if(!argv0)argv0=ARGF(); _inargv=1; \ -+#define ARGBEGIN if(!argv0)argv0=ARGF(); _inargv=1; \ - while(argc && argv[0][0] == '-') { \ - _argi=1; _argv=*argv++; argc--; \ - while(_argv[_argi]) switch(_argv[_argi++]) -@@ -117,7 +116,8 @@ print_stat(Stat *s, int details) { - static int - xwrite(int argc, char *argv[]) { - IxpCFid *fid; -- char *file; -+ char *file, *_argv; -+ int _argi, _argtmp, _inargv=0; - - ARGBEGIN{ - default: -@@ -136,8 +136,8 @@ xwrite(int argc, char *argv[]) { - static int - xawrite(int argc, char *argv[]) { - IxpCFid *fid; -- char *file, *buf, *arg; -- int nbuf, mbuf, len; -+ char *file, *buf, *arg, *_argv; -+ int nbuf, mbuf, len, _argi, _argtmp, _inargv=0; - - ARGBEGIN{ - default: -@@ -173,7 +173,8 @@ xawrite(int argc, char *argv[]) { - static int - xcreate(int argc, char *argv[]) { - IxpCFid *fid; -- char *file; -+ char *file, *_argv; -+ int _argi, _argtmp, _inargv=0; - - ARGBEGIN{ - default: -@@ -193,7 +194,8 @@ xcreate(int argc, char *argv[]) { - - static int - xremove(int argc, char *argv[]) { -- char *file; -+ char *file, *_argv; -+ int _argi, _argtmp, _inargv=0; - - ARGBEGIN{ - default: -@@ -209,8 +211,8 @@ xremove(int argc, char *argv[]) { - static int - xread(int argc, char *argv[]) { - IxpCFid *fid; -- char *file, *buf; -- int count; -+ char *file, *buf, *_argv; -+ int count, _argi, _argtmp, _inargv=0; - - ARGBEGIN{ - default: -@@ -237,8 +239,8 @@ xls(int argc, char *argv[]) { - IxpMsg m; - Stat *stat; - IxpCFid *fid; -- char *file, *buf; -- int lflag, dflag, count, nstat, mstat, i; -+ char *file, *buf, *_argv; -+ int lflag, dflag, count, nstat, mstat, i, _argi, _argtmp, _inargv=0; - - lflag = dflag = 0; - -@@ -313,9 +315,9 @@ struct exectab { - - int - main(int argc, char *argv[]) { -- char *cmd, *address; -+ char *cmd, *address, *_argv; - exectab *tab; -- int ret; -+ int ret, _argi, _argtmp, _inargv=0; - - address = getenv("IXP_ADDRESS"); - diff -Naur ports/devel/libixp/patches/patch-config_mk ports.new/devel/libixp/patches/patch-config_mk --- ports/devel/libixp/patches/patch-config_mk Wed Mar 11 20:41:03 2009 +++ ports.new/devel/libixp/patches/patch-config_mk Mon Mar 7 20:54:18 2011 @@ -1,35 +1,17 @@ $OpenBSD: patch-config_mk,v 1.3 2009/03/11 19:41:03 martin Exp $ ---- config.mk.orig Mon Nov 5 15:36:22 2007 -+++ config.mk Tue Mar 10 23:02:26 2009 -@@ -11,9 +11,9 @@ RUBYINC = -I/usr/local/lib/ruby/1.8/i386-freebsd6 - TASKINC = -I${HOME}/libtask +--- config.mk.orig Sun Sep 21 05:39:51 2008 ++++ config.mk Wed Mar 2 21:32:43 2011 +@@ -5,10 +5,10 @@ COMPONENTS = \ + libixp_pthread - # paths + # Paths -PREFIX = /usr/local +#PREFIX = /usr/local - BIN = ${PREFIX}/bin --MAN = ${PREFIX}/share/man -+MAN = ${PREFIX}/man - ETC = ${PREFIX}/etc - LIBDIR = ${PREFIX}/lib - INCLUDE = ${PREFIX}/include -@@ -24,15 +24,15 @@ LIBS = -L/usr/lib -lc + BIN = $(PREFIX)/bin +- MAN = $(PREFIX)/share/man +- ETC = $(PREFIX)/etc ++ MAN = $(PREFIX)/man ++ ETC = $(PREFIX)/share/examples + LIBDIR = $(PREFIX)/lib + INCLUDE = $(PREFIX)/include - # Flags - include ${ROOT}/mk/gcc.mk --CFLAGS = -g -Wall ${INCS} -DVERSION=\"${VERSION}\" -+CFLAGS = !!CFLAGS!! -g -Wall ${INCS} -DVERSION=\"${VERSION}\" - LDFLAGS = -g ${LIBS} - - # Compiler --CC = cc -c -+CC = !!CC!! -c - # Linker (Under normal circumstances, this should *not* be 'ld') --LD = cc -+LD = !!CC!! - # Other --AR = ar crs -+AR = ar cr - #AR = sh -c 'ar cr "$$@" && ranlib "$$@"' - - # Solaris diff -Naur ports/devel/libixp/patches/patch-libixp_intmap_c ports.new/devel/libixp/patches/patch-libixp_intmap_c --- ports/devel/libixp/patches/patch-libixp_intmap_c Thu Jan 1 01:00:00 1970 +++ ports.new/devel/libixp/patches/patch-libixp_intmap_c Mon Mar 7 20:54:18 2011 @@ -0,0 +1,10 @@ +$OpenBSD$ +--- libixp/intmap.c.orig Sun Sep 21 05:39:51 2008 ++++ libixp/intmap.c Mon Feb 28 18:39:18 2011 +@@ -1,5 +1,5 @@ + /* This file is derived from src/lib9p/intmap.c from plan9port */ +-/* See LICENCE.p9p for terms of use */ ++/* See LICENSE.p9p for terms of use */ + + #include <stdlib.h> + #include "ixp_local.h" diff -Naur ports/devel/libixp/patches/patch-libixp_server_c ports.new/devel/libixp/patches/patch-libixp_server_c --- ports/devel/libixp/patches/patch-libixp_server_c Sat Mar 15 13:38:53 2008 +++ ports.new/devel/libixp/patches/patch-libixp_server_c Mon Mar 7 20:54:18 2011 @@ -1,11 +1,11 @@ $OpenBSD: patch-libixp_server_c,v 1.1.1.1 2008/03/15 12:38:53 mcbride Exp $ ---- libixp/server.c.orig Tue Feb 19 04:07:08 2008 -+++ libixp/server.c Tue Feb 19 04:07:24 2008 -@@ -6,6 +6,7 @@ - #include <stdlib.h> +--- libixp/server.c.orig Sun Sep 21 05:39:51 2008 ++++ libixp/server.c Mon Feb 28 18:46:17 2011 +@@ -7,6 +7,7 @@ + #include <sys/types.h> #include <sys/socket.h> #include <unistd.h> +#include <string.h> #include "ixp_local.h" - IxpConn * + /** diff -Naur ports/devel/libixp/patches/patch-mk_dir_mk ports.new/devel/libixp/patches/patch-mk_dir_mk --- ports/devel/libixp/patches/patch-mk_dir_mk Thu Jan 1 01:00:00 1970 +++ ports.new/devel/libixp/patches/patch-mk_dir_mk Mon Mar 7 20:54:18 2011 @@ -0,0 +1,12 @@ +$OpenBSD$ +--- mk/dir.mk.orig Sun Sep 21 05:39:51 2008 ++++ mk/dir.mk Mon Feb 28 18:47:07 2011 +@@ -7,7 +7,7 @@ MKSUBDIR = \ + echo Skipping nonexistent directory: $$i 1>&2; \ + else \ + echo MAKE $$targ $$BASE; \ +- (cd $$i && $(MAKE) $$targ) || exit $?; \ ++ (cd $$i && $(MAKE) $$targ) || exit $$?; \ + fi; \ + done + diff -Naur ports/devel/libixp/patches/patch-mk_lib_mk ports.new/devel/libixp/patches/patch-mk_lib_mk --- ports/devel/libixp/patches/patch-mk_lib_mk Wed Mar 11 20:41:03 2009 +++ ports.new/devel/libixp/patches/patch-mk_lib_mk Thu Jan 1 01:00:00 1970 @@ -1,10 +0,0 @@ -$OpenBSD: patch-mk_lib_mk,v 1.1 2009/03/11 19:41:03 martin Exp $ ---- mk/lib.mk.orig Thu Mar 5 21:52:46 2009 -+++ mk/lib.mk Thu Mar 5 21:53:05 2009 -@@ -22,5 +22,6 @@ ${LIB}: ${OFILES} - echo AR $$($(ROOT)/util/cleanname $(BASE)/$@) - mkdir ${ROOT}/lib 2>/dev/null || true - ${AR} $@ ${OFILES} -+ ranlib ${LIB} - - include ${ROOT}/mk/common.mk diff -Naur ports/devel/libixp/pkg/PLIST ports.new/devel/libixp/pkg/PLIST --- ports/devel/libixp/pkg/PLIST Sat Mar 15 16:52:53 2008 +++ ports.new/devel/libixp/pkg/PLIST Mon Mar 7 20:54:18 2011 @@ -1,8 +1,7 @@ @comment $OpenBSD: PLIST,v 1.2 2008/03/15 15:52:53 mcbride Exp $ -bin/ixpc -@comment etc/ +@bin bin/ixpc include/ixp.h -include/ixp_fcall.h +include/ixp_srvutil.h lib/libixp.a lib/libixp_pthread.a @man man/man1/ixpc.1
diff -Naur ports/x11/wmii/Makefile ports.new/x11/wmii/Makefile --- ports/x11/wmii/Makefile Wed Mar 2 07:30:34 2011 +++ ports.new/x11/wmii/Makefile Mon Mar 7 21:01:03 2011 @@ -1,35 +1,37 @@ -# $OpenBSD: Makefile,v 1.18 2011/03/02 06:30:34 jasper Exp $ +# $OpenBSD: Makefile,v 1.14 2010/07/10 14:35:59 naddy Exp $ -COMMENT= dynamic window manager +PORTNAME = wmii +RELEASE = 3.9.2 -DISTNAME= wmii-3.6 -REVISION= 5 -CATEGORIES= x11 +CATEGORIES = x11 +COMMENT = dynamic window manager -HOMEPAGE= http://wmii.suckless.org/ +DISTNAME = ${PORTNAME}-${RELEASE} +REVISION = -# MIT/X -PERMIT_PACKAGE_CDROM= Yes -PERMIT_PACKAGE_FTP= Yes -PERMIT_DISTFILES_CDROM= Yes -PERMIT_DISTFILES_FTP= Yes +HOMEPAGE = http://www.suckless.org/ +MASTER_SITES = http://dl.suckless.org/wmii/ -MASTER_SITES= http://dl.suckless.org/wmii/ +EXTRACT_SUFX = .tbz +EXTRACT_CASES = *.tbz) bzcat ${FULLDISTDIR}/$$archive | tar -xf - -s /+ixp//;; +DISTFILES = ${PORTNAME}+ixp-${RELEASE}${EXTRACT_SUFX} -WANTLIB += X11 Xext c m +# MIT/X and Bell Labs MIT-like for included 9P libraries +PERMIT_PACKAGE_CDROM = Yes +PERMIT_PACKAGE_FTP = Yes +PERMIT_DISTFILES_CDROM = Yes +PERMIT_DISTFILES_FTP = Yes -MODULES= converters/libiconv +USE_GROFF = Yes -BUILD_DEPENDS= devel/libixp +WANTLIB += X11 Xau Xdmcp Xext Xft Xinerama Xrandr Xrender c expat fontconfig +WANTLIB += freetype m pthread-stubs xcb z -RUN_DEPENDS= x11/dmenu +BUILD_DEPENDS = devel/libixp -USE_GROFF = Yes +MAKE_ENV = SYSCONFDIR=${SYSCONFDIR} +MAKE_FLAGS = noisycc=1 -NO_REGRESS= Yes - -MAKE_FLAGS= noisycc=1 -FAKE_FLAGS= PREFIX=${WRKINST}${LOCALBASE} \ - MAN=${WRKINST}${LOCALBASE}/man +NO_REGRESS = Yes .include <bsd.port.mk> diff -Naur ports/x11/wmii/distinfo ports.new/x11/wmii/distinfo --- ports/x11/wmii/distinfo Sat Mar 15 13:52:50 2008 +++ ports.new/x11/wmii/distinfo Mon Mar 7 20:59:49 2011 @@ -1,5 +1,5 @@ -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 +MD5 (wmii+ixp-3.9.2.tbz) = PUgFArex4qQF2UHfZ/Frzw== +RMD160 (wmii+ixp-3.9.2.tbz) = ikAaXQoDPA2iVNFef+QV7EDnozI= +SHA1 (wmii+ixp-3.9.2.tbz) = 6FopeaC9Ch237Uhvxwmv5yuv2LA= +SHA256 (wmii+ixp-3.9.2.tbz) = BGbxpcU0sO6f2s4sei0lGEW37AroC9uOaK5lhOvuvys= +SIZE (wmii+ixp-3.9.2.tbz) = 432032 diff -Naur ports/x11/wmii/patches/patch-Makefile ports.new/x11/wmii/patches/patch-Makefile --- ports/x11/wmii/patches/patch-Makefile Thu Jan 1 01:00:00 1970 +++ ports.new/x11/wmii/patches/patch-Makefile Mon Mar 7 20:59:49 2011 @@ -0,0 +1,21 @@ +$OpenBSD$ +--- Makefile.orig Thu Jun 10 09:24:04 2010 ++++ Makefile Mon Mar 7 19:48:33 2011 +@@ -6,16 +6,13 @@ PDIRS = \ + doc \ + man \ + cmd \ +- libwmii_hack \ +- rc \ +- alternative_wmiircs ++ rc + + DIRS = \ + libbio \ + libfmt \ + libregexp \ + libutf \ +- libixp \ + $(PDIRS) + + DOCS = README \ diff -Naur ports/x11/wmii/patches/patch-cmd_Makefile ports.new/x11/wmii/patches/patch-cmd_Makefile --- ports/x11/wmii/patches/patch-cmd_Makefile Thu Jan 1 01:00:00 1970 +++ ports.new/x11/wmii/patches/patch-cmd_Makefile Mon Mar 7 20:59:49 2011 @@ -0,0 +1,14 @@ +$OpenBSD$ +--- cmd/Makefile.orig Thu Jun 10 09:24:01 2010 ++++ cmd/Makefile Mon Mar 7 19:53:48 2011 +@@ -6,9 +6,7 @@ wmiir.c: $(ROOT)/mk/wmii.mk + + DIRS = wmii \ + menu +-TARG = wihack \ +- wmii.rc \ +- wmii.sh \ ++TARG = wmii.sh \ + wmii9menu \ + wmiir + diff -Naur ports/x11/wmii/patches/patch-cmd_wmii_Makefile ports.new/x11/wmii/patches/patch-cmd_wmii_Makefile --- ports/x11/wmii/patches/patch-cmd_wmii_Makefile Thu Jan 1 01:00:00 1970 +++ ports.new/x11/wmii/patches/patch-cmd_wmii_Makefile Mon Mar 7 20:59:49 2011 @@ -0,0 +1,12 @@ +$OpenBSD$ +--- cmd/wmii/Makefile.orig Thu Jun 10 09:24:02 2010 ++++ cmd/wmii/Makefile Fri Mar 4 19:31:30 2011 +@@ -12,7 +12,7 @@ PACKAGES += $(X11PACKAGES) xext xrandr xrender xineram + LIB = $(LIBIXP) + LIBS += -lm $(LIBS9) + +-CFLAGS += $(INCICONV) -DIXP_NEEDAPI=97 ++CFLAGS += -DIXP_NEEDAPI=97 + OBJ = area \ + bar \ + client \ diff -Naur ports/x11/wmii/patches/patch-cmd_wmii__util_c ports.new/x11/wmii/patches/patch-cmd_wmii__util_c --- ports/x11/wmii/patches/patch-cmd_wmii__util_c Thu Jan 1 01:00:00 1970 +++ ports.new/x11/wmii/patches/patch-cmd_wmii__util_c Mon Mar 7 20:59:49 2011 @@ -0,0 +1,12 @@ +$OpenBSD$ +--- cmd/wmii/_util.c.orig Thu Jun 10 09:24:02 2010 ++++ cmd/wmii/_util.c Tue Mar 1 20:17:54 2011 +@@ -5,7 +5,7 @@ + #include <errno.h> + #include <fcntl.h> + #include <stdarg.h> +-#include <sys/signal.h> ++#include <signal.h> + #include <sys/wait.h> + #include <unistd.h> + #include <bio.h> diff -Naur ports/x11/wmii/patches/patch-cmd_wmii_main_c ports.new/x11/wmii/patches/patch-cmd_wmii_main_c --- ports/x11/wmii/patches/patch-cmd_wmii_main_c Thu Jan 1 01:00:00 1970 +++ ports.new/x11/wmii/patches/patch-cmd_wmii_main_c Mon Mar 7 20:59:49 2011 @@ -0,0 +1,12 @@ +$OpenBSD$ +--- cmd/wmii/main.c.orig Thu Jun 10 09:24:02 2010 ++++ cmd/wmii/main.c Mon Feb 28 21:35:30 2011 +@@ -10,7 +10,7 @@ + #include <fcntl.h> + #include <locale.h> + #include <pwd.h> +-#include <sys/signal.h> ++#include <signal.h> + #include <sys/stat.h> + #include <unistd.h> + #include "fns.h" diff -Naur ports/x11/wmii/patches/patch-cmd_wmii_sh_sh ports.new/x11/wmii/patches/patch-cmd_wmii_sh_sh --- ports/x11/wmii/patches/patch-cmd_wmii_sh_sh Thu Jan 1 01:00:00 1970 +++ ports.new/x11/wmii/patches/patch-cmd_wmii_sh_sh Mon Mar 7 20:59:49 2011 @@ -0,0 +1,18 @@ +$OpenBSD$ +--- cmd/wmii.sh.sh.orig Thu Jun 10 09:24:02 2010 ++++ cmd/wmii.sh.sh Mon Mar 7 19:52:56 2011 +@@ -170,14 +170,6 @@ wi_script() { + shift; echo "$_prog $*" + } + +-wi_runcmd() { +- if [ "$1" = -t ]; then +- shift +- set -- wihack -tags $(wmiir read /tag/sel/ctl | sed 1q) "$*" +- fi +- eval exec "$*" & +-} +- + wi_tags() { + wmiir ls /tag | sed 's,/,,; /^sel$/d' + } diff -Naur ports/x11/wmii/patches/patch-config_mk ports.new/x11/wmii/patches/patch-config_mk --- ports/x11/wmii/patches/patch-config_mk Sat Jul 10 16:35:59 2010 +++ ports.new/x11/wmii/patches/patch-config_mk Mon Mar 7 20:59:49 2011 @@ -1,46 +1,48 @@ $OpenBSD: patch-config_mk,v 1.5 2010/07/10 14:35:59 naddy Exp $ ---- config.mk.orig Fri Nov 16 06:59:15 2007 -+++ config.mk Sat Jul 10 08:33:20 2010 -@@ -1,10 +1,10 @@ +--- config.mk.orig Thu Jun 10 09:24:04 2010 ++++ config.mk Mon Mar 7 20:34:55 2011 +@@ -1,11 +1,11 @@ # Customize below to fit your system - # paths + # Paths -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 ++PREFIX = $(TRUEPREFIX) + BIN = $(PREFIX)/bin +- MAN = $(PREFIX)/share/man ++ MAN = $(PREFIX)/man + DOC = $(PREFIX)/share/doc/wmii +- ETC = $(PREFIX)/etc ++ ETC = $(PREFIX)/share/examples + LIBDIR = $(PREFIX)/lib + INCLUDE = $(PREFIX)/include -@@ -14,8 +14,10 @@ LIBS = -L/usr/lib -lc -L${ROOT}/lib +@@ -17,8 +17,8 @@ TERMINAL = xterm # Flags - include ${ROOT}/mk/gcc.mk --CFLAGS += -g -O0 -DIXPlint --LDFLAGS += -g ${LIBS} -+#CFLAGS += -g -O0 -DIXPlint -+CFLAGS += -DIXPlint -+#LDFLAGS += -g ${LIBS} -+LDFLAGS += ${LIBS} + include $(ROOT)/mk/gcc.mk +-CFLAGS += -Os # $(DEBUGCFLAGS) -O0 +-LDFLAGS += # -g $(LIBS) ++#CFLAGS += -Os $(DEBUGCFLAGS) -O0 ++#LDFLAGS += -g $(LIBS) + SOLDFLAGS += $(LDFLAGS) + SHARED = -shared -Wl,-soname=$(SONAME) STATIC = -static - MKDEP = cpp -M +@@ -31,8 +31,7 @@ AR = ar crs -@@ -29,11 +31,10 @@ AR = ar crs - AWKPATH = $$(which awk) - P9PATHS = ${PLAN9}:"'$${HOME}/plan9'":/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 + X11PACKAGES = xft + INCX11 = $$(pkg-config --cflags $(X11PACKAGES)) -LIBICONV = # Leave blank if your libc includes iconv (glibc does) --LIBIXP = ${ROOT}/libixp/libixp.a --LIBIXP = ${LIBDIR}/libixp.a -+INCX11 = -I${X11BASE}/include -+LIBX11 = -L${X11BASE}/lib -lX11 -+LIBICONV = -L${LOCALBASE}/lib -liconv -+LIBIXP = ${LOCALBASE}/lib/libixp.a +-LIBIXP = $(ROOT)/lib/libixp.a ++LIBIXP = $(LIBDIR)/libixp.a - # Solaris - #CFLAGS = -fast ${INCS} -DVERSION=\"${VERSION}\" + # Your make shell. By default, the first found of /bin/dash, /bin/ksh, + # /bin/sh. Except with bsdmake, which assumes /bin/sh is sane. bash and zsh +@@ -49,8 +48,6 @@ LIBIXP = $(ROOT)/lib/libixp.a + #CC=pcc -c + #LD=pcc + +-# *BSD +-#LIBICONV = -L/usr/local/lib -liconv + # +Darwin + #STATIC = # Darwin doesn't like static linking + #SHARED = -dynamiclib diff -Naur ports/x11/wmii/patches/patch-man_Makefile ports.new/x11/wmii/patches/patch-man_Makefile --- ports/x11/wmii/patches/patch-man_Makefile Thu Jan 1 01:00:00 1970 +++ ports.new/x11/wmii/patches/patch-man_Makefile Mon Mar 7 20:59:49 2011 @@ -0,0 +1,12 @@ +$OpenBSD$ +--- man/Makefile.orig Thu Jun 10 09:24:03 2010 ++++ man/Makefile Tue Mar 1 20:14:58 2011 +@@ -7,7 +7,7 @@ TARG = wmii.1 \ + wmii9menu.1\ + wimenu.1 + +-$(TARG): Makefile $(ROOT)/mk/wmii.mk header.t2t ++$(TARG): header.t2t + + include ${ROOT}/mk/man.mk + diff -Naur ports/x11/wmii/patches/patch-mk_dir_mk ports.new/x11/wmii/patches/patch-mk_dir_mk --- ports/x11/wmii/patches/patch-mk_dir_mk Thu Jan 1 01:00:00 1970 +++ ports.new/x11/wmii/patches/patch-mk_dir_mk Mon Mar 7 20:59:49 2011 @@ -0,0 +1,12 @@ +$OpenBSD$ +--- mk/dir.mk.orig Thu Jun 10 09:24:03 2010 ++++ mk/dir.mk Mon Feb 28 21:00:38 2011 +@@ -8,7 +8,7 @@ MKSUBDIR = \ + echo Skipping nonexistent directory: $$i 1>&2; \ + else \ + echo MAKE $$targ $$BASE; \ +- (cd $$i && $(MAKE) $$targ) || exit $?; \ ++ (cd $$i && $(MAKE) $$targ) || exit $$?; \ + fi; \ + done + diff -Naur ports/x11/wmii/patches/patch-mk_wmii_mk ports.new/x11/wmii/patches/patch-mk_wmii_mk --- ports/x11/wmii/patches/patch-mk_wmii_mk Thu Jan 1 01:00:00 1970 +++ ports.new/x11/wmii/patches/patch-mk_wmii_mk Mon Mar 7 20:59:49 2011 @@ -0,0 +1,20 @@ +$OpenBSD$ +--- mk/wmii.mk.orig Thu Jun 10 09:24:04 2010 ++++ mk/wmii.mk Fri Mar 4 19:37:38 2011 +@@ -1,13 +1,13 @@ + VERSION = 3.9.2 + CONFVERSION = +-COPYRIGHT = ©2010 Kris Maglione ++COPYRIGHT = (c) 2010 Kris Maglione + SUBMAKE_EXPORT = WMII_HGVERSION="" + + LIBS9 = $(ROOT)/lib/libregexp9.a $(ROOT)/lib/libbio.a $(ROOT)/lib/libfmt.a $(ROOT)/lib/libutf.a + + CFLAGS += '-DVERSION=\"$(VERSION)\"' '-DCOPYRIGHT=\"$(COPYRIGHT)\"' \ +- '-DCONFVERSION=\"$(CONFVERSION)\"' '-DCONFPREFIX=\"$(ETC)\"' +-FILTER = sed "s|@CONFPREFIX@|$(ETC)|g; \ ++ '-DCONFVERSION=\"$(CONFVERSION)\"' '-DCONFPREFIX=\"$(SYSCONFDIR)\"' ++FILTER = sed "s|@CONFPREFIX@|$(SYSCONFDIR)|g; \ + s|@CONFVERSION@|$(CONFVERSION)|g; \ + s|@DOCDIR@|$(DOC)|g; \ + s|@VERSION@|$(VERSION)|g; \ diff -Naur ports/x11/wmii/patches/patch-rc_wmiirc_sh ports.new/x11/wmii/patches/patch-rc_wmiirc_sh --- ports/x11/wmii/patches/patch-rc_wmiirc_sh Thu Jan 1 01:00:00 1970 +++ ports.new/x11/wmii/patches/patch-rc_wmiirc_sh Mon Mar 7 20:59:49 2011 @@ -0,0 +1,22 @@ +$OpenBSD$ +--- rc/wmiirc.sh.orig Thu Jun 10 09:24:04 2010 ++++ rc/wmiirc.sh Mon Mar 7 19:51:42 2011 +@@ -27,7 +27,7 @@ export WMII_TERM="@TERMINAL@" + + if ! test -d "${WMII_CONFPATH%%:*}"; then + mkdir "${WMII_CONFPATH%%:*}" +- res=$(wihack -type DIALOG xmessage -nearmouse -buttons Windows,Alt -print -fn $WMII_FONT \ ++ res=$(xmessage -nearmouse -buttons Windows,Alt -print -fn $WMII_FONT \ + "Welcome to wmii,$wi_newline$wi_newline" \ + "Most of wmii's default key bindings make use of the$wi_newline" \ + "Windows key, or equivalent. For keyboards lacking such$wi_newline" \ +@@ -88,8 +88,7 @@ Event Unresponsive + { + client=$1; shift + msg="The following client is not responding. What would you like to do?$wi_newline" +- resp=$(wihack -transient $client \ +- xmessage -nearmouse -buttons Kill,Wait -print ++ resp=$(xmessage -nearmouse -buttons Kill,Wait -print + -fn "${WMII_FONT%%,*}" "$msg $(wmiir read /client/sel/label)") + if [ "$resp" = Kill ]; then + wmiir xwrite /client/$client/ctl slay & diff -Naur ports/x11/wmii/pkg/PLIST ports.new/x11/wmii/pkg/PLIST --- ports/x11/wmii/pkg/PLIST Sun May 31 18:24:23 2009 +++ ports.new/x11/wmii/pkg/PLIST Mon Mar 7 20:59:49 2011 @@ -1,19 +1,21 @@ @comment $OpenBSD: PLIST,v 1.3 2009/05/31 16:24:23 sthen Exp $ +@bin bin/wimenu @bin bin/wmii +bin/wmii.sh @bin bin/wmii9menu -bin/wmii9rc -bin/wmiiloop @bin bin/wmiir -bin/wmiistartrc +@man man/man1/wimenu.1 @man man/man1/wmii.1 -@man man/man1/wmiiloop.1 +@man man/man1/wmii9menu.1 @man man/man1/wmiir.1 -share/examples/wmii-3.5/ -@sample ${SYSCONFDIR}/wmii-3.5/ -@mode 755 -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 +share/doc/wmii/ +share/doc/wmii/LICENSE +share/doc/wmii/README +share/doc/wmii/wmii.pdf +share/examples/wmii/ +@sample ${SYSCONFDIR}/wmii/ +@mode 0755 +share/examples/wmii/welcome +@sample ${SYSCONFDIR}/wmii/welcome +share/examples/wmii/wmiirc +@sample ${SYSCONFDIR}/wmii/wmiirc
