From df492b077cc26aef14fd92b02edc3aa911729441 Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
Date: Thu, 12 Mar 2009 00:47:01 +0100
Subject: [PATCH] Remove $make_env. It's not really useful anymore.

--HG--
extra : convert_revision : f75462dfe24b62d3a278c722302b760ca4b475d2
---
 shutils/build_funcs.sh     | 5 -----
 shutils/install_funcs.sh   | 5 -----
 shutils/tmpl_funcs.sh      | 2 +-
 templates/firefox/template | 1 -
 templates/git/template     | 1 -
 5 files changed, 1 insertion(+), 13 deletions(-)

diff --git a/shutils/build_funcs.sh b/shutils/build_funcs.sh
index 106de3833d..fce33a81d9 100644
--- a/shutils/build_funcs.sh
+++ b/shutils/build_funcs.sh
@@ -64,11 +64,6 @@ build_src_phase()
 	[ -n "$XBPS_MAKEJOBS" -a -z "$disable_parallel_build" ] && \
 		makejobs="-j$XBPS_MAKEJOBS"
 
-	# Export make_env vars.
-	for f in ${make_env}; do
-		export "$f"
-	done
-
 	if [ -z "$in_chroot" ]; then
 		. $XBPS_SHUTILSDIR/libtool_funcs.sh
 		libtool_fixup_file
diff --git a/shutils/install_funcs.sh b/shutils/install_funcs.sh
index 1cd9766b10..9cb1c6a18c 100644
--- a/shutils/install_funcs.sh
+++ b/shutils/install_funcs.sh
@@ -141,11 +141,6 @@ make_install()
 		fi
 	fi
 
-	# Unset make_env vars.
-	for f in ${make_env}; do
-		unset eval ${f%=*}
-	done
-
 	# Unset build vars.
 	unset_build_vars
 }
diff --git a/shutils/tmpl_funcs.sh b/shutils/tmpl_funcs.sh
index f5952f8c2d..62d85ac11f 100644
--- a/shutils/tmpl_funcs.sh
+++ b/shutils/tmpl_funcs.sh
@@ -62,7 +62,7 @@ reset_tmpl_vars()
 			make_build_args make_install_args build_style	\
 			short_desc maintainer long_desc checksum wrksrc	\
 			patch_files make_cmd base_package base_chroot \
-			make_env make_build_target configure_script \
+			make_build_target configure_script \
 			pre_configure pre_build pre_install post_install \
 			postinstall_helpers make_install_target version \
 			tar_override_cmd xml_entries sgml_entries \
diff --git a/templates/firefox/template b/templates/firefox/template
index e77bbd4133..dc62e7ff9c 100644
--- a/templates/firefox/template
+++ b/templates/firefox/template
@@ -10,7 +10,6 @@ configure_args="--enable-default-toolkit=cairo-gtk2 --disable-dbus
  --enable-svg --enable-svg-renderer=cairo --enable-system-cairo
  --enable-crypto --enable-application=browser --disable-gnomevfs
  --disable-gnomeui"
-make_env="MOZILLA_PKG_NAME=$pkgname LIBRUNPATH=$XBPS_MASTERDIR/lib/$pkgname"
 short_desc="Lightweight gecko-based web browser"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=50f5c23182ac8bfe1a33502fb04814a3961c5033
diff --git a/templates/git/template b/templates/git/template
index c2c6838143..3f9cb5c632 100644
--- a/templates/git/template
+++ b/templates/git/template
@@ -4,7 +4,6 @@ version=1.6.2
 distfiles="
 http://www.kernel.org/pub/software/scm/git/$pkgname-$version.tar.bz2"
 build_style=gnu_configure
-make_env="THREADED_DELTA_SEARCH=1"
 configure_args="--with-shell=/bin/sh --with-curl --with-expat --without-tcltk"
 make_install_target="DESTDIR=$XBPS_DESTDIR/$pkgname-$version install"
 short_desc="GIT Tree History Storage Tool"