diff options
| -rw-r--r-- | editors/Sigil/Makefile | 13 | ||||
| -rw-r--r-- | editors/Sigil/PLIST | 43 | ||||
| -rw-r--r-- | editors/Sigil/distinfo | 12 | ||||
| -rw-r--r-- | editors/Sigil/patches/patch-src_ZipArchive_DirEnumerator.cpp | 15 | ||||
| -rw-r--r-- | editors/Sigil/patches/patch-src_ZipArchive_ZipFile__stl.cpp | 15 | ||||
| -rw-r--r-- | editors/Sigil/patches/patch-src_ZipArchive_ZipPlatform__lnx.cpp | 24 | ||||
| -rw-r--r-- | editors/Sigil/patches/patch-src_minizip_ioapi.c | 17 |
7 files changed, 50 insertions, 89 deletions
diff --git a/editors/Sigil/Makefile b/editors/Sigil/Makefile index c6061f93cf1..b382aaaae5e 100644 --- a/editors/Sigil/Makefile +++ b/editors/Sigil/Makefile @@ -1,9 +1,8 @@ -# $NetBSD: Makefile,v 1.38 2012/10/08 23:01:25 adam Exp $ +# $NetBSD: Makefile,v 1.39 2012/11/19 10:57:44 ryoon Exp $ # -DISTNAME= Sigil-0.5.3-Code +DISTNAME= Sigil-0.6.0-Code PKGNAME= ${DISTNAME:S/-Code//} -PKGREVISION= 7 CATEGORIES= editors MASTER_SITES= http://sigil.googlecode.com/files/ EXTRACT_SUFX= .zip @@ -25,14 +24,6 @@ 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/PLIST b/editors/Sigil/PLIST index 7824f8f1958..a6fa22d4e78 100644 --- a/editors/Sigil/PLIST +++ b/editors/Sigil/PLIST @@ -1,36 +1,45 @@ -@comment $NetBSD: PLIST,v 1.5 2012/02/15 08:00:03 ryoon Exp $ +@comment $NetBSD: PLIST,v 1.6 2012/11/19 10:57:44 ryoon Exp $ bin/sigil share/applications/sigil.desktop share/pixmaps/sigil.png -share/sigil/dictionaries/About.txt -share/sigil/dictionaries/de_DE.aff -share/sigil/dictionaries/de_DE.dic -share/sigil/dictionaries/en_GB.aff -share/sigil/dictionaries/en_GB.dic -share/sigil/dictionaries/en_US.aff -share/sigil/dictionaries/en_US.dic -share/sigil/dictionaries/es.aff -share/sigil/dictionaries/es.dic -share/sigil/dictionaries/fr.aff -share/sigil/dictionaries/fr.dic -share/sigil/dictionaries/hyph_de_DE.dic -share/sigil/dictionaries/hyph_en_GB.dic -share/sigil/dictionaries/hyph_en_US.dic -share/sigil/dictionaries/hyph_es.dic -share/sigil/dictionaries/hyph_fr.dic +share/sigil/examples/clip_entries.ini +share/sigil/examples/search_entries.ini +share/sigil/hunspell_dictionaries/About.txt +share/sigil/hunspell_dictionaries/de_DE.aff +share/sigil/hunspell_dictionaries/de_DE.dic +share/sigil/hunspell_dictionaries/en_GB.aff +share/sigil/hunspell_dictionaries/en_GB.dic +share/sigil/hunspell_dictionaries/en_US.aff +share/sigil/hunspell_dictionaries/en_US.dic +share/sigil/hunspell_dictionaries/es.aff +share/sigil/hunspell_dictionaries/es.dic +share/sigil/hunspell_dictionaries/fr.aff +share/sigil/hunspell_dictionaries/fr.dic +share/sigil/hunspell_dictionaries/hyph_de_DE.dic +share/sigil/hunspell_dictionaries/hyph_en_GB.dic +share/sigil/hunspell_dictionaries/hyph_en_US.dic +share/sigil/hunspell_dictionaries/hyph_es.dic +share/sigil/hunspell_dictionaries/hyph_fr.dic share/sigil/translations/sigil_cs.qm share/sigil/translations/sigil_da_DK.qm share/sigil/translations/sigil_de.qm +share/sigil/translations/sigil_el_GR.qm share/sigil/translations/sigil_en.qm share/sigil/translations/sigil_es_ES.qm share/sigil/translations/sigil_fr.qm +share/sigil/translations/sigil_gl.qm +share/sigil/translations/sigil_id_ID.qm share/sigil/translations/sigil_it.qm share/sigil/translations/sigil_ja.qm +share/sigil/translations/sigil_km.qm +share/sigil/translations/sigil_ko.qm share/sigil/translations/sigil_nl.qm share/sigil/translations/sigil_pl.qm share/sigil/translations/sigil_pt_BR.qm +share/sigil/translations/sigil_ro_RO.qm share/sigil/translations/sigil_ru.qm share/sigil/translations/sigil_sk.qm share/sigil/translations/sigil_tr_TR.qm +share/sigil/translations/sigil_ug.qm share/sigil/translations/sigil_zh_CN.qm share/sigil/translations/sigil_zh_TW.qm diff --git a/editors/Sigil/distinfo b/editors/Sigil/distinfo index 7b205622262..4f1ad21aee1 100644 --- a/editors/Sigil/distinfo +++ b/editors/Sigil/distinfo @@ -1,8 +1,6 @@ -$NetBSD: distinfo,v 1.19 2012/08/12 02:12:51 marino Exp $ +$NetBSD: distinfo,v 1.20 2012/11/19 10:57:44 ryoon 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 (Sigil-0.6.0-Code.zip) = 541bc65c86158433adb2c5926e3ae43e46ed4fb6 +RMD160 (Sigil-0.6.0-Code.zip) = 5c41cf2025c696c2cb77a4d266f749aa1856775d +Size (Sigil-0.6.0-Code.zip) = 12907949 bytes +SHA1 (patch-src_minizip_ioapi.c) = 1530d95061aad350888a37ab3215ddbf9aee72ca diff --git a/editors/Sigil/patches/patch-src_ZipArchive_DirEnumerator.cpp b/editors/Sigil/patches/patch-src_ZipArchive_DirEnumerator.cpp deleted file mode 100644 index ae722f3e315..00000000000 --- a/editors/Sigil/patches/patch-src_ZipArchive_DirEnumerator.cpp +++ /dev/null @@ -1,15 +0,0 @@ -$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 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 diff --git a/editors/Sigil/patches/patch-src_ZipArchive_ZipFile__stl.cpp b/editors/Sigil/patches/patch-src_ZipArchive_ZipFile__stl.cpp deleted file mode 100644 index 2de5721a535..00000000000 --- a/editors/Sigil/patches/patch-src_ZipArchive_ZipFile__stl.cpp +++ /dev/null @@ -1,15 +0,0 @@ -$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 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 diff --git a/editors/Sigil/patches/patch-src_ZipArchive_ZipPlatform__lnx.cpp b/editors/Sigil/patches/patch-src_ZipArchive_ZipPlatform__lnx.cpp deleted file mode 100644 index 4b12e38192a..00000000000 --- a/editors/Sigil/patches/patch-src_ZipArchive_ZipPlatform__lnx.cpp +++ /dev/null @@ -1,24 +0,0 @@ -$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 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 -@@ -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 diff --git a/editors/Sigil/patches/patch-src_minizip_ioapi.c b/editors/Sigil/patches/patch-src_minizip_ioapi.c new file mode 100644 index 00000000000..c2bc45cdaf1 --- /dev/null +++ b/editors/Sigil/patches/patch-src_minizip_ioapi.c @@ -0,0 +1,17 @@ +$NetBSD: patch-src_minizip_ioapi.c,v 1.1 2012/11/19 10:57:45 ryoon Exp $ + +--- src/minizip/ioapi.c.orig 2012-10-27 11:24:40.000000000 +0000 ++++ src/minizip/ioapi.c +@@ -14,6 +14,12 @@ + #define _CRT_SECURE_NO_WARNINGS + #endif + ++#if defined(__NetBSD__) || defined(__DragonFly__) ++#define fopen64 fopen ++#define fseeko64 fseek ++#define ftello64 ftello ++#endif ++ + #include "ioapi.h" + + voidpf call_zopen64 (const zlib_filefunc64_32_def* pfilefunc,const void*filename,int mode) |