Make sure to use json-glib and not the local headers.

5 files changed, 29 insertions, 27 deletions

diff --git a/graphics/clutter08/distinfo b/graphics/clutter08/distinfo
index f0040cd8343..e839968388d 100644
--- a/graphics/clutter08/distinfo
+++ b/graphics/clutter08/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.3 2012/02/03 01:17:32 sbd Exp $
+$NetBSD: distinfo,v 1.4 2013/05/30 15:35:46 joerg Exp $
 
 SHA1 (clutter-0.8.8.tar.gz) = 560e127b99494131ec3b901f53bd93d6809d79ea
 RMD160 (clutter-0.8.8.tar.gz) = 400c97617cd26ae9e338cedddce8b67bc3fe4293
@@ -7,5 +7,5 @@ SHA1 (patch-aa) = 639cd5709b8423ccd5c42b77231fefaaa9af072d
 SHA1 (patch-ab) = 4aa8988640df604f727a45229d2f9b0326df069d
 SHA1 (patch-clutter_Makefile.am) = 47fa8731d7f621512e799e2cae009fa9af4ac847
 SHA1 (patch-clutter_Makefile.in) = 0d707044acbd28e7aae8de19e03f1e95f30ecd60
-SHA1 (patch-clutter_json_Makefile.am) = f054809b0d5f7d196c4c3296b951cdbf1fc0b6fe
-SHA1 (patch-clutter_json_Makefile.in) = 14d4cba6aab6fc91974426791d37901ceb9cc8c2
+SHA1 (patch-clutter_clutter-script-private.h) = 381c7f05f9b4389100915828dabe03159f767e31
+SHA1 (patch-clutter_clutter-script.c) = ab712d9e8440477417238a66a2546a38e046c765
diff --git a/graphics/clutter08/patches/patch-clutter_clutter-script-private.h b/graphics/clutter08/patches/patch-clutter_clutter-script-private.h
new file mode 100644
index 00000000000..3c660cf16c5
--- /dev/null
+++ b/graphics/clutter08/patches/patch-clutter_clutter-script-private.h
@@ -0,0 +1,13 @@
+$NetBSD: patch-clutter_clutter-script-private.h,v 1.1 2013/05/30 15:35:46 joerg Exp $
+
+--- clutter/clutter-script-private.h.orig	2013-05-29 19:54:53.000000000 +0000
++++ clutter/clutter-script-private.h
+@@ -27,7 +27,7 @@
+ #define __CLUTTER_SCRIPT_PRIVATE_H__
+ 
+ #include <glib-object.h>
+-#include "json/json-types.h"
++#include <json-glib/json-glib.h>
+ #include "clutter-color.h"
+ #include "clutter-types.h"
+ #include "clutter-script.h"
diff --git a/graphics/clutter08/patches/patch-clutter_clutter-script.c b/graphics/clutter08/patches/patch-clutter_clutter-script.c
new file mode 100644
index 00000000000..ab442b2c10e
--- /dev/null
+++ b/graphics/clutter08/patches/patch-clutter_clutter-script.c
@@ -0,0 +1,13 @@
+$NetBSD: patch-clutter_clutter-script.c,v 1.1 2013/05/30 15:35:46 joerg Exp $
+
+--- clutter/clutter-script.c.orig	2013-05-29 19:56:00.000000000 +0000
++++ clutter/clutter-script.c
+@@ -183,7 +183,7 @@
+ #include "clutter-private.h"
+ #include "clutter-debug.h"
+ 
+-#include "json/json-parser.h"
++#include <json-glib/json-glib.h>
+ 
+ enum
+ {
diff --git a/graphics/clutter08/patches/patch-clutter_json_Makefile.am b/graphics/clutter08/patches/patch-clutter_json_Makefile.am
deleted file mode 100644
index d7eb223510c..00000000000
--- a/graphics/clutter08/patches/patch-clutter_json_Makefile.am
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-clutter_json_Makefile.am,v 1.1 2012/02/03 01:18:09 sbd Exp $
-
---- clutter/json/Makefile.am.orig	2009-02-20 15:41:39.000000000 +0000
-+++ clutter/json/Makefile.am
-@@ -19,7 +19,6 @@ libclutter_json_la_SOURCES = $(source_c)
- 
- INCLUDES = \
- 	-I$(top_srcdir) \
--	-DG_DISABLE_DEPRECATED \
- 	$(GCC_FLAGS) \
- 	$(CLUTTER_CFLAGS) \
- 	$(CLUTTER_DEBUG_CFLAGS)
diff --git a/graphics/clutter08/patches/patch-clutter_json_Makefile.in b/graphics/clutter08/patches/patch-clutter_json_Makefile.in
deleted file mode 100644
index 47ac525dbd1..00000000000
--- a/graphics/clutter08/patches/patch-clutter_json_Makefile.in
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-clutter_json_Makefile.in,v 1.1 2012/02/03 01:18:09 sbd Exp $
-
---- clutter/json/Makefile.in.orig	2009-02-20 15:58:03.000000000 +0000
-+++ clutter/json/Makefile.in
-@@ -261,7 +261,6 @@ noinst_LTLIBRARIES = libclutter-json.la
- libclutter_json_la_SOURCES = $(source_c) $(source_h)
- INCLUDES = \
- 	-I$(top_srcdir) \
--	-DG_DISABLE_DEPRECATED \
- 	$(GCC_FLAGS) \
- 	$(CLUTTER_CFLAGS) \
- 	$(CLUTTER_DEBUG_CFLAGS)