Date: Sun, 28 Dec 2003 04:11:49 +0100 (CET) From: Eugene Ossintsev <eugos@gmx.net> To: FreeBSD-gnats-submit@FreeBSD.org Cc: jonc@chen.org.nz Subject: ports/60644: net/psi: unbreak port and fix support of gpg 1.2.3 (supersedes ports/59426) Message-ID: <20031228031149.27E81272@badger.home> Resent-Message-ID: <200312280310.hBS3AIfZ018498@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 60644 >Category: ports >Synopsis: net/psi: unbreak port and fix support of gpg 1.2.3 (supersedes ports/59426) >Confidential: no >Severity: serious >Priority: medium >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Sat Dec 27 19:10:18 PST 2003 >Closed-Date: >Last-Modified: >Originator: Eugene Ossintsev >Release: FreeBSD 4.9-STABLE i386 >Organization: >Environment: System: FreeBSD badger.home 4.9-STABLE FreeBSD 4.9-STABLE #2: Thu Dec 25 18:47:13 CET 2003 root@badger.home:/usr/obj/usr/src/sys/BADGER i386 >Description: Unbreak the port for the new x11-toolkits/qt32 (see Makefile of x11-toolkits/qt32 for details), fix a bashism in the psi's configure and incorporate the patch from ports/59426. >How-To-Repeat: >Fix: diff -ruN psi.orig/Makefile psi/Makefile --- psi.orig/Makefile Fri Jul 25 20:11:55 2003 +++ psi/Makefile Fri Dec 26 18:44:38 2003 @@ -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_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 -ruN psi.orig/files/patch-aa psi/files/patch-aa --- psi.orig/files/patch-aa Thu Jan 1 01:00:00 1970 +++ psi/files/patch-aa Sun Dec 28 03:20:29 2003 @@ -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 -ruN psi.orig/files/patch-configure psi/files/patch-configure --- psi.orig/files/patch-configure Sun Jun 29 13:44:32 2003 +++ psi/files/patch-configure Fri Dec 26 18:39:14 2003 @@ -1,9 +1,9 @@ $FreeBSD: ports/net/psi/files/patch-configure,v 1.2 2003/06/26 09:10:32 daichi Exp $ -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 @@ *) 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 >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20031228031149.27E81272>