fix nasty LP64 bugs the prevented the pkg from even being compiled (much

less run).  Patches have been feed back to the author.

4 files changed, 142 insertions, 1 deletions

diff --git a/chat/gtkyahoo/distinfo b/chat/gtkyahoo/distinfo
index 0fca7b0e91f..253e23af9bf 100644
--- a/chat/gtkyahoo/distinfo
+++ b/chat/gtkyahoo/distinfo
@@ -1,5 +1,8 @@
-$NetBSD: distinfo,v 1.1.1.1 2001/10/23 02:04:32 jlam Exp $
+$NetBSD: distinfo,v 1.2 2002/03/31 14:13:45 dmcmahill Exp $
 
 SHA1 (gtkyahoo-0.18.2.tar.gz) = c1aa66766049635a328e59783a7f7a2afd7b9de7
 Size (gtkyahoo-0.18.2.tar.gz) = 300728 bytes
 SHA1 (patch-aa) = b599a96a20e45878b4222759bd747a68dbd61ed9
+SHA1 (patch-ab) = b6713fa9b89bfcd937112bd136413bcb46ca7f77
+SHA1 (patch-ac) = 3725e1aec98f23fe4cc3dbc06df816c97862feac
+SHA1 (patch-ad) = b7d5593c10bbbff5ba2ffdd2448890304a97c99a
diff --git a/chat/gtkyahoo/patches/patch-ab b/chat/gtkyahoo/patches/patch-ab
new file mode 100644
index 00000000000..f8cf2ef93cf
--- /dev/null
+++ b/chat/gtkyahoo/patches/patch-ab
@@ -0,0 +1,103 @@
+$NetBSD: patch-ab,v 1.1 2002/03/31 14:13:46 dmcmahill Exp $
+LP64 fixes
+
+--- menus.c.orig	Mon Aug 20 09:13:11 2001
++++ menus.c
+@@ -269,6 +269,28 @@
+ 	}
+ }
+ 
++char *preset_urls[]={
++"http://msg.edit.yahoo.com/config/set_buddylist",
++"http://msg.edit.yahoo.com/config/eval_profile",
++"http://msg.edit.yahoo.com/config/edit_identity",
++"http://www.yahoo.com",
++"http://search.profiles.yahoo.com",
++"http://mail.yahoo.com",
++"http://address.yahoo.com",
++"http://calendar.yahoo.com",
++"http://finance.yahoo.com",
++"http://my.yahoo.com",
++"http://shopping.yahoo.com",
++"http://auctions.yahoo.com",
++"http://classifieds.yahoo.com",
++"http://clubs.yahoo.com",
++"http://games.yahoo.com",
++"http://chat.yahoo.com",
++"http://personals.yahoo.com",
++"http://messages.yahoo.com",
++"http://geocities.yahoo.com/home"
++};
++
+ static GtkItemFactoryEntry menu_items[] = {
+ 	{"/_File", NULL, 0, 0, "<Branch>"},
+ 	{"/File/About GTKYahoo...", NULL, create_about_window,
+@@ -286,11 +308,11 @@
+ 
+ 	{"/_Edit", NULL, 0, 0, "<Branch>"},
+ 	{"/Edit/Friends & Groups", NULL, launch_browser_cb,
+-		(guint) "http://msg.edit.yahoo.com/config/set_buddylist", "<Item>"},
++		0, "<Item>"},
+ 	{"/Edit/Account Information", NULL, launch_browser_cb,
+-		(guint) "http://msg.edit.yahoo.com/config/eval_profile", "<Item>"},
++		1, "<Item>"},
+ 	{"/Edit/Profiles & Identities", NULL, launch_browser_cb,
+-		(guint) "http://msg.edit.yahoo.com/config/edit_identity", "<Item>"},
++		2, "<Item>"},
+ 
+ 	{"/_Tools", NULL, 0, 0, "<Branch>"},
+ 	{"/Tools/Start Chat...", "<control>M", handle_menu_tools_startchat,
+@@ -328,37 +350,37 @@
+ 
+ 	{"/_Y!", NULL, 0, 0, "<Branch>"},
+ 	{"/Y!/Yahoo! Home", NULL, launch_browser_cb,
+-		(guint) "http://www.yahoo.com", "<Item>"},
++		3, "<Item>"},
+ 	{"/Y!/Find New Friends", NULL, launch_browser_cb,
+-		(guint) "http://search.profiles.yahoo.com", "<Item>"},
++		4, "<Item>"},
+ 	{"/Y!/Check & Send Email", NULL, launch_browser_cb,
+-		(guint) "http://mail.yahoo.com", "<Item>"},
++		5, "<Item>"},
+ 	{"/Y!/View Your Address Book", NULL, launch_browser_cb,
+-		(guint) "http://address.yahoo.com", "<Item>"},
++		6, "<Item>"},
+ 	{"/Y!/View Your Calendar", NULL, launch_browser_cb,
+-		(guint) "http://calendar.yahoo.com", "<Item>"},
++		7, "<Item>"},
+ 	{"/Y!/Stock Quotes", NULL, launch_browser_cb,
+-		(guint) "http://finance.yahoo.com", "<Item>"},
++		8, "<Item>"},
+ 	{"/Y!/Personalize Yahoo!", NULL, launch_browser_cb,
+-		(guint) "http://my.yahoo.com", "<Item>"},
++		9, "<Item>"},
+ 	{"/Y!/Shopping", NULL, launch_browser_cb,
+-		(guint) "http://shopping.yahoo.com", "<Item>"},
++		10, "<Item>"},
+ 	{"/Y!/Bid on Auctions", NULL, launch_browser_cb,
+-		(guint) "http://auctions.yahoo.com", "<Item>"},
++		11, "<Item>"},
+ 	{"/Y!/Classified Ads", NULL, launch_browser_cb,
+-		(guint) "http://classifieds.yahoo.com", "<Item>"},
++		12, "<Item>"},
+ 	{"/Y!/Join & View Clubs", NULL, launch_browser_cb,
+-		(guint) "http://clubs.yahoo.com", "<Item>"},
++		13, "<Item>"},
+ 	{"/Y!/Play Games", NULL, launch_browser_cb,
+-		(guint) "http://games.yahoo.com", "<Item>"},
++		14, "<Item>"},
+ 	{"/Y!/Chat With Friends", NULL, launch_browser_cb,
+-		(guint) "http://chat.yahoo.com", "<Item>"},
++		15, "<Item>"},
+ 	{"/Y!/View & Post Personals", NULL, launch_browser_cb,
+-		(guint) "http://personals.yahoo.com", "<Item>"},
++		16, "<Item>"},
+ 	{"/Y!/Message Boards", NULL, launch_browser_cb,
+-		(guint) "http://messages.yahoo.com", "<Item>"},
++		17, "<Item>"},
+ 	{"/Y!/Free Home Pages at GeoCities", NULL, launch_browser_cb,
+-		(guint) "http://geocities.yahoo.com/home", "<Item>"}
++		18, "<Item>"}
+ };
+ 
+ static GtkItemFactoryEntry status_items[] = {
diff --git a/chat/gtkyahoo/patches/patch-ac b/chat/gtkyahoo/patches/patch-ac
new file mode 100644
index 00000000000..22268f15650
--- /dev/null
+++ b/chat/gtkyahoo/patches/patch-ac
@@ -0,0 +1,21 @@
+$NetBSD: patch-ac,v 1.1 2002/03/31 14:13:46 dmcmahill Exp $
+LP64 fixes
+
+--- gtkyahoo.c.orig	Fri Aug 17 05:41:11 2001
++++ gtkyahoo.c
+@@ -201,11 +201,11 @@
+ 	return (1);
+ }
+ 
+-void launch_browser_cb(GtkWidget * w, gpointer data)
+-{
+-	char *url = (char *) data;
+ 
+-	launch_browser(url);
++void launch_browser_cb(gpointer data, guint action, GtkWidget *widget)
++{
++	extern char *preset_urls[];
++	launch_browser(preset_urls[action]);
+ }
+ 
+ static int id_is_sys_id (const char *id)
diff --git a/chat/gtkyahoo/patches/patch-ad b/chat/gtkyahoo/patches/patch-ad
new file mode 100644
index 00000000000..ff9378d69d0
--- /dev/null
+++ b/chat/gtkyahoo/patches/patch-ad
@@ -0,0 +1,14 @@
+$NetBSD: patch-ad,v 1.1 2002/03/31 14:13:46 dmcmahill Exp $
+LP64 fixes
+
+--- gtkyahoo-proto.h.orig	Mon Aug 13 07:56:01 2001
++++ gtkyahoo-proto.h
+@@ -65,7 +65,7 @@
+ void handle_button_startchat(GtkWidget * widget, gpointer * data);
+ void io_callback(gpointer data, gint source, GdkInputCondition condition);
+ int process_packets_callback(gpointer data);
+-void launch_browser_cb(GtkWidget * w, gpointer data);
++void launch_browser_cb(gpointer data, guint action, GtkWidget *widget);
+ void process_packet_message(struct yahoo_packet *pkt);
+ void process_packet_ping(struct yahoo_packet *pkt);
+ void process_packet_filetransfer(struct yahoo_packet *pkt);