On Thursday, October 6, 2011 23:35 CEST, Stuart Cassoff <[email protected]> wrote: 
 
> Simple upgrade, drop a couple of patches since some stuff went upstream.

the patch doesn't seem to apply correctly:

|Index: lang/tcl/8.5/patches/patch-tests_safe_test
|===================================================================
|RCS file: lang/tcl/8.5/patches/patch-tests_safe_test
|diff -N lang/tcl/8.5/patches/patch-tests_safe_test
|--- lang/tcl/8.5/patches/patch-tests_safe_test 5 Jan 2011 16:13:53 -0000       
1.1
|+++ /dev/null  1 Jan 1970 00:00:00 -0000
--------------------------
Patching file lang/tcl/8.5/patches/patch-tests_safe_test using Plan A...
Empty context always matches.
Hunk #1 failed at 0.
1 out of 1 hunks failed--saving rejects to 
lang/tcl/8.5/patches/patch-tests_safe_test.rej
Hmm...  The next patch looks like a unified diff to me...
The text leading up to this was:
--------------------------


|Index: lang/tcl/8.5/patches/patch-unix_Makefile_in
|===================================================================
|RCS file: /cvs/ports/lang/tcl/8.5/patches/patch-unix_Makefile_in,v
|retrieving revision 1.5
|diff -u -p -r1.5 patch-unix_Makefile_in
|--- lang/tcl/8.5/patches/patch-unix_Makefile_in        5 Jan 2011 16:13:53 
-0000       1.5
|+++ lang/tcl/8.5/patches/patch-unix_Makefile_in        6 Oct 2011 21:14:40 
-0000
--------------------------
Patching file lang/tcl/8.5/patches/patch-unix_Makefile_in using Plan A...
Hunk #1 succeeded at 1.
Hunk #2 succeeded at 12.
Hunk #3 succeeded at 31.
Hunk #4 failed at 58.
Hunk #5 succeeded at 95.
1 out of 5 hunks failed--saving rejects to 
lang/tcl/8.5/patches/patch-unix_Makefile_in.rej
Hmm...  The next patch looks like a unified diff to me...
The text leading up to this was:
--------------------------

ignoring above, and emptying patch-tests_safe_test, it then fails with make 
patch:
1 out of 6 hunks failed--saving rejects to unix/Makefile.in.rej
***>   patch-unix_Makefile_in did not apply cleanly

Sebastian

Reply via email to