diff options
-rw-r--r-- | editors/Sigil/Makefile | 10 | ||||
-rw-r--r-- | editors/Sigil/distinfo | 8 | ||||
-rw-r--r-- | editors/Sigil/patches/patch-src_ZipArchive_DirEnumerator.cpp | 22 | ||||
-rw-r--r-- | editors/Sigil/patches/patch-src_ZipArchive_ZipFile__stl.cpp | 20 | ||||
-rw-r--r-- | editors/Sigil/patches/patch-src_ZipArchive_ZipPlatform__lnx.cpp | 36 |
5 files changed, 52 insertions, 44 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]*) diff --git a/editors/Sigil/distinfo b/editors/Sigil/distinfo index d859b6098ea..7b205622262 100644 --- a/editors/Sigil/distinfo +++ b/editors/Sigil/distinfo @@ -1,8 +1,8 @@ -$NetBSD: distinfo,v 1.18 2012/08/11 17:34:04 marino Exp $ +$NetBSD: distinfo,v 1.19 2012/08/12 02:12:51 marino Exp $ SHA1 (Sigil-0.5.3-Code.zip) = e43861b2979f11e2abefedad454623e2685c781f RMD160 (Sigil-0.5.3-Code.zip) = cb400fec5b2453a2cd076c1821e2962df7d011c8 Size (Sigil-0.5.3-Code.zip) = 12843490 bytes -SHA1 (patch-src_ZipArchive_DirEnumerator.cpp) = fd3bf1f77a3183e1a4205fba6578fe85b29a30d5 -SHA1 (patch-src_ZipArchive_ZipFile__stl.cpp) = f740a0454237ca45951d8b430cea3cba0ab9e917 -SHA1 (patch-src_ZipArchive_ZipPlatform__lnx.cpp) = 1412523a1a0aaf6446a82fc76b6c630b355983a1 +SHA1 (patch-src_ZipArchive_DirEnumerator.cpp) = 1430a73cb771c77bd15fc32768a3accfd70ee28b +SHA1 (patch-src_ZipArchive_ZipFile__stl.cpp) = d7db211cfd373a3d4ead90da67d0b9d445baa26f +SHA1 (patch-src_ZipArchive_ZipPlatform__lnx.cpp) = 9d552417e86c77584b952bc07b06e75eaa02a68d diff --git a/editors/Sigil/patches/patch-src_ZipArchive_DirEnumerator.cpp b/editors/Sigil/patches/patch-src_ZipArchive_DirEnumerator.cpp index ce3df30f68d..ae722f3e315 100644 --- a/editors/Sigil/patches/patch-src_ZipArchive_DirEnumerator.cpp +++ b/editors/Sigil/patches/patch-src_ZipArchive_DirEnumerator.cpp @@ -1,15 +1,15 @@ -$NetBSD: patch-src_ZipArchive_DirEnumerator.cpp,v 1.3 2012/08/11 17:34:05 marino Exp $ +$NetBSD: patch-src_ZipArchive_DirEnumerator.cpp,v 1.4 2012/08/12 02:12:51 marino Exp $ Add DragonFly support. ---- src/ZipArchive/DirEnumerator.cpp.orig 2012-02-25 10:54:10.000000000 +0000 +--- src/ZipArchive/DirEnumerator.cpp.orig 2011-10-14 18:30:31 +0000 +++ src/ZipArchive/DirEnumerator.cpp -@@ -73,7 +73,7 @@ bool CDirEnumerator::Start(CFileFilter& - if (!entry)
- break;
- CZipString path(m_szCurrentDirectory + entry->d_name);
-- #if !defined __APPLE__ && !defined __CYGWIN__ && !defined __NetBSD__
-+ #if !defined __APPLE__ && !defined __CYGWIN__ && !defined __NetBSD__ && !defined __DragonFly__
- struct stat64 sStats;
- if (stat64(path, &sStats) == -1)
- #else
+@@ -73,7 +73,7 @@ bool CDirEnumerator::Start(CFileFilter& + if (!entry) + break; + CZipString path(m_szCurrentDirectory + entry->d_name); +- #if !defined __APPLE__ && !defined __CYGWIN__ && !defined __NetBSD__ ++ #if !defined __APPLE__ && !defined __CYGWIN__ && !defined __NetBSD__ && !defined __DragonFly__ + struct stat64 sStats; + if (stat64(path, &sStats) == -1) + #else diff --git a/editors/Sigil/patches/patch-src_ZipArchive_ZipFile__stl.cpp b/editors/Sigil/patches/patch-src_ZipArchive_ZipFile__stl.cpp index baa8e2a8e8b..2de5721a535 100644 --- a/editors/Sigil/patches/patch-src_ZipArchive_ZipFile__stl.cpp +++ b/editors/Sigil/patches/patch-src_ZipArchive_ZipFile__stl.cpp @@ -1,15 +1,15 @@ -$NetBSD: patch-src_ZipArchive_ZipFile__stl.cpp,v 1.2 2012/08/11 17:34:05 marino Exp $ +$NetBSD: patch-src_ZipArchive_ZipFile__stl.cpp,v 1.3 2012/08/12 02:12:51 marino Exp $ Add DragonFly support. ---- src/ZipArchive/ZipFile_stl.cpp.orig 2012-02-25 10:54:10.000000000 +0000 +--- src/ZipArchive/ZipFile_stl.cpp.orig 2011-10-14 18:30:33 +0000 +++ src/ZipArchive/ZipFile_stl.cpp @@ -16,7 +16,7 @@ -
- #if (defined _ZIP_IMPL_STL && (!defined _ZIP_FILE_IMPLEMENTATION || _ZIP_FILE_IMPLEMENTATION == ZIP_ZFI_DEFAULT)) || _ZIP_FILE_IMPLEMENTATION == ZIP_ZFI_STL
-
--#if defined __APPLE__ || defined __CYGWIN__ || defined __NetBSD__
-+#if defined __APPLE__ || defined __CYGWIN__ || defined __NetBSD__ || defined __DragonFly__
- #define FILE_FUNCTIONS_64B_BY_DEFAULT
- #else
- #undef FILE_FUNCTIONS_64B_BY_DEFAULT
+ + #if (defined _ZIP_IMPL_STL && (!defined _ZIP_FILE_IMPLEMENTATION || _ZIP_FILE_IMPLEMENTATION == ZIP_ZFI_DEFAULT)) || _ZIP_FILE_IMPLEMENTATION == ZIP_ZFI_STL + +-#if defined __APPLE__ || defined __CYGWIN__ || defined __NetBSD__ ++#if defined __APPLE__ || defined __CYGWIN__ || defined __NetBSD__ || defined __DragonFly__ + #define FILE_FUNCTIONS_64B_BY_DEFAULT + #else + #undef FILE_FUNCTIONS_64B_BY_DEFAULT diff --git a/editors/Sigil/patches/patch-src_ZipArchive_ZipPlatform__lnx.cpp b/editors/Sigil/patches/patch-src_ZipArchive_ZipPlatform__lnx.cpp index 7d2c2e0ae94..4b12e38192a 100644 --- a/editors/Sigil/patches/patch-src_ZipArchive_ZipPlatform__lnx.cpp +++ b/editors/Sigil/patches/patch-src_ZipArchive_ZipPlatform__lnx.cpp @@ -1,24 +1,24 @@ -$NetBSD: patch-src_ZipArchive_ZipPlatform__lnx.cpp,v 1.2 2012/08/11 17:34:05 marino Exp $ +$NetBSD: patch-src_ZipArchive_ZipPlatform__lnx.cpp,v 1.3 2012/08/12 02:12:51 marino Exp $ Add DragonFly support. ---- src/ZipArchive/ZipPlatform_lnx.cpp.orig 2012-02-25 10:54:10.000000000 +0000 +--- src/ZipArchive/ZipPlatform_lnx.cpp.orig 2011-10-14 18:30:33 +0000 +++ src/ZipArchive/ZipPlatform_lnx.cpp @@ -16,7 +16,7 @@ -
- #ifdef _ZIP_SYSTEM_LINUX
-
--#if defined __APPLE__ || defined __CYGWIN__ || defined __NetBSD__
-+#if defined __APPLE__ || defined __CYGWIN__ || defined __NetBSD__ || defined __DragonFly__
- #define FILE_FUNCTIONS_64B_BY_DEFAULT
- #else
- #undef FILE_FUNCTIONS_64B_BY_DEFAULT
+ + #ifdef _ZIP_SYSTEM_LINUX + +-#if defined __APPLE__ || defined __CYGWIN__ || defined __NetBSD__ ++#if defined __APPLE__ || defined __CYGWIN__ || defined __NetBSD__ || defined __DragonFly__ + #define FILE_FUNCTIONS_64B_BY_DEFAULT + #else + #undef FILE_FUNCTIONS_64B_BY_DEFAULT @@ -34,7 +34,7 @@ -
- #include <sys/types.h>
-
--#if defined (__FreeBSD__) || defined (__APPLE__) || defined (__NetBSD__)
-+#if defined (__FreeBSD__) || defined (__APPLE__) || defined (__NetBSD__) || defined (__DragonFly__)
- #include <sys/param.h>
- #include <sys/mount.h>
- #else
+ + #include <sys/types.h> + +-#if defined (__FreeBSD__) || defined (__APPLE__) || defined (__NetBSD__) ++#if defined (__FreeBSD__) || defined (__APPLE__) || defined (__NetBSD__) || defined (__DragonFly__) + #include <sys/param.h> + #include <sys/mount.h> + #else |