Received: by mail.netbsd.org (Postfix, from userid 605) id C5EFF8549A; Fri, 23 Aug 2019 18:24:40 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 4E32C84D92 for ; Fri, 23 Aug 2019 18:24:40 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([IPv6:::1]) by localhost (mail.netbsd.org [IPv6:::1]) (amavisd-new, port 10025) with ESMTP id N1XW2_dnlwGx for ; Fri, 23 Aug 2019 18:24:39 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.NetBSD.org [IPv6:2001:470:a085:999:28c:faff:fe03:5984]) by mail.netbsd.org (Postfix) with ESMTP id C1A5484CE8 for ; Fri, 23 Aug 2019 18:24:39 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id BB80AFBF4; Fri, 23 Aug 2019 18:24:39 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1566584679212200" MIME-Version: 1.0 Date: Fri, 23 Aug 2019 18:24:39 +0000 From: "Leonardo Taccari" Subject: CVS commit: pkgsrc/sysutils/libnotify To: pkgsrc-changes@NetBSD.org Reply-To: leot@netbsd.org X-Mailer: log_accum Message-Id: <20190823182439.BB80AFBF4@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: pkgsrc-changes.NetBSD.org Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_1566584679212200 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" 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. --_----------=_1566584679212200 Content-Disposition: inline Content-Length: 1534 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii 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 --_----------=_1566584679212200--