From 1bcd94905caf78a9186c7066014068bdc123f847 Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
Date: Tue, 31 May 2011 16:39:02 +0200
Subject: [PATCH] xbps-src: update pkg metadata files.plist "links" array with
 a new object "target".

The "target" object should point to the target file for the symlink. Will be
used by an upcoming xbps utils version.
---
 xbps-src/shutils/init_funcs.sh.in |  6 +++++-
 xbps-src/shutils/metadata.sh      | 33 ++++++++++++-------------------
 2 files changed, 18 insertions(+), 21 deletions(-)

diff --git a/xbps-src/shutils/init_funcs.sh.in b/xbps-src/shutils/init_funcs.sh.in
index 5c9f64ec56..44c68e841c 100644
--- a/xbps-src/shutils/init_funcs.sh.in
+++ b/xbps-src/shutils/init_funcs.sh.in
@@ -36,7 +36,11 @@ set_defvars()
 	: ${XBPS_META_PATH:=$XBPS_DBDIR/}
 	: ${XBPS_PKGMETADIR:=$XBPS_DBDIR/metadata}
 	: ${XBPS_SRCPKGDIR:=$XBPS_DISTRIBUTIONDIR/srcpkgs}
-	: ${XBPS_DESTDIR:=$XBPS_MASTERDIR/pkg-destdir}
+	if [ -n "$in_chroot" ]; then
+		: ${XBPS_DESTDIR:=/pkg-destdir}
+	else
+		: ${XBPS_DESTDIR:=$XBPS_MASTERDIR/pkg-destdir}
+	fi
 	: ${XBPS_PACKAGESDIR:=$XBPS_MASTERDIR/pkg-binpkgs}
 	: ${XBPS_BUILDDIR:=$XBPS_MASTERDIR/pkg-builddir}
 	: ${XBPS_SRCDISTDIR:=$XBPS_MASTERDIR/pkg-srcdistdir}
diff --git a/xbps-src/shutils/metadata.sh b/xbps-src/shutils/metadata.sh
index 67c95ef521..018cede5eb 100644
--- a/xbps-src/shutils/metadata.sh
+++ b/xbps-src/shutils/metadata.sh
@@ -23,19 +23,6 @@
 # THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #-
 
-write_metadata_flist_header()
-{
-	[ ! -f "$1" ] && return 1
-
-	cat > $1 <<_EOF
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-_EOF
-
-}
-
 xbps_write_metadata_pkg()
 {
 	local subpkg spkgrev
@@ -110,10 +97,6 @@ xbps_write_metadata_pkg_real()
 		lver="${version}"
 	fi
 
-	# Write the files.plist file.
-	TMPFLIST=$(mktemp -t flist.XXXXXXXXXX) || exit 1
-	TMPFPLIST=$(mktemp -t fplist.XXXXXXXXXX) || exit 1
-
         #
         # Find out if this package contains info files and compress
         # all them with gzip.
@@ -182,11 +165,18 @@ xbps_write_metadata_pkg_real()
 		done
 	fi
 
-	cd ${DESTDIR}
+	# Write the files.plist file.
+	TMPFLIST=$(mktemp -t flist.XXXXXXXXXX) || exit 1
+	TMPFPLIST=$(mktemp -t fplist.XXXXXXXXXX) || exit 1
+
 	msg_normal "'$pkgname-$lver': creating package metadata...\n"
 
-	write_metadata_flist_header $TMPFPLIST
-
+	cat > "$TMPFPLIST" <<_EOF
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+_EOF
 	# Pass 1: add links.
 	echo "<key>links</key>" >> $TMPFPLIST
 	echo "<array>" >> $TMPFPLIST
@@ -198,6 +188,9 @@ xbps_write_metadata_pkg_real()
 		echo "<dict>" >> $TMPFPLIST
 		echo "<key>file</key>" >> $TMPFPLIST
 		echo "<string>$j</string>" >> $TMPFPLIST
+		echo "<key>target</key>" >> $TMPFPLIST
+		echo "<string>$(readlink -f "$f"|sed -e "$fpattern")</string>" \
+			>> $TMPFPLIST
 		echo "</dict>" >> $TMPFPLIST
 	done
 	echo "</array>" >> $TMPFPLIST