diff -uNr --exclude=CVS ../net/psi/Makefile psi/Makefile --- ../net/psi/Makefile Wed Aug 16 04:02:38 2006 +++ psi/Makefile Sun Jan 21 18:38:04 2007 @@ -1,30 +1,32 @@ -# $OpenBSD: Makefile,v 1.6 2006/08/03 23:15:58 espie Exp $ +# $OpenBSD$ COMMENT= "multiplatform Jabber client" -DISTNAME= psi-0.9.3 -PKGNAME= ${DISTNAME}p2 +DISTNAME= psi-0.10 CATEGORIES= net -HOMEPAGE= http://psi.affinix.com/ +HOMEPAGE= http://psi-im.org/ -MAINTAINER= Gerardo Santana Gomez Garrido +MAINTAINER= Vlad Glagolev # GPL PERMIT_PACKAGE_CDROM= Yes PERMIT_PACKAGE_FTP= Yes PERMIT_DISTFILES_CDROM= Yes PERMIT_DISTFILES_FTP= Yes -WANTLIB= X11 Xss m c z Xext pthread stdc++ +WANTLIB= X11 Xss m c z Xext pthread stdc++ qca MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=psi/} EXTRACT_SUFX= .tar.bz2 +# For QSettings to write its setup +PORTHOME= ${WRKDIST} + MODULES= x11/qt3 MODQT_OVERRIDE_UIC= No MODQT_MT= Yes -LIB_DEPENDS= qca.>=1::security/qca +LIB_DEPENDS= ::security/qca-tls USE_X11= Yes USE_GMAKE= Yes diff -uNr --exclude=CVS ../net/psi/distinfo psi/distinfo --- ../net/psi/distinfo Fri May 20 00:29:58 2005 +++ psi/distinfo Wed Jan 17 22:01:03 2007 @@ -1,4 +1,4 @@ -MD5 (psi-0.9.3.tar.bz2) = d20f3bb530235a246bc2d92308089744 -RMD160 (psi-0.9.3.tar.bz2) = 66983a9746812b27a5c8a1c072e9b33aca638d30 -SHA1 (psi-0.9.3.tar.bz2) = dc5e7dbf5d791db2f0c4189cad055a40b21cf9b6 -SIZE (psi-0.9.3.tar.bz2) = 1423322 +MD5 (psi-0.10.tar.bz2) = f0fd4ccf077f7b24e236f71c22649b7b +RMD160 (psi-0.10.tar.bz2) = b8be1490cd02f61cf86f09f2dc9f29716ea4c186 +SHA1 (psi-0.10.tar.bz2) = f1687f8b93338f47cb1c8fa363e4b4f58628f167 +SIZE (psi-0.10.tar.bz2) = 1430929 diff -uNr --exclude=CVS ../net/psi/patches/patch-configure psi/patches/patch-configure --- ../net/psi/patches/patch-configure Sat Sep 24 04:02:48 2005 +++ psi/patches/patch-configure Thu Jan 18 00:23:59 2007 @@ -1,4 +1,4 @@ -$OpenBSD: patch-configure,v 1.2 2005/09/24 00:02:48 espie Exp $ +$OpenBSD$ --- configure.orig Sat Nov 20 14:05:03 2004 +++ configure Sat Sep 24 01:20:20 2005 @@ -261,7 +261,7 @@ public: diff -uNr --exclude=CVS ../net/psi/patches/patch-iris_jabber_s5b_cpp psi/patches/patch-iris_jabber_s5b_cpp --- ../net/psi/patches/patch-iris_jabber_s5b_cpp Thu Jan 1 03:00:00 1970 +++ psi/patches/patch-iris_jabber_s5b_cpp Thu Jan 18 00:24:45 2007 @@ -0,0 +1,12 @@ +$OpenBSD$ +--- iris/jabber/s5b.cpp.orig Sun Aug 21 21:44:29 2005 ++++ iris/jabber/s5b.cpp Wed Jan 17 23:20:12 2007 +@@ -26,7 +26,7 @@ + #include + #include"xmpp_xmlcommon.h" + #include"hash.h" +-#include"socks.h" ++#include"network/socks.h" + #include"safedelete.h" + + #ifdef Q_OS_WIN diff -uNr --exclude=CVS ../net/psi/patches/patch-iris_libidn_rfc3454_c psi/patches/patch-iris_libidn_rfc3454_c --- ../net/psi/patches/patch-iris_libidn_rfc3454_c Wed Mar 29 13:16:03 2006 +++ psi/patches/patch-iris_libidn_rfc3454_c Thu Jan 18 00:24:37 2007 @@ -1,4 +1,4 @@ -$OpenBSD: patch-iris_libidn_rfc3454_c,v 1.1 2006/03/29 09:16:03 bernd Exp $ +$OpenBSD$ --- iris/libidn/rfc3454.c.orig Wed Mar 22 11:28:27 2006 +++ iris/libidn/rfc3454.c Wed Mar 22 11:28:27 2006 @@ -1,4 +1,4 @@ diff -uNr --exclude=CVS ../net/psi/patches/patch-iris_xmpp-core_connector_cpp psi/patches/patch-iris_xmpp-core_connector_cpp --- ../net/psi/patches/patch-iris_xmpp-core_connector_cpp Thu Jan 1 03:00:00 1970 +++ psi/patches/patch-iris_xmpp-core_connector_cpp Thu Jan 18 00:24:30 2007 @@ -0,0 +1,24 @@ +$OpenBSD$ +--- iris/xmpp-core/connector.cpp.orig Sun Aug 21 21:44:29 2005 ++++ iris/xmpp-core/connector.cpp Wed Jan 17 23:18:16 2007 +@@ -38,14 +38,14 @@ + #ifdef NO_NDNS + #include + #else +-#include"ndns.h" ++#include"network/ndns.h" + #endif + +-#include"srvresolver.h" +-#include"bsocket.h" +-#include"httpconnect.h" +-#include"httppoll.h" +-#include"socks.h" ++#include"network/srvresolver.h" ++#include"network/bsocket.h" ++#include"network/httpconnect.h" ++#include"network/httppoll.h" ++#include"network/socks.h" + #include"hash.h" + + //#define XMPP_DEBUG diff -uNr --exclude=CVS ../net/psi/patches/patch-iris_xmpp-core_jid_cpp psi/patches/patch-iris_xmpp-core_jid_cpp --- ../net/psi/patches/patch-iris_xmpp-core_jid_cpp Wed Mar 29 13:16:03 2006 +++ psi/patches/patch-iris_xmpp-core_jid_cpp Thu Jan 1 03:00:00 1970 @@ -1,12 +0,0 @@ -$OpenBSD: patch-iris_xmpp-core_jid_cpp,v 1.1 2006/03/29 09:16:03 bernd Exp $ ---- iris/xmpp-core/jid.cpp.orig Wed Mar 22 11:25:09 2006 -+++ iris/xmpp-core/jid.cpp Wed Mar 22 11:25:09 2006 -@@ -20,7 +20,7 @@ - - #include"xmpp.h" - --#include -+#include"../libidn/stringprep.h" - - using namespace XMPP; - diff -uNr --exclude=CVS ../net/psi/patches/patch-psics_pri psi/patches/patch-psics_pri --- ../net/psi/patches/patch-psics_pri Thu Jan 1 03:00:00 1970 +++ psi/patches/patch-psics_pri Thu Jan 18 00:24:21 2007 @@ -0,0 +1,12 @@ +$OpenBSD$ +--- psics.pri.orig Sun Aug 21 21:44:35 2005 ++++ psics.pri Wed Jan 17 23:15:58 2007 +@@ -2,7 +2,7 @@ + # iris + INCLUDEPATH += \ + $$IRISCS_CPP/util \ +- $$IRISCS_CPP/network ++ $$IRISCS_CPP + + HEADERS += \ + $$IRISCS_CPP/util/base64.h \ diff -uNr --exclude=CVS ../net/psi/patches/patch-src_options_opt_appearance-ui_ui psi/patches/patch-src_options_opt_appearance-ui_ui --- ../net/psi/patches/patch-src_options_opt_appearance-ui_ui Sat Sep 24 04:02:48 2005 +++ psi/patches/patch-src_options_opt_appearance-ui_ui Thu Jan 1 03:00:00 1970 @@ -1,13 +0,0 @@ -$OpenBSD: patch-src_options_opt_appearance-ui_ui,v 1.1 2005/09/24 00:02:48 espie Exp $ ---- src/options/opt_appearance-ui.ui.orig Sat Sep 24 01:50:35 2005 -+++ src/options/opt_appearance-ui.ui Sat Sep 24 01:50:46 2005 -@@ -458,9 +458,5 @@ - - - -- fontlabel.h -- fontlabel.h -- fontlabel.h -- fontlabel.h - - diff -uNr --exclude=CVS ../net/psi/patches/patch-src_psiaccount_cpp psi/patches/patch-src_psiaccount_cpp --- ../net/psi/patches/patch-src_psiaccount_cpp Thu Jan 1 03:00:00 1970 +++ psi/patches/patch-src_psiaccount_cpp Thu Jan 18 00:24:14 2007 @@ -0,0 +1,12 @@ +$OpenBSD$ +--- src/psiaccount.cpp.orig Sun Jan 8 00:19:01 2006 ++++ src/psiaccount.cpp Wed Jan 17 23:22:22 2007 +@@ -83,7 +83,7 @@ + #include "psigrowlnotifier.h" + #endif + +-#include"bsocket.h" ++#include"network/bsocket.h" + /*#ifdef Q_WS_WIN + #include + typedef int socklen_t; diff -uNr --exclude=CVS ../net/psi/patches/patch-src_src_pro psi/patches/patch-src_src_pro --- ../net/psi/patches/patch-src_src_pro Fri Jun 3 10:02:37 2005 +++ psi/patches/patch-src_src_pro Thu Jan 1 03:00:00 1970 @@ -1,29 +0,0 @@ -$OpenBSD: patch-src_src_pro,v 1.1 2005/06/03 06:02:37 sturm Exp $ ---- src/src.pro.orig Thu Jun 2 15:24:37 2005 -+++ src/src.pro Thu Jun 2 15:25:11 2005 -@@ -17,12 +17,6 @@ MOC_DIR = .moc - OBJECTS_DIR = .obj - UI_DIR = .ui - --# qconf --unix: { -- include(../conf.pri) -- include(../extra.pri) --} -- - # qxml - !isEmpty(QXML_STATIC) { - unix: { -@@ -42,6 +36,12 @@ exists(../cutestuff) { - PSICS_CPP = ../cutestuff - } - include(../psics.pri) -+ -+# qconf -+unix: { -+ include(../conf.pri) -+ include(../extra.pri) -+} - - # qca - #DEFINES += QCA_STATIC diff -uNr --exclude=CVS ../net/psi/patches/patch-src_ui_about_ui psi/patches/patch-src_ui_about_ui --- ../net/psi/patches/patch-src_ui_about_ui Sat Sep 24 04:02:48 2005 +++ psi/patches/patch-src_ui_about_ui Thu Jan 1 03:00:00 1970 @@ -1,11 +0,0 @@ -$OpenBSD: patch-src_ui_about_ui,v 1.1 2005/09/24 00:02:48 espie Exp $ ---- src/ui_about.ui.orig Sat Sep 24 01:44:47 2005 -+++ src/ui_about.ui Sat Sep 24 01:44:58 2005 -@@ -334,7 +334,6 @@ Now that this is out of the way, enjoy P - - - fancylabel.h -- urllabel.h - psitextview.h - psitextview.h - psitextview.h diff -uNr --exclude=CVS ../net/psi/pkg/DESCR psi/pkg/DESCR --- ../net/psi/pkg/DESCR Fri May 20 00:29:58 2005 +++ psi/pkg/DESCR Wed Jan 17 23:06:52 2007 @@ -1,4 +1,4 @@ Psi is the premiere Instant Messaging application designed for Microsoft Windows, Apple Mac OS X, GNU/Linux and BSD. Built upon an open protocol named Jabber, Psi is a fast and lightweight messaging client that utilises the best -in open source technologies. +in open source technologies. diff -uNr --exclude=CVS ../net/psi/pkg/PFRAG.shared psi/pkg/PFRAG.shared --- ../net/psi/pkg/PFRAG.shared Fri May 20 00:29:58 2005 +++ psi/pkg/PFRAG.shared Wed Jan 17 23:07:02 2007 @@ -1,2 +1,2 @@ -@comment $OpenBSD: PFRAG.shared,v 1.1.1.1 2005/05/19 20:29:58 niallo Exp $ +@comment $OpenBSD$ share/psi/libpsiwidgets.so diff -uNr --exclude=CVS ../net/psi/pkg/PLIST psi/pkg/PLIST --- ../net/psi/pkg/PLIST Tue Aug 1 14:22:33 2006 +++ psi/pkg/PLIST Thu Jan 18 00:00:03 2007 @@ -1,4 +1,4 @@ -@comment $OpenBSD: PLIST,v 1.2 2006/03/09 20:40:06 sturm Exp $ +@comment $OpenBSD$ %%SHARED%% bin/psi share/applnk/ @@ -65,19 +65,14 @@ share/psi/iconsets/emoticons/default/yes.png share/psi/iconsets/roster/ share/psi/iconsets/roster/README -share/psi/iconsets/roster/aim/ -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/crystal_aim.jisp -share/psi/iconsets/roster/crystal_icq.jisp -share/psi/iconsets/roster/crystal_msn.jisp -share/psi/iconsets/roster/crystal_roster.jisp -share/psi/iconsets/roster/crystal_transport.jisp -share/psi/iconsets/roster/crystal_yahoo.jisp +share/psi/iconsets/roster/crystal-aim.jisp +share/psi/iconsets/roster/crystal-gadu.jisp +share/psi/iconsets/roster/crystal-icq.jisp +share/psi/iconsets/roster/crystal-msn.jisp +share/psi/iconsets/roster/crystal-roster.jisp +share/psi/iconsets/roster/crystal-service.jisp +share/psi/iconsets/roster/crystal-sms.jisp +share/psi/iconsets/roster/crystal-yahoo.jisp share/psi/iconsets/roster/default/ share/psi/iconsets/roster/default/ask.png share/psi/iconsets/roster/default/away.png @@ -99,80 +94,13 @@ 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/ -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/ -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/ -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/ -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/ -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/ -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/ -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/ -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/ share/psi/iconsets/system/README -share/psi/iconsets/system/crystal_system.jisp share/psi/iconsets/system/default/ share/psi/iconsets/system/default/account.png share/psi/iconsets/system/default/add.png +share/psi/iconsets/system/default/advanced.png +share/psi/iconsets/system/default/appearance.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 @@ -199,15 +127,11 @@ 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/configure_toolbars.png +share/psi/iconsets/system/default/disco.png share/psi/iconsets/system/default/download.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/events.png share/psi/iconsets/system/default/eye_blue.png share/psi/iconsets/system/default/filemanager.png share/psi/iconsets/system/default/groupchat.png @@ -221,7 +145,6 @@ 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 @@ -236,10 +159,16 @@ 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/self.png share/psi/iconsets/system/default/send.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 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/start-chat.png +share/psi/iconsets/system/default/status.png share/psi/iconsets/system/default/stop.png share/psi/iconsets/system/default/time.png share/psi/iconsets/system/default/tip.png