Dejan Lesjak dejan.lesjak at
Fri May 11 07:24:37 UTC 2007

On Friday 11 of May 2007, Li-Lun Wang (Leland Wang) wrote:
> Hi,
> failed to merge on my 7.0-current.  It failed at the
> "Merge failed." part.  When I looked into the script I realized it
> tried to see whether there is anything other than "File exists" in
> ${errorfile} generated by tar to declare it successful or not.  In
> my ${errorfile}, in addition to the "File exists" line that
> wanted to ignore, there was a "tar: Error exit delayed
> from previous errors" line at the end.  I wonder if this line should
> also be ignored, since the "previous errors" are all ignored.

Yes it should be ignored as well. I don't have time to do it at this moment 
If everything got transferred to /usr/local; you should be able to finish it 
by manually deleting /usr/X11R6 directory and creating 
symlink /usr/X11R6 -> /usr/local. After that you can run the script again so 
it edits some files in /etc (it shouldn't touch /usr/X11R6 again if it is 


More information about the freebsd-x11 mailing list