summaryrefslogtreecommitdiff
path: root/Tools
diff options
context:
space:
mode:
authorKris Kennaway <kris@FreeBSD.org>2004-11-25 00:06:02 +0000
committerKris Kennaway <kris@FreeBSD.org>2004-11-25 00:06:02 +0000
commite5e059c3d8610d3f0faf78743844de868067e289 (patch)
tree788286bcc316da641655cfd425e8d2e5bdc00122 /Tools
parentNew port kde-icons-gartoon-svg version 1.3: KDE Gartoon SVG iconset (diff)
Rework the -incremental support slightly; this should now be robust enough
to use.
Notes
Notes: svn path=/head/; revision=122360
Diffstat (limited to 'Tools')
-rwxr-xr-xTools/portbuild/scripts/dopackages8
1 files changed, 5 insertions, 3 deletions
diff --git a/Tools/portbuild/scripts/dopackages b/Tools/portbuild/scripts/dopackages
index 088121717abe..2b3776bd9ead 100755
--- a/Tools/portbuild/scripts/dopackages
+++ b/Tools/portbuild/scripts/dopackages
@@ -404,8 +404,8 @@ if [ "$skipstart" = 0 ]; then
cd ${PORTSDIR}
# Identify the ports that have changed and need to be removed before rebuilding
- cut -f 1,2,3,8,9 -d \| ${INDEXFILE}.old | sort > ${INDEXFILE}.old1
- cut -f 1,2,3,8,9 -d \| ${INDEXFILE} | sort > ${INDEXFILE}.1
+ cut -f 1,2,3,8,9,11,12,13 -d \| ${INDEXFILE}.old | sort > ${INDEXFILE}.old1
+ cut -f 1,2,3,8,9,11,12,13 -d \| ${INDEXFILE} | sort > ${INDEXFILE}.1
comm -2 -3 ${INDEXFILE}.old1 ${INDEXFILE}.1 | cut -f 1 -d \| > ${pb}/${arch}/${branch}/.oldports
echo "Removing $(wc -l ${pb}/${arch}/${branch}/.oldports) packages in preparation for incremental build"
@@ -417,11 +417,13 @@ if [ "$skipstart" = 0 ]; then
cd ${pb}/${arch}/${branch}/errors/
sed "s,\$,.log," ${pb}/${arch}/${branch}/.oldports | xargs rm -f
- find . -name \*.log.bz2 -delete
+ sed "s,\$,.log.bz2," ${pb}/${arch}/${branch}/.oldports | xargs rm -f
+ find . -name \*.log.bz2 | xargs bunzip2 -f
cd ${pb}/${arch}/${branch}/logs/
sed 's,$,.log,' ${pb}/${arch}/${branch}/.oldports | xargs rm -f
sed 's,$,.log.bz2,' ${pb}/${arch}/${branch}/.oldports | xargs rm -f
+ find . -name \*.log.bz2 | xargs bunzip2 -f
else
# need to preserve symlinks for packages
mv -f packages bak