From de411515cc089115a88dd0ee2300d2b9ca14f612 Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
Date: Sat, 14 Mar 2009 06:11:52 +0100
Subject: [PATCH] Kill $base_package, it was only used by dash after all.

--HG--
extra : convert_revision : e7ac14b1535f716dec259fc208343b3f4b6bb75f
---
 shutils/configure_funcs.sh | 9 +--------
 shutils/tmpl_funcs.sh      | 2 +-
 templates/dash/template    | 7 +++----
 3 files changed, 5 insertions(+), 13 deletions(-)

diff --git a/shutils/configure_funcs.sh b/shutils/configure_funcs.sh
index 8c37b442a21..7d0103fb3c6 100644
--- a/shutils/configure_funcs.sh
+++ b/shutils/configure_funcs.sh
@@ -68,13 +68,6 @@ configure_src_phase()
 
 	[ -z "$configure_script" ] && configure_script="./configure"
 
-	local _prefix=
-	if [ -z "$base_package" ]; then
-		_prefix=/usr
-	else
-		_prefix=
-	fi
-
 	cd $wrksrc || exit 1
 
 	. $XBPS_SHUTILSDIR/buildvars_funcs.sh
@@ -92,7 +85,7 @@ configure_src_phase()
 			mandir=/usr/share/man
 		fi
 		${configure_script}				\
-			--prefix=${_prefix} --sysconfdir=/etc	\
+			--prefix=/usr --sysconfdir=/etc		\
 			--infodir=${infodir} --mandir=${mandir} \
 			${configure_args}
 	#
diff --git a/shutils/tmpl_funcs.sh b/shutils/tmpl_funcs.sh
index 59697f55fc0..4eb301abae0 100644
--- a/shutils/tmpl_funcs.sh
+++ b/shutils/tmpl_funcs.sh
@@ -61,7 +61,7 @@ reset_tmpl_vars()
 	local TMPL_VARS="pkgname distfiles configure_args configure_env \
 			make_build_args make_install_args build_style	\
 			short_desc maintainer long_desc checksum wrksrc	\
-			patch_files make_cmd base_package base_chroot \
+			patch_files make_cmd base_chroot \
 			make_build_target configure_script \
 			pre_configure pre_build pre_install post_install \
 			make_install_target version \
diff --git a/templates/dash/template b/templates/dash/template
index 318e11e2f86..fee6b27e1b1 100644
--- a/templates/dash/template
+++ b/templates/dash/template
@@ -4,8 +4,9 @@ version=0.5.4
 distfiles="
 http://gondor.apana.org.au/~herbert/dash/files/$pkgname-$version.tar.gz"
 build_style=gnu_configure
-configure_args="--bindir=$XBPS_DESTDIR/$pkgname-$version/bin"
+configure_args="--prefix= --mandir=/usr/share/man"
 configure_env="LANG=C"
+make_install_target="DESTDIR=$XBPS_DESTDIR/$pkgname-$version install"
 short_desc="POSIX-compliant Unix shell, much smaller than GNU bash"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=a9dc8f0237f632dd2c1bfeff80b1052e75fafaef0d767e3beab0bd8becced623
@@ -17,12 +18,10 @@ long_desc="
  (ash). It was ported to Linux by Herbert Xu in early 1997. It was renamed to
  dash in 2002."
 
-base_package=yes
 base_chroot=yes
-
 Add_dependency run glibc
 
 post_install()
 {
-	cd $XBPS_DESTDIR/$pkgname-$version/bin && ln -s dash sh
+	cd ${DESTDIR}/bin && ln -s dash sh
 }