3 files changed, 70 insertions, 5 deletions

diff --git a/net-im/mcabber/Makefile b/net-im/mcabber/Makefile
index 48c034ee80f3..d0c1bb6ff8a9 100644
--- a/net-im/mcabber/Makefile
+++ b/net-im/mcabber/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	mcabber
-PORTVERSION=	0.9.3
+PORTVERSION=	0.9.4
 CATEGORIES=	net-im
 MASTER_SITES=	http://www.lilotux.net/~mikael/mcabber/files/ CENKES
 
@@ -28,6 +28,7 @@ LDFLAGS=	-L${LOCALBASE}/lib
 MAN1=		mcabber.1
 
 OPTIONS=	GPGME "Use security/gpgme for PGP support" off \
+		OTR "Off-the-record messaging support" off \
 		ASPELL "Use textproc/aspell for spell checking" off
 
 .include <bsd.port.pre.mk>
@@ -54,6 +55,14 @@ CONFIGURE_ARGS+=--enable-aspell
 CONFIGURE_ARGS+=--disable-aspell
 .endif
 
+.if defined(WITH_OTR)
+LIB_DEPENDS+=	otr.3:${PORTSDIR}/security/libotr \
+		gcrypt.13:${PORTSDIR}/security/libgcrypt
+CONFIGURE_ARGS+=--enable-otr
+.else
+CONFIGURE_ARGS+=--disable-otr
+.endif
+
 post-patch:
 	@${REINPLACE_CMD} -e 's|$$"$${datadir}"|"$${datadir}"|;s|-O2||'\
 		${WRKSRC}/configure ${WRKSRC}/*/configure
diff --git a/net-im/mcabber/distinfo b/net-im/mcabber/distinfo
index c49d4c97429c..b1c53fb987e1 100644
--- a/net-im/mcabber/distinfo
+++ b/net-im/mcabber/distinfo
@@ -1,3 +1,3 @@
-MD5 (mcabber-0.9.3.tar.bz2) = 26bc2d698c1311e1ef4eec5109a45c39
-SHA256 (mcabber-0.9.3.tar.bz2) = ee5bc81da96b958aee7b277bb6fdeeace1a8fff5e41ec61053c63cdb63016406
-SIZE (mcabber-0.9.3.tar.bz2) = 437100
+MD5 (mcabber-0.9.4.tar.bz2) = 5ac405d0661c7c0c2893e65893c8ae8e
+SHA256 (mcabber-0.9.4.tar.bz2) = 1a8a0bc4a7b89b4a6b351295750a541f1bda4facb1c48726477cd309c29619ef
+SIZE (mcabber-0.9.4.tar.bz2) = 484395
diff --git a/net-im/mcabber/pkg-plist b/net-im/mcabber/pkg-plist
index 71b487e9255c..75d4eee89e71 100644
--- a/net-im/mcabber/pkg-plist
+++ b/net-im/mcabber/pkg-plist
@@ -19,6 +19,7 @@ share/applications/mcabber.desktop
 %%DATADIR%%/help/de/hlp_buffer.txt
 %%DATADIR%%/help/de/hlp_chat_disable.txt
 %%DATADIR%%/help/de/hlp_clear.txt
+%%DATADIR%%/help/de/hlp_color.txt
 %%DATADIR%%/help/de/hlp_connect.txt
 %%DATADIR%%/help/de/hlp_del.txt
 %%DATADIR%%/help/de/hlp_disconnect.txt
@@ -29,6 +30,8 @@ share/applications/mcabber.desktop
 %%DATADIR%%/help/de/hlp_info.txt
 %%DATADIR%%/help/de/hlp_move.txt
 %%DATADIR%%/help/de/hlp_msay.txt
+%%DATADIR%%/help/de/hlp_otr.txt
+%%DATADIR%%/help/de/hlp_otrpolicy.txt
 %%DATADIR%%/help/de/hlp_pgp.txt
 %%DATADIR%%/help/de/hlp_quit.txt
 %%DATADIR%%/help/de/hlp_rawxml.txt
@@ -52,6 +55,7 @@ share/applications/mcabber.desktop
 %%DATADIR%%/help/en/hlp_buffer.txt
 %%DATADIR%%/help/en/hlp_chat_disable.txt
 %%DATADIR%%/help/en/hlp_clear.txt
+%%DATADIR%%/help/en/hlp_color.txt
 %%DATADIR%%/help/en/hlp_connect.txt
 %%DATADIR%%/help/en/hlp_del.txt
 %%DATADIR%%/help/en/hlp_disconnect.txt
@@ -62,6 +66,8 @@ share/applications/mcabber.desktop
 %%DATADIR%%/help/en/hlp_info.txt
 %%DATADIR%%/help/en/hlp_move.txt
 %%DATADIR%%/help/en/hlp_msay.txt
+%%DATADIR%%/help/en/hlp_otr.txt
+%%DATADIR%%/help/en/hlp_otrpolicy.txt
 %%DATADIR%%/help/en/hlp_pgp.txt
 %%DATADIR%%/help/en/hlp_quit.txt
 %%DATADIR%%/help/en/hlp_rawxml.txt
@@ -85,6 +91,7 @@ share/applications/mcabber.desktop
 %%DATADIR%%/help/fr/hlp_buffer.txt
 %%DATADIR%%/help/fr/hlp_chat_disable.txt
 %%DATADIR%%/help/fr/hlp_clear.txt
+%%DATADIR%%/help/fr/hlp_color.txt
 %%DATADIR%%/help/fr/hlp_connect.txt
 %%DATADIR%%/help/fr/hlp_del.txt
 %%DATADIR%%/help/fr/hlp_disconnect.txt
@@ -95,6 +102,8 @@ share/applications/mcabber.desktop
 %%DATADIR%%/help/fr/hlp_info.txt
 %%DATADIR%%/help/fr/hlp_move.txt
 %%DATADIR%%/help/fr/hlp_msay.txt
+%%DATADIR%%/help/fr/hlp_otr.txt
+%%DATADIR%%/help/fr/hlp_otrpolicy.txt
 %%DATADIR%%/help/fr/hlp_pgp.txt
 %%DATADIR%%/help/fr/hlp_quit.txt
 %%DATADIR%%/help/fr/hlp_rawxml.txt
@@ -110,6 +119,42 @@ share/applications/mcabber.desktop
 %%DATADIR%%/help/fr/hlp_status.txt
 %%DATADIR%%/help/fr/hlp_status_to.txt
 %%DATADIR%%/help/fr/hlp_version.txt
+%%DATADIR%%/help/it/hlp.txt
+%%DATADIR%%/help/it/hlp_add.txt
+%%DATADIR%%/help/it/hlp_alias.txt
+%%DATADIR%%/help/it/hlp_authorization.txt
+%%DATADIR%%/help/it/hlp_bind.txt
+%%DATADIR%%/help/it/hlp_buffer.txt
+%%DATADIR%%/help/it/hlp_chat_disable.txt
+%%DATADIR%%/help/it/hlp_clear.txt
+%%DATADIR%%/help/it/hlp_color.txt
+%%DATADIR%%/help/it/hlp_connect.txt
+%%DATADIR%%/help/it/hlp_del.txt
+%%DATADIR%%/help/it/hlp_disconnect.txt
+%%DATADIR%%/help/it/hlp_event.txt
+%%DATADIR%%/help/it/hlp_group.txt
+%%DATADIR%%/help/it/hlp_help.txt
+%%DATADIR%%/help/it/hlp_iline.txt
+%%DATADIR%%/help/it/hlp_info.txt
+%%DATADIR%%/help/it/hlp_move.txt
+%%DATADIR%%/help/it/hlp_msay.txt
+%%DATADIR%%/help/it/hlp_otr.txt
+%%DATADIR%%/help/it/hlp_otrpolicy.txt
+%%DATADIR%%/help/it/hlp_pgp.txt
+%%DATADIR%%/help/it/hlp_quit.txt
+%%DATADIR%%/help/it/hlp_rawxml.txt
+%%DATADIR%%/help/it/hlp_rename.txt
+%%DATADIR%%/help/it/hlp_request.txt
+%%DATADIR%%/help/it/hlp_room.txt
+%%DATADIR%%/help/it/hlp_roster.txt
+%%DATADIR%%/help/it/hlp_say.txt
+%%DATADIR%%/help/it/hlp_say_to.txt
+%%DATADIR%%/help/it/hlp_screen_refresh.txt
+%%DATADIR%%/help/it/hlp_set.txt
+%%DATADIR%%/help/it/hlp_source.txt
+%%DATADIR%%/help/it/hlp_status.txt
+%%DATADIR%%/help/it/hlp_status_to.txt
+%%DATADIR%%/help/it/hlp_version.txt
 %%DATADIR%%/help/nl/hlp.txt
 %%DATADIR%%/help/nl/hlp_add.txt
 %%DATADIR%%/help/nl/hlp_alias.txt
@@ -118,6 +163,7 @@ share/applications/mcabber.desktop
 %%DATADIR%%/help/nl/hlp_buffer.txt
 %%DATADIR%%/help/nl/hlp_chat_disable.txt
 %%DATADIR%%/help/nl/hlp_clear.txt
+%%DATADIR%%/help/nl/hlp_color.txt
 %%DATADIR%%/help/nl/hlp_connect.txt
 %%DATADIR%%/help/nl/hlp_del.txt
 %%DATADIR%%/help/nl/hlp_disconnect.txt
@@ -128,6 +174,8 @@ share/applications/mcabber.desktop
 %%DATADIR%%/help/nl/hlp_info.txt
 %%DATADIR%%/help/nl/hlp_move.txt
 %%DATADIR%%/help/nl/hlp_msay.txt
+%%DATADIR%%/help/nl/hlp_otr.txt
+%%DATADIR%%/help/nl/hlp_otrpolicy.txt
 %%DATADIR%%/help/nl/hlp_pgp.txt
 %%DATADIR%%/help/nl/hlp_quit.txt
 %%DATADIR%%/help/nl/hlp_rawxml.txt
@@ -151,6 +199,7 @@ share/applications/mcabber.desktop
 %%DATADIR%%/help/pl/hlp_buffer.txt
 %%DATADIR%%/help/pl/hlp_chat_disable.txt
 %%DATADIR%%/help/pl/hlp_clear.txt
+%%DATADIR%%/help/pl/hlp_color.txt
 %%DATADIR%%/help/pl/hlp_connect.txt
 %%DATADIR%%/help/pl/hlp_del.txt
 %%DATADIR%%/help/pl/hlp_disconnect.txt
@@ -170,8 +219,8 @@ share/applications/mcabber.desktop
 %%DATADIR%%/help/pl/hlp_roster.txt
 %%DATADIR%%/help/pl/hlp_say.txt
 %%DATADIR%%/help/pl/hlp_say_to.txt
-%%DATADIR%%/help/pl/hlp_set.txt
 %%DATADIR%%/help/pl/hlp_screen_refresh.txt
+%%DATADIR%%/help/pl/hlp_set.txt
 %%DATADIR%%/help/pl/hlp_source.txt
 %%DATADIR%%/help/pl/hlp_status.txt
 %%DATADIR%%/help/pl/hlp_status_to.txt
@@ -184,6 +233,7 @@ share/applications/mcabber.desktop
 %%DATADIR%%/help/ru/hlp_buffer.txt
 %%DATADIR%%/help/ru/hlp_chat_disable.txt
 %%DATADIR%%/help/ru/hlp_clear.txt
+%%DATADIR%%/help/ru/hlp_color.txt
 %%DATADIR%%/help/ru/hlp_connect.txt
 %%DATADIR%%/help/ru/hlp_del.txt
 %%DATADIR%%/help/ru/hlp_disconnect.txt
@@ -194,6 +244,8 @@ share/applications/mcabber.desktop
 %%DATADIR%%/help/ru/hlp_info.txt
 %%DATADIR%%/help/ru/hlp_move.txt
 %%DATADIR%%/help/ru/hlp_msay.txt
+%%DATADIR%%/help/ru/hlp_otr.txt
+%%DATADIR%%/help/ru/hlp_otrpolicy.txt
 %%DATADIR%%/help/ru/hlp_pgp.txt
 %%DATADIR%%/help/ru/hlp_quit.txt
 %%DATADIR%%/help/ru/hlp_rawxml.txt
@@ -217,6 +269,7 @@ share/applications/mcabber.desktop
 %%DATADIR%%/help/uk/hlp_buffer.txt
 %%DATADIR%%/help/uk/hlp_chat_disable.txt
 %%DATADIR%%/help/uk/hlp_clear.txt
+%%DATADIR%%/help/uk/hlp_color.txt
 %%DATADIR%%/help/uk/hlp_connect.txt
 %%DATADIR%%/help/uk/hlp_del.txt
 %%DATADIR%%/help/uk/hlp_disconnect.txt
@@ -227,6 +280,8 @@ share/applications/mcabber.desktop
 %%DATADIR%%/help/uk/hlp_info.txt
 %%DATADIR%%/help/uk/hlp_move.txt
 %%DATADIR%%/help/uk/hlp_msay.txt
+%%DATADIR%%/help/uk/hlp_otr.txt
+%%DATADIR%%/help/uk/hlp_otrpolicy.txt
 %%DATADIR%%/help/uk/hlp_pgp.txt
 %%DATADIR%%/help/uk/hlp_quit.txt
 %%DATADIR%%/help/uk/hlp_rawxml.txt
@@ -249,6 +304,7 @@ share/applications/mcabber.desktop
 @dirrm %%DATADIR%%/help/de
 @dirrm %%DATADIR%%/help/en
 @dirrm %%DATADIR%%/help/fr
+@dirrm %%DATADIR%%/help/it
 @dirrm %%DATADIR%%/help/nl
 @dirrm %%DATADIR%%/help/pl
 @dirrm %%DATADIR%%/help/ru