Wed Aug 23 17:52:31 2017 UTC ()
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.


(jlam)
diff -r1.14 -r1.15 pkgsrc/mk/pkgformat/pkg/metadata.mk
cvs diff -r1.14 -r1.15 pkgsrc/mk/pkgformat/pkg/metadata.mk (expand / switch to unified diff)

--- pkgsrc/mk/pkgformat/pkg/metadata.mk 2017/06/01 02:15:10 1.14
+++ pkgsrc/mk/pkgformat/pkg/metadata.mk 2017/08/23 17:52:30 1.15
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: metadata.mk,v 1.14 2017/06/01 02:15:10 jlam Exp $ 1# $NetBSD: metadata.mk,v 1.15 2017/08/23 17:52:30 jlam Exp $
2 2
3###################################################################### 3######################################################################
4### The targets below are all PRIVATE. 4### The targets below are all PRIVATE.
5###################################################################### 5######################################################################
6 6
7###################################################################### 7######################################################################
8### 8###
9### Temporary package meta-data directory. The contents of this directory 9### Temporary package meta-data directory. The contents of this directory
10### are copied directly into the real package meta-data directory. 10### are copied directly into the real package meta-data directory.
11### 11###
12PKG_DB_TMPDIR= ${WRKDIR}/.pkgdb 12PKG_DB_TMPDIR= ${WRKDIR}/.pkgdb
13 13
14unprivileged-install-hook: ${PKG_DB_TMPDIR} 14unprivileged-install-hook: ${PKG_DB_TMPDIR}
@@ -347,27 +347,27 @@ ${_DEPENDS_PLIST}: ${PLIST} @@ -347,27 +347,27 @@ ${_DEPENDS_PLIST}: ${PLIST}
347 ${AWK} '$$1 == "bootstrap" || $$1 == "build" { printf "@blddep %s\n", $$3; }' < ${_RDEPENDS_FILE}; \ 347 ${AWK} '$$1 == "bootstrap" || $$1 == "build" { printf "@blddep %s\n", $$3; }' < ${_RDEPENDS_FILE}; \
348 ${CAT} ${PLIST}; } > ${.TARGET} 348 ${CAT} ${PLIST}; } > ${.TARGET}
349 349
350_PKG_CREATE_ARGS+= -l -U 350_PKG_CREATE_ARGS+= -l -U
351_PKG_CREATE_ARGS+= -B ${_BUILD_INFO_FILE} 351_PKG_CREATE_ARGS+= -B ${_BUILD_INFO_FILE}
352_PKG_CREATE_ARGS+= -b ${_BUILD_VERSION_FILE} 352_PKG_CREATE_ARGS+= -b ${_BUILD_VERSION_FILE}
353_PKG_CREATE_ARGS+= -c ${_COMMENT_FILE} 353_PKG_CREATE_ARGS+= -c ${_COMMENT_FILE}
354_PKG_CREATE_ARGS+= ${_MESSAGE_FILE:D -D ${_MESSAGE_FILE}} 354_PKG_CREATE_ARGS+= ${_MESSAGE_FILE:D -D ${_MESSAGE_FILE}}
355_PKG_CREATE_ARGS+= -d ${_DESCR_FILE} 355_PKG_CREATE_ARGS+= -d ${_DESCR_FILE}
356_PKG_CREATE_ARGS+= -f ${_DEPENDS_PLIST} 356_PKG_CREATE_ARGS+= -f ${_DEPENDS_PLIST}
357_PKG_CREATE_ARGS+= ${PKG_PRESERVE:D -n ${_PRESERVE_FILE}} 357_PKG_CREATE_ARGS+= ${PKG_PRESERVE:D -n ${_PRESERVE_FILE}}
358_PKG_CREATE_ARGS+= -S ${_SIZE_ALL_FILE} 358_PKG_CREATE_ARGS+= -S ${_SIZE_ALL_FILE}
359_PKG_CREATE_ARGS+= -s ${_SIZE_PKG_FILE} 359_PKG_CREATE_ARGS+= -s ${_SIZE_PKG_FILE}
360_PKG_CREATE_ARGS+= ${CONFLICTS:D -C ${CONFLICTS:Q}} 360_PKG_CREATE_ARGS+= ${"${CONFLICTS:M*}" != "":?-C ${CONFLICTS:Q}:}
361.if ${_USE_NEW_PKGINSTALL:Uno} != "no" 361.if ${_USE_NEW_PKGINSTALL:Uno} != "no"
362_PKG_CREATE_ARGS+= ${_INSTALL_FILE:D -i ${_INSTALL_FILE:Q}} 362_PKG_CREATE_ARGS+= ${_INSTALL_FILE:D -i ${_INSTALL_FILE:Q}}
363_PKG_CREATE_ARGS+= ${_DEINSTALL_FILE:D -k ${_DEINSTALL_FILE:Q}} 363_PKG_CREATE_ARGS+= ${_DEINSTALL_FILE:D -k ${_DEINSTALL_FILE:Q}}
364.else 364.else
365_PKG_CREATE_ARGS+= ${INSTALL_FILE:D ${_INSTALL_ARG_cmd:sh}} 365_PKG_CREATE_ARGS+= ${INSTALL_FILE:D ${_INSTALL_ARG_cmd:sh}}
366_PKG_CREATE_ARGS+= ${DEINSTALL_FILE:D ${_DEINSTALL_ARG_cmd:sh}} 366_PKG_CREATE_ARGS+= ${DEINSTALL_FILE:D ${_DEINSTALL_ARG_cmd:sh}}
367.endif 367.endif
368 368
369_PKG_ARGS_INSTALL+= ${_PKG_CREATE_ARGS} 369_PKG_ARGS_INSTALL+= ${_PKG_CREATE_ARGS}
370_PKG_ARGS_INSTALL+= -I ${PREFIX} -p ${DESTDIR}${PREFIX} 370_PKG_ARGS_INSTALL+= -I ${PREFIX} -p ${DESTDIR}${PREFIX}
371 371
372.if ${_USE_NEW_PKGINSTALL:Uno} == "no" 372.if ${_USE_NEW_PKGINSTALL:Uno} == "no"
373_DEINSTALL_ARG_cmd= if ${TEST} -f ${DEINSTALL_FILE}; then \ 373_DEINSTALL_ARG_cmd= if ${TEST} -f ${DEINSTALL_FILE}; then \