Fix build with latest glib2.

5 files changed, 66 insertions, 1 deletions

diff --git a/net/linc/distinfo b/net/linc/distinfo
index f93895620fc..345702fb8a5 100644
--- a/net/linc/distinfo
+++ b/net/linc/distinfo
@@ -1,6 +1,10 @@
-$NetBSD: distinfo,v 1.12 2005/02/24 12:13:52 agc Exp $
+$NetBSD: distinfo,v 1.13 2012/05/07 00:20:34 dholland Exp $
 
 SHA1 (linc-1.1.1.tar.bz2) = efebe15c4e29f9c03dfda04191161e557b1e1982
 RMD160 (linc-1.1.1.tar.bz2) = 0b8607abf3a9fa877c83f43586e5227a3fb85d66
 Size (linc-1.1.1.tar.bz2) = 204064 bytes
 SHA1 (patch-aa) = 965071a6cdfb7dca2bd976ac96e566f671df6ede
+SHA1 (patch-include_linc_linc-connection_h) = a6bbddfc11f7bb40e129ea33c4d4589f6c6a26c4
+SHA1 (patch-include_linc_linc-protocol_h) = 1b02124daa240ec827c841eb68f0bb02828a4ac3
+SHA1 (patch-include_linc_linc-server_h) = 4d11642b396c7fbfe017e6f2bbaf21c3d86fa439
+SHA1 (patch-include_linc_linc-types_h) = 1437a91a5a13966c79f015a93b183ad5c3de244c
diff --git a/net/linc/patches/patch-include_linc_linc-connection_h b/net/linc/patches/patch-include_linc_linc-connection_h
new file mode 100644
index 00000000000..0901e6d7528
--- /dev/null
+++ b/net/linc/patches/patch-include_linc_linc-connection_h
@@ -0,0 +1,15 @@
+$NetBSD: patch-include_linc_linc-connection_h,v 1.1 2012/05/07 00:20:34 dholland Exp $
+
+Fix build with latest glib2.
+
+--- include/linc/linc-connection.h~	2003-04-24 17:34:24.000000000 +0000
++++ include/linc/linc-connection.h
+@@ -12,7 +12,7 @@
+ #ifndef _LINC_CONNECTION_H_
+ #define _LINC_CONNECTION_H_
+ 
+-#include <glib/gmacros.h>
++#include <glib.h>
+ 
+ G_BEGIN_DECLS
+ 
diff --git a/net/linc/patches/patch-include_linc_linc-protocol_h b/net/linc/patches/patch-include_linc_linc-protocol_h
new file mode 100644
index 00000000000..3a9ed7d2bd9
--- /dev/null
+++ b/net/linc/patches/patch-include_linc_linc-protocol_h
@@ -0,0 +1,15 @@
+$NetBSD: patch-include_linc_linc-protocol_h,v 1.1 2012/05/07 00:20:34 dholland Exp $
+
+Fix build with latest glib2.
+
+--- include/linc/linc-protocol.h~	2002-06-12 16:46:39.000000000 +0000
++++ include/linc/linc-protocol.h
+@@ -12,7 +12,7 @@
+ #ifndef _LINC_PROTOCOL_H_
+ #define _LINC_PROTOCOL_H_
+ 
+-#include <glib/gmacros.h>
++#include <glib.h>
+ 
+ G_BEGIN_DECLS
+ 
diff --git a/net/linc/patches/patch-include_linc_linc-server_h b/net/linc/patches/patch-include_linc_linc-server_h
new file mode 100644
index 00000000000..70957d56428
--- /dev/null
+++ b/net/linc/patches/patch-include_linc_linc-server_h
@@ -0,0 +1,15 @@
+$NetBSD: patch-include_linc_linc-server_h,v 1.1 2012/05/07 00:20:34 dholland Exp $
+
+Fix build with latest glib2.
+
+--- include/linc/linc-server.h~	2002-01-23 17:29:03.000000000 +0000
++++ include/linc/linc-server.h
+@@ -12,7 +12,7 @@
+ #ifndef _LINC_SERVER_H_
+ #define _LINC_SERVER_H_
+ 
+-#include <glib/gmacros.h>
++#include <glib.h>
+ 
+ G_BEGIN_DECLS
+ 
diff --git a/net/linc/patches/patch-include_linc_linc-types_h b/net/linc/patches/patch-include_linc_linc-types_h
new file mode 100644
index 00000000000..a9de4d04cd3
--- /dev/null
+++ b/net/linc/patches/patch-include_linc_linc-types_h
@@ -0,0 +1,16 @@
+$NetBSD: patch-include_linc_linc-types_h,v 1.1 2012/05/07 00:20:34 dholland Exp $
+
+Fix build with latest glib2.
+
+--- include/linc/linc-types.h~	2002-01-23 17:53:41.000000000 +0000
++++ include/linc/linc-types.h
+@@ -12,8 +12,7 @@
+ #ifndef _LINC_TYPES_H_
+ #define _LINC_TYPES_H_
+ 
+-#include <glib/gmacros.h>
+-#include <glib/gthread.h>
++#include <glib.h>
+ #include <glib-object.h>
+ 
+ G_BEGIN_DECLS