Note: Psi 0.15 uses a new profile data format. Data from 0.14 and

prior will be migrated to the new format when you run 0.15 for the
first time.

Changes:
  - Merge many changes from Psi+.
  - New message history browser.
  - New, fast contact list window.
  - TURN proxying for voice calls.
  - Store data in more standardized locations based on the platform.
  - No longer dependent on the Qt3Support library.
  - Domains ending in .local now always work, whether via DNS server or mdns.
  - Windows 64-bit and Mac 64-bit now supported. Mac PPC deprecated.
  - Legacy SSL port probe feature removed.
  - Various small features and bugfixes.

Since 0.14, this version contains about two years worth of merges
from the Psi+ project. Thanks to Rion and Dealer_WeARE for diligently
keeping the Psi source repo current all this time.

3 files changed, 24 insertions, 10 deletions

diff --git a/chat/psi/patches/patch-ah b/chat/psi/patches/patch-ah
index 123f1687c9c..efb6aa777ab 100644
--- a/chat/psi/patches/patch-ah
+++ b/chat/psi/patches/patch-ah
@@ -1,16 +1,16 @@
-$NetBSD: patch-ah,v 1.3 2011/01/02 23:53:13 schnoebe Exp $
+$NetBSD: patch-ah,v 1.4 2012/12/07 23:52:09 schnoebe Exp $
 
 pkgsrc places idna.h in a different directory than other package
 managers
 
---- iris/src/xmpp/xmpp-core/connector.cpp.orig	2009-07-16 00:08:57.000000000 -0500
+--- iris/src/xmpp/xmpp-core/connector.cpp.orig	2012-10-04 00:53:09.000000000 +0000
 +++ iris/src/xmpp/xmpp-core/connector.cpp
-@@ -37,7 +37,7 @@
+@@ -36,7 +36,7 @@
  #include <QUrl>
  #include <QTimer>
- #include "safedelete.h"
+ #include <qca.h>
 -#include <libidn/idna.h>
 +#include <idna.h>
  
- #include "ndns.h"
- 
+ #include "bsocket.h"
+ #include "httpconnect.h"
diff --git a/chat/psi/patches/patch-ak b/chat/psi/patches/patch-ak
index ede286c8e02..7674e052d23 100644
--- a/chat/psi/patches/patch-ak
+++ b/chat/psi/patches/patch-ak
@@ -1,9 +1,9 @@
-$NetBSD: patch-ak,v 1.1 2011/01/02 23:53:13 schnoebe Exp $
+$NetBSD: patch-ak,v 1.2 2012/12/07 23:52:09 schnoebe Exp $
 
 pkgsrc places IDN's stringprep in a different directory than other
 package managers.
 
---- iris/src/xmpp/jid/jid.cpp.orig	2009-07-16 00:08:57.000000000 -0500
+--- iris/src/xmpp/jid/jid.cpp.orig	2012-10-04 00:53:09.000000000 +0000
 +++ iris/src/xmpp/jid/jid.cpp
 @@ -24,7 +24,7 @@
  #include <QCoreApplication>
@@ -12,5 +12,5 @@ package managers.
 -#include <libidn/stringprep.h>
 +#include <stringprep.h>
  
- using namespace XMPP;
- 
+ #ifndef NO_IRISNET
+ #include "irisnetglobal_p.h"
diff --git a/chat/psi/patches/patch-src_src.pro b/chat/psi/patches/patch-src_src.pro
new file mode 100644
index 00000000000..5477479ba1f
--- /dev/null
+++ b/chat/psi/patches/patch-src_src.pro
@@ -0,0 +1,14 @@
+$NetBSD: patch-src_src.pro,v 1.1 2012/12/07 23:52:09 schnoebe Exp $
+
+Remove unneeded DESTDIR statement, it broke the install target.
+
+--- src/src.pro.orig	2012-10-04 00:53:03.000000000 +0000
++++ src/src.pro
+@@ -6,7 +6,6 @@
+ TEMPLATE = app
+ TARGET   = psi
+ CONFIG  += qt thread x11
+-DESTDIR  = $$PWD/..
+ 
+ #CONFIG += use_crash
+ CONFIG += pep