Re: pkg/43656: patches of files with DOS CR/LF

[Stefan Schaeckeler <schaecsn%gmx.net@localhost>]

>  > Anyone else having the same problem?
>  
>  I didn't test building/patching, but I indeed did see the ^M/CR in the
>  patch-ac file.  I checked if that wasn't an issue in the other files of
>  that package, and the others seem fine even if they were updated around
>  the same time.

Shortened output:

--- snip ---
#  PATCH_DEBUG=1 PATH=/usr/current/bin:/usr/current/sbin:$PATH bmake patch
:
:
===> Patching for libmatroska-1.0.0
=> Applying pkgsrc patches for libmatroska-1.0.0
=> Verifying /usr/current/pkgsrc/multimedia/libmatroska/patches/patch-ac
=> Applying pkgsrc patch 
/usr/current/pkgsrc/multimedia/libmatroska/patches/patch-ac
(Stripping trailing CRs from patch.)
patching file make/linux/Makefile
Hunk #1 FAILED at 16.
Hunk #2 FAILED at 53.
Hunk #3 FAILED at 92.
Hunk #4 FAILED at 151.
4 out of 4 hunks FAILED -- saving rejects to file make/linux/Makefile.rej
Patch /usr/current/pkgsrc/multimedia/libmatroska/patches/patch-ac failed
ERROR: Patching failed due to modified or broken patch file(s):
ERROR:  /usr/current/pkgsrc/multimedia/libmatroska/patches/patch-ac
*** Error code 1
--- snip ---


Maybe the problem has to do with the automatic "Stripping trailing CRs from 
patch."

Both patch programs, slackware's patch program as well as pkgsrc's patch 
program in usr/current/bin, are version 2.5.4.

 Stefan