On Wed, Apr 10, 2013 at 10:57:31AM +0500, dmitry.sensei wrote: > Hi! > > Do you plan update version of net/psi to 0.15? > Some suggestion was be made in > http://comments.gmane.org/gmane.os.openbsd.ports/58536
sync with last changes in ports. Someone has any objections ? Comment ? OK ? -- Alexandr Shadchin Index: Makefile =================================================================== RCS file: /cvs/ports/net/psi/Makefile,v retrieving revision 1.17 diff -u -p -r1.17 Makefile --- Makefile 11 Mar 2013 11:35:55 -0000 1.17 +++ Makefile 10 Apr 2013 18:28:08 -0000 @@ -2,8 +2,7 @@ COMMENT= multiplatform Jabber client -DISTNAME= psi-0.10 -REVISION= 1 +DISTNAME= psi-0.15 CATEGORIES= net HOMEPAGE= http://psi-im.org/ @@ -11,73 +10,66 @@ HOMEPAGE= http://psi-im.org/ MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=psi/} EXTRACT_SUFX= .tar.bz2 -# GPL +# GPLv2 PERMIT_PACKAGE_CDROM= Yes -WANTLIB= X11 Xext Xss m c pthread pthread-stubs stdc++ xcb z \ - qca>=1 +WANTLIB += ICE QtDBus QtGui QtNetwork QtXml SM X11 Xext Xi Xinerama +WANTLIB += Xrender Xss c enchant fontconfig freetype glib-2.0 +WANTLIB += gmodule-2.0 intl m pthread qca2 stdc++ z -MODULES= x11/qt3 - -MODQT_OVERRIDE_UIC= No +MODULES= x11/qt4 USE_GMAKE= Yes -LIB_DEPENDS= security/qca -RUN_DEPENDS= security/qca-tls +LIB_DEPENDS= security/qca2 \ + textproc/enchant +RUN_DEPENDS= devel/desktop-file-utils \ + security/qca-gnupg \ + security/qca-ossl \ + x11/gtk+2,-guic CONFIGURE_STYLE= simple -CONFIGURE_ARGS+= --qtdir=${MODQT_QTDIR} \ - --with-qca-inc=${LOCALBASE}/include \ - --with-qca-lib=${LOCALBASE}/lib \ - --disable-growl \ - --disable-dnotify \ - --disable-ghbnr - -CONFIGURE_ENV+= LOCALBASE=${LOCALBASE} \ - KDEDIR=${LOCALBASE} +CONFIGURE_ARGS+= --prefix=${LOCALBASE} \ + --qtdir=${MODQT4_QTDIR} \ + --with-qca-inc=${LOCALBASE}/include/QtCrypto \ + --disable-growl # For QSettings to write its setup -PORTHOME= ${WRKDIST} +PORTHOME= ${WRKDIST} NO_TEST= Yes -pre-configure: - @perl -pi -e "s@%%X11BASE%%@${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_PROGRAM} ${WRKSRC}/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/applications + ${INSTALL_DATA} ${WRKSRC}/psi.desktop ${PREFIX}/share/applications/ ${INSTALL_DATA_DIR} ${PREFIX}/share/icons/hicolor/16x16/apps - ${INSTALL_DATA} ${WRKSRC}/iconsets/system/default/icon_16.png \ + ${INSTALL_DATA} ${WRKSRC}/iconsets/system/default/logo_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 \ + ${INSTALL_DATA} ${WRKSRC}/iconsets/system/default/logo_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 \ + ${INSTALL_DATA} ${WRKSRC}/iconsets/system/default/logo_48.png \ ${PREFIX}/share/icons/hicolor/48x48/apps/psi.png + + ${INSTALL_DATA_DIR} ${PREFIX}/share/icons/hicolor/64x64/apps + ${INSTALL_DATA} ${WRKSRC}/iconsets/system/default/logo_64.png \ + ${PREFIX}/share/icons/hicolor/64x64/apps/psi.png + + ${INSTALL_DATA_DIR} ${PREFIX}/share/icons/hicolor/128x128/apps + ${INSTALL_DATA} ${WRKSRC}/iconsets/system/default/logo_128.png \ + ${PREFIX}/share/icons/hicolor/128x128/apps/psi.png .include <bsd.port.mk> Index: distinfo =================================================================== RCS file: /cvs/ports/net/psi/distinfo,v retrieving revision 1.6 diff -u -p -r1.6 distinfo --- distinfo 31 May 2011 08:35:20 -0000 1.6 +++ distinfo 10 Apr 2013 18:28:08 -0000 @@ -1,5 +1,2 @@ -MD5 (psi-0.10.tar.bz2) = 8P1Mzwd/eyTiNvccImSbew== -RMD160 (psi-0.10.tar.bz2) = uL4UkM0C9hz4bwny3J8pcW6kwYY= -SHA1 (psi-0.10.tar.bz2) = 8Wh/i5Mzj0fLHI+jY+S09YYo8Wc= -SHA256 (psi-0.10.tar.bz2) = 4QqIWG+NfylTVRDPOjhX3I/yeS5k20IH1iqTWJCmDKE= -SIZE (psi-0.10.tar.bz2) = 1430929 +SHA256 (psi-0.15.tar.bz2) = WTtd3Xk0r2nCRa+w5ykAR/197c/YdluspaOgJMVpx+Y= +SIZE (psi-0.15.tar.bz2) = 1984777 Index: patches/patch-configure =================================================================== RCS file: /cvs/ports/net/psi/patches/patch-configure,v retrieving revision 1.5 diff -u -p -r1.5 patch-configure --- patches/patch-configure 8 Aug 2007 05:51:51 -0000 1.5 +++ patches/patch-configure 10 Apr 2013 18:28:08 -0000 @@ -1,12 +1,12 @@ $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) - - 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; - } +--- configure.orig Fri Aug 17 08:52:47 2012 ++++ configure Fri Aug 24 00:43:38 2012 +@@ -622,7 +622,7 @@ static QString internal_crypto_prf(const QString &incd + "isEmpty(LINKAGE) {\n" + " !isEmpty(QCA_INCDIR):INCLUDEPATH += \$\$QCA_INCDIR/QtCrypto\n" + " !isEmpty(QCA_LIBDIR):LIBS += -L\$\$QCA_LIBDIR\n" +-" LINKAGE = -lqca\n" ++" LINKAGE = -lqca2\n" + " CONFIG(debug, debug|release) {\n" + " windows:LINKAGE = -lqcad\n" + " mac:LINKAGE = -lqca_debug\n" Index: patches/patch-iris_iris_pri =================================================================== RCS file: patches/patch-iris_iris_pri diff -N patches/patch-iris_iris_pri --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ patches/patch-iris_iris_pri 10 Apr 2013 18:28:08 -0000 @@ -0,0 +1,12 @@ +$OpenBSD$ +--- iris/iris.pri.orig Mon Aug 1 18:06:20 2011 ++++ iris/iris.pri Mon Aug 1 18:06:29 2011 +@@ -1,7 +1,7 @@ + IRIS_BASE = $$PWD + include(common.pri) + +-CONFIG *= depend_prl ++#CONFIG *= depend_prl + + INCLUDEPATH += $$IRIS_BASE/include $$IRIS_BASE/include/iris $$IRIS_BASE/src + Index: patches/patch-iris_libidn_rfc3454_c =================================================================== RCS file: patches/patch-iris_libidn_rfc3454_c diff -N patches/patch-iris_libidn_rfc3454_c --- patches/patch-iris_libidn_rfc3454_c 29 Mar 2006 09:16:03 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,9 +0,0 @@ -$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 -@@ -1,4 +1,4 @@ --#include <stringprep.h> -+#include "stringprep.h" - - /* - * A.1 Unassigned code points in Unicode 3.2 Index: patches/patch-iris_src_jdns_jdns_p_h =================================================================== RCS file: patches/patch-iris_src_jdns_jdns_p_h diff -N patches/patch-iris_src_jdns_jdns_p_h --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ patches/patch-iris_src_jdns_jdns_p_h 10 Apr 2013 18:28:08 -0000 @@ -0,0 +1,12 @@ +$OpenBSD$ +--- iris/src/jdns/jdns_p.h.orig Mon Aug 1 02:19:45 2011 ++++ iris/src/jdns/jdns_p.h Mon Aug 1 02:20:09 2011 +@@ -40,6 +40,8 @@ + # define JDNS_OS_FREEBSD + #elif defined(__NetBSD__) + # define JDNS_OS_NETBSD ++#elif defined(__OpenBSD__) ++# define JDNS_OS_OPENBSD + #elif defined(sun) || defined(__sun) + # define JDNS_OS_SOLARIS + #elif defined(__APPLE__) && (defined(__GNUC__) || defined(__xlC__) || defined(__xlc__)) Index: patches/patch-iris_src_jdns_jdns_sys_c =================================================================== RCS file: patches/patch-iris_src_jdns_jdns_sys_c diff -N patches/patch-iris_src_jdns_jdns_sys_c --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ patches/patch-iris_src_jdns_jdns_sys_c 10 Apr 2013 18:28:08 -0000 @@ -0,0 +1,19 @@ +$OpenBSD$ +--- iris/src/jdns/jdns_sys.c.orig Sun Apr 1 13:15:35 2012 ++++ iris/src/jdns/jdns_sys.c Sun Apr 8 14:32:54 2012 +@@ -752,6 +752,7 @@ static jdns_dnsparams_t *dnsparams_get_unixsys() + if(n == -1) + return params; + ++#ifndef JDNS_OS_OPENBSD + // nameservers - ipv6 + for(n = 0; n < MAXNS && n < RESVAR._u._ext.nscount; ++n) + { +@@ -775,6 +776,7 @@ static jdns_dnsparams_t *dnsparams_get_unixsys() + jdns_dnsparams_append_nameserver(params, addr, JDNS_UNICAST_PORT); + jdns_address_delete(addr); + } ++#endif + + // nameservers - ipv4 + for(n = 0; n < MAXNS && n < RESVAR.nscount; ++n) Index: patches/patch-iris_xmpp-core_jid_cpp =================================================================== RCS file: patches/patch-iris_xmpp-core_jid_cpp diff -N patches/patch-iris_xmpp-core_jid_cpp --- patches/patch-iris_xmpp-core_jid_cpp 8 Aug 2007 05:51:51 -0000 1.4 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,12 +0,0 @@ -$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" - - #include<qdict.h> --#include<stringprep.h> -+#include"../libidn/stringprep.h" - - using namespace XMPP; - Index: pkg/PFRAG.shared =================================================================== RCS file: pkg/PFRAG.shared diff -N pkg/PFRAG.shared --- pkg/PFRAG.shared 19 May 2005 20:29:58 -0000 1.1.1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,2 +0,0 @@ -@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 -p -r1.5 PLIST --- pkg/PLIST 8 Aug 2007 05:51:52 -0000 1.5 +++ pkg/PLIST 10 Apr 2013 18:28:08 -0000 @@ -1,29 +1,20 @@ @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 -share/icons/ -share/icons/hicolor/ -share/icons/hicolor/16x16/ -share/icons/hicolor/16x16/apps/ +@bin bin/psi +share/applications/psi.desktop +share/icons/hicolor/128x128/apps/psi.png share/icons/hicolor/16x16/apps/psi.png -share/icons/hicolor/32x32/ -share/icons/hicolor/32x32/apps/ share/icons/hicolor/32x32/apps/psi.png -share/icons/hicolor/48x48/ -share/icons/hicolor/48x48/apps/ share/icons/hicolor/48x48/apps/psi.png +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 +67,25 @@ share/psi/iconsets/roster/crystal-yahoo. 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/call.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 +101,10 @@ share/psi/iconsets/system/default/browse 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 @@ -135,18 +112,20 @@ share/psi/iconsets/system/default/events share/psi/iconsets/system/default/eye_blue.png share/psi/iconsets/system/default/filemanager.png share/psi/iconsets/system/default/groupchat.png +share/psi/iconsets/system/default/gstreamer-logo-50.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 +133,7 @@ share/psi/iconsets/system/default/play.p 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 +141,7 @@ share/psi/iconsets/system/default/remove 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 +156,28 @@ share/psi/iconsets/system/default/tip.pn 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 @@ -184,3 +187,7 @@ share/psi/sound/ft_incoming.wav share/psi/sound/offline.wav share/psi/sound/online.wav share/psi/sound/send.wav +@exec %D/bin/update-desktop-database +@unexec-delete %D/bin/update-desktop-database +@exec %D/bin/gtk-update-icon-cache -q %D/share/icons/hicolor 2>/dev/null || true +@unexec-delete %D/bin/gtk-update-icon-cache -q %D/share/icons/hicolor 2>/dev/null || true
qca-gnupg.tgz
Description: application/tar-gz
