Update json-glib to 1.0.

Overview of changes for 1.0
==============================
• Bump the dependency on GLib to 2.38
• Use the TAP driver for the test suite
• Improve the syntax validation in JsonPath
• Validate the JsonParser input to be UTF-8
• Add command line tools for validating and formatting JSON
• Improve documentation

5 files changed, 60 insertions, 10 deletions

diff --git a/textproc/json-glib/Makefile b/textproc/json-glib/Makefile
index bf86a4919f5..a3cc355c6f8 100644
--- a/textproc/json-glib/Makefile
+++ b/textproc/json-glib/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.20 2014/04/20 09:32:57 obache Exp $
+# $NetBSD: Makefile,v 1.21 2014/04/20 09:36:29 obache Exp $
 #
 
-DISTNAME=	json-glib-0.16.2
+DISTNAME=	json-glib-1.0.0
 CATEGORIES=	textproc
-MASTER_SITES=	${MASTER_SITE_GNOME:=sources/json-glib/0.16/}
+MASTER_SITES=	${MASTER_SITE_GNOME:=sources/json-glib/${PKGVERSION_NOREV:R}/}
 EXTRACT_SUFX=	.tar.xz
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
@@ -21,6 +21,13 @@ TEST_TARGET=		check
 
 .include "options.mk"
 
-BUILDLINK_API_DEPENDS.glib2+=	glib2>=2.34.0
+PRINT_PLIST_AWK+= \
+	($$0 ~ /^lib\/girepository-1.0\//) || \
+	($$0 ~ /^share\/gir-1.0\//) \
+	{ $$0 = "$${PLIST.introspection}" $$0; } \
+	($$0 ~ /^${PKGLOCALEDIR:S|/|\/|g}\/locale\//) \
+	{ $$0 = "$${PLIST.nls}" $$0; }
+
+BUILDLINK_API_DEPENDS.glib2+=	glib2>=2.38.0
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/textproc/json-glib/PLIST b/textproc/json-glib/PLIST
index 74ab8fd9712..de0abd5e029 100644
--- a/textproc/json-glib/PLIST
+++ b/textproc/json-glib/PLIST
@@ -1,4 +1,6 @@
-@comment $NetBSD: PLIST,v 1.7 2013/04/21 14:04:20 rodent Exp $
+@comment $NetBSD: PLIST,v 1.8 2014/04/20 09:36:29 obache Exp $
+bin/json-glib-format
+bin/json-glib-validate
 include/json-glib-1.0/json-glib/json-builder.h
 include/json-glib-1.0/json-glib/json-enum-types.h
 include/json-glib-1.0/json-glib/json-generator.h
@@ -9,6 +11,7 @@ include/json-glib-1.0/json-glib/json-parser.h
 include/json-glib-1.0/json-glib/json-path.h
 include/json-glib-1.0/json-glib/json-reader.h
 include/json-glib-1.0/json-glib/json-types.h
+include/json-glib-1.0/json-glib/json-version-macros.h
 include/json-glib-1.0/json-glib/json-version.h
 ${PLIST.introspection}lib/girepository-1.0/Json-1.0.typelib
 lib/libjson-glib-1.0.la
@@ -23,7 +26,7 @@ share/gtk-doc/html/json-glib/annotation-glossary.html
 share/gtk-doc/html/json-glib/ch01.html
 share/gtk-doc/html/json-glib/ch02.html
 share/gtk-doc/html/json-glib/ch03.html
-share/gtk-doc/html/json-glib/ch04.html
+share/gtk-doc/html/json-glib/ch05.html
 share/gtk-doc/html/json-glib/home.png
 share/gtk-doc/html/json-glib/index.html
 share/gtk-doc/html/json-glib/index.sgml
@@ -37,6 +40,7 @@ share/gtk-doc/html/json-glib/ix07.html
 share/gtk-doc/html/json-glib/ix08.html
 share/gtk-doc/html/json-glib/json-advanced.html
 share/gtk-doc/html/json-glib/json-base.html
+share/gtk-doc/html/json-glib/json-format-tool.html
 share/gtk-doc/html/json-glib/json-glib-Boxed-Types-Serialization.html
 share/gtk-doc/html/json-glib/json-glib-GObject-Serialization.html
 share/gtk-doc/html/json-glib/json-glib-JSON-Array.html
@@ -49,10 +53,15 @@ share/gtk-doc/html/json-glib/json-glib.devhelp2
 share/gtk-doc/html/json-glib/json-glib.html
 share/gtk-doc/html/json-glib/json-streams.html
 share/gtk-doc/html/json-glib/json-tools.html
+share/gtk-doc/html/json-glib/json-validate-tool.html
+share/gtk-doc/html/json-glib/left-insensitive.png
 share/gtk-doc/html/json-glib/left.png
 share/gtk-doc/html/json-glib/license.html
+share/gtk-doc/html/json-glib/right-insensitive.png
 share/gtk-doc/html/json-glib/right.png
 share/gtk-doc/html/json-glib/style.css
+share/gtk-doc/html/json-glib/tools.html
+share/gtk-doc/html/json-glib/up-insensitive.png
 share/gtk-doc/html/json-glib/up.png
 ${PLIST.nls}share/locale/as/LC_MESSAGES/json-glib-1.0.mo
 ${PLIST.nls}share/locale/bg/LC_MESSAGES/json-glib-1.0.mo
@@ -69,7 +78,9 @@ ${PLIST.nls}share/locale/es/LC_MESSAGES/json-glib-1.0.mo
 ${PLIST.nls}share/locale/et/LC_MESSAGES/json-glib-1.0.mo
 ${PLIST.nls}share/locale/eu/LC_MESSAGES/json-glib-1.0.mo
 ${PLIST.nls}share/locale/fr/LC_MESSAGES/json-glib-1.0.mo
+${PLIST.nls}share/locale/fur/LC_MESSAGES/json-glib-1.0.mo
 ${PLIST.nls}share/locale/gl/LC_MESSAGES/json-glib-1.0.mo
+${PLIST.nls}share/locale/he/LC_MESSAGES/json-glib-1.0.mo
 ${PLIST.nls}share/locale/hi/LC_MESSAGES/json-glib-1.0.mo
 ${PLIST.nls}share/locale/hu/LC_MESSAGES/json-glib-1.0.mo
 ${PLIST.nls}share/locale/id/LC_MESSAGES/json-glib-1.0.mo
diff --git a/textproc/json-glib/distinfo b/textproc/json-glib/distinfo
index 279150c7c5f..51f325cc751 100644
--- a/textproc/json-glib/distinfo
+++ b/textproc/json-glib/distinfo
@@ -1,5 +1,7 @@
-$NetBSD: distinfo,v 1.12 2014/01/02 12:19:00 obache Exp $
+$NetBSD: distinfo,v 1.13 2014/04/20 09:36:29 obache Exp $
 
-SHA1 (json-glib-0.16.2.tar.xz) = a67e1f0d5a3cc5c96e999ddb24c75c6ca21d8252
-RMD160 (json-glib-0.16.2.tar.xz) = f6ddacdd58846ea65b99cbd18eb4943f6a66019b
-Size (json-glib-0.16.2.tar.xz) = 506640 bytes
+SHA1 (json-glib-1.0.0.tar.xz) = ed48f3d276327ba4ce22fb42494d95141e37893f
+RMD160 (json-glib-1.0.0.tar.xz) = e9a99e1179b446cca06ad7c17b3c03a94d67efc9
+Size (json-glib-1.0.0.tar.xz) = 547100 bytes
+SHA1 (patch-build_autotools_glibtests.m4) = 2ec66dd7e744557224629f1bef90980c9538c806
+SHA1 (patch-configure) = b698c4864a2f1a03173e20b9da989044c1cc3247
diff --git a/textproc/json-glib/patches/patch-build_autotools_glibtests.m4 b/textproc/json-glib/patches/patch-build_autotools_glibtests.m4
new file mode 100644
index 00000000000..65438535265
--- /dev/null
+++ b/textproc/json-glib/patches/patch-build_autotools_glibtests.m4
@@ -0,0 +1,15 @@
+$NetBSD: patch-build_autotools_glibtests.m4,v 1.1 2014/04/20 09:36:29 obache Exp $
+
+* test(1) portability fix
+
+--- build/autotools/glibtests.m4.orig	2013-11-22 17:36:08.000000000 +0000
++++ build/autotools/glibtests.m4
+@@ -21,7 +21,7 @@ AC_DEFUN([GLIB_TESTS],
+                   *) AC_MSG_ERROR([bad value ${enableval} for --enable-always-build-tests]) ;;
+                  esac])
+   AM_CONDITIONAL([ENABLE_ALWAYS_BUILD_TESTS], test "$ENABLE_ALWAYS_BUILD_TESTS" = "1")
+-  if test "$ENABLE_INSTALLED_TESTS" == "1"; then
++  if test "$ENABLE_INSTALLED_TESTS" = "1"; then
+     AC_SUBST(installed_test_metadir, [${datadir}/installed-tests/]AC_PACKAGE_NAME)
+     AC_SUBST(installed_testdir, [${libexecdir}/installed-tests/]AC_PACKAGE_NAME)
+   fi
diff --git a/textproc/json-glib/patches/patch-configure b/textproc/json-glib/patches/patch-configure
new file mode 100644
index 00000000000..2482b9f6067
--- /dev/null
+++ b/textproc/json-glib/patches/patch-configure
@@ -0,0 +1,15 @@
+$NetBSD: patch-configure,v 1.1 2014/04/20 09:36:29 obache Exp $
+
+* test(1) portability fix
+
+--- configure.orig	2014-04-20 08:58:47.000000000 +0000
++++ configure
+@@ -12430,7 +12430,7 @@ else
+   ENABLE_ALWAYS_BUILD_TESTS_FALSE=
+ fi
+ 
+-  if test "$ENABLE_INSTALLED_TESTS" == "1"; then
++  if test "$ENABLE_INSTALLED_TESTS" = "1"; then
+     installed_test_metadir=${datadir}/installed-tests/json-glib
+ 
+     installed_testdir=${libexecdir}/installed-tests/json-glib