From 2f5d1187a31bbe2ca663a0ab81fa40d2b1934792 Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
Date: Mon, 8 Mar 2010 10:52:55 +0100
Subject: [PATCH] shutils: prepare for upcoming "$conflicts" support.

--HG--
extra : convert_revision : 021b9ea71ef7dbd8bcdef844a9e1379613db88d3
---
 xbps-src/shutils/metadata.sh   | 10 ++++++++++
 xbps-src/shutils/tmpl_funcs.sh |  2 +-
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/xbps-src/shutils/metadata.sh b/xbps-src/shutils/metadata.sh
index e66044af6c5..afb08cccc03 100644
--- a/xbps-src/shutils/metadata.sh
+++ b/xbps-src/shutils/metadata.sh
@@ -337,6 +337,16 @@ _EOF
 		echo "</array>" >> $TMPFPROPS
 	fi
 
+	# Conflicting package(s).
+	if [ -n "$conflicts" ]; then
+		echo "<key>conflicts</key>" >> $TMPFPROPS
+		echo "<array>" >> $TMPFPROPS
+		for f in ${conflicts}; do
+			echo "<string>$(echo $f|sed "s|<|\&lt;|g;s|>|\&gt;|g")</string>" >> $TMPFPROPS
+		done
+		echo "</array>" >> $TMPFPROPS
+	fi
+
 	# Terminate the property list file.
 	echo "</dict>" >> $TMPFPROPS
 	echo "</plist>" >> $TMPFPROPS
diff --git a/xbps-src/shutils/tmpl_funcs.sh b/xbps-src/shutils/tmpl_funcs.sh
index 96a49d8c6c0..d5ddaafbe1a 100644
--- a/xbps-src/shutils/tmpl_funcs.sh
+++ b/xbps-src/shutils/tmpl_funcs.sh
@@ -76,7 +76,7 @@ reset_tmpl_vars()
 			noarch subpackages sourcepkg gtk_iconcache_dirs \
 			abi_depends api_depends triggers openrc_services \
 			replaces system_accounts build_wrksrc create_wrksrc \
-			ignore_vdeps_dir noverifyrdeps \
+			ignore_vdeps_dir noverifyrdeps conflicts \
 			XBPS_EXTRACT_DONE XBPS_CONFIGURE_DONE \
 			XBPS_BUILD_DONE XBPS_INSTALL_DONE FILESDIR DESTDIR \
 			SRCPKGDESTDIR PATCHESDIR"