4 files changed, 14 insertions, 28 deletions

diff --git a/net-im/mcabber/Makefile b/net-im/mcabber/Makefile
index 2a226b7ae23b..ba442983b9ce 100644
--- a/net-im/mcabber/Makefile
+++ b/net-im/mcabber/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	mcabber
-PORTVERSION=	0.9.7
-PORTREVISION=	1
+PORTVERSION=	0.9.8
 CATEGORIES=	net-im
 MASTER_SITES=	http://www.lilotux.net/~mikael/mcabber/files/ CENKES
 
@@ -33,10 +32,6 @@ OPTIONS=	GPGME "Use security/gpgme for PGP support" off \
 
 .include <bsd.port.pre.mk>
 
-.if ${OSVERSION} < 503000
-BROKEN=	Unicoded ncurses require 5.3
-.endif
-
 .if ${OSVERSION} < 602107 || (${OSVERSION} > 700000 && ${OSVERSION} < 700033)
 LIB_DEPENDS+=	ncursesw.5:${PORTSDIR}/devel/ncurses
 .endif
@@ -56,7 +51,7 @@ CONFIGURE_ARGS+=--disable-aspell
 .endif
 
 .if defined(WITH_OTR)
-LIB_DEPENDS+=	otr.3:${PORTSDIR}/security/libotr \
+LIB_DEPENDS+=	otr.4:${PORTSDIR}/security/libotr \
 		gcrypt.15:${PORTSDIR}/security/libgcrypt
 CONFIGURE_ARGS+=--enable-otr
 .else
diff --git a/net-im/mcabber/distinfo b/net-im/mcabber/distinfo
index d104b3e4955a..99c84daeb9cd 100644
--- a/net-im/mcabber/distinfo
+++ b/net-im/mcabber/distinfo
@@ -1,3 +1,3 @@
-MD5 (mcabber-0.9.7.tar.bz2) = a6f136aa0dabdd7ecfd3bfaded180406
-SHA256 (mcabber-0.9.7.tar.bz2) = a476cc4f1cdae0bac6650dda3b33ab93fcc3213054a647fb771463a878098ea9
-SIZE (mcabber-0.9.7.tar.bz2) = 489554
+MD5 (mcabber-0.9.8.tar.bz2) = 4b8278aaaaf89d3865ec102888f3127f
+SHA256 (mcabber-0.9.8.tar.bz2) = f2946354c301e6c130e5ea02ab3db1eeee7ca6c9943751703a1ffc2deaa401f0
+SIZE (mcabber-0.9.8.tar.bz2) = 484286
diff --git a/net-im/mcabber/files/patch-src__hbuf.c b/net-im/mcabber/files/patch-src__hbuf.c
deleted file mode 100644
index 18d7ec048efb..000000000000
--- a/net-im/mcabber/files/patch-src__hbuf.c
+++ /dev/null
@@ -1,18 +0,0 @@
---- ./src/hbuf.c.orig	Sat Dec 16 21:05:39 2006
-+++ ./src/hbuf.c	Sat Jan 13 03:02:55 2007
-@@ -250,6 +250,7 @@
-   hbuf_block *blk;
-   guchar last_persist_prefixflags = 0;
-   GList *last_persist;  // last persistent flags
-+  int maxlen;
-   hbb_line **array, **array_elt;
- 
-   // To be able to correctly highlight multi-line messages,
-@@ -270,7 +271,6 @@
- 
-   for (i = 0 ; i < n ; i++) {
-     if (hbuf) {
--      int maxlen;
-       blk = (hbuf_block*)(hbuf->data);
-       maxlen = blk->ptr_end - blk->ptr;
-       *array_elt = (hbb_line*)g_new(hbb_line, 1);
diff --git a/net-im/mcabber/pkg-plist b/net-im/mcabber/pkg-plist
index 8128ba40c01a..b61892717707 100644
--- a/net-im/mcabber/pkg-plist
+++ b/net-im/mcabber/pkg-plist
@@ -4,6 +4,7 @@ share/applications/mcabber.desktop
 %%DATADIR%%/contrib/cicq2mcabber.pl
 %%DATADIR%%/contrib/events/eventcmd
 %%DATADIR%%/contrib/events/eventcmd.osd
+%%DATADIR%%/contrib/events/eventcmd.pastebin
 %%DATADIR%%/contrib/events/mcnotify.py
 %%DATADIR%%/contrib/filter_statusmsg.py
 %%DATADIR%%/contrib/mcwizz.rb
@@ -23,6 +24,7 @@ share/applications/mcabber.desktop
 %%DATADIR%%/help/de/hlp_connect.txt
 %%DATADIR%%/help/de/hlp_del.txt
 %%DATADIR%%/help/de/hlp_disconnect.txt
+%%DATADIR%%/help/de/hlp_echo.txt
 %%DATADIR%%/help/de/hlp_event.txt
 %%DATADIR%%/help/de/hlp_group.txt
 %%DATADIR%%/help/de/hlp_help.txt
@@ -59,6 +61,7 @@ share/applications/mcabber.desktop
 %%DATADIR%%/help/en/hlp_connect.txt
 %%DATADIR%%/help/en/hlp_del.txt
 %%DATADIR%%/help/en/hlp_disconnect.txt
+%%DATADIR%%/help/en/hlp_echo.txt
 %%DATADIR%%/help/en/hlp_event.txt
 %%DATADIR%%/help/en/hlp_group.txt
 %%DATADIR%%/help/en/hlp_help.txt
@@ -95,6 +98,7 @@ share/applications/mcabber.desktop
 %%DATADIR%%/help/fr/hlp_connect.txt
 %%DATADIR%%/help/fr/hlp_del.txt
 %%DATADIR%%/help/fr/hlp_disconnect.txt
+%%DATADIR%%/help/fr/hlp_echo.txt
 %%DATADIR%%/help/fr/hlp_event.txt
 %%DATADIR%%/help/fr/hlp_group.txt
 %%DATADIR%%/help/fr/hlp_help.txt
@@ -131,6 +135,7 @@ share/applications/mcabber.desktop
 %%DATADIR%%/help/it/hlp_connect.txt
 %%DATADIR%%/help/it/hlp_del.txt
 %%DATADIR%%/help/it/hlp_disconnect.txt
+%%DATADIR%%/help/it/hlp_echo.txt
 %%DATADIR%%/help/it/hlp_event.txt
 %%DATADIR%%/help/it/hlp_group.txt
 %%DATADIR%%/help/it/hlp_help.txt
@@ -167,6 +172,7 @@ share/applications/mcabber.desktop
 %%DATADIR%%/help/nl/hlp_connect.txt
 %%DATADIR%%/help/nl/hlp_del.txt
 %%DATADIR%%/help/nl/hlp_disconnect.txt
+%%DATADIR%%/help/nl/hlp_echo.txt
 %%DATADIR%%/help/nl/hlp_event.txt
 %%DATADIR%%/help/nl/hlp_group.txt
 %%DATADIR%%/help/nl/hlp_help.txt
@@ -203,6 +209,7 @@ share/applications/mcabber.desktop
 %%DATADIR%%/help/pl/hlp_connect.txt
 %%DATADIR%%/help/pl/hlp_del.txt
 %%DATADIR%%/help/pl/hlp_disconnect.txt
+%%DATADIR%%/help/pl/hlp_echo.txt
 %%DATADIR%%/help/pl/hlp_event.txt
 %%DATADIR%%/help/pl/hlp_group.txt
 %%DATADIR%%/help/pl/hlp_help.txt
@@ -239,6 +246,7 @@ share/applications/mcabber.desktop
 %%DATADIR%%/help/ru/hlp_connect.txt
 %%DATADIR%%/help/ru/hlp_del.txt
 %%DATADIR%%/help/ru/hlp_disconnect.txt
+%%DATADIR%%/help/ru/hlp_echo.txt
 %%DATADIR%%/help/ru/hlp_event.txt
 %%DATADIR%%/help/ru/hlp_group.txt
 %%DATADIR%%/help/ru/hlp_help.txt
@@ -275,6 +283,7 @@ share/applications/mcabber.desktop
 %%DATADIR%%/help/uk/hlp_connect.txt
 %%DATADIR%%/help/uk/hlp_del.txt
 %%DATADIR%%/help/uk/hlp_disconnect.txt
+%%DATADIR%%/help/uk/hlp_echo.txt
 %%DATADIR%%/help/uk/hlp_event.txt
 %%DATADIR%%/help/uk/hlp_group.txt
 %%DATADIR%%/help/uk/hlp_help.txt