- Update to 0.12

Changelog:	http://forum.psi-im.org/thread/5043

PR:		126080
Submitted by:	Sergei Golyashov <athathoth@yandex.ru>
Approved by:	portmgr (pav)

9 files changed, 41 insertions, 55 deletions

diff --git a/net-im/psi/Makefile b/net-im/psi/Makefile
index bdfeff0aebb9..4631f98de973 100644
--- a/net-im/psi/Makefile
+++ b/net-im/psi/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	psi
-DISTVERSION=	0.11
+DISTVERSION=	0.12
 CATEGORIES=	net-im
 MASTER_SITES=	SF
 
@@ -21,18 +21,19 @@ USE_QT_VER=	4
 QT_COMPONENTS=	corelib dbus gui iconengines imageformats qt3support \
 		inputmethods moc network rcc script svg uic xml
 
-
 CONFIGURE_ENV=	QMAKESPEC=${LOCALBASE}/share/qt4/mkspecs/freebsd-g++ \
 		PTHREAD_CFLAGS=${PTHREAD_CFLAGS} \
 		PTHREAD_LDFLAGS=${PTHREAD_LIBS} \
 		KDEDIR=${LOCALBASE}
 CONFIGURE_ARGS=	--prefix=${PREFIX} --qtdir=${LOCALBASE} \
-		--with-qca-inc=${LOCALBASE}/include/QtCrypto \
-		--with-qca-lib=${LOCALBASE}/lib \
-		--disable-growl --disable-dnotify --disable-ghbnr
+		--disable-growl --disable-ghbnr
 MAKE_ARGS+=	QTDIR=${QT_PREFIX} \
 		QMAKESPEC=${LOCALBASE}/share/qt4/mkspecs/freebsd-g++
 
+post-patch:
+	#fix build when libzip is installed
+	cd ${WRKSRC}/src/tools/zip && ${LN} zip.h psi-zip.h
+
 post-install:
 	${STRIP_CMD} ${PREFIX}/bin/psi
 
diff --git a/net-im/psi/distinfo b/net-im/psi/distinfo
index f77a91498fcb..46f07ee1c58f 100644
--- a/net-im/psi/distinfo
+++ b/net-im/psi/distinfo
@@ -1,3 +1,3 @@
-MD5 (psi-0.11.tar.bz2) = 6ccc81783eece7959140951289cf5310
-SHA256 (psi-0.11.tar.bz2) = be37b7b8d86e965362512f47bf68af2b21d35e5c886a9e0eccf1c9bc519706b3
-SIZE (psi-0.11.tar.bz2) = 2000216
+MD5 (psi-0.12.tar.bz2) = 47b654c944ef8766b860fe0645615d18
+SHA256 (psi-0.12.tar.bz2) = 0309d48891ab18cb8afc15416db2e9db979bc66f5cd879b382de226043e91e6c
+SIZE (psi-0.12.tar.bz2) = 2122406
diff --git a/net-im/psi/files/patch-iris_jaber_s5b.cpp b/net-im/psi/files/patch-iris_jaber_s5b.cpp
deleted file mode 100644
index 9e7723015432..000000000000
--- a/net-im/psi/files/patch-iris_jaber_s5b.cpp
+++ /dev/null
@@ -1,10 +0,0 @@
---- iris/jabber/s5b.cpp.orig	Fri Apr  8 09:22:20 2005
-+++ iris/jabber/s5b.cpp	Fri Apr  8 09:22:48 2005
-@@ -31,6 +31,7 @@
- #ifdef Q_OS_WIN
- # include <windows.h>
- #else
-+# include <sys/types.h>
- # include <netinet/in.h>
- #endif
- 
diff --git a/net-im/psi/files/patch-src-tools-iconset_iconset.cpp b/net-im/psi/files/patch-src-tools-iconset_iconset.cpp
new file mode 100644
index 000000000000..b1a0487b753f
--- /dev/null
+++ b/net-im/psi/files/patch-src-tools-iconset_iconset.cpp
@@ -0,0 +1,11 @@
+--- ./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
new file mode 100644
index 000000000000..d4e492e85cdd
--- /dev/null
+++ b/net-im/psi/files/patch-src-tools-zip_zip.cpp
@@ -0,0 +1,11 @@
+--- ./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/files/patch-third-party-qca-cyrus-sasl.cpp b/net-im/psi/files/patch-third-party-qca-cyrus-sasl.cpp
deleted file mode 100644
index 844a17a47907..000000000000
--- a/net-im/psi/files/patch-third-party-qca-cyrus-sasl.cpp
+++ /dev/null
@@ -1,10 +0,0 @@
---- third-party/qca/qca-cyrus-sasl/qca-cyrus-sasl.cpp.orig	2007-10-14 18:00:57.000000000 +0400
-+++ third-party/qca/qca-cyrus-sasl/qca-cyrus-sasl.cpp	2008-02-06 18:08:20.000000000 +0300
-@@ -20,6 +20,7 @@
-  */
- 
- #include <QtCrypto>
-+#include <qcaprovider.h>
- #include <QDebug>
- #include <QtCore/qplugin.h>
- 
diff --git a/net-im/psi/files/patch-third-party-qca-gnupg.cpp b/net-im/psi/files/patch-third-party-qca-gnupg.cpp
deleted file mode 100644
index f682a1837e40..000000000000
--- a/net-im/psi/files/patch-third-party-qca-gnupg.cpp
+++ /dev/null
@@ -1,10 +0,0 @@
---- third-party/qca/qca-gnupg/qca-gnupg.cpp.orig	2008-02-06 18:10:33.000000000 +0300
-+++ third-party/qca/qca-gnupg/qca-gnupg.cpp	2008-02-06 18:10:39.000000000 +0300
-@@ -17,6 +17,7 @@
-  */
- 
- #include <QtCrypto>
-+#include <qcaprovider.h>
- #include <QtPlugin>
- 
- #ifdef Q_OS_MAC
diff --git a/net-im/psi/files/patch-third-party-qca-ossl.cpp b/net-im/psi/files/patch-third-party-qca-ossl.cpp
deleted file mode 100644
index 7626150c0b3d..000000000000
--- a/net-im/psi/files/patch-third-party-qca-ossl.cpp
+++ /dev/null
@@ -1,10 +0,0 @@
---- third-party/qca/qca-ossl/qca-ossl.cpp.orig	2007-10-14 18:00:57.000000000 +0400
-+++ third-party/qca/qca-ossl/qca-ossl.cpp	2008-02-06 18:09:55.000000000 +0300
-@@ -19,6 +19,7 @@
-  */
- 
- #include <QtCrypto>
-+#include <qcaprovider.h>
- 
- #include <QDebug>
- #include <QtCore/qplugin.h>
diff --git a/net-im/psi/pkg-plist b/net-im/psi/pkg-plist
index 94e4e8b6a9cf..5b57b6112317 100644
--- a/net-im/psi/pkg-plist
+++ b/net-im/psi/pkg-plist
@@ -10,6 +10,7 @@ share/icons/hicolor/64x64/apps/psi.png
 %%DATADIR%%/certs/README
 %%DATADIR%%/certs/rootcerts.pem
 %%DATADIR%%/certs/startcom_ca.crt
+%%DATADIR%%/certs/startcom_ca_new.crt
 %%DATADIR%%/iconsets/emoticons/default/angry.png
 %%DATADIR%%/iconsets/emoticons/default/bat.png
 %%DATADIR%%/iconsets/emoticons/default/beer.png
@@ -76,6 +77,7 @@ share/icons/hicolor/64x64/apps/psi.png
 %%DATADIR%%/iconsets/roster/default/perr.png
 %%DATADIR%%/iconsets/roster/default/system.png
 %%DATADIR%%/iconsets/roster/default/xa.png
+%%DATADIR%%/iconsets/roster/stellar-1.jisp
 %%DATADIR%%/iconsets/system/README
 %%DATADIR%%/iconsets/system/default/account.png
 %%DATADIR%%/iconsets/system/default/add.png
@@ -155,6 +157,7 @@ share/icons/hicolor/64x64/apps/psi.png
 %%DATADIR%%/iconsets/system/default/whiteboarding/erase.png
 %%DATADIR%%/iconsets/system/default/whiteboarding/group.png
 %%DATADIR%%/iconsets/system/default/whiteboarding/rotate.png
+%%DATADIR%%/iconsets/system/default/whiteboarding/save.png
 %%DATADIR%%/iconsets/system/default/whiteboarding/scale.png
 %%DATADIR%%/iconsets/system/default/whiteboarding/scroll.png
 %%DATADIR%%/iconsets/system/default/whiteboarding/select.png
@@ -182,16 +185,16 @@ share/icons/hicolor/64x64/apps/psi.png
 @dirrm %%DATADIR%%/iconsets
 @dirrm %%DATADIR%%/certs
 @dirrm %%DATADIR%%
-@dirrmtry share/applications
-@dirrmtry share/icons/hicolor/16x16/apps
-@dirrmtry share/icons/hicolor/16x16
-@dirrmtry share/icons/hicolor/32x32/apps
-@dirrmtry share/icons/hicolor/32x32
-@dirrmtry share/icons/hicolor/48x48/apps
-@dirrmtry share/icons/hicolor/48x48
 @dirrmtry share/icons/hicolor/64x64/apps
 @dirrmtry share/icons/hicolor/64x64
+@dirrmtry share/icons/hicolor/48x48/apps
+@dirrmtry share/icons/hicolor/48x48
+@dirrmtry share/icons/hicolor/32x32/apps
+@dirrmtry share/icons/hicolor/32x32
+@dirrmtry share/icons/hicolor/16x16/apps
+@dirrmtry share/icons/hicolor/16x16
 @dirrmtry share/icons/hicolor/128x128/apps
 @dirrmtry share/icons/hicolor/128x128
 @dirrmtry share/icons/hicolor
 @dirrmtry share/icons
+@dirrmtry share/applications