Update libotr and pidgin-otr to 4.0.0

The main new features in 4.0.0:

* Support v3 of the OTR protocol

* The plugin now supports multiple OTR conversations with the same buddy
  who is logged in at multiple locations. In this case, a new OTR menu
  will appear, which allows you to select which session an outgoing
  message is indended for. Note that concurrent SMP authentications with
  the same buddy who is logged in multiple times is not yet supported
  (starting a second authentication will end the first).

* During a private conversation with a buddy, an incoming unencrypted
  message will now trigger the regular incoming message notifications.
  In Pidgin this includes showing the message in the top-right
  notification area, if it is normally configured to do so.

* When a private conversation begins, the plugin will indicate whether
  Pidgin is configured to log the conversation.

* By default, OTR conversations will not be logged by Pidgin.

* New translations.

* libotr API changes:

  - instance tags, to support multiple simultaneous logins

  - support for asynchronous private key generation

  - the ability to provide an "extra" symmetric key to applications
    (with forward secrecy)

  - applications can supply a formation conversion callback if they do
    not natively use XHTML-style UTF8 markup

  - error messages formerly provided by libotr are now handled using
    callbacks to the application, for better i18n support

  - otrl_message_sending now handles message fragmentation internally

6 files changed, 24 insertions, 28 deletions

diff --git a/security/libotr/Makefile b/security/libotr/Makefile
index 9e97e19406fb..c65e4856bc2f 100644
--- a/security/libotr/Makefile
+++ b/security/libotr/Makefile
@@ -1,23 +1,16 @@
-# ex:ts=8
-# New ports collection makefile for:	libotr
-# Date created:				2005-03-20
-# Whom:					Conor McDermottroe <ports@mcdermottroe.com>
-#
 # $FreeBSD$
-#
 
 PORTNAME=	libotr
-PORTVERSION=	3.2.1
+PORTVERSION=	4.0.0
 # Please do not bump PORTREVISION for this port unless you have
 # confirmed via testing that it is necessary
-PORTREVISION=	0
-CATEGORIES=	security
+CATEGORIES=	security net-im net
 MASTER_SITES=	http://www.cypherpunks.ca/otr/
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} ${DISTNAME}${EXTRACT_SUFX}.asc
 EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 
 MAINTAINER=	dougb@FreeBSD.org
-COMMENT=	The portable OTR Messaging Library and toolkit
+COMMENT=	Portable OTR Messaging Library and toolkit
 
 BUILD_DEPENDS=	pkgconf>0:${PORTSDIR}/devel/pkgconf
 LIB_DEPENDS=	gpg-error.0:${PORTSDIR}/security/libgpg-error \
@@ -25,6 +18,8 @@ LIB_DEPENDS=	gpg-error.0:${PORTSDIR}/security/libgpg-error \
 
 MAKE_JOBS_SAFE=	yes
 
+CONFLICTS=	libotr-3.*
+
 USE_AUTOTOOLS=	autoconf libtool
 USE_LDCONFIG=	yes
 
diff --git a/security/libotr/distinfo b/security/libotr/distinfo
index b1af629e7a25..7182d2cccdca 100644
--- a/security/libotr/distinfo
+++ b/security/libotr/distinfo
@@ -1,4 +1,4 @@
-SHA256 (libotr-3.2.1.tar.gz) = d428eaa584984baa09450cca07742e0ac8fc62401f3a1c556e3025023369cdf4
-SIZE (libotr-3.2.1.tar.gz) = 414684
-SHA256 (libotr-3.2.1.tar.gz.asc) = 8ec08871018ce41bb4f631f5672daeaab72e9ea1b8913b3ddad22b9672a5e2b4
-SIZE (libotr-3.2.1.tar.gz.asc) = 190
+SHA256 (libotr-4.0.0.tar.gz) = 3f911994409898e74527730745ef35ed75c352c695a1822a677a34b2cf0293b4
+SIZE (libotr-4.0.0.tar.gz) = 441441
+SHA256 (libotr-4.0.0.tar.gz.asc) = 577f6fb9fbc8a33f45c5495ce46d41e55af84da56a6530bf113c6ea8d19b5c3c
+SIZE (libotr-4.0.0.tar.gz.asc) = 190
diff --git a/security/libotr/pkg-plist b/security/libotr/pkg-plist
index 27c9ced871fc..2f3a3f01de67 100644
--- a/security/libotr/pkg-plist
+++ b/security/libotr/pkg-plist
@@ -7,7 +7,9 @@ bin/otr_sesskeys
 include/libotr/auth.h
 include/libotr/b64.h
 include/libotr/context.h
+include/libotr/context_priv.h
 include/libotr/dh.h
+include/libotr/instag.h
 include/libotr/mem.h
 include/libotr/message.h
 include/libotr/privkey.h
@@ -21,7 +23,7 @@ include/libotr/version.h
 lib/libotr.a
 lib/libotr.la
 lib/libotr.so
-lib/libotr.so.4
+lib/libotr.so.5
 libdata/pkgconfig/libotr.pc
 share/aclocal/libotr.m4
 @dirrm include/libotr
diff --git a/security/pidgin-otr/Makefile b/security/pidgin-otr/Makefile
index 3130f2a2492e..4d91d7de97bd 100644
--- a/security/pidgin-otr/Makefile
+++ b/security/pidgin-otr/Makefile
@@ -1,16 +1,10 @@
-# ex:ts=8
-# Ports collection Makefile for:	pidgin-otr
-# Date created:				2004-12-17
-# Whom:					Conor McDermottroe <ports@mcdermottroe.com>
-#
 # $FreeBSD$
-#
 
 PORTNAME=	otr
-PORTVERSION=	3.2.1
+PORTVERSION=	4.0.0
 # Please do not bump PORTREVISION for this port unless you have
 # confirmed via testing that it is necessary
-CATEGORIES=	security net
+CATEGORIES=	security net-im net
 MASTER_SITES=	http://www.cypherpunks.ca/otr/
 PKGNAMEPREFIX=	pidgin-
 DISTNAME=	${PKGNAMEPREFIX}${PORTNAME}-${PORTVERSION}
@@ -22,7 +16,7 @@ COMMENT=	Allows deniable private conversations using Pidgin
 
 BUILD_DEPENDS=	${LOCALBASE}/bin/pidgin:${PORTSDIR}/net-im/pidgin \
 		pkgconf>0:${PORTSDIR}/devel/pkgconf
-LIB_DEPENDS=	otr:${PORTSDIR}/security/libotr \
+LIB_DEPENDS=	otr.5:${PORTSDIR}/security/libotr \
 		gcrypt:${PORTSDIR}/security/libgcrypt \
 		purple:${PORTSDIR}/net-im/libpurple
 
diff --git a/security/pidgin-otr/distinfo b/security/pidgin-otr/distinfo
index 97920752d5e9..4f65f21dfdbc 100644
--- a/security/pidgin-otr/distinfo
+++ b/security/pidgin-otr/distinfo
@@ -1,4 +1,4 @@
-SHA256 (pidgin-otr-3.2.1.tar.gz) = ce17e9769e3853076d80645adafaa866e7d7188f988d28a9793afc32c85cb979
-SIZE (pidgin-otr-3.2.1.tar.gz) = 409238
-SHA256 (pidgin-otr-3.2.1.tar.gz.asc) = 628d230599deec294f56e3c03764fb00316b61e8cea7a07a1d5ea1249be1a8b5
-SIZE (pidgin-otr-3.2.1.tar.gz.asc) = 190
+SHA256 (pidgin-otr-4.0.0.tar.gz) = d56b3f092dbe9ee6597641c7d2dd294884dc04ba47aaf4ec571cd54977df4691
+SIZE (pidgin-otr-4.0.0.tar.gz) = 459591
+SHA256 (pidgin-otr-4.0.0.tar.gz.asc) = cbde09d59d0341df738d83c789563435e1a555e881c4b749e339b364e17074f5
+SIZE (pidgin-otr-4.0.0.tar.gz.asc) = 190
diff --git a/security/pidgin-otr/pkg-plist b/security/pidgin-otr/pkg-plist
index fa4c03e22a10..104795db02e8 100644
--- a/security/pidgin-otr/pkg-plist
+++ b/security/pidgin-otr/pkg-plist
@@ -2,14 +2,19 @@ lib/pidgin/pidgin-otr.la
 lib/pidgin/pidgin-otr.so
 share/locale/ar/LC_MESSAGES/pidgin-otr.mo
 share/locale/de/LC_MESSAGES/pidgin-otr.mo
+share/locale/el/LC_MESSAGES/pidgin-otr.mo
 share/locale/es/LC_MESSAGES/pidgin-otr.mo
+share/locale/fa/LC_MESSAGES/pidgin-otr.mo
 share/locale/fr/LC_MESSAGES/pidgin-otr.mo
 share/locale/it/LC_MESSAGES/pidgin-otr.mo
 share/locale/hu/LC_MESSAGES/pidgin-otr.mo
 share/locale/nl/LC_MESSAGES/pidgin-otr.mo
+share/locale/my_MM/LC_MESSAGES/pidgin-otr.mo
+share/locale/nn/LC_MESSAGES/pidgin-otr.mo
 share/locale/pl/LC_MESSAGES/pidgin-otr.mo
 share/locale/ru/LC_MESSAGES/pidgin-otr.mo
 share/locale/sk/LC_MESSAGES/pidgin-otr.mo
 share/locale/sv/LC_MESSAGES/pidgin-otr.mo
 share/locale/vi/LC_MESSAGES/pidgin-otr.mo
+share/locale/zh_CN/LC_MESSAGES/pidgin-otr.mo
 @dirrmtry lib/pidgin