Received: by mail.netbsd.org (Postfix, from userid 605) id EC8EF84D57; Thu, 26 Mar 2020 11:57:11 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 7586884D55 for ; Thu, 26 Mar 2020 11:57:11 +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 KFsMxuNl60Jq for ; Thu, 26 Mar 2020 11:57:11 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id D1FBA84CD8 for ; Thu, 26 Mar 2020 11:57:10 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 9DEB1FB27; Thu, 26 Mar 2020 11:57:10 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1585223830175960" MIME-Version: 1.0 Date: Thu, 26 Mar 2020 11:57:10 +0000 From: "Nia Alarie" Subject: CVS commit: pkgsrc/textproc/expat To: pkgsrc-changes@NetBSD.org Reply-To: nia@netbsd.org X-Mailer: log_accum Message-Id: <20200326115710.9DEB1FB27@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. --_----------=_1585223830175960 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: nia Date: Thu Mar 26 11:57:10 UTC 2020 Modified Files: pkgsrc/textproc/expat: Makefile Log Message: expat: Avoid detecting system docbook, resulting in PLIST conflicts Noticed by Dr. Thomas Orgis To generate a diff of this commit: cvs rdiff -u -r1.41 -r1.42 pkgsrc/textproc/expat/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1585223830175960 Content-Disposition: inline Content-Length: 719 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/textproc/expat/Makefile diff -u pkgsrc/textproc/expat/Makefile:1.41 pkgsrc/textproc/expat/Makefile:1.42 --- pkgsrc/textproc/expat/Makefile:1.41 Mon Mar 23 18:39:03 2020 +++ pkgsrc/textproc/expat/Makefile Thu Mar 26 11:57:10 2020 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.41 2020/03/23 18:39:03 nia Exp $ +# $NetBSD: Makefile,v 1.42 2020/03/26 11:57:10 nia Exp $ DISTNAME= expat-2.2.9 CATEGORIES= textproc @@ -20,6 +20,10 @@ USE_LIBTOOL= yes #USE_TOOLS+= bash #REPLACE_BASH= test-driver-wrapper.sh +CONFIGURE_ARGS+= --without-examples +CONFIGURE_ARGS+= --without-tests +CONFIGURE_ARGS+= --without-docbook + PKGCONFIG_OVERRIDE+= expat.pc.in DOCDIR= ${PREFIX}/share/doc/expat --_----------=_1585223830175960--