Update to 0.10.

  - Psi will now sign out before Windows or Mac OS X machines go to 'sleep'
  - The default text input line in the chat dialogs starts at one line tall,
    and grows as necessary.
  - The Roster can now be automatically resized to fit all  contacts.
  - The Roster now has a menu bar available on Windows and Linux
  - Chat windows can be collected together using tabs
  - On Windows and Mac OS X, selected text may be automatically copied to the
    clipboard.
  - Mac OS X builds now enjoy Growl(.info) support
  - Photos are now available in the VCard dialog
  - New default colour scheme
  - Roster and chat dialog opacity is now configurable on Windows and Mac OS X
  - The colour scheme is now slightly more configurable
  - Assorted minor feature additions and bug fixes
  - Number of unread messages is now visible in the dock on Mac OS X
  - GPG passphrases are now cached during the entire Psi session
  - 'Authorization received' messages can now be ignored
  - Roster and chat windows can be made transparent

6 files changed, 103 insertions, 170 deletions

diff --git a/chat/psi/Makefile b/chat/psi/Makefile
index 901ace287cf..f34f2e3f669 100644
--- a/chat/psi/Makefile
+++ b/chat/psi/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.31 2006/01/05 10:08:58 ghen Exp $
+# $NetBSD: Makefile,v 1.32 2006/01/23 17:05:02 xtraeme Exp $
 
-PSI_VERSION=	0.9.3
+PSI_VERSION=	0.10
 DISTNAME=	psi-${PSI_VERSION}
-PKGREVISION=	1
 CATEGORIES=	chat
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=psi/}
 EXTRACT_SUFX=	.tar.bz2
@@ -21,6 +20,7 @@ COMMENT=	PSI Jabber Client
 DEPENDS+=	qca-tls>=1.0:../../security/qca-tls
 
 USE_TOOLS+=	gmake
+USE_LANGUAGES+=	c++
 USE_LIBTOOL=	yes
 HAS_CONFIGURE=	yes
 
@@ -36,10 +36,10 @@ LANG_FILES=	psi_zh.qm psi_nl.qm psi_sk.qm psi_fr.qm psi_cs.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=
+SITES_${l}=	http://psi-im.org/download?page=download&version=${PSI_VERSION}&lang_id=
 .endfor
 
-INSTALLATION_DIRS=	bin
+INSTALLATION_DIRS=	bin share/psi share/doc/psi
 
 # XXX the psiwidgets.so symlink is somewhat ugly, but without that
 # uic doesn't find the built plug-in and generates sources without
@@ -54,24 +54,26 @@ post-configure:
 	${MV} ${WRKSRC}/Makefile.new ${WRKSRC}/Makefile
 	cd ${WRKSRC}/libpsi/psiwidgets && ( ${SETENV} ${CONFIGURE_ENV}	\
 		${QTDIR}/bin/qmake psiwidgets.pro -o Makefile; \
-		${SED} -e 's,-rpath.*$$,-rpath "${QTDIR}/lib",' < Makefile > Makefile.new; \
+		${SED} -e 's,-rpath.*$$,-rpath "${QTDIR}/lib",' \
+			< Makefile > Makefile.new; \
 		${MV} Makefile.new Makefile; \
 		${LN} -s .libs/libpsiwidgets.so psiwidgets.so; \
 	)
 
 do-install:
-	${INSTALL_DATA_DIR} ${PREFIX}/share/psi
-	cd ${WRKSRC} && \
-	${CP} -f -pR iconsets sound certs README COPYING ${PREFIX}/share/psi/
-	for f in ${LANG_FILES}; do \
-		${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/$$f \
-			 ${PREFIX}/share/psi/; \
-	done
+.for f in iconsets sound certs
+	${INSTALL_DATA_DIR} ${PREFIX}/share/psi/${f}
+	cd ${WRKSRC}/${f} && ${PAX} -rwppm . ${PREFIX}/share/psi/${f}
+.endfor
+	${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/psi
+.for f in ${LANG_FILES}
+	${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/${f} ${PREFIX}/share/psi
+.endfor
 	${INSTALL_PROGRAM} ${WRKSRC}/psi ${PREFIX}/bin/psi
 
-.include "../../x11/qt3-libs/buildlink3.mk"
-.include "../../x11/qt3-tools/buildlink3.mk"
+.include "../../devel/libidn/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../security/qca/buildlink3.mk"
-.include "../../devel/libidn/buildlink3.mk"
+.include "../../x11/qt3-libs/buildlink3.mk"
+.include "../../x11/qt3-tools/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/chat/psi/PLIST b/chat/psi/PLIST
index c5c735aeb8c..6e95d3a66af 100644
--- a/chat/psi/PLIST
+++ b/chat/psi/PLIST
@@ -1,7 +1,6 @@
-@comment $NetBSD: PLIST,v 1.7 2005/10/01 22:00:07 jdolecek Exp $
+@comment $NetBSD: PLIST,v 1.8 2006/01/23 17:05:02 xtraeme Exp $
 bin/psi
-share/psi/COPYING
-share/psi/README
+share/doc/psi/README
 share/psi/certs/README
 share/psi/certs/rootcert.xml
 share/psi/iconsets/emoticons/README
@@ -44,18 +43,14 @@ share/psi/iconsets/emoticons/default/unhappy.png
 share/psi/iconsets/emoticons/default/wink.png
 share/psi/iconsets/emoticons/default/yes.png
 share/psi/iconsets/roster/README
-share/psi/iconsets/roster/aim/away.png
-share/psi/iconsets/roster/aim/dnd.png
-share/psi/iconsets/roster/aim/icondef.xml
-share/psi/iconsets/roster/aim/offline.png
-share/psi/iconsets/roster/aim/online.png
-share/psi/iconsets/roster/aim/xa.png
-share/psi/iconsets/roster/crystal_aim.jisp
-share/psi/iconsets/roster/crystal_icq.jisp
-share/psi/iconsets/roster/crystal_msn.jisp
-share/psi/iconsets/roster/crystal_roster.jisp
-share/psi/iconsets/roster/crystal_transport.jisp
-share/psi/iconsets/roster/crystal_yahoo.jisp
+share/psi/iconsets/roster/crystal-aim.jisp
+share/psi/iconsets/roster/crystal-gadu.jisp
+share/psi/iconsets/roster/crystal-icq.jisp
+share/psi/iconsets/roster/crystal-msn.jisp
+share/psi/iconsets/roster/crystal-roster.jisp
+share/psi/iconsets/roster/crystal-service.jisp
+share/psi/iconsets/roster/crystal-sms.jisp
+share/psi/iconsets/roster/crystal-yahoo.jisp
 share/psi/iconsets/roster/default/ask.png
 share/psi/iconsets/roster/default/away.png
 share/psi/iconsets/roster/default/chat.png
@@ -76,70 +71,11 @@ share/psi/iconsets/roster/default/online.png
 share/psi/iconsets/roster/default/perr.png
 share/psi/iconsets/roster/default/system.png
 share/psi/iconsets/roster/default/xa.png
-share/psi/iconsets/roster/gadugadu/away.png
-share/psi/iconsets/roster/gadugadu/icondef.xml
-share/psi/iconsets/roster/gadugadu/invisible.png
-share/psi/iconsets/roster/gadugadu/offline.png
-share/psi/iconsets/roster/gadugadu/online.png
-share/psi/iconsets/roster/icq/away.png
-share/psi/iconsets/roster/icq/chat.png
-share/psi/iconsets/roster/icq/dnd.png
-share/psi/iconsets/roster/icq/icondef.xml
-share/psi/iconsets/roster/icq/invisible.png
-share/psi/iconsets/roster/icq/offline.png
-share/psi/iconsets/roster/icq/online.png
-share/psi/iconsets/roster/icq/xa.png
-share/psi/iconsets/roster/lightbulb/away.png
-share/psi/iconsets/roster/lightbulb/chat.png
-share/psi/iconsets/roster/lightbulb/dnd.png
-share/psi/iconsets/roster/lightbulb/ffc.png
-share/psi/iconsets/roster/lightbulb/groupclose.png
-share/psi/iconsets/roster/lightbulb/groupempty.png
-share/psi/iconsets/roster/lightbulb/groupopen.png
-share/psi/iconsets/roster/lightbulb/icondef.xml
-share/psi/iconsets/roster/lightbulb/invisible.png
-share/psi/iconsets/roster/lightbulb/message.png
-share/psi/iconsets/roster/lightbulb/offline.png
-share/psi/iconsets/roster/lightbulb/online.png
-share/psi/iconsets/roster/lightbulb/system.png
-share/psi/iconsets/roster/lightbulb/xa.png
-share/psi/iconsets/roster/msn/away.png
-share/psi/iconsets/roster/msn/dnd.png
-share/psi/iconsets/roster/msn/icondef.xml
-share/psi/iconsets/roster/msn/offline.png
-share/psi/iconsets/roster/msn/online.png
-share/psi/iconsets/roster/sms/away.png
-share/psi/iconsets/roster/sms/dnd.png
-share/psi/iconsets/roster/sms/icondef.xml
-share/psi/iconsets/roster/sms/offline.png
-share/psi/iconsets/roster/sms/online.png
-share/psi/iconsets/roster/sms/xa.png
-share/psi/iconsets/roster/stellar-icq/ask.png
-share/psi/iconsets/roster/stellar-icq/away.png
-share/psi/iconsets/roster/stellar-icq/dnd.png
-share/psi/iconsets/roster/stellar-icq/ffc.png
-share/psi/iconsets/roster/stellar-icq/icondef.xml
-share/psi/iconsets/roster/stellar-icq/invisible.png
-share/psi/iconsets/roster/stellar-icq/noauth.png
-share/psi/iconsets/roster/stellar-icq/offline.png
-share/psi/iconsets/roster/stellar-icq/online.png
-share/psi/iconsets/roster/stellar-icq/xa.png
-share/psi/iconsets/roster/transport/away.png
-share/psi/iconsets/roster/transport/dnd.png
-share/psi/iconsets/roster/transport/icondef.xml
-share/psi/iconsets/roster/transport/offline.png
-share/psi/iconsets/roster/transport/online.png
-share/psi/iconsets/roster/transport/xa.png
-share/psi/iconsets/roster/yahoo/away.png
-share/psi/iconsets/roster/yahoo/dnd.png
-share/psi/iconsets/roster/yahoo/icondef.xml
-share/psi/iconsets/roster/yahoo/offline.png
-share/psi/iconsets/roster/yahoo/online.png
-share/psi/iconsets/roster/yahoo/xa.png
 share/psi/iconsets/system/README
-share/psi/iconsets/system/crystal_system.jisp
 share/psi/iconsets/system/default/account.png
 share/psi/iconsets/system/default/add.png
+share/psi/iconsets/system/default/advanced.png
+share/psi/iconsets/system/default/appearance.png
 share/psi/iconsets/system/default/arrow_down.png
 share/psi/iconsets/system/default/arrow_left.png
 share/psi/iconsets/system/default/arrow_right.png
@@ -165,15 +101,11 @@ share/psi/iconsets/system/default/clients/trillian.png
 share/psi/iconsets/system/default/clients/unknown.png
 share/psi/iconsets/system/default/clients/yahoo.png
 share/psi/iconsets/system/default/close.png
+share/psi/iconsets/system/default/closetab.png
 share/psi/iconsets/system/default/configure_toolbars.png
+share/psi/iconsets/system/default/disco.png
 share/psi/iconsets/system/default/download.png
-share/psi/iconsets/system/default/edit.png
-share/psi/iconsets/system/default/editclear.png
-share/psi/iconsets/system/default/editcopy.png
-share/psi/iconsets/system/default/editcut.png
-share/psi/iconsets/system/default/editdelete.png
-share/psi/iconsets/system/default/editpaste.png
-share/psi/iconsets/system/default/edittrash.png
+share/psi/iconsets/system/default/events.png
 share/psi/iconsets/system/default/eye_blue.png
 share/psi/iconsets/system/default/filemanager.png
 share/psi/iconsets/system/default/groupchat.png
@@ -187,7 +119,6 @@ share/psi/iconsets/system/default/icondef.xml
 share/psi/iconsets/system/default/info.png
 share/psi/iconsets/system/default/jabber.png
 share/psi/iconsets/system/default/key.png
-share/psi/iconsets/system/default/key2.png
 share/psi/iconsets/system/default/key_bad.png
 share/psi/iconsets/system/default/key_unknown.png
 share/psi/iconsets/system/default/ok.png
@@ -202,10 +133,16 @@ share/psi/iconsets/system/default/register.png
 share/psi/iconsets/system/default/reload.png
 share/psi/iconsets/system/default/remove.png
 share/psi/iconsets/system/default/search.png
+share/psi/iconsets/system/default/self.png
 share/psi/iconsets/system/default/send.png
+share/psi/iconsets/system/default/show_away.png
+share/psi/iconsets/system/default/show_hidden.png
+share/psi/iconsets/system/default/show_offline.png
 share/psi/iconsets/system/default/smile.png
 share/psi/iconsets/system/default/ssl_no.png
 share/psi/iconsets/system/default/ssl_yes.png
+share/psi/iconsets/system/default/start-chat.png
+share/psi/iconsets/system/default/status.png
 share/psi/iconsets/system/default/stop.png
 share/psi/iconsets/system/default/time.png
 share/psi/iconsets/system/default/tip.png
@@ -237,19 +174,11 @@ share/psi/sound/send.wav
 @dirrm share/psi/iconsets/system/default/clients
 @dirrm share/psi/iconsets/system/default
 @dirrm share/psi/iconsets/system
-@dirrm share/psi/iconsets/roster/yahoo
-@dirrm share/psi/iconsets/roster/transport
-@dirrm share/psi/iconsets/roster/stellar-icq
-@dirrm share/psi/iconsets/roster/sms
-@dirrm share/psi/iconsets/roster/msn
-@dirrm share/psi/iconsets/roster/lightbulb
-@dirrm share/psi/iconsets/roster/icq
-@dirrm share/psi/iconsets/roster/gadugadu
 @dirrm share/psi/iconsets/roster/default
-@dirrm share/psi/iconsets/roster/aim
 @dirrm share/psi/iconsets/roster
 @dirrm share/psi/iconsets/emoticons/default
 @dirrm share/psi/iconsets/emoticons
 @dirrm share/psi/iconsets
 @dirrm share/psi/certs
 @dirrm share/psi
+@dirrm share/doc/psi
diff --git a/chat/psi/distinfo b/chat/psi/distinfo
index ef3f43d0f1b..e6ca64de918 100644
--- a/chat/psi/distinfo
+++ b/chat/psi/distinfo
@@ -1,48 +1,48 @@
-$NetBSD: distinfo,v 1.13 2005/10/01 22:02:00 jdolecek Exp $
+$NetBSD: distinfo,v 1.14 2006/01/23 17:05:02 xtraeme Exp $
 
-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-aa) = 1f3fbbe1f32df44db06a76d33d32555dd0fe7b6f
-SHA1 (patch-ac) = 6faea4967d2682c087aa5de12b7c83ac5848d1b5
-SHA1 (patch-ad) = 8d255aa9de01ccb39d2cdc7b0074b5dec0e3c0cb
+SHA1 (psi-0.10/psi-0.10.tar.bz2) = f1687f8b93338f47cb1c8fa363e4b4f58628f167
+RMD160 (psi-0.10/psi-0.10.tar.bz2) = b8be1490cd02f61cf86f09f2dc9f29716ea4c186
+Size (psi-0.10/psi-0.10.tar.bz2) = 1430929 bytes
+SHA1 (psi-0.10/psi_zh.qm) = 5011ae8134ec4a0a528d80613d435a3f5f774033
+RMD160 (psi-0.10/psi_zh.qm) = 91554b0a6dfc261069d22573bc590293baaf2150
+Size (psi-0.10/psi_zh.qm) = 6409 bytes
+SHA1 (psi-0.10/psi_nl.qm) = 9e474f05c5b57cc513a0a3be053b8e8e2cf2ca4d
+RMD160 (psi-0.10/psi_nl.qm) = 734a82fce03b241245ab638a6d8ff4cd2ca67d29
+Size (psi-0.10/psi_nl.qm) = 6409 bytes
+SHA1 (psi-0.10/psi_sk.qm) = 17dcb72a59c202b9533cfa1de2c4131adcb67258
+RMD160 (psi-0.10/psi_sk.qm) = 7c46a80e25c67cf955d6493496b723aaa3857db8
+Size (psi-0.10/psi_sk.qm) = 6409 bytes
+SHA1 (psi-0.10/psi_fr.qm) = 5deddd5d77f4caaf62341dcd99d2255338f7bb47
+RMD160 (psi-0.10/psi_fr.qm) = 93ad8ad89cb50e45438e4dc162251c33340c7585
+Size (psi-0.10/psi_fr.qm) = 6409 bytes
+SHA1 (psi-0.10/psi_cs.qm) = cbf51f0ffc1cc379ecf0099ecdb2bc2991e4a056
+RMD160 (psi-0.10/psi_cs.qm) = 6585cb6f594fe99a0cf8b0ae446d20593dabf301
+Size (psi-0.10/psi_cs.qm) = 6409 bytes
+SHA1 (psi-0.10/psi_de.qm) = c46fabf629b9bbb1cbbc0755b91dd8e9762ad8fc
+RMD160 (psi-0.10/psi_de.qm) = 5fd5d7aadc6249525c6a3123e024fd6c53bbc3b6
+Size (psi-0.10/psi_de.qm) = 6409 bytes
+SHA1 (psi-0.10/psi_et.qm) = eda5b2025765ac327e04620968254d4c73d614ce
+RMD160 (psi-0.10/psi_et.qm) = 62aff4fb1d06b3d549bc1848b3b36c06f2aaba24
+Size (psi-0.10/psi_et.qm) = 6409 bytes
+SHA1 (psi-0.10/psi_pl.qm) = bdbbfb82ca4e0b85342df30ca1d813ebf561777a
+RMD160 (psi-0.10/psi_pl.qm) = 03f98847de8f3c995bb807e28904e02404242a82
+Size (psi-0.10/psi_pl.qm) = 6409 bytes
+SHA1 (psi-0.10/psi_mk.qm) = f866d409df04bdada4880ab3561ad9352dba1b3e
+RMD160 (psi-0.10/psi_mk.qm) = 7fcdf7b038adbcc20a373a94767caf6e6694fd45
+Size (psi-0.10/psi_mk.qm) = 6409 bytes
+SHA1 (psi-0.10/psi_el.qm) = b31b8ce8c23b42d6c1b537952ea553c469444a4f
+RMD160 (psi-0.10/psi_el.qm) = 1065cc146e4327a0efbbb0773984a0dace4d8075
+Size (psi-0.10/psi_el.qm) = 6409 bytes
+SHA1 (psi-0.10/psi_es.qm) = ccba582649004df80141c9695bd7c84815447b9f
+RMD160 (psi-0.10/psi_es.qm) = ac74e58af37f952b7b0a2e8ee84acc6c381b27a5
+Size (psi-0.10/psi_es.qm) = 6409 bytes
+SHA1 (psi-0.10/psi_ru.qm) = 884e84bf3c5c0def111ebdafeab9145c913c1e8f
+RMD160 (psi-0.10/psi_ru.qm) = d47b0c66da51518423d0b3e0147cf2e1565f33ed
+Size (psi-0.10/psi_ru.qm) = 6409 bytes
+SHA1 (psi-0.10/psi_vi.qm) = 9ba7c7293dfdddc62314c2f75abfe5a520a0683f
+RMD160 (psi-0.10/psi_vi.qm) = 7be58a083030720aac2340a81c96b00653494587
+Size (psi-0.10/psi_vi.qm) = 6409 bytes
+SHA1 (patch-aa) = 1cc8ebcc9317f48e1a1548e6a3895f57899f6cb7
+SHA1 (patch-ac) = 011dfae070e171628ce03471c76360aa1f4a30d4
+SHA1 (patch-ad) = 01c71c5a00284570b919a5d244fe0e96d141138e
 SHA1 (patch-ae) = 93896bc73cb834a42d81e3eed1419940b75a49a0
diff --git a/chat/psi/patches/patch-aa b/chat/psi/patches/patch-aa
index 3912dad18b8..6552c9d2587 100644
--- a/chat/psi/patches/patch-aa
+++ b/chat/psi/patches/patch-aa
@@ -1,7 +1,7 @@
-$NetBSD: patch-aa,v 1.5 2005/09/14 14:18:16 dmcmahill Exp $
+$NetBSD: patch-aa,v 1.6 2006/01/23 17:05:02 xtraeme Exp $
 
---- cutestuff/openpgp/gpgproc/jprocess_unix.cpp.orig	2004-06-07 03:30:04.000000000 -0400
-+++ cutestuff/openpgp/gpgproc/jprocess_unix.cpp
+--- src/tools/openpgp/gpgproc/jprocess_unix.cpp.orig	2006-01-23 17:21:43.000000000 +0100
++++ src/tools/openpgp/gpgproc/jprocess_unix.cpp	2006-01-23 17:22:01.000000000 +0100
 @@ -35,6 +35,9 @@
  **
  **********************************************************************/
diff --git a/chat/psi/patches/patch-ac b/chat/psi/patches/patch-ac
index 39508dbdbb3..9d3df09466e 100644
--- a/chat/psi/patches/patch-ac
+++ b/chat/psi/patches/patch-ac
@@ -1,15 +1,16 @@
-$NetBSD: patch-ac,v 1.6 2005/04/02 11:33:10 jdolecek Exp $
+$NetBSD: patch-ac,v 1.7 2006/01/23 17:05:02 xtraeme Exp $
 
---- 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 = true;
+--- src/psi_profiles.cpp.orig	2006-01-23 16:20:44.000000000 +0100
++++ src/psi_profiles.cpp	2006-01-23 16:21:15.000000000 +0100
+@@ -441,7 +441,11 @@
+ 	prefs.rosterOpacity = 95;
+ 	prefs.outlineHeadings = false;
  
+-	prefs.player = "play";
 +#ifdef __NetBSD__
 +	prefs.player = "audioplay";
 +#else
- 	prefs.player = "play";
++	prefs.player = "player";
 +#endif
  	prefs.noAwaySound = FALSE;
  
diff --git a/chat/psi/patches/patch-ad b/chat/psi/patches/patch-ad
index 70ddebd23e0..75d1cdf8e0d 100644
--- a/chat/psi/patches/patch-ad
+++ b/chat/psi/patches/patch-ad
@@ -1,19 +1,20 @@
-$NetBSD: patch-ad,v 1.2 2003/07/27 21:44:01 jdolecek Exp $
+$NetBSD: patch-ad,v 1.3 2006/01/23 17:05:02 xtraeme Exp $
 
---- cutestuff/zip/minizip/unzip.h.orig	Mon Jul 29 19:53:00 2002
-+++ cutestuff/zip/minizip/unzip.h	Mon Jul 29 19:54:16 2002
-@@ -49,6 +49,14 @@
+--- src/tools/zip/minizip/unzip.h.orig	2006-01-23 16:41:21.000000000 +0100
++++ src/tools/zip/minizip/unzip.h	2006-01-23 16:41:41.000000000 +0100
+@@ -49,6 +49,15 @@
  #include "zlib.h"
  #endif
  
 +#ifndef OF
 +#  ifdef STDC
-+#    define OF(x)	x
++#    define OF(x)      x
 +#  else
 +#    define OF(x)
 +#  endif
 +#endif
 +
++
  #if defined(STRICTUNZIP) || defined(STRICTZIPUNZIP)
  /* like the STRICT of WIN32, we define a pointer that cannot be converted
      from (void*) without cast */