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.diff -r1.2 -r1.3 pkgsrc/textproc/json-c/Makefile
(wiz)
@@ -1,28 +1,24 @@ | @@ -1,28 +1,24 @@ | |||
1 | # $NetBSD: Makefile,v 1.2 2012/10/26 20:16:44 joerg Exp $ | 1 | # $NetBSD: Makefile,v 1.3 2013/11/25 11:59:08 wiz Exp $ | |
2 | # | |||
3 | 2 | |||
4 | DISTNAME= json-c-0.10 | 3 | DISTNAME= json-c-0.11 | |
5 | CATEGORIES= textproc | 4 | CATEGORIES= textproc | |
6 | MASTER_SITES= https://github.com/downloads/json-c/json-c/ | 5 | MASTER_SITES= https://s3.amazonaws.com/json-c_releases/releases/ | |
7 | 6 | |||
8 | MAINTAINER= ryoon@NetBSD.org | 7 | MAINTAINER= ryoon@NetBSD.org | |
9 | HOMEPAGE= https://github.com/json-c/json-c/wiki | 8 | HOMEPAGE= https://github.com/json-c/json-c/wiki | |
10 | COMMENT= JSON library in C | 9 | COMMENT= JSON library in C | |
11 | LICENSE= mit | 10 | LICENSE= mit | |
12 | 11 | |||
13 | # Force using "curl" for fetching the distribution file. It is only available | |||
14 | # over HTTPS and "curl" is the only fetch program which always supports HTTPS. | |||
15 | FETCH_USING= curl | |||
16 | ||||
17 | GNU_CONFIGURE= yes | 12 | GNU_CONFIGURE= yes | |
18 | USE_LIBTOOL= yes | 13 | USE_LIBTOOL= yes | |
19 | USE_TOOLS+= pkg-config | 14 | USE_TOOLS+= pkg-config | |
20 | 15 | |||
21 | PKGCONFIG_OVERRIDE+= json.pc.in | 16 | PKGCONFIG_OVERRIDE+= json.pc.in | |
17 | PKGCONFIG_OVERRIDE+= json-c.pc.in | |||
22 | 18 | |||
23 | .include "../../mk/compiler.mk" | 19 | .include "../../mk/compiler.mk" | |
24 | .if !empty(PKGSRC_COMPILER:Mclang) | 20 | .if !empty(PKGSRC_COMPILER:Mclang) | |
25 | CFLAGS+= -Wno-tautological-compare -Wno-unused-value | 21 | CFLAGS+= -Wno-tautological-compare -Wno-unused-value | |
26 | .endif | 22 | .endif | |
27 | 23 | |||
28 | .include "../../mk/bsd.pkg.mk" | 24 | .include "../../mk/bsd.pkg.mk" |
@@ -1,16 +1,20 @@ | @@ -1,16 +1,20 @@ | |||
1 | @comment $NetBSD: PLIST,v 1.1 2012/10/11 15:40:40 ryoon Exp $ | 1 | @comment $NetBSD: PLIST,v 1.2 2013/11/25 11:59:08 wiz Exp $ | |
2 | include/json/arraylist.h | 2 | include/json | |
3 | include/json/bits.h | 3 | include/json-c/arraylist.h | |
4 | include/json/debug.h | 4 | include/json-c/bits.h | |
5 | include/json/json.h | 5 | include/json-c/debug.h | |
6 | include/json/json_config.h | 6 | include/json-c/json.h | |
7 | include/json/json_inttypes.h | 7 | include/json-c/json_c_version.h | |
8 | include/json/json_object.h | 8 | include/json-c/json_config.h | |
9 | include/json/json_object_iterator.h | 9 | include/json-c/json_inttypes.h | |
10 | include/json/json_object_private.h | 10 | include/json-c/json_object.h | |
11 | include/json/json_tokener.h | 11 | include/json-c/json_object_iterator.h | |
12 | include/json/json_util.h | 12 | include/json-c/json_object_private.h | |
13 | include/json/linkhash.h | 13 | include/json-c/json_tokener.h | |
14 | include/json/printbuf.h | 14 | include/json-c/json_util.h | |
15 | include/json-c/linkhash.h | |||
16 | include/json-c/printbuf.h | |||
17 | lib/libjson-c.la | |||
15 | lib/libjson.la | 18 | lib/libjson.la | |
19 | lib/pkgconfig/json-c.pc | |||
16 | lib/pkgconfig/json.pc | 20 | lib/pkgconfig/json.pc |
@@ -1,12 +1,13 @@ | @@ -1,12 +1,13 @@ | |||
1 | # $NetBSD: buildlink3.mk,v 1.1 2012/10/11 15:40:40 ryoon Exp $ | 1 | # $NetBSD: buildlink3.mk,v 1.2 2013/11/25 11:59:08 wiz Exp $ | |
2 | 2 | |||
3 | BUILDLINK_TREE+= json-c | 3 | BUILDLINK_TREE+= json-c | |
4 | 4 | |||
5 | .if !defined(JSON_C_BUILDLINK3_MK) | 5 | .if !defined(JSON_C_BUILDLINK3_MK) | |
6 | JSON_C_BUILDLINK3_MK:= | 6 | JSON_C_BUILDLINK3_MK:= | |
7 | 7 | |||
8 | BUILDLINK_API_DEPENDS.json-c+= json-c>=0.10 | 8 | BUILDLINK_API_DEPENDS.json-c+= json-c>=0.10 | |
9 | BUILDLINK_ABI_DEPENDS.json-c?= json-c>=0.11 | |||
9 | BUILDLINK_PKGSRCDIR.json-c?= ../../textproc/json-c | 10 | BUILDLINK_PKGSRCDIR.json-c?= ../../textproc/json-c | |
10 | .endif # JSON_C_BUILDLINK3_MK | 11 | .endif # JSON_C_BUILDLINK3_MK | |
11 | 12 | |||
12 | BUILDLINK_TREE+= -json-c | 13 | BUILDLINK_TREE+= -json-c |
@@ -1,6 +1,5 @@ | @@ -1,6 +1,5 @@ | |||
1 | $NetBSD: distinfo,v 1.1 2012/10/11 15:40:40 ryoon Exp $ | 1 | $NetBSD: distinfo,v 1.2 2013/11/25 11:59:08 wiz Exp $ | |
2 | 2 | |||
3 | SHA1 (json-c-0.10.tar.gz) = f90f643c8455da21d57b3e8866868a944a93c596 | 3 | SHA1 (json-c-0.11.tar.gz) = 5d0377d2cc4a1af324d5aeb5b63032d1d026aacd | |
4 | RMD160 (json-c-0.10.tar.gz) = 2ad4ce9a41d87f30a0dcc15a89246353e8edd360 | 4 | RMD160 (json-c-0.11.tar.gz) = 04a5e2619a9543dfef5f3d6f19e2606c4241c6e9 | |
5 | Size (json-c-0.10.tar.gz) = 385812 bytes | 5 | Size (json-c-0.11.tar.gz) = 557263 bytes | |
6 | SHA1 (patch-Makefile.in) = 6dfebc80c89f1122f3299102c13fdce5618ae4c8 |