From d5fdba9ab3f62f1c78ccf6c1d47331265654ebc8 Mon Sep 17 00:00:00 2001
From: jlam <jlam@pkgsrc.org>
Date: Thu, 27 Jul 2006 22:16:06 +0000
Subject: 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.

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

diff --git a/mk/flavor/pkg/metadata.mk b/mk/flavor/pkg/metadata.mk
index 256fd8b0771..ae3e2c35daf 100644
--- a/mk/flavor/pkg/metadata.mk
+++ b/mk/flavor/pkg/metadata.mk
@@ -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+=	${NO_MTREE:D:U		-m ${MTREE_FILE}}
 _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}}
-- 
cgit v1.2.3