On Sun, 13 Jan 2008, Simon Kuhnle wrote:
On Sun, Jan 13, 2008 at 01:58:16PM +0100, Markus Hennecke wrote:
today was mcabber 0.9.6 released. The patches needed for the previous
version to build can be removed, so please apply with the '-E' option of
patch. No problems found so far on amd64 and i386.
Your patch didn't apply cleanly on Makefile, failing to change the
DISTNAME, but after doing it manually it worked.
There seems to be a whitespace inserted into the patch by pine. So here
it is again, this time attached.
Builds and runs fine on i386 and amd64!
Good to hear. Anyone willing to commit this?
Best regards,
Markus
Index: Makefile
===================================================================
RCS file: /var/cvs/ports/net/mcabber/Makefile,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 Makefile
--- Makefile 3 Jan 2008 18:42:00 -0000 1.1.1.1
+++ Makefile 13 Jan 2008 12:38:35 -0000
@@ -1,7 +1,7 @@
# $OpenBSD: Makefile,v 1.1.1.1 2008/01/03 18:42:00 jasper Exp $
COMMENT= console jabber client
-DISTNAME= mcabber-0.9.5
+DISTNAME= mcabber-0.9.6
CATEGORIES= net
HOMEPAGE= http://www.lilotux.net/~mikael/mcabber/
Index: distinfo
===================================================================
RCS file: /var/cvs/ports/net/mcabber/distinfo,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 distinfo
--- distinfo 3 Jan 2008 18:42:00 -0000 1.1.1.1
+++ distinfo 13 Jan 2008 12:38:35 -0000
@@ -1,5 +1,5 @@
-MD5 (mcabber-0.9.5.tar.bz2) = aaACA43vl4aJ2VtU3Hvp9A==
-RMD160 (mcabber-0.9.5.tar.bz2) = JxZHEGg1ZRL8COzx1d5E/TkoEM0=
-SHA1 (mcabber-0.9.5.tar.bz2) = 31dpAVURAPB0OchvU12MBhEuM20=
-SHA256 (mcabber-0.9.5.tar.bz2) = ytmfXRrBMqpK7U4zWkRP91HehAQ4+v1CVE69II7+K3w=
-SIZE (mcabber-0.9.5.tar.bz2) = 487465
+MD5 (mcabber-0.9.6.tar.bz2) = s9x9OPI1twGoKkkm6jyvkQ==
+RMD160 (mcabber-0.9.6.tar.bz2) = rDSShtvCqRKeNgExZTLrerG6nns=
+SHA1 (mcabber-0.9.6.tar.bz2) = eqh5Q8zj58LNQv50lgtToM0kAzE=
+SHA256 (mcabber-0.9.6.tar.bz2) = NUVz11FhG3AMyWEmLfCZHTe1psigWNHNaRbSUxNlQ9M=
+SIZE (mcabber-0.9.6.tar.bz2) = 480333
Index: patches/patch-configure
===================================================================
RCS file: patches/patch-configure
diff -N patches/patch-configure
--- patches/patch-configure 3 Jan 2008 18:42:00 -0000 1.1.1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,12 +0,0 @@
-$OpenBSD: patch-configure,v 1.1.1.1 2008/01/03 18:42:00 jasper Exp $
---- configure.orig Sun Dec 30 20:33:36 2007
-+++ configure Sun Dec 30 20:34:15 2007
-@@ -10336,7 +10336,7 @@ if test x"${datadir}" != x""; then
- exec_prefix_NONE=
- test "x$prefix" = xNONE && prefix_NONE=yes && prefix=$ac_default_prefix
- test "x$exec_prefix" = xNONE && exec_prefix_NONE=yes && exec_prefix=$prefix
-- ac_define_dir=`eval echo $"${datadir}"`
-+ ac_define_dir=`eval echo "${datadir}"`
- ac_define_dir=`eval echo $ac_define_dir`
- DATA_DIR="$ac_define_dir"
-
Index: patches/patch-src_commands_h
===================================================================
RCS file: patches/patch-src_commands_h
diff -N patches/patch-src_commands_h
--- patches/patch-src_commands_h 3 Jan 2008 18:42:00 -0000 1.1.1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,11 +0,0 @@
-$OpenBSD: patch-src_commands_h,v 1.1.1.1 2008/01/03 18:42:00 jasper Exp $
---- src/commands.h.orig Sat Dec 1 13:24:04 2007
-+++ src/commands.h Sat Dec 1 13:24:15 2007
-@@ -2,6 +2,7 @@
- #define __COMMANDS_H__ 1
-
- #include <glib.h>
-+#include <stdbool.h>
-
- // Command structure
- typedef struct {
Index: patches/patch-src_screen_h
===================================================================
RCS file: patches/patch-src_screen_h
diff -N patches/patch-src_screen_h
--- patches/patch-src_screen_h 3 Jan 2008 18:42:00 -0000 1.1.1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,11 +0,0 @@
-$OpenBSD: patch-src_screen_h,v 1.1.1.1 2008/01/03 18:42:00 jasper Exp $
---- src/screen.h.orig Sat Dec 1 13:26:21 2007
-+++ src/screen.h Sat Dec 1 13:26:28 2007
-@@ -2,6 +2,7 @@
- #define __SCREEN_H__ 1
-
- #include <glib.h>
-+#include <stdbool.h>
-
- #if HAVE_NCURSESW_NCURSES_H
- # include <ncursesw/ncurses.h>
