svn commit: r207660 - in stable/8/release: . picobsd/floppy.tree/sbin

[Ken Smith]

Author: kensmith
Date: Wed May  5 16:25:57 2010
New Revision: 207660
URL: http://svn.freebsd.org/changeset/base/207660

Log:
  Merge r206422:
  
  > Pass the HTTP_PROXY and FTP_PROXY environment variables through in addition
  > to FTP_PASSIVE_MODE so release building works for a machine that needs
  > to use a proxy.
  
  PR:		misc/137688
  Submitted by:	Michael Leun

Modified:
  stable/8/release/Makefile
Directory Properties:
  stable/8/release/   (props changed)
  stable/8/release/picobsd/   (props changed)
  stable/8/release/picobsd/floppy.tree/sbin/   (props changed)
  stable/8/release/picobsd/floppy.tree/sbin/dhclient-script   (props changed)
  stable/8/release/picobsd/qemu/   (props changed)

Modified: stable/8/release/Makefile
==============================================================================
--- stable/8/release/Makefile	Wed May  5 16:05:51 2010	(r207659)
+++ stable/8/release/Makefile	Wed May  5 16:25:57 2010	(r207660)
@@ -575,7 +575,7 @@ release rerelease:
 	echo "	for i in ${MAKEINDEXPORTS}"	>> ${_MK}
 	echo "	do"			>> ${_MK}
 	echo "		cd /usr/ports/\$${i}"	>> ${_MK}
-	echo "		env -i FTP_PASSIVE_MODE=$${FTP_PASSIVE_MODE:-no} PATH=$${PATH} \\" >> ${_MK}
+	echo "		env -i HTTP_PROXY=$${HTTP_PROXY} FTP_PROXY=$${FTP_PROXY} FTP_PASSIVE_MODE=$${FTP_PASSIVE_MODE:-no} PATH=$${PATH} \\" >> ${_MK}
 	echo "		make all install clean BATCH=yes FORCE_PKG_REGISTER=yes" >> ${_MK}
 	echo "	done"				>> ${_MK}
 	echo "	cd /usr/ports"			>> ${_MK}