pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/textproc/json-glib json-glib: convert to meson properl...
details: https://anonhg.NetBSD.org/pkgsrc/rev/42e6c715b43a
branches: trunk
changeset: 450153:42e6c715b43a
user: nia <nia%pkgsrc.org@localhost>
date: Mon Apr 12 11:16:11 2021 +0000
description:
json-glib: convert to meson properly, install man pages
disabling NLS is no longer possible
bump PKGREVISION
diffstat:
textproc/json-glib/Makefile | 18 +++--
textproc/json-glib/PLIST | 114 +++++++++++++++++++-------------------
textproc/json-glib/buildlink3.mk | 5 +-
textproc/json-glib/options.mk | 20 ++----
4 files changed, 76 insertions(+), 81 deletions(-)
diffs (233 lines):
diff -r ba52e12e5896 -r 42e6c715b43a textproc/json-glib/Makefile
--- a/textproc/json-glib/Makefile Mon Apr 12 11:09:17 2021 +0000
+++ b/textproc/json-glib/Makefile Mon Apr 12 11:16:11 2021 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.32 2020/03/18 18:01:23 joerg Exp $
+# $NetBSD: Makefile,v 1.33 2021/04/12 11:16:11 nia Exp $
DISTNAME= json-glib-1.4.4
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= textproc gnome
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/json-glib/${PKGVERSION_NOREV:R}/}
EXTRACT_SUFX= .tar.xz
@@ -11,9 +11,11 @@
COMMENT= JSON parser for GLib-based libraries and applications
LICENSE= gnu-lgpl-v2.1
-USE_TOOLS+= gmake msgfmt msgmerge pkg-config xgettext
+TOOL_DEPENDS+= libxslt-[0-9]*:../../textproc/libxslt
-CONFIGURE_ARGS+= --disable-man
+USE_TOOLS+= msgfmt pkg-config xgettext
+
+MESON_ARGS+= -Dman=true
.include "../../mk/compiler.mk"
@@ -31,11 +33,13 @@
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 -r ba52e12e5896 -r 42e6c715b43a textproc/json-glib/PLIST
--- a/textproc/json-glib/PLIST Mon Apr 12 11:09:17 2021 +0000
+++ b/textproc/json-glib/PLIST Mon Apr 12 11:16:11 2021 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.11 2019/06/13 09:45:17 wiz Exp $
+@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
@@ -34,6 +34,8 @@
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/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/installed-tests/json-glib-1.0/array.test
share/installed-tests/json-glib-1.0/boxed.test
@@ -49,58 +51,58 @@
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/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/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/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/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 -r ba52e12e5896 -r 42e6c715b43a textproc/json-glib/buildlink3.mk
--- a/textproc/json-glib/buildlink3.mk Mon Apr 12 11:09:17 2021 +0000
+++ b/textproc/json-glib/buildlink3.mk Mon Apr 12 11:16:11 2021 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.13 2020/03/08 16:48:14 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.14 2021/04/12 11:16:11 nia Exp $
#
BUILDLINK_TREE+= json-glib
@@ -13,11 +13,8 @@
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 -r ba52e12e5896 -r 42e6c715b43a textproc/json-glib/options.mk
--- a/textproc/json-glib/options.mk Mon Apr 12 11:09:17 2021 +0000
+++ b/textproc/json-glib/options.mk Mon Apr 12 11:16:11 2021 +0000
@@ -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 @@
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=true
PLIST.introspection= yes
.else
-CONFIGURE_ARGS+= --enable-introspection=no
+MESON_ARGS+= -Dintrospection=false
.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
Home |
Main Index |
Thread Index |
Old Index