Do not define variables in headers; define them in .c files instead.

Otherwise, they cause link errors on Darwin.

16 files changed, 447 insertions, 6 deletions

diff --git a/chat/xchat-systray-integration/distinfo b/chat/xchat-systray-integration/distinfo
index af58dc6c777..da45b1a5ac0 100644
--- a/chat/xchat-systray-integration/distinfo
+++ b/chat/xchat-systray-integration/distinfo
@@ -1,7 +1,21 @@
-$NetBSD: distinfo,v 1.5 2006/07/06 21:26:23 minskim Exp $
+$NetBSD: distinfo,v 1.6 2006/07/06 22:04:03 minskim Exp $
 
 SHA1 (xchat-systray-integration-2.4.5-src.tar.gz) = d7bad0f60c1944ce385e5799eb08a45a081365ab
 RMD160 (xchat-systray-integration-2.4.5-src.tar.gz) = 0d476ae52d491123b9da392eb3ee86322c2403ab
 Size (xchat-systray-integration-2.4.5-src.tar.gz) = 57953 bytes
-SHA1 (patch-aa) = 12cdc25278a2d2d4b67432a1df6b5f5b1a4a7790
+SHA1 (patch-aa) = 1afab689e88a6315201c3b1187dcdbbabc991ca8
 SHA1 (patch-ab) = c10c4125ea9d4f2555ec5b695746742577531487
+SHA1 (patch-ac) = f42ca3d00a9bcba15f2bd523cd54f3e606b4399f
+SHA1 (patch-ad) = 51f13e63894e2a5c391731262628dfa3ceed7a62
+SHA1 (patch-ae) = fa82c5a19fc872638d0a97e1e5eb0b8465d3a1b6
+SHA1 (patch-af) = 762fd3d13c43a90eef992a3eda25dd44240b6581
+SHA1 (patch-ag) = 7acef11d2bb5554286bf92c629663f7b6ee0d0ce
+SHA1 (patch-ah) = 4abd6aa8fadbbf7ae36afe022d03b56eb14e4f74
+SHA1 (patch-ai) = 89916065bd4c1a659a2ca9d48ee486dc05ff9f12
+SHA1 (patch-aj) = 7ae731b9181a3b9d8e148929ae17ebfdc763a687
+SHA1 (patch-ak) = e16d53b22e906983e85987bd87e90aa307b3158e
+SHA1 (patch-al) = a97c5c6b7faa10619de5c657bb5cc3b78cc43be0
+SHA1 (patch-am) = 595962817692c42b5f9e35d4f8571dd555390485
+SHA1 (patch-an) = e3cb80f89d226ace7efd39f0fd6e48e9a2dadd1e
+SHA1 (patch-ao) = a758b0f36d6de664673d77a9123180559e963ec7
+SHA1 (patch-ap) = 7f705380a7d6f72957b300d726a31b890487212a
diff --git a/chat/xchat-systray-integration/patches/patch-aa b/chat/xchat-systray-integration/patches/patch-aa
index f41ef15422b..8976ac7759a 100644
--- a/chat/xchat-systray-integration/patches/patch-aa
+++ b/chat/xchat-systray-integration/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.2 2006/07/06 21:26:23 minskim Exp $
+$NetBSD: patch-aa,v 1.3 2006/07/06 22:04:03 minskim Exp $
 
---- Makefile.orig	2004-04-30 12:38:10.000000000 +0000
+--- Makefile.orig	2004-04-30 05:38:10.000000000 -0700
 +++ Makefile
-@@ -1,10 +1,10 @@
+@@ -1,15 +1,15 @@
  #UNIX VARS
 -CFLAGS = -Os -Wall
 -GTKFLAGS =`pkg-config gtk+-2.0 --cflags`
@@ -17,6 +17,12 @@ $NetBSD: patch-aa,v 1.2 2006/07/06 21:26:23 minskim Exp $
  ifndef prefix
      prefix=/usr/
  endif
+ plugindir = $(prefix)/lib/xchat/plugins/
+-Objects = src/away_system.o src/data_manager.o src/events.o src/menu.o src/settings.o src/warnings.o src/help.o src/eggtrayicon.o src/systray.o
++Objects = src/away_system.o src/data_manager.o src/events.o src/menu.o src/settings.o src/warnings.o src/help.o src/eggtrayicon.o src/systray.o src/traycoreengine.o
+ 
+ #WINDOWS VARS
+ GTKPREFIX=C:/DEV-CPP/include/
 @@ -27,7 +27,7 @@ WINCFLAGS = $(WINGTKFLAGS) -DBUILDING_DL
  WINObjects = src/away_system.o src/data_manager.o src/events.o src/menu.o src/settings.o src/warnings.o src/help.o src/systray.o
  
@@ -26,7 +32,7 @@ $NetBSD: patch-aa,v 1.2 2006/07/06 21:26:23 minskim Exp $
  else 
  	plugin=Systray.dll
  	plugindir=C:/Program Files/X-Chat2/plugins/
-@@ -63,42 +63,42 @@ src/systray.o: src/systray.c
+@@ -63,42 +63,45 @@ src/systray.o: src/systray.c
  else 
  
  src/eggtrayicon.o: src/libs/Unix/eggtrayicon.c
@@ -68,6 +74,9 @@ $NetBSD: patch-aa,v 1.2 2006/07/06 21:26:23 minskim Exp $
  
 -systray.so: $(Objects)
 -	$(CC) $(CFLAGS) $(LIBS) $(Objects) -shared -o $(plugin)
++src/traycoreengine.o: src/libs/traycoreengine.c
++	${SHLIBTOOL} --mode=compile ${CC} $(CFLAGS) $(GTKFLAGS) -c src/libs/traycoreengine.c -o src/traycoreengine.o
++
 +systray.la: $(Objects)
 +	${SHLIBTOOL} --mode=link ${CC} $(LIBS) ${Objects:.o=.lo} -o ${plugin} -rpath ${prefix}/lib -avoid-version -module
  
diff --git a/chat/xchat-systray-integration/patches/patch-ac b/chat/xchat-systray-integration/patches/patch-ac
new file mode 100644
index 00000000000..886d1cda43b
--- /dev/null
+++ b/chat/xchat-systray-integration/patches/patch-ac
@@ -0,0 +1,58 @@
+$NetBSD: patch-ac,v 1.1 2006/07/06 22:04:03 minskim Exp $
+
+--- src/away_system.h.orig	2004-04-30 05:38:10.000000000 -0700
++++ src/away_system.h
+@@ -3,31 +3,31 @@
+ 
+ #include "libs/traycoreengine.h"
+ 
+-gboolean go_change;
+-gboolean go_identify;
++extern gboolean go_change;
++extern gboolean go_identify;
+ #ifdef _WIN32_
+-	HICON pix_xchat_away;
+-	HICON pix_xchat;
++	extern HICON pix_xchat_away;
++	extern HICON pix_xchat;
+ #else
+-	GdkPixbuf *pix_xchat_away;
+-	GdkPixbuf *pix_xchat;
++	extern GdkPixbuf *pix_xchat_away;
++	extern GdkPixbuf *pix_xchat;
+ #endif
+-gboolean global_away;
+-gboolean global_away_temp;
+-char away_msg1[150];
+-char away_msg2[150];
+-char away_msg3[150];
+-char away_nick[150];
+-char away_pass[150];
+-const char* awaynick;
+-const char* amsg1;
+-const char* amsg2;
+-const char* amsg3;
+-const char* awaypass;
+-gboolean edit;
+-const char* message;
+-GtkWidget *checkbutton3;
+-GtkWidget *away_text,*away_nick_box,*away_nick_pass_box;
++extern gboolean global_away;
++extern gboolean global_away_temp;
++extern char away_msg1[150];
++extern char away_msg2[150];
++extern char away_msg3[150];
++extern char away_nick[150];
++extern char away_pass[150];
++extern const char* awaynick;
++extern const char* amsg1;
++extern const char* amsg2;
++extern const char* amsg3;
++extern const char* awaypass;
++extern gboolean edit;
++extern const char* message;
++extern GtkWidget *checkbutton3;
++extern GtkWidget *away_text,*away_nick_box,*away_nick_pass_box;
+ 
+ 
+ void get_label(GtkWidget *button, void *data);
diff --git a/chat/xchat-systray-integration/patches/patch-ad b/chat/xchat-systray-integration/patches/patch-ad
new file mode 100644
index 00000000000..1e8605f7dd9
--- /dev/null
+++ b/chat/xchat-systray-integration/patches/patch-ad
@@ -0,0 +1,36 @@
+$NetBSD: patch-ad,v 1.1 2006/07/06 22:04:03 minskim Exp $
+
+--- src/away_system.c.orig	2004-04-30 05:38:10.000000000 -0700
++++ src/away_system.c
+@@ -3,6 +3,31 @@
+ #include "away_system.h"
+ 
+ //AWAY SYSTEM
++gboolean go_change;
++gboolean go_identify;
++#ifdef _WIN32_
++	HICON pix_xchat_away;
++	HICON pix_xchat;
++#else
++	GdkPixbuf *pix_xchat_away;
++	GdkPixbuf *pix_xchat;
++#endif
++gboolean global_away;
++gboolean global_away_temp;
++char away_msg1[150];
++char away_msg2[150];
++char away_msg3[150];
++char away_nick[150];
++char away_pass[150];
++const char* awaynick;
++const char* amsg1;
++const char* amsg2;
++const char* amsg3;
++const char* awaypass;
++gboolean edit;
++const char* message;
++GtkWidget *checkbutton3;
++GtkWidget *away_text,*away_nick_box,*away_nick_pass_box;
+ 
+ //get the select away msg
+ void get_label(GtkWidget *button, void *data) {
diff --git a/chat/xchat-systray-integration/patches/patch-ae b/chat/xchat-systray-integration/patches/patch-ae
new file mode 100644
index 00000000000..e6d02c4354b
--- /dev/null
+++ b/chat/xchat-systray-integration/patches/patch-ae
@@ -0,0 +1,34 @@
+$NetBSD: patch-ae,v 1.1 2006/07/06 22:04:03 minskim Exp $
+
+--- src/libs/traycoreengine.h.orig	2004-04-30 05:38:10.000000000 -0700
++++ src/libs/traycoreengine.h
+@@ -35,20 +35,20 @@ MYICON loadicons(char* filename ,char* t
+ void clean_up();
+ 
+ //xchat plugin var
+-xchat_plugin *ph;
+-xchat_context *flash_ctx;
+-xchat_context *focus_ctx;
++extern xchat_plugin *ph;
++extern xchat_context *flash_ctx;
++extern xchat_context *focus_ctx;
+ 
+ 
+-GHashTable *servers_names;
+-gint status;
++extern GHashTable *servers_names;
++extern gint status;
+ 
+ #ifndef _WIN32_
+-	GtkWidget *tray_icon_image;
+-	GtkWidget *tray_icon;
+-	GtkTooltips *tray_icon_tooltip;
++	extern GtkWidget *tray_icon_image;
++	extern GtkWidget *tray_icon;
++	extern GtkTooltips *tray_icon_tooltip;
+ #else
+-	NOTIFYICONDATA tray_icon;
++	extern NOTIFYICONDATA tray_icon;
+ #endif
+ 
+ #endif
diff --git a/chat/xchat-systray-integration/patches/patch-af b/chat/xchat-systray-integration/patches/patch-af
new file mode 100644
index 00000000000..061d246ecb2
--- /dev/null
+++ b/chat/xchat-systray-integration/patches/patch-af
@@ -0,0 +1,21 @@
+$NetBSD: patch-af,v 1.1 2006/07/06 22:04:03 minskim Exp $
+
+--- src/libs/traycoreengine.c.orig	2006-07-06 14:43:48.000000000 -0700
++++ src/libs/traycoreengine.c
+@@ -0,0 +1,16 @@
++#include "traycoreengine.h"
++
++xchat_plugin *ph;
++xchat_context *flash_ctx;
++xchat_context *focus_ctx;
++
++GHashTable *servers_names;
++gint status;
++
++#ifndef _WIN32_
++	GtkWidget *tray_icon_image;
++	GtkWidget *tray_icon;
++	GtkTooltips *tray_icon_tooltip;
++#else
++	NOTIFYICONDATA tray_icon;
++#endif
diff --git a/chat/xchat-systray-integration/patches/patch-ag b/chat/xchat-systray-integration/patches/patch-ag
new file mode 100644
index 00000000000..23259d3e06c
--- /dev/null
+++ b/chat/xchat-systray-integration/patches/patch-ag
@@ -0,0 +1,59 @@
+$NetBSD: patch-ag,v 1.1 2006/07/06 22:04:03 minskim Exp $
+
+--- src/data_manager.h.orig	2004-04-30 05:38:10.000000000 -0700
++++ src/data_manager.h
+@@ -5,32 +5,32 @@
+ #include "warnings.h"
+ #include "away_system.h"
+ 
+-gboolean highlight;
+-gboolean query;
+-gboolean disconnection;
+-gboolean kick;
+-gboolean dcc_chat;
+-gboolean dcc_send;
+-gboolean invite;
+-gboolean notify_list;
+-GtkWidget *away1,*away2,*away3;
+-GtkWidget *browser_text,*email_text,*player_text,*imagepath_text;
++extern gboolean highlight;
++extern gboolean query;
++extern gboolean disconnection;
++extern gboolean kick;
++extern gboolean dcc_chat;
++extern gboolean dcc_send;
++extern gboolean invite;
++extern gboolean notify_list;
++extern GtkWidget *away1,*away2,*away3;
++extern GtkWidget *browser_text,*email_text,*player_text,*imagepath_text;
+ //settings items
+-const char* ppath1;
+-const char* epath1;
+-const char* bpath1;
+-const char* imagepath1;
++extern const char* ppath1;
++extern const char* epath1;
++extern const char* bpath1;
++extern const char* imagepath1;
+ #ifndef _WIN32_
+-	gboolean KDE;
+-	gboolean window_manager_modified;
++	extern gboolean KDE;
++	extern gboolean window_manager_modified;
+ #endif
+ //settings items array
+-char ppath[150];
+-char epath[150];
+-char bpath[150];
+-char imagepath[150];
+-gint flash_interval;
+-gboolean killevent;
++extern char ppath[150];
++extern char epath[150];
++extern char bpath[150];
++extern char imagepath[150];
++extern gint flash_interval;
++extern gboolean killevent;
+ 
+ void write2file(gboolean control);
+ void get_info (gboolean onstart_warning,gboolean control);
diff --git a/chat/xchat-systray-integration/patches/patch-ah b/chat/xchat-systray-integration/patches/patch-ah
new file mode 100644
index 00000000000..8a3cee1cd90
--- /dev/null
+++ b/chat/xchat-systray-integration/patches/patch-ah
@@ -0,0 +1,38 @@
+$NetBSD: patch-ah,v 1.1 2006/07/06 22:04:03 minskim Exp $
+
+--- src/data_manager.c.orig	2004-04-30 05:38:10.000000000 -0700
++++ src/data_manager.c
+@@ -3,6 +3,33 @@
+ 
+ #include "data_manager.h"
+ 
++gboolean highlight;
++gboolean query;
++gboolean disconnection;
++gboolean kick;
++gboolean dcc_chat;
++gboolean dcc_send;
++gboolean invite;
++gboolean notify_list;
++GtkWidget *away1,*away2,*away3;
++GtkWidget *browser_text,*email_text,*player_text,*imagepath_text;
++//settings items
++const char* ppath1;
++const char* epath1;
++const char* bpath1;
++const char* imagepath1;
++#ifndef _WIN32_
++	gboolean KDE;
++	gboolean window_manager_modified;
++#endif
++//settings items array
++char ppath[150];
++char epath[150];
++char bpath[150];
++char imagepath[150];
++gint flash_interval;
++gboolean killevent;
++
+ //save function
+ void write2file(gboolean control) {
+ 
diff --git a/chat/xchat-systray-integration/patches/patch-ai b/chat/xchat-systray-integration/patches/patch-ai
new file mode 100644
index 00000000000..b06ed5576e6
--- /dev/null
+++ b/chat/xchat-systray-integration/patches/patch-ai
@@ -0,0 +1,15 @@
+$NetBSD: patch-ai,v 1.1 2006/07/06 22:04:03 minskim Exp $
+
+--- src/settings.h.orig	2004-04-30 05:38:10.000000000 -0700
++++ src/settings.h
+@@ -5,8 +5,8 @@
+ #include "data_manager.h"
+ #include "away_system.h"
+ 
+-GtkWidget **app2set;
+- GtkWidget *spinbutton;
++extern GtkWidget **app2set;
++extern GtkWidget *spinbutton;
+ 
+ void ok_click( GtkWidget *w, GtkFileSelection *fs );
+ void app_select();
diff --git a/chat/xchat-systray-integration/patches/patch-aj b/chat/xchat-systray-integration/patches/patch-aj
new file mode 100644
index 00000000000..feead1e4122
--- /dev/null
+++ b/chat/xchat-systray-integration/patches/patch-aj
@@ -0,0 +1,14 @@
+$NetBSD: patch-aj,v 1.1 2006/07/06 22:04:03 minskim Exp $
+
+--- src/settings.c.orig	2004-04-30 05:38:10.000000000 -0700
++++ src/settings.c
+@@ -3,6 +3,9 @@
+ 
+ #include "settings.h"
+ 
++GtkWidget **app2set;
++GtkWidget *spinbutton;
++
+ //file selected
+ void ok_click( GtkWidget *w, GtkFileSelection *fs )
+ {
diff --git a/chat/xchat-systray-integration/patches/patch-ak b/chat/xchat-systray-integration/patches/patch-ak
new file mode 100644
index 00000000000..ea8f5de8e1d
--- /dev/null
+++ b/chat/xchat-systray-integration/patches/patch-ak
@@ -0,0 +1,56 @@
+$NetBSD: patch-ak,v 1.1 2006/07/06 22:04:03 minskim Exp $
+
+--- src/events.h.orig	2004-04-30 05:38:10.000000000 -0700
++++ src/events.h
+@@ -5,25 +5,25 @@
+ #include "libs/traycoreengine.h"
+ #include "data_manager.h"
+ 
+-gint flash_id;
++extern gint flash_id;
+ #ifndef _WIN32_
+-	GdkPixbuf *icontype;
+-	GdkPixbuf *pix_xchat_red;
+-	GdkPixbuf *pix_xchat_blue;
+-	GdkPixbuf *pix_xchat_dcc;
+-	GdkPixbuf *pix_xchat_disc;
+-	GdkPixbuf *pix_xchat_inv;
+-	GdkPixbuf *pix_xchat_notin;
+-	GdkPixbuf *pix_xchat_notout;
++	extern GdkPixbuf *icontype;
++	extern GdkPixbuf *pix_xchat_red;
++	extern GdkPixbuf *pix_xchat_blue;
++	extern GdkPixbuf *pix_xchat_dcc;
++	extern GdkPixbuf *pix_xchat_disc;
++	extern GdkPixbuf *pix_xchat_inv;
++	extern GdkPixbuf *pix_xchat_notin;
++	extern GdkPixbuf *pix_xchat_notout;
+ #else
+-	HICON icontype;
+-        HICON pix_xchat_red;
+-        HICON pix_xchat_blue;
+-        HICON pix_xchat_dcc;
+-        HICON pix_xchat_disc;
+-        HICON pix_xchat_inv;
+-        HICON pix_xchat_notin;
+-        HICON pix_xchat_notout;
++	extern HICON icontype;
++        extern HICON pix_xchat_red;
++        extern HICON pix_xchat_blue;
++        extern HICON pix_xchat_dcc;
++        extern HICON pix_xchat_disc;
++        extern HICON pix_xchat_inv;
++        extern HICON pix_xchat_notin;
++        extern HICON pix_xchat_notout;
+ #endif
+ 
+ 
+@@ -41,7 +41,7 @@ int noti_hilight_cb(char *word[], void *
+ void flash_stop();
+ void flash_start();
+ gboolean flash_timeout(gpointer userdata);
+-char* motivation;
++extern char* motivation;
+ 
+ #endif
+ 
diff --git a/chat/xchat-systray-integration/patches/patch-al b/chat/xchat-systray-integration/patches/patch-al
new file mode 100644
index 00000000000..cca1f5ac121
--- /dev/null
+++ b/chat/xchat-systray-integration/patches/patch-al
@@ -0,0 +1,33 @@
+$NetBSD: patch-al,v 1.1 2006/07/06 22:04:03 minskim Exp $
+
+--- src/events.c.orig	2004-04-30 05:38:10.000000000 -0700
++++ src/events.c
+@@ -1,5 +1,28 @@
+ //XChat Events Listener
+ #include "events.h"
++
++gint flash_id;
++#ifndef _WIN32_
++	GdkPixbuf *icontype;
++	GdkPixbuf *pix_xchat_red;
++	GdkPixbuf *pix_xchat_blue;
++	GdkPixbuf *pix_xchat_dcc;
++	GdkPixbuf *pix_xchat_disc;
++	GdkPixbuf *pix_xchat_inv;
++	GdkPixbuf *pix_xchat_notin;
++	GdkPixbuf *pix_xchat_notout;
++#else
++	HICON icontype;
++        HICON pix_xchat_red;
++        HICON pix_xchat_blue;
++        HICON pix_xchat_dcc;
++        HICON pix_xchat_disc;
++        HICON pix_xchat_inv;
++        HICON pix_xchat_notin;
++        HICON pix_xchat_notout;
++#endif
++char* motivation;
++
+ /*
+ #ifndef _WIN32_
+ 	//notify icons
diff --git a/chat/xchat-systray-integration/patches/patch-am b/chat/xchat-systray-integration/patches/patch-am
new file mode 100644
index 00000000000..8319a528091
--- /dev/null
+++ b/chat/xchat-systray-integration/patches/patch-am
@@ -0,0 +1,15 @@
+$NetBSD: patch-am,v 1.1 2006/07/06 22:04:03 minskim Exp $
+
+--- src/menu.h.orig	2004-04-30 05:38:10.000000000 -0700
++++ src/menu.h
+@@ -9,8 +9,8 @@
+ #include "help.h"
+ #include "events.h"
+ 
+-gint onExit;
+-GtkWidget *status_menu;
++extern gint onExit;
++extern GtkWidget *status_menu;
+ 
+ void launch_browser();
+ void launch_email();
diff --git a/chat/xchat-systray-integration/patches/patch-an b/chat/xchat-systray-integration/patches/patch-an
new file mode 100644
index 00000000000..83256ecd6f7
--- /dev/null
+++ b/chat/xchat-systray-integration/patches/patch-an
@@ -0,0 +1,14 @@
+$NetBSD: patch-an,v 1.1 2006/07/06 22:04:03 minskim Exp $
+
+--- src/menu.c.orig	2004-04-30 05:38:10.000000000 -0700
++++ src/menu.c
+@@ -2,6 +2,9 @@
+ 

+ #include "menu.h"

+ 

++gint onExit;

++GtkWidget *status_menu;

++

+ //MENU CREATION AND COMMANDS

+ 

+ //launch browser

diff --git a/chat/xchat-systray-integration/patches/patch-ao b/chat/xchat-systray-integration/patches/patch-ao
new file mode 100644
index 00000000000..9470ba13d0f
--- /dev/null
+++ b/chat/xchat-systray-integration/patches/patch-ao
@@ -0,0 +1,13 @@
+$NetBSD: patch-ao,v 1.1 2006/07/06 22:04:03 minskim Exp $
+
+--- src/help.h.orig	2004-04-30 05:38:10.000000000 -0700
++++ src/help.h
+@@ -9,7 +9,7 @@ void visit_website();
+ void send_email();
+ void help_page();
+ 
+-char* version;
++extern char* version;
+ 
+ #endif
+ 
diff --git a/chat/xchat-systray-integration/patches/patch-ap b/chat/xchat-systray-integration/patches/patch-ap
new file mode 100644
index 00000000000..94d9f95280b
--- /dev/null
+++ b/chat/xchat-systray-integration/patches/patch-ap
@@ -0,0 +1,12 @@
+$NetBSD: patch-ap,v 1.1 2006/07/06 22:04:03 minskim Exp $
+
+--- src/help.c.orig	2004-04-30 05:59:11.000000000 -0700
++++ src/help.c
+@@ -1,5 +1,7 @@
+ #include "help.h"
+ 
++char* version;
++
+ void check_updates() {
+ 
+ 	//when language implementation will be ready i'll delete this dummy var.