Update psi to 0.9.2.

Notable addition is file upload support, other changes are mostly
usability changes and bug fixes. Full list available at
http://psi.affinix.com/?page=changelog.

Internal pkgsrc organization changes:
* depends on qca-tls for SSL support, functionality confirmed working;
  this fixes PR#26120, PR#25444, PR#26665
* uses prepared psi language files, no longer using lrelease (the raw
  language files are not part of distribution), only use DEPMETHOD=build
  for qt3-tools

8 files changed, 296 insertions, 280 deletions

diff --git a/chat/psi/DESCR b/chat/psi/DESCR
index 13a5abf66da..9f23d5e539f 100644
--- a/chat/psi/DESCR
+++ b/chat/psi/DESCR
@@ -22,3 +22,4 @@ Features:
 * Language plugins
 * OpenPGP integration (via GnuPG)
 * Groupchat invites / private-messaging
+* File upload
diff --git a/chat/psi/MESSAGE b/chat/psi/MESSAGE
deleted file mode 100644
index 2da7cb963d0..00000000000
--- a/chat/psi/MESSAGE
+++ /dev/null
@@ -1,6 +0,0 @@
-===========================================================================
-$NetBSD: MESSAGE,v 1.1 2004/07/12 05:23:38 jdolecek Exp $
-
-Install psi-ssl package for secure encrypted connection support.
-
-===========================================================================
diff --git a/chat/psi/Makefile b/chat/psi/Makefile
index 0f65d2e8905..395967f77f4 100644
--- a/chat/psi/Makefile
+++ b/chat/psi/Makefile
@@ -1,41 +1,68 @@
-# $NetBSD: Makefile,v 1.18 2004/10/03 00:13:15 tv Exp $
+# $NetBSD: Makefile,v 1.19 2004/11/27 21:58:18 jdolecek Exp $
 
-DISTNAME=	psi-0.9
-PKGREVISION=	5
+PSI_VERSION=	0.9.2
+DISTNAME=	psi-${PSI_VERSION}
+PKGREVISION=	# empty
 CATEGORIES=	chat
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=psi/}
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=psi/}	\
+		http://psi.affinix.com/?version=${PSI_VERSION}&file=
 EXTRACT_SUFX=	.tar.bz2
 
+DIST_SUBDIR=	${DISTNAME}
+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"
+
 MAINTAINER=	jdolecek@NetBSD.org
 HOMEPAGE=	http://psi.affinix.com/
 COMMENT=	PSI Jabber Client
 
+DEPENDS+=	qca-tls>=1.0:../../security/qca-tls
+
 USE_BUILDLINK3=	yes
 USE_GNU_TOOLS+=	make
 USE_LIBTOOL=	yes
 USE_X11=	yes
 HAS_CONFIGURE=	yes
 
-CONFIGURE_ARGS+= -p ${PREFIX}
+CONFIGURE_ARGS= --prefix="${PREFIX}" --qtdir="${QTDIR}"
 
+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
+
+# XXX the psiwidgets.so symlink is somewhat ugly, but without that
+# uic doesn't find the built plug-in and generates sources without
+# proper psiwidgets #include's. This should eventually be fixed in
+# qmake template.
 post-configure:
 	${SED} \
 	-e 's:^CHK_DIR_EXISTS *= *$$:CHK_DIR_EXISTS=test -d:' \
 	-e "s:^MKDIR *= *$$:MKDIR=${MKDIR}:" \
-	-e "s:/bin/true:${TRUE}:" < ${BUILD_DIRS}/Makefile \
-		> ${BUILD_DIRS}/Makefile.orig
-	${MV} ${BUILD_DIRS}/Makefile.orig ${BUILD_DIRS}/Makefile
+	-e "s:/bin/true:${TRUE}:" < ${WRKSRC}/Makefile \
+		> ${WRKSRC}/Makefile.new
+	${MV} ${WRKSRC}/Makefile.new ${WRKSRC}/Makefile
+	cd ${WRKSRC}/libpsi/psiwidgets && (	\
+		${QTDIR}/bin/qmake psiwidgets.pro -o Makefile; \
+		${SED} -e 's,-rpath.*$$,-rpath "${QTDIR}/lib",' < Makefile > Makefile.new; \
+		${MV} Makefile.new Makefile; \
+		${LN} -s .libs/libpsiwidgets.so psiwidgets.so; \
+	)
 
 do-install:
-	cd ${WRKSRC} && ${QTDIR}/bin/lrelease psi.pro
 	${INSTALL_DATA_DIR} ${PREFIX}/share/psi
-	cd ${WRKSRC} && ${CP} -f -pR image iconsets sound certs lang/*.qm \
-		README COPYING \
-		${PREFIX}/share/psi/
-	cd ${WRKSRC} && ${CP} -f psi ${PREFIX}/bin/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
+	${INSTALL_PROGRAM} ${WRKSRC}/psi ${PREFIX}/bin/psi
 
 .include "../../x11/qt3-libs/buildlink3.mk"
-BUILDLINK_DEPENDS.qt3-tools=	qt3-tools>=3.1.2nb2	# need lrelease
+BUILDLINK_DEPMETHOD.qt3-tools=	build
 .include "../../x11/qt3-tools/buildlink3.mk"
-
+.include "../../devel/zlib/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/chat/psi/PLIST b/chat/psi/PLIST
index f5bebca0a6d..37ff18589cf 100644
--- a/chat/psi/PLIST
+++ b/chat/psi/PLIST
@@ -1,170 +1,230 @@
-@comment $NetBSD: PLIST,v 1.4 2003/07/27 22:23:01 jdolecek Exp $
+@comment $NetBSD: PLIST,v 1.5 2004/11/27 21:58:18 jdolecek Exp $
 bin/psi
-share/psi/image/aim_away.png
-share/psi/image/aim_dnd.png
-share/psi/image/aim_offline.png
-share/psi/image/aim_online.png
-share/psi/image/aim_xa.png
-share/psi/image/find.png
-share/psi/image/gg_away.png
-share/psi/image/gg_dnd.png
-share/psi/image/gg_offline.png
-share/psi/image/gg_online.png
-share/psi/image/gg_xa.png
-share/psi/image/icon_16.png
-share/psi/image/icon_32.png
-share/psi/image/icon_48.png
-share/psi/image/icon_mac.png
-share/psi/image/icq_away.png
-share/psi/image/icq_dnd.png
-share/psi/image/icq_offline.png
-share/psi/image/icq_online.png
-share/psi/image/icq_xa.png
-share/psi/image/key.png
-share/psi/image/key2.png
-share/psi/image/key_bad.png
-share/psi/image/key_unknown.png
-share/psi/image/msn_away.png
-share/psi/image/msn_dnd.png
-share/psi/image/msn_offline.png
-share/psi/image/msn_online.png
-share/psi/image/msn_xa.png
-share/psi/image/psilogo.png
-share/psi/image/smile.png
-share/psi/image/trans_away.png
-share/psi/image/trans_dnd.png
-share/psi/image/trans_offline.png
-share/psi/image/trans_online.png
-share/psi/image/trans_xa.png
-share/psi/image/yahoo_away.png
-share/psi/image/yahoo_dnd.png
-share/psi/image/yahoo_offline.png
-share/psi/image/yahoo_online.png
-share/psi/image/yahoo_xa.png
-share/psi/iconsets/stellar/account.png
-share/psi/iconsets/stellar/add.png
-share/psi/iconsets/stellar/arrow_down.png
-share/psi/iconsets/stellar/arrow_left.png
-share/psi/iconsets/stellar/arrow_right.png
-share/psi/iconsets/stellar/arrow_up.png
-share/psi/iconsets/stellar/ask.png
-share/psi/iconsets/stellar/away.png
-share/psi/iconsets/stellar/changeacc.png
-share/psi/iconsets/stellar/chat.png
-share/psi/iconsets/stellar/chatclear.png
-share/psi/iconsets/stellar/connect.png
-share/psi/iconsets/stellar/desc
-share/psi/iconsets/stellar/dnd.png
-share/psi/iconsets/stellar/emoticon_angry.png
-share/psi/iconsets/stellar/emoticon_bat.png
-share/psi/iconsets/stellar/emoticon_beer.png
-share/psi/iconsets/stellar/emoticon_biggrin.png
-share/psi/iconsets/stellar/emoticon_blush.png
-share/psi/iconsets/stellar/emoticon_boy.png
-share/psi/iconsets/stellar/emoticon_brflower.png
-share/psi/iconsets/stellar/emoticon_brheart.png
-share/psi/iconsets/stellar/emoticon_coffee.png
-share/psi/iconsets/stellar/emoticon_coolglasses.png
-share/psi/iconsets/stellar/emoticon_cry.png
-share/psi/iconsets/stellar/emoticon_cuffs.png
-share/psi/iconsets/stellar/emoticon_devil.png
-share/psi/iconsets/stellar/emoticon_drink.png
-share/psi/iconsets/stellar/emoticon_flower.png
-share/psi/iconsets/stellar/emoticon_frowning.png
-share/psi/iconsets/stellar/emoticon_girl.png
-share/psi/iconsets/stellar/emoticon_heart.png
-share/psi/iconsets/stellar/emoticon_hugleft.png
-share/psi/iconsets/stellar/emoticon_hugright.png
-share/psi/iconsets/stellar/emoticon_kiss.png
-share/psi/iconsets/stellar/emoticon_lamp.png
-share/psi/iconsets/stellar/emoticon_mail.png
-share/psi/iconsets/stellar/emoticon_music.png
-share/psi/iconsets/stellar/emoticon_no.png
-share/psi/iconsets/stellar/emoticon_oh.png
-share/psi/iconsets/stellar/emoticon_phone.png
-share/psi/iconsets/stellar/emoticon_photo.png
-share/psi/iconsets/stellar/emoticon_pussy.png
-share/psi/iconsets/stellar/emoticon_rainbow.png
-share/psi/iconsets/stellar/emoticon_smile.png
-share/psi/iconsets/stellar/emoticon_star.png
-share/psi/iconsets/stellar/emoticon_stare.png
-share/psi/iconsets/stellar/emoticon_tongue.png
-share/psi/iconsets/stellar/emoticon_unhappy.png
-share/psi/iconsets/stellar/emoticon_wink.png
-share/psi/iconsets/stellar/emoticon_yes.png
-share/psi/iconsets/stellar/groupchat.png
-share/psi/iconsets/stellar/groupclose.png
-share/psi/iconsets/stellar/groupempty.png
-share/psi/iconsets/stellar/groupopen.png
-share/psi/iconsets/stellar/headline.png
-share/psi/iconsets/stellar/help.png
-share/psi/iconsets/stellar/history.png
-share/psi/iconsets/stellar/info.png
-share/psi/iconsets/stellar/invisible.png
-share/psi/iconsets/stellar/jabber.png
-share/psi/iconsets/stellar/message.png
-share/psi/iconsets/stellar/noauth.png
-share/psi/iconsets/stellar/offline.png
-share/psi/iconsets/stellar/online.png
-share/psi/iconsets/stellar/options.png
-share/psi/iconsets/stellar/perr.png
-share/psi/iconsets/stellar/pgp.png
-share/psi/iconsets/stellar/play_sounds.png
-share/psi/iconsets/stellar/psimain.png
-share/psi/iconsets/stellar/quit.png
-share/psi/iconsets/stellar/register.png
-share/psi/iconsets/stellar/reload.png
-share/psi/iconsets/stellar/remove.png
-share/psi/iconsets/stellar/search.png
-share/psi/iconsets/stellar/send.png
-share/psi/iconsets/stellar/ssl_no.png
-share/psi/iconsets/stellar/ssl_yes.png
-share/psi/iconsets/stellar/stop.png
-share/psi/iconsets/stellar/system.png
-share/psi/iconsets/stellar/time.png
-share/psi/iconsets/stellar/url.png
-share/psi/iconsets/stellar/xa.png
-share/psi/iconsets/stellar/xml.png
-share/psi/iconsets/lightbulb/away.png
-share/psi/iconsets/lightbulb/chat.png
-share/psi/iconsets/lightbulb/desc
-share/psi/iconsets/lightbulb/dnd.png
-share/psi/iconsets/lightbulb/groupclose.png
-share/psi/iconsets/lightbulb/groupempty.png
-share/psi/iconsets/lightbulb/groupopen.png
-share/psi/iconsets/lightbulb/message.png
-share/psi/iconsets/lightbulb/offline.png
-share/psi/iconsets/lightbulb/online.png
-share/psi/iconsets/lightbulb/system.png
-share/psi/iconsets/lightbulb/xa.png
-share/psi/sound/chat1.wav
+share/psi/iconsets/emoticons/default/hugleft.png
+share/psi/iconsets/emoticons/default/devil.png
+share/psi/iconsets/emoticons/default/tongue.png
+share/psi/iconsets/emoticons/default/girl.png
+share/psi/iconsets/emoticons/default/blush.png
+share/psi/iconsets/emoticons/default/drink.png
+share/psi/iconsets/emoticons/default/cry.png
+share/psi/iconsets/emoticons/default/yes.png
+share/psi/iconsets/emoticons/default/rainbow.png
+share/psi/iconsets/emoticons/default/hugright.png
+share/psi/iconsets/emoticons/default/angry.png
+share/psi/iconsets/emoticons/default/unhappy.png
+share/psi/iconsets/emoticons/default/pussy.png
+share/psi/iconsets/emoticons/default/beer.png
+share/psi/iconsets/emoticons/default/music.png
+share/psi/iconsets/emoticons/default/mail.png
+share/psi/iconsets/emoticons/default/heart.png
+share/psi/iconsets/emoticons/default/biggrin.png
+share/psi/iconsets/emoticons/default/brflower.png
+share/psi/iconsets/emoticons/default/kiss.png
+share/psi/iconsets/emoticons/default/flower.png
+share/psi/iconsets/emoticons/default/smile.png
+share/psi/iconsets/emoticons/default/coffee.png
+share/psi/iconsets/emoticons/default/no.png
+share/psi/iconsets/emoticons/default/oh.png
+share/psi/iconsets/emoticons/default/icondef.xml
+share/psi/iconsets/emoticons/default/wink.png
+share/psi/iconsets/emoticons/default/brheart.png
+share/psi/iconsets/emoticons/default/star.png
+share/psi/iconsets/emoticons/default/bat.png
+share/psi/iconsets/emoticons/default/cuffs.png
+share/psi/iconsets/emoticons/default/stare.png
+share/psi/iconsets/emoticons/default/phone.png
+share/psi/iconsets/emoticons/default/lamp.png
+share/psi/iconsets/emoticons/default/photo.png
+share/psi/iconsets/emoticons/default/frowning.png
+share/psi/iconsets/emoticons/default/boy.png
+share/psi/iconsets/emoticons/default/coolglasses.png
+share/psi/iconsets/emoticons/README
+share/psi/iconsets/roster/default/perr.png
+share/psi/iconsets/roster/default/headline.png
+share/psi/iconsets/roster/default/online.png
+share/psi/iconsets/roster/default/dnd.png
+share/psi/iconsets/roster/default/message.png
+share/psi/iconsets/roster/default/away.png
+share/psi/iconsets/roster/default/chat.png
+share/psi/iconsets/roster/default/system.png
+share/psi/iconsets/roster/default/ffc.png
+share/psi/iconsets/roster/default/file.png
+share/psi/iconsets/roster/default/offline.png
+share/psi/iconsets/roster/default/groupempty.png
+share/psi/iconsets/roster/default/groupclose.png
+share/psi/iconsets/roster/default/icondef.xml
+share/psi/iconsets/roster/default/xa.png
+share/psi/iconsets/roster/default/noauth.png
+share/psi/iconsets/roster/default/groupopen.png
+share/psi/iconsets/roster/default/ask.png
+share/psi/iconsets/roster/default/connect.png
+share/psi/iconsets/roster/default/invisible.png
+share/psi/iconsets/roster/icq/xa.png
+share/psi/iconsets/roster/icq/online.png
+share/psi/iconsets/roster/icq/dnd.png
+share/psi/iconsets/roster/icq/away.png
+share/psi/iconsets/roster/icq/chat.png
+share/psi/iconsets/roster/icq/offline.png
+share/psi/iconsets/roster/icq/icondef.xml
+share/psi/iconsets/roster/icq/invisible.png
+share/psi/iconsets/roster/msn/online.png
+share/psi/iconsets/roster/msn/dnd.png
+share/psi/iconsets/roster/msn/away.png
+share/psi/iconsets/roster/msn/offline.png
+share/psi/iconsets/roster/msn/icondef.xml
+share/psi/iconsets/roster/sms/online.png
+share/psi/iconsets/roster/sms/dnd.png
+share/psi/iconsets/roster/sms/away.png
+share/psi/iconsets/roster/sms/offline.png
+share/psi/iconsets/roster/sms/icondef.xml
+share/psi/iconsets/roster/sms/xa.png
+share/psi/iconsets/roster/gadugadu/invisible.png
+share/psi/iconsets/roster/gadugadu/online.png
+share/psi/iconsets/roster/gadugadu/away.png
+share/psi/iconsets/roster/gadugadu/offline.png
+share/psi/iconsets/roster/gadugadu/icondef.xml
+share/psi/iconsets/roster/aim/online.png
+share/psi/iconsets/roster/aim/dnd.png
+share/psi/iconsets/roster/aim/away.png
+share/psi/iconsets/roster/aim/offline.png
+share/psi/iconsets/roster/aim/icondef.xml
+share/psi/iconsets/roster/aim/xa.png
+share/psi/iconsets/roster/yahoo/online.png
+share/psi/iconsets/roster/yahoo/dnd.png
+share/psi/iconsets/roster/yahoo/away.png
+share/psi/iconsets/roster/yahoo/offline.png
+share/psi/iconsets/roster/yahoo/icondef.xml
+share/psi/iconsets/roster/yahoo/xa.png
+share/psi/iconsets/roster/stellar-icq/ask.png
+share/psi/iconsets/roster/stellar-icq/online.png
+share/psi/iconsets/roster/stellar-icq/dnd.png
+share/psi/iconsets/roster/stellar-icq/away.png
+share/psi/iconsets/roster/stellar-icq/ffc.png
+share/psi/iconsets/roster/stellar-icq/offline.png
+share/psi/iconsets/roster/stellar-icq/icondef.xml
+share/psi/iconsets/roster/stellar-icq/xa.png
+share/psi/iconsets/roster/stellar-icq/noauth.png
+share/psi/iconsets/roster/stellar-icq/invisible.png
+share/psi/iconsets/roster/lightbulb/groupopen.png
+share/psi/iconsets/roster/lightbulb/online.png
+share/psi/iconsets/roster/lightbulb/dnd.png
+share/psi/iconsets/roster/lightbulb/message.png
+share/psi/iconsets/roster/lightbulb/away.png
+share/psi/iconsets/roster/lightbulb/chat.png
+share/psi/iconsets/roster/lightbulb/system.png
+share/psi/iconsets/roster/lightbulb/ffc.png
+share/psi/iconsets/roster/lightbulb/offline.png
+share/psi/iconsets/roster/lightbulb/groupempty.png
+share/psi/iconsets/roster/lightbulb/groupclose.png
+share/psi/iconsets/roster/lightbulb/icondef.xml
+share/psi/iconsets/roster/lightbulb/xa.png
+share/psi/iconsets/roster/lightbulb/invisible.png
+share/psi/iconsets/roster/transport/online.png
+share/psi/iconsets/roster/transport/dnd.png
+share/psi/iconsets/roster/transport/away.png
+share/psi/iconsets/roster/transport/offline.png
+share/psi/iconsets/roster/transport/icondef.xml
+share/psi/iconsets/roster/transport/xa.png
+share/psi/iconsets/roster/README
+share/psi/iconsets/system/default/help.png
+share/psi/iconsets/system/default/edit.png
+share/psi/iconsets/system/default/options.png
+share/psi/iconsets/system/default/xml.png
+share/psi/iconsets/system/default/key.png
+share/psi/iconsets/system/default/filemanager.png
+share/psi/iconsets/system/default/account.png
+share/psi/iconsets/system/default/browse.png
+share/psi/iconsets/system/default/icon_16.png
+share/psi/iconsets/system/default/arrow_right.png
+share/psi/iconsets/system/default/vcard.png
+share/psi/iconsets/system/default/icon_32.png
+share/psi/iconsets/system/default/icon_48.png
+share/psi/iconsets/system/default/history.png
+share/psi/iconsets/system/default/arrow_down.png
+share/psi/iconsets/system/default/ssl_yes.png
+share/psi/iconsets/system/default/editcut.png
+share/psi/iconsets/system/default/groupchat.png
+share/psi/iconsets/system/default/psimain.png
+share/psi/iconsets/system/default/arrow_left.png
+share/psi/iconsets/system/default/jabber.png
+share/psi/iconsets/system/default/remove.png
+share/psi/iconsets/system/default/configure_toolbars.png
+share/psi/iconsets/system/default/key_unknown.png
+share/psi/iconsets/system/default/tip.png
+share/psi/iconsets/system/default/icon_mac.png
+share/psi/iconsets/system/default/reload.png
+share/psi/iconsets/system/default/smile.png
+share/psi/iconsets/system/default/add.png
+share/psi/iconsets/system/default/ok.png
+share/psi/iconsets/system/default/editclear.png
+share/psi/iconsets/system/default/changeacc.png
+share/psi/iconsets/system/default/arrow_up.png
+share/psi/iconsets/system/default/upload.png
+share/psi/iconsets/system/default/send.png
+share/psi/iconsets/system/default/icondef.xml
+share/psi/iconsets/system/default/chatclear.png
+share/psi/iconsets/system/default/play_sounds.png
+share/psi/iconsets/system/default/url.png
+share/psi/iconsets/system/default/edittrash.png
+share/psi/iconsets/system/default/ssl_no.png
+share/psi/iconsets/system/default/search.png
+share/psi/iconsets/system/default/close.png
+share/psi/iconsets/system/default/play.png
+share/psi/iconsets/system/default/editcopy.png
+share/psi/iconsets/system/default/quit.png
+share/psi/iconsets/system/default/psilogo.png
+share/psi/iconsets/system/default/register.png
+share/psi/iconsets/system/default/info.png
+share/psi/iconsets/system/default/editpaste.png
+share/psi/iconsets/system/default/pgp.png
+share/psi/iconsets/system/default/time.png
+share/psi/iconsets/system/default/key2.png
+share/psi/iconsets/system/default/stop.png
+share/psi/iconsets/system/default/editdelete.png
+share/psi/iconsets/system/default/download.png
+share/psi/iconsets/system/default/cancel.png
+share/psi/iconsets/system/default/eye_blue.png
+share/psi/iconsets/system/default/key_bad.png
+share/psi/iconsets/system/README
 share/psi/sound/chat2.wav
-share/psi/sound/offline.wav
 share/psi/sound/online.wav
+share/psi/sound/chat1.wav
+share/psi/sound/ft_incoming.wav
+share/psi/sound/offline.wav
 share/psi/sound/send.wav
-share/psi/certs/README
+share/psi/sound/ft_complete.wav
 share/psi/certs/rootcert.xml
+share/psi/certs/README
 share/psi/README
 share/psi/COPYING
-share/psi/psi_cs.qm
-share/psi/psi_de.qm
-share/psi/psi_es.qm
+share/psi/psi_sw.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_es.qm
+share/psi/psi_el.qm
+share/psi/psi_de.qm
 share/psi/psi_fr.qm
-share/psi/psi_it.qm
-share/psi/psi_jp.qm
-share/psi/psi_mk.qm
-share/psi/psi_nl.qm
-share/psi/psi_pl.qm
-share/psi/psi_ptbr.qm
-share/psi/psi_ru.qm
-share/psi/psi_se.qm
-share/psi/psi_sr.qm
-share/psi/psi_sr@Latn.qm
-@dirrm share/psi/image
-@dirrm share/psi/iconsets/stellar
-@dirrm share/psi/iconsets/lightbulb
-@dirrm share/psi/iconsets
+share/psi/psi_zh.qm
 @dirrm share/psi/sound
+@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
diff --git a/chat/psi/distinfo b/chat/psi/distinfo
index 0955dffb49d..98d69b7535e 100644
--- a/chat/psi/distinfo
+++ b/chat/psi/distinfo
@@ -1,8 +1,30 @@
-$NetBSD: distinfo,v 1.8 2003/11/18 17:54:48 xtraeme Exp $
+$NetBSD: distinfo,v 1.9 2004/11/27 21:58:18 jdolecek Exp $
 
-SHA1 (psi-0.9.tar.bz2) = 66ab7a6b540f60c9e117bc964a70c126b30aff47
-Size (psi-0.9.tar.bz2) = 968348 bytes
-SHA1 (patch-aa) = 7cb3505e80c180411257ea5755a351e57d77de9b
-SHA1 (patch-ab) = d7f9fc5f183117d3f81912ef73f27c0f2fa8c6a0
-SHA1 (patch-ac) = a3b0f87f54f4d7397c8be6f152209bef3a14d4a6
+SHA1 (psi-0.9.2/psi-0.9.2.tar.bz2) = 6681c6447064f1e94889a1e160584bd577ebe6c4
+Size (psi-0.9.2/psi-0.9.2.tar.bz2) = 1154392 bytes
+SHA1 (psi-0.9.2/psi_zh.qm) = d5f9bef42161b27fe013dc211a279fd385e5ae28
+Size (psi-0.9.2/psi_zh.qm) = 69489 bytes
+SHA1 (psi-0.9.2/psi_nl.qm) = 039a19fc91d8954167c314085d5234bfad5e46b5
+Size (psi-0.9.2/psi_nl.qm) = 131016 bytes
+SHA1 (psi-0.9.2/psi_sk.qm) = 907bf5326caaaf117131e17470efcc2b81f0dce0
+Size (psi-0.9.2/psi_sk.qm) = 121985 bytes
+SHA1 (psi-0.9.2/psi_fr.qm) = 328f757ec754f663420de2580ddc5b9c178ed2d5
+Size (psi-0.9.2/psi_fr.qm) = 147411 bytes
+SHA1 (psi-0.9.2/psi_fi.qm) = 8198e07dcff01807e4969414d8f1552808d64b12
+Size (psi-0.9.2/psi_fi.qm) = 126909 bytes
+SHA1 (psi-0.9.2/psi_de.qm) = a608df8d248f97ba3b803c1b1c976818f48388a7
+Size (psi-0.9.2/psi_de.qm) = 135542 bytes
+SHA1 (psi-0.9.2/psi_sw.qm) = d134e91be015df74fa0c8498850e7b5f841808d8
+Size (psi-0.9.2/psi_sw.qm) = 138546 bytes
+SHA1 (psi-0.9.2/psi_pl.qm) = ef6501ce42a1129d6ec90c2910ff341d7c7ea044
+Size (psi-0.9.2/psi_pl.qm) = 128935 bytes
+SHA1 (psi-0.9.2/psi_mk.qm) = d762175a585e34665641dc3747abda2cd87238e3
+Size (psi-0.9.2/psi_mk.qm) = 125833 bytes
+SHA1 (psi-0.9.2/psi_el.qm) = 98d6bad933b267f31c0b0bc3395dcdd9d2bb4c04
+Size (psi-0.9.2/psi_el.qm) = 139378 bytes
+SHA1 (psi-0.9.2/psi_es.qm) = ce918282d42cbb569db569973ee41259ee8cbc7f
+Size (psi-0.9.2/psi_es.qm) = 131774 bytes
+SHA1 (psi-0.9.2/psi_ru.qm) = a49e15eed950476aa0d3adf1b7e8294624903432
+Size (psi-0.9.2/psi_ru.qm) = 130398 bytes
+SHA1 (patch-ac) = e934f2cf6474dcdd825b7eaf089b02fa0f2e0ee2
 SHA1 (patch-ad) = 8d255aa9de01ccb39d2cdc7b0074b5dec0e3c0cb
diff --git a/chat/psi/patches/patch-aa b/chat/psi/patches/patch-aa
deleted file mode 100644
index b216ce11b4e..00000000000
--- a/chat/psi/patches/patch-aa
+++ /dev/null
@@ -1,62 +0,0 @@
-$NetBSD: patch-aa,v 1.3 2003/11/18 17:54:48 xtraeme Exp $
-
-Patch from Martin Ehmsen to make psi work with gpg-1.2.3 (and
-versions before that).
-
---- cutestuff/openpgp/gpgop.cpp	2003-05-26 19:40:28.000000000 +0200
-+++ cutestuff/openpgp/gpgop.cpp	2003-08-28 00:20:59.000000000 +0200
-@@ -543,18 +543,33 @@
- 		return false;
- 
- 	QStringList::ConstIterator it = lines.begin();
-+	QString keyring;
-+	int ver = 0;
- 
--	// first line is keyring file
--	QString keyring = *(it++);
--
--	// skip past the divider
-+	// check if gnupg version is 1.2.3 or below
- 	for(; it != lines.end(); ++it) {
--		if((*it).at(0) == '-')
--			break;
-+	   if((*it).at(0) == '-') {
-+	      ver = 1;
-+	      break;
-+	   }
-+	}
-+
-+	it = lines.begin();
-+
-+	// if gnupg version is 1.2.2 and below first line is keyring
-+	if(ver) {
-+	   // first line is keyring file
-+	   keyring = *(it++);
-+
-+	   // skip past the divider
-+	   for(; it != lines.end(); ++it) {
-+	      if((*it).at(0) == '-')
-+		 break;
-+	   }
-+	   if(it == lines.end())
-+	      return false;
-+	   ++it;
- 	}
--	if(it == lines.end())
--		return false;
--	++it;
- 
- 	OpenPGP::Key *k = 0;
- 	for(; it != lines.end(); ++it) {
-@@ -620,8 +635,9 @@
- 
- 	if(_keylist)
- 		*_keylist = keyList;
--	if(_keyring)
--		*_keyring = keyring;
-+	if(ver)
-+	   if(_keyring)
-+	      *_keyring = keyring;
- 
- 	return true;
- }
diff --git a/chat/psi/patches/patch-ab b/chat/psi/patches/patch-ab
deleted file mode 100644
index 8b72dca5be0..00000000000
--- a/chat/psi/patches/patch-ab
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD: patch-ab,v 1.5 2003/07/27 22:23:01 jdolecek Exp $
-
---- psi.pro.orig	2003-07-28 00:06:40.000000000 +0200
-+++ psi.pro	2003-07-28 00:19:02.000000000 +0200
-@@ -152,20 +152,17 @@
- TRANSLATIONS = \
- 	lang/psi_jp.ts \
- 	lang/psi_de.ts \
--	lang/psi_zh.ts \
- 	lang/psi_pl.ts \
- 	lang/psi_se.ts \
- 	lang/psi_cs.ts \
- 	lang/psi_fr.ts \
- 	lang/psi_es.ts \
- 	lang/psi_ru.ts \
--	lang/psi_da.ts \
--	lang/psi_pt.ts \
- 	lang/psi_nl.ts \
--	lang/psi_ar.ts \
- 	lang/psi_ptbr.ts \
- 	lang/psi_it.ts \
- 	lang/psi_sr.ts \
-+	lang/psi_sr@Latn.ts \
- 	lang/psi_mk.ts \
- 	lang/psi_fi.ts
- 
diff --git a/chat/psi/patches/patch-ac b/chat/psi/patches/patch-ac
index e7ce9ed5160..c88aea0f03d 100644
--- a/chat/psi/patches/patch-ac
+++ b/chat/psi/patches/patch-ac
@@ -1,10 +1,10 @@
-$NetBSD: patch-ac,v 1.4 2003/09/18 19:58:12 wiz Exp $
+$NetBSD: patch-ac,v 1.5 2004/11/27 21:58:18 jdolecek Exp $
 
---- src/profiles.cpp.orig	2003-05-26 02:40:13.000000000 +0200
-+++ src/profiles.cpp
-@@ -518,7 +518,11 @@ void UserProfile::reset()
- 	prefs.font[fMessage] = QApplication::font().toString();
- 	prefs.font[fChat] = QApplication::font().toString();
+--- 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 @@
+ 
+ 	prefs.clNewHeadings = false;
  
 +#ifdef __NetBSD__
 +	prefs.player = "audioplay";
@@ -13,4 +13,4 @@ $NetBSD: patch-ac,v 1.4 2003/09/18 19:58:12 wiz Exp $
 +#endif
  	prefs.noAwaySound = FALSE;
  
- 	prefs.onevent[eMessage] = g.pathBase + "/sound/chat2.wav";
+ 	prefs.onevent[eMessage]    = g.pathBase + "/sound/chat2.wav";