Received: by mail.netbsd.org (Postfix, from userid 605) id 39DC784D8E; Wed, 23 Aug 2017 17:52:32 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id BDB0E84C86 for ; Wed, 23 Aug 2017 17:52:31 +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 0pWOLJMheAsh for ; Wed, 23 Aug 2017 17:52:31 +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 2699C84D8D for ; Wed, 23 Aug 2017 17:52:31 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 16E6BFA85; Wed, 23 Aug 2017 17:52:31 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1503510751102350" MIME-Version: 1.0 Date: Wed, 23 Aug 2017 17:52:31 +0000 From: "Johnny C. Lam" Subject: CVS commit: pkgsrc/mk/pkgformat/pkg To: pkgsrc-changes@NetBSD.org Reply-To: jlam@netbsd.org X-Mailer: log_accum Message-Id: <20170823175231.16E6BFA85@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. --_----------=_1503510751102350 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: jlam Date: Wed Aug 23 17:52:31 UTC 2017 Modified Files: pkgsrc/mk/pkgformat/pkg: metadata.mk Log Message: mk/pkgformat: Only pass "-C" option to pkg_create(1) if it's valid. Only pass "-C ${CONFLICTS}" to pkg_create(1) if ${CONFLICTS} is non-empty; otherwise, a fatal error occurs. This allows CONFLICTS to be defined, but empty. To generate a diff of this commit: cvs rdiff -u -r1.14 -r1.15 pkgsrc/mk/pkgformat/pkg/metadata.mk Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1503510751102350 Content-Disposition: inline Content-Length: 1035 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/mk/pkgformat/pkg/metadata.mk diff -u pkgsrc/mk/pkgformat/pkg/metadata.mk:1.14 pkgsrc/mk/pkgformat/pkg/metadata.mk:1.15 --- pkgsrc/mk/pkgformat/pkg/metadata.mk:1.14 Thu Jun 1 02:15:10 2017 +++ pkgsrc/mk/pkgformat/pkg/metadata.mk Wed Aug 23 17:52:30 2017 @@ -1,4 +1,4 @@ -# $NetBSD: metadata.mk,v 1.14 2017/06/01 02:15:10 jlam Exp $ +# $NetBSD: metadata.mk,v 1.15 2017/08/23 17:52:30 jlam Exp $ ###################################################################### ### The targets below are all PRIVATE. @@ -357,7 +357,7 @@ _PKG_CREATE_ARGS+= -f ${_DEPENDS_PLIS _PKG_CREATE_ARGS+= ${PKG_PRESERVE:D -n ${_PRESERVE_FILE}} _PKG_CREATE_ARGS+= -S ${_SIZE_ALL_FILE} _PKG_CREATE_ARGS+= -s ${_SIZE_PKG_FILE} -_PKG_CREATE_ARGS+= ${CONFLICTS:D -C ${CONFLICTS:Q}} +_PKG_CREATE_ARGS+= ${"${CONFLICTS:M*}" != "":?-C ${CONFLICTS:Q}:} .if ${_USE_NEW_PKGINSTALL:Uno} != "no" _PKG_CREATE_ARGS+= ${_INSTALL_FILE:D -i ${_INSTALL_FILE:Q}} _PKG_CREATE_ARGS+= ${_DEINSTALL_FILE:D -k ${_DEINSTALL_FILE:Q}} --_----------=_1503510751102350--