From owner-freebsd-ports@FreeBSD.ORG  Tue Jul 19 18:02:00 2005
Return-Path: <owner-freebsd-ports@FreeBSD.ORG>
X-Original-To: ports@freebsd.org
Delivered-To: freebsd-ports@FreeBSD.ORG
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 515E216A41F
	for <ports@freebsd.org>; Tue, 19 Jul 2005 18:02:00 +0000 (GMT)
	(envelope-from pauls@utdallas.edu)
Received: from smtp1.utdallas.edu (smtp1.utdallas.edu [129.110.10.12])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 13E0C43D46
	for <ports@freebsd.org>; Tue, 19 Jul 2005 18:01:59 +0000 (GMT)
	(envelope-from pauls@utdallas.edu)
Received: from utd59514.utdallas.edu (utd59514.utdallas.edu [129.110.3.28])
	by smtp1.utdallas.edu (Postfix) with ESMTP id A8C06388D13
	for <ports@freebsd.org>; Tue, 19 Jul 2005 13:01:59 -0500 (CDT)
Date: Tue, 19 Jul 2005 13:01:59 -0500
From: Paul Schmehl <pauls@utdallas.edu>
To: ports@freebsd.org
Message-ID: <7EA964ADB15B6C3F4E521554@utd59514.utdallas.edu>
X-Mailer: Mulberry/3.1.6 (Linux/x86)
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii; format=flowed
Content-Transfer-Encoding: 7bit
Content-Disposition: inline
Cc: 
Subject: patch problem with new port
X-BeenThere: freebsd-ports@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Porting software to FreeBSD <freebsd-ports.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-ports>,
	<mailto:freebsd-ports-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-ports>
List-Post: <mailto:freebsd-ports@freebsd.org>
List-Help: <mailto:freebsd-ports-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-ports>,
	<mailto:freebsd-ports-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 19 Jul 2005 18:02:00 -0000

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@utdallas.edu)
Adjunct Information Security Officer
University of Texas at Dallas
AVIEN Founding Member
http://www.utdallas.edu/ir/security/