BUG: py-pcapy patch fails

[janakj@…]

When trying to install py-pcapy, I get the following error:

--->  Applying patches to py-pcapy
--->  Applying /opt/local/var/db/dports/sources/rsync.rsync.darwinports.org_dpupdate_dports/python/py-pcapy/files/patch-setup.py
patching file setup.py
Hunk #1 FAILED at 6.
1 out of 1 hunk FAILED -- saving rejects to file setup.py.rej
Error: Target com.apple.patch returned: shell command "cd "/opt/local/var/db/dports/build/_opt_local_var_db_dports_sources_rsync.rsync.darwinports.org_dpupdate_dports_python_py-pcapy/work/pcapy-0.10.4" && patch -p0 < "/opt/local/var/db/dports/sources/rsync.rsync.darwinports.org_dpupdate_dports/python/py-pcapy/files/patch-setup.py"" returned error 1
Command output: patching file setup.py
Hunk #1 FAILED at 6.
1 out of 1 hunk FAILED -- saving rejects to file setup.py.rej

Warning: the following items did not execute (for py-pcapy): com.apple.patch
Error: Status 1 encountered during processing.
$

It appears that the patchfile, while correct, may have CR/LF issues. I built a new patchfile and diff shows the two as different, even though the content is the same. I'd be happy to submit the new patchfile, just let me know how.

Regards,

--janak

[markd@…]

Fixed broken patch.

[markd@…]

It isn't fixed after all.

[markd@…]

I'm having seriously weird patch issues. It is line feed problems but I don't understand how they are cropping up in my new patches. Can you submit yours so I can try them?

[markd@…]

Committed a fix as revision 1.