CVS commit: pkgsrc/sysutils/libnotify

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

Module Name:    pkgsrc
Committed By:   leot
Date:           Fri Aug 23 18:24:39 UTC 2019

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

Log Message:
libnotify: Move the meson argument to disable doc to `doc' option

Disabling the docbook_docs belong to `doc' option, move MESON_ARGS directly
there. While here also make xmlto a tool dependency. (NFCI)


To generate a diff of this commit:
cvs rdiff -u -r1.53 -r1.54 pkgsrc/sysutils/libnotify/Makefile
cvs rdiff -u -r1.5 -r1.6 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.53 pkgsrc/sysutils/libnotify/Makefile:1.54
--- pkgsrc/sysutils/libnotify/Makefile:1.53     Sun Aug 18 08:03:17 2019
+++ pkgsrc/sysutils/libnotify/Makefile  Fri Aug 23 18:24:39 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.53 2019/08/18 08:03:17 wiz Exp $
+# $NetBSD: Makefile,v 1.54 2019/08/23 18:24:39 leot Exp $
 
 DISTNAME=      libnotify-0.7.8
 CATEGORIES=    sysutils gnome
@@ -21,8 +21,6 @@ PKGCONFIG_OVERRIDE=   output/meson-private
 PKGCONFIG_OVERRIDE_STAGE=pre-install
 MAKE_ENV+=             LD_LIBRARY_PATH=${WRKSRC}/output/${PKGBASE}
 
-MESON_ARGS+=   -Ddocbook_docs=disabled
-
 .include "options.mk"
 
 .include "../../graphics/gdk-pixbuf2/buildlink3.mk"

Index: pkgsrc/sysutils/libnotify/options.mk
diff -u pkgsrc/sysutils/libnotify/options.mk:1.5 pkgsrc/sysutils/libnotify/options.mk:1.6
--- pkgsrc/sysutils/libnotify/options.mk:1.5    Fri Aug 16 10:09:37 2019
+++ pkgsrc/sysutils/libnotify/options.mk        Fri Aug 23 18:24:39 2019
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.5 2019/08/16 10:09:37 wiz Exp $
+# $NetBSD: options.mk,v 1.6 2019/08/23 18:24:39 leot Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.libnotify
 PKG_SUPPORTED_OPTIONS= doc
@@ -7,6 +7,9 @@ PLIST_VARS+=            doc
 .include "../../mk/bsd.options.mk"
 
 .if !empty(PKG_OPTIONS:Mdoc)
-BUILD_DEPENDS+=        xmlto-[0-9]*:../../textproc/xmlto
+TOOL_DEPENDS+=         xmlto-[0-9]*:../../textproc/xmlto
 PLIST.doc=             yes
+MESON_ARGS+=           -Ddocbook_docs=enabled
+.else
+MESON_ARGS+=           -Ddocbook_docs=disabled
 .endif