Update json-glib to 0.16.0. pkgsrc changes: use options framework to enable

the user to disable tests and NLS (enabled by default), and add PKG_OPTION
for gobject-introspection. EXTRACT_SUFX is now .tar.xz. Buildlink pthread
and textproc/json-c. Add PKG_BUILD_OPTIONS to buildlink3.mk. No noticeable
changes by default. PLIST uses PLIST_VARS as supplied by options.mk for
introspection and nls PKG_OPTIONS. Passes pkglint. From ChangeLog:

    Translation additions/updates:
    Assamese, Bengali Brazilian, British Bulgarian, Catalan, Catalan
    (Valencian), Czech, Danish, English, Esperanto, Estonian, French, Galician,
    German, Greek, Hindi, Hungarian, India, Indonesian, Italian, Japanese,
    Korean, Kyrgyz, Latvian, Lithuanian, Norwegian (bokmal), Odia, Polish,
    Portuguese, Portuguese (Brazilian), Punjabi, Russian, Serbian, Slovak,
    Slovenian, Spanish, Swedish, Tadjik, Telugu, Traditional Chinese
    translation (Hong Kong and Taiwan), Turkish, Ukrainian, Uyghur, Vietnamese

    docs: Fix xinclude fallback for annotation glossary
    variant: Fix documentation and annotations for deserialize()
    Update Visual Studio Solution Files
    Visual Studio Builds: Support building introspection files
    Update build/win32/config.h.win32(.in)
    Update Visual Studio Property Sheets
    node: add (transfer none) annotations to the new typed initializers
    Signed-off-by: Gheyret Kenji <gheyret@gmail.com>
    path: Fix get all object members with wildcard
    path: Fix get all array elements with wildcard
    Using the same data as in tests, asking for $['store']['book'][*] JSON path
    should return all the book objects in an array.
    But that array is returned inside another array, dupped several times.
    Fix VS 2008 poperty sheet
    Cleanup/fix Visual C++ build files
    build: Bump up the requirement for GLib
    build: Use the symbols file to generate our public ABI
    symbols: Re-sort
    tests: Put g_type_init() under conditional compilation
    Use typed initializers for JsonNode
    Use the new typed JsonNode initializers
    The typed setters in JsonArray and JsonObject should use the JsonNode
    typed initializers.
    Consolidate null handling in JsonArray and JsonObject
    node: Add typed initializers
    tests/reader: Improve test coverage
    reader: "null" is a value
    scanner: Remove unused functions
    tests: Improve coverage
    gobject: Use JsonSerializable API
    Instead of directly accessing the vfunc from the interface vtable.
    tests: Improve coverage
    builder: Conform to the coding style
    Function arguments should be aligned on different lines.
    array: Relax preconditions on array and object methods
    array: Relax add_string_element() preconditions
    tests/parser: Check negative numeric values
    tests/invalid: Improve test coverage
    parser: Empty member names are not valid
    build: Fix test-report generation
    tests/invalid: Add more invalid JSON tests
    tests/invalid: Check invalid assignments
    parser: Use error codes for invalid assignments
    tests: Move the invalid JSON unit to its own file
    parser: Consolidate value parsing
    parser: Show the column in the error message
    parser: Fix small leak in json_parse_statement
    reader: Do not do strict type validation on numeric types
    node: Implicitly convert numeric types
    generator: Use JsonValue, not GValue
    doap: Change my email address to @gnome.org
    Post-release version bump to 0.15.3
    docs: Add missing symbols
    build: Drop dependency on gnome-autogen.sh
    Use autoreconf instead.
    symbols: Add missing functions
    build: Add abicheck.sh
    scanner: Mark all symbols as internal
    Use lcov instead of gcov for test coverage reports
    With lcov we get nicer reporting tools, with HTML output.
    node: Replace GValue with JsonValue
    Add JsonValue
    path: Pass int width for printf field width, not long
    Signed-off-by: Fran Diéguez <fran.dieguez@mabishu.com>
    Fix "install" paths in VS property sheets
    Remove JSON_DISABLE_DEPRECATED
    Prevent .po file updates on simple 'make'
    autogen.sh: remove out-of-tree check
    Fix VS property sheets
    docs: Use markdown in the README
    docs: Fix typo in JsonObject's description
    Use the new GLib deprecation scheme
    Use g_value_[sg]et_schar() with GLib 2.31
    The non-explicitly signed variant is deprecated.
    Adapt to the demise of single includes in GLib
    Update VS9 property sheet
    build: Fix srcdir != builddir

5 files changed, 106 insertions, 14 deletions

diff --git a/textproc/json-glib/Makefile b/textproc/json-glib/Makefile
index 4b84d7d2f9a..882af458b51 100644
--- a/textproc/json-glib/Makefile
+++ b/textproc/json-glib/Makefile
@@ -1,11 +1,10 @@
-# $NetBSD: Makefile,v 1.16 2012/10/25 06:56:02 asau Exp $
+# $NetBSD: Makefile,v 1.17 2013/04/21 14:04:20 rodent Exp $
 #
 
-DISTNAME=	json-glib-0.14.2
-PKGREVISION=	3
+DISTNAME=	json-glib-0.16.0
 CATEGORIES=	textproc
-MASTER_SITES=	${MASTER_SITE_GNOME:=sources/json-glib/0.14/}
-EXTRACT_SUFX=	.tar.bz2
+MASTER_SITES=	${MASTER_SITE_GNOME:=sources/json-glib/0.16/}
+EXTRACT_SUFX=	.tar.xz
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://live.gnome.org/JsonGlib
@@ -14,12 +13,14 @@ LICENSE=	gnu-lgpl-v2.1
 
 GNU_CONFIGURE=	yes
 USE_LIBTOOL=	yes
-USE_TOOLS+=	gmake pkg-config
+USE_TOOLS+=	gmake msgfmt msgmerge pkg-config xgettext
 
 PKGCONFIG_OVERRIDE+=	json-glib.pc.in
 
-TEST_TARGET=	check
+.include "options.mk"
 
+.include "../../mk/pthread.buildlink3.mk"
+.include "../../textproc/json-c/buildlink3.mk"
 BUILDLINK_API_DEPENDS.glib2+=	glib2>=2.16.0
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/textproc/json-glib/PLIST b/textproc/json-glib/PLIST
index e925562bd24..74ab8fd9712 100644
--- a/textproc/json-glib/PLIST
+++ b/textproc/json-glib/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.6 2011/11/05 15:56:47 drochner Exp $
+@comment $NetBSD: PLIST,v 1.7 2013/04/21 14:04:20 rodent Exp $
 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
@@ -10,8 +10,10 @@ 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.h
+${PLIST.introspection}lib/girepository-1.0/Json-1.0.typelib
 lib/libjson-glib-1.0.la
 lib/pkgconfig/json-glib-1.0.pc
+${PLIST.introspection}share/gir-1.0/Json-1.0.gir
 share/gtk-doc/html/json-glib/JsonBuilder.html
 share/gtk-doc/html/json-glib/JsonGenerator.html
 share/gtk-doc/html/json-glib/JsonParser.html
@@ -52,4 +54,50 @@ share/gtk-doc/html/json-glib/license.html
 share/gtk-doc/html/json-glib/right.png
 share/gtk-doc/html/json-glib/style.css
 share/gtk-doc/html/json-glib/up.png
-share/locale/pl/LC_MESSAGES/json-glib-1.0.mo
+${PLIST.nls}share/locale/as/LC_MESSAGES/json-glib-1.0.mo
+${PLIST.nls}share/locale/bg/LC_MESSAGES/json-glib-1.0.mo
+${PLIST.nls}share/locale/bn_IN/LC_MESSAGES/json-glib-1.0.mo
+${PLIST.nls}share/locale/ca/LC_MESSAGES/json-glib-1.0.mo
+${PLIST.nls}share/locale/ca@valencia/LC_MESSAGES/json-glib-1.0.mo
+${PLIST.nls}share/locale/cs/LC_MESSAGES/json-glib-1.0.mo
+${PLIST.nls}share/locale/da/LC_MESSAGES/json-glib-1.0.mo
+${PLIST.nls}share/locale/de/LC_MESSAGES/json-glib-1.0.mo
+${PLIST.nls}share/locale/el/LC_MESSAGES/json-glib-1.0.mo
+${PLIST.nls}share/locale/en_GB/LC_MESSAGES/json-glib-1.0.mo
+${PLIST.nls}share/locale/eo/LC_MESSAGES/json-glib-1.0.mo
+${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/gl/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
+${PLIST.nls}share/locale/it/LC_MESSAGES/json-glib-1.0.mo
+${PLIST.nls}share/locale/ja/LC_MESSAGES/json-glib-1.0.mo
+${PLIST.nls}share/locale/ko/LC_MESSAGES/json-glib-1.0.mo
+${PLIST.nls}share/locale/ky/LC_MESSAGES/json-glib-1.0.mo
+${PLIST.nls}share/locale/lt/LC_MESSAGES/json-glib-1.0.mo
+${PLIST.nls}share/locale/lv/LC_MESSAGES/json-glib-1.0.mo
+${PLIST.nls}share/locale/ml/LC_MESSAGES/json-glib-1.0.mo
+${PLIST.nls}share/locale/nb/LC_MESSAGES/json-glib-1.0.mo
+${PLIST.nls}share/locale/or/LC_MESSAGES/json-glib-1.0.mo
+${PLIST.nls}share/locale/pa/LC_MESSAGES/json-glib-1.0.mo
+${PLIST.nls}share/locale/pl/LC_MESSAGES/json-glib-1.0.mo
+${PLIST.nls}share/locale/pt/LC_MESSAGES/json-glib-1.0.mo
+${PLIST.nls}share/locale/pt_BR/LC_MESSAGES/json-glib-1.0.mo
+${PLIST.nls}share/locale/ru/LC_MESSAGES/json-glib-1.0.mo
+${PLIST.nls}share/locale/sk/LC_MESSAGES/json-glib-1.0.mo
+${PLIST.nls}share/locale/sl/LC_MESSAGES/json-glib-1.0.mo
+${PLIST.nls}share/locale/sr/LC_MESSAGES/json-glib-1.0.mo
+${PLIST.nls}share/locale/sr@latin/LC_MESSAGES/json-glib-1.0.mo
+${PLIST.nls}share/locale/sv/LC_MESSAGES/json-glib-1.0.mo
+${PLIST.nls}share/locale/te/LC_MESSAGES/json-glib-1.0.mo
+${PLIST.nls}share/locale/tg/LC_MESSAGES/json-glib-1.0.mo
+${PLIST.nls}share/locale/tr/LC_MESSAGES/json-glib-1.0.mo
+${PLIST.nls}share/locale/ug/LC_MESSAGES/json-glib-1.0.mo
+${PLIST.nls}share/locale/uk/LC_MESSAGES/json-glib-1.0.mo
+${PLIST.nls}share/locale/vi/LC_MESSAGES/json-glib-1.0.mo
+${PLIST.nls}share/locale/zh_CN/LC_MESSAGES/json-glib-1.0.mo
+${PLIST.nls}share/locale/zh_HK/LC_MESSAGES/json-glib-1.0.mo
+${PLIST.nls}share/locale/zh_TW/LC_MESSAGES/json-glib-1.0.mo
diff --git a/textproc/json-glib/buildlink3.mk b/textproc/json-glib/buildlink3.mk
index 0145681c295..3c52f11c127 100644
--- a/textproc/json-glib/buildlink3.mk
+++ b/textproc/json-glib/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.8 2012/09/15 10:06:37 obache Exp $
+# $NetBSD: buildlink3.mk,v 1.9 2013/04/21 14:04:20 rodent Exp $
 #
 
 BUILDLINK_TREE+=	json-glib
@@ -10,6 +10,19 @@ BUILDLINK_API_DEPENDS.json-glib+=	json-glib>=0.6.2
 BUILDLINK_ABI_DEPENDS.json-glib+=		json-glib>=0.14.2nb3
 BUILDLINK_PKGSRCDIR.json-glib?=		../../textproc/json-glib
 
+pkgbase := json-glib
+.include "../../mk/pkg-build-options.mk"
+
+.if !empty(PKG_BUILD_OPTIONS.json-glib:Mintrospection)
+.include "../../devel/gobject-introspection/buildlink3.mk"
+.endif
+
+.if !empty(PKG_BUILD_OPTIONS.json-glib:Mnls)
+.include "../../converters/libiconv/buildlink3.mk"
+.include "../../devel/gettext-lib/buildlink3.mk"
+.endif
+
+.include "../../mk/pthread.buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
 .endif # JSON_GLIB_BUILDLINK3_MK
 
diff --git a/textproc/json-glib/distinfo b/textproc/json-glib/distinfo
index c5dc2107a78..33f22ab8a80 100644
--- a/textproc/json-glib/distinfo
+++ b/textproc/json-glib/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.10 2011/11/05 15:56:47 drochner Exp $
+$NetBSD: distinfo,v 1.11 2013/04/21 14:04:20 rodent Exp $
 
-SHA1 (json-glib-0.14.2.tar.bz2) = eecad8c1c9da35d097205708c348cc6ee391ebfa
-RMD160 (json-glib-0.14.2.tar.bz2) = 9d2ceddcbf742ba099b17082839682bcd7b921d4
-Size (json-glib-0.14.2.tar.bz2) = 523253 bytes
+SHA1 (json-glib-0.16.0.tar.xz) = 9e0af8625586fc2e70e12b4beae31b120cff5090
+RMD160 (json-glib-0.16.0.tar.xz) = b0d95ca7b509dda0ebf456b52982b09d7d28a3f3
+Size (json-glib-0.16.0.tar.xz) = 505452 bytes
diff --git a/textproc/json-glib/options.mk b/textproc/json-glib/options.mk
new file mode 100644
index 00000000000..10815d3b652
--- /dev/null
+++ b/textproc/json-glib/options.mk
@@ -0,0 +1,30 @@
+# $NetBSD: options.mk,v 1.1 2013/04/21 14:04:20 rodent Exp $
+
+PKG_OPTIONS_VAR=	PKG_OPTIONS.json-glib
+PKG_SUPPORTED_OPTIONS=	introspection nls tests
+PKG_SUGGESTED_OPTIONS+=	nls tests
+PLIST_VARS+=		introspection nls
+
+.include "../../mk/bsd.options.mk"
+
+.if !empty(PKG_OPTIONS:Mintrospection)
+.include "../../devel/gobject-introspection/buildlink3.mk"
+CONFIGURE_ARGS+=	--enable-introspection=yes
+PLIST.introspection=	yes
+.else
+CONFIGURE_ARGS+=	--enable-introspection=no
+.endif
+
+.if !empty(PKG_OPTIONS:Mnls)
+.include "../../converters/libiconv/buildlink3.mk"
+.include "../../devel/gettext-lib/buildlink3.mk"
+PLIST.nls=		yes
+.else
+CONFIGURE_ARGS+=	--disable-nls
+.endif
+
+.if !empty(PKG_OPTIONS:Mtests)
+TEST_TARGET=		check
+.else
+CONFIGURE_ARGS+=	--disable-glibtest
+.endif