CVS commit: pkgsrc/mk/pkgformat/pkg

["Johnny C. Lam" <jlam%netbsd.org@localhost>]

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.

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}}