5 files changed, 156 insertions, 105 deletions

diff --git a/net-im/psi/Makefile b/net-im/psi/Makefile
index f10aacc5fe2e..eda5d03a6c28 100644
--- a/net-im/psi/Makefile
+++ b/net-im/psi/Makefile
@@ -6,9 +6,10 @@
 #
 
 PORTNAME=	psi
-PORTVERSION=	0.8.5
+PORTVERSION=	0.8.6
 CATEGORIES=	net
-MASTER_SITES=	http://psi.affinix.com/files/${PORTVERSION}/
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
+MASTER_SITE_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	jonc@chen.org.nz
 
@@ -29,9 +30,9 @@ pre-build:
 	cd ${BUILD_WRKSRC}; qmake -spec ${X11BASE}/mkspecs/freebsd-g++ psi.pro
 
 do-install:
-	${MKDIR} ${PREFIX}/share/psi
-	cd ${INSTALL_WRKSRC}; \
-		${CP} -r image iconsets sound README COPYING ${PREFIX}/share/psi
-	${CP} ${BUILD_WRKSRC}/psi ${PREFIX}/bin
+	@${MKDIR} ${DATADIR}
+	@cd ${INSTALL_WRKSRC}; \
+		${CP} -r image iconsets sound certs README COPYING ${DATADIR}
+	@${INSTALL_PROGRAM} ${BUILD_WRKSRC}/psi ${PREFIX}/bin
 
 .include <bsd.port.mk>
diff --git a/net-im/psi/distinfo b/net-im/psi/distinfo
index a5ee9e040503..efa9a693ed94 100644
--- a/net-im/psi/distinfo
+++ b/net-im/psi/distinfo
@@ -1 +1 @@
-MD5 (psi-0.8.5.tar.bz2) = 74a8f8f3dd329422cbbdb96c8b26b651
+MD5 (psi-0.8.6.tar.bz2) = 8e624f88c7dde5794ce14c22f978f3ad
diff --git a/net-im/psi/files/patch-src::ndns.cpp b/net-im/psi/files/patch-src::ndns.cpp
new file mode 100644
index 000000000000..1a742aafc71e
--- /dev/null
+++ b/net-im/psi/files/patch-src::ndns.cpp
@@ -0,0 +1,10 @@
+--- src/ndns.cpp.orig	Thu Jul 11 18:49:42 2002
++++ src/ndns.cpp	Thu Jul 11 18:40:24 2002
+@@ -51,6 +51,7 @@
+ #include "ndns.h"
+ 
+ #ifdef Q_OS_UNIX
++#include	<sys/types.h>
+ #include<netdb.h>
+ #include<netinet/in.h>
+ #include<arpa/inet.h>
diff --git a/net-im/psi/pkg-descr b/net-im/psi/pkg-descr
index 1efa119746c7..5aa6a3361f95 100644
--- a/net-im/psi/pkg-descr
+++ b/net-im/psi/pkg-descr
@@ -1,4 +1,7 @@
-Psi is a Jabber client built with the Qt toolkit.
+Psi is a client for the Jabber system. Written in C++ and based on the
+Qt library, there are versions available for Linux, FreeBSD (and other
+flavors of unix/X11), Microsoft Windows, and Apple MacOS X.
+
 It does not require KDE to run.
 
 WWW: http://psi.affinix.com/
diff --git a/net-im/psi/pkg-plist b/net-im/psi/pkg-plist
index 43e339097979..ebb9e9c799d4 100644
--- a/net-im/psi/pkg-plist
+++ b/net-im/psi/pkg-plist
@@ -1,129 +1,131 @@
 bin/psi
 share/psi/COPYING
 share/psi/README
-share/psi/image/ft_folder.png
-share/psi/image/yahoo_dnd.png
-share/psi/image/aim_xa.png
-share/psi/image/icq_online.png
-share/psi/image/icon_mac.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_dnd.png
-share/psi/image/icq_away.png
-share/psi/image/msn_online.png
-share/psi/image/yahoo_away.png
-share/psi/image/yahoo_offline.png
-share/psi/image/icq_offline.png
-share/psi/image/psimain.png
-share/psi/image/msn_xa.png
-share/psi/image/msn_away.png
-share/psi/image/aim_offline.png
-share/psi/image/ft_file.png
-share/psi/image/aim_away.png
-share/psi/image/chatsend.png
-share/psi/image/chatclear.png
-share/psi/image/yahoo_online.png
-share/psi/image/psilogo.png
-share/psi/image/aim_online.png
-share/psi/image/trans_online.png
-share/psi/image/trans_offline.png
-share/psi/image/ft_back.png
-share/psi/image/icq_dnd.png
-share/psi/image/yahoo_xa.png
-share/psi/image/trans_xa.png
-share/psi/image/msn_offline.png
-share/psi/image/ssl_yes.png
-share/psi/image/ssl_no.png
-share/psi/image/psiwmdock1.png
-share/psi/image/account.png
-share/psi/image/icon_16.png
-share/psi/image/icon_32.png
-share/psi/image/icon_48.png
+share/psi/certs/README
+share/psi/certs/cacert-rootonly.pem
+share/psi/certs/cacert.pem
+share/psi/iconsets/cosmic/add.png
+share/psi/iconsets/cosmic/away.png
+share/psi/iconsets/cosmic/changeacc.png
+share/psi/iconsets/cosmic/chat.png
+share/psi/iconsets/cosmic/desc
+share/psi/iconsets/cosmic/dnd.png
+share/psi/iconsets/cosmic/groupclose.png
+share/psi/iconsets/cosmic/groupempty.png
+share/psi/iconsets/cosmic/groupopen.png
+share/psi/iconsets/cosmic/headline.png
+share/psi/iconsets/cosmic/history.png
+share/psi/iconsets/cosmic/info.png
+share/psi/iconsets/cosmic/message.png
+share/psi/iconsets/cosmic/offline.png
+share/psi/iconsets/cosmic/online.png
+share/psi/iconsets/cosmic/remove.png
+share/psi/iconsets/cosmic/send.png
+share/psi/iconsets/cosmic/system.png
+share/psi/iconsets/cosmic/url.png
+share/psi/iconsets/cosmic/xa.png
+share/psi/iconsets/gabber/away.png
+share/psi/iconsets/gabber/chat.png
+share/psi/iconsets/gabber/desc
+share/psi/iconsets/gabber/dnd.png
+share/psi/iconsets/gabber/message.png
+share/psi/iconsets/gabber/offline.png
+share/psi/iconsets/gabber/online.png
+share/psi/iconsets/gabber/xa.png
+share/psi/iconsets/icq2/away.png
+share/psi/iconsets/icq2/chat.png
 share/psi/iconsets/icq2/desc
-share/psi/iconsets/icq2/online.png
 share/psi/iconsets/icq2/dnd.png
 share/psi/iconsets/icq2/message.png
-share/psi/iconsets/icq2/away.png
-share/psi/iconsets/icq2/chat.png
 share/psi/iconsets/icq2/offline.png
+share/psi/iconsets/icq2/online.png
 share/psi/iconsets/icq2/send.png
 share/psi/iconsets/icq2/xa.png
+share/psi/iconsets/licq/add.png
+share/psi/iconsets/licq/away.png
+share/psi/iconsets/licq/chat.png
 share/psi/iconsets/licq/desc
-share/psi/iconsets/licq/online.png
 share/psi/iconsets/licq/dnd.png
 share/psi/iconsets/licq/message.png
-share/psi/iconsets/licq/away.png
-share/psi/iconsets/licq/chat.png
 share/psi/iconsets/licq/offline.png
-share/psi/iconsets/licq/add.png
+share/psi/iconsets/licq/online.png
 share/psi/iconsets/licq/send.png
 share/psi/iconsets/licq/xa.png
-share/psi/iconsets/cosmic/desc
-share/psi/iconsets/cosmic/online.png
-share/psi/iconsets/cosmic/dnd.png
-share/psi/iconsets/cosmic/message.png
-share/psi/iconsets/cosmic/history.png
-share/psi/iconsets/cosmic/away.png
-share/psi/iconsets/cosmic/chat.png
-share/psi/iconsets/cosmic/system.png
-share/psi/iconsets/cosmic/offline.png
-share/psi/iconsets/cosmic/remove.png
-share/psi/iconsets/cosmic/groupempty.png
-share/psi/iconsets/cosmic/groupclose.png
-share/psi/iconsets/cosmic/add.png
-share/psi/iconsets/cosmic/changeacc.png
-share/psi/iconsets/cosmic/send.png
-share/psi/iconsets/cosmic/url.png
-share/psi/iconsets/cosmic/xa.png
-share/psi/iconsets/cosmic/groupopen.png
-share/psi/iconsets/cosmic/info.png
-share/psi/iconsets/cosmic/headline.png
-share/psi/iconsets/smiley/desc
-share/psi/iconsets/smiley/online.png
-share/psi/iconsets/smiley/dnd.png
-share/psi/iconsets/smiley/message.png
-share/psi/iconsets/smiley/away.png
-share/psi/iconsets/smiley/chat.png
-share/psi/iconsets/smiley/offline.png
-share/psi/iconsets/smiley/send.png
-share/psi/iconsets/smiley/xa.png
-share/psi/iconsets/lightbulb/desc
-share/psi/iconsets/lightbulb/xa.png
-share/psi/iconsets/lightbulb/online.png
-share/psi/iconsets/lightbulb/dnd.png
-share/psi/iconsets/lightbulb/message.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/gabber/desc
-share/psi/iconsets/gabber/away.png
-share/psi/iconsets/gabber/chat.png
-share/psi/iconsets/gabber/dnd.png
-share/psi/iconsets/gabber/message.png
-share/psi/iconsets/gabber/offline.png
-share/psi/iconsets/gabber/online.png
-share/psi/iconsets/gabber/xa.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/mike/away.png
 share/psi/iconsets/mike/chat.png
+share/psi/iconsets/mike/desc
 share/psi/iconsets/mike/dnd.png
 share/psi/iconsets/mike/message.png
 share/psi/iconsets/mike/offline.png
 share/psi/iconsets/mike/online.png
 share/psi/iconsets/mike/send.png
 share/psi/iconsets/mike/xa.png
-share/psi/iconsets/mike/desc
+share/psi/iconsets/smiley/away.png
+share/psi/iconsets/smiley/chat.png
+share/psi/iconsets/smiley/desc
+share/psi/iconsets/smiley/dnd.png
+share/psi/iconsets/smiley/message.png
+share/psi/iconsets/smiley/offline.png
+share/psi/iconsets/smiley/online.png
+share/psi/iconsets/smiley/send.png
+share/psi/iconsets/smiley/xa.png
+share/psi/iconsets/stellar/account.png
 share/psi/iconsets/stellar/add.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/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/groupclose.png
 share/psi/iconsets/stellar/groupempty.png
 share/psi/iconsets/stellar/groupopen.png
@@ -133,16 +135,52 @@ share/psi/iconsets/stellar/info.png
 share/psi/iconsets/stellar/message.png
 share/psi/iconsets/stellar/offline.png
 share/psi/iconsets/stellar/online.png
+share/psi/iconsets/stellar/psimain.png
 share/psi/iconsets/stellar/remove.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/system.png
 share/psi/iconsets/stellar/url.png
 share/psi/iconsets/stellar/xa.png
+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/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/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/sound/chat1.wav
-share/psi/sound/online.wav
-share/psi/sound/offline.wav
 share/psi/sound/chat2.wav
+share/psi/sound/offline.wav
+share/psi/sound/online.wav
 share/psi/sound/send.wav
+@dirrm share/psi/sound
+@dirrm share/psi/image
 @dirrm share/psi/iconsets/stellar
 @dirrm share/psi/iconsets/smiley
 @dirrm share/psi/iconsets/mike
@@ -151,7 +189,6 @@ share/psi/sound/send.wav
 @dirrm share/psi/iconsets/icq2
 @dirrm share/psi/iconsets/gabber
 @dirrm share/psi/iconsets/cosmic
-@dirrm share/psi/sound
-@dirrm share/psi/image
 @dirrm share/psi/iconsets
+@dirrm share/psi/certs
 @dirrm share/psi