- Fix build on 4.x [1]

- Fix master site grouping
- Add additional patch

PR:		ports/98175
Submitted by:	Shaun Amott (maintainer)
Reported by:	krismail [1]

3 files changed, 49 insertions, 2 deletions

diff --git a/net-im/psi/Makefile.gentoo b/net-im/psi/Makefile.gentoo
index 77ac4971031..1db48022899 100644
--- a/net-im/psi/Makefile.gentoo
+++ b/net-im/psi/Makefile.gentoo
@@ -6,10 +6,11 @@
 #
 
 MASTER_SITES+=	http://vivid.dat.pl/psi/:vivid \
+		http://mirror.inerd.com/FreeBSD/distfiles/psi-gentoo/:inerd \
 		http://csociety-ftp.ecn.purdue.edu/pub/gentoo-portage/net-im/psi/files/:portage \
-		${MASTER_SITE_GENTOO:C/gentoo\/%SUBDIR%/gentoo-portage\/net-im\/psi\/files/g}:portage
+		${MASTER_SITE_GENTOO:C/gentoo\/%SUBDIR%\//gentoo-portage\/net-im\/psi\/files\/:portage/g}
 
-DISTFILES=	${DISTNAME}${EXTRACT_SUFX} gentoo-psi-0.10.tar.bz2:vivid psi-indicator.png:portage
+DISTFILES=	${DISTNAME}${EXTRACT_SUFX} gentoo-psi-0.10.tar.bz2:vivid psi-indicator.png:portage psi-reverse_trayicon2.patch:inerd
 EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX} gentoo-psi-0.10.tar.bz2
 GENTOO_PATCHES=	${WRKDIR}/0.10
 PKGNAMESUFFIX=	-gentoo
@@ -158,6 +159,9 @@ post-patch::
 
 	${GPATCH} -d ${WRKSRC} -p1 < ${GENTOO_PATCHES}/psi-gentoo-version.patch
 
+	${CP} ${DISTDIR}/psi-reverse_trayicon2.patch ${GENTOO_PATCHES}
+	${GPATCH} -d ${WRKSRC} -p0 < ${GENTOO_PATCHES}/psi-reverse_trayicon2.patch
+
 	# Repair Makefile
 	${MV} ${WRKSRC}/src/psiaccount.cpp ${WRKSRC}/src/psiaccount.cpp.orig
 	${SED} 	-e 's/include"adhoc.h"/include"..\/adhoc.h"/' \
@@ -165,6 +169,8 @@ post-patch::
 		-e 's/include"adhoc_fileserver.h"/include"..\/adhoc_fileserver.h"/' \
 		${WRKSRC}/src/psiaccount.cpp.orig > ${WRKSRC}/src/psiaccount.cpp
 
+	cd ${WRKSRC} && ${PATCH} < ${FILESDIR}/gentoopatch-src_psiaccount.cpp
+
 	# Move misplaced files
 	${MV} 	${WRKSRC}/adhoc.cpp \
 		${WRKSRC}/adhoc.h \
diff --git a/net-im/psi/distinfo b/net-im/psi/distinfo
index df52df0fbda..a4deabba383 100644
--- a/net-im/psi/distinfo
+++ b/net-im/psi/distinfo
@@ -7,3 +7,6 @@ SIZE (gentoo-psi-0.10.tar.bz2) = 211538
 MD5 (psi-indicator.png) = 0d5cafd17325fc912c4855252d73378f
 SHA256 (psi-indicator.png) = a0e9adcd0409d23c9033170ceb8f22980ba6d5e14f19234630f9986bfb94bce2
 SIZE (psi-indicator.png) = 300
+MD5 (psi-reverse_trayicon2.patch) = c2528c15be8277434647506d791663d8
+SHA256 (psi-reverse_trayicon2.patch) = 2a690a7cda661884ce3424530ac6569a7fcb1e6c97342c120767a0d5058c403c
+SIZE (psi-reverse_trayicon2.patch) = 937
diff --git a/net-im/psi/files/gentoopatch-src_psiaccount.cpp b/net-im/psi/files/gentoopatch-src_psiaccount.cpp
new file mode 100644
index 00000000000..d18c53baa7b
--- /dev/null
+++ b/net-im/psi/files/gentoopatch-src_psiaccount.cpp
@@ -0,0 +1,38 @@
+--- src/psiaccount.cpp.orig	Tue May 30 22:17:08 2006
++++ src/psiaccount.cpp	Tue May 30 19:40:01 2006
+@@ -3049,13 +3049,13 @@
+ 
+ 		values["Sender.jid.full"] = jidSender.full();
+ 		values["Sender.jid.bare"] = jidSender.bare();
+-		values["Sender.nick"]     = (uSender)? uSender->name() : "";
+-		values["Sender.nick-jid"] = jidnick(jidSender.bare(), (uSender)? uSender->name() : "");
++		values["Sender.nick"]     = (uSender)? uSender->name() : (QString)"";
++		values["Sender.nick-jid"] = jidnick(jidSender.bare(), (uSender)? uSender->name() : (QString)"");
+ 
+ 		values["Me.jid.full"] = jidMe.resource().isEmpty()? jidMe.full() + "/" + d->client->resource() : jidMe.full();
+ 		values["Me.jid.bare"] = jidMe.bare();
+-		values["Me.nick"]     = (uMe)? uMe->name() : "";;
+-		values["Me.nick-jid"] = jidnick(jidMe.bare(), (uMe)? uMe->name() : "");
++		values["Me.nick"]     = (uMe)? uMe->name() : (QString)"";;
++		values["Me.nick-jid"] = jidnick(jidMe.bare(), (uMe)? uMe->name() : (QString)"");
+ 
+ 		header = headerTemplate.expand(values);
+ 	}
+@@ -3081,7 +3081,7 @@
+ 
+ 		Template::ExpandData values;
+ 		
+-		values["fortune"] = (option.fortunes.count())? option.fortunes[rand()%option.fortunes.count()] : "";
++		values["fortune"] = (option.fortunes.count())? option.fortunes[rand()%option.fortunes.count()] : (QString)"";
+ 
+ 		signature = signatureTemplate.expand(values);
+ 
+@@ -3146,7 +3146,7 @@
+ 		sepBody = "\n";
+ 
+ 	// signature
+-	QString signature = (option.useMessageSignature)? expandSignatureTemplate(option.messageSignature, option.autoMessageSignatureDelimiter,FALSE) : "";
++	QString signature = (option.useMessageSignature)? expandSignatureTemplate(option.messageSignature, option.autoMessageSignatureDelimiter,FALSE) : (QString)"";
+ 
+ 	// body/signature separator
+ 	//		we want to have one empty line between body and signature (at least two '\n');