CVS commit: pkgsrc/sysutils/libnotify

["Leonardo Taccari" <leot%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   leot
Date:           Sun Aug 25 11:54:34 UTC 2019

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

Log Message:
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>!


To generate a diff of this commit:
cvs rdiff -u -r1.54 -r1.55 pkgsrc/sysutils/libnotify/Makefile
cvs rdiff -u -r1.6 -r1.7 pkgsrc/sysutils/libnotify/PLIST \
    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.54 pkgsrc/sysutils/libnotify/Makefile:1.55
--- pkgsrc/sysutils/libnotify/Makefile:1.54     Fri Aug 23 18:24:39 2019
+++ pkgsrc/sysutils/libnotify/Makefile  Sun Aug 25 11:54:34 2019
@@ -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 @@ HOMEPAGE=     https://developer.gnome.org/li
 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 @@ MAKE_ENV+=            LD_LIBRARY_PATH=${WRKSRC}/ou
 .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"

Index: pkgsrc/sysutils/libnotify/PLIST
diff -u pkgsrc/sysutils/libnotify/PLIST:1.6 pkgsrc/sysutils/libnotify/PLIST:1.7
--- pkgsrc/sysutils/libnotify/PLIST:1.6 Fri Aug 16 10:08:04 2019
+++ pkgsrc/sysutils/libnotify/PLIST     Sun Aug 25 11:54:34 2019
@@ -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
Index: pkgsrc/sysutils/libnotify/options.mk
diff -u pkgsrc/sysutils/libnotify/options.mk:1.6 pkgsrc/sysutils/libnotify/options.mk:1.7
--- pkgsrc/sysutils/libnotify/options.mk:1.6    Fri Aug 23 18:24:39 2019
+++ pkgsrc/sysutils/libnotify/options.mk        Sun Aug 25 11:54:34 2019
@@ -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