[pkgsrc/trunk]: pkgsrc/textproc/json-glib json-glib: remove introspection opt...

[wiz <wiz%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/778a33a894d4
branches:  trunk
changeset: 380509:778a33a894d4
user:      wiz <wiz%pkgsrc.org@localhost>
date:      Tue Jun 07 18:09:26 2022 +0000

description:
json-glib: remove introspection option, enabling it by default

It was default-on, but bump PKGREVISION for those who had
it disabled.

diffstat:

 textproc/json-glib/Makefile   |   8 +++++---
 textproc/json-glib/PLIST      |   6 +++---
 textproc/json-glib/options.mk |  18 ------------------
 3 files changed, 8 insertions(+), 24 deletions(-)

diffs (84 lines):

diff -r 8f143bc39df3 -r 778a33a894d4 textproc/json-glib/Makefile
--- a/textproc/json-glib/Makefile       Tue Jun 07 18:07:26 2022 +0000
+++ b/textproc/json-glib/Makefile       Tue Jun 07 18:09:26 2022 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.36 2021/12/08 16:02:42 adam Exp $
+# $NetBSD: Makefile,v 1.37 2022/06/07 18:09:26 wiz Exp $
 
 DISTNAME=      json-glib-1.6.2
 PKGREVISION=   1
@@ -18,6 +18,7 @@
 
 MESON_ARGS+=   -Dman=true
 MESON_ARGS+=   -Dgtk_doc=disabled
+MESON_ARGS+=   -Dintrospection=enabled
 
 .include "../../mk/compiler.mk"
 
@@ -30,8 +31,6 @@
 # https://gitlab.gnome.org/GNOME/json-glib/issues/35
 MAKE_ENV+=     LD_LIBRARY_PATH=${WRKSRC}/output/json-glib
 
-.include "options.mk"
-
 PRINT_PLIST_AWK+= \
        ($$0 ~ /^lib\/girepository-1.0\//) || \
        ($$0 ~ /^share\/gir-1.0\//) \
@@ -43,5 +42,8 @@
 .include "../../converters/libiconv/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
+BUILDLINK_API_DEPENDS.gobject-introspection+=  gobject-introspection>=0.9.5
+BUILDLINK_DEPMETHOD.gobject-introspection+=    build
+.include "../../devel/gobject-introspection/buildlink3.mk"
 .include "../../devel/meson/build.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r 8f143bc39df3 -r 778a33a894d4 textproc/json-glib/PLIST
--- a/textproc/json-glib/PLIST  Tue Jun 07 18:07:26 2022 +0000
+++ b/textproc/json-glib/PLIST  Tue Jun 07 18:09:26 2022 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.13 2021/04/21 19:52:29 cirnatdan Exp $
+@comment $NetBSD: PLIST,v 1.14 2022/06/07 18:09:26 wiz Exp $
 bin/json-glib-format
 bin/json-glib-validate
 include/json-glib-1.0/json-glib/json-builder.h
@@ -14,7 +14,7 @@
 include/json-glib-1.0/json-glib/json-utils.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/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
@@ -38,7 +38,7 @@
 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/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
 share/installed-tests/json-glib-1.0/builder.test
diff -r 8f143bc39df3 -r 778a33a894d4 textproc/json-glib/options.mk
--- a/textproc/json-glib/options.mk     Tue Jun 07 18:07:26 2022 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,18 +0,0 @@
-# $NetBSD: options.mk,v 1.6 2021/04/21 19:52:29 cirnatdan Exp $
-
-PKG_OPTIONS_VAR=       PKG_OPTIONS.json-glib
-PKG_SUPPORTED_OPTIONS= introspection
-PKG_SUGGESTED_OPTIONS+=        introspection
-PLIST_VARS+=           introspection
-
-.include "../../mk/bsd.options.mk"
-
-.if !empty(PKG_OPTIONS:Mintrospection)
-BUILDLINK_API_DEPENDS.gobject-introspection+=  gobject-introspection>=0.9.5
-BUILDLINK_DEPMETHOD.gobject-introspection+=    build
-.include "../../devel/gobject-introspection/buildlink3.mk"
-MESON_ARGS+=           -Dintrospection=enabled
-PLIST.introspection=   yes
-.else
-MESON_ARGS+=           -Dintrospection=disabled
-.endif