Hello,
while working on the updates to the OpenBSD ports of libixp and wmii I
hit some minor issues that needed to be fixed. The updated ports include
the necessary patches, but it would be great if those would be included
at the source, too.
wmii:
1. A shell variable in mk/dir.mk isn't escaped properly.
2. cmd/wmii/_util.c and cmd/wmii/main.c use functions defined in
<signal.h>, but include <sys/signal.h> only.
3. The build scripts still reference iconv although it isn't used in the
code anymore.
-> wmii-3.9.2-buildfix.diff
libixp:
1. Same error in mk/dir.mk as above.
2. libixp/server.c uses memset, but doesn't include <string.h>.
3. There's a typo in the license note.
-> libixp-0.5-buildfix.diff
Regards,
Oliver Klima
diff -Naur libixp-0.5/libixp/intmap.c libixp-0.5.new/libixp/intmap.c
--- libixp-0.5/libixp/intmap.c Sun Sep 21 05:39:51 2008
+++ libixp-0.5.new/libixp/intmap.c Mon Mar 7 21:17:39 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 libixp-0.5/libixp/server.c libixp-0.5.new/libixp/server.c
--- libixp-0.5/libixp/server.c Sun Sep 21 05:39:51 2008
+++ libixp-0.5.new/libixp/server.c Mon Mar 7 21:17:44 2011
@@ -7,6 +7,7 @@
#include <sys/types.h>
#include <sys/socket.h>
#include <unistd.h>
+#include <string.h>
#include "ixp_local.h"
/**
diff -Naur libixp-0.5/mk/dir.mk libixp-0.5.new/mk/dir.mk
--- libixp-0.5/mk/dir.mk Sun Sep 21 05:39:51 2008
+++ libixp-0.5.new/mk/dir.mk Mon Mar 7 21:17:48 2011
@@ -7,7 +7,7 @@
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 wmii+ixp-3.9.2/cmd/wmii/Makefile wmii+ixp-3.9.2.new/cmd/wmii/Makefile
--- wmii+ixp-3.9.2/cmd/wmii/Makefile Thu Jun 10 09:24:02 2010
+++ wmii+ixp-3.9.2.new/cmd/wmii/Makefile Mon Mar 7 21:24:58 2011
@@ -12,7 +12,7 @@
LIB = $(LIBIXP)
LIBS += -lm $(LIBS9)
-CFLAGS += $(INCICONV) -DIXP_NEEDAPI=97
+CFLAGS += -DIXP_NEEDAPI=97
OBJ = area \
bar \
client \
diff -Naur wmii+ixp-3.9.2/cmd/wmii/_util.c wmii+ixp-3.9.2.new/cmd/wmii/_util.c
--- wmii+ixp-3.9.2/cmd/wmii/_util.c Thu Jun 10 09:24:02 2010
+++ wmii+ixp-3.9.2.new/cmd/wmii/_util.c Mon Mar 7 21:25:04 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 wmii+ixp-3.9.2/cmd/wmii/main.c wmii+ixp-3.9.2.new/cmd/wmii/main.c
--- wmii+ixp-3.9.2/cmd/wmii/main.c Thu Jun 10 09:24:02 2010
+++ wmii+ixp-3.9.2.new/cmd/wmii/main.c Mon Mar 7 21:25:06 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 wmii+ixp-3.9.2/config.mk wmii+ixp-3.9.2.new/config.mk
--- wmii+ixp-3.9.2/config.mk Thu Jun 10 09:24:04 2010
+++ wmii+ixp-3.9.2.new/config.mk Mon Mar 7 21:25:11 2011
@@ -31,8 +31,7 @@
X11PACKAGES = xft
INCX11 = $$(pkg-config --cflags $(X11PACKAGES))
-LIBICONV = # Leave blank if your libc includes iconv (glibc does)
-LIBIXP = $(ROOT)/lib/libixp.a
+LIBIXP = $(LIBDIR)/libixp.a
# 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 @@
#CC=pcc -c
#LD=pcc
-# *BSD
-#LIBICONV = -L/usr/local/lib -liconv
# +Darwin
#STATIC = # Darwin doesn't like static linking
#SHARED = -dynamiclib
diff -Naur wmii+ixp-3.9.2/mk/dir.mk wmii+ixp-3.9.2.new/mk/dir.mk
--- wmii+ixp-3.9.2/mk/dir.mk Thu Jun 10 09:24:03 2010
+++ wmii+ixp-3.9.2.new/mk/dir.mk Mon Mar 7 21:25:16 2011
@@ -8,7 +8,7 @@
echo Skipping nonexistent directory: $$i 1>&2; \
else \
echo MAKE $$targ $$BASE; \
- (cd $$i && $(MAKE) $$targ) || exit $?; \
+ (cd $$i && $(MAKE) $$targ) || exit $$?; \
fi; \
done
