Subject: Re: pkg/32867 (pkgsrc/wip/jdk14 patch fails)
To: None <,,,>
From: None <>
List: pkgsrc-bugs
Date: 02/18/2006 22:49:40
Synopsis: pkgsrc/wip/jdk14 patch fails

State-Changed-From-To: open->closed
State-Changed-When: Sat, 18 Feb 2006 22:49:39 +0000
The patch stage was broken on pkgsrc-HEAD in the same way a couple of weeks 
ago.  This was caused by ^M (Carriage Return) characters in the Eyesbeyond 
patchset.  Since the wip/jdk14 package itself didn't change, it must have been
some change in the pkgsrc infrastructure which caused this failure (I still
haven't figured out what exactly broke it).  I then committed a simple
workaround for this: SUBST the ^M characters out of the patchset before
applying the patches.  

Apparantly this broke it on pkgsrc-2005Q4 systems (which were ok before) in
turn.  Your patch (add -a to unzip's arguments) fixes it when combined with my
earlier fix, so now it works on both pkgsrc-2005Q4 and pkgsrc-HEAD.  Thanks for
the patch!  

I will probably remove this again when pkgsrc-2006Q1 is branched (and
pkgsrc-2005Q4 becomes obsolete), or when patchset-9 is released (because Greg
is aware of the problem, the CR characters will be removed in the next
Eyesbeyond patchset release).