Update to 0.13

Mark MAKE_JOBS_SAFE

6 files changed, 21 insertions, 32 deletions

diff --git a/net-im/psi/Makefile b/net-im/psi/Makefile
index 7eaee8a5f451..c846da4360ea 100644
--- a/net-im/psi/Makefile
+++ b/net-im/psi/Makefile
@@ -6,15 +6,15 @@
 #
 
 PORTNAME=	psi
-DISTVERSION=	0.12.1
-PORTREVISION=	2
+PORTVERSION=	0.13
 CATEGORIES=	net-im
 MASTER_SITES=	SF
 
 MAINTAINER=	makc@FreeBSD.org
 COMMENT=	A Qt-based Jabber client
 
-LIB_DEPENDS=	qca.2:${PORTSDIR}/devel/qca
+LIB_DEPENDS=	qca.2:${PORTSDIR}/devel/qca \
+		aspell.16:${PORTSDIR}/textproc/aspell
 RUN_DEPENDS=	qca-ossl>=2.0.0.b3:${PORTSDIR}/security/qca-ossl \
 		qca-gnupg>=2.0.0.b3:${PORTSDIR}/security/qca-gnupg
 
@@ -26,11 +26,12 @@ QT_COMPONENTS=	corelib dbus gui iconengines imageformats qt3support \
 		qmake_build moc_build rcc_build uic_build
 
 CONFIGURE_ARGS=	--prefix=${PREFIX} --qtdir=${LOCALBASE} \
-		--disable-growl --disable-ghbnr --disable-bundled-qca
+		--with-aspell-inc=${LOCALBASE}/include \
+		--with-aspell-lib=${LOCALBASE}/lib \
+		--disable-growl --disable-ghbnr --disable-bundled-qca \
+		--verbose
 
-post-patch:
-#fix build when libzip is installed
-	cd ${WRKSRC}/src/tools/zip && ${LN} zip.h psi-zip.h
+MAKE_JOBS_SAFE=	yes
 
 post-install:
 	${STRIP_CMD} ${PREFIX}/bin/psi
diff --git a/net-im/psi/distinfo b/net-im/psi/distinfo
index 39e8102f2fce..d0e45f537fd8 100644
--- a/net-im/psi/distinfo
+++ b/net-im/psi/distinfo
@@ -1,3 +1,3 @@
-MD5 (psi-0.12.1.tar.bz2) = da273e45daef04ffc8338708e96e9173
-SHA256 (psi-0.12.1.tar.bz2) = a8022faadbbe15bc4691338b1d83400adf069f773b7fa3b462552515990b277e
-SIZE (psi-0.12.1.tar.bz2) = 2112404
+MD5 (psi-0.13.tar.bz2) = ddc1a2a35dc155ca46ad6ecaeccdf894
+SHA256 (psi-0.13.tar.bz2) = 4e7771cd79b251656f3435d8d4f261ff367f8c69492576fd63ced03dcb87e070
+SIZE (psi-0.13.tar.bz2) = 2180062
diff --git a/net-im/psi/files/patch-iris__src__libbase.pri b/net-im/psi/files/patch-iris__src__libbase.pri
new file mode 100644
index 000000000000..ad906e902918
--- /dev/null
+++ b/net-im/psi/files/patch-iris__src__libbase.pri
@@ -0,0 +1,8 @@
+--- ./iris/src/libbase.pri.orig	2009-07-27 01:02:12.000000000 +0400
++++ ./iris/src/libbase.pri	2009-08-10 13:57:28.000000000 +0400
+@@ -5,4 +5,4 @@
+ 
+ include(../common.pri)
+ 
+-QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.3
++#QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.3
diff --git a/net-im/psi/files/patch-src-tools-iconset_iconset.cpp b/net-im/psi/files/patch-src-tools-iconset_iconset.cpp
deleted file mode 100644
index b1a0487b753f..000000000000
--- a/net-im/psi/files/patch-src-tools-iconset_iconset.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./src/tools/iconset/iconset.cpp.orig	2008-03-19 01:24:57.000000000 +0300
-+++ ./src/tools/iconset/iconset.cpp	2008-07-30 01:53:45.000000000 +0400
-@@ -50,7 +50,7 @@
- #endif
- 
- #ifdef ICONSET_ZIP
--#	include "zip.h"
-+#	include "psi-zip.h"
- #endif
- 
- #include <QApplication>
diff --git a/net-im/psi/files/patch-src-tools-zip_zip.cpp b/net-im/psi/files/patch-src-tools-zip_zip.cpp
deleted file mode 100644
index d4e492e85cdd..000000000000
--- a/net-im/psi/files/patch-src-tools-zip_zip.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./src/tools/zip/zip.cpp.orig	2007-04-08 12:19:03.000000000 +0400
-+++ ./src/tools/zip/zip.cpp	2008-07-30 01:52:00.000000000 +0400
-@@ -23,7 +23,7 @@
- #include <QFile>
- 
- #include "minizip/unzip.h"
--#include "zip.h"
-+#include "psi-zip.h"
- 
- class UnZipPrivate
- {
diff --git a/net-im/psi/pkg-plist b/net-im/psi/pkg-plist
index a6dce8d37292..3ab0acc61221 100644
--- a/net-im/psi/pkg-plist
+++ b/net-im/psi/pkg-plist
@@ -59,6 +59,7 @@ share/icons/hicolor/64x64/apps/psi.png
 %%DATADIR%%/iconsets/roster/crystal-yahoo.jisp
 %%DATADIR%%/iconsets/roster/default/ask.png
 %%DATADIR%%/iconsets/roster/default/away.png
+%%DATADIR%%/iconsets/roster/default/call.png
 %%DATADIR%%/iconsets/roster/default/chat.fading.png
 %%DATADIR%%/iconsets/roster/default/chatty.png
 %%DATADIR%%/iconsets/roster/default/dnd.png
@@ -101,6 +102,7 @@ share/icons/hicolor/64x64/apps/psi.png
 %%DATADIR%%/iconsets/system/default/eye_blue.png
 %%DATADIR%%/iconsets/system/default/filemanager.png
 %%DATADIR%%/iconsets/system/default/groupchat.png
+%%DATADIR%%/iconsets/system/default/gstreamer-logo-50.png
 %%DATADIR%%/iconsets/system/default/help.png
 %%DATADIR%%/iconsets/system/default/history.png
 %%DATADIR%%/iconsets/system/default/icondef.xml