update net/psi: 0.8.7 --> 0.9

PR:		53618
Submitted by:	Jonathan Chen <jonc@chen.org.nz> (maintainer)

5 files changed, 42 insertions, 37 deletions

diff --git a/net-im/psi/Makefile b/net-im/psi/Makefile
index 97dabbc9e33a..7feca56a5b71 100644
--- a/net-im/psi/Makefile
+++ b/net-im/psi/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	psi
-PORTVERSION=	0.8.7
+PORTVERSION=	0.9
 CATEGORIES=	net
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -14,17 +14,12 @@ MASTER_SITE_SUBDIR=	${PORTNAME}
 MAINTAINER=	jonc@chen.org.nz
 COMMENT=	A Qt-based Jabber client
 
-LIB_DEPENDS+=	qssl.0:${PORTSDIR}/devel/qssl
-
 HAS_CONFIGURE=	yes
 USE_X_PREFIX=	yes
 USE_BZIP2=	yes
 USE_QT_VER=	3
 CONFIGURE_ENV=	QTDIR=${X11BASE}
 CONFIGURE_ARGS=	-p ${PREFIX}
-MAKE_ARGS+=	QTDIR=${X11BASE} \
-		CFLAGS="-pipe -pthread -D_THREAD_SAFE -DQT_NO_DEBUG -DQT_THREAD_SUPPORT"
-BUILD_WRKSRC=	${WRKSRC}/src
-INSTALL_WRKSRC=	${WRKSRC}/src
+MAKE_ARGS+=	QTDIR=${X11BASE}
 
 .include <bsd.port.mk>
diff --git a/net-im/psi/distinfo b/net-im/psi/distinfo
index 82de70a5bd63..579b3829bbc8 100644
--- a/net-im/psi/distinfo
+++ b/net-im/psi/distinfo
@@ -1 +1 @@
-MD5 (psi-0.8.7.tar.bz2) = 4e18ea341dca70556d0dc1baf026ef86
+MD5 (psi-0.9.tar.bz2) = bf3aaa7fa8a1efdff9f96fa718366aa8
diff --git a/net-im/psi/files/patch-configure b/net-im/psi/files/patch-configure
index 1b6a2947fd7f..1e04067aa8d2 100644
--- a/net-im/psi/files/patch-configure
+++ b/net-im/psi/files/patch-configure
@@ -1,16 +1,15 @@
 $FreeBSD$
 
-Fix the getopt to use BSD's getopt instead of Linux's
+Hack configure to eat autogenerated qt options.
 
---- configure.orig	Wed Oct 30 23:09:35 2002
-+++ configure	Mon Nov  4 22:10:49 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
- 
+--- configure.orig	Wed Jun 11 06:12:49 2003
++++ configure	Mon Jun 23 09:46:58 2003
+@@ -86,6 +86,8 @@
+ 			;;
+ 
+ 		-h|--help) show_usage; exit ;;
++		--with-*)
++			shift;;
+ 		*) show_usage; exit ;;
+ 	esac
+ done
diff --git a/net-im/psi/files/patch-src::psi.pro b/net-im/psi/files/patch-src::psi.pro
deleted file mode 100644
index 2a0278fd329a..000000000000
--- a/net-im/psi/files/patch-src::psi.pro
+++ /dev/null
@@ -1,14 +0,0 @@
-$FreeBSD$
-
-Disable the use of /bin/true (doesn't exist in FreeBSD)
-
---- src/psi.pro.orig	Wed Oct 30 23:09:34 2002
-+++ src/psi.pro	Mon Nov  4 20:43:19 2002
-@@ -157,7 +157,6 @@
- 	LIBS         += -lz -lXss
- 	SOURCES      += trayicon_x11.cpp
- 
--	QMAKE_STRIP = "/bin/true"
- 	include( configure.pri )
- }
- 
diff --git a/net-im/psi/pkg-plist b/net-im/psi/pkg-plist
index c8657be27317..f86b9a34db2a 100644
--- a/net-im/psi/pkg-plist
+++ b/net-im/psi/pkg-plist
@@ -2,8 +2,7 @@ bin/psi
 share/psi/COPYING
 share/psi/README
 share/psi/certs/README
-share/psi/certs/cacert-rootonly.pem
-share/psi/certs/cacert.pem
+share/psi/certs/rootcert.xml
 share/psi/iconsets/lightbulb/away.png
 share/psi/iconsets/lightbulb/chat.png
 share/psi/iconsets/lightbulb/desc
@@ -18,6 +17,10 @@ share/psi/iconsets/lightbulb/system.png
 share/psi/iconsets/lightbulb/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
@@ -68,27 +71,45 @@ 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/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
@@ -98,6 +119,10 @@ 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