[pkgsrc/trunk]: pkgsrc/mk/flavor/pkg Add back CONFLICTS handling that was acc...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/790591b86bf8
branches:  trunk
changeset: 516795:790591b86bf8
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Thu Jul 27 22:16:06 2006 +0000

description:
Add back CONFLICTS handling that was accidentally left out when revision
1.1 of this file was committed and the same code was removed from
bsd.pkg.mk.

diffstat:

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

diffs (17 lines):

diff -r 0e970a3cd5b2 -r 790591b86bf8 mk/flavor/pkg/metadata.mk
--- a/mk/flavor/pkg/metadata.mk Thu Jul 27 22:08:11 2006 +0000
+++ b/mk/flavor/pkg/metadata.mk Thu Jul 27 22:16:06 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: metadata.mk,v 1.8 2006/07/15 23:58:52 rillig Exp $
+# $NetBSD: metadata.mk,v 1.9 2006/07/27 22:16:06 jlam Exp $
 
 ######################################################################
 ### The targets below are all PRIVATE.
@@ -325,6 +325,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+=                             ${_DEPENDS_ARG_cmd:sh}
 _PKG_CREATE_ARGS+=     ${INSTALL_FILE:D        ${_INSTALL_ARG_cmd:sh}}
 _PKG_CREATE_ARGS+=     ${DEINSTALL_FILE:D      ${_DEINSTALL_ARG_cmd:sh}}