update to psi 0.8.7

7 files changed, 161 insertions, 284 deletions

diff --git a/chat/psi/Makefile b/chat/psi/Makefile
index 5b9024a087c..262d626b04c 100644
--- a/chat/psi/Makefile
+++ b/chat/psi/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.3 2002/12/24 06:09:47 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2003/01/03 20:05:21 lha Exp $
 
-DISTNAME=	psi-0.8.6
-PKGREVISION=	1
+DISTNAME=	psi-0.8.7
 CATEGORIES=	chat
 MASTER_SITES=	http://belnet.dl.sourceforge.net/sourceforge/psi/
 EXTRACT_SUFX=	.tar.bz2
@@ -14,25 +13,17 @@ USE_BUILDLINK2=	yes
 USE_GMAKE=	yes
 USE_LIBTOOL=	yes
 USE_X11BASE=	yes
+HAS_CONFIGURE=	yes
 
 BUILD_DIRS=	${WRKSRC}/src
 
-post-patch:
-	cd ${WRKSRC}/src && ${SED} -e 's^@PREFIX@^"${PREFIX}"^' common.cpp > common.cpp.new && ${MV} -f common.cpp.new common.cpp
-
-pre-build:
-	cd ${WRKSRC}/src;						\
-	if [ ! -f Makefile -o Makefile -ot psi.pro ]; then		\
-		${SETENV} ${MAKE_ENV} ${QTDIR}/bin/qmake psi.pro;	\
-	fi
-
-do-install:
-	cd ${WRKSRC} && PREFIX="${PREFIX}" ./install.sh
+CONFIGURE_ARGS+= -p ${PREFIX}
 
 BUILDLINK_DEPENDS_METHOD.qt3-tools=	build
 # need qt3 3.0.4nb2, for qmake
 BUILDLINK_DEPENDS.qt3-tools=		qt3-tools>=3.0.4nb2
 
+.include "../../graphics/freetype2/buildlink2.mk"
 .include "../../x11/qt3-libs/buildlink2.mk"
 .include "../../x11/qt3-tools/buildlink2.mk"
 
diff --git a/chat/psi/PLIST b/chat/psi/PLIST
index 9123993c444..53193993734 100644
--- a/chat/psi/PLIST
+++ b/chat/psi/PLIST
@@ -1,196 +1,130 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2002/08/04 16:52:45 jdolecek Exp $
+@comment $NetBSD: PLIST,v 1.2 2003/01/03 20:05:21 lha Exp $
 bin/psi
-psi/COPYING
-psi/README
-psi/certs/README
-psi/certs/cacert-rootonly.pem
-psi/certs/cacert.pem
-psi/iconsets/cosmic/add.png
-psi/iconsets/cosmic/away.png
-psi/iconsets/cosmic/changeacc.png
-psi/iconsets/cosmic/chat.png
-psi/iconsets/cosmic/desc
-psi/iconsets/cosmic/dnd.png
-psi/iconsets/cosmic/groupclose.png
-psi/iconsets/cosmic/groupempty.png
-psi/iconsets/cosmic/groupopen.png
-psi/iconsets/cosmic/headline.png
-psi/iconsets/cosmic/history.png
-psi/iconsets/cosmic/info.png
-psi/iconsets/cosmic/message.png
-psi/iconsets/cosmic/offline.png
-psi/iconsets/cosmic/online.png
-psi/iconsets/cosmic/remove.png
-psi/iconsets/cosmic/send.png
-psi/iconsets/cosmic/system.png
-psi/iconsets/cosmic/url.png
-psi/iconsets/cosmic/xa.png
-psi/iconsets/gabber/away.png
-psi/iconsets/gabber/chat.png
-psi/iconsets/gabber/desc
-psi/iconsets/gabber/dnd.png
-psi/iconsets/gabber/message.png
-psi/iconsets/gabber/offline.png
-psi/iconsets/gabber/online.png
-psi/iconsets/gabber/xa.png
-psi/iconsets/icq2/away.png
-psi/iconsets/icq2/chat.png
-psi/iconsets/icq2/desc
-psi/iconsets/icq2/dnd.png
-psi/iconsets/icq2/message.png
-psi/iconsets/icq2/offline.png
-psi/iconsets/icq2/online.png
-psi/iconsets/icq2/send.png
-psi/iconsets/icq2/xa.png
-psi/iconsets/licq/add.png
-psi/iconsets/licq/away.png
-psi/iconsets/licq/chat.png
-psi/iconsets/licq/desc
-psi/iconsets/licq/dnd.png
-psi/iconsets/licq/message.png
-psi/iconsets/licq/offline.png
-psi/iconsets/licq/online.png
-psi/iconsets/licq/send.png
-psi/iconsets/licq/xa.png
-psi/iconsets/lightbulb/away.png
-psi/iconsets/lightbulb/chat.png
-psi/iconsets/lightbulb/desc
-psi/iconsets/lightbulb/dnd.png
-psi/iconsets/lightbulb/groupclose.png
-psi/iconsets/lightbulb/groupempty.png
-psi/iconsets/lightbulb/groupopen.png
-psi/iconsets/lightbulb/message.png
-psi/iconsets/lightbulb/offline.png
-psi/iconsets/lightbulb/online.png
-psi/iconsets/lightbulb/system.png
-psi/iconsets/lightbulb/xa.png
-psi/iconsets/mike/away.png
-psi/iconsets/mike/chat.png
-psi/iconsets/mike/desc
-psi/iconsets/mike/dnd.png
-psi/iconsets/mike/message.png
-psi/iconsets/mike/offline.png
-psi/iconsets/mike/online.png
-psi/iconsets/mike/send.png
-psi/iconsets/mike/xa.png
-psi/iconsets/smiley/away.png
-psi/iconsets/smiley/chat.png
-psi/iconsets/smiley/desc
-psi/iconsets/smiley/dnd.png
-psi/iconsets/smiley/message.png
-psi/iconsets/smiley/offline.png
-psi/iconsets/smiley/online.png
-psi/iconsets/smiley/send.png
-psi/iconsets/smiley/xa.png
-psi/iconsets/stellar/add.png
-psi/iconsets/stellar/away.png
-psi/iconsets/stellar/changeacc.png
-psi/iconsets/stellar/chat.png
-psi/iconsets/stellar/desc
-psi/iconsets/stellar/dnd.png
-psi/iconsets/stellar/groupclose.png
-psi/iconsets/stellar/groupempty.png
-psi/iconsets/stellar/groupopen.png
-psi/iconsets/stellar/headline.png
-psi/iconsets/stellar/history.png
-psi/iconsets/stellar/info.png
-psi/iconsets/stellar/message.png
-psi/iconsets/stellar/offline.png
-psi/iconsets/stellar/online.png
-psi/iconsets/stellar/remove.png
-psi/iconsets/stellar/send.png
-psi/iconsets/stellar/system.png
-psi/iconsets/stellar/url.png
-psi/iconsets/stellar/xa.png
-psi/iconsets/stellar/account.png
-psi/iconsets/stellar/chatclear.png
-psi/iconsets/stellar/emoticon_angry.png
-psi/iconsets/stellar/emoticon_bat.png
-psi/iconsets/stellar/emoticon_beer.png
-psi/iconsets/stellar/emoticon_biggrin.png
-psi/iconsets/stellar/emoticon_blush.png
-psi/iconsets/stellar/emoticon_boy.png
-psi/iconsets/stellar/emoticon_brflower.png
-psi/iconsets/stellar/emoticon_brheart.png
-psi/iconsets/stellar/emoticon_coffee.png
-psi/iconsets/stellar/emoticon_coolglasses.png
-psi/iconsets/stellar/emoticon_cry.png
-psi/iconsets/stellar/emoticon_cuffs.png
-psi/iconsets/stellar/emoticon_devil.png
-psi/iconsets/stellar/emoticon_drink.png
-psi/iconsets/stellar/emoticon_flower.png
-psi/iconsets/stellar/emoticon_frowning.png
-psi/iconsets/stellar/emoticon_girl.png
-psi/iconsets/stellar/emoticon_heart.png
-psi/iconsets/stellar/emoticon_hugleft.png
-psi/iconsets/stellar/emoticon_hugright.png
-psi/iconsets/stellar/emoticon_kiss.png
-psi/iconsets/stellar/emoticon_lamp.png
-psi/iconsets/stellar/emoticon_mail.png
-psi/iconsets/stellar/emoticon_music.png
-psi/iconsets/stellar/emoticon_no.png
-psi/iconsets/stellar/emoticon_oh.png
-psi/iconsets/stellar/emoticon_phone.png
-psi/iconsets/stellar/emoticon_photo.png
-psi/iconsets/stellar/emoticon_pussy.png
-psi/iconsets/stellar/emoticon_rainbow.png
-psi/iconsets/stellar/emoticon_smile.png
-psi/iconsets/stellar/emoticon_star.png
-psi/iconsets/stellar/emoticon_stare.png
-psi/iconsets/stellar/emoticon_tongue.png
-psi/iconsets/stellar/emoticon_unhappy.png
-psi/iconsets/stellar/emoticon_wink.png
-psi/iconsets/stellar/emoticon_yes.png
-psi/iconsets/stellar/psimain.png
-psi/iconsets/stellar/ssl_no.png
-psi/iconsets/stellar/ssl_yes.png
-psi/image/aim_away.png
-psi/image/aim_dnd.png
-psi/image/aim_offline.png
-psi/image/aim_online.png
-psi/image/aim_xa.png
-psi/image/icon_16.png
-psi/image/icon_32.png
-psi/image/icon_48.png
-psi/image/icon_mac.png
-psi/image/icq_away.png
-psi/image/icq_dnd.png
-psi/image/icq_offline.png
-psi/image/icq_online.png
-psi/image/icq_xa.png
-psi/image/msn_away.png
-psi/image/msn_dnd.png
-psi/image/msn_offline.png
-psi/image/msn_online.png
-psi/image/msn_xa.png
-psi/image/psilogo.png
-psi/image/smile.png
-psi/image/trans_away.png
-psi/image/trans_dnd.png
-psi/image/trans_offline.png
-psi/image/trans_online.png
-psi/image/trans_xa.png
-psi/image/yahoo_away.png
-psi/image/yahoo_dnd.png
-psi/image/yahoo_offline.png
-psi/image/yahoo_online.png
-psi/image/yahoo_xa.png
-psi/psi
-psi/sound/chat1.wav
-psi/sound/chat2.wav
-psi/sound/offline.wav
-psi/sound/online.wav
-psi/sound/send.wav
-@dirrm psi/iconsets/cosmic
-@dirrm psi/iconsets/gabber
-@dirrm psi/iconsets/icq2
-@dirrm psi/iconsets/licq
-@dirrm psi/iconsets/lightbulb
-@dirrm psi/iconsets/mike
-@dirrm psi/iconsets/smiley
-@dirrm psi/iconsets/stellar
-@dirrm psi/iconsets
-@dirrm psi/image
-@dirrm psi/sound
-@dirrm psi/certs
-@dirrm 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_dnd.png
+share/psi/image/icq_away.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/msn_away.png
+share/psi/image/smile.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/trans_offline.png
+share/psi/image/icq_dnd.png
+share/psi/image/yahoo_xa.png
+share/psi/image/trans_xa.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/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/away.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/emoticon_angry.png
+share/psi/iconsets/stellar/remove.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_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_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_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_wink.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/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/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/groupclose.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/send.wav
+share/psi/certs/README
+share/psi/certs/cacert-rootonly.pem
+share/psi/certs/cacert.pem
+share/psi/README
+share/psi/COPYING
+@dirrm share/psi/image
+@dirrm share/psi/iconsets/stellar
+@dirrm share/psi/iconsets/lightbulb
+@dirrm share/psi/iconsets
+@dirrm share/psi/sound
+@dirrm share/psi/certs
+@dirrm share/psi
diff --git a/chat/psi/distinfo b/chat/psi/distinfo
index 9a627bbe548..4d3876dd600 100644
--- a/chat/psi/distinfo
+++ b/chat/psi/distinfo
@@ -1,8 +1,7 @@
-$NetBSD: distinfo,v 1.2 2002/08/04 17:11:06 jdolecek Exp $
+$NetBSD: distinfo,v 1.3 2003/01/03 20:05:21 lha Exp $
 
-SHA1 (psi-0.8.6.tar.bz2) = 472c7434459c9fdcc7641217509c6bd0e27afa7c
-Size (psi-0.8.6.tar.bz2) = 448520 bytes
-SHA1 (patch-aa) = b2ef8e4e8fa2f9543363df559f6a1b7854fb6132
-SHA1 (patch-ab) = f89c78533f7bccac216cb7c33e97ef13a9564980
-SHA1 (patch-ac) = b6ab63f0389303e42853b712d9526541379aab1a
+SHA1 (psi-0.8.7.tar.bz2) = 40431331a56f63cb61738538604c75f8363203eb
+Size (psi-0.8.7.tar.bz2) = 465036 bytes
+SHA1 (patch-ab) = 98a46d0014fedc425c05c0a54e8a2c0b961953a0
 SHA1 (patch-ad) = a753869d279434dfd62d9f3330a0302f1b504b4d
+SHA1 (patch-af) = 5fb9b727156e774773e937ddd4c42d3b7b66d371
diff --git a/chat/psi/patches/patch-aa b/chat/psi/patches/patch-aa
deleted file mode 100644
index 2579b8dc3b9..00000000000
--- a/chat/psi/patches/patch-aa
+++ /dev/null
@@ -1,48 +0,0 @@
-$NetBSD: patch-aa,v 1.1.1.1 2002/08/04 16:52:45 jdolecek Exp $
-
---- install.sh.orig	Mon Jul  8 20:13:11 2002
-+++ install.sh	Sun Aug  4 13:54:04 2002
-@@ -1,33 +1,33 @@
--#!/bin/sh
-+#!/bin/sh -x
- 
--if [ ! -f ./psi ]; then
-+if [ ! -f src/psi ]; then
-   echo "The program 'psi' doesn't exist.  Perhaps this is a source package and you have not yet compiled the program?  Go read the INSTALL file."
-   exit 1
- fi
- 
--export PSIDIR=/usr/local/psi
-+PSIDIR=$PREFIX/psi
- 
- echo [Installing Psi]
- 
- mkdir -p $PSIDIR
- 
--echo Copying program files to /usr/local/psi
-+echo Copying program files to $PSIDIR
- cp -r ./image $PSIDIR
- cp -r ./iconsets $PSIDIR
- cp -r ./sound $PSIDIR
- cp -r ./certs $PSIDIR
- 
--cp ./psi $PSIDIR
-+cp src/psi $PSIDIR
- cp ./README $PSIDIR
- cp ./COPYING $PSIDIR
- 
--mkdir -p /usr/local/bin
--if [ -e /usr/local/bin/psi ]; then
--  rm /usr/local/bin/psi
-+mkdir -p $PREFIX/bin
-+if [ -e $PREFIX/bin/psi ]; then
-+  rm $PREFIX/bin/psi
- fi
- 
--echo Putting a link in /usr/local/bin
--ln -s $PSIDIR/psi /usr/local/bin/psi
-+echo Putting a link in $PREFIX/bin
-+ln -s $PSIDIR/psi $PREFIX/bin/psi
- 
- echo [Finished]
- 
diff --git a/chat/psi/patches/patch-ab b/chat/psi/patches/patch-ab
index feeca7b197f..bb4b5113542 100644
--- a/chat/psi/patches/patch-ab
+++ b/chat/psi/patches/patch-ab
@@ -1,13 +1,13 @@
-$NetBSD: patch-ab,v 1.1.1.1 2002/08/04 16:52:45 jdolecek Exp $
+$NetBSD: patch-ab,v 1.2 2003/01/03 20:05:22 lha Exp $
 
---- src/psi.pro.orig	Mon Jul  8 20:13:11 2002
-+++ src/psi.pro	Fri Aug  2 10:57:52 2002
-@@ -141,7 +141,7 @@
+--- src/psi.pro.orig	Wed Oct 30 11:09:34 2002
++++ src/psi.pro	Tue Dec 17 13:10:29 2002
+@@ -154,7 +154,7 @@
  # System-specific build settings
  unix:!mac {
- 	INCLUDEPATH  += /usr/X11R6/include
--	LIBS         += -lXss -lz
-+	LIBS         += -lXss -lz -lqt-mt
+ 	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-ac b/chat/psi/patches/patch-ac
deleted file mode 100644
index c92aa52e014..00000000000
--- a/chat/psi/patches/patch-ac
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ac,v 1.2 2002/08/04 17:08:21 jdolecek Exp $
-
---- src/common.cpp.orig	Wed Jun 12 13:03:22 2002
-+++ src/common.cpp	Tue Jun 11 23:24:46 2002
-@@ -1130,7 +1130,7 @@
- #ifdef Q_WS_X11
- QString getResourcesDir()
- {
--	return "/usr/local/psi";
-+	return @PREFIX@"/psi";
- }
- 
- QString getHomeDir()
diff --git a/chat/psi/patches/patch-af b/chat/psi/patches/patch-af
new file mode 100644
index 00000000000..f00715744f5
--- /dev/null
+++ b/chat/psi/patches/patch-af
@@ -0,0 +1,14 @@
+$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
+