pkgsrc-bugs: pkg/37345: Update chat/psi to 0.11

Subject: pkg/37345: Update chat/psi to 0.11
To: None <pkg-manager@netbsd.org, gnats-admin@netbsd.org,>
From: None <eschnoebelen@efjohnson.com>
List: pkgsrc-bugs
Date: 11/08/2007 21:40:01
>Number:         37345
>Category:       pkg
>Synopsis:       update chat/psi to 0.11
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    pkg-manager
>State:          open
>Class:          change-request
>Submitter-Id:   net
>Arrival-Date:   Thu Nov 08 21:40:01 +0000 2007
>Originator:     Eric Schnoebelen
>Release:        NetBSD 4.99.31
>Organization:
Eric Schnoebelen	eschnoebelen@efjohnson.com		eric@cirr.com
"He made a lot of mistakes.  But he made mistakes in good directions, so 
 eventually he got to the right answers.  I tried to imitate him, but I 
 found out that it is very difficult to make good mistakes." -- Goro Simura
>Environment:
System: NetBSD duke 4.99.31 NetBSD 4.99.31 (GENERIC.MP) #13: Fri Sep 21 18:44:46 CDT 2007 eric@egsner.cirr.com:/work/eric/NetBSD-current/obj/amd64/sys/arch/amd64/compile/GENERIC.MP amd64
Architecture: x86_64
Machine: amd64
>Description:
The Psi Project (I think that's what they call themselves) has
released a new version of their Psi XMPP client.

The new version has a number of new features, and requires Qt 4.3.1.
>How-To-Repeat:
>Fix:
The following patches will bring the package up to 0.11.

These patches need to be removed, as they are no longer needed.

	patches/patch-ai patches/patch-aj patches/patch-af
	patches/patch-ag patches/patch-aa

Index: Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/chat/psi/Makefile,v
retrieving revision 1.49
diff -b -u -w -r1.49 Makefile
--- Makefile	20 Feb 2007 16:23:22 -0000	1.49
+++ Makefile	8 Nov 2007 20:18:22 -0000
@@ -1,8 +1,7 @@
 # $NetBSD: Makefile,v 1.49 2007/02/20 16:23:22 rillig 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,8 +10,6 @@
 HOMEPAGE=	http://psi-im.org/
 COMMENT=	PSI Jabber Client
 
-DEPENDS+=	qca-tls>=1.0:../../security/qca-tls
-
 DIST_SUBDIR=	${DISTNAME}-20060806-1
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} ${LANG_FILES}
 EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
@@ -26,55 +23,35 @@
 
 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+=	--with-zlib-inc=${BUILDLINK_PREFIX.zlib}/include
 CONFIGURE_ARGS+=	--with-zlib-lib=${BUILDLINK_PREFIX.zlib}/lib
+CONFIGURE_ARGS+=	--with-aspell-inc=${BUILDLINK_PREFIX.aspell}/include
+CONFIGURE_ARGS+=	--with-aspell-lib=${BUILDLINK_PREFIX.aspell}/lib
+CONFIGURE_ARGS+=	--with-openssl-inc=${BUILDLINK_PREFIX.openssl}/include
+CONFIGURE_ARGS+=	--with-openssl-lib=${BUILDLINK_PREFIX.openssl}/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
-
-.for l in ${LANG_FILES}
-SITES.${l}=	http://psi-im.org/files/translation/${PSI_VERSION}/
-.endfor
 
-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; \
-	)
-
-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
-	${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/psi
-.for f in ${LANG_FILES}
-	${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/${f} ${PREFIX}/share/psi
-.endfor
-	${INSTALL_PROGRAM} ${WRKSRC}/psi ${PREFIX}/bin/psi
+#
+# LANG_FILES left for when the translations get released in a few weeks
+#	the PLIST will also need to be updated at that time.
+#
+# 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
+
+# .for l in ${LANG_FILES}
+# SITES.${l}=	http://psi-im.org/files/translation/${PSI_VERSION}/
+# .endfor
+
+INSTALLATION_DIRS=	bin share/psi share/doc/psi
 
+.include "../../textproc/aspell/buildlink3.mk"
 .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 "../../security/openssl/buildlink3.mk"
+BUILDLINK_API_DEPENDS.qt4-libs+=	qt4-libs>=4.3.2
+.include "../../x11/qt4-libs/buildlink3.mk"
+BUILDLINK_API_DEPENDS.qt4-tools+=	qt4-tools>=4.3.2
+.include "../../x11/qt4-tools/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
Index: PLIST
===================================================================
RCS file: /cvsroot/pkgsrc/chat/psi/PLIST,v
retrieving revision 1.9
diff -b -w -u -r1.9 PLIST
--- PLIST	2 Mar 2006 23:00:46 -0000	1.9
+++ PLIST	8 Nov 2007 20:15:40 -0000
@@ -1,9 +1,16 @@
-@comment $NetBSD: PLIST,v 1.9 2006/03/02 23:00:46 wiz Exp $
+@comment $NetBSD$
 bin/psi
-share/doc/psi/README
+share/applications/psi.desktop
+share/icons/hicolor/128x128/apps/psi.png
+share/icons/hicolor/16x16/apps/psi.png
+share/icons/hicolor/32x32/apps/psi.png
+share/icons/hicolor/48x48/apps/psi.png
+share/icons/hicolor/64x64/apps/psi.png
+share/psi/COPYING
+share/psi/README
 share/psi/certs/README
-share/psi/certs/rootcert.xml
-share/psi/iconsets/emoticons/README
+share/psi/certs/rootcerts.pem
+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 +60,19 @@
 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 +90,10 @@
 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 +103,17 @@
 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 +121,7 @@
 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 +129,7 @@
 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 +144,27 @@
 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
@@ -173,7 +173,7 @@
 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
@@ -183,4 +183,3 @@
 @dirrm share/psi/iconsets
 @dirrm share/psi/certs
 @dirrm share/psi
-@dirrm share/doc/psi
Index: distinfo
===================================================================
RCS file: /cvsroot/pkgsrc/chat/psi/distinfo,v
retrieving revision 1.21
diff -b -w -u -r1.21 distinfo
--- distinfo	4 Dec 2006 22:06:40 -0000	1.21
+++ distinfo	8 Nov 2007 20:15:40 -0000
@@ -1,59 +1,10 @@
 $NetBSD: distinfo,v 1.21 2006/12/04 22:06:40 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 (patch-aa) = 1cc8ebcc9317f48e1a1548e6a3895f57899f6cb7
-SHA1 (patch-ac) = 011dfae070e171628ce03471c76360aa1f4a30d4
-SHA1 (patch-ad) = 01c71c5a00284570b919a5d244fe0e96d141138e
-SHA1 (patch-ae) = 93896bc73cb834a42d81e3eed1419940b75a49a0
-SHA1 (patch-af) = 3be7b02847bbc1c552a15334ae1ba158b030326b
-SHA1 (patch-ag) = ed53824947298272f5ac83af91bf59186d544b93
-SHA1 (patch-ah) = 97eba977a7519488b2d3bef0ed2cbc3e2636de9b
-SHA1 (patch-ai) = 06d0e9dc7aa67ca42462779acf4d2978904df66b
-SHA1 (patch-aj) = b7f7b3ccc5333f50fcde36bab3a3bc120900f37b
+SHA1 (psi-0.11-20060806-1/psi-0.11.tar.bz2) = 834fac4b51d92e2502cb08d01d40f05ffcdce4a2
+RMD160 (psi-0.11-20060806-1/psi-0.11.tar.bz2) = 0e4ce707d7659e02d29b16d6d95a4c4c8ba9850a
+Size (psi-0.11-20060806-1/psi-0.11.tar.bz2) = 2000216 bytes
+SHA1 (patch-ac) = 2eb54f0b984bc336daf3a643b8cce887cd614bcb
+SHA1 (patch-ad) = 19ac57e2662be8b02be735cd57bb80da97345bf8
+SHA1 (patch-ae) = 6d107097862c7793547abf3cd738654ee3fbbe81
+SHA1 (patch-ah) = c10ccecaeb81ef86f15e324b6e102c6b4a433ac5
+SHA1 (patch-ai) = 09b2cc1f67c9d9dc9bf3de0cc8de19b707c20110
Index: patches/patch-ac
===================================================================
RCS file: /cvsroot/pkgsrc/chat/psi/patches/patch-ac,v
retrieving revision 1.7
diff -b -w -u -r1.7 patch-ac
--- patches/patch-ac	23 Jan 2006 17:05:02 -0000	1.7
+++ patches/patch-ac	8 Nov 2007 20:15:40 -0000
@@ -1,17 +1,16 @@
-$NetBSD: patch-ac,v 1.7 2006/01/23 17:05:02 xtraeme Exp $
+$NetBSD$
 
---- src/psi_profiles.cpp.orig	2006-01-23 16:20:44.000000000 +0100
-+++ src/psi_profiles.cpp	2006-01-23 16:21:15.000000000 +0100
-@@ -441,7 +441,11 @@
- 	prefs.rosterOpacity = 95;
+--- src/psi_profiles.cpp.orig	2007-10-14 09:00:53.000000000 -0500
++++ src/psi_profiles.cpp
+@@ -546,7 +546,11 @@ void UserProfile::reset()
+ 	prefs.clNewHeadings = false;
  	prefs.outlineHeadings = false;
  
--	prefs.player = "play";
 +#ifdef __NetBSD__
 +	prefs.player = "audioplay";
 +#else
-+	prefs.player = "player";
+ 	prefs.player = "play";
 +#endif
  	prefs.noAwaySound = FALSE;
  
- 	prefs.onevent[eMessage]    = g.pathBase + "/sound/chat2.wav";
+ 	prefs.onevent[eMessage]    = ApplicationInfo::resourcesDir() + "/sound/chat2.wav";
Index: patches/patch-ad
===================================================================
RCS file: /cvsroot/pkgsrc/chat/psi/patches/patch-ad,v
retrieving revision 1.3
diff -b -w -u -r1.3 patch-ad
--- patches/patch-ad	23 Jan 2006 17:05:02 -0000	1.3
+++ patches/patch-ad	8 Nov 2007 20:15:40 -0000
@@ -1,8 +1,8 @@
-$NetBSD: patch-ad,v 1.3 2006/01/23 17:05:02 xtraeme Exp $
+$NetBSD$
 
---- src/tools/zip/minizip/unzip.h.orig	2006-01-23 16:41:21.000000000 +0100
-+++ src/tools/zip/minizip/unzip.h	2006-01-23 16:41:41.000000000 +0100
-@@ -49,6 +49,15 @@
+--- src/tools/zip/minizip/unzip.h.orig	2007-10-14 09:00:55.000000000 -0500
++++ src/tools/zip/minizip/unzip.h
+@@ -49,6 +49,14 @@ extern "C" {
  #include "zlib.h"
  #endif
  
@@ -14,7 +14,6 @@
 +#  endif
 +#endif
 +
-+
  #if defined(STRICTUNZIP) || defined(STRICTZIPUNZIP)
  /* like the STRICT of WIN32, we define a pointer that cannot be converted
      from (void*) without cast */
Index: patches/patch-ae
===================================================================
RCS file: /cvsroot/pkgsrc/chat/psi/patches/patch-ae,v
retrieving revision 1.1
diff -b -w -u -r1.1 patch-ae
--- patches/patch-ae	1 Oct 2005 22:02:00 -0000	1.1
+++ patches/patch-ae	8 Nov 2007 20:15:40 -0000
@@ -1,18 +1,18 @@
-$NetBSD: patch-ae,v 1.1 2005/10/01 22:02:00 jdolecek Exp $
+$NetBSD$
 
---- iris.pri.orig	2005-10-01 22:20:56.000000000 +0200
-+++ iris.pri	2005-10-01 22:22:05.000000000 +0200
+--- iris/iris.pri.orig	2007-10-14 09:00:49.000000000 -0500
++++ iris/iris.pri
 @@ -1,7 +1,10 @@
  # libidn
--LIBIDN_BASE = $$IRIS_BASE/libidn
+-LIBIDN_BASE = $$PWD/libidn
 -CONFIG += libidn
--include($$IRIS_BASE/libidn.pri)
-+#LIBIDN_BASE = $$IRIS_BASE/libidn
+-include($$PWD/libidn.pri)
++# LIBIDN_BASE = $$PWD/libidn
 +#CONFIG += libidn
-+#include($$IRIS_BASE/libidn.pri)
++# include($$PWD/libidn.pri)
 +unix:{
 +	LIBS += -lidn
 +}
  
- # qca
- #unix:{
+ # IrisNet
+ irisnet {
Index: patches/patch-ah
===================================================================
RCS file: /cvsroot/pkgsrc/chat/psi/patches/patch-ah,v
retrieving revision 1.1
diff -b -w -u -r1.1 patch-ah
--- patches/patch-ah	23 Oct 2006 21:49:31 -0000	1.1
+++ patches/patch-ah	8 Nov 2007 20:15:40 -0000
@@ -1,25 +1,13 @@
-$NetBSD: patch-ah,v 1.1 2006/10/23 21:49:31 jdolecek Exp $
+$NetBSD$
 
---- iris/xmpp-core/connector.cpp.orig	2006-10-23 23:00:30.000000000 +0200
+--- iris/xmpp-core/connector.cpp.orig	2007-10-14 09:00:50.000000000 -0500
 +++ iris/xmpp-core/connector.cpp
-@@ -38,14 +38,14 @@
- #ifdef NO_NDNS
- #include<qdns.h>
- #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"
+@@ -36,7 +36,7 @@
+ #include <QList>
+ #include <QUrl>
+ #include "safedelete.h"
+-#include <libidn/idna.h>
++#include <idna.h>
  
- //#define XMPP_DEBUG
+ #ifdef NO_NDNS
+ #include <q3dns.h>

diff -buw /dev/null patches/patch-ak
--- /dev/null	2007-11-08 14:05:48.000000000 -0600
+++ patches/patch-ak	2007-11-07 10:00:58.000000000 -0600
@@ -0,0 +1,13 @@
+$NetBSD$
+
+--- iris/xmpp-core/jid.cpp.orig	2007-10-14 09:00:50.000000000 -0500
++++ iris/xmpp-core/jid.cpp
+@@ -23,7 +23,7 @@
+ #include <QApplication>
+ #include <QByteArray>
+ #include <QHash>
+-#include <libidn/stringprep.h>
++#include <stringprep.h>
+ 
+ 
+ using namespace XMPP;