From 2b9aec22ea58a4599974f5b454c6437665e49580 Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
Date: Fri, 8 Jul 2011 02:25:51 +0200
Subject: [PATCH] xbps-src: <destdir> and <builddir> must not be in
 XBPS_HOSTDIR.

---
 xbps-src/etc/xbps-src.conf.in     | 1 -
 xbps-src/shutils/init_funcs.sh.in | 6 +++---
 xbps-src/xbps-src.sh.in           | 4 ++--
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/xbps-src/etc/xbps-src.conf.in b/xbps-src/etc/xbps-src.conf.in
index 15ed6fcdeaa..d1f2d9b6801 100644
--- a/xbps-src/etc/xbps-src.conf.in
+++ b/xbps-src/etc/xbps-src.conf.in
@@ -23,7 +23,6 @@ XBPS_MASTERDIR=$XBPS_DISTRIBUTIONDIR/masterdir
 # Basically your directory must contain this structure:
 #
 # /yourdir
-# 	|_ /build
 # 	|_ /binpkgs
 # 	|_ /repocache
 # 	|_ /sources
diff --git a/xbps-src/shutils/init_funcs.sh.in b/xbps-src/shutils/init_funcs.sh.in
index 274ee6d1f9f..796df450cef 100644
--- a/xbps-src/shutils/init_funcs.sh.in
+++ b/xbps-src/shutils/init_funcs.sh.in
@@ -37,12 +37,12 @@ set_defvars()
 	: ${XBPS_PKGMETADIR:=$XBPS_DBDIR/metadata}
 	: ${XBPS_SRCPKGDIR:=$XBPS_DISTRIBUTIONDIR/srcpkgs}
 	if [ -n "$IN_CHROOT" ]; then
-		: ${XBPS_DESTDIR:=/host/destdir}
+		: ${XBPS_DESTDIR:=/destdir}
 	else
-		: ${XBPS_DESTDIR:=$XBPS_MASTERDIR/host/destdir}
+		: ${XBPS_DESTDIR:=$XBPS_MASTERDIR/destdir}
 	fi
 	: ${XBPS_PACKAGESDIR:=$XBPS_MASTERDIR/host/binpkgs}
-	: ${XBPS_BUILDDIR:=$XBPS_MASTERDIR/host/build}
+	: ${XBPS_BUILDDIR:=$XBPS_MASTERDIR/builddir}
 	: ${XBPS_SRCDISTDIR:=$XBPS_MASTERDIR/host/sources}
 	: ${XBPS_TRIGGERSDIR:=$XBPS_SRCPKGDIR/xbps-triggers/files}
 
diff --git a/xbps-src/xbps-src.sh.in b/xbps-src/xbps-src.sh.in
index cec552063e1..adab824e9e3 100644
--- a/xbps-src/xbps-src.sh.in
+++ b/xbps-src/xbps-src.sh.in
@@ -80,7 +80,7 @@ Targets:
 
  extract [pkgname]
 	Extract package source distribution file(s) into the build directory.
-	By default set to <masterdir>/host/build.
+	By default set to <masterdir>/builddir.
 
  fetch [pkgname]
 	Download package source distribution file(s).
@@ -131,7 +131,7 @@ Options:
  -c     Path to global configuration file:
         if not specified @@XBPS_INSTALL_ETCDIR@@/xbps-src.conf is used.
  -D     Only install <pkgname> to package's destination directory set
-        to <masterdir>/host/destdir/<pkgname>-<version>.
+        to <masterdir>/destdir/<pkgname>-<version>.
  -h	Usage output.
  -K     Do not remove automatic package dependencies while building
         or installing a package with XBPS_PREFER_BINPKG_DEPS enabled.