PERFORCE change 103021 for review
Gabor Kovesdan
gabor at FreeBSD.org
Wed Aug 2 13:53:49 UTC 2006
http://perforce.freebsd.org/chv.cgi?CH=103021
Change 103021 by gabor at gabor_spitfire on 2006/08/02 13:53:42
Eliminate make += variable assignments.
Affected files ...
.. //depot/projects/soc2006/gabor_ports/Tools/scripts/do-fetch.sh#15 edit
Differences ...
==== //depot/projects/soc2006/gabor_ports/Tools/scripts/do-fetch.sh#15 (text+ko) ====
@@ -12,10 +12,12 @@
${ECHO_MSG} "used in group definitions. Please fix your MASTER_SITES."
exit 1
fi
- _MASTER_SITES_${_group}+= `${ECHO_CMD} ${_S} | ${SED} "s/@^(.*/):[^/:]+$@\1@"`
+ __SUFFIX_TMP= `${ECHO_CMD} ${_S} | ${SED} "s/@^(.*/):[^/:]+$@\1@"`
+ _MASTER_SITES_${_group}= $${_MASTER_SITES_${_group}} ${__SUFFIX_TMP}
done
else
- _MASTER_SITES_DEFAULT+= ${_S:C@^(.*/):[^/:]+$@\1@}
+ __SUFFIX_TMP= `${ECHO_CMD} ${_S} | ${SED} "s@^(.*/):[^/:]+$@\1@"`
+ _MASTER_SITES_DEFAULT= ${_MASTER_SITES_DEFAULT} ${__SUFFIX_TMP}
fi
done
for _S in ${MASTER_SITE_SUBDIR}; do
@@ -30,12 +32,14 @@
exit 1
fi
if [ -n "${_MASTER_SITES_${_group}}" ] ; then
- _MASTER_SITE_SUBDIR_${_group}+= `${ECHO_CMD} ${_S} | ${SED} "s@^(.*)/:[^/:]+$@\1@"`
+ __SUFFIX_TMP= `${ECHO_CMD} ${_S} | ${SED} "s@^(.*)/:[^/:]+$@\1@"`
+ _MASTER_SITE_SUBDIR_${_group}= $${_MASTER_SITE_SUBDIR_${_group}} ${__SUFFIX_TMP}
fi
done
else
if [ -n "${_MASTER_SITES_DEFAULT}" ] ; then
- _MASTER_SITE_SUBDIR_DEFAULT+= `${ECHO_CMD} ${_S} | ${SED} "@^(.*)/:[^/:]+$@\1@"`
+ __SUFFIX_TMP= `${ECHO_CMD} ${_S} | ${SED} "@^(.*)/:[^/:]+$@\1@"`
+ _MASTER_SITE_SUBDIR_DEFAULT= ${_MASTER_SITE_SUBDIR_DEFAULT} ${__SUFFIX_TMP}
fi
fi
done
@@ -55,10 +59,11 @@
for site in $${_MASTER_SITES_${_group}}; do
_S_TEMP_TEMP= `${ECHO_CMD} ${site} | ${TR} ' ' '\n' | ${GREP} *%SUBDIR%/*`
if [ -z "${_S_TEMP_TEMP}" ] ; then
- MASTER_SITES_TMP+= ${site}
+ MASTER_SITES_TMP= ${MASTER_SITES_TMP} ${site}
else
for dir in $${_MASTER_SITE_SUBDIR_${_group}}; do
- MASTER_SITES_TMP+= `${ECHO_CMD} ${site} | ${SED} "s^%SUBDIR%^\${dir}^"`
+ __SUFFIX_TMP= `${ECHO_CMD} ${site} | ${SED} "s^%SUBDIR%^\${dir}^"
+ MASTER_SITES_TMP= ${MASTER_SITES_TM} ${__SUFFIX_TMP}
done
fi
done
@@ -77,10 +82,11 @@
for site in ${_MASTER_SITES_DEFAULT}; do
_S_TEMP_TEMP= `${ECHO_CMD} ${site} | ${TR} ' ' '\n' | ${GREP} *%SUBDIR%/*`
if [ -z "${_S_TEMP_TEMP}" ] ; then
- MASTER_SITES_TMP+= ${site}
+ MASTER_SITES_TMP= ${MASTER_SITES_TMP} ${site}
else
for dir in ${_MASTER_SITE_SUBDIR_DEFAULT}; do
- MASTER_SITES_TMP+= `${ECHO_CMD} ${site} | ${SED} "s^%SUBDIR%^\${dir}^"
+ __SUFFIX_TMP= `${ECHO_CMD} ${site} | ${SED} "s^%SUBDIR%^\${dir}^"`
+ MASTER_SITES_TMP= ${MASTER_SITES_TMP} ${__SUFFIX_TMP}
done
fi
done
@@ -113,7 +119,7 @@
if [ -d ${MOUNTPT}/ports/distfiles ] ; then
_MASTER_SITE_OVERRIDE:= file:${MOUNTPT}/ports/distfiles/${DIST_SUBDIR}/ ${_MASTER_SITE_OVERRIDE}
if [ -n "${FETCH_SYMLINK_DISTFILES}" ]; then
- FETCH_BEFORE_ARGS+= -l
+ FETCH_BEFORE_ARGS= ${FETCH_BEFORE_ARGS} -l
fi
fi
done
@@ -137,14 +143,15 @@
if [ -z "$$}_MASTER_SITES_${_group}}" ] ; then
_G_TEMP_TEMP= `${ECHO_CMD} ${_G_TEMP} | ${TR} ' ' '\n' | ${GREP} /${_group}/`
if [ -z "${_G_TEMP_TEMP}" ; then
- _G_TEMP+= ${_group}
- _MASTER_SITES_ALL+= $${_MASTER_SITES_${_group}}
+ _G_TEMP= ${_G_TEMP} ${_group}
+ _MASTER_SITES_ALL= ${_MASTER_SITES_ALL} $${_MASTER_SITES_${_group}}
fi
fi
done
- _DISTFILES+= `${ECHO_CMD} ${_D} | ${SED} "s/:[^:]+$//"`
+ __SUFFIX_TMP= `${ECHO_CMD} ${_D} | ${SED} "s/:[^:]+$//"`
+ _DISTFILES= ${_DISTFILE} ${__SUFFIX_TMP}
else
- _DISTFILES+= ${_D}
+ _DISTFILES= ${_DISTFILES} ${_D}
fi
done
_G_TEMP=
@@ -260,10 +267,12 @@
${ECHO_MSG} "used in group definitions. Please fix your PATCH_SITES"
exit 1
fi
- _PATCH_SITES_${_group}+= `${ECHO_CMD} ${_S} | ${SED} "s@^(.*/):[^/:]+$@\1@"`
+ __SUFFIX_TMP= `${ECHO_CMD} ${_S} | ${SED} "s@^(.*/):[^/:]+$@\1@"`
+ _PATCH_SITES_${_group}= $${_PATCH_SITES_${_group}} ${__SUFFIX_TMP}
done
else
- _PATCH_SITES_DEFAULT+= `${ECHO_CMD} ${_S} | ${SED} "s@^(.*/):[^/:]+$@\1@"`
+ __SUFFIX_TMP= `${ECHO_CMD} ${_S} | ${SED} "s@^(.*/):[^/:]+$@\1@"`
+ _PATCH_SITES_DEFAULT= ${_PATCH_SITES_DEFAULT} ${__SUFFIX_TMP}
fi
done
for _S in ${PATCH_SITE_SUBDIR}; do
@@ -278,12 +287,14 @@
exit 1
fi
if [ -n "${_PATCH_SITES_${_group}}" ] ; then
- _PATCH_SITE_SUBDIR_${_group}+= `${ECHO_CMD} ${_S} | ${SED} "s@^(.*)/:[^/:]+$@\1@"`
+ __SUFFIX_TMP= `${ECHO_CMD} ${_S} | ${SED} "s@^(.*)/:[^/:]+$@\1@"`
+ _PATCH_SITE_SUBDIR_${_group}= $${_PATCH_SITE_SUBDIR_${_group}} ${__SUFFIX_TMP}
fi
done
else
if [ -n "${_PATCH_SITES_DEFAULT}" ] ; then
- _PATCH_SITE_SUBDIR_DEFAULT+= `${ECHO_CMD} ${_S} | ${SED} "s@^(.*)/:[^/:]+$@\1@"`
+ __SUFFIX_TMP= `${ECHO_CMD} ${_S} | ${SED} "s@^(.*)/:[^/:]+$@\1@"`
+ _PATCH_SITE_SUBDIR_DEFAULT= ${_PATCH_SITE_SUBDIR_DEFAULT} ${__SUFFIX_TMP}
fi
fi
done
@@ -301,11 +312,12 @@
for site in $${_PATCH_SITES_${_group}}; do
_S_TEMP_TEMP= `${ECHO_CMD} ${site} | ${TR} ' ' '\n' | ${GREP} *%SUBDIR%/*`
if [ -z "${_S_TEMP_TEMP}" ] ; then
- PATCH_SITES_TMP+= ${site}
+ PATCH_SITES_TMP= ${PATCH_SITES_TMP} ${site}
else
for dir in $${_PATCH_SITE_SUBDIR_${_group}}; do
- PATCH_SITES_TMP+= `${ECHO_CMD} ${site} | ${SED} "s^%SUBDIR%^\${dir}^"`
- dine
+ __SUFFIX_TMP= `${ECHO_CMD} ${site} | ${SED} "s^%SUBDIR%^\${dir}^"`
+ PATCH_SITES_TMP= ${PATCH_SITES_TMP} ${__SUFFIX_TMP}
+ done
fi
done
fi
@@ -323,10 +335,11 @@
for site in ${_PATCH_SITES_DEFAULT}; do
_S_TEMP_TEMP= `${ECHO_CMD} ${site} | ${TR} ' ' '\n' | ${GREP} *%SUBDIR%/*`
if [ -z "${_S_TEMP_TEMP}" ] ; then
- PATCH_SITES_TMP+= ${site}
+ PATCH_SITES_TMP= ${PATCH_SITES_TMP} ${site}
else
for dir in ${_PATCH_SITE_SUBDIR_DEFAULT}; do
- PATCH_SITES_TMP+= `${ECHO_CMD} ${site} | ${SED} "s^%SUBDIR%^\${dir}^"`
+ __SUFFIX_TMP= `${ECHO_CMD} ${site} | ${SED} "s^%SUBDIR%^\${dir}^"`
+ PATCH_SITES_TMP= ${PATCH_SITES_TMP} ${__SUFFIX_TMP}
done
fi
done
@@ -346,14 +359,15 @@
if [ -z "$${_PATCH_SITES_${_group}}" ] ; then
_G_TEMP_TEMP= `${ECHO_CMD} ${_G_TEMP} | ${TR} ' ' '\n' | ${GREP} /${_group}/`
if [ -z "${_G_TEMP_TEMP}" ] ; then
- _G_TEMP+= ${_group}
- _PATCH_SITES_ALL+= $${_PATCH_SITES_${_group}}
+ _G_TEMP= ${_G_TEMP} ${_group}
+ _PATCH_SITES_ALL= ${_PATCH_SITES_ALL} $${_PATCH_SITES_${_group}}
fi
fi
done
- _PATCHFILES+= `${ECHO_CMD} ${_P} | ${SED} "s/:[^:]+$//"`
+ __SUFFIX_TMP= `${ECHO_CMD} ${_P} | ${SED} "s/:[^:]+$//"`
+ _PATCHFILES= ${_PATCHFILES} ${__SUFFIX_TMP}
else
- _PATCHFILES+= ${_P}
+ _PATCHFILES= ${_PATCHFILES} ${_P}
fi
done
for _S in ${PATCH_SITES}; do
More information about the p4-projects
mailing list