From 55e7ac2532013efe779dc74c8f53679921875cf1 Mon Sep 17 00:00:00 2001 From: jdolecek Date: Wed, 19 Dec 2007 13:19:38 +0000 Subject: Update psi to 0.11. New in 0.11 - Reworked account registration process (including proper support for XEP-0077 (In-band registration)) - Finished support for XEP-0004 (Data Forms) by supporting forms in messages. (thanks to Roelof Naude) - Added support for XEP-0070 (Verifying HTTP Requests via XMPP). Thanks to Maciej Niedzielski. - Customizable shortcuts (thanks to Ephraim) - System-wide shortcuts - Added spell checking (thanks to Ephraim). Currently only aspell is supported. - Added option to automatically set the resource (using the hostname) - Added new default Stellar3 iconset - Added support for XEP-138 (Stream Compression) - Added support for using XEP-33 (Extended Stanza Addressing) to multicast messages to multiple users. Use option.enable-multicasting to enable it. - Added 'Show status message' toggle. There is a hidden option to put status messages under the nickname (at the cost of 2 extra pixels when no status message is shown) - Support for Bookmark Storage (XEP-0048), where bookmarked conferences are auto-joined. No UI is provided for creating bookmarks (yet). - Better error messages, including error condition mappings (XEP-0086) - Support dynamically changing priority - Improved PGP error messages - Hiding the deprecated protocol selector for service discovery by default. Use option.ui.show-deprecated.service-discovery.protocol-selector to re-enable it. - New options system (see options.xml) - Receiving support for vCard-Based Avatars (XEP-0153) - Support for Multi-User-Chat (XEP-0045) - Preliminary support for User Nickname (XEP-0172) - Preliminary support for Roster Item Exchange (XEP-0144) - Psi now uses the Qt4(>=4.3) and QCA2 libraries, replacing the Qt3 and QCA1 requirements. - "Privacy List" support in the account dialog. - Support for XEP-0050 (Ad-hoc commands) - Preliminary support for XEP-0163 (Personal Eventing Protocol) - Preliminary support for XEP-0146 (Remote Controlling Clients) - Large parts of the codebase have been restructured. - Fixed a chat room bug where subject/topic changes were not shown. - Mac OS X builds are now universal binaries, supporting the new Intel based Macs. - Support for XEP-85 (Chat State Notifications). - Support for XEP-0115 (Entity Capabilities). - There is now a config.xml option to make some windows use the brushed metal theme on Mac OS X. - Window opacity support is now present for all three supported platforms. - Fixed Unicode URL opening bug #510 - Auto-reconnect accounts on wakeup - Copy-pasting with emoticons now works - Fixed issue #263 where emoticons would disappear in a reply or quote - History index is rebuilt faster - Configure toolbars merged into main preferences dialog - Moving tooltips - MingW32 compiler support (Coupled with the open source Qt4 Windows library this now allows completely free building of Psi on Windows) Aspell support is not activated in pkgsrc ATM --- chat/psi/Makefile | 50 +++++++++---------------------- chat/psi/PLIST | 88 +++++++++++++++++++++++-------------------------------- chat/psi/distinfo | 53 +++------------------------------ 3 files changed, 55 insertions(+), 136 deletions(-) (limited to 'chat') diff --git a/chat/psi/Makefile b/chat/psi/Makefile index 31c52b63c20..472d9dd31ab 100644 --- a/chat/psi/Makefile +++ b/chat/psi/Makefile @@ -1,8 +1,7 @@ -# $NetBSD: Makefile,v 1.49 2007/02/20 16:23:22 rillig Exp $ +# $NetBSD: Makefile,v 1.50 2007/12/19 13:19:38 jdolecek Exp $ -PSI_VERSION= 0.10 +PSI_VERSION= 0.11 DISTNAME= psi-${PSI_VERSION} -PKGREVISION= 8 CATEGORIES= chat MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=psi/} EXTRACT_SUFX= .tar.bz2 @@ -11,9 +10,9 @@ MAINTAINER= jdolecek@NetBSD.org HOMEPAGE= http://psi-im.org/ COMMENT= PSI Jabber Client -DEPENDS+= qca-tls>=1.0:../../security/qca-tls +DEPENDS+= qca-ossl>=2.0.0beta3:../../security/qca-ossl -DIST_SUBDIR= ${DISTNAME}-20060806-1 +DIST_SUBDIR= ${DISTNAME}-20071115-1 DISTFILES= ${DISTNAME}${EXTRACT_SUFX} ${LANG_FILES} EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} @@ -26,14 +25,15 @@ CONFIG_SHELL= ${SH} CONFIGURE_ARGS+= --prefix=${PREFIX:Q} CONFIGURE_ARGS+= --qtdir=${QTDIR:Q} -CONFIGURE_ARGS+= --with-qca-inc=${BUILDLINK_PREFIX.qca:Q}/include -CONFIGURE_ARGS+= --with-qca-lib=${BUILDLINK_PREFIX.qca:Q}/lib +CONFIGURE_ARGS+= --disable-bundled-qca CONFIGURE_ARGS+= --with-zlib-inc=${BUILDLINK_PREFIX.zlib}/include CONFIGURE_ARGS+= --with-zlib-lib=${BUILDLINK_PREFIX.zlib}/lib -LANG_FILES= psi_bg.qm psi_ca.qm psi_eo.qm psi_es.qm psi_fr.qm \ - psi_hu.qm psi_mk.qm psi_nl.qm psi_pl.qm psi_pt.qm \ - psi_pt_BR.qm psi_sk.qm psi_sl.qm psi_vi.qm psi_zh.qm +# no lang files for 0.13 yet +#LANG_FILES= psi_bg.qm psi_ca.qm psi_eo.qm psi_es.qm psi_fr.qm \ +# psi_hu.qm psi_mk.qm psi_nl.qm psi_pl.qm psi_pt.qm \ +# psi_pt_BR.qm psi_sk.qm psi_sl.qm psi_vi.qm psi_zh.qm +LANG_FILES= .for l in ${LANG_FILES} SITES.${l}= http://psi-im.org/files/translation/${PSI_VERSION}/ @@ -41,30 +41,10 @@ SITES.${l}= http://psi-im.org/files/translation/${PSI_VERSION}/ INSTALLATION_DIRS= bin share/psi share/doc/psi -# XXX the psiwidgets.so symlink is somewhat ugly, but without that -# uic doesn't find the built plug-in and generates sources without -# proper psiwidgets #include's. This should eventually be fixed in -# qmake template. -post-configure: - ${SED} \ - -e 's:^CHK_DIR_EXISTS *= *$$:CHK_DIR_EXISTS=test -d:' \ - -e 's:^MKDIR *= *$$:MKDIR=${MKDIR}:' \ - -e "s:/bin/true:${TRUE}:" < ${WRKSRC}/Makefile \ - > ${WRKSRC}/Makefile.new - ${MV} ${WRKSRC}/Makefile.new ${WRKSRC}/Makefile - ${ECHO} 'target.path=${QTDIR}/lib' \ - >> ${WRKSRC}/libpsi/psiwidgets/psiwidgets.pro - ${ECHO} 'QMAKE_UIC=${QTDIR}/bin/uic -L ../libpsi/psiwidgets/.libs' \ - >> ${WRKSRC}/src/src.pro - cd ${WRKSRC}/libpsi/psiwidgets && ( ${SETENV} ${CONFIGURE_ENV} \ - ${QTDIR}/bin/qmake psiwidgets.pro -o Makefile; \ - ) - +# custom install targets, we don't want psi to install the desktop & icon +# stuff do-install: -.for f in iconsets sound certs - ${INSTALL_DATA_DIR} ${PREFIX}/share/psi/${f} - cd ${WRKSRC}/${f} && ${PAX} -rwppm . ${PREFIX}/share/psi/${f} -.endfor + cd ${WRKSRC}/src && ${MAKE} install_target install_sharedfiles ${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/psi .for f in ${LANG_FILES} ${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/${f} ${PREFIX}/share/psi @@ -74,7 +54,5 @@ do-install: .include "../../devel/libidn/buildlink3.mk" .include "../../devel/zlib/buildlink3.mk" .include "../../security/qca/buildlink3.mk" -.include "../../x11/qt3-libs/buildlink3.mk" -BUILDLINK_API_DEPENDS.qt3-tools+= qt3-tools>=3.3.5nb6 -.include "../../x11/qt3-tools/buildlink3.mk" +.include "../../x11/qt4-libs/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/chat/psi/PLIST b/chat/psi/PLIST index ac5d1a3624a..bd977bea5dd 100644 --- a/chat/psi/PLIST +++ b/chat/psi/PLIST @@ -1,9 +1,8 @@ -@comment $NetBSD: PLIST,v 1.9 2006/03/02 23:00:46 wiz Exp $ +@comment $NetBSD: PLIST,v 1.10 2007/12/19 13:19:38 jdolecek Exp $ bin/psi share/doc/psi/README share/psi/certs/README -share/psi/certs/rootcert.xml -share/psi/iconsets/emoticons/README +share/psi/certs/startcom_ca.crt share/psi/iconsets/emoticons/default/angry.png share/psi/iconsets/emoticons/default/bat.png share/psi/iconsets/emoticons/default/beer.png @@ -53,20 +52,19 @@ share/psi/iconsets/roster/crystal-sms.jisp share/psi/iconsets/roster/crystal-yahoo.jisp 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 @@ -84,24 +82,10 @@ share/psi/iconsets/system/default/browse.png 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/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 @@ -111,16 +95,17 @@ share/psi/iconsets/system/default/filemanager.png 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 @@ -128,6 +113,7 @@ share/psi/iconsets/system/default/play.png 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 @@ -135,6 +121,7 @@ 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/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 @@ -149,22 +136,27 @@ share/psi/iconsets/system/default/tip.png 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/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/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/psi_bg.qm -share/psi/psi_ca.qm -share/psi/psi_eo.qm -share/psi/psi_es.qm -share/psi/psi_fr.qm -share/psi/psi_hu.qm -share/psi/psi_mk.qm -share/psi/psi_nl.qm -share/psi/psi_pl.qm -share/psi/psi_pt.qm -share/psi/psi_pt_BR.qm -share/psi/psi_sk.qm -share/psi/psi_sl.qm -share/psi/psi_vi.qm -share/psi/psi_zh.qm share/psi/sound/chat1.wav share/psi/sound/chat2.wav share/psi/sound/ft_complete.wav @@ -172,15 +164,9 @@ share/psi/sound/ft_incoming.wav share/psi/sound/offline.wav share/psi/sound/online.wav share/psi/sound/send.wav -@dirrm share/psi/sound -@dirrm share/psi/iconsets/system/default/clients +@dirrm share/psi/iconsets/system/default/whiteboarding @dirrm share/psi/iconsets/system/default @dirrm share/psi/iconsets/system -@dirrm share/psi/iconsets/roster/default -@dirrm share/psi/iconsets/roster -@dirrm share/psi/iconsets/emoticons/default -@dirrm share/psi/iconsets/emoticons @dirrm share/psi/iconsets -@dirrm share/psi/certs @dirrm share/psi @dirrm share/doc/psi diff --git a/chat/psi/distinfo b/chat/psi/distinfo index 5c4b8c838cf..67107f8d462 100644 --- a/chat/psi/distinfo +++ b/chat/psi/distinfo @@ -1,53 +1,8 @@ -$NetBSD: distinfo,v 1.21 2006/12/04 22:06:40 jdolecek Exp $ +$NetBSD: distinfo,v 1.22 2007/12/19 13:19:38 jdolecek Exp $ -SHA1 (psi-0.10-20060806-1/psi-0.10.tar.bz2) = f1687f8b93338f47cb1c8fa363e4b4f58628f167 -RMD160 (psi-0.10-20060806-1/psi-0.10.tar.bz2) = b8be1490cd02f61cf86f09f2dc9f29716ea4c186 -Size (psi-0.10-20060806-1/psi-0.10.tar.bz2) = 1430929 bytes -SHA1 (psi-0.10-20060806-1/psi_bg.qm) = 618a0a148d95669c9369e702c88dac0c6508213d -RMD160 (psi-0.10-20060806-1/psi_bg.qm) = 5719905bf19ed39ee0372fc0a8ec0611de361d4f -Size (psi-0.10-20060806-1/psi_bg.qm) = 139972 bytes -SHA1 (psi-0.10-20060806-1/psi_ca.qm) = 8fdee9f2b244738522f658561d75be63d40e491e -RMD160 (psi-0.10-20060806-1/psi_ca.qm) = 0ef859daad12d3fa2415e47647a37187340b6a42 -Size (psi-0.10-20060806-1/psi_ca.qm) = 137575 bytes -SHA1 (psi-0.10-20060806-1/psi_eo.qm) = 078afb6fff3ef75419735e753a7876f88e85f27c -RMD160 (psi-0.10-20060806-1/psi_eo.qm) = f9f3dccb2c1514c3598015796099d3f9fd6fb905 -Size (psi-0.10-20060806-1/psi_eo.qm) = 130507 bytes -SHA1 (psi-0.10-20060806-1/psi_es.qm) = f8f73d02e0f643e441c5586171cb79e4eca7bba0 -RMD160 (psi-0.10-20060806-1/psi_es.qm) = 46cd0457b7703de810e356aeb987bb5909b52998 -Size (psi-0.10-20060806-1/psi_es.qm) = 140669 bytes -SHA1 (psi-0.10-20060806-1/psi_fr.qm) = 97d7b93486db97805adbe5ff114c4094a35d6b4a -RMD160 (psi-0.10-20060806-1/psi_fr.qm) = b2253a2260b866cdc3af9aa8bef26f09317febb8 -Size (psi-0.10-20060806-1/psi_fr.qm) = 151526 bytes -SHA1 (psi-0.10-20060806-1/psi_hu.qm) = e74b731a7716954ba8092e971d57e0c7c010a351 -RMD160 (psi-0.10-20060806-1/psi_hu.qm) = c2983593d4e2ab652d4ccc58d06d0a351df31229 -Size (psi-0.10-20060806-1/psi_hu.qm) = 124375 bytes -SHA1 (psi-0.10-20060806-1/psi_mk.qm) = 764b545f2d10e28727c733083a041c21ab9f3664 -RMD160 (psi-0.10-20060806-1/psi_mk.qm) = d288549cfc592d1cc09168f3f60321b894ea7353 -Size (psi-0.10-20060806-1/psi_mk.qm) = 132998 bytes -SHA1 (psi-0.10-20060806-1/psi_nl.qm) = d77c9a7dd91b69004c28152ec45e5797e3231e8c -RMD160 (psi-0.10-20060806-1/psi_nl.qm) = c97b9da4515ebb6867f5dba7fffdab97e13d8566 -Size (psi-0.10-20060806-1/psi_nl.qm) = 136712 bytes -SHA1 (psi-0.10-20060806-1/psi_pl.qm) = 95330b61c6600a54675744045ae10d27658564f3 -RMD160 (psi-0.10-20060806-1/psi_pl.qm) = 006487f732b017c1e890b3119331ed40c2ba6cf2 -Size (psi-0.10-20060806-1/psi_pl.qm) = 133702 bytes -SHA1 (psi-0.10-20060806-1/psi_pt.qm) = b7ef2d8f814c91f41903c72cb6289966085d6387 -RMD160 (psi-0.10-20060806-1/psi_pt.qm) = c63c6a3d998a85061024f0b6bf6d9b52a7d228a4 -Size (psi-0.10-20060806-1/psi_pt.qm) = 133900 bytes -SHA1 (psi-0.10-20060806-1/psi_pt_BR.qm) = d5d4c47d04353022ba7e8009e1a3c0f88147c755 -RMD160 (psi-0.10-20060806-1/psi_pt_BR.qm) = 8e7ad4682b4617b87c84c7b90e7e1326e4ab5aa6 -Size (psi-0.10-20060806-1/psi_pt_BR.qm) = 139768 bytes -SHA1 (psi-0.10-20060806-1/psi_sk.qm) = 77ae0ed29af4e6cf43e37509a48c83b4f2fc5884 -RMD160 (psi-0.10-20060806-1/psi_sk.qm) = 4757cd60149cecc9666cabbca950acb44fe0fb3b -Size (psi-0.10-20060806-1/psi_sk.qm) = 127088 bytes -SHA1 (psi-0.10-20060806-1/psi_sl.qm) = 67555cc727f7ba6e7ceb740418b93c031826c50d -RMD160 (psi-0.10-20060806-1/psi_sl.qm) = afe18282840c05d9ff677a5836381f6985dd0c28 -Size (psi-0.10-20060806-1/psi_sl.qm) = 129990 bytes -SHA1 (psi-0.10-20060806-1/psi_vi.qm) = 68457ded09a981de1c1a04fd06596ced922bc812 -RMD160 (psi-0.10-20060806-1/psi_vi.qm) = f8d444f843e47cd36e3d468a34604b71115bfaa3 -Size (psi-0.10-20060806-1/psi_vi.qm) = 133410 bytes -SHA1 (psi-0.10-20060806-1/psi_zh.qm) = 57c4131b3797eee6e4184f1bd5e7b7381dfefe6b -RMD160 (psi-0.10-20060806-1/psi_zh.qm) = d5c372d9cc4a07bdfcc783222240450cae9bcd28 -Size (psi-0.10-20060806-1/psi_zh.qm) = 72584 bytes +SHA1 (psi-0.11-20071115-1/psi-0.11.tar.bz2) = 834fac4b51d92e2502cb08d01d40f05ffcdce4a2 +RMD160 (psi-0.11-20071115-1/psi-0.11.tar.bz2) = 0e4ce707d7659e02d29b16d6d95a4c4c8ba9850a +Size (psi-0.11-20071115-1/psi-0.11.tar.bz2) = 2000216 bytes SHA1 (patch-aa) = 1cc8ebcc9317f48e1a1548e6a3895f57899f6cb7 SHA1 (patch-ac) = 011dfae070e171628ce03471c76360aa1f4a30d4 SHA1 (patch-ad) = 01c71c5a00284570b919a5d244fe0e96d141138e -- cgit v1.2.3