summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--chat/psi/DESCR7
-rw-r--r--chat/psi/Makefile51
-rw-r--r--chat/psi/PLIST17
-rw-r--r--chat/psi/distinfo15
-rw-r--r--chat/psi/patches/patch-ad21
-rw-r--r--chat/psi/patches/patch-ah16
-rw-r--r--chat/psi/patches/patch-ak16
-rw-r--r--chat/psi/patches/patch-al16
8 files changed, 128 insertions, 31 deletions
diff --git a/chat/psi/DESCR b/chat/psi/DESCR
index 9f23d5e539f..352e23f6904 100644
--- a/chat/psi/DESCR
+++ b/chat/psi/DESCR
@@ -1,6 +1,5 @@
-Jabber is an open, XML based Instant Messaging system that seeks
-to be the standard IM network. It is a distributed system, created
-from the ground up, not relying upon central servers.
+XMPP is an open, XML based, distributed, Instant Messaging system
+that seeks to be the standard IM network.
Psi is a client for the Jabber system. Written in C++ and based on
the Qt library, there are versions available for NetBSD, Linux (and
@@ -22,4 +21,4 @@ Features:
* Language plugins
* OpenPGP integration (via GnuPG)
* Groupchat invites / private-messaging
-* File upload
+* File transfer
diff --git a/chat/psi/Makefile b/chat/psi/Makefile
index d057f1c0e62..18404349530 100644
--- a/chat/psi/Makefile
+++ b/chat/psi/Makefile
@@ -1,26 +1,25 @@
-# $NetBSD: Makefile,v 1.59 2010/11/15 22:56:29 abs Exp $
+# $NetBSD: Makefile,v 1.60 2011/01/02 23:53:12 schnoebe Exp $
-PSI_VERSION= 0.12.1
+PSI_VERSION= 0.14
DISTNAME= psi-${PSI_VERSION}
-PKGREVISION= # empty
-PKGREVISION= 5
+PKGNAME= ${DISTNAME:S/-rc/rc/}
CATEGORIES= chat
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=psi/}
EXTRACT_SUFX= .tar.bz2
-MAINTAINER= jdolecek@NetBSD.org
+MAINTAINER= eric@cirr.com
HOMEPAGE= http://psi-im.org/
-COMMENT= PSI Jabber Client
+COMMENT= Psi XMPP/Jabber Client
+LICENSE= gnu-gpl-v2
PKG_DESTDIR_SUPPORT= user-destdir
DEPENDS+= qca2-ossl>=2.0.0beta3:../../security/qca2-ossl
-DIST_SUBDIR= ${DISTNAME}-20071115-1
-DISTFILES= ${DISTNAME}${EXTRACT_SUFX} ${LANG_FILES}
-EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX}
+DIST_SUBDIR= ${DISTNAME}
+DISTFILES= ${DEFAULT_DISTFILES} ${LANG_PACK}
-USE_TOOLS+= gmake
+USE_TOOLS+= gmake unzip
USE_LANGUAGES= c c++
USE_LIBTOOL= yes
HAS_CONFIGURE= yes
@@ -33,35 +32,43 @@ CONFIGURE_ARGS+= --disable-bundled-qca
CONFIGURE_ARGS+= --with-zlib-inc=${BUILDLINK_PREFIX.zlib}/include
CONFIGURE_ARGS+= --with-zlib-lib=${BUILDLINK_PREFIX.zlib}/lib
-# 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=
+#
+# LANG_PACK is an archive of all the translations..
+#
+LANG_PACK=psi-0.14_langpack_2009-12-02.zip
+SITES.${LANG_PACK}= http://fs.scs-tsa.de/psi_l10n/
-.for l in ${LANG_FILES}
-SITES.${l}= http://psi-im.org/files/translation/${PSI_VERSION}/
-.endfor
+#
+# LANG_FILES are the translations we're going to install
+#
+
+LANG_FILES= be/psi_be.qm cs/psi_cs.qm de/psi_de.qm fr/psi_fr.qm \
+ it/psi_it.qm ja/psi_ja.qm pl/psi_pl.qm ru/psi_ru.qm \
+ sl/psi_sl.qm sv/psi_sv.qm pt_BR/psi_pt_BR.qm \
+ ur_PK/psi_ur_PK.qm zh_TW/psi_zh_TW.qm
INSTALLATION_DIRS= bin share/psi share/doc/psi
INSTALL_DIRS= src
INSTALL_TARGET= install_target install_sharedfiles
INSTALL_MAKE_FLAGS= INSTALL_ROOT=${DESTDIR}
-# custom install targets, we don't want psi to install the desktop & icon
-# stuff
+.include "options.mk"
+
post-install:
+ # remove some files that shouldn't be there,
+ # install some files where they should be installed
${INSTALL_DATA} ${WRKSRC}/README ${DESTDIR}${PREFIX}/share/doc/psi
${RM} ${DESTDIR}${PREFIX}/share/psi/README
${INSTALL_DATA} ${WRKSRC}/COPYING ${DESTDIR}${PREFIX}/share/doc/psi
${RM} ${DESTDIR}${PREFIX}/share/psi/COPYING
+ # install the translations
.for f in ${LANG_FILES}
- ${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/${f} ${DESTDIR}${PREFIX}/share/psi
+ ${INSTALL_DATA} ${WRKDIR}/${f} ${DESTDIR}${PREFIX}/share/psi
.endfor
- ${INSTALL_PROGRAM} ${WRKSRC}/psi ${DESTDIR}${PREFIX}/bin/psi
.include "../../devel/libidn/buildlink3.mk"
.include "../../devel/zlib/buildlink3.mk"
.include "../../security/qca2/buildlink3.mk"
+BUILDLINK_API_DEPENDS.qt4-libs+= qt4-libs>=4.4.0
.include "../../x11/qt4-libs/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/chat/psi/PLIST b/chat/psi/PLIST
index 850b79dc84b..6b776db4ce4 100644
--- a/chat/psi/PLIST
+++ b/chat/psi/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.13 2009/06/14 17:37:48 joerg Exp $
+@comment $NetBSD: PLIST,v 1.14 2011/01/02 23:53:12 schnoebe Exp $
bin/psi
share/doc/psi/COPYING
share/doc/psi/README
@@ -54,6 +54,7 @@ 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/call.png
share/psi/iconsets/roster/default/chat.fading.png
share/psi/iconsets/roster/default/chatty.png
share/psi/iconsets/roster/default/dnd.png
@@ -96,6 +97,7 @@ share/psi/iconsets/system/default/events.png
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/icondef.xml
@@ -161,6 +163,19 @@ 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_be.qm
+share/psi/psi_cs.qm
+share/psi/psi_de.qm
+share/psi/psi_fr.qm
+share/psi/psi_it.qm
+share/psi/psi_ja.qm
+share/psi/psi_pl.qm
+share/psi/psi_ru.qm
+share/psi/psi_sl.qm
+share/psi/psi_sv.qm
+share/psi/psi_pt_BR.qm
+share/psi/psi_ur_PK.qm
+share/psi/psi_zh_TW.qm
share/psi/sound/chat1.wav
share/psi/sound/chat2.wav
share/psi/sound/ft_complete.wav
diff --git a/chat/psi/distinfo b/chat/psi/distinfo
index a99a1de71d9..0d933256581 100644
--- a/chat/psi/distinfo
+++ b/chat/psi/distinfo
@@ -1,5 +1,12 @@
-$NetBSD: distinfo,v 1.24 2009/05/13 07:26:29 jdolecek Exp $
+$NetBSD: distinfo,v 1.25 2011/01/02 23:53:12 schnoebe Exp $
-SHA1 (psi-0.12.1-20071115-1/psi-0.12.1.tar.bz2) = 6fdcea3a072b40333faecc37acdb925f9bf8c5c3
-RMD160 (psi-0.12.1-20071115-1/psi-0.12.1.tar.bz2) = a5fc850796b0078bc1a03f4ff93a03611ee11e80
-Size (psi-0.12.1-20071115-1/psi-0.12.1.tar.bz2) = 2112404 bytes
+SHA1 (psi-0.14/psi-0.14.tar.bz2) = f5f8e1a427339a4e9113b5fa513b01a42ae1be4b
+RMD160 (psi-0.14/psi-0.14.tar.bz2) = 0c4a07726c2f9819da0f8aa8f1982e939f1fc20f
+Size (psi-0.14/psi-0.14.tar.bz2) = 2168801 bytes
+SHA1 (psi-0.14/psi-0.14_langpack_2009-12-02.zip) = f57b8fc70db64ffb57cb82ab5df9f923961dbde8
+RMD160 (psi-0.14/psi-0.14_langpack_2009-12-02.zip) = 176bfaa4b5f787a7157883b3b806dc23d5a2b78b
+Size (psi-0.14/psi-0.14_langpack_2009-12-02.zip) = 1246445 bytes
+SHA1 (patch-ad) = 3ee21a1cb17637ed650b6b58e5575c8fa246a4f0
+SHA1 (patch-ah) = 0f267b9d6d1615a2111b423d9eb9048961f0da0d
+SHA1 (patch-ak) = 539e272207ab8fcc88e4eaf29ddeb14e37458dbe
+SHA1 (patch-al) = 44d17e5ca70061c13164cadf69b8a5f84648c177
diff --git a/chat/psi/patches/patch-ad b/chat/psi/patches/patch-ad
new file mode 100644
index 00000000000..c2a4575585f
--- /dev/null
+++ b/chat/psi/patches/patch-ad
@@ -0,0 +1,21 @@
+$NetBSD: patch-ad,v 1.5 2011/01/02 23:53:13 schnoebe Exp $
+
+Some old versions of zlib defined OF; not needed, but provide compat for it.
+
+--- src/libpsi/tools/zip/minizip/unzip.h.orig 2007-10-14 09:00:55.000000000 -0500
++++ src/libpsi/tools/zip/minizip/unzip.h
+@@ -49,6 +49,14 @@ extern "C" {
+ #include "zlib.h"
+ #endif
+
++#ifndef OF
++# ifdef STDC
++# define OF(x) x
++# else
++# define OF(x)
++# endif
++#endif
++
+ #if defined(STRICTUNZIP) || defined(STRICTZIPUNZIP)
+ /* like the STRICT of WIN32, we define a pointer that cannot be converted
+ from (void*) without cast */
diff --git a/chat/psi/patches/patch-ah b/chat/psi/patches/patch-ah
new file mode 100644
index 00000000000..123f1687c9c
--- /dev/null
+++ b/chat/psi/patches/patch-ah
@@ -0,0 +1,16 @@
+$NetBSD: patch-ah,v 1.3 2011/01/02 23:53:13 schnoebe Exp $
+
+pkgsrc places idna.h in a different directory than other package
+managers
+
+--- iris/src/xmpp/xmpp-core/connector.cpp.orig 2009-07-16 00:08:57.000000000 -0500
++++ iris/src/xmpp/xmpp-core/connector.cpp
+@@ -37,7 +37,7 @@
+ #include <QUrl>
+ #include <QTimer>
+ #include "safedelete.h"
+-#include <libidn/idna.h>
++#include <idna.h>
+
+ #include "ndns.h"
+
diff --git a/chat/psi/patches/patch-ak b/chat/psi/patches/patch-ak
new file mode 100644
index 00000000000..ede286c8e02
--- /dev/null
+++ b/chat/psi/patches/patch-ak
@@ -0,0 +1,16 @@
+$NetBSD: patch-ak,v 1.1 2011/01/02 23:53:13 schnoebe Exp $
+
+pkgsrc places IDN's stringprep in a different directory than other
+package managers.
+
+--- iris/src/xmpp/jid/jid.cpp.orig 2009-07-16 00:08:57.000000000 -0500
++++ iris/src/xmpp/jid/jid.cpp
+@@ -24,7 +24,7 @@
+ #include <QCoreApplication>
+ #include <QByteArray>
+ #include <QHash>
+-#include <libidn/stringprep.h>
++#include <stringprep.h>
+
+ using namespace XMPP;
+
diff --git a/chat/psi/patches/patch-al b/chat/psi/patches/patch-al
new file mode 100644
index 00000000000..b6798d2b695
--- /dev/null
+++ b/chat/psi/patches/patch-al
@@ -0,0 +1,16 @@
+$NetBSD: patch-al,v 1.1 2011/01/02 23:53:13 schnoebe Exp $
+
+Add NetBSD to the list of resolvers that support threading, having a
+"modern" resolver API.
+
+--- iris/src/jdns/jdns_sys.c.orig 2009-07-26 16:02:12.000000000 -0500
++++ iris/src/jdns/jdns_sys.c
+@@ -679,7 +679,7 @@ static jdns_dnsparams_t *dnsparams_get_u
+ return params;
+ }
+
+-#if defined(__GLIBC__) && ((__GLIBC__ > 2) || ((__GLIBC__ == 2) && (__GLIBC_MINOR__ >= 3)))
++#if defined(__GLIBC__) && ((__GLIBC__ > 2) || ((__GLIBC__ == 2) && (__GLIBC_MINOR__ >= 3))) || defined(JDNS_OS_NETBSD)
+ # define JDNS_MODERN_RES_API
+ #endif
+
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-09 22:03:09 +0000