Update psi to 0.9.3. Changes since 0.9.2:

* Notification when a user is typing
* Advanced Data Forms capability (x:data)
* Mac version uses the menu bar and also has a new color scheme
* Slightly improved new user dialog
* Drag and drop File Transfer
* Ability to specify a status messages when going offline
* The tray icon under X11 should now be more beautiful
* Show self-contact is now a toolbar button instead of a normal option
* There is now an option for all chat windows to be compact by default
* Bugfix: file transfer sometimes wouldn't send the whole file
* Fixed many other small bugs

Update provided by Piotr Kalinowski in PR pkg/29285.

4 files changed, 64 insertions, 57 deletions

diff --git a/chat/psi/Makefile b/chat/psi/Makefile
index 0445020b29c..1cd5b495368 100644
--- a/chat/psi/Makefile
+++ b/chat/psi/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.20 2004/12/05 12:50:19 jdolecek Exp $
+# $NetBSD: Makefile,v 1.21 2005/04/02 11:33:10 jdolecek Exp $
 
-PSI_VERSION=	0.9.2
+PSI_VERSION=	0.9.3
 DISTNAME=	psi-${PSI_VERSION}
 PKGREVISION=	# empty
 CATEGORIES=	chat
@@ -12,7 +12,7 @@ DISTFILES=	${DISTNAME}${EXTRACT_SUFX} ${LANG_FILES}
 EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 
 # XXX uses internal bsd.pkg.mk variable
-FETCH_BEFORE_ARGS+=	-o "${DISTDIR}/${DIST_SUBDIR}/$$bfile"
+FETCH_BEFORE_ARGS+=	${FETCH_OUTPUT_ARGS} "${DISTDIR}/${DIST_SUBDIR}/$$bfile"
 
 MAINTAINER=	jdolecek@NetBSD.org
 HOMEPAGE=	http://psi.affinix.com/
@@ -27,10 +27,12 @@ USE_X11=	yes
 HAS_CONFIGURE=	yes
 
 CONFIGURE_ARGS= --prefix="${PREFIX}" --qtdir="${QTDIR}"
+CONFIGURE_ARGS+=	--with-qca-inc="${BUILDLINK_PREFIX.qca}/include" \
+			--with-qca-lib="${BUILDLINK_PREFIX.qca}/lib"
 
-LANG_FILES=	psi_zh.qm psi_nl.qm psi_sk.qm psi_fr.qm psi_fi.qm	\
-		psi_de.qm psi_sw.qm psi_pl.qm psi_mk.qm psi_el.qm	\
-		psi_es.qm psi_ru.qm
+LANG_FILES=	psi_zh.qm psi_nl.qm psi_sk.qm psi_fr.qm psi_cs.qm	\
+		psi_de.qm psi_et.qm psi_pl.qm psi_mk.qm psi_el.qm	\
+		psi_es.qm psi_ru.qm psi_vi.qm
 
 .for l in ${LANG_FILES}
 SITES_${l}=	http://psi.affinix.com/?version=${PSI_VERSION}&file=
@@ -68,4 +70,5 @@ do-install:
 BUILDLINK_DEPMETHOD.qt3-tools=	build
 .include "../../x11/qt3-tools/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
+.include "../../security/qca/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/chat/psi/PLIST b/chat/psi/PLIST
index 37ff18589cf..c6bb54e4f75 100644
--- a/chat/psi/PLIST
+++ b/chat/psi/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2004/11/27 21:58:18 jdolecek Exp $
+@comment $NetBSD: PLIST,v 1.6 2005/04/02 11:33:10 jdolecek Exp $
 bin/psi
 share/psi/iconsets/emoticons/default/hugleft.png
 share/psi/iconsets/emoticons/default/devil.png
@@ -197,18 +197,19 @@ share/psi/certs/rootcert.xml
 share/psi/certs/README
 share/psi/README
 share/psi/COPYING
-share/psi/psi_sw.qm
+share/psi/psi_zh.qm
+share/psi/psi_vi.qm
 share/psi/psi_sk.qm
 share/psi/psi_ru.qm
 share/psi/psi_pl.qm
 share/psi/psi_nl.qm
 share/psi/psi_mk.qm
-share/psi/psi_fi.qm
+share/psi/psi_fr.qm
+share/psi/psi_et.qm
 share/psi/psi_es.qm
 share/psi/psi_el.qm
 share/psi/psi_de.qm
-share/psi/psi_fr.qm
-share/psi/psi_zh.qm
+share/psi/psi_cs.qm
 @dirrm share/psi/sound
 @dirrm share/psi/iconsets/system/default
 @dirrm share/psi/iconsets/system
diff --git a/chat/psi/distinfo b/chat/psi/distinfo
index 7e1969a253c..f2406836496 100644
--- a/chat/psi/distinfo
+++ b/chat/psi/distinfo
@@ -1,43 +1,46 @@
-$NetBSD: distinfo,v 1.10 2005/02/23 15:59:13 agc Exp $
+$NetBSD: distinfo,v 1.11 2005/04/02 11:33:10 jdolecek Exp $
 
-SHA1 (psi-0.9.2/psi-0.9.2.tar.bz2) = 6681c6447064f1e94889a1e160584bd577ebe6c4
-RMD160 (psi-0.9.2/psi-0.9.2.tar.bz2) = 8734d0401011bed0e9b90736ff0cfd43ef72cb21
-Size (psi-0.9.2/psi-0.9.2.tar.bz2) = 1154392 bytes
-SHA1 (psi-0.9.2/psi_zh.qm) = d5f9bef42161b27fe013dc211a279fd385e5ae28
-RMD160 (psi-0.9.2/psi_zh.qm) = 5227c6a23196f8284ca3ae40b713eccf14a1e135
-Size (psi-0.9.2/psi_zh.qm) = 69489 bytes
-SHA1 (psi-0.9.2/psi_nl.qm) = 039a19fc91d8954167c314085d5234bfad5e46b5
-RMD160 (psi-0.9.2/psi_nl.qm) = 477aa396e8e9f79ec0b23aa846f07bba1a176a6b
-Size (psi-0.9.2/psi_nl.qm) = 131016 bytes
-SHA1 (psi-0.9.2/psi_sk.qm) = 907bf5326caaaf117131e17470efcc2b81f0dce0
-RMD160 (psi-0.9.2/psi_sk.qm) = 852ccdf17f3c58e13db6bba813da91c1cbd1c5d5
-Size (psi-0.9.2/psi_sk.qm) = 121985 bytes
-SHA1 (psi-0.9.2/psi_fr.qm) = 328f757ec754f663420de2580ddc5b9c178ed2d5
-RMD160 (psi-0.9.2/psi_fr.qm) = eec2ff587b6b19d7898c91715bee2e6b40fbc8f6
-Size (psi-0.9.2/psi_fr.qm) = 147411 bytes
-SHA1 (psi-0.9.2/psi_fi.qm) = 8198e07dcff01807e4969414d8f1552808d64b12
-RMD160 (psi-0.9.2/psi_fi.qm) = dafac9e3202186979c511681ed6de82424be4602
-Size (psi-0.9.2/psi_fi.qm) = 126909 bytes
-SHA1 (psi-0.9.2/psi_de.qm) = a608df8d248f97ba3b803c1b1c976818f48388a7
-RMD160 (psi-0.9.2/psi_de.qm) = f41184deb22d71efa58dc70d3c420dcf51e2720e
-Size (psi-0.9.2/psi_de.qm) = 135542 bytes
-SHA1 (psi-0.9.2/psi_sw.qm) = d134e91be015df74fa0c8498850e7b5f841808d8
-RMD160 (psi-0.9.2/psi_sw.qm) = a8fa8afe06cc14ad49bd542906e0ae0d2f104e53
-Size (psi-0.9.2/psi_sw.qm) = 138546 bytes
-SHA1 (psi-0.9.2/psi_pl.qm) = ef6501ce42a1129d6ec90c2910ff341d7c7ea044
-RMD160 (psi-0.9.2/psi_pl.qm) = 246a736c5ff64fc6746d11764c1eb42b16a42a52
-Size (psi-0.9.2/psi_pl.qm) = 128935 bytes
-SHA1 (psi-0.9.2/psi_mk.qm) = d762175a585e34665641dc3747abda2cd87238e3
-RMD160 (psi-0.9.2/psi_mk.qm) = 6822d7f5f2368250fb9a0339dd1b551347e16e3a
-Size (psi-0.9.2/psi_mk.qm) = 125833 bytes
-SHA1 (psi-0.9.2/psi_el.qm) = 98d6bad933b267f31c0b0bc3395dcdd9d2bb4c04
-RMD160 (psi-0.9.2/psi_el.qm) = bbab1e0f9ab7ec202eeeacd2f28bdd0b7cd17a49
-Size (psi-0.9.2/psi_el.qm) = 139378 bytes
-SHA1 (psi-0.9.2/psi_es.qm) = ce918282d42cbb569db569973ee41259ee8cbc7f
-RMD160 (psi-0.9.2/psi_es.qm) = 7630b0124cc6b1b5586ed4bf9616c3cd4c004ed7
-Size (psi-0.9.2/psi_es.qm) = 131774 bytes
-SHA1 (psi-0.9.2/psi_ru.qm) = a49e15eed950476aa0d3adf1b7e8294624903432
-RMD160 (psi-0.9.2/psi_ru.qm) = d5a8add77055af8172b541437cb1dfc9ea5826ae
-Size (psi-0.9.2/psi_ru.qm) = 130398 bytes
-SHA1 (patch-ac) = e934f2cf6474dcdd825b7eaf089b02fa0f2e0ee2
+SHA1 (psi-0.9.3/psi-0.9.3.tar.bz2) = dc5e7dbf5d791db2f0c4189cad055a40b21cf9b6
+RMD160 (psi-0.9.3/psi-0.9.3.tar.bz2) = 66983a9746812b27a5c8a1c072e9b33aca638d30
+Size (psi-0.9.3/psi-0.9.3.tar.bz2) = 1423322 bytes
+SHA1 (psi-0.9.3/psi_zh.qm) = 8ccd483cd486881b8afe3dca23c960af4a466183
+RMD160 (psi-0.9.3/psi_zh.qm) = 68ae45fa806bf8e15c2ca5c30b94b3a25bf3361f
+Size (psi-0.9.3/psi_zh.qm) = 70437 bytes
+SHA1 (psi-0.9.3/psi_nl.qm) = f4f60980bff1eb70cd2fe30b44bdec2e3a8bbff1
+RMD160 (psi-0.9.3/psi_nl.qm) = 6d70a5d38e445331954d0832e064707c6ccfa64b
+Size (psi-0.9.3/psi_nl.qm) = 132405 bytes
+SHA1 (psi-0.9.3/psi_sk.qm) = ca287c4d7666bcf8fcaf7dd28a897d68ac6babc3
+RMD160 (psi-0.9.3/psi_sk.qm) = 53993c98e4f786c48ab7438ca29ba7608651081b
+Size (psi-0.9.3/psi_sk.qm) = 123381 bytes
+SHA1 (psi-0.9.3/psi_fr.qm) = 400d1b4066675d524e2ecf3aa73464117ec07277
+RMD160 (psi-0.9.3/psi_fr.qm) = e9b7b12cac95f85ca1b2bf0f3b32bbfedad3e02c
+Size (psi-0.9.3/psi_fr.qm) = 148745 bytes
+SHA1 (psi-0.9.3/psi_cs.qm) = 34827ddcfbf3f6b4991a77666114703375caa327
+RMD160 (psi-0.9.3/psi_cs.qm) = c45603f18254dd78fc399169b7ff7e5a432590d3
+Size (psi-0.9.3/psi_cs.qm) = 126479 bytes
+SHA1 (psi-0.9.3/psi_de.qm) = decde91384fd30ec467d63262cad8cef70c2d2e7
+RMD160 (psi-0.9.3/psi_de.qm) = c35a49d137a6343951d71dd937adaa0ba979e5a5
+Size (psi-0.9.3/psi_de.qm) = 136428 bytes
+SHA1 (psi-0.9.3/psi_et.qm) = 3700b495cb111aeea51026b6e4da042dd3a96be5
+RMD160 (psi-0.9.3/psi_et.qm) = a33c822e2e3983f6f624f6aa9394923b7cb81fef
+Size (psi-0.9.3/psi_et.qm) = 110651 bytes
+SHA1 (psi-0.9.3/psi_pl.qm) = 0e77dda6169d62f6d39dec7efa7364a88fe388ec
+RMD160 (psi-0.9.3/psi_pl.qm) = 3dddc11a639a037f63cfb5b7b1b504f04cf25094
+Size (psi-0.9.3/psi_pl.qm) = 130215 bytes
+SHA1 (psi-0.9.3/psi_mk.qm) = 278c867aad93aff67295e7b1b13467ae9361caba
+RMD160 (psi-0.9.3/psi_mk.qm) = 1262d30b0fbef68283f81721df8e445b1a4ebd5a
+Size (psi-0.9.3/psi_mk.qm) = 128211 bytes
+SHA1 (psi-0.9.3/psi_el.qm) = d169834d301579d4f9f10c6bb4b4c908601e6324
+RMD160 (psi-0.9.3/psi_el.qm) = c5d017d7ec3e95fd036769f24233b2800bb144b4
+Size (psi-0.9.3/psi_el.qm) = 140442 bytes
+SHA1 (psi-0.9.3/psi_es.qm) = 25bde8c6e3a7bc15a93397686d9aed144e995ec9
+RMD160 (psi-0.9.3/psi_es.qm) = f2c1be98bc288f9307d29a2aa1e9f71333710aab
+Size (psi-0.9.3/psi_es.qm) = 136308 bytes
+SHA1 (psi-0.9.3/psi_ru.qm) = 42e20ca618100a90da8222a3f31053f0e563bb69
+RMD160 (psi-0.9.3/psi_ru.qm) = 2273130a312838cb309aa9104e07725a3f62b929
+Size (psi-0.9.3/psi_ru.qm) = 131782 bytes
+SHA1 (psi-0.9.3/psi_vi.qm) = 9676425d54ecf37c4d7039cdc1aff81de87c9612
+RMD160 (psi-0.9.3/psi_vi.qm) = ed111729624fb299eaba729648105b7f1a93e35f
+Size (psi-0.9.3/psi_vi.qm) = 139897 bytes
+SHA1 (patch-ac) = 6faea4967d2682c087aa5de12b7c83ac5848d1b5
 SHA1 (patch-ad) = 8d255aa9de01ccb39d2cdc7b0074b5dec0e3c0cb
diff --git a/chat/psi/patches/patch-ac b/chat/psi/patches/patch-ac
index c88aea0f03d..39508dbdbb3 100644
--- a/chat/psi/patches/patch-ac
+++ b/chat/psi/patches/patch-ac
@@ -1,10 +1,10 @@
-$NetBSD: patch-ac,v 1.5 2004/11/27 21:58:18 jdolecek Exp $
+$NetBSD: patch-ac,v 1.6 2005/04/02 11:33:10 jdolecek Exp $
 
---- src/psi_profiles.cpp.orig	2004-11-27 12:25:13.000000000 +0100
-+++ src/psi_profiles.cpp	2004-11-27 12:25:34.000000000 +0100
-@@ -433,7 +433,11 @@
+--- src/psi_profiles.cpp.orig	2004-12-08 15:42:39.000000000 +0100
++++ src/psi_profiles.cpp	2005-04-02 12:51:21.000000000 +0200
+@@ -451,7 +451,11 @@
  
- 	prefs.clNewHeadings = false;
+ 	prefs.clNewHeadings = true;
  
 +#ifdef __NetBSD__
 +	prefs.player = "audioplay";