X-Spam-Check-By:	sourceware.org
Message-ID:	<459D64FE.1060006@t-online.de>
Date:	Thu, 04 Jan 2007 21:35:10 +0100
From:	Christian Franke <Christian DOT Franke AT t-online DOT de>
User-Agent:	Mozilla/5.0 (Windows; U; Windows NT 5.1; en-US; rv:1.8.0.7) Gecko/20060910 SeaMonkey/1.0.5
MIME-Version:	1.0
To:	cygwin AT cygwin DOT com
Subject:	cygport patch: Add PATCHOPTS
X-ID:	GQO7KqZYge9xJDqsHoyMXFGKazK+PlkajPTFeQAeKgJGs0fswrFDY-
X-TOI-MSGID:	1b495851-31a5-4c30-8e5a-22816a57903f
X-IsSubscribed:	yes
Mailing-List:	contact cygwin-help AT cygwin DOT com; run by ezmlm
List-Id:	<cygwin.cygwin.com>
List-Subscribe:	<mailto:cygwin-subscribe AT cygwin DOT com>
List-Archive:	<http://sourceware.org/ml/cygwin/>
List-Post:	<mailto:cygwin AT cygwin DOT com>
List-Help:	<mailto:cygwin-help AT cygwin DOT com>, <http://sourceware.org/ml/#faqs>
Sender:	cygwin-owner AT cygwin DOT com
Mail-Followup-To:	cygwin AT cygwin DOT com
Delivered-To:	mailing list cygwin AT cygwin DOT com

--------------010203030209010706040104
Content-Type: text/plain; charset=ISO-8859-1; format=flowed
Content-Transfer-Encoding: 7bit

The attached patch adds the ability to pass patch options to cygport 
prep command.

Example: Set original timestamps from patch file (like g-b-s does):

PATCHOPTS+="-Z"

Christian


--------------010203030209010706040104
Content-Type: text/plain;
 name="cygport-patchopts.patch.txt"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline;
 filename="cygport-patchopts.patch.txt"

diff -ur origsrc/cygport-0.2.7/bin/cygport.in src/cygport-0.2.7/bin/cygport.in
--- origsrc/cygport-0.2.7/bin/cygport.in	2006-12-25 06:42:04.000000000 +0100
+++ src/cygport-0.2.7/bin/cygport.in	2007-01-04 21:12:28.109375000 +0100
@@ -529,10 +529,10 @@
 
 		while (( patchlevel <= 3 ))
 		do
-			if patch -N -s --dry-run -p${patchlevel} -i ${patchfile} &> /dev/null
+			if patch ${PATCHOPTS} -s --dry-run -p${patchlevel} -i ${patchfile} &> /dev/null
 			then
 				inform "applying patch ${patchfile##*/}:";
-				patch -N -p${patchlevel} -i ${patchfile} || error "patch ${patchfile##*/} failed"
+				patch ${PATCHOPTS} -p${patchlevel} -i ${patchfile} || error "patch ${patchfile##*/} failed"
 				break;
 			else
 				if (( patchlevel == 3 ))
@@ -1558,6 +1558,7 @@
 declare -x F77FLAGS="-O2 -pipe ";
 declare -x GCJFLAGS="-O2 -pipe ";
 declare -x LDFLAGS="";
+declare    PATCHOPTS="-N "
 declare    MAKEOPTS="-j2 "
 
 source ${_privdatadir}/mirrors || warning "could not read mirrors file"


--------------010203030209010706040104
Content-Type: text/plain; charset=us-ascii

--
Unsubscribe info:      http://cygwin.com/ml/#unsubscribe-simple
Problem reports:       http://cygwin.com/problems.html
Documentation:         http://cygwin.com/docs.html
FAQ:                   http://cygwin.com/faq/
--------------010203030209010706040104--

- Raw text -