A simple script to magically update-patches.

It's a fair attempt at trying to match actual changed files
with the patchdir, and invent new patch file names.

There are a few things it doesn't do yet, such as dealing with
patch files with multiple patches, or dealing with context diffs.

Just watch out when you use it for the first time on a port, verify
you don't lose or duplicate patches.

I've been using this to update large ports recently, and it seemed too
good not to give it to other porters.

Approved by turan@

infrastructure/build/update-patches

@@ -0,0 +1,101 @@
+#!/bin/sh
+
+# $OpenBSD: update-patches,v 1.1 2000/04/19 11:16:27 espie Exp $
+# Copyright (c) 2000
+# Marc Espie.  All rights reserved.
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+# 1. Redistributions of code must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+# 2. Neither the name of OpenBSD nor the names of its contributors
+#    may be used to endorse or promote products derived from this software
+#    without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY ITS AUTHOR AND THE OpenBSD project ``AS IS'' AND
+# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+# ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+# SUCH DAMAGE.
+
+# Find out all .orig files and strip the name to what diff will use
+find $WRKDIST -type f -name '*.orig' | fgrep -v $DISTORIG | \
+sed -e "s,^$WRKDIST/\(.*\)\.orig\$,\1," | {
+while read file 
+do
+    echo 1>&2 "Processing $file"
+    # look in patchdir for an existing patchfile matching this
+    cd $PATCHDIR
+    for i in ${PATCH_LIST}
+    do
+	# Ignore non-files, or old backup
+	[ -f $i ] || continue
+	case $i in \
+	*.orig|*.rej|*~) ;;
+	*) # Patch found. Is this the one ?
+	    if grep "^--- $file.orig" $i >/dev/null
+	    then
+		accounted="$accounted $i"
+		# found it, splice before diff part with diff
+		esc=`echo $file | sed -e 's,/,\\\\/,g'`
+		{ sed -e "/^--- $esc.orig/,\$ d" <$i
+		    (cd $WRKDIST && diff ${DIFF_ARGS} -u -p $file.orig $file) } >$i.new
+		# did it change ? mark it as changed
+		if diff ${DIFF_ARGS} -u --ignore-matching-lines="^--- $file.orig	.*" \
+		    --ignore-matching-lines="^+++ $file	.*" $i $i.new 1>&2
+		then
+		    rm $i.new
+		else
+		    echo 1>&2 "Patch $i for $file updated"
+		    mv $i $i.orig
+		    mv $i.new $i
+		    edit="$edit $i"
+		fi
+		continue 2
+	    fi;;
+	esac
+    done
+    # Build a sensible name for the patch file
+    patchname=patch-`echo $file|sed -e s,[/.],_,g`
+    echo 1>&2 "No patch-* found for $file, creating $patchname"
+    { echo '$OpenBSD: update-patches,v 1.1 2000/04/19 11:16:27 espie Exp $'; (cd $WRKDIST && diff ${DIFF_ARGS} -u -p $file.orig $file) } >$patchname
+    edit="$edit $patchname"
+    accounted="$accounted $patchname"
+done
+
+# Verify all patches accounted for
+for i in *
+do
+    [ -f $i ] || continue
+    case $i in \
+    *.orig|*.rej|*~) ;;
+    *)
+	for j in $accounted 
+	do
+	    if [ $j = $i ]
+	    then
+		continue 2
+	    fi
+	done
+	echo 1>&2 "*** Patch $i not accounted for.";;
+    esac
+done
+
+# Check for $Id: update-patches,v 1.1 2000/04/19 11:16:27 espie Exp $ and similar bugs in all those patch files.
+for i in $accounted
+do
+    if sed -e '/1,^---/ d' $i|grep '$(Id|OpenBSD'
+    then
+	    echo 1>&2 "Problem with $i: CVS tag found in patch"
+    fi
+done
+
+echo $edit
+}
+exit 0