From 49b46005e7f7ebebcf6b43d451918c5462ac28d4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lucio=20Andr=C3=A9s=20Illanes=20Albornoz=20=28arab=2C=20vx?=
 =?UTF-8?q?p=29?= <lucio@lucioillanes.de>
Date: Sun, 19 Nov 2017 14:21:25 +0000
Subject: vars/{build,env}.vars: diet, pt. II. vars/build.vars: install w/
 `DESTDIR=<prefix> PREFIX= prefix=' by default. vars/build.vars:cmake: build
 w/ -g0 -O2. vars/cmake.vars: build using cmake_host. vars/pkgconf_host.vars:
 remove & don't install ${PREFIX}/bin/pkg-config link to avoid confusing host
 packages. vars/{apr_util,chainport}.vars: replaced w/ corresponding
 ${PKG_BUILD_STEPS}. patches/perl-5.22.1.local.patch: pass -L. -lperl when
 linking. patches/smallbasic.local.patch: don't call pcre-config.
 subr/pkg_autoconf.subr, vars/{lib{caca,udns},toilet}.vars: always install
 config.sub after bootstrap. subr/pkg_disabled.subr: always silently finish
 disabled packages. subr/pkg_setup_{env,vars}.subr: split.
 subr/pkg_{build,install}.subr: always pass LIBTOOL=${PKG_SLIBTOOL:=slibtool}.
 subr/pkg_{{build,work}_dir,extract,setup_env}.subr: infer ${PKG_BUILD_DIR}
 from ${PKG_SUBDIR} given the absence of configure{,.{ac,in}}.

---
 subr/pkg_extract.subr | 17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)

(limited to 'subr/pkg_extract.subr')

diff --git a/subr/pkg_extract.subr b/subr/pkg_extract.subr
index f6982937..f6ddff2e 100644
--- a/subr/pkg_extract.subr
+++ b/subr/pkg_extract.subr
@@ -6,23 +6,20 @@ pkg_extract() {
 	if [ -n "${PKG_URL}" ]\
 	&& [ "${PKG_URL_TYPE:-wget}" = wget ]; then
 		build_fileop rm "${WORKDIR}/${PKG_SUBDIR}";
-		if [ "${PKG_SUBDIR_CREATE:-0}" -eq 1 ]; then
-			build_fileop mkdir "${WORKDIR}/${PKG_SUBDIR}";
-		fi;
 		if [ "${PKG_FNAME##*.tar.}" = "bz2" ]; then
-			bunzip2 -d < "${DLCACHEDIR}/${PKG_FNAME}" | tar -C "${WORKDIR}${PKG_SUBDIR_CREATE:+/${PKG_SUBDIR}}" -xf -;
+			bunzip2 -d < "${DLCACHEDIR}/${PKG_FNAME}" | tar -C "${WORKDIR}" -xf -;
 		elif [ "${PKG_FNAME##*.tar.}" = "gz" ]; then
-			gunzip -d < "${DLCACHEDIR}/${PKG_FNAME}" | tar -C "${WORKDIR}${PKG_SUBDIR_CREATE:+/${PKG_SUBDIR}}" -xf -;
+			gunzip -d < "${DLCACHEDIR}/${PKG_FNAME}" | tar -C "${WORKDIR}" -xf -;
 		elif [ "${PKG_FNAME##*.tar.}" = "xz" ]; then
-			xz -d < "${DLCACHEDIR}/${PKG_FNAME}" | tar -C "${WORKDIR}${PKG_SUBDIR_CREATE:+/${PKG_SUBDIR}}" -xf -;
+			xz -d < "${DLCACHEDIR}/${PKG_FNAME}" | tar -C "${WORKDIR}" -xf -;
 		elif [ "${PKG_FNAME##*.t}" = "bz2" ]; then
-			bunzip2 -d < "${DLCACHEDIR}/${PKG_FNAME}" | tar -C "${WORKDIR}${PKG_SUBDIR_CREATE:+/${PKG_SUBDIR}}" -xf -;
+			bunzip2 -d < "${DLCACHEDIR}/${PKG_FNAME}" | tar -C "${WORKDIR}" -xf -;
 		elif [ "${PKG_FNAME##*.t}" = "gz" ]; then
-			gunzip -d < "${DLCACHEDIR}/${PKG_FNAME}" | tar -C "${WORKDIR}${PKG_SUBDIR_CREATE:+/${PKG_SUBDIR}}" -xf -;
+			gunzip -d < "${DLCACHEDIR}/${PKG_FNAME}" | tar -C "${WORKDIR}" -xf -;
 		elif [ "${PKG_FNAME##*.t}" = "xz" ]; then
-			xz -d < "${DLCACHEDIR}/${PKG_FNAME}" | tar -C "${WORKDIR}${PKG_SUBDIR_CREATE:+/${PKG_SUBDIR}}" -xf -;
+			xz -d < "${DLCACHEDIR}/${PKG_FNAME}" | tar -C "${WORKDIR}" -xf -;
 		else
-			tar -C "${WORKDIR}${PKG_SUBDIR_CREATE:+/${PKG_SUBDIR}}" -xf "${DLCACHEDIR}/${PKG_FNAME}";
+			tar -C "${WORKDIR}" -xf "${DLCACHEDIR}/${PKG_FNAME}";
 		fi;
 	fi;
 };
-- 
cgit v1.2.3