Succeeded by Makefile.sysinstall.REL=9.0-RELEASE.diff *** 5.2-RELEASE/src/release/Makefile Wed Jun 4 07:38:46 2003 --- new/src/release/Makefile Sat Jun 14 21:43:40 2003 *************** *** 447,452 **** --- 447,502 ---- echo "export RELEASEDIR=${_R}" >> ${_MK} echo "export PATH=/bin:/usr/bin:/sbin:/usr/sbin:${LOCALDIR}" >> ${_MK} echo "export MANBUILDCAT=YES" >> ${_MK} + @# + # Ensure knowledge of any (fetch(3) defined) proxies. + .if defined(FTP_LOGIN) #{ + echo "export FTP_LOGIN=\"${FTP_LOGIN}\"" >> ${_MK} + .endif #} + .if defined(FTP_PASSIVE_MODE) #{ + echo "export FTP_PASSIVE_MODE=\"${FTP_PASSIVE_MODE}\"" \ + >> ${_MK} + .endif #} + .if defined(FTP_PASSWORD) #{ + echo "export FTP_PASSWORD=\"${FTP_PASSWORD}\"" >> ${_MK} + .endif #} + .if defined(ftp_proxy) #{ + echo "export ftp_proxy=\"${ftp_proxy}\"" >> ${_MK} + .endif #} + .if defined(http_proxy) #{ + echo "export http_proxy=\"${http_proxy}\"" >> ${_MK} + .endif #} + .if defined(FTP_PROXY) #{ + echo "export FTP_PROXY=\"${FTP_PROXY}\"" >> ${_MK} + .endif #} + .if defined(HTTP_PROXY) #{ + echo "export HTTP_PROXY=\"${HTTP_PROXY}\"" >> ${_MK} + .endif #} + .if defined(HTTP_AUTH) #{ + echo "export HTTP_AUTH=\"${HTTP_AUTH}\"" >> ${_MK} + .endif #} + .if defined(HTTP_PROXY_AUTH) #{ + echo "export HTTP_PROXY_AUTH=\"${HTTP_PROXY_AUTH}\"" \ + >> ${_MK} + .endif #} + .if defined(HTTP_USER_AGENT) #{ + echo "export HTTP_USER_AGENT=\"${HTTP_USER_AGENT}\"" \ + >> ${_MK} + .endif #} + @# Look for distfiles localy, before remotely at ftp.freebsd.org + touch ${CHROOTDIR}/etc/make.conf + @# ( ${CHROOTDIR}/etc/make.conf does not pre-exist on 4.7-RELEASE, + @# but might exist in 4.8 or 5.0, so don't just ">" to it ). + .if defined(MASTER_SITE_BACKUP) + @echo 'Adding MASTER_SITE_BACKUP=${MASTER_SITE_BACKUP}' + echo 'MASTER_SITE_BACKUP= ${MASTER_SITE_BACKUP}' \ + >> ${CHROOTDIR}/etc/make.conf + .endif + .if defined(MASTER_SITE_FREEBSD) #{ + @echo 'Adding MASTER_SITE_FREEBSD= ${MASTER_SITE_FREEBSD}' + @echo 'MASTER_SITE_FREEBSD= ${MASTER_SITE_FREEBSD}' \ + >> ${CHROOTDIR}/etc/make.conf + .endif #} + @# # NB: these may fail if the host is running w/o devfs echo "umount /dev >/dev/null 2>&1 || true" >> ${_MK} echo "mount -t devfs devfs /dev >/dev/null 2>&1 || true" >> ${_MK}