CVS commit: pkgsrc/sysutils/libnotify

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

Module Name:    pkgsrc
Committed By:   wiz
Date:           Tue Jun  7 18:07:16 UTC 2022

Modified Files:
        pkgsrc/sysutils/libnotify: Makefile PLIST options.mk

Log Message:
libnotify: 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.67 -r1.68 pkgsrc/sysutils/libnotify/Makefile
cvs rdiff -u -r1.8 -r1.9 pkgsrc/sysutils/libnotify/PLIST
cvs rdiff -u -r1.7 -r1.8 pkgsrc/sysutils/libnotify/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/sysutils/libnotify/Makefile
diff -u pkgsrc/sysutils/libnotify/Makefile:1.67 pkgsrc/sysutils/libnotify/Makefile:1.68
--- pkgsrc/sysutils/libnotify/Makefile:1.67     Mon May 30 15:58:30 2022
+++ pkgsrc/sysutils/libnotify/Makefile  Tue Jun  7 18:07:16 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.67 2022/05/30 15:58:30 adam Exp $
+# $NetBSD: Makefile,v 1.68 2022/06/07 18:07:16 wiz Exp $
 
 DISTNAME=      libnotify-0.7.12
 CATEGORIES=    sysutils gnome
@@ -22,6 +22,8 @@ PKGCONFIG_OVERRIDE=           output/meson-privat
 PKGCONFIG_OVERRIDE_STAGE=      pre-install
 MAKE_ENV+=                     LD_LIBRARY_PATH=${WRKSRC}/output/${PKGBASE}
 
+MESON_ARGS+=           -Dintrospection=enabled
+
 # Apply removals to post-wrapper transformed arguments.
 BUILDLINK_TRANSFORM.SunOS+=    rm:-Wl,--version-script
 BUILDLINK_TRANSFORM.SunOS+=    rm:-Wl,${WRKSRC}/libnotify/libnotify.map
@@ -33,6 +35,8 @@ PYTHON_FOR_BUILD_ONLY=        tool
 .include "../../graphics/gdk-pixbuf2/buildlink3.mk"
 BUILDLINK_API_DEPENDS.glib2+=  glib2>=2.26.0
 .include "../../devel/glib2/buildlink3.mk"
+BUILDLINK_DEPMETHOD.gobject-introspection=     build
+.include "../../devel/gobject-introspection/buildlink3.mk"
 BUILDLINK_DEPMETHOD.gtk3=      build
 .include "../../x11/gtk3/buildlink3.mk"
 .include "../../devel/meson/build.mk"

Index: pkgsrc/sysutils/libnotify/PLIST
diff -u pkgsrc/sysutils/libnotify/PLIST:1.8 pkgsrc/sysutils/libnotify/PLIST:1.9
--- pkgsrc/sysutils/libnotify/PLIST:1.8 Sat Mar  7 15:11:42 2020
+++ pkgsrc/sysutils/libnotify/PLIST     Tue Jun  7 18:07:16 2022
@@ -1,17 +1,17 @@
-@comment $NetBSD: PLIST,v 1.8 2020/03/07 15:11:42 wiz Exp $
+@comment $NetBSD: PLIST,v 1.9 2022/06/07 18:07:16 wiz Exp $
 bin/notify-send
 include/libnotify/notification.h
 include/libnotify/notify-enum-types.h
 include/libnotify/notify-features.h
 include/libnotify/notify.h
-${PLIST.introspection}lib/girepository-1.0/Notify-0.7.typelib
+lib/girepository-1.0/Notify-0.7.typelib
 lib/libnotify.so
 lib/libnotify.so.4
 lib/libnotify.so.4.0.0
 lib/pkgconfig/libnotify.pc
 man/man1/notify-send.1
 ${PLIST.doc}share/doc/libnotify/spec/notification-spec.html
-${PLIST.introspection}share/gir-1.0/Notify-0.7.gir
+share/gir-1.0/Notify-0.7.gir
 ${PLIST.doc}share/gtk-doc/html/libnotify/NotifyNotification.html
 ${PLIST.doc}share/gtk-doc/html/libnotify/annotation-glossary.html
 ${PLIST.doc}share/gtk-doc/html/libnotify/api-index-deprecated.html

Index: pkgsrc/sysutils/libnotify/options.mk
diff -u pkgsrc/sysutils/libnotify/options.mk:1.7 pkgsrc/sysutils/libnotify/options.mk:1.8
--- pkgsrc/sysutils/libnotify/options.mk:1.7    Sun Aug 25 11:54:34 2019
+++ pkgsrc/sysutils/libnotify/options.mk        Tue Jun  7 18:07:16 2022
@@ -1,9 +1,9 @@
-# $NetBSD: options.mk,v 1.7 2019/08/25 11:54:34 leot Exp $
+# $NetBSD: options.mk,v 1.8 2022/06/07 18:07:16 wiz Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.libnotify
-PKG_SUPPORTED_OPTIONS= doc introspection
-PKG_SUGGESTED_OPTIONS= introspection
-PLIST_VARS+=           doc introspection
+PKG_SUPPORTED_OPTIONS= doc
+PKG_SUGGESTED_OPTIONS= # empty
+PLIST_VARS+=           doc
 
 .include "../../mk/bsd.options.mk"
 
@@ -17,12 +17,3 @@ MESON_ARGS+=         -Dgtk_doc=true
 MESON_ARGS+=           -Ddocbook_docs=disabled
 MESON_ARGS+=           -Dgtk_doc=false
 .endif
-
-.if !empty(PKG_OPTIONS:Mintrospection)
-BUILDLINK_DEPMETHOD.gobject-introspection=     build
-.include "../../devel/gobject-introspection/buildlink3.mk"
-PLIST.introspection=   yes
-MESON_ARGS+=           -Dintrospection=enabled
-.else
-MESON_ARGS+=           -Dintrospection=disabled
-.endif