pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

json-glib: sync with changes from main pkgsrc tree

Module Name:	pkgsrc-wip
Committed By:	Dan Cîrnaț <dan%alt.md@localhost>
Pushed By:	cirnatdan
Date:		Wed Apr 21 18:39:49 2021 +0200
Changeset:	336566c727d88c9a307e836099860dcf57799437

Modified Files:
	json-glib/Makefile
	json-glib/PLIST
	json-glib/buildlink3.mk
	json-glib/options.mk

Log Message:
json-glib: sync with changes from main pkgsrc tree

remove gtk-doc support

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=336566c727d88c9a307e836099860dcf57799437

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 json-glib/Makefile      |  19 ++++--
 json-glib/PLIST         | 160 ++++++++++++++++++------------------------------
 json-glib/buildlink3.mk |   5 +-
 json-glib/options.mk    |  20 ++----
 4 files changed, 81 insertions(+), 123 deletions(-)

diffs:
diff --git a/json-glib/Makefile b/json-glib/Makefile
index ce0b5614a4..9acfc2f344 100644
--- a/json-glib/Makefile
+++ b/json-glib/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.32 2020/03/18 18:01:23 joerg Exp $
+# $NetBSD$
 
 DISTNAME=	json-glib-1.6.2
+PKGREVISION=	1
 CATEGORIES=	textproc gnome
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/json-glib/${PKGVERSION_NOREV:R}/}
 EXTRACT_SUFX=	.tar.xz
@@ -10,9 +11,13 @@ HOMEPAGE=	https://wiki.gnome.org/Projects/JsonGlib
 COMMENT=	JSON parser for GLib-based libraries and applications
 LICENSE=	gnu-lgpl-v2.1
 
-USE_TOOLS+=	msgfmt msgmerge pkg-config xgettext
+TOOL_DEPENDS+=	libxslt-[0-9]*:../../textproc/libxslt
+TOOL_DEPENDS+=	docbook-xsl-[0-9]*:../../textproc/docbook-xsl
 
-CONFIGURE_ARGS+=	--disable-man
+USE_TOOLS+=	msgfmt pkg-config xgettext
+
+MESON_ARGS+=	-Dman=true
+MESON_ARGS+=	-Dgtk_doc=disabled
 
 .include "../../mk/compiler.mk"
 
@@ -30,11 +35,13 @@ MAKE_ENV+=	LD_LIBRARY_PATH=${WRKSRC}/output/json-glib
 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; }
+	{ $$0 = "$${PLIST.introspection}" $$0; }
+
+PYTHON_FOR_BUILD_ONLY=	tool
 
 BUILDLINK_API_DEPENDS.glib2+=	glib2>=2.38.0
+.include "../../converters/libiconv/buildlink3.mk"
+.include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../devel/meson/build.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/json-glib/PLIST b/json-glib/PLIST
index 5be6f85bd1..348ebe047b 100644
--- a/json-glib/PLIST
+++ b/json-glib/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD$
+@comment $NetBSD: PLIST,v 1.12 2021/04/12 11:16:11 nia Exp $
 bin/json-glib-format
 bin/json-glib-validate
 include/json-glib-1.0/json-glib/json-builder.h
@@ -17,7 +17,7 @@ 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.so
 lib/libjson-glib-1.0.so.0
-lib/libjson-glib-1.0.so.0.600.2
+lib/libjson-glib-1.0.so.0.400.4
 lib/pkgconfig/json-glib-1.0.pc
 libexec/installed-tests/json-glib-1.0/array
 libexec/installed-tests/json-glib-1.0/boxed
@@ -36,47 +36,9 @@ libexec/installed-tests/json-glib-1.0/serialize-full
 libexec/installed-tests/json-glib-1.0/serialize-simple
 libexec/installed-tests/json-glib-1.0/skip-bom.json
 libexec/installed-tests/json-glib-1.0/stream-load.json
+man/man1/json-glib-format.1
+man/man1/json-glib-validate.1
 ${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
-share/gtk-doc/html/json-glib/JsonPath.html
-share/gtk-doc/html/json-glib/JsonReader.html
-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/ch06.html
-share/gtk-doc/html/json-glib/home.png
-share/gtk-doc/html/json-glib/index.html
-share/gtk-doc/html/json-glib/ix01.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
-share/gtk-doc/html/json-glib/json-glib-JSON-GVariant-Integration.html
-share/gtk-doc/html/json-glib/json-glib-JSON-Node.html
-share/gtk-doc/html/json-glib/json-glib-JSON-Object.html
-share/gtk-doc/html/json-glib/json-glib-Serializable-Interface.html
-share/gtk-doc/html/json-glib/json-glib-Utility-API.html
-share/gtk-doc/html/json-glib/json-glib-Versioning-information.html
-share/gtk-doc/html/json-glib/json-glib.devhelp2
-share/gtk-doc/html/json-glib/json-overview.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
 share/installed-tests/json-glib-1.0/array.test
 share/installed-tests/json-glib-1.0/boxed.test
 share/installed-tests/json-glib-1.0/builder.test
@@ -91,60 +53,60 @@ share/installed-tests/json-glib-1.0/reader.test
 share/installed-tests/json-glib-1.0/serialize-complex.test
 share/installed-tests/json-glib-1.0/serialize-full.test
 share/installed-tests/json-glib-1.0/serialize-simple.test
-${PLIST.nls}share/locale/as/LC_MESSAGES/json-glib-1.0.mo
-${PLIST.nls}share/locale/be/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/bs/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/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/hr/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/ms/LC_MESSAGES/json-glib-1.0.mo
-${PLIST.nls}share/locale/nb/LC_MESSAGES/json-glib-1.0.mo
-${PLIST.nls}share/locale/ne/LC_MESSAGES/json-glib-1.0.mo
-${PLIST.nls}share/locale/nl/LC_MESSAGES/json-glib-1.0.mo
-${PLIST.nls}share/locale/oc/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/ro/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
+share/locale/as/LC_MESSAGES/json-glib-1.0.mo
+share/locale/be/LC_MESSAGES/json-glib-1.0.mo
+share/locale/bg/LC_MESSAGES/json-glib-1.0.mo
+share/locale/bn_IN/LC_MESSAGES/json-glib-1.0.mo
+share/locale/bs/LC_MESSAGES/json-glib-1.0.mo
+share/locale/ca/LC_MESSAGES/json-glib-1.0.mo
+share/locale/ca@valencia/LC_MESSAGES/json-glib-1.0.mo
+share/locale/cs/LC_MESSAGES/json-glib-1.0.mo
+share/locale/da/LC_MESSAGES/json-glib-1.0.mo
+share/locale/de/LC_MESSAGES/json-glib-1.0.mo
+share/locale/el/LC_MESSAGES/json-glib-1.0.mo
+share/locale/en_GB/LC_MESSAGES/json-glib-1.0.mo
+share/locale/eo/LC_MESSAGES/json-glib-1.0.mo
+share/locale/es/LC_MESSAGES/json-glib-1.0.mo
+share/locale/et/LC_MESSAGES/json-glib-1.0.mo
+share/locale/eu/LC_MESSAGES/json-glib-1.0.mo
+share/locale/fr/LC_MESSAGES/json-glib-1.0.mo
+share/locale/fur/LC_MESSAGES/json-glib-1.0.mo
+share/locale/gl/LC_MESSAGES/json-glib-1.0.mo
+share/locale/he/LC_MESSAGES/json-glib-1.0.mo
+share/locale/hi/LC_MESSAGES/json-glib-1.0.mo
+share/locale/hr/LC_MESSAGES/json-glib-1.0.mo
+share/locale/hu/LC_MESSAGES/json-glib-1.0.mo
+share/locale/id/LC_MESSAGES/json-glib-1.0.mo
+share/locale/it/LC_MESSAGES/json-glib-1.0.mo
+share/locale/ja/LC_MESSAGES/json-glib-1.0.mo
+share/locale/ko/LC_MESSAGES/json-glib-1.0.mo
+share/locale/ky/LC_MESSAGES/json-glib-1.0.mo
+share/locale/lt/LC_MESSAGES/json-glib-1.0.mo
+share/locale/lv/LC_MESSAGES/json-glib-1.0.mo
+share/locale/ml/LC_MESSAGES/json-glib-1.0.mo
+share/locale/ms/LC_MESSAGES/json-glib-1.0.mo
+share/locale/nb/LC_MESSAGES/json-glib-1.0.mo
+share/locale/ne/LC_MESSAGES/json-glib-1.0.mo
+share/locale/nl/LC_MESSAGES/json-glib-1.0.mo
+share/locale/oc/LC_MESSAGES/json-glib-1.0.mo
+share/locale/or/LC_MESSAGES/json-glib-1.0.mo
+share/locale/pa/LC_MESSAGES/json-glib-1.0.mo
+share/locale/pl/LC_MESSAGES/json-glib-1.0.mo
+share/locale/pt/LC_MESSAGES/json-glib-1.0.mo
+share/locale/pt_BR/LC_MESSAGES/json-glib-1.0.mo
+share/locale/ro/LC_MESSAGES/json-glib-1.0.mo
+share/locale/ru/LC_MESSAGES/json-glib-1.0.mo
+share/locale/sk/LC_MESSAGES/json-glib-1.0.mo
+share/locale/sl/LC_MESSAGES/json-glib-1.0.mo
+share/locale/sr/LC_MESSAGES/json-glib-1.0.mo
+share/locale/sr@latin/LC_MESSAGES/json-glib-1.0.mo
+share/locale/sv/LC_MESSAGES/json-glib-1.0.mo
+share/locale/te/LC_MESSAGES/json-glib-1.0.mo
+share/locale/tg/LC_MESSAGES/json-glib-1.0.mo
+share/locale/tr/LC_MESSAGES/json-glib-1.0.mo
+share/locale/ug/LC_MESSAGES/json-glib-1.0.mo
+share/locale/uk/LC_MESSAGES/json-glib-1.0.mo
+share/locale/vi/LC_MESSAGES/json-glib-1.0.mo
+share/locale/zh_CN/LC_MESSAGES/json-glib-1.0.mo
+share/locale/zh_HK/LC_MESSAGES/json-glib-1.0.mo
+share/locale/zh_TW/LC_MESSAGES/json-glib-1.0.mo
diff --git a/json-glib/buildlink3.mk b/json-glib/buildlink3.mk
index 543b9d1813..e08bb464f2 100644
--- a/json-glib/buildlink3.mk
+++ b/json-glib/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.13 2020/03/08 16:48:14 wiz Exp $
+# $NetBSD$
 #
 
 BUILDLINK_TREE+=	json-glib
@@ -13,11 +13,8 @@ BUILDLINK_PKGSRCDIR.json-glib?=		../../textproc/json-glib
 pkgbase := json-glib
 .include "../../mk/pkg-build-options.mk"
 
-.if !empty(PKG_BUILD_OPTIONS.json-glib:Mnls)
 .include "../../converters/libiconv/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
-.endif
-
 .include "../../devel/glib2/buildlink3.mk"
 .endif # JSON_GLIB_BUILDLINK3_MK
 
diff --git a/json-glib/options.mk b/json-glib/options.mk
index ded1088d19..6e2d450b60 100644
--- a/json-glib/options.mk
+++ b/json-glib/options.mk
@@ -1,9 +1,9 @@
-# $NetBSD: options.mk,v 1.4 2014/04/20 09:32:57 obache Exp $
+# $NetBSD: options.mk,v 1.5 2021/04/12 11:16:11 nia Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.json-glib
-PKG_SUPPORTED_OPTIONS=	introspection nls
-PKG_SUGGESTED_OPTIONS+=	introspection nls
-PLIST_VARS+=		introspection nls
+PKG_SUPPORTED_OPTIONS=	introspection
+PKG_SUGGESTED_OPTIONS+=	introspection
+PLIST_VARS+=		introspection
 
 .include "../../mk/bsd.options.mk"
 
@@ -11,16 +11,8 @@ PLIST_VARS+=		introspection nls
 BUILDLINK_API_DEPENDS.gobject-introspection+=	gobject-introspection>=0.9.5
 BUILDLINK_DEPMETHOD.gobject-introspection+=	build
 .include "../../devel/gobject-introspection/buildlink3.mk"
-CONFIGURE_ARGS+=	--enable-introspection=yes
+MESON_ARGS+=		-Dintrospection=enabled
 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
+MESON_ARGS+=		-Dintrospection=disabled
 .endif
Home | Main Index | Thread Index | Old Index