From cba275234da888fe769e4b5a7c169eb1386294a2 Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
Date: Thu, 23 Jun 2011 12:18:42 +0200
Subject: [PATCH] xbps-mklive: adapt for xbps-base-system -> base-system
 rename.

---
 srcpkgs/xbps-mklive/files/xbps-mklive.sh.in | 4 ++--
 srcpkgs/xbps-mklive/template                | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/xbps-mklive/files/xbps-mklive.sh.in b/srcpkgs/xbps-mklive/files/xbps-mklive.sh.in
index 4872155e09d..ae305c46ccf 100755
--- a/srcpkgs/xbps-mklive/files/xbps-mklive.sh.in
+++ b/srcpkgs/xbps-mklive/files/xbps-mklive.sh.in
@@ -186,9 +186,9 @@ fi
 . $CONFIG_FILE
 
 if [ -z "$PACKAGE_LIST" ]; then
-	PACKAGE_LIST="xbps-base-system xbps-casper"
+	PACKAGE_LIST="base-system xbps-casper"
 else
-	PACKAGE_LIST="xbps-base-system xbps-casper $PACKAGE_LIST"
+	PACKAGE_LIST="base-system xbps-casper $PACKAGE_LIST"
 fi
 BUILDDIR=$(mktemp --tmpdir="$(pwd)" -d) || exit 1
 BUILDDIR=$(readlink -f $BUILDDIR)
diff --git a/srcpkgs/xbps-mklive/template b/srcpkgs/xbps-mklive/template
index 3ca6d7cfe63..0a75e5d5d26 100644
--- a/srcpkgs/xbps-mklive/template
+++ b/srcpkgs/xbps-mklive/template
@@ -1,6 +1,6 @@
 # Template file for 'xbps-mklive'
 pkgname=xbps-mklive
-version=0.3.6
+version=0.3.7
 build_style=custom-install
 short_desc="XBPS Live image maker"
 maintainer="Juan RP <xtraeme@gmail.com>"
@@ -19,10 +19,10 @@ Add_dependency full initramfs-tools
 do_build()
 {
 	sed "s|@@MKLIVE_VERSION@@|${version}|g" \
-		${FILESDIR}/${pkgname}.sh.in > ${wrksrc}/${pkgname}.sh
+		${FILESDIR}/${pkgname}.sh.in > ${pkgname}.sh
 }
 
 do_install()
 {
-	install -D -m755 ${wrksrc}/${pkgname}.sh ${DESTDIR}/usr/sbin/xbps-mklive
+	install -Dm755 ${pkgname}.sh ${DESTDIR}/usr/sbin/xbps-mklive
 }