[pkgsrc/trunk]: pkgsrc/sysutils/libnotify libnotify: Readd `introspection' op...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/be7a169a040d
branches:  trunk
changeset: 338445:be7a169a040d
user:      leot <leot%pkgsrc.org@localhost>
date:      Sun Aug 25 11:54:34 2019 +0000

description:
libnotify: Readd `introspection' option and install gtk-doc for `doc' option

- Readd introspection option (enabled by default) like it was present in
  previous libnotify version.
- gtk-doc is probably a "bigger" tool dependency than xmlto, make it part of
  the `doc' option (this also make gtk-doc no longer a tool dependency by
  default).

Bump PKGREVISION

Discussed and thanks to <wiz>!

diffstat:

 sysutils/libnotify/Makefile   |   7 ++-----
 sysutils/libnotify/PLIST      |  38 +++++++++++++++++++-------------------
 sysutils/libnotify/options.mk |  19 ++++++++++++++++---
 3 files changed, 37 insertions(+), 27 deletions(-)

diffs (117 lines):

diff -r 3ae2bd498316 -r be7a169a040d sysutils/libnotify/Makefile
--- a/sysutils/libnotify/Makefile       Sun Aug 25 09:37:19 2019 +0000
+++ b/sysutils/libnotify/Makefile       Sun Aug 25 11:54:34 2019 +0000
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.54 2019/08/23 18:24:39 leot Exp $
+# $NetBSD: Makefile,v 1.55 2019/08/25 11:54:34 leot Exp $
 
 DISTNAME=      libnotify-0.7.8
+PKGREVISION=   1
 CATEGORIES=    sysutils gnome
 MASTER_SITES=  ${MASTER_SITE_GNOME:=sources/libnotify/0.7/}
 EXTRACT_SUFX=  .tar.xz
@@ -10,8 +11,6 @@
 COMMENT=       Desktop notification framework
 LICENSE=       gnu-lgpl-v2.1
 
-TOOL_DEPENDS+= gtk-doc-[0-9]*:../../textproc/gtk-doc
-
 CONFLICTS+=    libnotify07-[0-9]*
 SUPERSEDES+=   libnotify07-[0-9]*
 
@@ -26,8 +25,6 @@
 .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/py-meson/build.mk"
diff -r 3ae2bd498316 -r be7a169a040d sysutils/libnotify/PLIST
--- a/sysutils/libnotify/PLIST  Sun Aug 25 09:37:19 2019 +0000
+++ b/sysutils/libnotify/PLIST  Sun Aug 25 11:54:34 2019 +0000
@@ -1,29 +1,29 @@
-@comment $NetBSD: PLIST,v 1.6 2019/08/16 10:08:04 wiz Exp $
+@comment $NetBSD: PLIST,v 1.7 2019/08/25 11:54:34 leot Exp $
 bin/notify-send
 include/libnotify/notification.h
 include/libnotify/notify-enum-types.h
 include/libnotify/notify-features.h
 include/libnotify/notify.h
-lib/girepository-1.0/Notify-0.7.typelib
+${PLIST.introspection}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
 ${PLIST.doc}share/doc/libnotify/spec/notification-spec.html
-share/gir-1.0/Notify-0.7.gir
-share/gtk-doc/html/libnotify/NotifyNotification.html
-share/gtk-doc/html/libnotify/annotation-glossary.html
-share/gtk-doc/html/libnotify/api-index-deprecated.html
-share/gtk-doc/html/libnotify/api-index-full.html
-share/gtk-doc/html/libnotify/ch01.html
-share/gtk-doc/html/libnotify/home.png
-share/gtk-doc/html/libnotify/index.html
-share/gtk-doc/html/libnotify/left-insensitive.png
-share/gtk-doc/html/libnotify/left.png
-share/gtk-doc/html/libnotify/libnotify-notify.html
-share/gtk-doc/html/libnotify/libnotify.devhelp2
-share/gtk-doc/html/libnotify/right-insensitive.png
-share/gtk-doc/html/libnotify/right.png
-share/gtk-doc/html/libnotify/style.css
-share/gtk-doc/html/libnotify/up-insensitive.png
-share/gtk-doc/html/libnotify/up.png
+${PLIST.introspection}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
+${PLIST.doc}share/gtk-doc/html/libnotify/api-index-full.html
+${PLIST.doc}share/gtk-doc/html/libnotify/ch01.html
+${PLIST.doc}share/gtk-doc/html/libnotify/home.png
+${PLIST.doc}share/gtk-doc/html/libnotify/index.html
+${PLIST.doc}share/gtk-doc/html/libnotify/left-insensitive.png
+${PLIST.doc}share/gtk-doc/html/libnotify/left.png
+${PLIST.doc}share/gtk-doc/html/libnotify/libnotify-notify.html
+${PLIST.doc}share/gtk-doc/html/libnotify/libnotify.devhelp2
+${PLIST.doc}share/gtk-doc/html/libnotify/right-insensitive.png
+${PLIST.doc}share/gtk-doc/html/libnotify/right.png
+${PLIST.doc}share/gtk-doc/html/libnotify/style.css
+${PLIST.doc}share/gtk-doc/html/libnotify/up-insensitive.png
+${PLIST.doc}share/gtk-doc/html/libnotify/up.png
diff -r 3ae2bd498316 -r be7a169a040d sysutils/libnotify/options.mk
--- a/sysutils/libnotify/options.mk     Sun Aug 25 09:37:19 2019 +0000
+++ b/sysutils/libnotify/options.mk     Sun Aug 25 11:54:34 2019 +0000
@@ -1,15 +1,28 @@
-# $NetBSD: options.mk,v 1.6 2019/08/23 18:24:39 leot Exp $
+# $NetBSD: options.mk,v 1.7 2019/08/25 11:54:34 leot Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.libnotify
-PKG_SUPPORTED_OPTIONS= doc
-PLIST_VARS+=           doc
+PKG_SUPPORTED_OPTIONS= doc introspection
+PKG_SUGGESTED_OPTIONS= introspection
+PLIST_VARS+=           doc introspection
 
 .include "../../mk/bsd.options.mk"
 
 .if !empty(PKG_OPTIONS:Mdoc)
+TOOL_DEPENDS+=         gtk-doc-[0-9]*:../../textproc/gtk-doc
 TOOL_DEPENDS+=         xmlto-[0-9]*:../../textproc/xmlto
 PLIST.doc=             yes
 MESON_ARGS+=           -Ddocbook_docs=enabled
+MESON_ARGS+=           -Dgtk_doc=true
 .else
 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