Changeset 410

Timestamp:

07/25/06 15:27:51 (2 years ago)

Author:

tg

Message:

if ${WRKSRC}/.patched-newfiles was not created by the
prepare target of the original extraction (i.e. the
pre-existing diffs did not patch any new files into
existence), quell generation of patch files for files
which exist in ${WRKSRC} but do not exist in the
distfile

this quells creation of stuff like patch-deflate_o
in zlib after running a compile (although there are
still fallouts: patch-Makefile and patch-zconf_h,
which will only be not generated if WRKBUILD!=WRKSRC)

new policy (from OpenBSD ports): do not patch any
files into existence, use the ./extra facility instead.

Files:

• trunk/freewrt/scripts/update-patches (modified) (1 diff)

trunk/freewrt/scripts/update-patches

@@ -75 +75 @@
-    (cd $WRKDIST; pax -rw -0 -d $ORGDIST/) >/dev/null 2>&1
-
+if [[ -e $WRKDIST/.patched-newfiles ]]; then
+        touch $ORGDIST/.patched-newfiles
+        patch_newfiles=1
+else
+        patch_newfiles=0
+fi
+
-DIFF_FLAGS="-adu -I \"^--- $(echo $D_SUB.orig/ | $TRANSFORM)@@  .*\""
-DIFF_FLAGS="$DIFF_FLAGS -I \"^\+\+\+ $(echo $D_SUB/ | $TRANSFORM)@@     .*\""
-
-for file in $(cd ${WRKDIST}; find . -type f | sed 's#^\./##'); do
+        [[ ! -e $ORGDIST/$file && $patch_newfiles = 0 ]] && continue
-        cmp -s "$ORGDIST/$file" "$WRKDIST/$file" && continue
-        echo "Processing ${file}..." >&2