Update to version 0.9.1;

Correct WWW.

Approved by:	maintainer
This commit is contained in:
Dmitry Sivachenko 2004-01-07 13:54:13 +00:00
parent 95b35c4ba7
commit f7527a57e5
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=97569
12 changed files with 430 additions and 442 deletions

View file

@ -6,8 +6,7 @@
#
PORTNAME= psi
PORTVERSION= 0.9
PORTREVISION= 1
PORTVERSION= 0.9.1
CATEGORIES= net
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
@ -15,15 +14,15 @@ MASTER_SITE_SUBDIR= ${PORTNAME}
MAINTAINER= jonc@chen.org.nz
COMMENT= A Qt-based Jabber client
LIB_DEPENDS+= qssl.1:${PORTSDIR}/devel/qssl
HAS_CONFIGURE= yes
USE_X_PREFIX= yes
USE_BZIP2= yes
USE_GMAKE= yes
USE_QT_VER= 3
CONFIGURE_ENV= QTDIR=${X11BASE} \
QMAKESPEC=${LOCALBASE}/share/qt/mkspecs/freebsd-g++
CONFIGURE_ARGS= -p ${PREFIX}
MAKE_ARGS+= QTDIR=${X11BASE}
CONFIGURE_ARGS= --prefix=${PREFIX}
MAKE_ARGS+= QTDIR=${X11BASE} \
QMAKESPEC=${LOCALBASE}/share/qt/mkspecs/freebsd-g++
.include <bsd.port.mk>

View file

@ -1 +1 @@
MD5 (psi-0.9.tar.bz2) = bf3aaa7fa8a1efdff9f96fa718366aa8
MD5 (psi-0.9.1.tar.bz2) = 7057b61518e1b1ebd732a95c265a3b76

View file

@ -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;
}

View file

@ -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

View file

@ -4,4 +4,4 @@ flavors of unix/X11), Microsoft Windows, and Apple MacOS X.
It does not require KDE to run.
WWW: http://psi.sourceforge.net/
WWW: http://psi.affinix.com/

View file

@ -3,152 +3,208 @@ share/psi/COPYING
share/psi/README
share/psi/certs/README
share/psi/certs/rootcert.xml
share/psi/iconsets/lightbulb/away.png
share/psi/iconsets/lightbulb/chat.png
share/psi/iconsets/lightbulb/desc
share/psi/iconsets/lightbulb/dnd.png
share/psi/iconsets/lightbulb/groupclose.png
share/psi/iconsets/lightbulb/groupempty.png
share/psi/iconsets/lightbulb/groupopen.png
share/psi/iconsets/lightbulb/message.png
share/psi/iconsets/lightbulb/offline.png
share/psi/iconsets/lightbulb/online.png
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
share/psi/iconsets/stellar/chat.png
share/psi/iconsets/stellar/chatclear.png
share/psi/iconsets/stellar/connect.png
share/psi/iconsets/stellar/desc
share/psi/iconsets/stellar/dnd.png
share/psi/iconsets/stellar/emoticon_angry.png
share/psi/iconsets/stellar/emoticon_bat.png
share/psi/iconsets/stellar/emoticon_beer.png
share/psi/iconsets/stellar/emoticon_biggrin.png
share/psi/iconsets/stellar/emoticon_blush.png
share/psi/iconsets/stellar/emoticon_boy.png
share/psi/iconsets/stellar/emoticon_brflower.png
share/psi/iconsets/stellar/emoticon_brheart.png
share/psi/iconsets/stellar/emoticon_coffee.png
share/psi/iconsets/stellar/emoticon_coolglasses.png
share/psi/iconsets/stellar/emoticon_cry.png
share/psi/iconsets/stellar/emoticon_cuffs.png
share/psi/iconsets/stellar/emoticon_devil.png
share/psi/iconsets/stellar/emoticon_drink.png
share/psi/iconsets/stellar/emoticon_flower.png
share/psi/iconsets/stellar/emoticon_frowning.png
share/psi/iconsets/stellar/emoticon_girl.png
share/psi/iconsets/stellar/emoticon_heart.png
share/psi/iconsets/stellar/emoticon_hugleft.png
share/psi/iconsets/stellar/emoticon_hugright.png
share/psi/iconsets/stellar/emoticon_kiss.png
share/psi/iconsets/stellar/emoticon_lamp.png
share/psi/iconsets/stellar/emoticon_mail.png
share/psi/iconsets/stellar/emoticon_music.png
share/psi/iconsets/stellar/emoticon_no.png
share/psi/iconsets/stellar/emoticon_oh.png
share/psi/iconsets/stellar/emoticon_phone.png
share/psi/iconsets/stellar/emoticon_photo.png
share/psi/iconsets/stellar/emoticon_pussy.png
share/psi/iconsets/stellar/emoticon_rainbow.png
share/psi/iconsets/stellar/emoticon_smile.png
share/psi/iconsets/stellar/emoticon_star.png
share/psi/iconsets/stellar/emoticon_stare.png
share/psi/iconsets/stellar/emoticon_tongue.png
share/psi/iconsets/stellar/emoticon_unhappy.png
share/psi/iconsets/stellar/emoticon_wink.png
share/psi/iconsets/stellar/emoticon_yes.png
share/psi/iconsets/stellar/groupchat.png
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
share/psi/image/icon_mac.png
share/psi/image/icq_away.png
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
share/psi/image/msn_online.png
share/psi/image/msn_xa.png
share/psi/image/psilogo.png
share/psi/image/smile.png
share/psi/image/trans_away.png
share/psi/image/trans_dnd.png
share/psi/image/trans_offline.png
share/psi/image/trans_online.png
share/psi/image/trans_xa.png
share/psi/image/yahoo_away.png
share/psi/image/yahoo_dnd.png
share/psi/image/yahoo_offline.png
share/psi/image/yahoo_online.png
share/psi/image/yahoo_xa.png
share/psi/iconsets/emoticons/README
share/psi/iconsets/emoticons/default/angry.png
share/psi/iconsets/emoticons/default/bat.png
share/psi/iconsets/emoticons/default/beer.png
share/psi/iconsets/emoticons/default/biggrin.png
share/psi/iconsets/emoticons/default/blush.png
share/psi/iconsets/emoticons/default/boy.png
share/psi/iconsets/emoticons/default/brflower.png
share/psi/iconsets/emoticons/default/brheart.png
share/psi/iconsets/emoticons/default/coffee.png
share/psi/iconsets/emoticons/default/coolglasses.png
share/psi/iconsets/emoticons/default/cry.png
share/psi/iconsets/emoticons/default/cuffs.png
share/psi/iconsets/emoticons/default/devil.png
share/psi/iconsets/emoticons/default/drink.png
share/psi/iconsets/emoticons/default/flower.png
share/psi/iconsets/emoticons/default/frowning.png
share/psi/iconsets/emoticons/default/girl.png
share/psi/iconsets/emoticons/default/heart.png
share/psi/iconsets/emoticons/default/hugleft.png
share/psi/iconsets/emoticons/default/hugright.png
share/psi/iconsets/emoticons/default/icondef.xml
share/psi/iconsets/emoticons/default/kiss.png
share/psi/iconsets/emoticons/default/lamp.png
share/psi/iconsets/emoticons/default/mail.png
share/psi/iconsets/emoticons/default/music.png
share/psi/iconsets/emoticons/default/no.png
share/psi/iconsets/emoticons/default/oh.png
share/psi/iconsets/emoticons/default/phone.png
share/psi/iconsets/emoticons/default/photo.png
share/psi/iconsets/emoticons/default/pussy.png
share/psi/iconsets/emoticons/default/rainbow.png
share/psi/iconsets/emoticons/default/smile.png
share/psi/iconsets/emoticons/default/star.png
share/psi/iconsets/emoticons/default/stare.png
share/psi/iconsets/emoticons/default/tongue.png
share/psi/iconsets/emoticons/default/unhappy.png
share/psi/iconsets/emoticons/default/wink.png
share/psi/iconsets/emoticons/default/yes.png
share/psi/iconsets/roster/README
share/psi/iconsets/roster/aim/away.png
share/psi/iconsets/roster/aim/dnd.png
share/psi/iconsets/roster/aim/icondef.xml
share/psi/iconsets/roster/aim/offline.png
share/psi/iconsets/roster/aim/online.png
share/psi/iconsets/roster/aim/xa.png
share/psi/iconsets/roster/default/ask.png
share/psi/iconsets/roster/default/away.png
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/groupclose.png
share/psi/iconsets/roster/default/groupempty.png
share/psi/iconsets/roster/default/groupopen.png
share/psi/iconsets/roster/default/headline.png
share/psi/iconsets/roster/default/icondef.xml
share/psi/iconsets/roster/default/invisible.png
share/psi/iconsets/roster/default/message.png
share/psi/iconsets/roster/default/noauth.png
share/psi/iconsets/roster/default/offline.png
share/psi/iconsets/roster/default/online.png
share/psi/iconsets/roster/default/perr.png
share/psi/iconsets/roster/default/system.png
share/psi/iconsets/roster/default/xa.png
share/psi/iconsets/roster/gadugadu/away.png
share/psi/iconsets/roster/gadugadu/icondef.xml
share/psi/iconsets/roster/gadugadu/invisible.png
share/psi/iconsets/roster/gadugadu/offline.png
share/psi/iconsets/roster/gadugadu/online.png
share/psi/iconsets/roster/icq/away.png
share/psi/iconsets/roster/icq/chat.png
share/psi/iconsets/roster/icq/dnd.png
share/psi/iconsets/roster/icq/icondef.xml
share/psi/iconsets/roster/icq/invisible.png
share/psi/iconsets/roster/icq/offline.png
share/psi/iconsets/roster/icq/online.png
share/psi/iconsets/roster/icq/xa.png
share/psi/iconsets/roster/lightbulb/away.png
share/psi/iconsets/roster/lightbulb/chat.png
share/psi/iconsets/roster/lightbulb/dnd.png
share/psi/iconsets/roster/lightbulb/ffc.png
share/psi/iconsets/roster/lightbulb/groupclose.png
share/psi/iconsets/roster/lightbulb/groupempty.png
share/psi/iconsets/roster/lightbulb/groupopen.png
share/psi/iconsets/roster/lightbulb/icondef.xml
share/psi/iconsets/roster/lightbulb/invisible.png
share/psi/iconsets/roster/lightbulb/message.png
share/psi/iconsets/roster/lightbulb/offline.png
share/psi/iconsets/roster/lightbulb/online.png
share/psi/iconsets/roster/lightbulb/system.png
share/psi/iconsets/roster/lightbulb/xa.png
share/psi/iconsets/roster/msn/away.png
share/psi/iconsets/roster/msn/dnd.png
share/psi/iconsets/roster/msn/icondef.xml
share/psi/iconsets/roster/msn/offline.png
share/psi/iconsets/roster/msn/online.png
share/psi/iconsets/roster/sms/away.png
share/psi/iconsets/roster/sms/dnd.png
share/psi/iconsets/roster/sms/icondef.xml
share/psi/iconsets/roster/sms/offline.png
share/psi/iconsets/roster/sms/online.png
share/psi/iconsets/roster/sms/xa.png
share/psi/iconsets/roster/stellar-icq/ask.png
share/psi/iconsets/roster/stellar-icq/away.png
share/psi/iconsets/roster/stellar-icq/dnd.png
share/psi/iconsets/roster/stellar-icq/ffc.png
share/psi/iconsets/roster/stellar-icq/icondef.xml
share/psi/iconsets/roster/stellar-icq/invisible.png
share/psi/iconsets/roster/stellar-icq/noauth.png
share/psi/iconsets/roster/stellar-icq/offline.png
share/psi/iconsets/roster/stellar-icq/online.png
share/psi/iconsets/roster/stellar-icq/xa.png
share/psi/iconsets/roster/transport/away.png
share/psi/iconsets/roster/transport/dnd.png
share/psi/iconsets/roster/transport/icondef.xml
share/psi/iconsets/roster/transport/offline.png
share/psi/iconsets/roster/transport/online.png
share/psi/iconsets/roster/transport/xa.png
share/psi/iconsets/roster/yahoo/away.png
share/psi/iconsets/roster/yahoo/dnd.png
share/psi/iconsets/roster/yahoo/icondef.xml
share/psi/iconsets/roster/yahoo/offline.png
share/psi/iconsets/roster/yahoo/online.png
share/psi/iconsets/roster/yahoo/xa.png
share/psi/iconsets/system/README
share/psi/iconsets/system/default/account.png
share/psi/iconsets/system/default/add.png
share/psi/iconsets/system/default/arrow_down.png
share/psi/iconsets/system/default/arrow_left.png
share/psi/iconsets/system/default/arrow_right.png
share/psi/iconsets/system/default/arrow_up.png
share/psi/iconsets/system/default/browse.png
share/psi/iconsets/system/default/cancel.png
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/edit.png
share/psi/iconsets/system/default/editclear.png
share/psi/iconsets/system/default/editcopy.png
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/groupchat.png
share/psi/iconsets/system/default/help.png
share/psi/iconsets/system/default/history.png
share/psi/iconsets/system/default/icon_16.png
share/psi/iconsets/system/default/icon_32.png
share/psi/iconsets/system/default/icon_48.png
share/psi/iconsets/system/default/icon_mac.png
share/psi/iconsets/system/default/icondef.xml
share/psi/iconsets/system/default/info.png
share/psi/iconsets/system/default/jabber.png
share/psi/iconsets/system/default/key.png
share/psi/iconsets/system/default/key2.png
share/psi/iconsets/system/default/key_bad.png
share/psi/iconsets/system/default/key_unknown.png
share/psi/iconsets/system/default/ok.png
share/psi/iconsets/system/default/options.png
share/psi/iconsets/system/default/pgp.png
share/psi/iconsets/system/default/play.png
share/psi/iconsets/system/default/play_sounds.png
share/psi/iconsets/system/default/psilogo.png
share/psi/iconsets/system/default/psimain.png
share/psi/iconsets/system/default/quit.png
share/psi/iconsets/system/default/register.png
share/psi/iconsets/system/default/reload.png
share/psi/iconsets/system/default/remove.png
share/psi/iconsets/system/default/search.png
share/psi/iconsets/system/default/send.png
share/psi/iconsets/system/default/smile.png
share/psi/iconsets/system/default/ssl_no.png
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/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/offline.wav
share/psi/sound/online.wav
share/psi/sound/send.wav
@dirrm share/psi/sound
@dirrm share/psi/image
@dirrm share/psi/iconsets/stellar
@dirrm share/psi/iconsets/lightbulb
@dirrm share/psi/iconsets/system/default
@dirrm share/psi/iconsets/system
@dirrm share/psi/iconsets/roster/yahoo
@dirrm share/psi/iconsets/roster/transport
@dirrm share/psi/iconsets/roster/stellar-icq
@dirrm share/psi/iconsets/roster/sms
@dirrm share/psi/iconsets/roster/msn
@dirrm share/psi/iconsets/roster/lightbulb
@dirrm share/psi/iconsets/roster/icq
@dirrm share/psi/iconsets/roster/gadugadu
@dirrm share/psi/iconsets/roster/default
@dirrm share/psi/iconsets/roster/aim
@dirrm share/psi/iconsets/roster
@dirrm share/psi/iconsets/emoticons/default
@dirrm share/psi/iconsets/emoticons
@dirrm share/psi/iconsets
@dirrm share/psi/certs
@dirrm share/psi

View file

@ -6,8 +6,7 @@
#
PORTNAME= psi
PORTVERSION= 0.9
PORTREVISION= 1
PORTVERSION= 0.9.1
CATEGORIES= net
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
@ -15,15 +14,15 @@ MASTER_SITE_SUBDIR= ${PORTNAME}
MAINTAINER= jonc@chen.org.nz
COMMENT= A Qt-based Jabber client
LIB_DEPENDS+= qssl.1:${PORTSDIR}/devel/qssl
HAS_CONFIGURE= yes
USE_X_PREFIX= yes
USE_BZIP2= yes
USE_GMAKE= yes
USE_QT_VER= 3
CONFIGURE_ENV= QTDIR=${X11BASE} \
QMAKESPEC=${LOCALBASE}/share/qt/mkspecs/freebsd-g++
CONFIGURE_ARGS= -p ${PREFIX}
MAKE_ARGS+= QTDIR=${X11BASE}
CONFIGURE_ARGS= --prefix=${PREFIX}
MAKE_ARGS+= QTDIR=${X11BASE} \
QMAKESPEC=${LOCALBASE}/share/qt/mkspecs/freebsd-g++
.include <bsd.port.mk>

View file

@ -1 +1 @@
MD5 (psi-0.9.tar.bz2) = bf3aaa7fa8a1efdff9f96fa718366aa8
MD5 (psi-0.9.1.tar.bz2) = 7057b61518e1b1ebd732a95c265a3b76

View file

@ -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;
}

View file

@ -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

View file

@ -4,4 +4,4 @@ flavors of unix/X11), Microsoft Windows, and Apple MacOS X.
It does not require KDE to run.
WWW: http://psi.sourceforge.net/
WWW: http://psi.affinix.com/

View file

@ -3,152 +3,208 @@ share/psi/COPYING
share/psi/README
share/psi/certs/README
share/psi/certs/rootcert.xml
share/psi/iconsets/lightbulb/away.png
share/psi/iconsets/lightbulb/chat.png
share/psi/iconsets/lightbulb/desc
share/psi/iconsets/lightbulb/dnd.png
share/psi/iconsets/lightbulb/groupclose.png
share/psi/iconsets/lightbulb/groupempty.png
share/psi/iconsets/lightbulb/groupopen.png
share/psi/iconsets/lightbulb/message.png
share/psi/iconsets/lightbulb/offline.png
share/psi/iconsets/lightbulb/online.png
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
share/psi/iconsets/stellar/chat.png
share/psi/iconsets/stellar/chatclear.png
share/psi/iconsets/stellar/connect.png
share/psi/iconsets/stellar/desc
share/psi/iconsets/stellar/dnd.png
share/psi/iconsets/stellar/emoticon_angry.png
share/psi/iconsets/stellar/emoticon_bat.png
share/psi/iconsets/stellar/emoticon_beer.png
share/psi/iconsets/stellar/emoticon_biggrin.png
share/psi/iconsets/stellar/emoticon_blush.png
share/psi/iconsets/stellar/emoticon_boy.png
share/psi/iconsets/stellar/emoticon_brflower.png
share/psi/iconsets/stellar/emoticon_brheart.png
share/psi/iconsets/stellar/emoticon_coffee.png
share/psi/iconsets/stellar/emoticon_coolglasses.png
share/psi/iconsets/stellar/emoticon_cry.png
share/psi/iconsets/stellar/emoticon_cuffs.png
share/psi/iconsets/stellar/emoticon_devil.png
share/psi/iconsets/stellar/emoticon_drink.png
share/psi/iconsets/stellar/emoticon_flower.png
share/psi/iconsets/stellar/emoticon_frowning.png
share/psi/iconsets/stellar/emoticon_girl.png
share/psi/iconsets/stellar/emoticon_heart.png
share/psi/iconsets/stellar/emoticon_hugleft.png
share/psi/iconsets/stellar/emoticon_hugright.png
share/psi/iconsets/stellar/emoticon_kiss.png
share/psi/iconsets/stellar/emoticon_lamp.png
share/psi/iconsets/stellar/emoticon_mail.png
share/psi/iconsets/stellar/emoticon_music.png
share/psi/iconsets/stellar/emoticon_no.png
share/psi/iconsets/stellar/emoticon_oh.png
share/psi/iconsets/stellar/emoticon_phone.png
share/psi/iconsets/stellar/emoticon_photo.png
share/psi/iconsets/stellar/emoticon_pussy.png
share/psi/iconsets/stellar/emoticon_rainbow.png
share/psi/iconsets/stellar/emoticon_smile.png
share/psi/iconsets/stellar/emoticon_star.png
share/psi/iconsets/stellar/emoticon_stare.png
share/psi/iconsets/stellar/emoticon_tongue.png
share/psi/iconsets/stellar/emoticon_unhappy.png
share/psi/iconsets/stellar/emoticon_wink.png
share/psi/iconsets/stellar/emoticon_yes.png
share/psi/iconsets/stellar/groupchat.png
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
share/psi/image/icon_mac.png
share/psi/image/icq_away.png
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
share/psi/image/msn_online.png
share/psi/image/msn_xa.png
share/psi/image/psilogo.png
share/psi/image/smile.png
share/psi/image/trans_away.png
share/psi/image/trans_dnd.png
share/psi/image/trans_offline.png
share/psi/image/trans_online.png
share/psi/image/trans_xa.png
share/psi/image/yahoo_away.png
share/psi/image/yahoo_dnd.png
share/psi/image/yahoo_offline.png
share/psi/image/yahoo_online.png
share/psi/image/yahoo_xa.png
share/psi/iconsets/emoticons/README
share/psi/iconsets/emoticons/default/angry.png
share/psi/iconsets/emoticons/default/bat.png
share/psi/iconsets/emoticons/default/beer.png
share/psi/iconsets/emoticons/default/biggrin.png
share/psi/iconsets/emoticons/default/blush.png
share/psi/iconsets/emoticons/default/boy.png
share/psi/iconsets/emoticons/default/brflower.png
share/psi/iconsets/emoticons/default/brheart.png
share/psi/iconsets/emoticons/default/coffee.png
share/psi/iconsets/emoticons/default/coolglasses.png
share/psi/iconsets/emoticons/default/cry.png
share/psi/iconsets/emoticons/default/cuffs.png
share/psi/iconsets/emoticons/default/devil.png
share/psi/iconsets/emoticons/default/drink.png
share/psi/iconsets/emoticons/default/flower.png
share/psi/iconsets/emoticons/default/frowning.png
share/psi/iconsets/emoticons/default/girl.png
share/psi/iconsets/emoticons/default/heart.png
share/psi/iconsets/emoticons/default/hugleft.png
share/psi/iconsets/emoticons/default/hugright.png
share/psi/iconsets/emoticons/default/icondef.xml
share/psi/iconsets/emoticons/default/kiss.png
share/psi/iconsets/emoticons/default/lamp.png
share/psi/iconsets/emoticons/default/mail.png
share/psi/iconsets/emoticons/default/music.png
share/psi/iconsets/emoticons/default/no.png
share/psi/iconsets/emoticons/default/oh.png
share/psi/iconsets/emoticons/default/phone.png
share/psi/iconsets/emoticons/default/photo.png
share/psi/iconsets/emoticons/default/pussy.png
share/psi/iconsets/emoticons/default/rainbow.png
share/psi/iconsets/emoticons/default/smile.png
share/psi/iconsets/emoticons/default/star.png
share/psi/iconsets/emoticons/default/stare.png
share/psi/iconsets/emoticons/default/tongue.png
share/psi/iconsets/emoticons/default/unhappy.png
share/psi/iconsets/emoticons/default/wink.png
share/psi/iconsets/emoticons/default/yes.png
share/psi/iconsets/roster/README
share/psi/iconsets/roster/aim/away.png
share/psi/iconsets/roster/aim/dnd.png
share/psi/iconsets/roster/aim/icondef.xml
share/psi/iconsets/roster/aim/offline.png
share/psi/iconsets/roster/aim/online.png
share/psi/iconsets/roster/aim/xa.png
share/psi/iconsets/roster/default/ask.png
share/psi/iconsets/roster/default/away.png
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/groupclose.png
share/psi/iconsets/roster/default/groupempty.png
share/psi/iconsets/roster/default/groupopen.png
share/psi/iconsets/roster/default/headline.png
share/psi/iconsets/roster/default/icondef.xml
share/psi/iconsets/roster/default/invisible.png
share/psi/iconsets/roster/default/message.png
share/psi/iconsets/roster/default/noauth.png
share/psi/iconsets/roster/default/offline.png
share/psi/iconsets/roster/default/online.png
share/psi/iconsets/roster/default/perr.png
share/psi/iconsets/roster/default/system.png
share/psi/iconsets/roster/default/xa.png
share/psi/iconsets/roster/gadugadu/away.png
share/psi/iconsets/roster/gadugadu/icondef.xml
share/psi/iconsets/roster/gadugadu/invisible.png
share/psi/iconsets/roster/gadugadu/offline.png
share/psi/iconsets/roster/gadugadu/online.png
share/psi/iconsets/roster/icq/away.png
share/psi/iconsets/roster/icq/chat.png
share/psi/iconsets/roster/icq/dnd.png
share/psi/iconsets/roster/icq/icondef.xml
share/psi/iconsets/roster/icq/invisible.png
share/psi/iconsets/roster/icq/offline.png
share/psi/iconsets/roster/icq/online.png
share/psi/iconsets/roster/icq/xa.png
share/psi/iconsets/roster/lightbulb/away.png
share/psi/iconsets/roster/lightbulb/chat.png
share/psi/iconsets/roster/lightbulb/dnd.png
share/psi/iconsets/roster/lightbulb/ffc.png
share/psi/iconsets/roster/lightbulb/groupclose.png
share/psi/iconsets/roster/lightbulb/groupempty.png
share/psi/iconsets/roster/lightbulb/groupopen.png
share/psi/iconsets/roster/lightbulb/icondef.xml
share/psi/iconsets/roster/lightbulb/invisible.png
share/psi/iconsets/roster/lightbulb/message.png
share/psi/iconsets/roster/lightbulb/offline.png
share/psi/iconsets/roster/lightbulb/online.png
share/psi/iconsets/roster/lightbulb/system.png
share/psi/iconsets/roster/lightbulb/xa.png
share/psi/iconsets/roster/msn/away.png
share/psi/iconsets/roster/msn/dnd.png
share/psi/iconsets/roster/msn/icondef.xml
share/psi/iconsets/roster/msn/offline.png
share/psi/iconsets/roster/msn/online.png
share/psi/iconsets/roster/sms/away.png
share/psi/iconsets/roster/sms/dnd.png
share/psi/iconsets/roster/sms/icondef.xml
share/psi/iconsets/roster/sms/offline.png
share/psi/iconsets/roster/sms/online.png
share/psi/iconsets/roster/sms/xa.png
share/psi/iconsets/roster/stellar-icq/ask.png
share/psi/iconsets/roster/stellar-icq/away.png
share/psi/iconsets/roster/stellar-icq/dnd.png
share/psi/iconsets/roster/stellar-icq/ffc.png
share/psi/iconsets/roster/stellar-icq/icondef.xml
share/psi/iconsets/roster/stellar-icq/invisible.png
share/psi/iconsets/roster/stellar-icq/noauth.png
share/psi/iconsets/roster/stellar-icq/offline.png
share/psi/iconsets/roster/stellar-icq/online.png
share/psi/iconsets/roster/stellar-icq/xa.png
share/psi/iconsets/roster/transport/away.png
share/psi/iconsets/roster/transport/dnd.png
share/psi/iconsets/roster/transport/icondef.xml
share/psi/iconsets/roster/transport/offline.png
share/psi/iconsets/roster/transport/online.png
share/psi/iconsets/roster/transport/xa.png
share/psi/iconsets/roster/yahoo/away.png
share/psi/iconsets/roster/yahoo/dnd.png
share/psi/iconsets/roster/yahoo/icondef.xml
share/psi/iconsets/roster/yahoo/offline.png
share/psi/iconsets/roster/yahoo/online.png
share/psi/iconsets/roster/yahoo/xa.png
share/psi/iconsets/system/README
share/psi/iconsets/system/default/account.png
share/psi/iconsets/system/default/add.png
share/psi/iconsets/system/default/arrow_down.png
share/psi/iconsets/system/default/arrow_left.png
share/psi/iconsets/system/default/arrow_right.png
share/psi/iconsets/system/default/arrow_up.png
share/psi/iconsets/system/default/browse.png
share/psi/iconsets/system/default/cancel.png
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/edit.png
share/psi/iconsets/system/default/editclear.png
share/psi/iconsets/system/default/editcopy.png
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/groupchat.png
share/psi/iconsets/system/default/help.png
share/psi/iconsets/system/default/history.png
share/psi/iconsets/system/default/icon_16.png
share/psi/iconsets/system/default/icon_32.png
share/psi/iconsets/system/default/icon_48.png
share/psi/iconsets/system/default/icon_mac.png
share/psi/iconsets/system/default/icondef.xml
share/psi/iconsets/system/default/info.png
share/psi/iconsets/system/default/jabber.png
share/psi/iconsets/system/default/key.png
share/psi/iconsets/system/default/key2.png
share/psi/iconsets/system/default/key_bad.png
share/psi/iconsets/system/default/key_unknown.png
share/psi/iconsets/system/default/ok.png
share/psi/iconsets/system/default/options.png
share/psi/iconsets/system/default/pgp.png
share/psi/iconsets/system/default/play.png
share/psi/iconsets/system/default/play_sounds.png
share/psi/iconsets/system/default/psilogo.png
share/psi/iconsets/system/default/psimain.png
share/psi/iconsets/system/default/quit.png
share/psi/iconsets/system/default/register.png
share/psi/iconsets/system/default/reload.png
share/psi/iconsets/system/default/remove.png
share/psi/iconsets/system/default/search.png
share/psi/iconsets/system/default/send.png
share/psi/iconsets/system/default/smile.png
share/psi/iconsets/system/default/ssl_no.png
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/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/offline.wav
share/psi/sound/online.wav
share/psi/sound/send.wav
@dirrm share/psi/sound
@dirrm share/psi/image
@dirrm share/psi/iconsets/stellar
@dirrm share/psi/iconsets/lightbulb
@dirrm share/psi/iconsets/system/default
@dirrm share/psi/iconsets/system
@dirrm share/psi/iconsets/roster/yahoo
@dirrm share/psi/iconsets/roster/transport
@dirrm share/psi/iconsets/roster/stellar-icq
@dirrm share/psi/iconsets/roster/sms
@dirrm share/psi/iconsets/roster/msn
@dirrm share/psi/iconsets/roster/lightbulb
@dirrm share/psi/iconsets/roster/icq
@dirrm share/psi/iconsets/roster/gadugadu
@dirrm share/psi/iconsets/roster/default
@dirrm share/psi/iconsets/roster/aim
@dirrm share/psi/iconsets/roster
@dirrm share/psi/iconsets/emoticons/default
@dirrm share/psi/iconsets/emoticons
@dirrm share/psi/iconsets
@dirrm share/psi/certs
@dirrm share/psi