From cfbd1d6089510d492ec85ce4763b59dbb4d9e824 Mon Sep 17 00:00:00 2001
From: arved <arved@FreeBSD.org>
Date: Thu, 20 Jan 2011 13:27:22 +0000
Subject: Unbreak on amd64

Feature safe:	yes
---
 net-im/iserverd/Makefile                             |  2 +-
 net-im/iserverd/files/patch-database-contacvs_db.cpp | 14 ++++++++++++++
 net-im/iserverd/files/patch-isdcore-sockets-kq.cpp   | 20 ++++++++++++++++++++
 net-im/iserverd/files/patch-system-signals.cpp       | 11 +++++++++++
 4 files changed, 46 insertions(+), 1 deletion(-)
 create mode 100644 net-im/iserverd/files/patch-database-contacvs_db.cpp
 create mode 100644 net-im/iserverd/files/patch-isdcore-sockets-kq.cpp
 create mode 100644 net-im/iserverd/files/patch-system-signals.cpp

(limited to 'net-im')

diff --git a/net-im/iserverd/Makefile b/net-im/iserverd/Makefile
index bf7d8dbc758f..aad6e2da76ce 100644
--- a/net-im/iserverd/Makefile
+++ b/net-im/iserverd/Makefile
@@ -36,7 +36,7 @@ MAN8=		iserverd.8
 .include <bsd.port.pre.mk>
 
 .if ${OSVERSION} >= 700042
-.if ${ARCH} == "amd64" || ${ARCH} == "sparc64"
+.if ${ARCH} == "sparc64"
 BROKEN=		Does not compile with GCC 4.2
 .endif
 .endif
diff --git a/net-im/iserverd/files/patch-database-contacvs_db.cpp b/net-im/iserverd/files/patch-database-contacvs_db.cpp
new file mode 100644
index 000000000000..b1c1322674cc
--- /dev/null
+++ b/net-im/iserverd/files/patch-database-contacvs_db.cpp
@@ -0,0 +1,14 @@
+--- database/contacts_db.cpp.orig	2011-01-20 14:17:48.000000000 +0100
++++ database/contacts_db.cpp	2011-01-20 14:19:28.000000000 +0100
+@@ -252,9 +252,9 @@
+       }
+       
+       *contact = (unsigned long *)malloc(sizeof(unsigned long)*number);
+-      DEBUG(200, ("Trying to malloc %d bytes for %d records (result: %06X)\n",
++      DEBUG(200, ("Trying to malloc %d bytes for %d records (result: %06X)\n",
+                   (sizeof(unsigned long)*number), number, 
+-		  (unsigned int)*contact));
++		  *contact));
+ 		
+       for (int i=0;i<number;i++) (*contact)[i] = atoul(PQgetvalue(res, i, 0));	
+ 
diff --git a/net-im/iserverd/files/patch-isdcore-sockets-kq.cpp b/net-im/iserverd/files/patch-isdcore-sockets-kq.cpp
new file mode 100644
index 000000000000..27d39be46522
--- /dev/null
+++ b/net-im/iserverd/files/patch-isdcore-sockets-kq.cpp
@@ -0,0 +1,20 @@
+--- isdcore/sockets-kq.cpp.orig	2011-01-20 14:15:51.000000000 +0100
++++ isdcore/sockets-kq.cpp	2011-01-20 14:16:45.000000000 +0100
+@@ -58,7 +58,7 @@
+ void process_socket()
+ {
+    int i;
+-   unsigned int udata_index = 0;
++   uintptr_t udata_index = 0;
+    
+    pack_processed = 0;		/* number of processed by server packets  */
+    Packet upacket;		/* udp socket processor temporal packet   */
+@@ -86,7 +86,7 @@
+ 
+       for(i = 0; i < nsockets; i++)
+       {
+-         udata_index = (unsigned int)sock_kev[i].udata;
++         udata_index = (uintptr_t)sock_kev[i].udata;
+ 	 
+          /* socket errors handler */
+          if(sock_kev[i].flags & EV_ERROR)
diff --git a/net-im/iserverd/files/patch-system-signals.cpp b/net-im/iserverd/files/patch-system-signals.cpp
new file mode 100644
index 000000000000..52b01bdc0f82
--- /dev/null
+++ b/net-im/iserverd/files/patch-system-signals.cpp
@@ -0,0 +1,11 @@
+--- system/signals.cpp.orig	2011-01-20 14:21:46.000000000 +0100
++++ system/signals.cpp	2011-01-20 14:22:51.000000000 +0100
+@@ -274,7 +274,7 @@
+ 		   
+      fprintf(ftrace, "IServerd stack backtrace dump: \n\n");
+ 
+-#ifdef HAVE_BACKTRACE  
++#if 0
+      /* trying to dump stack backtrace */
+      void *addr_array[32];
+      int addr_num = backtrace(addr_array, 32);
-- 
cgit