diff options
| author | marino <marino@pkgsrc.org> | 2012-08-12 02:12:51 +0000 |
|---|---|---|
| committer | marino <marino@pkgsrc.org> | 2012-08-12 02:12:51 +0000 |
| commit | 0954acef0693f9763f477e3f3c053471c76a877c (patch) | |
| tree | 845326118b868bc8f4126e040803bfde019ae0d4 /editors/Sigil/Makefile | |
| parent | 0e428e9a07ab013306d8d6ed389444e21fe1dfcf (diff) | |
| download | pkgsrc-0954acef0693f9763f477e3f3c053471c76a877c.tar.gz | |
editors/Sigil: Return patches to unix CR; use another method
Some platforms will automatically convert DOS endings to unix endings
during the extraction of a zip file. Those that do this can't use
patches with DOS endings, so revert the last commit.
Instead, copy textproc/FlightCrew package's method:
For each file that will be patched, strip any DOS endings found after
extraction. If they've already been stripped out, that's fine. It
guarantees that every platform will strip the target files at least
once, allowing all of them to use Unix line-ending patches.
Diffstat (limited to 'editors/Sigil/Makefile')
| -rw-r--r-- | editors/Sigil/Makefile | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/editors/Sigil/Makefile b/editors/Sigil/Makefile index f4e3b24a3b8..a81e35168e8 100644 --- a/editors/Sigil/Makefile +++ b/editors/Sigil/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.31 2012/07/02 13:37:37 adam Exp $ +# $NetBSD: Makefile,v 1.32 2012/08/12 02:12:51 marino Exp $ # DISTNAME= Sigil-0.5.3-Code @@ -27,6 +27,14 @@ BUILDLINK_TRANSFORM+= l:BoostParts:boost_date_time:boost_filesystem:boost_regex: BUILDLINK_TRANSFORM+= l:Xerces:xerces-c BUILDLINK_TRANSFORM+= l:zlib:z +SUBST_CLASSES+= d2u +SUBST_STAGE.d2u= post-extract +SUBST_MESSAGE.d2u= Removing CR end-of-line markers. +SUBST_FILES.d2u= src/ZipArchive/DirEnumerator.cpp +SUBST_FILES.d2u+= src/ZipArchive/ZipFile_stl.cpp +SUBST_FILES.d2u+= src/ZipArchive/ZipPlatform_lnx.cpp +SUBST_FILTER_CMD.d2u= ${TR} -d '\r' + .include "../../mk/compiler.mk" # GCC 4.4 and above needs this .if !empty(PKGSRC_COMPILER:Mgcc) && !empty(CC_VERSION:Mgcc-4.[4-9]*) |