From 6f8456d9f1dcddf9d4f62e36a79253e8da3e4bf3 Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
Date: Thu, 18 Dec 2008 02:11:12 +0100
Subject: [PATCH] binpkg.sh: use xbps as extension and add hw machine.

Packages are now named like: foo-2.0.x86_64.xbps
so that they don't have any common extension that could lead
to confusion for installing.

These packages shouldn't be installed directly with tar(1).

--HG--
extra : convert_revision : ee3efd57adbba6aa025a2a4e76002c784510f810
---
 utils/sh/binpkg.sh | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/utils/sh/binpkg.sh b/utils/sh/binpkg.sh
index 770190bf4f5..7605e551b27 100644
--- a/utils/sh/binpkg.sh
+++ b/utils/sh/binpkg.sh
@@ -51,7 +51,7 @@ xbps_write_metadata_pkg()
 <plist version="1.0">
 <dict>
 	<key>architecture</key>
-	<string>$(uname -m)</string>
+	<string>$xbps_machine</string>
 	<key>installed_size</key>
 	<integer>$(du -sb $destdir|awk '{print $1}')</integer>
 	<key>maintainer</key>
@@ -116,12 +116,13 @@ _EOF
 xbps_make_binpkg()
 {
 	local destdir=$XBPS_DESTDIR/$pkgname-$version
+	local binpkg=$pkgname-$version.$xbps_machine.xbps
 
 	cd $destdir || exit 1
 
-	run_rootcmd tar cfjp $destdir-xbps.tbz2 .
+	run_rootcmd tar cfjp $XBPS_DESTDIR/$binpkg .
 	[ ! -d $XBPS_PACKAGESDIR ] && mkdir -p $XBPS_PACKAGESDIR
-	mv -f $destdir-xbps.tbz2 $XBPS_PACKAGESDIR
+	mv -f $XBPS_DESTDIR/$binpkg $XBPS_PACKAGESDIR
 
-	echo "=> Built package: $pkgname-$version-xbps.tbz2."
+	echo "=> Built package: $binpkg"
 }