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

1 files changed, 14 insertions, 36 deletions

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"