On Sat, Aug 11, 2012 at 05:34:05PM +0000, John Marino wrote:
Module Name: pkgsrc
Committed By: marino
Date: Sat Aug 11 17:34:05 UTC 2012
Modified Files:
pkgsrc/editors/Sigil: distinfo
pkgsrc/editors/Sigil/patches: patch-src_ZipArchive_DirEnumerator.cpp
patch-src_ZipArchive_ZipFile__stl.cpp
patch-src_ZipArchive_ZipPlatform__lnx.cpp
Log Message:
editors/Sigil: Fix patch phase, Repack all patches
Sigil is delivered in a zip file, and the files have DOS line endings.
The patches had unix line endings, and at least on some platforms
including NetBSD 5, this resulted in rejected hunks.
All three patches repacked, now contain DOS line endings and work fine.
This is no general solution either; on NetBSD-6.99.10/amd64 I now get:
Also note that:
./extract/extract: : ${EXTRACT_OPTS_ZIP=-aqo}
where
-a When extracting a text file, convert DOS-style line endings
to Unix-style line endings.
so the files should already extract to Unix-style line endings.
Some unzips might need "-aa" instead to force this conversion.
Thomas