update to psi 0.8.7

4 files changed, 22 insertions, 69 deletions

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
+