patch problem with new port

[Paul Schmehl]

I need to create some patches for some ports I'm working on, but there's a 
problem.

Here's an example.  I need to change "wish" to "wish8.3":

This is an excerpt from the original file:
#!/bin/sh
# Run wish from users PATH \
exec wish "$0" "$@"

# $Id: sguil.tk,v 1.157 2004/12/06 21:18:21 bamm Exp $ #

####################################################################
# Sguil - A tcl/tk interface for network security monitoring       #
####################################################################

This is what I need:
#!/bin/sh
# Run wish from users PATH \
exec wish8.3 "$0" "$@"

# $Id: sguil.tk,v 1.157 2004/12/06 21:18:21 bamm Exp $ #

####################################################################
# Sguil - A tcl/tk interface for network security monitoring       #
####################################################################

The problem is, even if I use -C1 with diff, I *still* end up with the $Id 
line included in the patchfile, and that's illegal.  It will break the 
patch when the port is committed.

Is there a way around this problem?  I have several files that all need to 
be patched this way - both wish and tclsh are used in them.

Paul Schmehl (pauls at utdallas.edu)
Adjunct Information Security Officer
University of Texas at Dallas
AVIEN Founding Member
http://www.utdallas.edu/ir/security/