Date: Wed, 2 Aug 2006 22:38:31 GMT From: Gabor Kovesdan <gabor@FreeBSD.org> To: Perforce Change Reviews <perforce@FreeBSD.org> Subject: PERFORCE change 103069 for review Message-ID: <200608022238.k72McV8C018975@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=103069 Change 103069 by gabor@gabor_spitfire on 2006/08/02 22:38:17 - Fix some syntactical errors in do-fetch.sh - Clean up FETCH_SCRIPT_ENV in bsd.port.mk Affected files ... .. //depot/projects/soc2006/gabor_ports/Mk/bsd.port.mk#66 edit .. //depot/projects/soc2006/gabor_ports/Tools/scripts/do-fetch.sh#16 edit Differences ... ==== //depot/projects/soc2006/gabor_ports/Mk/bsd.port.mk#66 (text+ko) ==== @@ -2138,19 +2138,13 @@ FETCH_SCRIPT=${PORTSDIR}/Tools/scripts/do-fetch.sh FETCH_SCRIPT_ENV= AWK="${AWK}" BASENAME="${BASENAME}" ECHO_CMD="${ECHO_CMD}" ECHO_MSG="${ECHO_MSG}" \ - GREP="${GREP}" MKDIR="${MKDIR}" SED="${SED}" SETENV="${SETENV}" \ + GREP="${GREP}" MKDIR="${MKDIR}" SED="${SED}" SETENV="${SETENV}" TR="${TR} \ FETCH_CMD="${FETCH_CMD}" \ FETCH_BEFORE_ARGS="${FETCH_BEFORE_ARGS}" FETCH_AFTER_ARGS="${FETCH_AFTER_ARGS}" \ _DISTDIR="${_DISTDIR}" DIST_SUBDIR="${DIST_SUBDIR}" DISTFILES="${DISTFILES}" \ FORCE_FETCH="${FORCE_FETCH}" NO_CHECKSUM="${NO_CHECKSUM}" MD5_FILE="${MD5_FILE}" \ - _MASTER_SITES="${_MASTER_SITES}" \ - _MASTER_SITE_OVERRIDE="${MASTER_SITE_OVERRIDE}" \ - _MASTER_SITE_BACKUP="${_MASTER_SITE_BACKUP}" MASTER_SORT_AWK="${MASTER_SORT_AWK}" \ - SORTED_MASTER_SITES_DEFAULT_CMD="${SORTED_MASTER_SITES_DEFAULT_CMD}" \ _RANDOMIZE_SITES="${_RANDOMIZE_SITES}" \ - PATCHFILES="${PATCHFILES}" \ - SORTED_PATCH_SITES_DEFAULT_CMD="${SORTED_PATCH_SITES_DEFAULT_CMD}" - + PATCHFILES="${PATCHFILES}" .if exists(/usr/bin/fetch) FETCH_CMD?= /usr/bin/fetch -ARr ==== //depot/projects/soc2006/gabor_ports/Tools/scripts/do-fetch.sh#16 (text+ko) ==== @@ -4,10 +4,10 @@ for _S in ${MASTER_SITES}; do __TMP= `${ECHO_CMD} ${_S} | ${SED} "s@/:[^/:]+$@/@}"` _S_TEMP= `${ECHO_CMD} ${_S} | ${SED} -e "s/^${__TMP}//" -e "/^://"` - if [ -n "${_S_TEMP}" ] ; then + if [ -n "${_S_TEMP}" ] ; then for _group in `${ECHO_CMD} ${_S_TEMP} | ${SED} "s/,/ /g"`; do _G_TEMP= ${_group} - if ${_G_TEMP} == all || ${_G_TEMP} == ALL || ${_G_TEMP} == default + if ${_G_TEMP} == all || ${_G_TEMP} == ALL || ${_G_TEMP} == default; then ${ECHO_MSG} "Makefile error: the words all, ALL and default are reserved and cannot be" ${ECHO_MSG} "used in group definitions. Please fix your MASTER_SITES." exit 1 @@ -31,7 +31,7 @@ ${ECHO_MSG} "used in group definitions. Please fix your MASTER_SITES." exit 1 fi - if [ -n "${_MASTER_SITES_${_group}}" ] ; then + if [ -n "$${_MASTER_SITES_${_group}}" ] ; then __SUFFIX_TMP= `${ECHO_CMD} ${_S} | ${SED} "s@^(.*)/:[^/:]+$@\1@"` _MASTER_SITE_SUBDIR_${_group}= $${_MASTER_SITE_SUBDIR_${_group}} ${__SUFFIX_TMP} fi
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200608022238.k72McV8C018975>