Fix broken amd64 build.

5 files changed, 150 insertions, 1 deletions

diff --git a/chat/centericq/distinfo b/chat/centericq/distinfo
index 74eae919f34..ffd29787445 100644
--- a/chat/centericq/distinfo
+++ b/chat/centericq/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.23 2007/07/19 00:43:40 lkundrak Exp $
+$NetBSD: distinfo,v 1.24 2008/08/02 20:26:21 dholland Exp $
 
 SHA1 (centericq-4.21.0.tar.bz2) = 26b07c4bdcbe8c6888ceab98140b33007bec8554
 RMD160 (centericq-4.21.0.tar.bz2) = 69207fcaf5c90b9ae4609221526b839659c5ccfc
@@ -29,3 +29,7 @@ SHA1 (patch-aw) = 20b682ce67e9d026a1253e2ce7546eea1d924282
 SHA1 (patch-ax) = a96edcc859b30fde6e6577a833005fab8d45eabf
 SHA1 (patch-ay) = 46ca8c7a9828c471aa760089f2271f21c9cf0ce6
 SHA1 (patch-az) = 4542871c64fffb311cc464bc0b25fb59ef2db3b3
+SHA1 (patch-ba) = 5535fde395fe6e77e8e8ed5f81e38e0db302c09d
+SHA1 (patch-bb) = b47e899ba23e06817afffe42d51a52025ebded13
+SHA1 (patch-bc) = 2aecc91589d53bd9a5a4331a4702b6485788f674
+SHA1 (patch-bd) = abb61646b41fed2d6bfcf28f1de0f0466569607e
diff --git a/chat/centericq/patches/patch-ba b/chat/centericq/patches/patch-ba
new file mode 100644
index 00000000000..2d4abe0a852
--- /dev/null
+++ b/chat/centericq/patches/patch-ba
@@ -0,0 +1,13 @@
+$NetBSD: patch-ba,v 1.1 2008/08/02 20:26:21 dholland Exp $
+
+--- kkconsui-0.1/src/texteditor.cc~	2003-09-09 17:51:33.000000000 -0400
++++ kkconsui-0.1/src/texteditor.cc	2008-08-02 16:05:41.000000000 -0400
+@@ -1940,7 +1940,7 @@ void texteditor::undorecordfree(void *p)
+ }
+ 
+ int texteditor::findint(void *p1, void *p2) {
+-    return *(int *) p1 != (int) p2;
++    return *(int *) p1 != (int)(intptr_t) p2;
+ }
+ 
+ int texteditor::findhighline(void *p1, void *p2) {
diff --git a/chat/centericq/patches/patch-bb b/chat/centericq/patches/patch-bb
new file mode 100644
index 00000000000..f0b92361bbd
--- /dev/null
+++ b/chat/centericq/patches/patch-bb
@@ -0,0 +1,25 @@
+$NetBSD: patch-bb,v 1.1 2008/08/02 20:26:21 dholland Exp $
+
+--- kkstrtext-0.1/kkstrtext.cc~	2005-01-31 19:13:24.000000000 -0500
++++ kkstrtext-0.1/kkstrtext.cc	2008-08-02 16:08:30.000000000 -0400
+@@ -430,9 +430,11 @@ int stringcompare(void *s1, void *s2) {
+     }
+ }
+ 
++#if 0 /* unused */
+ int intcompare(void *s1, void *s2) {
+     return (int) s1 != (int) s2;
+ }
++#endif
+ 
+ string i2str(int i) {
+     char buf[64];
+@@ -885,7 +887,7 @@ string siconv(const string &atext, const
+ #ifdef HAVE_ICONV
+     iconv_t cd = iconv_open(tocs.c_str(), fromcs.c_str());
+ 
+-    if(((int) cd) != -1) {
++    if (cd != (iconv_t)-1) {
+ 	string r, text(atext);
+ 	size_t inleft, outleft, soutleft;
+ 	char *inbuf, *outbuf, *sinbuf, *soutbuf;
diff --git a/chat/centericq/patches/patch-bc b/chat/centericq/patches/patch-bc
new file mode 100644
index 00000000000..7585a132cfa
--- /dev/null
+++ b/chat/centericq/patches/patch-bc
@@ -0,0 +1,49 @@
+$NetBSD: patch-bc,v 1.1 2008/08/02 20:26:21 dholland Exp $
+
+--- src/icqdialogs.cc~	2005-05-23 17:16:52.000000000 -0400
++++ src/icqdialogs.cc	2008-08-02 16:13:22.000000000 -0400
+@@ -894,7 +894,7 @@ void icqface::selectcountry(unsigned sho
+     i = m.open();
+     m.close();
+ 
+-    if(i) f = (unsigned short) ((int) m.getref(i-1));
++    if(i) f = (unsigned short) ((int)(intptr_t) m.getref(i-1));
+ }
+ 
+ void icqface::selectlanguage(unsigned short &f) {
+@@ -946,7 +946,7 @@ void icqface::selectgender(imgender &f) 
+     int i = m.open();
+     m.close();
+ 
+-    if(i) f = (imgender) ((int) m.getref(i-1));
++    if(i) f = (imgender) ((int)(intptr_t) m.getref(i-1));
+ }
+ 
+ void icqface::selectagerange(ICQ2000::AgeRange &r) {
+@@ -967,7 +967,7 @@ void icqface::selectagerange(ICQ2000::Ag
+     int i = m.open();
+     m.close();
+ 
+-    if(i) r = (ICQ2000::AgeRange) ((int) m.getref(i-1));
++    if(i) r = (ICQ2000::AgeRange) ((int)(intptr_t) m.getref(i-1));
+ }
+ 
+ bool icqface::edit(string &txt, const string &header) {
+@@ -1256,7 +1256,7 @@ bool icqface::updateconf(icqconf::regsou
+ 
+ 	void *p;
+ 	finished = !db.open(n, b, &p);
+-	i = (int) p;
++	i = (int)(intptr_t) p;
+ 
+ 	if(!finished)
+ 	switch(b) {
+@@ -1750,7 +1750,7 @@ void icqface::transfermonitor() {
+ 	    it = transfers.end();
+ 
+ 	    if(!db.gettree()->isnode(db.gettree()->getid(np-1)))
+-		it = transfers.begin() + (int) db.getmenu()->getref(n-1);
++		it = transfers.begin() + (intptr_t) db.getmenu()->getref(n-1);
+ 
+ 	    switch(b) {
+ 		case 0:
diff --git a/chat/centericq/patches/patch-bd b/chat/centericq/patches/patch-bd
new file mode 100644
index 00000000000..ef475ae79a0
--- /dev/null
+++ b/chat/centericq/patches/patch-bd
@@ -0,0 +1,58 @@
+$NetBSD: patch-bd,v 1.1 2008/08/02 20:26:21 dholland Exp $
+
+--- src/icqface.cc~	2005-08-27 21:33:21.000000000 -0400
++++ src/icqface.cc	2008-08-02 16:15:47.000000000 -0400
+@@ -401,7 +401,7 @@ int icqface::contextmenu(icqcontact *c) 
+ 
+     m.scale();
+     m.idle = &menuidle;
+-    i = (int) m.getref(m.open()-1);
++    i = (int)(intptr_t) m.getref(m.open()-1);
+     m.close();
+ 
+     if(i) lastr = i;
+@@ -450,7 +450,7 @@ int icqface::generalmenu() {
+ 
+     if(i) {
+ 	lastitem = i-1;
+-	r = (int) m.getref(lastitem);
++	r = (int)(intptr_t) m.getref(lastitem);
+     }
+ 
+     return r;
+@@ -513,7 +513,7 @@ icqcontact *icqface::mainloop(int &actio
+ 	    g = 0;
+ 	}
+ 	
+-	if((unsigned int) c < 100) c = 0;
++	if((uintptr_t) c < 100) c = 0;
+ 
+ 	if(i) {
+ 	    switch(action = extk) {
+@@ -1484,7 +1484,7 @@ bool icqface::changestatus(vector<protoc
+ 	m.scale();
+ 
+ 	i = m.open();
+-	choice = (int) m.getref(i-1);
++	choice = (int)(intptr_t) m.getref(i-1);
+ 
+ 	m.close();
+     }
+@@ -1539,7 +1539,7 @@ bool icqface::changestatus(vector<protoc
+ 	m.close();
+ 
+ 	if(r = i) {
+-	    st = (imstatus) ((int) m.getref(i-1));
++	    st = (imstatus) ((int)(intptr_t) m.getref(i-1));
+ 	}
+     }
+ 
+@@ -2132,7 +2132,7 @@ void icqface::quickfind(verticalmenu *mu
+ 			    c = (icqcontact *) cm->getref(i);
+ 			}
+ 
+-			if((unsigned int) c > 100) {
++			if((uintptr_t) c > 100) {
+ 			    string current = c->getdispnick();
+ 			    len = current.size();
+ 			    if(len > nick.size()) len = nick.size();