From 9dfcab1416985344b75a2bd90335ec1e562fb981 Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
Date: Tue, 28 Apr 2009 00:13:21 +0200
Subject: [PATCH] Rename config_shell to configure_shell.

--HG--
extra : convert_revision : 416900b81eca96e802f94b7a075842112d116eba
---
 shutils/configure_funcs.sh     | 6 +++---
 shutils/tmpl_funcs.sh          | 2 +-
 templates/ImageMagick/template | 2 +-
 templates/libsmbios/template   | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/shutils/configure_funcs.sh b/shutils/configure_funcs.sh
index 1e19971bf8b..4b1fd564e7c 100644
--- a/shutils/configure_funcs.sh
+++ b/shutils/configure_funcs.sh
@@ -78,15 +78,15 @@ configure_src_phase()
 	. $XBPS_SHUTILSDIR/buildvars_funcs.sh
 	set_build_vars
 
-	if [ -z "${config_shell}" ]; then
-		config_shell=/bin/sh
+	if [ -z "${configure_shell}" ]; then
+		configure_shell=/bin/sh
 	fi
 
 	#
 	# Packages using GNU autoconf
 	#
 	if [ "$build_style" = "gnu_configure" ]; then
-		env CONFIG_SHELL=${config_shell} ${configure_script}	\
+		env CONFIG_SHELL=${configure_shell} ${configure_script}	\
 			--prefix=/usr --sysconfdir=/etc		\
 			--infodir=/usr/share/info		\
 			--mandir=/usr/share/man			\
diff --git a/shutils/tmpl_funcs.sh b/shutils/tmpl_funcs.sh
index ccec69601ac..fb9d5d8e800 100644
--- a/shutils/tmpl_funcs.sh
+++ b/shutils/tmpl_funcs.sh
@@ -64,7 +64,7 @@ reset_tmpl_vars()
 			short_desc maintainer long_desc checksum wrksrc	\
 			patch_files make_cmd base_chroot register_shell \
 			make_build_target configure_script noextract \
-			pre_configure pre_build pre_install config_shell \
+			pre_configure pre_build pre_install configure_shell \
 			post_configure post_build post_install \
 			make_install_target version revision \
 			sgml_catalogs xml_catalogs xml_entries sgml_entries \
diff --git a/templates/ImageMagick/template b/templates/ImageMagick/template
index a0d324b5a55..8460e6f40c9 100644
--- a/templates/ImageMagick/template
+++ b/templates/ImageMagick/template
@@ -6,7 +6,7 @@ version=${_distver}.${_distverpatch}
 wrksrc=${pkgname}-${_distver}-${_distverpatch}
 distfiles="ftp://ftp.imagemagick.org/pub/$pkgname/$pkgname-${_distver}-${_distverpatch}.tar.bz2"
 build_style=gnu_configure
-config_shell="/bin/bash"
+configure_shell=/bin/bash
 configure_args="--without-gslib --without-jp2 --without-autotrace
  --without-djvu --without-dps --without-fpx --without-gvc --without-jbig
  --without-lqr --without-openexr --with-gs-font-dir=/usr/share/fonts/Type1
diff --git a/templates/libsmbios/template b/templates/libsmbios/template
index bfb647b63f2..34abe60925a 100644
--- a/templates/libsmbios/template
+++ b/templates/libsmbios/template
@@ -4,7 +4,7 @@ sourcepkg=$pkgname
 version=2.2.16
 distfiles="http://linux.dell.com/$pkgname/download/$pkgname/$pkgname-$version/$pkgname-$version.tar.bz2"
 build_style=gnu_configure
-config_shell=/bin/bash
+configure_shell=/bin/bash
 configure_args="--disable-static --disable-python"
 short_desc="Library for SMBIOS access"
 maintainer="Juan RP <xtraeme@gmail.com>"