[pkgsrc/trunk]: pkgsrc/editors/Sigil editors/Sigil: Fix patch phase, Repack a...

[marino <marino%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/59e321e1605a
branches:  trunk
changeset: 607422:59e321e1605a
user:      marino <marino%pkgsrc.org@localhost>
date:      Sat Aug 11 17:34:04 2012 +0000

description:
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.

diffstat:

 editors/Sigil/distinfo                                          |   8 +-
 editors/Sigil/patches/patch-src_ZipArchive_DirEnumerator.cpp    |  22 +++---
 editors/Sigil/patches/patch-src_ZipArchive_ZipFile__stl.cpp     |  20 ++--
 editors/Sigil/patches/patch-src_ZipArchive_ZipPlatform__lnx.cpp |  36 +++++-----
 4 files changed, 43 insertions(+), 43 deletions(-)

diffs (121 lines):

diff -r b343fc1f307a -r 59e321e1605a editors/Sigil/distinfo
--- a/editors/Sigil/distinfo    Sat Aug 11 17:33:27 2012 +0000
+++ b/editors/Sigil/distinfo    Sat Aug 11 17:34:04 2012 +0000
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.17 2012/03/01 15:11:34 ryoon Exp $
+$NetBSD: distinfo,v 1.18 2012/08/11 17:34:04 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) = 1430a73cb771c77bd15fc32768a3accfd70ee28b
-SHA1 (patch-src_ZipArchive_ZipFile__stl.cpp) = d7db211cfd373a3d4ead90da67d0b9d445baa26f
-SHA1 (patch-src_ZipArchive_ZipPlatform__lnx.cpp) = 9d552417e86c77584b952bc07b06e75eaa02a68d
+SHA1 (patch-src_ZipArchive_DirEnumerator.cpp) = fd3bf1f77a3183e1a4205fba6578fe85b29a30d5
+SHA1 (patch-src_ZipArchive_ZipFile__stl.cpp) = f740a0454237ca45951d8b430cea3cba0ab9e917
+SHA1 (patch-src_ZipArchive_ZipPlatform__lnx.cpp) = 1412523a1a0aaf6446a82fc76b6c630b355983a1
diff -r b343fc1f307a -r 59e321e1605a editors/Sigil/patches/patch-src_ZipArchive_DirEnumerator.cpp
--- a/editors/Sigil/patches/patch-src_ZipArchive_DirEnumerator.cpp      Sat Aug 11 17:33:27 2012 +0000
+++ b/editors/Sigil/patches/patch-src_ZipArchive_DirEnumerator.cpp      Sat Aug 11 17:34:04 2012 +0000
@@ -1,15 +1,15 @@
-$NetBSD: patch-src_ZipArchive_DirEnumerator.cpp,v 1.2 2011/10/14 09:49:06 ryoon Exp $
+$NetBSD: patch-src_ZipArchive_DirEnumerator.cpp,v 1.3 2012/08/11 17:34:05 marino Exp $
 
 Add DragonFly support.
 
---- src/ZipArchive/DirEnumerator.cpp.orig      2011-10-14 18:30:31 +0000
+--- src/ZipArchive/DirEnumerator.cpp.orig      2012-02-25 10:54:10.000000000 +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 -r b343fc1f307a -r 59e321e1605a editors/Sigil/patches/patch-src_ZipArchive_ZipFile__stl.cpp
--- a/editors/Sigil/patches/patch-src_ZipArchive_ZipFile__stl.cpp       Sat Aug 11 17:33:27 2012 +0000
+++ b/editors/Sigil/patches/patch-src_ZipArchive_ZipFile__stl.cpp       Sat Aug 11 17:34:04 2012 +0000
@@ -1,15 +1,15 @@
-$NetBSD: patch-src_ZipArchive_ZipFile__stl.cpp,v 1.1 2011/10/14 09:49:07 ryoon Exp $
+$NetBSD: patch-src_ZipArchive_ZipFile__stl.cpp,v 1.2 2012/08/11 17:34:05 marino Exp $
 
 Add DragonFly support.
 
---- src/ZipArchive/ZipFile_stl.cpp.orig        2011-10-14 18:30:33 +0000
+--- src/ZipArchive/ZipFile_stl.cpp.orig        2012-02-25 10:54:10.000000000 +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 -r b343fc1f307a -r 59e321e1605a editors/Sigil/patches/patch-src_ZipArchive_ZipPlatform__lnx.cpp
--- a/editors/Sigil/patches/patch-src_ZipArchive_ZipPlatform__lnx.cpp   Sat Aug 11 17:33:27 2012 +0000
+++ b/editors/Sigil/patches/patch-src_ZipArchive_ZipPlatform__lnx.cpp   Sat Aug 11 17:34:04 2012 +0000
@@ -1,24 +1,24 @@
-$NetBSD: patch-src_ZipArchive_ZipPlatform__lnx.cpp,v 1.1 2011/10/14 09:49:07 ryoon Exp $
+$NetBSD: patch-src_ZipArchive_ZipPlatform__lnx.cpp,v 1.2 2012/08/11 17:34:05 marino Exp $
 
 Add DragonFly support.
 
---- src/ZipArchive/ZipPlatform_lnx.cpp.orig    2011-10-14 18:30:33 +0000
+--- src/ZipArchive/ZipPlatform_lnx.cpp.orig    2012-02-25 10:54:10.000000000 +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