[pkgsrc/trunk]: pkgsrc/mk/pkgformat/pkg mk/pkgformat: Only pass "-C" option t...

[jlam <jlam%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/ebfb7f96f7c3
branches:  trunk
changeset: 367076:ebfb7f96f7c3
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Wed Aug 23 17:52:30 2017 +0000

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

diffstat:

 mk/pkgformat/pkg/metadata.mk |  4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diffs (18 lines):

diff -r a18833901242 -r ebfb7f96f7c3 mk/pkgformat/pkg/metadata.mk
--- a/mk/pkgformat/pkg/metadata.mk      Wed Aug 23 17:52:19 2017 +0000
+++ b/mk/pkgformat/pkg/metadata.mk      Wed Aug 23 17:52:30 2017 +0000
@@ -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+=     ${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}}