From 6fd07a253333f5f3f3cc6d2ab6c3ae344fb860f0 Mon Sep 17 00:00:00 2001
From: jlam <jlam@pkgsrc.org>
Date: Wed, 23 Aug 2017 17:52:30 +0000
Subject: 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.
---
 mk/pkgformat/pkg/metadata.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/mk/pkgformat/pkg/metadata.mk b/mk/pkgformat/pkg/metadata.mk
index 8a798e341de..371816761eb 100644
--- a/mk/pkgformat/pkg/metadata.mk
+++ b/mk/pkgformat/pkg/metadata.mk
@@ -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_PLIST}
 _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}}
-- 
cgit v1.2.3