Fix build with latest glib2. Since this requires touching patch-ab,

rename it to match.

5 files changed, 70 insertions, 10 deletions

diff --git a/chat/xchat/distinfo b/chat/xchat/distinfo
index 7cdd100e3d3..34d1dfc98d9 100644
--- a/chat/xchat/distinfo
+++ b/chat/xchat/distinfo
@@ -1,6 +1,9 @@
-$NetBSD: distinfo,v 1.42 2010/11/16 12:21:10 tron Exp $
+$NetBSD: distinfo,v 1.43 2012/05/06 18:41:51 dholland Exp $
 
 SHA1 (xchat-2.8.8.tar.bz2) = a4ac161e4e40f4bbabc492675a1ff4380dba8d68
 RMD160 (xchat-2.8.8.tar.bz2) = 1bc3e0ff00e15c83588dd21a3ef3e8e34f953331
 Size (xchat-2.8.8.tar.bz2) = 1509993 bytes
-SHA1 (patch-ab) = 109d61363f040d4f9716b6698a002b804847da33
+SHA1 (patch-src_common_servlist_c) = 3f5b8f7dbe51155266071b8aa0bea74c8db445a2
+SHA1 (patch-src_common_text_c) = 8907bd99ef0bc867e57ac21ff592489876cf83f7
+SHA1 (patch-src_common_util_c) = 486bb9c270e718e55efd01043b30f8545ffeac02
+SHA1 (patch-src_common_xchat_h) = 61d1132dffeec7d236144543559b7cd15b43346d
diff --git a/chat/xchat/patches/patch-src_common_servlist_c b/chat/xchat/patches/patch-src_common_servlist_c
new file mode 100644
index 00000000000..0aa705eb3a1
--- /dev/null
+++ b/chat/xchat/patches/patch-src_common_servlist_c
@@ -0,0 +1,14 @@
+$NetBSD: patch-src_common_servlist_c,v 1.1 2012/05/06 18:41:51 dholland Exp $
+
+Fix build with latest glib2.
+
+--- src/common/servlist.c~	2010-05-16 07:24:26.000000000 +0000
++++ src/common/servlist.c
+@@ -24,7 +24,6 @@
+ #include <unistd.h>
+ 
+ #include "xchat.h"
+-#include <glib/ghash.h>
+ 
+ #include "cfgfiles.h"
+ #include "fe.h"
diff --git a/chat/xchat/patches/patch-src_common_text_c b/chat/xchat/patches/patch-src_common_text_c
new file mode 100644
index 00000000000..494aed531cb
--- /dev/null
+++ b/chat/xchat/patches/patch-src_common_text_c
@@ -0,0 +1,14 @@
+$NetBSD: patch-src_common_text_c,v 1.1 2012/05/06 18:41:51 dholland Exp $
+
+Fix build with latest glib2.
+
+--- src/common/text.c~	2010-05-30 02:14:41.000000000 +0000
++++ src/common/text.c
+@@ -28,7 +28,6 @@
+ #include <sys/mman.h>
+ 
+ #include "xchat.h"
+-#include <glib/ghash.h>
+ #include "cfgfiles.h"
+ #include "chanopt.h"
+ #include "plugin.h"
diff --git a/chat/xchat/patches/patch-ab b/chat/xchat/patches/patch-src_common_util_c
index 4a379409678..2ecdcf15cf4 100644
--- a/chat/xchat/patches/patch-ab
+++ b/chat/xchat/patches/patch-src_common_util_c
@@ -1,8 +1,19 @@
-$NetBSD: patch-ab,v 1.12 2008/08/15 17:25:32 tron Exp $
+$NetBSD: patch-src_common_util_c,v 1.1 2012/05/06 18:41:51 dholland Exp $
 
---- src/common/util.c.orig	2008-02-24 02:59:48.000000000 +0000
-+++ src/common/util.c	2008-08-15 11:16:47.000000000 +0100
-@@ -49,6 +49,10 @@
+ - Fix build with latest glib2
+ - add NetBSD support
+
+--- src/common/util.c.orig	2009-08-16 09:40:16.000000000 +0000
++++ src/common/util.c
+@@ -39,7 +39,6 @@
+ #include <errno.h>
+ #include "xchat.h"
+ #include "xchatc.h"
+-#include <glib/gmarkup.h>
+ #include <ctype.h>
+ #include "util.h"
+ #include "../../config.h"
+@@ -49,6 +48,10 @@
  
  #if defined (USING_FREEBSD) || defined (__APPLE__)
  #include <sys/sysctl.h>
@@ -13,7 +24,7 @@ $NetBSD: patch-ab,v 1.12 2008/08/15 17:25:32 tron Exp $
  #endif
  #ifdef SOCKS
  #include <socks.h>
-@@ -510,7 +514,7 @@
+@@ -510,7 +513,7 @@ strip_hidden_attribute (char *src, char 
  	return len;
  }
  
@@ -22,7 +33,7 @@ $NetBSD: patch-ab,v 1.12 2008/08/15 17:25:32 tron Exp $
  
  static void
  get_cpu_info (double *mhz, int *cpus)
-@@ -554,7 +558,7 @@
+@@ -554,7 +557,7 @@ get_cpu_info (double *mhz, int *cpus)
  		*cpus = 1;
  
  #endif
@@ -31,7 +42,7 @@ $NetBSD: patch-ab,v 1.12 2008/08/15 17:25:32 tron Exp $
  
  	int mib[2], ncpu;
  	u_long freq;
-@@ -656,7 +660,7 @@
+@@ -656,7 +659,7 @@ get_cpu_str (void)
  char *
  get_cpu_str (void)
  {
@@ -40,7 +51,7 @@ $NetBSD: patch-ab,v 1.12 2008/08/15 17:25:32 tron Exp $
  	double mhz;
  #endif
  	int cpus = 1;
-@@ -670,7 +674,7 @@
+@@ -670,7 +673,7 @@ get_cpu_str (void)
  
  	uname (&un);
  
diff --git a/chat/xchat/patches/patch-src_common_xchat_h b/chat/xchat/patches/patch-src_common_xchat_h
new file mode 100644
index 00000000000..de70d923d78
--- /dev/null
+++ b/chat/xchat/patches/patch-src_common_xchat_h
@@ -0,0 +1,18 @@
+$NetBSD: patch-src_common_xchat_h,v 1.1 2012/05/06 18:41:51 dholland Exp $
+
+Fix build with latest glib2.
+
+--- src/common/xchat.h~	2009-08-16 09:40:16.000000000 +0000
++++ src/common/xchat.h
+@@ -1,10 +1,6 @@
+ #include "../../config.h"
+ 
+-#include <glib/gslist.h>
+-#include <glib/glist.h>
+-#include <glib/gutils.h>
+-#include <glib/giochannel.h>
+-#include <glib/gstrfuncs.h>
++#include <glib.h>
+ #include <time.h>			/* need time_t */
+ 
+ #ifndef XCHAT_H