Update to 0.11:

0.11

  * IMPORTANT: the name of the library has changed to libjson-c.so and
     the header files are now in include/json-c.
     The pkgconfig name has also changed from json to json-c.
     You should change your build to use appropriate -I and -l options.
     A compatibility shim is in place so builds using the old name will
     continue to work, but that will be removed in the next release.
  * Maximum recursion depth is now a runtime option.
     json_tokener_new() is provided for compatibility.
     json_tokener_new_ex(depth)
  * Include json_object_iterator.h in the installed headers.
  * Add support for building on Android.
  * Rewrite json_object_object_add to replace just the value if the key already exists so keys remain valid.
  * Make it safe to delete keys while iterating with the json_object_object_foreach macro.
  * Add a json_set_serializer() function to allow the string output of a json_object to be customized.
  * Make float parsing locale independent.
  * Add a json_tokener_set_flags() function and a JSON_TOKENER_STRICT flag.
  * Enable -Werror when building.
  * speed improvements to parsing 64-bit integers on systems with working sscanf
  * Add a json_object_object_length function.
  * Fix a bug (buffer overrun) when expanding arrays to more than 64 entries.

5 files changed, 28 insertions, 42 deletions

diff --git a/textproc/json-c/Makefile b/textproc/json-c/Makefile
index 8307384b4a5..1484acbd521 100644
--- a/textproc/json-c/Makefile
+++ b/textproc/json-c/Makefile
@@ -1,24 +1,20 @@
-# $NetBSD: Makefile,v 1.2 2012/10/26 20:16:44 joerg Exp $
-#
+# $NetBSD: Makefile,v 1.3 2013/11/25 11:59:08 wiz Exp $
 
-DISTNAME=	json-c-0.10
+DISTNAME=	json-c-0.11
 CATEGORIES=	textproc
-MASTER_SITES=	https://github.com/downloads/json-c/json-c/
+MASTER_SITES=	https://s3.amazonaws.com/json-c_releases/releases/
 
 MAINTAINER=	ryoon@NetBSD.org
 HOMEPAGE=	https://github.com/json-c/json-c/wiki
 COMMENT=	JSON library in C
 LICENSE=	mit
 
-# Force using "curl" for fetching the distribution file. It is only available
-# over HTTPS and "curl" is the only fetch program which always supports HTTPS.
-FETCH_USING=	curl
-
 GNU_CONFIGURE=	yes
 USE_LIBTOOL=	yes
 USE_TOOLS+=	pkg-config
 
 PKGCONFIG_OVERRIDE+=	json.pc.in
+PKGCONFIG_OVERRIDE+=	json-c.pc.in
 
 .include "../../mk/compiler.mk"
 .if !empty(PKGSRC_COMPILER:Mclang)
diff --git a/textproc/json-c/PLIST b/textproc/json-c/PLIST
index 3bf62f3e35e..21dab7bd6a7 100644
--- a/textproc/json-c/PLIST
+++ b/textproc/json-c/PLIST
@@ -1,16 +1,20 @@
-@comment $NetBSD: PLIST,v 1.1 2012/10/11 15:40:40 ryoon Exp $
-include/json/arraylist.h
-include/json/bits.h
-include/json/debug.h
-include/json/json.h
-include/json/json_config.h
-include/json/json_inttypes.h
-include/json/json_object.h
-include/json/json_object_iterator.h
-include/json/json_object_private.h
-include/json/json_tokener.h
-include/json/json_util.h
-include/json/linkhash.h
-include/json/printbuf.h
+@comment $NetBSD: PLIST,v 1.2 2013/11/25 11:59:08 wiz Exp $
+include/json
+include/json-c/arraylist.h
+include/json-c/bits.h
+include/json-c/debug.h
+include/json-c/json.h
+include/json-c/json_c_version.h
+include/json-c/json_config.h
+include/json-c/json_inttypes.h
+include/json-c/json_object.h
+include/json-c/json_object_iterator.h
+include/json-c/json_object_private.h
+include/json-c/json_tokener.h
+include/json-c/json_util.h
+include/json-c/linkhash.h
+include/json-c/printbuf.h
+lib/libjson-c.la
 lib/libjson.la
+lib/pkgconfig/json-c.pc
 lib/pkgconfig/json.pc
diff --git a/textproc/json-c/buildlink3.mk b/textproc/json-c/buildlink3.mk
index c743a9bbdc4..d3be7b4b7a9 100644
--- a/textproc/json-c/buildlink3.mk
+++ b/textproc/json-c/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2012/10/11 15:40:40 ryoon Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2013/11/25 11:59:08 wiz Exp $
 
 BUILDLINK_TREE+=	json-c
 
@@ -6,6 +6,7 @@ BUILDLINK_TREE+=	json-c
 JSON_C_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.json-c+=	json-c>=0.10
+BUILDLINK_ABI_DEPENDS.json-c?=	json-c>=0.11
 BUILDLINK_PKGSRCDIR.json-c?=	../../textproc/json-c
 .endif	# JSON_C_BUILDLINK3_MK
 
diff --git a/textproc/json-c/distinfo b/textproc/json-c/distinfo
index a6722cbf7fa..14e12d74363 100644
--- a/textproc/json-c/distinfo
+++ b/textproc/json-c/distinfo
@@ -1,6 +1,5 @@
-$NetBSD: distinfo,v 1.1 2012/10/11 15:40:40 ryoon Exp $
+$NetBSD: distinfo,v 1.2 2013/11/25 11:59:08 wiz Exp $
 
-SHA1 (json-c-0.10.tar.gz) = f90f643c8455da21d57b3e8866868a944a93c596
-RMD160 (json-c-0.10.tar.gz) = 2ad4ce9a41d87f30a0dcc15a89246353e8edd360
-Size (json-c-0.10.tar.gz) = 385812 bytes
-SHA1 (patch-Makefile.in) = 6dfebc80c89f1122f3299102c13fdce5618ae4c8
+SHA1 (json-c-0.11.tar.gz) = 5d0377d2cc4a1af324d5aeb5b63032d1d026aacd
+RMD160 (json-c-0.11.tar.gz) = 04a5e2619a9543dfef5f3d6f19e2606c4241c6e9
+Size (json-c-0.11.tar.gz) = 557263 bytes
diff --git a/textproc/json-c/patches/patch-Makefile.in b/textproc/json-c/patches/patch-Makefile.in
deleted file mode 100644
index 0a272115756..00000000000
--- a/textproc/json-c/patches/patch-Makefile.in
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-Makefile.in,v 1.1 2012/10/11 15:40:40 ryoon Exp $
-
-* From https://github.com/json-c/json-c/commit/4154c55edae6f6b34d6ef4fcc331055fdf8e1a23#Makefile.am
-
---- Makefile.in.orig	2012-05-31 02:31:35.000000000 +0000
-+++ Makefile.in
-@@ -278,6 +278,7 @@ libjsoninclude_HEADERS = \
- 	json_config.h \
- 	json_inttypes.h \
- 	json_object.h \
-+	json_object_iterator.h \
- 	json_object_private.h \
- 	json_tokener.h \
- 	json_util.h \