pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/sysutils/libnotify libnotify: Move the meson argument ...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/b8534b83b493
branches:  trunk
changeset: 338392:b8534b83b493
user:      leot <leot%pkgsrc.org@localhost>
date:      Fri Aug 23 18:24:39 2019 +0000

description:
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)

diffstat:

 sysutils/libnotify/Makefile   |  4 +---
 sysutils/libnotify/options.mk |  7 +++++--
 2 files changed, 6 insertions(+), 5 deletions(-)

diffs (38 lines):

diff -r bc8bcd45d6b7 -r b8534b83b493 sysutils/libnotify/Makefile
--- a/sysutils/libnotify/Makefile       Fri Aug 23 17:20:19 2019 +0000
+++ b/sysutils/libnotify/Makefile       Fri Aug 23 18:24:39 2019 +0000
@@ -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_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"
diff -r bc8bcd45d6b7 -r b8534b83b493 sysutils/libnotify/options.mk
--- a/sysutils/libnotify/options.mk     Fri Aug 23 17:20:19 2019 +0000
+++ b/sysutils/libnotify/options.mk     Fri Aug 23 18:24:39 2019 +0000
@@ -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 @@
 .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



Home | Main Index | Thread Index | Old Index