pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/misc/sword sword: Upgrade to 1.8.1
details: https://anonhg.NetBSD.org/pkgsrc/rev/14b1fdad2f7c
branches: trunk
changeset: 403463:14b1fdad2f7c
user: kamil <kamil%pkgsrc.org@localhost>
date: Sun Oct 27 16:59:45 2019 +0000
description:
sword: Upgrade to 1.8.1
Full changelog is unknown.
CHANGELOG
=========
1.8.0
I would like to take this chance to announce the immediate availability of
SWORD release 1.8.0. I know this release has been a long time in coming,
but the long time comes with lots of benefits for users, developers, and
maintainers. The benefits to users and developers are mentioned elsewhere,
throughout the code and other places. The main benefit to maintainers is
that, now, there are automated tests in place and the release process is
now automated. This means that future releases on that 1.8 branch can be
easily executed whenever needed. Have a Merry Christmas, everyone! And keep
your eyes open for a 1.8.1 in the not too distant future to fix up
buildings in the binding code. Otherwise, you can get the code you're
looking for below:
MD5: 095dbd723738c2a232c85685a11827a8 sword-1.8.0.tar.gz
SHA512: c45f3135255322a77e955297997db2529f31b397c42cc4b9474dc6ec8d329b2233b292078979de5fbf33cad4a1a607aabb66f86501072a729d68e9fc840c8c8e
sword-1.8.0.tar.gz
URL: sword-1.8.0.tar.gz
--Greg
diffstat:
misc/sword/Makefile | 10 +-
misc/sword/PLIST | 22 ++++-
misc/sword/buildlink3.mk | 6 +-
misc/sword/distinfo | 20 +--
misc/sword/patches/patch-Makefile.in | 14 +-
misc/sword/patches/patch-src_keys_treekeyidx.cpp | 49 ----------
misc/sword/patches/patch-src_mgr_swmgr.cpp | 13 --
misc/sword/patches/patch-src_modules_common_rawstr.cpp | 31 ------
misc/sword/patches/patch-src_modules_common_rawstr4.cpp | 31 ------
misc/sword/patches/patch-src_modules_common_zstr.cpp | 31 ------
misc/sword/patches/patch-src_modules_lexdict_rawld4_rawld4.cpp | 13 --
misc/sword/patches/patch-src_modules_lexdict_rawld_rawld.cpp | 13 --
misc/sword/patches/patch-src_modules_lexdict_zld_zld.cpp | 13 --
13 files changed, 43 insertions(+), 223 deletions(-)
diffs (truncated from 463 to 300 lines):
diff -r d3a434b5789b -r 14b1fdad2f7c misc/sword/Makefile
--- a/misc/sword/Makefile Sun Oct 27 15:43:23 2019 +0000
+++ b/misc/sword/Makefile Sun Oct 27 16:59:45 2019 +0000
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.27 2019/08/22 12:23:35 ryoon Exp $
+# $NetBSD: Makefile,v 1.28 2019/10/27 16:59:45 kamil Exp $
#
-DISTNAME= sword-1.7.4
-PKGREVISION= 24
+DISTNAME= sword-1.8.1
CATEGORIES= misc
-MASTER_SITES= http://www.crosswire.org/ftpmirror/pub/sword/source/v1.7/
+MASTER_SITES= http://www.crosswire.org/ftpmirror/pub/sword/source/v1.8/
MAINTAINER= elentirmo.gilgalad%gmail.com@localhost
HOMEPAGE= http://www.crosswire.org/sword/index.jsp
@@ -28,6 +27,9 @@
# needed with at least GCC-5.4.0 which has a default value of 25
CXXFLAGS+= -ftemplate-depth=50
+http://site.icu-project.org/download/61#TOC-Migration-Issues
+CXXFLAGS+= -DU_USING_ICU_NAMESPACE=1
+
.include "../../textproc/icu/buildlink3.mk"
.include "../../textproc/libclucene/buildlink3.mk"
.include "../../devel/zlib/buildlink3.mk"
diff -r d3a434b5789b -r 14b1fdad2f7c misc/sword/PLIST
--- a/misc/sword/PLIST Sun Oct 27 15:43:23 2019 +0000
+++ b/misc/sword/PLIST Sun Oct 27 16:59:45 2019 +0000
@@ -1,5 +1,6 @@
-@comment $NetBSD: PLIST,v 1.1 2015/03/12 13:30:28 nros Exp $
+@comment $NetBSD: PLIST,v 1.2 2019/10/27 16:59:45 kamil Exp $
bin/diatheke
+bin/emptyvss
bin/imp2gbs
bin/imp2ld
bin/imp2vs
@@ -10,15 +11,19 @@
bin/mod2vpl
bin/mod2zmod
bin/osis2mod
+bin/stripaccents
bin/tei2mod
bin/vpl2mod
bin/vs2osisref
bin/vs2osisreftxt
bin/xml2gbs
+include/sword/bz2comprs.h
include/sword/canon.h
include/sword/canon_abbrevs.h
+include/sword/canon_calvin.h
include/sword/canon_catholic.h
include/sword/canon_catholic2.h
+include/sword/canon_darbyfr.h
include/sword/canon_german.h
include/sword/canon_kjva.h
include/sword/canon_leningrad.h
@@ -29,6 +34,7 @@
include/sword/canon_nrsva.h
include/sword/canon_null.h
include/sword/canon_orthodox.h
+include/sword/canon_segond.h
include/sword/canon_synodal.h
include/sword/canon_synodalprot.h
include/sword/canon_vulg.h
@@ -49,6 +55,7 @@
include/sword/gbfheadings.h
include/sword/gbfhtml.h
include/sword/gbfhtmlhref.h
+include/sword/gbflatex.h
include/sword/gbfmorph.h
include/sword/gbfosis.h
include/sword/gbfplain.h
@@ -76,6 +83,7 @@
include/sword/osisglosses.h
include/sword/osisheadings.h
include/sword/osishtmlhref.h
+include/sword/osislatex.h
include/sword/osislemma.h
include/sword/osismorph.h
include/sword/osismorphsegmentation.h
@@ -107,6 +115,7 @@
include/sword/remotetrans.h
include/sword/roman.h
include/sword/rtfhtml.h
+include/sword/rtranspgdrive.h
include/sword/sapphire.h
include/sword/scsuutf8.h
include/sword/stringmgr.h
@@ -137,6 +146,7 @@
include/sword/swversion.h
include/sword/sysdata.h
include/sword/teihtmlhref.h
+include/sword/teilatex.h
include/sword/teiplain.h
include/sword/teirtf.h
include/sword/teixhtml.h
@@ -145,6 +155,7 @@
include/sword/thmlheadings.h
include/sword/thmlhtml.h
include/sword/thmlhtmlhref.h
+include/sword/thmllatex.h
include/sword/thmllemma.h
include/sword/thmlmorph.h
include/sword/thmlosis.h
@@ -172,6 +183,7 @@
include/sword/utf8latin1.h
include/sword/utf8nfc.h
include/sword/utf8nfkd.h
+include/sword/utf8scsu.h
include/sword/utf8transliterator.h
include/sword/utf8utf16.h
include/sword/utilstr.h
@@ -179,12 +191,16 @@
include/sword/versekey.h
include/sword/versetreekey.h
include/sword/versificationmgr.h
+include/sword/xzcomprs.h
include/sword/zcom.h
+include/sword/zcom4.h
include/sword/zipcomprs.h
include/sword/zld.h
include/sword/zstr.h
include/sword/ztext.h
+include/sword/ztext4.h
include/sword/zverse.h
+include/sword/zverse4.h
lib/libsword.la
lib/pkgconfig/sword.pc
share/examples/sword/sword.conf
@@ -195,6 +211,7 @@
share/sword/locales.d/ar_EG-cp1256.conf
share/sword/locales.d/ar_EG-utf8.conf
share/sword/locales.d/az-utf8.conf
+share/sword/locales.d/be-utf8.conf
share/sword/locales.d/bg-utf8.conf
share/sword/locales.d/bg_BG-cp1251.conf
share/sword/locales.d/cs-utf8.conf
@@ -236,10 +253,12 @@
share/sword/locales.d/ko.conf
share/sword/locales.d/ko_abbrev-utf8.conf
share/sword/locales.d/ko_abbrev.conf
+share/sword/locales.d/kpg-utf8.conf
share/sword/locales.d/la-utf8.conf
share/sword/locales.d/la.conf
share/sword/locales.d/locales.conf
share/sword/locales.d/lt-utf8.conf
+share/sword/locales.d/lv-utf8.conf
share/sword/locales.d/mt-utf8.conf
share/sword/locales.d/nb-utf8.conf
share/sword/locales.d/nb.conf
@@ -267,6 +286,7 @@
share/sword/locales.d/sv-utf8.conf
share/sword/locales.d/sv.conf
share/sword/locales.d/th-utf8.conf
+share/sword/locales.d/tr-utf8.conf
share/sword/locales.d/uk-utf8.conf
share/sword/locales.d/uk_UA-cp1251.conf
share/sword/locales.d/uk_UA-koi8-u.conf
diff -r d3a434b5789b -r 14b1fdad2f7c misc/sword/buildlink3.mk
--- a/misc/sword/buildlink3.mk Sun Oct 27 15:43:23 2019 +0000
+++ b/misc/sword/buildlink3.mk Sun Oct 27 16:59:45 2019 +0000
@@ -1,12 +1,12 @@
-# $NetBSD: buildlink3.mk,v 1.24 2019/08/22 12:23:35 ryoon Exp $
+# $NetBSD: buildlink3.mk,v 1.25 2019/10/27 16:59:45 kamil Exp $
BUILDLINK_TREE+= sword
.if !defined(SWORD_BUILDLINK3_MK)
SWORD_BUILDLINK3_MK:=
-BUILDLINK_API_DEPENDS.sword+= sword>=1.7.4
-BUILDLINK_ABI_DEPENDS.sword?= sword>=1.7.4nb24
+BUILDLINK_API_DEPENDS.sword+= sword>=1.8.1
+BUILDLINK_ABI_DEPENDS.sword?= sword>=1.8.1
BUILDLINK_PKGSRCDIR.sword?= ../../misc/sword
.include "../../textproc/icu/buildlink3.mk"
diff -r d3a434b5789b -r 14b1fdad2f7c misc/sword/distinfo
--- a/misc/sword/distinfo Sun Oct 27 15:43:23 2019 +0000
+++ b/misc/sword/distinfo Sun Oct 27 16:59:45 2019 +0000
@@ -1,15 +1,7 @@
-$NetBSD: distinfo,v 1.3 2016/12/17 14:22:39 joerg Exp $
+$NetBSD: distinfo,v 1.4 2019/10/27 16:59:45 kamil Exp $
-SHA1 (sword-1.7.4.tar.gz) = 9fc1070baaa9f991056c1dc0d0455022de2610db
-RMD160 (sword-1.7.4.tar.gz) = 55a0b741a97e58f29cfa5eca4572719660447393
-SHA512 (sword-1.7.4.tar.gz) = 4c8b183e613367364439cc7a8a842012f75180fccc8eb775b9af2dc4c10f39c152261d35f0aadaaa91a11df36ab1a4057c2edc50ea4b0b3bb0ab0a847ff68f75
-Size (sword-1.7.4.tar.gz) = 2157882 bytes
-SHA1 (patch-Makefile.in) = 512be822cb96144244cb93f70ca2ba409a90db9b
-SHA1 (patch-src_keys_treekeyidx.cpp) = 2bae86876bfb4a1c74faf709d016e7665514cd90
-SHA1 (patch-src_mgr_swmgr.cpp) = e0e63ec4df6b07c89678a33827cc925f3ccb2369
-SHA1 (patch-src_modules_common_rawstr.cpp) = 89bf3b3bf389393dc0d826f6aa0ab1a4737d30bd
-SHA1 (patch-src_modules_common_rawstr4.cpp) = 966d0f6b52ac888abb27376ec0cedd2336bc6b99
-SHA1 (patch-src_modules_common_zstr.cpp) = 591cbf710dade59c5249d8c15ae2db5ac791db03
-SHA1 (patch-src_modules_lexdict_rawld4_rawld4.cpp) = d2cebbe1ddd5456d52f651079fc6e4eec46905d4
-SHA1 (patch-src_modules_lexdict_rawld_rawld.cpp) = 48a55530444b6e10412bdb08d2036395554a7299
-SHA1 (patch-src_modules_lexdict_zld_zld.cpp) = a4f4075da1011728ff6fde8c0a13b4c9d45fe3cd
+SHA1 (sword-1.8.1.tar.gz) = 3a9932fd7c9e73bb032b09288a5f29440c8bb25e
+RMD160 (sword-1.8.1.tar.gz) = 2297bd574b5c592fbbee741cd32b3c812908dfc8
+SHA512 (sword-1.8.1.tar.gz) = 5c08c070ea0c86b7d929bbf94c89730eb5a487986deb9edf01c08d1710356aecd1ab3bde4437a778e5fc1ceb05b63287612ec6161381c0986a36344c27d2ab36
+Size (sword-1.8.1.tar.gz) = 2449503 bytes
+SHA1 (patch-Makefile.in) = 6508dabcd47e08609e43c76f738c4d4384152354
diff -r d3a434b5789b -r 14b1fdad2f7c misc/sword/patches/patch-Makefile.in
--- a/misc/sword/patches/patch-Makefile.in Sun Oct 27 15:43:23 2019 +0000
+++ b/misc/sword/patches/patch-Makefile.in Sun Oct 27 16:59:45 2019 +0000
@@ -1,8 +1,8 @@
-$NetBSD: patch-Makefile.in,v 1.1 2015/03/12 13:30:28 nros Exp $
-* don't install sword.conf use pkginstall framework for this
---- Makefile.in.orig 2014-12-24 20:33:10.000000000 +0000
+$NetBSD: patch-Makefile.in,v 1.2 2019/10/27 16:59:45 kamil Exp $
+
+--- Makefile.in.orig 2018-01-09 02:02:03.000000000 +0000
+++ Makefile.in
-@@ -438,7 +438,7 @@ EXTRA_DIST = sword.spec sword.kdevprj sw
+@@ -440,7 +440,7 @@ EXTRA_DIST = sword.spec sword.kdevprj sw
$(swdocdir)/translation-template.conf
@USE_PKGCONF_TRUE@pkgconfigdir = $(libdir)/pkgconfig
@USE_PKGCONF_TRUE@pkgconfig_DATA = sword.pc
@@ -11,7 +11,7 @@
buildtest_SOURCES = buildtest.cpp
swlocaledir = $(top_srcdir)/locales.d
localeDATA = $(swlocaledir)/*.conf
-@@ -1108,8 +1108,8 @@ register:
+@@ -1102,8 +1102,8 @@ register:
@echo ""
install_config:
@@ -20,5 +20,5 @@
+ @echo "[Install]" > $(DESTDIR)$(datarootdir)/examples/sword/sword.conf
+ @echo "DataPath=$(pkgdatadir)/" >> $(DESTDIR)$(datarootdir)/examples/sword/sword.conf
@echo "sword.conf generated"
-
- dist-hook:
+ @echo ""
+ @echo "You can now try to install modules with installmgr, e.g.,"
diff -r d3a434b5789b -r 14b1fdad2f7c misc/sword/patches/patch-src_keys_treekeyidx.cpp
--- a/misc/sword/patches/patch-src_keys_treekeyidx.cpp Sun Oct 27 15:43:23 2019 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,49 +0,0 @@
-$NetBSD: patch-src_keys_treekeyidx.cpp,v 1.1 2016/12/17 14:22:39 joerg Exp $
-
---- src/keys/treekeyidx.cpp.orig 2016-12-17 11:16:23.463483505 +0000
-+++ src/keys/treekeyidx.cpp
-@@ -61,7 +61,7 @@ TreeKeyIdx::TreeKeyIdx(const char *idxPa
- buf.setFormatted("%s.dat", path);
- datfd = FileMgr::getSystemFileMgr()->open(buf, fileMode, true);
-
-- if (datfd <= 0) {
-+ if (!datfd) {
- SWLog::getSystemLog()->logError("%d", errno);
- error = errno;
- }
-@@ -331,7 +331,7 @@ void TreeKeyIdx::getTreeNodeFromDatOffse
- __s32 tmp;
- __u16 tmp2;
-
-- if (datfd > 0) {
-+ if (datfd) {
-
- datfd->seek(ioffset, SEEK_SET);
-
-@@ -385,7 +385,7 @@ char TreeKeyIdx::getTreeNodeFromIdxOffse
- }
-
- node->offset = ioffset;
-- if (idxfd > 0) {
-+ if (idxfd) {
- if (idxfd->getFd() > 0) {
- idxfd->seek(ioffset, SEEK_SET);
- if (idxfd->read(&offset, 4) == 4) {
-@@ -422,7 +422,7 @@ void TreeKeyIdx::saveTreeNodeOffsets(Tre
- long datOffset = 0;
- __s32 tmp;
-
-- if (idxfd > 0) {
-+ if (idxfd) {
- idxfd->seek(node->offset, SEEK_SET);
- if (idxfd->read(&tmp, 4) != 4) {
- datOffset = datfd->seek(0, SEEK_END);
-@@ -488,7 +488,7 @@ void TreeKeyIdx::copyFrom(const TreeKeyI
- void TreeKeyIdx::saveTreeNode(TreeNode *node) {
- long datOffset = 0;
- __s32 tmp;
-- if (idxfd > 0) {
-+ if (idxfd) {
-
- idxfd->seek(node->offset, SEEK_SET);
- datOffset = datfd->seek(0, SEEK_END);
diff -r d3a434b5789b -r 14b1fdad2f7c misc/sword/patches/patch-src_mgr_swmgr.cpp
--- a/misc/sword/patches/patch-src_mgr_swmgr.cpp Sun Oct 27 15:43:23 2019 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,13 +0,0 @@
-$NetBSD: patch-src_mgr_swmgr.cpp,v 1.1 2016/12/17 14:22:39 joerg Exp $
-
---- src/mgr/swmgr.cpp.orig 2016-12-17 11:17:23.119076977 +0000
-+++ src/mgr/swmgr.cpp
-@@ -1362,7 +1362,7 @@ void SWMgr::InstallScan(const char *dirn
- else {
Home |
Main Index |
Thread Index |
Old Index