[pkgsrc/trunk]: pkgsrc/chat/psi Update psi to 0.9.2.

[jdolecek <jdolecek%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/cce089380bd3
branches:  trunk
changeset: 484512:cce089380bd3
user:      jdolecek <jdolecek%pkgsrc.org@localhost>
date:      Sat Nov 27 21:58:17 2004 +0000

description:
Update psi to 0.9.2.

Notable addition is file upload support, other changes are mostly
usability changes and bug fixes. Full list available at
http://psi.affinix.com/?page=changelog.

Internal pkgsrc organization changes:
* depends on qca-tls for SSL support, functionality confirmed working;
  this fixes PR#26120, PR#25444, PR#26665
* uses prepared psi language files, no longer using lrelease (the raw
  language files are not part of distribution), only use DEPMETHOD=build
  for qt3-tools

diffstat:

 chat/psi/DESCR            |    1 +
 chat/psi/MESSAGE          |    6 -
 chat/psi/Makefile         |   57 +++++-
 chat/psi/PLIST            |  378 ++++++++++++++++++++++++++-------------------
 chat/psi/distinfo         |   34 +++-
 chat/psi/patches/patch-aa |   62 -------
 chat/psi/patches/patch-ab |   26 ---
 chat/psi/patches/patch-ac |   14 +-
 8 files changed, 297 insertions(+), 281 deletions(-)

diffs (truncated from 660 to 300 lines):

diff -r 9ee4ba947e29 -r cce089380bd3 chat/psi/DESCR
--- a/chat/psi/DESCR    Sat Nov 27 21:28:56 2004 +0000
+++ b/chat/psi/DESCR    Sat Nov 27 21:58:17 2004 +0000
@@ -22,3 +22,4 @@
 * Language plugins
 * OpenPGP integration (via GnuPG)
 * Groupchat invites / private-messaging
+* File upload
diff -r 9ee4ba947e29 -r cce089380bd3 chat/psi/MESSAGE
--- a/chat/psi/MESSAGE  Sat Nov 27 21:28:56 2004 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,6 +0,0 @@
-===========================================================================
-$NetBSD: MESSAGE,v 1.1 2004/07/12 05:23:38 jdolecek Exp $
-
-Install psi-ssl package for secure encrypted connection support.
-
-===========================================================================
diff -r 9ee4ba947e29 -r cce089380bd3 chat/psi/Makefile
--- a/chat/psi/Makefile Sat Nov 27 21:28:56 2004 +0000
+++ b/chat/psi/Makefile Sat Nov 27 21:58:17 2004 +0000
@@ -1,41 +1,68 @@
-# $NetBSD: Makefile,v 1.18 2004/10/03 00:13:15 tv Exp $
+# $NetBSD: Makefile,v 1.19 2004/11/27 21:58:18 jdolecek Exp $
 
-DISTNAME=      psi-0.9
-PKGREVISION=   5
+PSI_VERSION=   0.9.2
+DISTNAME=      psi-${PSI_VERSION}
+PKGREVISION=   # empty
 CATEGORIES=    chat
-MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=psi/}
+MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=psi/}        \
+               http://psi.affinix.com/?version=${PSI_VERSION}&file=
 EXTRACT_SUFX=  .tar.bz2
 
+DIST_SUBDIR=   ${DISTNAME}
+DISTFILES=     ${DISTNAME}${EXTRACT_SUFX} ${LANG_FILES}
+EXTRACT_ONLY=  ${DISTNAME}${EXTRACT_SUFX}
+
+# XXX uses internal bsd.pkg.mk variable
+FETCH_BEFORE_ARGS+=    -o "${DISTDIR}/${DIST_SUBDIR}/$$bfile"
+
 MAINTAINER=    jdolecek%NetBSD.org@localhost
 HOMEPAGE=      http://psi.affinix.com/
 COMMENT=       PSI Jabber Client
 
+DEPENDS+=      qca-tls>=1.0:../../security/qca-tls
+
 USE_BUILDLINK3=        yes
 USE_GNU_TOOLS+=        make
 USE_LIBTOOL=   yes
 USE_X11=       yes
 HAS_CONFIGURE= yes
 
-CONFIGURE_ARGS+= -p ${PREFIX}
+CONFIGURE_ARGS= --prefix="${PREFIX}" --qtdir="${QTDIR}"
 
+LANG_FILES=    psi_zh.qm psi_nl.qm psi_sk.qm psi_fr.qm psi_fi.qm       \
+               psi_de.qm psi_sw.qm psi_pl.qm psi_mk.qm psi_el.qm       \
+               psi_es.qm psi_ru.qm
+
+# 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}:" < ${BUILD_DIRS}/Makefile \
-               > ${BUILD_DIRS}/Makefile.orig
-       ${MV} ${BUILD_DIRS}/Makefile.orig ${BUILD_DIRS}/Makefile
+       -e "s:/bin/true:${TRUE}:" < ${WRKSRC}/Makefile \
+               > ${WRKSRC}/Makefile.new
+       ${MV} ${WRKSRC}/Makefile.new ${WRKSRC}/Makefile
+       cd ${WRKSRC}/libpsi/psiwidgets && (     \
+               ${QTDIR}/bin/qmake psiwidgets.pro -o Makefile; \
+               ${SED} -e 's,-rpath.*$$,-rpath "${QTDIR}/lib",' < Makefile > Makefile.new; \
+               ${MV} Makefile.new Makefile; \
+               ${LN} -s .libs/libpsiwidgets.so psiwidgets.so; \
+       )
 
 do-install:
-       cd ${WRKSRC} && ${QTDIR}/bin/lrelease psi.pro
        ${INSTALL_DATA_DIR} ${PREFIX}/share/psi
-       cd ${WRKSRC} && ${CP} -f -pR image iconsets sound certs lang/*.qm \
-               README COPYING \
-               ${PREFIX}/share/psi/
-       cd ${WRKSRC} && ${CP} -f psi ${PREFIX}/bin/psi
+       cd ${WRKSRC} && \
+       ${CP} -f -pR iconsets sound certs README COPYING ${PREFIX}/share/psi/
+       for f in ${LANG_FILES}; do \
+               ${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/$$f \
+                        ${PREFIX}/share/psi/; \
+       done
+       ${INSTALL_PROGRAM} ${WRKSRC}/psi ${PREFIX}/bin/psi
 
 .include "../../x11/qt3-libs/buildlink3.mk"
-BUILDLINK_DEPENDS.qt3-tools=   qt3-tools>=3.1.2nb2     # need lrelease
+BUILDLINK_DEPMETHOD.qt3-tools= build
 .include "../../x11/qt3-tools/buildlink3.mk"
-
+.include "../../devel/zlib/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r 9ee4ba947e29 -r cce089380bd3 chat/psi/PLIST
--- a/chat/psi/PLIST    Sat Nov 27 21:28:56 2004 +0000
+++ b/chat/psi/PLIST    Sat Nov 27 21:58:17 2004 +0000
@@ -1,170 +1,230 @@
-@comment $NetBSD: PLIST,v 1.4 2003/07/27 22:23:01 jdolecek Exp $
+@comment $NetBSD: PLIST,v 1.5 2004/11/27 21:58:18 jdolecek Exp $
 bin/psi
-share/psi/image/aim_away.png
-share/psi/image/aim_dnd.png
-share/psi/image/aim_offline.png
-share/psi/image/aim_online.png
-share/psi/image/aim_xa.png
-share/psi/image/find.png
-share/psi/image/gg_away.png
-share/psi/image/gg_dnd.png
-share/psi/image/gg_offline.png
-share/psi/image/gg_online.png
-share/psi/image/gg_xa.png
-share/psi/image/icon_16.png
-share/psi/image/icon_32.png
-share/psi/image/icon_48.png
-share/psi/image/icon_mac.png
-share/psi/image/icq_away.png
-share/psi/image/icq_dnd.png
-share/psi/image/icq_offline.png
-share/psi/image/icq_online.png
-share/psi/image/icq_xa.png
-share/psi/image/key.png
-share/psi/image/key2.png
-share/psi/image/key_bad.png
-share/psi/image/key_unknown.png
-share/psi/image/msn_away.png
-share/psi/image/msn_dnd.png
-share/psi/image/msn_offline.png
-share/psi/image/msn_online.png
-share/psi/image/msn_xa.png
-share/psi/image/psilogo.png
-share/psi/image/smile.png
-share/psi/image/trans_away.png
-share/psi/image/trans_dnd.png
-share/psi/image/trans_offline.png
-share/psi/image/trans_online.png
-share/psi/image/trans_xa.png
-share/psi/image/yahoo_away.png
-share/psi/image/yahoo_dnd.png
-share/psi/image/yahoo_offline.png
-share/psi/image/yahoo_online.png
-share/psi/image/yahoo_xa.png
-share/psi/iconsets/stellar/account.png
-share/psi/iconsets/stellar/add.png
-share/psi/iconsets/stellar/arrow_down.png
-share/psi/iconsets/stellar/arrow_left.png
-share/psi/iconsets/stellar/arrow_right.png
-share/psi/iconsets/stellar/arrow_up.png
-share/psi/iconsets/stellar/ask.png
-share/psi/iconsets/stellar/away.png
-share/psi/iconsets/stellar/changeacc.png
-share/psi/iconsets/stellar/chat.png
-share/psi/iconsets/stellar/chatclear.png
-share/psi/iconsets/stellar/connect.png
-share/psi/iconsets/stellar/desc
-share/psi/iconsets/stellar/dnd.png
-share/psi/iconsets/stellar/emoticon_angry.png
-share/psi/iconsets/stellar/emoticon_bat.png
-share/psi/iconsets/stellar/emoticon_beer.png
-share/psi/iconsets/stellar/emoticon_biggrin.png
-share/psi/iconsets/stellar/emoticon_blush.png
-share/psi/iconsets/stellar/emoticon_boy.png
-share/psi/iconsets/stellar/emoticon_brflower.png
-share/psi/iconsets/stellar/emoticon_brheart.png
-share/psi/iconsets/stellar/emoticon_coffee.png
-share/psi/iconsets/stellar/emoticon_coolglasses.png
-share/psi/iconsets/stellar/emoticon_cry.png
-share/psi/iconsets/stellar/emoticon_cuffs.png
-share/psi/iconsets/stellar/emoticon_devil.png
-share/psi/iconsets/stellar/emoticon_drink.png
-share/psi/iconsets/stellar/emoticon_flower.png
-share/psi/iconsets/stellar/emoticon_frowning.png
-share/psi/iconsets/stellar/emoticon_girl.png
-share/psi/iconsets/stellar/emoticon_heart.png
-share/psi/iconsets/stellar/emoticon_hugleft.png
-share/psi/iconsets/stellar/emoticon_hugright.png
-share/psi/iconsets/stellar/emoticon_kiss.png
-share/psi/iconsets/stellar/emoticon_lamp.png
-share/psi/iconsets/stellar/emoticon_mail.png
-share/psi/iconsets/stellar/emoticon_music.png
-share/psi/iconsets/stellar/emoticon_no.png
-share/psi/iconsets/stellar/emoticon_oh.png
-share/psi/iconsets/stellar/emoticon_phone.png
-share/psi/iconsets/stellar/emoticon_photo.png
-share/psi/iconsets/stellar/emoticon_pussy.png
-share/psi/iconsets/stellar/emoticon_rainbow.png
-share/psi/iconsets/stellar/emoticon_smile.png
-share/psi/iconsets/stellar/emoticon_star.png
-share/psi/iconsets/stellar/emoticon_stare.png
-share/psi/iconsets/stellar/emoticon_tongue.png
-share/psi/iconsets/stellar/emoticon_unhappy.png
-share/psi/iconsets/stellar/emoticon_wink.png
-share/psi/iconsets/stellar/emoticon_yes.png
-share/psi/iconsets/stellar/groupchat.png
-share/psi/iconsets/stellar/groupclose.png
-share/psi/iconsets/stellar/groupempty.png
-share/psi/iconsets/stellar/groupopen.png
-share/psi/iconsets/stellar/headline.png
-share/psi/iconsets/stellar/help.png
-share/psi/iconsets/stellar/history.png
-share/psi/iconsets/stellar/info.png
-share/psi/iconsets/stellar/invisible.png
-share/psi/iconsets/stellar/jabber.png
-share/psi/iconsets/stellar/message.png
-share/psi/iconsets/stellar/noauth.png
-share/psi/iconsets/stellar/offline.png
-share/psi/iconsets/stellar/online.png
-share/psi/iconsets/stellar/options.png
-share/psi/iconsets/stellar/perr.png
-share/psi/iconsets/stellar/pgp.png
-share/psi/iconsets/stellar/play_sounds.png
-share/psi/iconsets/stellar/psimain.png
-share/psi/iconsets/stellar/quit.png
-share/psi/iconsets/stellar/register.png
-share/psi/iconsets/stellar/reload.png
-share/psi/iconsets/stellar/remove.png
-share/psi/iconsets/stellar/search.png
-share/psi/iconsets/stellar/send.png
-share/psi/iconsets/stellar/ssl_no.png
-share/psi/iconsets/stellar/ssl_yes.png
-share/psi/iconsets/stellar/stop.png
-share/psi/iconsets/stellar/system.png
-share/psi/iconsets/stellar/time.png
-share/psi/iconsets/stellar/url.png
-share/psi/iconsets/stellar/xa.png
-share/psi/iconsets/stellar/xml.png
-share/psi/iconsets/lightbulb/away.png
-share/psi/iconsets/lightbulb/chat.png
-share/psi/iconsets/lightbulb/desc
-share/psi/iconsets/lightbulb/dnd.png
-share/psi/iconsets/lightbulb/groupclose.png
-share/psi/iconsets/lightbulb/groupempty.png
-share/psi/iconsets/lightbulb/groupopen.png
-share/psi/iconsets/lightbulb/message.png
-share/psi/iconsets/lightbulb/offline.png
-share/psi/iconsets/lightbulb/online.png
-share/psi/iconsets/lightbulb/system.png
-share/psi/iconsets/lightbulb/xa.png
+share/psi/iconsets/emoticons/default/hugleft.png
+share/psi/iconsets/emoticons/default/devil.png
+share/psi/iconsets/emoticons/default/tongue.png
+share/psi/iconsets/emoticons/default/girl.png
+share/psi/iconsets/emoticons/default/blush.png
+share/psi/iconsets/emoticons/default/drink.png
+share/psi/iconsets/emoticons/default/cry.png
+share/psi/iconsets/emoticons/default/yes.png
+share/psi/iconsets/emoticons/default/rainbow.png
+share/psi/iconsets/emoticons/default/hugright.png
+share/psi/iconsets/emoticons/default/angry.png
+share/psi/iconsets/emoticons/default/unhappy.png
+share/psi/iconsets/emoticons/default/pussy.png
+share/psi/iconsets/emoticons/default/beer.png
+share/psi/iconsets/emoticons/default/music.png
+share/psi/iconsets/emoticons/default/mail.png
+share/psi/iconsets/emoticons/default/heart.png
+share/psi/iconsets/emoticons/default/biggrin.png
+share/psi/iconsets/emoticons/default/brflower.png
+share/psi/iconsets/emoticons/default/kiss.png
+share/psi/iconsets/emoticons/default/flower.png
+share/psi/iconsets/emoticons/default/smile.png
+share/psi/iconsets/emoticons/default/coffee.png
+share/psi/iconsets/emoticons/default/no.png
+share/psi/iconsets/emoticons/default/oh.png
+share/psi/iconsets/emoticons/default/icondef.xml
+share/psi/iconsets/emoticons/default/wink.png
+share/psi/iconsets/emoticons/default/brheart.png
+share/psi/iconsets/emoticons/default/star.png
+share/psi/iconsets/emoticons/default/bat.png
+share/psi/iconsets/emoticons/default/cuffs.png
+share/psi/iconsets/emoticons/default/stare.png
+share/psi/iconsets/emoticons/default/phone.png
+share/psi/iconsets/emoticons/default/lamp.png
+share/psi/iconsets/emoticons/default/photo.png
+share/psi/iconsets/emoticons/default/frowning.png
+share/psi/iconsets/emoticons/default/boy.png
+share/psi/iconsets/emoticons/default/coolglasses.png
+share/psi/iconsets/emoticons/README
+share/psi/iconsets/roster/default/perr.png
+share/psi/iconsets/roster/default/headline.png
+share/psi/iconsets/roster/default/online.png
+share/psi/iconsets/roster/default/dnd.png
+share/psi/iconsets/roster/default/message.png
+share/psi/iconsets/roster/default/away.png
+share/psi/iconsets/roster/default/chat.png
+share/psi/iconsets/roster/default/system.png
+share/psi/iconsets/roster/default/ffc.png
+share/psi/iconsets/roster/default/file.png
+share/psi/iconsets/roster/default/offline.png
+share/psi/iconsets/roster/default/groupempty.png