diff options
| author | Kirill Ponomarev <krion@FreeBSD.org> | 2003-12-29 22:26:55 +0000 |
|---|---|---|
| committer | Kirill Ponomarev <krion@FreeBSD.org> | 2003-12-29 22:26:55 +0000 |
| commit | 1bab6385f4e5c12f807ab5b8e98c5b5a2c209be0 (patch) | |
| tree | 3ace3a4ca9de62ad91ade13e25d4a8878ea9c9e9 /net-im | |
| parent | As documented at (diff) | |
- Fix build with x11-toolkits/qt32
- Fix support for gpg
- Fix bashism in configure
PR: 60644
Submitted by: Eugene Ossintsev <eugos@gmx.net>
Approved by: maintainer
Notes
Notes:
svn path=/head/; revision=96914
Diffstat (limited to 'net-im')
| -rw-r--r-- | net-im/psi/Makefile | 3 | ||||
| -rw-r--r-- | net-im/psi/files/patch-aa | 58 | ||||
| -rw-r--r-- | net-im/psi/files/patch-configure | 18 |
3 files changed, 75 insertions, 4 deletions
diff --git a/net-im/psi/Makefile b/net-im/psi/Makefile index 6217dff15f0c..7f2038834547 100644 --- a/net-im/psi/Makefile +++ b/net-im/psi/Makefile @@ -7,6 +7,7 @@ PORTNAME= psi PORTVERSION= 0.9 +PORTREVISION= 1 CATEGORIES= net MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ${PORTNAME} @@ -21,7 +22,7 @@ USE_X_PREFIX= yes USE_BZIP2= yes USE_QT_VER= 3 CONFIGURE_ENV= QTDIR=${X11BASE} \ - QMAKESPEC=${QT_PREFIX}/share/qt/mkspecs/freebsd-g++ + QMAKESPEC=${LOCALBASE}/share/qt/mkspecs/freebsd-g++ CONFIGURE_ARGS= -p ${PREFIX} MAKE_ARGS+= QTDIR=${X11BASE} diff --git a/net-im/psi/files/patch-aa b/net-im/psi/files/patch-aa new file mode 100644 index 000000000000..930d9fdaaa53 --- /dev/null +++ b/net-im/psi/files/patch-aa @@ -0,0 +1,58 @@ +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-im/psi/files/patch-configure b/net-im/psi/files/patch-configure index 1e04067aa8d2..d0a064d05849 100644 --- a/net-im/psi/files/patch-configure +++ b/net-im/psi/files/patch-configure @@ -1,9 +1,9 @@ $FreeBSD$ -Hack configure to eat autogenerated qt options. +Hack configure to eat autogenerated qt options and to fix a bashism (type -p). ---- configure.orig Wed Jun 11 06:12:49 2003 -+++ configure Mon Jun 23 09:46:58 2003 +--- configure.orig Tue Jun 10 20:12:49 2003 ++++ configure Tue Dec 23 11:40:49 2003 @@ -86,6 +86,8 @@ ;; @@ -13,3 +13,15 @@ Hack configure to eat autogenerated qt options. *) 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 +- qm=`type -p qmake` ++ qm=`which qmake` + if [ -x "$qm" ]; then + echo qmake found in $qm + else |