Attachment #89197 for bug #126080




#

PORTNAME=	psi
DISTVERSION=	0.12
CATEGORIES=	net-im
MASTER_SITES=	SF


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} \
		--disable-growl --disable-ghbnr
		--with-qca-lib=${LOCALBASE}/lib \
		--disable-growl --disable-dnotify --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


Lines 1-3 Link Here

(-)/home/makc/porting/ports/net-im/psi/distinfo (-3 / +3 lines)
1	MD5 (psi-0.11.tar.bz2) = 6ccc81783eece7959140951289cf5310	1	MD5 (psi-0.12.tar.bz2) = 47b654c944ef8766b860fe0645615d18
2	SHA256 (psi-0.11.tar.bz2) = be37b7b8d86e965362512f47bf68af2b21d35e5c886a9e0eccf1c9bc519706b3	2	SHA256 (psi-0.12.tar.bz2) = 0309d48891ab18cb8afc15416db2e9db979bc66f5cd879b382de226043e91e6c
3	SIZE (psi-0.11.tar.bz2) = 2000216	3	SIZE (psi-0.12.tar.bz2) = 2122406

Lines 1-10 Link Here

(-)/home/makc/porting/ports/net-im/psi/files/patch-iris_jaber_s5b.cpp (-10 lines)
1	--- iris/jabber/s5b.cpp.orig Fri Apr 8 09:22:20 2005
2	+++ iris/jabber/s5b.cpp Fri Apr 8 09:22:48 2005
3	@@ -31,6 +31,7 @@
4	#ifdef Q_OS_WIN
5	# include <windows.h>
6	#else
7	+# include <sys/types.h>
8	# include <netinet/in.h>
9	#endif
10

Line 0 Link Here

(-)/home/makc/porting/ports/net-im/psi/files/patch-src__tools__iconset__iconset.cpp (+11 lines)
	1	--- ./src/tools/iconset/iconset.cpp.orig 2008-03-19 01:24:57.000000000 +0300
	2	+++ ./src/tools/iconset/iconset.cpp 2008-07-30 01:53:45.000000000 +0400
	3	@@ -50,7 +50,7 @@
	4	#endif
	5
	6	#ifdef ICONSET_ZIP
	7	-# include "zip.h"
	8	+# include "psi-zip.h"
	9	#endif
	10
	11	#include <QApplication>

Line 0 Link Here

(-)/home/makc/porting/ports/net-im/psi/files/patch-src__tools__zip__zip.cpp (+11 lines)
	1	--- ./src/tools/zip/zip.cpp.orig 2007-04-08 12:19:03.000000000 +0400
	2	+++ ./src/tools/zip/zip.cpp 2008-07-30 01:52:00.000000000 +0400
	3	@@ -23,7 +23,7 @@
	4	#include <QFile>
	5
	6	#include "minizip/unzip.h"
	7	-#include "zip.h"
	8	+#include "psi-zip.h"
	9
	10	class UnZipPrivate
	11	{

Lines 1-10 Link Here

(-)/home/makc/porting/ports/net-im/psi/files/patch-third-party-qca-cyrus-sasl.cpp (-10 lines)
1	--- third-party/qca/qca-cyrus-sasl/qca-cyrus-sasl.cpp.orig 2007-10-14 18:00:57.000000000 +0400
2	+++ third-party/qca/qca-cyrus-sasl/qca-cyrus-sasl.cpp 2008-02-06 18:08:20.000000000 +0300
3	@@ -20,6 +20,7 @@
4	*/
5
6	#include <QtCrypto>
7	+#include <qcaprovider.h>
8	#include <QDebug>
9	#include <QtCore/qplugin.h>
10

Lines 1-10 Link Here

(-)/home/makc/porting/ports/net-im/psi/files/patch-third-party-qca-gnupg.cpp (-10 lines)
1	--- third-party/qca/qca-gnupg/qca-gnupg.cpp.orig 2008-02-06 18:10:33.000000000 +0300
2	+++ third-party/qca/qca-gnupg/qca-gnupg.cpp 2008-02-06 18:10:39.000000000 +0300
3	@@ -17,6 +17,7 @@
4	*/
5
6	#include <QtCrypto>
7	+#include <qcaprovider.h>
8	#include <QtPlugin>
9
10	#ifdef Q_OS_MAC

Lines 1-10 Link Here

(-)/home/makc/porting/ports/net-im/psi/files/patch-third-party-qca-ossl.cpp (-10 lines)
1	--- third-party/qca/qca-ossl/qca-ossl.cpp.orig 2007-10-14 18:00:57.000000000 +0400
2	+++ third-party/qca/qca-ossl/qca-ossl.cpp 2008-02-06 18:09:55.000000000 +0300
3	@@ -19,6 +19,7 @@
4	*/
5
6	#include <QtCrypto>
7	+#include <qcaprovider.h>
8
9	#include <QDebug>
10	#include <QtCore/qplugin.h>




%%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

%%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

%%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

@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

Return to bug 126080

Lines 6-12 Link Here

(-)/home/makc/porting/ports/net-im/psi/Makefile (-5 / +6 lines)
6	#	6	#
7		7
8	PORTNAME= psi	8	PORTNAME= psi
9	DISTVERSION= 0.11	9	DISTVERSION= 0.12
10	CATEGORIES= net-im	10	CATEGORIES= net-im
11	MASTER_SITES= SF	11	MASTER_SITES= SF
12		12
Lines 21-38 Link Here
21	QT_COMPONENTS= corelib dbus gui iconengines imageformats qt3support \	21	QT_COMPONENTS= corelib dbus gui iconengines imageformats qt3support \
22	inputmethods moc network rcc script svg uic xml	22	inputmethods moc network rcc script svg uic xml
23		23
24
25	CONFIGURE_ENV= QMAKESPEC=${LOCALBASE}/share/qt4/mkspecs/freebsd-g++ \	24	CONFIGURE_ENV= QMAKESPEC=${LOCALBASE}/share/qt4/mkspecs/freebsd-g++ \
26	PTHREAD_CFLAGS=${PTHREAD_CFLAGS} \	25	PTHREAD_CFLAGS=${PTHREAD_CFLAGS} \
27	PTHREAD_LDFLAGS=${PTHREAD_LIBS} \	26	PTHREAD_LDFLAGS=${PTHREAD_LIBS} \
28	KDEDIR=${LOCALBASE}	27	KDEDIR=${LOCALBASE}
29	CONFIGURE_ARGS= --prefix=${PREFIX} --qtdir=${LOCALBASE} \	28	CONFIGURE_ARGS= --prefix=${PREFIX} --qtdir=${LOCALBASE} \
30	--with-qca-inc=${LOCALBASE}/include/QtCrypto \	29	--disable-growl --disable-ghbnr
31	--with-qca-lib=${LOCALBASE}/lib \
32	--disable-growl --disable-dnotify --disable-ghbnr
33	MAKE_ARGS+= QTDIR=${QT_PREFIX} \	30	MAKE_ARGS+= QTDIR=${QT_PREFIX} \
34	QMAKESPEC=${LOCALBASE}/share/qt4/mkspecs/freebsd-g++	31	QMAKESPEC=${LOCALBASE}/share/qt4/mkspecs/freebsd-g++
35		32
		33	post-patch:
		34	#fix build when libzip is installed
		35	cd ${WRKSRC}/src/tools/zip && ${LN} zip.h psi-zip.h
		36
36	post-install:	37	post-install:
37	${STRIP_CMD} ${PREFIX}/bin/psi	38	${STRIP_CMD} ${PREFIX}/bin/psi
38		39

Lines 10-15 Link Here

(-)/home/makc/porting/ports/net-im/psi/pkg-plist (-7 / +10 lines)
10	%%DATADIR%%/certs/README	10	%%DATADIR%%/certs/README
11	%%DATADIR%%/certs/rootcerts.pem	11	%%DATADIR%%/certs/rootcerts.pem
12	%%DATADIR%%/certs/startcom_ca.crt	12	%%DATADIR%%/certs/startcom_ca.crt
		13	%%DATADIR%%/certs/startcom_ca_new.crt
13	%%DATADIR%%/iconsets/emoticons/default/angry.png	14	%%DATADIR%%/iconsets/emoticons/default/angry.png
14	%%DATADIR%%/iconsets/emoticons/default/bat.png	15	%%DATADIR%%/iconsets/emoticons/default/bat.png
15	%%DATADIR%%/iconsets/emoticons/default/beer.png	16	%%DATADIR%%/iconsets/emoticons/default/beer.png
Lines 76-81 Link Here
76	%%DATADIR%%/iconsets/roster/default/perr.png	77	%%DATADIR%%/iconsets/roster/default/perr.png
77	%%DATADIR%%/iconsets/roster/default/system.png	78	%%DATADIR%%/iconsets/roster/default/system.png
78	%%DATADIR%%/iconsets/roster/default/xa.png	79	%%DATADIR%%/iconsets/roster/default/xa.png
		80	%%DATADIR%%/iconsets/roster/stellar-1.jisp
79	%%DATADIR%%/iconsets/system/README	81	%%DATADIR%%/iconsets/system/README
80	%%DATADIR%%/iconsets/system/default/account.png	82	%%DATADIR%%/iconsets/system/default/account.png
81	%%DATADIR%%/iconsets/system/default/add.png	83	%%DATADIR%%/iconsets/system/default/add.png
Lines 155-160 Link Here
155	%%DATADIR%%/iconsets/system/default/whiteboarding/erase.png	157	%%DATADIR%%/iconsets/system/default/whiteboarding/erase.png
156	%%DATADIR%%/iconsets/system/default/whiteboarding/group.png	158	%%DATADIR%%/iconsets/system/default/whiteboarding/group.png
157	%%DATADIR%%/iconsets/system/default/whiteboarding/rotate.png	159	%%DATADIR%%/iconsets/system/default/whiteboarding/rotate.png
		160	%%DATADIR%%/iconsets/system/default/whiteboarding/save.png
158	%%DATADIR%%/iconsets/system/default/whiteboarding/scale.png	161	%%DATADIR%%/iconsets/system/default/whiteboarding/scale.png
159	%%DATADIR%%/iconsets/system/default/whiteboarding/scroll.png	162	%%DATADIR%%/iconsets/system/default/whiteboarding/scroll.png
160	%%DATADIR%%/iconsets/system/default/whiteboarding/select.png	163	%%DATADIR%%/iconsets/system/default/whiteboarding/select.png
Lines 182-197 Link Here
182	@dirrm %%DATADIR%%/iconsets	185	@dirrm %%DATADIR%%/iconsets
183	@dirrm %%DATADIR%%/certs	186	@dirrm %%DATADIR%%/certs
184	@dirrm %%DATADIR%%	187	@dirrm %%DATADIR%%
185	@dirrmtry share/applications
186	@dirrmtry share/icons/hicolor/16x16/apps
187	@dirrmtry share/icons/hicolor/16x16
188	@dirrmtry share/icons/hicolor/32x32/apps
189	@dirrmtry share/icons/hicolor/32x32
190	@dirrmtry share/icons/hicolor/48x48/apps
191	@dirrmtry share/icons/hicolor/48x48
192	@dirrmtry share/icons/hicolor/64x64/apps	188	@dirrmtry share/icons/hicolor/64x64/apps
193	@dirrmtry share/icons/hicolor/64x64	189	@dirrmtry share/icons/hicolor/64x64
		190	@dirrmtry share/icons/hicolor/48x48/apps
		191	@dirrmtry share/icons/hicolor/48x48
		192	@dirrmtry share/icons/hicolor/32x32/apps
		193	@dirrmtry share/icons/hicolor/32x32
		194	@dirrmtry share/icons/hicolor/16x16/apps
		195	@dirrmtry share/icons/hicolor/16x16
194	@dirrmtry share/icons/hicolor/128x128/apps	196	@dirrmtry share/icons/hicolor/128x128/apps
195	@dirrmtry share/icons/hicolor/128x128	197	@dirrmtry share/icons/hicolor/128x128
196	@dirrmtry share/icons/hicolor	198	@dirrmtry share/icons/hicolor
197	@dirrmtry share/icons	199	@dirrmtry share/icons
		200	@dirrmtry share/applications