From c18153b92cbba43aecb34ef047d77d0e3a7716b2 Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
Date: Mon, 4 Jan 2010 16:05:13 +0100
Subject: [PATCH] Add $create_wrksrc for use in templates.

If set the specified wrksrc will be created and its distfiles will be
extracted into it.

--HG--
extra : convert_revision : c6b0ff2634a9f764d45fcdd97ecee5d32c8a7ace
---
 xbps-src/shutils/extract_funcs.sh | 39 ++++++++++++++-----------------
 xbps-src/shutils/tmpl_funcs.sh    |  4 ++--
 2 files changed, 20 insertions(+), 23 deletions(-)

diff --git a/xbps-src/shutils/extract_funcs.sh b/xbps-src/shutils/extract_funcs.sh
index f6cb8ca4067..e092eaacd51 100644
--- a/xbps-src/shutils/extract_funcs.sh
+++ b/xbps-src/shutils/extract_funcs.sh
@@ -1,5 +1,5 @@
 #-
-# Copyright (c) 2008 Juan Romero Pardines.
+# Copyright (c) 2008-2010 Juan Romero Pardines.
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -29,7 +29,7 @@
 #
 extract_distfiles()
 {
-	local pkg="$1" curfile cursufx ltar_cmd f lver
+	local pkg="$1" curfile cursufx f lver
 
 	[ -f $XBPS_EXTRACT_DONE ] && return 0
 	[ -z "$in_chroot" -a ! -w $XBPS_BUILDDIR ] && \
@@ -59,14 +59,12 @@ extract_distfiles()
 		return 0
 	fi
 
-	msg_normal "Extracting $pkgname-$lver distfile(s)."
-
-	if [ -n "$tar_override_cmd" ]; then
-		ltar_cmd="$tar_override_cmd"
-	else
-		ltar_cmd="tar"
+	if [ -n "$create_wrksrc" ]; then
+		mkdir -p ${wrksrc} || return 1
 	fi
 
+	msg_normal "Extracting $pkgname-$lver distfile(s)."
+
 	for f in ${distfiles}; do
 		curfile=$(basename $f)
 
@@ -96,33 +94,36 @@ extract_distfiles()
 			msg_error "unknown distfile suffix for $curfile."
 		fi
 
+		if [ -n "$create_wrksrc" ]; then
+			extractdir="$wrksrc"
+		else
+			extractdir="$XBPS_BUILDDIR"
+		fi
+
 		case ${cursufx} in
 		txz)
 			if [ ! -x $XBPS_MASTERDIR/usr/bin/xz ]; then
 				msg_error "cannot find xz for extraction."
 			fi
-			$ltar_cmd xfJ $XBPS_SRCDISTDIR/$curfile \
-				-C $XBPS_BUILDDIR
+			tar xfJ $XBPS_SRCDISTDIR/$curfile -C $extractdir
 			if [ $? -ne 0 ]; then
 				msg_error "extracting $curfile into $XBPS_BUILDDIR."
 			fi
 			;;
 		tbz)
-			$ltar_cmd xfj $XBPS_SRCDISTDIR/$curfile \
-				-C $XBPS_BUILDDIR
+			tar xfj $XBPS_SRCDISTDIR/$curfile -C $extractdir
 			if [ $? -ne 0 ]; then
 				msg_error "extracting $curfile into $XBPS_BUILDDIR."
 			fi
 			;;
 		tgz)
-			$ltar_cmd xfz $XBPS_SRCDISTDIR/$curfile \
-				-C $XBPS_BUILDDIR
+			tar xfz $XBPS_SRCDISTDIR/$curfile -C $extractdir
 			if [ $? -ne 0 ]; then
 				msg_error "extracting $curfile into $XBPS_BUILDDIR."
 			fi
 			;;
 		gz|bz2)
-			cp -f $XBPS_SRCDISTDIR/$curfile $XBPS_BUILDDIR
+			cp -f $XBPS_SRCDISTDIR/$curfile $extractdir
 			if [ "$cursufx" = ".gz" ]; then
 				cd $XBPS_BUILDDIR && gunzip $curfile
 			else
@@ -130,8 +131,7 @@ extract_distfiles()
 			fi
 			;;
 		tar)
-			$ltar_cmd xf $XBPS_SRCDISTDIR/$curfile \
-				-C $XBPS_BUILDDIR
+			tar xf $XBPS_SRCDISTDIR/$curfile -C $extractdir
 			if [ $? -ne 0 ]; then
 				msg_error "extracting $curfile into $XBPS_BUILDDIR."
 			fi
@@ -140,7 +140,7 @@ extract_distfiles()
 			if [ -x $XBPS_MASTERDIR/usr/bin/unzip ]; then
 				$XBPS_MASTERDIR/usr/bin/unzip \
 					-q -x $XBPS_SRCDISTDIR/$curfile \
-					-d $XBPS_BUILDDIR
+					-d $extractdir
 				if [ $? -ne 0 ]; then
 					msg_error "extracting $curfile into $XBPS_BUILDDIR."
 				fi
@@ -154,8 +154,5 @@ extract_distfiles()
 		esac
 	done
 
-	if [ ! -d ${wrksrc} ]; then
-		mkdir -p ${wrksrc}
-	fi
 	touch -f $XBPS_EXTRACT_DONE
 }
diff --git a/xbps-src/shutils/tmpl_funcs.sh b/xbps-src/shutils/tmpl_funcs.sh
index 1e6fb1454fc..84b55c4ecf8 100644
--- a/xbps-src/shutils/tmpl_funcs.sh
+++ b/xbps-src/shutils/tmpl_funcs.sh
@@ -1,5 +1,5 @@
 #-
-# Copyright (c) 2008-2009 Juan Romero Pardines.
+# Copyright (c) 2008-2010 Juan Romero Pardines.
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -75,7 +75,7 @@ reset_tmpl_vars()
 			only_for_archs conf_files keep_libtool_archives \
 			noarch subpackages sourcepkg gtk_iconcache_dirs \
 			abi_depends api_depends triggers openrc_services \
-			replaces system_accounts build_wrksrc \
+			replaces system_accounts build_wrksrc create_wrksrc \
 			XBPS_EXTRACT_DONE XBPS_CONFIGURE_DONE \
 			XBPS_BUILD_DONE XBPS_INSTALL_DONE FILESDIR DESTDIR \
 			SRCPKGDESTDIR PATCHESDIR"