Update psi to version 0.9 (latest available).

Changes since 0.8.7:
* OpenPGP integration (via GnuPG)
* Jabber Browsing
* Groupchat invites / private-messaging
* better SSL certificate handling
* ton of bugfixes

Package now also includes all available language packs.

7 files changed, 154 insertions, 137 deletions

diff --git a/chat/psi/DESCR b/chat/psi/DESCR
index 589c8c096a9..e37ebfe3746 100644
--- a/chat/psi/DESCR
+++ b/chat/psi/DESCR
@@ -4,9 +4,8 @@ from the ground up, not relying upon central servers.
 
 Psi is a client for the Jabber system. Written in C++ and based on
 the Qt library, there are versions available for NetBSD, Linux (and
-other flavors of unix/X11), Microsoft Windows, and Apple MacOS X.
-Psi is released under the GNU General Public License, so you know
-that it's truly free, and will remain so.
+other flavors of Unix/X11), Microsoft Windows, and Apple MacOS X.
+Psi is released under the GNU General Public License.
 
 Features:
 * Message (ICQ-style) and Chat (AIM-style) modes
@@ -21,3 +20,5 @@ Features:
 * Auto-away after a configurable amount of time
 * Tray/dock icon for KDE/GNOME environments
 * Language plugins
+* OpenPGP integration (via GnuPG)
+* Groupchat invites / private-messaging
diff --git a/chat/psi/Makefile b/chat/psi/Makefile
index ece08fc784a..722c8f5e2ba 100644
--- a/chat/psi/Makefile
+++ b/chat/psi/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.8 2003/07/17 21:26:14 grant Exp $
+# $NetBSD: Makefile,v 1.9 2003/07/27 21:44:00 jdolecek Exp $
 
-DISTNAME=	psi-0.8.7
-PKGREVISION=	1
+DISTNAME=	psi-0.9
 CATEGORIES=	chat
 MASTER_SITES=	http://belnet.dl.sourceforge.net/sourceforge/psi/
 EXTRACT_SUFX=	.tar.bz2
@@ -10,8 +9,7 @@ MAINTAINER=	jdolecek@NetBSD.org
 HOMEPAGE=	http://psi.affinix.com/
 COMMENT=	PSI Jabber Client
 
-# need qt3 3.0.4nb2, for qmake
-BUILD_DEPENDS+=	qt3-tools>=3.0.4nb2:../../x11/qt3-tools
+DEPENDS+=	psi-ssl>=2.0:../../chat/psi-ssl
 
 USE_BUILDLINK2=	yes
 USE_GMAKE=	yes
@@ -19,16 +17,21 @@ USE_LIBTOOL=	yes
 USE_X11BASE=	yes
 HAS_CONFIGURE=	yes
 
-BUILD_DIRS=	${WRKSRC}/src
-
 CONFIGURE_ARGS+= -p ${PREFIX}
 
 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
 
-# This order is needed to pickup any freetype version dependencies from qt3
+do-install:
+	cd ${WRKSRC} && ${QTDIR}/bin/lrelease psi.pro
+	cd ${WRKSRC} && ${CP} -f -pR image iconsets sound certs lang/*.qm \
+		README COPYING \
+		${X11BASE}/share/psi/
+	cd ${WRKSRC} && ${CP} -f psi ${X11BASE}/bin/psi
+
 .include "../../x11/qt3-libs/buildlink2.mk"
-.include "../../graphics/freetype2/buildlink2.mk"
+BUILDLINK_DEPENDS.qt3-tools=	qt3-tools>=3.1.2nb2	# need lrelease
+.include "../../x11/qt3-tools/buildlink2.mk"
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/chat/psi/PLIST b/chat/psi/PLIST
index 53193993734..ed8d4a4706d 100644
--- a/chat/psi/PLIST
+++ b/chat/psi/PLIST
@@ -1,126 +1,169 @@
-@comment $NetBSD: PLIST,v 1.2 2003/01/03 20:05:21 lha Exp $
+@comment $NetBSD: PLIST,v 1.3 2003/07/27 21:44:00 jdolecek Exp $
 bin/psi
-share/psi/image/msn_offline.png
-share/psi/image/aim_xa.png
-share/psi/image/icq_online.png
-share/psi/image/trans_dnd.png
-share/psi/image/icq_xa.png
-share/psi/image/trans_away.png
-share/psi/image/msn_dnd.png
+share/psi/image/aim_away.png
 share/psi/image/aim_dnd.png
-share/psi/image/icq_away.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/msn_online.png
-share/psi/image/yahoo_away.png
 share/psi/image/icon_32.png
 share/psi/image/icon_48.png
-share/psi/image/yahoo_offline.png
-share/psi/image/icq_offline.png
-share/psi/image/find.png
-share/psi/image/msn_xa.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/smile.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/aim_offline.png
-share/psi/image/aim_away.png
-share/psi/image/yahoo_online.png
-share/psi/image/aim_online.png
-share/psi/image/trans_online.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/icq_dnd.png
-share/psi/image/yahoo_xa.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/iconsets/stellar/emoticon_lamp.png
-share/psi/iconsets/stellar/emoticon_flower.png
-share/psi/iconsets/stellar/emoticon_pussy.png
-share/psi/iconsets/stellar/headline.png
-share/psi/iconsets/stellar/emoticon_music.png
-share/psi/iconsets/stellar/online.png
-share/psi/iconsets/stellar/emoticon_heart.png
-share/psi/iconsets/stellar/emoticon_hugleft.png
-share/psi/iconsets/stellar/emoticon_coffee.png
-share/psi/iconsets/stellar/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/message.png
-share/psi/iconsets/stellar/emoticon_girl.png
-share/psi/iconsets/stellar/history.png
-share/psi/iconsets/stellar/ssl_yes.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/emoticon_frowning.png
-share/psi/iconsets/stellar/emoticon_smile.png
-share/psi/iconsets/stellar/system.png
-share/psi/iconsets/stellar/emoticon_rainbow.png
-share/psi/iconsets/stellar/groupchat.png
-share/psi/iconsets/stellar/psimain.png
-share/psi/iconsets/stellar/offline.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/remove.png
+share/psi/iconsets/stellar/emoticon_bat.png
 share/psi/iconsets/stellar/emoticon_beer.png
-share/psi/iconsets/stellar/groupempty.png
-share/psi/iconsets/stellar/emoticon_mail.png
-share/psi/iconsets/stellar/emoticon_unhappy.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_stare.png
-share/psi/iconsets/stellar/emoticon_phone.png
-share/psi/iconsets/stellar/emoticon_bat.png
-share/psi/iconsets/stellar/groupclose.png
-share/psi/iconsets/stellar/add.png
-share/psi/iconsets/stellar/emoticon_tongue.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_biggrin.png
 share/psi/iconsets/stellar/emoticon_kiss.png
-share/psi/iconsets/stellar/changeacc.png
-share/psi/iconsets/stellar/emoticon_photo.png
-share/psi/iconsets/stellar/emoticon_coolglasses.png
-share/psi/iconsets/stellar/send.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/chatclear.png
 share/psi/iconsets/stellar/emoticon_oh.png
-share/psi/iconsets/stellar/url.png
-share/psi/iconsets/stellar/ssl_no.png
-share/psi/iconsets/stellar/xa.png
-share/psi/iconsets/stellar/noauth.png
-share/psi/iconsets/stellar/emoticon_boy.png
-share/psi/iconsets/stellar/groupopen.png
-share/psi/iconsets/stellar/ask.png
-share/psi/iconsets/stellar/connect.png
-share/psi/iconsets/stellar/emoticon_devil.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/emoticon_brflower.png
-share/psi/iconsets/stellar/emoticon_blush.png
-share/psi/iconsets/stellar/emoticon_drink.png
-share/psi/iconsets/stellar/emoticon_star.png
-share/psi/iconsets/stellar/emoticon_cry.png
-share/psi/iconsets/stellar/emoticon_brheart.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/emoticon_yes.png
-share/psi/iconsets/stellar/desc
-share/psi/iconsets/lightbulb/groupopen.png
-share/psi/iconsets/lightbulb/online.png
-share/psi/iconsets/lightbulb/dnd.png
-share/psi/iconsets/lightbulb/message.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/system.png
-share/psi/iconsets/lightbulb/offline.png
-share/psi/iconsets/lightbulb/groupempty.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/iconsets/lightbulb/desc
-share/psi/sound/online.wav
 share/psi/sound/chat1.wav
 share/psi/sound/chat2.wav
 share/psi/sound/offline.wav
+share/psi/sound/online.wav
 share/psi/sound/send.wav
 share/psi/certs/README
-share/psi/certs/cacert-rootonly.pem
-share/psi/certs/cacert.pem
+share/psi/certs/rootcert.xml
 share/psi/README
 share/psi/COPYING
+share/psi/psi_ar.qm
+share/psi/psi_cs.qm
+share/psi/psi_da.qm
+share/psi/psi_de.qm
+share/psi/psi_es.qm
+share/psi/psi_fi.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_pt.qm
+share/psi/psi_ptbr.qm
+share/psi/psi_ru.qm
+share/psi/psi_se.qm
+share/psi/psi_sr.qm
+share/psi/psi_zh.qm
 @dirrm share/psi/image
 @dirrm share/psi/iconsets/stellar
 @dirrm share/psi/iconsets/lightbulb
diff --git a/chat/psi/distinfo b/chat/psi/distinfo
index e4265a8a4c4..6f8ef877ca6 100644
--- a/chat/psi/distinfo
+++ b/chat/psi/distinfo
@@ -1,7 +1,5 @@
-$NetBSD: distinfo,v 1.4 2003/01/29 06:45:47 jlam Exp $
+$NetBSD: distinfo,v 1.5 2003/07/27 21:44:00 jdolecek Exp $
 
-SHA1 (psi-0.8.7.tar.bz2) = 40431331a56f63cb61738538604c75f8363203eb
-Size (psi-0.8.7.tar.bz2) = 465036 bytes
-SHA1 (patch-ab) = d1fd061a233e3d36b7dc154fd3f28b8da755c247
-SHA1 (patch-ad) = a753869d279434dfd62d9f3330a0302f1b504b4d
-SHA1 (patch-af) = 5fb9b727156e774773e937ddd4c42d3b7b66d371
+SHA1 (psi-0.9.tar.bz2) = 66ab7a6b540f60c9e117bc964a70c126b30aff47
+Size (psi-0.9.tar.bz2) = 968348 bytes
+SHA1 (patch-ad) = 8d255aa9de01ccb39d2cdc7b0074b5dec0e3c0cb
diff --git a/chat/psi/patches/patch-ab b/chat/psi/patches/patch-ab
deleted file mode 100644
index 0f2f7431112..00000000000
--- a/chat/psi/patches/patch-ab
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-ab,v 1.3 2003/01/29 06:45:48 jlam Exp $
-
---- src/psi.pro.orig	Wed Oct 30 02:09:34 2002
-+++ src/psi.pro
-@@ -153,8 +153,7 @@ INCLUDEPATH += kmp
- 
- # System-specific build settings
- unix:!mac {
--	INCLUDEPATH  += /usr/include /usr/X11R6/include
--	LIBS         += -lz -lXss
-+	LIBS         += -lz -lXss -lqt-mt
- 	SOURCES      += trayicon_x11.cpp
- 
- 	QMAKE_STRIP = "/bin/true"
diff --git a/chat/psi/patches/patch-ad b/chat/psi/patches/patch-ad
index 09eac75e122..70ddebd23e0 100644
--- a/chat/psi/patches/patch-ad
+++ b/chat/psi/patches/patch-ad
@@ -1,7 +1,7 @@
-$NetBSD: patch-ad,v 1.1.1.1 2002/08/04 16:52:45 jdolecek Exp $
+$NetBSD: patch-ad,v 1.2 2003/07/27 21:44:01 jdolecek Exp $
 
---- src/minizip/unzip.h.orig	Mon Jul 29 19:53:00 2002
-+++ src/minizip/unzip.h	Mon Jul 29 19:54:16 2002
+--- 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 @@
  #include "zlib.h"
  #endif
diff --git a/chat/psi/patches/patch-af b/chat/psi/patches/patch-af
deleted file mode 100644
index f00715744f5..00000000000
--- a/chat/psi/patches/patch-af
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-af,v 1.1 2003/01/03 20:05:22 lha Exp $
-
---- configure.in	Tue Dec 17 14:53:22 2002
-+++ configure	Tue Dec 17 14:53:37 2002
-@@ -2,8 +2,7 @@
- 
- # parsing options
- 
--TEMP=`getopt -o p:b:l:q:h --long prefix:,bindir:,libdir:,qtdir:,help \
---n 'configure' -- "$@"`
-+TEMP=`getopt p:b:l:q:h "$@"`
- 
- if [ $? != 0 ] ; then echo "Terminating..." >&2 ; exit 1 ; fi
-