4 files changed, 19 insertions, 59 deletions

diff --git a/net-im/psi/Makefile b/net-im/psi/Makefile
index 02ee0b8c1a48..9b5a2f059dc9 100644
--- a/net-im/psi/Makefile
+++ b/net-im/psi/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	psi
-PORTVERSION=	0.9.1
-PORTREVISION=	2
+PORTVERSION=	0.9.2
 CATEGORIES=	net
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -16,7 +15,6 @@ MAINTAINER=	eugos@gmx.net
 COMMENT=	A Qt-based Jabber client
 
 BUILD_DEPENDS=	qmake:${PORTSDIR}/devel/qmake
-
 RUN_DEPENDS=	${X11BASE}/lib/plugins/crypto/libqca-tls.so:${PORTSDIR}/security/qca-tls
 
 HAS_CONFIGURE=	yes
diff --git a/net-im/psi/distinfo b/net-im/psi/distinfo
index d03da509af14..70158505b095 100644
--- a/net-im/psi/distinfo
+++ b/net-im/psi/distinfo
@@ -1,2 +1,2 @@
-MD5 (psi-0.9.1.tar.bz2) = 7057b61518e1b1ebd732a95c265a3b76
-SIZE (psi-0.9.1.tar.bz2) = 930227
+MD5 (psi-0.9.2.tar.bz2) = e29f90aea7d839f2a70e4a6e77e95a70
+SIZE (psi-0.9.2.tar.bz2) = 1154392
diff --git a/net-im/psi/files/patch-configure b/net-im/psi/files/patch-configure
index 2c7345835f8e..96858299ad19 100644
--- a/net-im/psi/files/patch-configure
+++ b/net-im/psi/files/patch-configure
@@ -1,50 +1,11 @@
 $FreeBSD$
 
-Hack configure to eat autogenerated qt options, to fix a bashism (type -p),
-to avoid using expr, and to do the main Makefile make(1) compatible.
+Hack configure to eat autogenerated qt options
+and to do the main Makefile make(1) compatible.
 
---- configure.orig	Wed Dec 10 01:10:03 2003
-+++ configure	Sat Jan 10 15:52:00 2004
-@@ -27,32 +27,32 @@
- while [ $# -gt 0 ]; do
- 	case "$1" in
- 		--prefix=*)
--			PREFIX=`expr "${1}" : "--prefix=\(.*\)"`
-+			PREFIX="${1#--prefix=}"
- 			shift
- 			;;
- 
- 		--bindir=*)
--			BINDIR=`expr "${1}" : "--bindir=\(.*\)"`
-+			BINDIR="${1#--bindir=}"
- 			shift
- 			;;
- 
- 		--libdir=*)
--			LIBDIR=`expr "${1}" : "--libdir=\(.*\)"`
-+			LIBDIR="${1#--libdir=}"
- 			shift
- 			;;
- 
- 		--qtdir=*)
--			QTDIR=`expr "${1}" : "--qtdir=\(.*\)"`
-+			QTDIR="${1#--qtdir=}"
- 			shift
- 			;;
- 
- 		--with-zlib-inc=*)
--			QC_WITH_ZLIB_INC=`expr "${1}" : "--with-zlib-inc=\(.*\)"`
-+			QC_WITH_ZLIB_INC="${1#--with-zlib-inc=}"
- 			shift
- 			;;
- 
- 		--with-zlib-lib=*)
--			QC_WITH_ZLIB_LIB=`expr "${1}" : "--with-zlib-lib=\(.*\)"`
-+			QC_WITH_ZLIB_LIB="${1#--with-zlib-lib=}"
- 			shift
- 			;;
- 
-@@ -81,6 +81,8 @@
+--- configure.orig	Fri Jun 11 13:49:06 2004
++++ configure	Fri Jun 11 14:25:01 2004
+@@ -82,6 +82,8 @@
  			shift
  			;;
  		--help) show_usage; exit ;;
@@ -53,21 +14,13 @@ to avoid using expr, and to do the main Makefile make(1) compatible.
  		*) show_usage; exit ;;
  	esac
  done
-@@ -136,7 +138,7 @@
- 		echo Warning: qmake not in \$QTDIR/bin/qmake
- 		echo trying to find it in \$PATH
- 	fi
--	qm=`type -p qmake`
-+	qm=`which qmake`
- 	if [ -x "$qm" ]; then
- 		if [ "$QC_DEBUG" = "Y" ]; then
- 			echo qmake found in $qm
-@@ -917,13 +919,6 @@
+@@ -1035,14 +1037,6 @@
  	echo
  	exit 1;
  fi
 -cat >Makefile.tmp <<EOT
 -export QTDIR = $QTDIR
+-export PATH = $QTDIR/bin:$PATH
 -EOT
 -cat Makefile >> Makefile.tmp
 -rm -f Makefile
diff --git a/net-im/psi/pkg-plist b/net-im/psi/pkg-plist
index 1f2e7bd298f9..265a1faf27dc 100644
--- a/net-im/psi/pkg-plist
+++ b/net-im/psi/pkg-plist
@@ -3,6 +3,7 @@ share/psi/COPYING
 share/psi/README
 share/psi/certs/README
 share/psi/certs/rootcert.xml
+share/psi/designer/libpsiwidgets.so
 share/psi/iconsets/emoticons/README
 share/psi/iconsets/emoticons/default/angry.png
 share/psi/iconsets/emoticons/default/bat.png
@@ -55,6 +56,7 @@ share/psi/iconsets/roster/default/chat.png
 share/psi/iconsets/roster/default/connect.png
 share/psi/iconsets/roster/default/dnd.png
 share/psi/iconsets/roster/default/ffc.png
+share/psi/iconsets/roster/default/file.png
 share/psi/iconsets/roster/default/groupclose.png
 share/psi/iconsets/roster/default/groupempty.png
 share/psi/iconsets/roster/default/groupopen.png
@@ -141,6 +143,7 @@ share/psi/iconsets/system/default/changeacc.png
 share/psi/iconsets/system/default/chatclear.png
 share/psi/iconsets/system/default/close.png
 share/psi/iconsets/system/default/configure_toolbars.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
@@ -148,6 +151,8 @@ 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/eye_blue.png
+share/psi/iconsets/system/default/filemanager.png
 share/psi/iconsets/system/default/groupchat.png
 share/psi/iconsets/system/default/help.png
 share/psi/iconsets/system/default/history.png
@@ -181,11 +186,14 @@ share/psi/iconsets/system/default/ssl_yes.png
 share/psi/iconsets/system/default/stop.png
 share/psi/iconsets/system/default/time.png
 share/psi/iconsets/system/default/tip.png
+share/psi/iconsets/system/default/upload.png
 share/psi/iconsets/system/default/url.png
 share/psi/iconsets/system/default/vcard.png
 share/psi/iconsets/system/default/xml.png
 share/psi/sound/chat1.wav
 share/psi/sound/chat2.wav
+share/psi/sound/ft_complete.wav
+share/psi/sound/ft_incoming.wav
 share/psi/sound/offline.wav
 share/psi/sound/online.wav
 share/psi/sound/send.wav
@@ -206,5 +214,6 @@ share/psi/sound/send.wav
 @dirrm share/psi/iconsets/emoticons/default
 @dirrm share/psi/iconsets/emoticons
 @dirrm share/psi/iconsets
+@dirrm share/psi/designer
 @dirrm share/psi/certs
 @dirrm share/psi