Here is my attempt at bringing net/psi more up-to-date. I know release candidates are not usually considered for inclusion, and the port probably needs a bit polishing, but I wanted to get it out into the open for people to look at and comment.
A couple comments: - it needs qca2, which doesn't coexist well at build time with qca1 (and vice versa), thus any newer version can't be included in bulk builds untill this is solved - you need to install qca-ossl (port attached), a qca2 plugin for SSL support for psi to talk over SSL/TLS with the server - you need to install qca-gnupg (port attached), a qca2 plugin for GnuPG support if you want to use GnuPG encryption for your conversations - I didn't manage to convince those plugins to have a library version - the desktop file is there, put Psi in my xfce menu, but it doesn't have an icon, I didn't look into that yet - patches/patch-src_psioptions_cpp added for Psi to compile with something as old as GCC 3.3.5, given to me from someone involved with psi as an "ugly hack" that works, but is not nearly nice enough to be included upstream Lightly tested on i386, seems to work for me. -- viq
Index: Makefile =================================================================== RCS file: /cvs/ports/net/psi/Makefile,v retrieving revision 1.9 diff -u -d -r1.9 Makefile --- Makefile 8 Aug 2007 05:51:51 -0000 1.9 +++ Makefile 20 Jul 2008 19:52:22 -0000 @@ -2,7 +2,7 @@ COMMENT= multiplatform Jabber client -DISTNAME= psi-0.10 +DISTNAME= psi-0.12-RC4 CATEGORIES= net HOMEPAGE= http://psi-im.org/ @@ -15,71 +15,39 @@ PERMIT_PACKAGE_FTP= Yes PERMIT_DISTFILES_CDROM= Yes PERMIT_DISTFILES_FTP= Yes -WANTLIB= X11 Xss m c z Xext pthread stdc++ -MODULES= x11/qt3 +WANTLIB += ICE SM X11 Xcursor Xext Xfixes Xi Xinerama Xrandr Xrender +WANTLIB += Xss c crypto dbus-1 fontconfig freetype glib-2.0 gthread-2.0 +WANTLIB += iconv intl m png pthread ssl stdc++ z + + +MODULES= x11/qt4 MODQT_OVERRIDE_UIC= No MODQT_MT= Yes +USE_BZIP2= Yes USE_X11= Yes USE_GMAKE= Yes -LIB_DEPENDS= qca.>=1::security/qca -RUN_DEPENDS= ::security/qca-tls +LIB_DEPENDS= qca.>=3::security/qca2 \ + aspell::textproc/aspell/core CONFIGURE_STYLE= simple CONFIGURE_ARGS+= --qtdir=${MODQT_QTDIR} \ - --with-qca-inc=${LOCALBASE}/include \ - --with-qca-lib=${LOCALBASE}/lib \ - --disable-growl \ - --disable-dnotify \ - --disable-ghbnr + --disable-bundled-qca \ + --disable-growl CONFIGURE_ENV+= LOCALBASE=${LOCALBASE} \ KDEDIR=${LOCALBASE} +MAKE_ENV+= INCLUDEPATH+=${LOCALBASE}/include/QtCrypto + +FAKE_FLAGS+= INSTALL_ROOT=${DESTDIR} # For QSettings to write its setup PORTHOME= ${WRKDIST} NO_REGRESS= Yes - -pre-configure: - @perl -pi -e "[EMAIL PROTECTED]@${X11BASE}@" ${WRKSRC}/configure - -# compilation breaks if /usr/local/include/socks.h (from security/dante) is -# found before psi's own socks.h, so add a workaround. -pre-build: - @perl -pi -e 's,INCLUDEPATH.*,,' ${WRKSRC}/conf.pri - -do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/src/psi ${PREFIX}/bin - ${INSTALL_DATA_DIR} ${PREFIX}/share/psi - ${INSTALL_DATA} ${WRKSRC}/COPYING ${PREFIX}/share/psi - ${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/psi - cp -R ${WRKSRC}/iconsets ${PREFIX}/share/psi - cp -R ${WRKSRC}/sound ${PREFIX}/share/psi - cp -R ${WRKSRC}/certs ${PREFIX}/share/psi - cp -R ${WRKSRC}/certs ${PREFIX}/share/psi - ${INSTALL_DATA} ${WRKSRC}/libpsi/psiwidgets/libpsiwidgets.so \ - ${PREFIX}/share/psi - - # Icons for KDE - ${INSTALL_DATA_DIR} ${PREFIX}/share/applnk/Internet - ${INSTALL_DATA} ${WRKSRC}/psi.desktop \ - ${PREFIX}/share/applnk/Internet/ - - ${INSTALL_DATA_DIR} ${PREFIX}/share/icons/hicolor/16x16/apps - ${INSTALL_DATA} ${WRKSRC}/iconsets/system/default/icon_16.png \ - ${PREFIX}/share/icons/hicolor/16x16/apps/psi.png - - ${INSTALL_DATA_DIR} ${PREFIX}/share/icons/hicolor/32x32/apps - ${INSTALL_DATA} ${WRKSRC}/iconsets/system/default/icon_32.png \ - ${PREFIX}/share/icons/hicolor/32x32/apps/psi.png - - ${INSTALL_DATA_DIR} ${PREFIX}/share/icons/hicolor/48x48/apps - ${INSTALL_DATA} ${WRKSRC}/iconsets/system/default/icon_48.png \ - ${PREFIX}/share/icons/hicolor/48x48/apps/psi.png .include <bsd.port.mk> Index: distinfo =================================================================== RCS file: /cvs/ports/net/psi/distinfo,v retrieving revision 1.5 diff -u -d -r1.5 distinfo --- distinfo 8 Aug 2007 05:51:51 -0000 1.5 +++ distinfo 20 Jul 2008 19:52:22 -0000 @@ -1,6 +1,5 @@ -MD5 (psi-0.10.tar.bz2) = f0fd4ccf077f7b24e236f71c22649b7b -RMD160 (psi-0.10.tar.bz2) = b8be1490cd02f61cf86f09f2dc9f29716ea4c186 -SHA1 (psi-0.10.tar.bz2) = f1687f8b93338f47cb1c8fa363e4b4f58628f167 -SHA256 (psi-0.10.tar.bz2) = e10a88586f8d7f29535510cf3a3857dc8ff2792e64db4207d62a935890a60ca1 -SIZE (psi-0.10.tar.bz2) = 1430929 -SIZE (psi-0.9.3.tar.bz2) = 1423322 +MD5 (psi-0.12-RC4.tar.bz2) = fRJyizDfhscil9ip/Ir+qA== +RMD160 (psi-0.12-RC4.tar.bz2) = siFLrGhz4bmrGSx3//YpbowmCbE= +SHA1 (psi-0.12-RC4.tar.bz2) = zms43jCmX7K9g8E2eKfjZCSiYBc= +SHA256 (psi-0.12-RC4.tar.bz2) = ZwyWGrXFGm/h4z6gBE+avaRfQi8QBlQ0dGpuh+w+0H4= +SIZE (psi-0.12-RC4.tar.bz2) = 2142463 Index: patches/patch-configure =================================================================== RCS file: /cvs/ports/net/psi/patches/patch-configure,v retrieving revision 1.5 diff -u -d -r1.5 patch-configure --- patches/patch-configure 8 Aug 2007 05:51:51 -0000 1.5 +++ patches/patch-configure 20 Jul 2008 19:52:22 -0000 @@ -1,12 +1,27 @@ -$OpenBSD: patch-configure,v 1.5 2007/08/08 05:51:51 steven Exp $ ---- configure.orig Sat Jan 7 22:19:01 2006 -+++ configure Thu Mar 22 23:09:35 2007 -@@ -360,7 +360,7 @@ class qc_qca : public ConfObj (public) +$OpenBSD$ +--- configure.orig Sat May 31 19:20:17 2008 ++++ configure Wed Jul 16 19:59:23 2008 +@@ -497,10 +497,11 @@ class qc_qca : public ConfObj (public) - s = conf->getenv("QC_WITH_QCA_LIB"); - if(!s.isEmpty()) { -- if(!conf->checkLibrary(s, "qca")) -+ if(!conf->checkLibrary(s, "qca -lpthread -lstdc++ -L/usr/X11R6/lib")) - return false; - lib = s; - } + QString proextra = + "CONFIG += qt crypto\n" ++ "INCLUDEPATH += ${LOCALBASE}/include/QtCrypto\n" + "QT -= gui\n"; + + QString str = +- "#include <QtCrypto>\n" ++ "#include <QtCrypto/QtCrypto>\n" + "\n" + "int main()\n" + "{\n" +@@ -2106,8 +2107,9 @@ int main() + str += "DEFINES += " + conf->DEFINES + '\n'; + if(!conf->INCLUDEPATH.isEmpty()) + str += "INCLUDEPATH += " + conf->INCLUDEPATH + '\n'; ++ str += "INCLUDEPATH += " + conf->INCLUDEPATH + "/QtCrypto" + '\n'; + if(!conf->LIBS.isEmpty()) +- str += "LIBS += " + conf->LIBS + '\n'; ++ str += "LIBS += " + conf->LIBS + " -lqca" + '\n'; + if(!conf->extra.isEmpty()) + str += conf->extra; + str += '\n'; Index: patches/patch-iris_libidn_rfc3454_c =================================================================== RCS file: /cvs/ports/net/psi/patches/patch-iris_libidn_rfc3454_c,v retrieving revision 1.1 diff -u -d -r1.1 patch-iris_libidn_rfc3454_c --- patches/patch-iris_libidn_rfc3454_c 29 Mar 2006 09:16:03 -0000 1.1 +++ patches/patch-iris_libidn_rfc3454_c 20 Jul 2008 19:52:22 -0000 @@ -1,9 +1,9 @@ -$OpenBSD: patch-iris_libidn_rfc3454_c,v 1.1 2006/03/29 09:16:03 bernd Exp $ ---- iris/libidn/rfc3454.c.orig Wed Mar 22 11:28:27 2006 -+++ iris/libidn/rfc3454.c Wed Mar 22 11:28:27 2006 +$OpenBSD$ +--- iris/libidn/rfc3454.c.orig Mon Apr 21 21:31:33 2008 ++++ iris/libidn/rfc3454.c Mon Apr 21 21:32:03 2008 @@ -1,4 +1,4 @@ --#include <stringprep.h> -+#include "stringprep.h" +-#include <libidn/stringprep.h> ++#include "../libidn/stringprep.h" /* * A.1 Unassigned code points in Unicode 3.2 Index: patches/patch-iris_xmpp-core_jid_cpp =================================================================== RCS file: /cvs/ports/net/psi/patches/patch-iris_xmpp-core_jid_cpp,v retrieving revision 1.4 diff -u -d -r1.4 patch-iris_xmpp-core_jid_cpp --- patches/patch-iris_xmpp-core_jid_cpp 8 Aug 2007 05:51:51 -0000 1.4 +++ patches/patch-iris_xmpp-core_jid_cpp 20 Jul 2008 19:52:22 -0000 @@ -1,12 +1,12 @@ -$OpenBSD: patch-iris_xmpp-core_jid_cpp,v 1.4 2007/08/08 05:51:51 steven Exp $ ---- iris/xmpp-core/jid.cpp.orig Thu Mar 22 23:26:30 2007 -+++ iris/xmpp-core/jid.cpp Thu Mar 22 23:25:26 2007 -@@ -21,7 +21,7 @@ - #include"xmpp.h" +$OpenBSD$ +--- iris/xmpp-core/jid.cpp.orig Mon Apr 21 21:32:37 2008 ++++ iris/xmpp-core/jid.cpp Mon Apr 21 21:33:15 2008 +@@ -23,7 +23,7 @@ + #include <QApplication> + #include <QByteArray> + #include <QHash> +-#include <libidn/stringprep.h> ++#include "../libidn/stringprep.h" - #include<qdict.h> --#include<stringprep.h> -+#include"../libidn/stringprep.h" using namespace XMPP; - Index: patches/patch-src_psioptions_cpp =================================================================== RCS file: patches/patch-src_psioptions_cpp diff -N patches/patch-src_psioptions_cpp --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ patches/patch-src_psioptions_cpp 20 Jul 2008 19:52:22 -0000 @@ -0,0 +1,80 @@ +$OpenBSD$ +--- src/psioptions.cpp.orig Thu Mar 20 22:53:03 2008 ++++ src/psioptions.cpp Sat Apr 26 11:53:17 2008 +@@ -141,46 +141,56 @@ bool PsiOptions::newProfile() + if (!load(":/options/newprofile.xml")) { + ok = false; + } +- StatusPreset(tr("Away from desk"), ++ StatusPreset x1(tr("Away from desk"), + tr("I am away from my desk. Leave a message."), + XMPP::Status::Away +- ).toOptions(this); +- StatusPreset(tr("Showering"), ++ ); ++ x1.toOptions(this); ++ StatusPreset x2(tr("Showering"), + tr("I'm in the shower. You'll have to wait for me to get out."), + XMPP::Status::Away +- ).toOptions(this); +- StatusPreset(tr("Eating"), ++ ); ++ x2.toOptions(this); ++ StatusPreset x3(tr("Eating"), + tr("Out eating. Mmmm.. food."), + XMPP::Status::Away +- ).toOptions(this); +- StatusPreset(tr("Sleep"), ++ ); ++ x3.toOptions(this); ++ StatusPreset x4(tr("Sleep"), + tr("Sleep is good. Zzzzz"), + XMPP::Status::DND +- ).toOptions(this); +- StatusPreset(tr("Work"), ++ ); ++ x4.toOptions(this); ++ StatusPreset x5(tr("Work"), + tr("Can't chat. Gotta work."), + XMPP::Status::DND +- ).toOptions(this); +- StatusPreset(tr("Air"), ++ ); ++ x5.toOptions(this); ++ StatusPreset x6(tr("Air"), + tr("Stepping out to get some fresh air."), + XMPP::Status::Away +- ).toOptions(this); +- StatusPreset(tr("Movie"), ++ ); ++ x6.toOptions(this); ++ StatusPreset x7(tr("Movie"), + tr("Out to a movie. Is that OK with you?"), + XMPP::Status::Away +- ).toOptions(this); +- StatusPreset(tr("Secret"), ++ ); ++ x7.toOptions(this); ++ StatusPreset x8(tr("Secret"), + tr("I'm not available right now and that's all you need to know."), + XMPP::Status::XA +- ).toOptions(this); +- StatusPreset(tr("Out for the night"), ++ ); ++ x8.toOptions(this); ++ StatusPreset x9(tr("Out for the night"), + tr("Out for the night."), + XMPP::Status::Away +- ).toOptions(this); +- StatusPreset(tr("Greece"), ++ ); ++ x9.toOptions(this); ++ StatusPreset x10(tr("Greece"), + tr("I have gone to a far away place. I will be back someday!"), + XMPP::Status::XA +- ).toOptions(this); ++ ); ++ x10.toOptions(this); + + { + ToolbarPrefs buttons; Index: pkg/PFRAG.shared =================================================================== RCS file: /cvs/ports/net/psi/pkg/PFRAG.shared,v retrieving revision 1.1.1.1 diff -u -d -r1.1.1.1 PFRAG.shared --- pkg/PFRAG.shared 19 May 2005 20:29:58 -0000 1.1.1.1 +++ pkg/PFRAG.shared 20 Jul 2008 19:52:22 -0000 @@ -1,2 +1 @@ @comment $OpenBSD: PFRAG.shared,v 1.1.1.1 2005/05/19 20:29:58 niallo Exp $ -share/psi/libpsiwidgets.so Index: pkg/PLIST =================================================================== RCS file: /cvs/ports/net/psi/pkg/PLIST,v retrieving revision 1.5 diff -u -d -r1.5 PLIST --- pkg/PLIST 8 Aug 2007 05:51:52 -0000 1.5 +++ pkg/PLIST 20 Jul 2008 19:52:22 -0000 @@ -1,11 +1,13 @@ @comment $OpenBSD: PLIST,v 1.5 2007/08/08 05:51:52 steven Exp $ %%SHARED%% -bin/psi -share/applnk/ -share/applnk/Internet/ -share/applnk/Internet/psi.desktop [EMAIL PROTECTED] bin/psi +share/applications/ +share/applications/psi.desktop share/icons/ share/icons/hicolor/ +share/icons/hicolor/128x128/ +share/icons/hicolor/128x128/apps/ +share/icons/hicolor/128x128/apps/psi.png share/icons/hicolor/16x16/ share/icons/hicolor/16x16/apps/ share/icons/hicolor/16x16/apps/psi.png @@ -15,15 +17,18 @@ share/icons/hicolor/48x48/ share/icons/hicolor/48x48/apps/ share/icons/hicolor/48x48/apps/psi.png +share/icons/hicolor/64x64/ +share/icons/hicolor/64x64/apps/ +share/icons/hicolor/64x64/apps/psi.png share/psi/ share/psi/COPYING share/psi/README share/psi/certs/ share/psi/certs/README -share/psi/certs/rootcert.xml +share/psi/certs/startcom_ca.crt +share/psi/certs/startcom_ca_new.crt share/psi/iconsets/ share/psi/iconsets/emoticons/ -share/psi/iconsets/emoticons/README share/psi/iconsets/emoticons/default/ share/psi/iconsets/emoticons/default/angry.png share/psi/iconsets/emoticons/default/bat.png @@ -76,24 +81,24 @@ share/psi/iconsets/roster/default/ 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/chat.fading.png +share/psi/iconsets/roster/default/chatty.png share/psi/iconsets/roster/default/dnd.png -share/psi/iconsets/roster/default/ffc.png -share/psi/iconsets/roster/default/file.png +share/psi/iconsets/roster/default/file.fading.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/message.fading.png share/psi/iconsets/roster/default/noauth.png share/psi/iconsets/roster/default/offline.png +share/psi/iconsets/roster/default/online.dimming.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/stellar-1.jisp share/psi/iconsets/system/ share/psi/iconsets/system/README share/psi/iconsets/system/default/ @@ -109,25 +114,10 @@ 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/clients/ -share/psi/iconsets/system/default/clients/aim.png -share/psi/iconsets/system/default/clients/exodus.png -share/psi/iconsets/system/default/clients/gabber.png -share/psi/iconsets/system/default/clients/gadu.png -share/psi/iconsets/system/default/clients/gaim.png -share/psi/iconsets/system/default/clients/gossip.png -share/psi/iconsets/system/default/clients/icq.png -share/psi/iconsets/system/default/clients/jajc.png -share/psi/iconsets/system/default/clients/kopete.png -share/psi/iconsets/system/default/clients/msn.png -share/psi/iconsets/system/default/clients/nitro.png -share/psi/iconsets/system/default/clients/pandion.png -share/psi/iconsets/system/default/clients/tkabber.png -share/psi/iconsets/system/default/clients/trillian.png -share/psi/iconsets/system/default/clients/unknown.png -share/psi/iconsets/system/default/clients/yahoo.png share/psi/iconsets/system/default/close.png share/psi/iconsets/system/default/closetab.png +share/psi/iconsets/system/default/command.png +share/psi/iconsets/system/default/configure-room.png share/psi/iconsets/system/default/configure_toolbars.png share/psi/iconsets/system/default/disco.png share/psi/iconsets/system/default/download.png @@ -137,16 +127,17 @@ 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/key_bad.png share/psi/iconsets/system/default/key_unknown.png +share/psi/iconsets/system/default/logo_128.png +share/psi/iconsets/system/default/logo_16.png +share/psi/iconsets/system/default/logo_32.png +share/psi/iconsets/system/default/logo_48.png +share/psi/iconsets/system/default/logo_64.png share/psi/iconsets/system/default/ok.png share/psi/iconsets/system/default/options.png share/psi/iconsets/system/default/pgp.png @@ -154,6 +145,7 @@ 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/publish_tune.png share/psi/iconsets/system/default/quit.png share/psi/iconsets/system/default/register.png share/psi/iconsets/system/default/reload.png @@ -161,6 +153,7 @@ share/psi/iconsets/system/default/search.png share/psi/iconsets/system/default/self.png share/psi/iconsets/system/default/send.png +share/psi/iconsets/system/default/shortcuts.png share/psi/iconsets/system/default/show_away.png share/psi/iconsets/system/default/show_hidden.png share/psi/iconsets/system/default/show_offline.png @@ -175,6 +168,28 @@ share/psi/iconsets/system/default/upload.png share/psi/iconsets/system/default/url.png share/psi/iconsets/system/default/vcard.png +share/psi/iconsets/system/default/whiteboarding/ +share/psi/iconsets/system/default/whiteboarding/add_image.png +share/psi/iconsets/system/default/whiteboarding/add_text.png +share/psi/iconsets/system/default/whiteboarding/bring_forwards.png +share/psi/iconsets/system/default/whiteboarding/bring_to_front.png +share/psi/iconsets/system/default/whiteboarding/draw_circles.png +share/psi/iconsets/system/default/whiteboarding/draw_ellipses.png +share/psi/iconsets/system/default/whiteboarding/draw_lines.png +share/psi/iconsets/system/default/whiteboarding/draw_paths.png +share/psi/iconsets/system/default/whiteboarding/draw_rectangles.png +share/psi/iconsets/system/default/whiteboarding/erase.png +share/psi/iconsets/system/default/whiteboarding/group.png +share/psi/iconsets/system/default/whiteboarding/rotate.png +share/psi/iconsets/system/default/whiteboarding/save.png +share/psi/iconsets/system/default/whiteboarding/scale.png +share/psi/iconsets/system/default/whiteboarding/scroll.png +share/psi/iconsets/system/default/whiteboarding/select.png +share/psi/iconsets/system/default/whiteboarding/send_backwards.png +share/psi/iconsets/system/default/whiteboarding/send_to_back.png +share/psi/iconsets/system/default/whiteboarding/translate.png +share/psi/iconsets/system/default/whiteboarding/ungroup.png +share/psi/iconsets/system/default/whiteboarding/whiteboard.png share/psi/iconsets/system/default/xml.png share/psi/sound/ share/psi/sound/chat1.wav
qca-plugins.tgz
Description: application/tar-gz
pgpV4RCZZdeRq.pgp
Description: PGP signature
