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.

7 files changed, 129 insertions, 57 deletions

diff --git a/chat/psi/Makefile b/chat/psi/Makefile
index c32853cf616..069e7243554 100644
--- a/chat/psi/Makefile
+++ b/chat/psi/Makefile
@@ -1,14 +1,11 @@
-# $NetBSD: Makefile,v 1.71 2012/10/08 23:01:18 adam Exp $
+# $NetBSD: Makefile,v 1.72 2012/12/07 23:52:09 schnoebe Exp $
 
-PSI_VERSION=	0.14
-DISTNAME=	psi-${PSI_VERSION}
-PKGNAME=	${DISTNAME:S/-rc/rc/}
-PKGREVISION=	10
+DISTNAME=	psi-0.15
 CATEGORIES=	chat
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=psi/}
 EXTRACT_SUFX=	.tar.bz2
 
-MAINTAINER=	eric@cirr.com
+MAINTAINER=	schnoebe@NetBSD.org
 HOMEPAGE=	http://psi-im.org/
 COMMENT=	Psi XMPP/Jabber Client
 LICENSE=	gnu-gpl-v2
@@ -16,7 +13,7 @@ LICENSE=	gnu-gpl-v2
 DEPENDS+=	qca2-ossl>=2.0.0beta3:../../security/qca2-ossl
 
 DIST_SUBDIR=	${DISTNAME}
-DISTFILES=	${DEFAULT_DISTFILES} ${LANG_PACK}
+DISTFILES=	${DEFAULT_DISTFILES} ${LANG_FILES}
 
 USE_TOOLS+=	gmake unzip
 USE_LANGUAGES=	c c++
@@ -27,24 +24,20 @@ CONFIG_SHELL=	${SH}
 
 CONFIGURE_ARGS+=	--prefix=${PREFIX:Q}
 CONFIGURE_ARGS+=	--qtdir=${QTDIR:Q}
-CONFIGURE_ARGS+=	--disable-bundled-qca
 CONFIGURE_ARGS+=	--with-zlib-inc=${BUILDLINK_PREFIX.zlib}/include
 CONFIGURE_ARGS+=	--with-zlib-lib=${BUILDLINK_PREFIX.zlib}/lib
+CONFIGURE_ARGS+=	--with-qca-lib=${BUILDLINK_PREFIX.qca2}/lib
+CONFIGURE_ARGS+=	--with-qca-inc=${BUILDLINK_PREFIX.qca2}/include
 
 #
-#   LANG_PACK is an archive of all the translations..
+# a group of scripts that aren't to be installed, and aren't
+# used by the pkgsrc system.  But they all have the non-standard
+# "==" in them. (silly linux developers thinking [ bash = sh ].
 #
-LANG_PACK=psi-0.14_langpack_2009-12-02.zip
-SITES.${LANG_PACK}= http://fs.scs-tsa.de/psi_l10n/
+CHECK_PORTABILITY_SKIP=	    admin/build/devconfig.sh \
+			    admin/build/build_package.sh \
+			    admin/build/prep_dist.sh
 
-#
-#   LANG_FILES are the translations we're going to install
-#
-
-LANG_FILES= be/psi_be.qm cs/psi_cs.qm de/psi_de.qm fr/psi_fr.qm \
-	    it/psi_it.qm ja/psi_ja.qm pl/psi_pl.qm ru/psi_ru.qm \
-	    sl/psi_sl.qm sv/psi_sv.qm pt_BR/psi_pt_BR.qm \
-	    ur_PK/psi_ur_PK.qm zh_TW/psi_zh_TW.qm
 
 INSTALLATION_DIRS=	bin share/psi share/doc/psi
 INSTALL_DIRS=		src
@@ -53,6 +46,18 @@ INSTALL_MAKE_FLAGS=	INSTALL_ROOT=${DESTDIR}
 
 .include "options.mk"
 
+#
+#   LANG_FILES are the translations we're going to install
+#
+# LANG_FILES= psi_be.qm psi_cs.qm psi_de.qm psi_eo.qm psi_es.qm \
+# 	    psi_es_ES.qm psi_fr.qm psi_it.qm psi_ja.qm psi_mk.qm \
+# 	    psi_pl.qm psi_pt_BR.qm psi_ru.qm psi_sl.qm psi_sv.qm \
+# 	    psi_uk.qm psi_ur_PK.qm psi_vi.qm psi_zh_CN.qm psi_zh_TW.qm
+
+.for f in ${LANG_FILES}
+    SITES.${f}=http://psi-im.org/download/lang/
+.endfor
+
 post-install:
 	# remove some files that shouldn't be there,
 	# install some files where they should be installed
@@ -68,6 +73,6 @@ post-install:
 .include "../../devel/libidn/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../security/qca2/buildlink3.mk"
-BUILDLINK_API_DEPENDS.qt4-libs+=	qt4-libs>=4.4.0
+BUILDLINK_API_DEPENDS.qt4-libs+=	qt4-libs>=4.7.0
 .include "../../x11/qt4-libs/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/chat/psi/PLIST b/chat/psi/PLIST
index 6b776db4ce4..cd05c87fafe 100644
--- a/chat/psi/PLIST
+++ b/chat/psi/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.14 2011/01/02 23:53:12 schnoebe Exp $
+@comment $NetBSD: PLIST,v 1.15 2012/12/07 23:52:09 schnoebe Exp $
 bin/psi
 share/doc/psi/COPYING
 share/doc/psi/README
@@ -163,19 +163,26 @@ share/psi/iconsets/system/default/whiteboarding/translate.png
 share/psi/iconsets/system/default/whiteboarding/ungroup.png
 share/psi/iconsets/system/default/whiteboarding/whiteboard.png
 share/psi/iconsets/system/default/xml.png
-share/psi/psi_be.qm
-share/psi/psi_cs.qm
-share/psi/psi_de.qm
-share/psi/psi_fr.qm
-share/psi/psi_it.qm
-share/psi/psi_ja.qm
-share/psi/psi_pl.qm
-share/psi/psi_ru.qm
-share/psi/psi_sl.qm
-share/psi/psi_sv.qm
-share/psi/psi_pt_BR.qm
-share/psi/psi_ur_PK.qm
-share/psi/psi_zh_TW.qm
+${PLIST.be}share/psi/psi_be.qm
+${PLIST.cs}share/psi/psi_cs.qm
+${PLIST.de}share/psi/psi_de.qm
+${PLIST.eo}share/psi/psi_eo.qm
+${PLIST.es}share/psi/psi_es.qm
+${PLIST.es-es}share/psi/psi_es_ES.qm
+${PLIST.fr}share/psi/psi_fr.qm
+${PLIST.it}share/psi/psi_it.qm
+${PLIST.ja}share/psi/psi_ja.qm
+${PLIST.mk}share/psi/psi_mk.qm
+${PLIST.pl}share/psi/psi_pl.qm
+${PLIST.pt-br}share/psi/psi_pt_BR.qm
+${PLIST.ru}share/psi/psi_ru.qm
+${PLIST.sl}share/psi/psi_sl.qm
+${PLIST.sv}share/psi/psi_sv.qm
+${PLIST.uk}share/psi/psi_uk.qm
+${PLIST.ur-pk}share/psi/psi_ur_PK.qm
+${PLIST.vi}share/psi/psi_vi.qm
+${PLIST.zh-cn}share/psi/psi_zh_CN.qm
+${PLIST.zh-tw}share/psi/psi_zh_TW.qm
 share/psi/sound/chat1.wav
 share/psi/sound/chat2.wav
 share/psi/sound/ft_complete.wav
diff --git a/chat/psi/distinfo b/chat/psi/distinfo
index 0d933256581..c4dd20cdb7e 100644
--- a/chat/psi/distinfo
+++ b/chat/psi/distinfo
@@ -1,12 +1,10 @@
-$NetBSD: distinfo,v 1.25 2011/01/02 23:53:12 schnoebe Exp $
+$NetBSD: distinfo,v 1.26 2012/12/07 23:52:09 schnoebe Exp $
 
-SHA1 (psi-0.14/psi-0.14.tar.bz2) = f5f8e1a427339a4e9113b5fa513b01a42ae1be4b
-RMD160 (psi-0.14/psi-0.14.tar.bz2) = 0c4a07726c2f9819da0f8aa8f1982e939f1fc20f
-Size (psi-0.14/psi-0.14.tar.bz2) = 2168801 bytes
-SHA1 (psi-0.14/psi-0.14_langpack_2009-12-02.zip) = f57b8fc70db64ffb57cb82ab5df9f923961dbde8
-RMD160 (psi-0.14/psi-0.14_langpack_2009-12-02.zip) = 176bfaa4b5f787a7157883b3b806dc23d5a2b78b
-Size (psi-0.14/psi-0.14_langpack_2009-12-02.zip) = 1246445 bytes
+SHA1 (psi-0.15/psi-0.15.tar.bz2) = 4801866d4fa2af43a9b3f431e2c9d633a97276db
+RMD160 (psi-0.15/psi-0.15.tar.bz2) = 0c5d461fb2b7e7b25850f19f79bcc23c1e87efb3
+Size (psi-0.15/psi-0.15.tar.bz2) = 1984777 bytes
 SHA1 (patch-ad) = 3ee21a1cb17637ed650b6b58e5575c8fa246a4f0
-SHA1 (patch-ah) = 0f267b9d6d1615a2111b423d9eb9048961f0da0d
-SHA1 (patch-ak) = 539e272207ab8fcc88e4eaf29ddeb14e37458dbe
+SHA1 (patch-ah) = 1c50b81daf5c4e9a4fcefc102ba5780ae90cf44e
+SHA1 (patch-ak) = f3870be31be769ac51a3f26a1fc6f6e14564e685
 SHA1 (patch-al) = 44d17e5ca70061c13164cadf69b8a5f84648c177
+SHA1 (patch-src_src.pro) = d35d1f22b91b8ca14692c4b5bfb13d11f1d06c34
diff --git a/chat/psi/options.mk b/chat/psi/options.mk
index a7d71d59093..117e2945853 100644
--- a/chat/psi/options.mk
+++ b/chat/psi/options.mk
@@ -1,20 +1,68 @@
-# $NetBSD: options.mk,v 1.1 2011/01/03 09:13:26 wiz Exp $
+# $NetBSD: options.mk,v 1.2 2012/12/07 23:52:09 schnoebe Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.psi
-PKG_SUPPORTED_OPTIONS=	aspell enchant
+PKG_SUPPORTED_OPTIONS+=	aspell enchant dbus whiteboard xscreensaver
+PKG_SUGGESTED_OPTIONS+=	aspell enchant
+
+# from an idea stolen from ../../misc/openoffice3.
+PSI_SUPPORTED_LANGUAGES=be cs de eo es es-es fr it ja mk pl pt-br ru \
+			sl sv uk ur-pk vi zh-cn zh-tw
+
+.for l in ${PSI_SUPPORTED_LANGUAGES}
+PKG_SUPPORTED_OPTIONS+= lang-${l}
+PLIST_VARS+=${l}
+.endfor
 
 .include "../../mk/bsd.options.mk"
 
+# handle the languages first
+#   bit of special logic, as the dialects of languages are handled
+#   as lang_DIALECT (aka, lower underscore UPPER) in the PSI translations
+.for lang in ${PKG_OPTIONS:Mlang-*:S/lang-//g}
+PLIST.${lang} = yes
+. if ${lang:M??-??}
+    LANG_FILES+= psi_${lang:C/-.*//g}_${lang:C/.*-//g:tu}.qm
+. else
+    LANG_FILES+= psi_${lang}.qm
+. endif
+.endfor
+
 # enable aspell
 .if !empty(PKG_OPTIONS:Maspell)
 CONFIGURE_ARGS+=	--with-aspell-inc=${BUILDLINK_PREFIX.aspell}/include
 CONFIGURE_ARGS+=	--with-aspell-lib=${BUILDLINK_PREFIX.aspell}/lib
 .include "../../textproc/aspell/buildlink3.mk"
+.else
+CONFIGURE_ARGS+=	--disable-aspell
 .endif
 
 # enable enchant
-.if empty(PKG_OPTIONS:Menchant)
+.if !empty(PKG_OPTIONS:Menchant)
+.include "../../textproc/enchant/buildlink3.mk"
+.else
 CONFIGURE_ARGS+=	--disable-enchant
+.endif
+
+# enable qdbus
+.if !empty(PKG_OPTIONS:Mdbus)
+.include "../../x11/qt4-qdbus/buildlink3.mk"
 .else
-.include "../../textproc/enchant/buildlink3.mk"
+CONFIGURE_ARGS+=	--disable-qdbus
+.endif
+
+# enable whiteboarding
+.if !empty(PKG_OPTIONS:Mwhiteboard)
+CONFIGURE_ARGS+=	--enable-whiteboarding
 .endif
+
+# enable xscreensaver extension
+.if empty(PKG_OPTIONS:Mxscreensaver)
+CONFIGURE_ARGS+=	--disable-xss
+.endif
+
+# enable growl
+# .if empty(PKG_OPTIONS:Mgrowl)
+# CONFIGURE_ARGS+=	--with-growl=${BUILDLINK_PREFIX.growl}
+# .else
+# CONFIGURE_ARGS+=	--disable-growl
+# .endif
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