CVS commit: pkgsrc/textproc/json-glib

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Tue Jun  7 18:09:26 UTC 2022

Modified Files:
        pkgsrc/textproc/json-glib: Makefile PLIST
Removed Files:
        pkgsrc/textproc/json-glib: options.mk

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

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


To generate a diff of this commit:
cvs rdiff -u -r1.36 -r1.37 pkgsrc/textproc/json-glib/Makefile
cvs rdiff -u -r1.13 -r1.14 pkgsrc/textproc/json-glib/PLIST
cvs rdiff -u -r1.6 -r0 pkgsrc/textproc/json-glib/options.mk

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

Modified files:

Index: pkgsrc/textproc/json-glib/Makefile
diff -u pkgsrc/textproc/json-glib/Makefile:1.36 pkgsrc/textproc/json-glib/Makefile:1.37
--- pkgsrc/textproc/json-glib/Makefile:1.36     Wed Dec  8 16:02:42 2021
+++ pkgsrc/textproc/json-glib/Makefile  Tue Jun  7 18:09:26 2022
@@ -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 @@ USE_TOOLS+=   msgfmt pkg-config xgettext
 
 MESON_ARGS+=   -Dman=true
 MESON_ARGS+=   -Dgtk_doc=disabled
+MESON_ARGS+=   -Dintrospection=enabled
 
 .include "../../mk/compiler.mk"
 
@@ -30,8 +31,6 @@ CWRAPPERS_APPEND.cc+= -Wno-error=void-po
 # 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 @@ BUILDLINK_API_DEPENDS.glib2+= glib2>=2.3
 .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"

Index: pkgsrc/textproc/json-glib/PLIST
diff -u pkgsrc/textproc/json-glib/PLIST:1.13 pkgsrc/textproc/json-glib/PLIST:1.14
--- pkgsrc/textproc/json-glib/PLIST:1.13        Wed Apr 21 19:52:29 2021
+++ pkgsrc/textproc/json-glib/PLIST     Tue Jun  7 18:09:26 2022
@@ -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-typ
 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/sk
 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