Update to version 0.9.1;

Correct WWW.

Approved by:	maintainer

2 files changed, 12 insertions, 73 deletions

diff --git a/net/psi/files/patch-aa b/net/psi/files/patch-aa
deleted file mode 100644
index 930d9fdaaa53..000000000000
--- a/net/psi/files/patch-aa
+++ /dev/null
@@ -1,58 +0,0 @@
-diff -ur cutestuff.ori/openpgp/gpgop.cpp cutestuff/openpgp/gpgop.cpp
---- cutestuff.ori/openpgp/gpgop.cpp	Tue Nov 18 18:07:55 2003
-+++ cutestuff/openpgp/gpgop.cpp	Tue Nov 18 18:13:37 2003
-@@ -543,18 +543,33 @@
- 		return false;
- 
- 	QStringList::ConstIterator it = lines.begin();
-+	QString keyring;
-+	int ver = 0;
- 
--	// first line is keyring file
--	QString keyring = *(it++);
--
--	// skip past the divider
-+	// check if gnupg version is 1.2.3 or below
- 	for(; it != lines.end(); ++it) {
--		if((*it).at(0) == '-')
--			break;
-+	   if((*it).at(0) == '-') {
-+	      ver = 1;
-+	      break;
-+	   }
-+	}
-+	
-+	it = lines.begin();
-+
-+	// if gnupg version is 1.2.2 and below first line is keyring
-+	if(ver) {
-+	   // first line is keyring file
-+	   keyring = *(it++);
-+
-+	   // skip past the divider
-+	   for(; it != lines.end(); ++it) {
-+	      if((*it).at(0) == '-')
-+		 break;
-+	   }
-+	   if(it == lines.end())
-+	      return false;
-+	   ++it;
- 	}
--	if(it == lines.end())
--		return false;
--	++it;
- 
- 	OpenPGP::Key *k = 0;
- 	for(; it != lines.end(); ++it) {
-@@ -620,8 +635,9 @@
- 
- 	if(_keylist)
- 		*_keylist = keyList;
--	if(_keyring)
--		*_keyring = keyring;
-+	if(ver)
-+	   if(_keyring)
-+	      *_keyring = keyring;
- 
- 	return true;
- }
\ No newline at end of file
diff --git a/net/psi/files/patch-configure b/net/psi/files/patch-configure
index d0a064d05849..8fa391c8090c 100644
--- a/net/psi/files/patch-configure
+++ b/net/psi/files/patch-configure
@@ -2,26 +2,23 @@ $FreeBSD$
 
 Hack configure to eat autogenerated qt options and to fix a bashism (type -p).
 
---- configure.orig	Tue Jun 10 20:12:49 2003
-+++ configure	Tue Dec 23 11:40:49 2003
-@@ -86,6 +86,8 @@
+--- configure.orig	Wed Dec 10 03:10:03 2003
++++ configure	Wed Jan  7 16:30:11 2004
+@@ -81,6 +81,8 @@
+ 			shift
  			;;
- 
- 		-h|--help) show_usage; exit ;;
+ 		--help) show_usage; exit ;;
 +		--with-*)
-+			shift;;
++			shift ;;
  		*) show_usage; exit ;;
  	esac
  done
-@@ -116,9 +118,9 @@
- fi 
- 
- if [ ! -x "$QTDIR/bin/qmake" ]; then
--	echo Warining: qmake not in \$QTDIR/bin/qmake
-+	echo Warning: qmake not in \$QTDIR/bin/qmake
- 	echo trying to find it in \$PATH
+@@ -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
- 		echo qmake found in $qm
- 	else 
+ 		if [ "$QC_DEBUG" = "Y" ]; then
+ 			echo qmake found in $qm