academic/sword: Updated for version 1.7.4.

Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>

5 files changed, 20 insertions, 145 deletions

diff --git a/academic/sword/README b/academic/sword/README
index 7766effb75c6..9d4d33967384 100644
--- a/academic/sword/README
+++ b/academic/sword/README
@@ -3,3 +3,11 @@ for research and study of God and His Word.  The SWORD Bible Framework allows
 easy manipulation of Bible texts, commentaries, lexicons, dictionaries, etc. 
 Many frontends are build using this framework. An installed module set may 
 be shared between any frontend using the framework.  
+
+This engine/library needs data to operate on to be usefull.
+
+A sword-data-kjv package is available on sbo to provide a basic bible with
+strongs and Greek and Hebrew dictionaries for use with this library. Many
+more bibles, commentries etc. can be found on the crosswire.org website.
+modules can be downloaded in raw format (zip) and extracted into the
+/usr/share/sword  directory.
diff --git a/academic/sword/sword-1.6.2-clucene2.patch b/academic/sword/sword-1.6.2-clucene2.patch
deleted file mode 100644
index f887f221472a..000000000000
--- a/academic/sword/sword-1.6.2-clucene2.patch
+++ /dev/null
@@ -1,125 +0,0 @@
-diff -up sword-1.6.2/configure.clucene2 sword-1.6.2/configure
---- sword-1.6.2/configure.clucene2	2010-10-22 23:14:28.000000000 +0200
-+++ sword-1.6.2/configure	2011-10-02 21:27:35.420704861 +0200
-@@ -16348,9 +16348,9 @@ for flag in $with_clucene; do
- 	if test -z "$clucene_set_failed"; then
- 		if test -e "$flag/include/CLucene.h"; then
- # 64-bit checks first
--			if test -e "$flag/lib64/libclucene.la" || test -e "$flag/lib64/libclucene.so"; then
-+			if test -e "$flag/lib64/libclucene-core.la" || test -e "$flag/lib64/libclucene-core.so"; then
- 				clucene_set_failed=$flag
--				CLUCENE_LIBS="-L$flag/lib64 -lclucene"
-+				CLUCENE_LIBS="-L$flag/lib64 -lclucene-core"
- 				if test -e "$flag/include/CLucene/clucene-config.h"; then
- 					CLUCENE_CXXFLAGS="-I$flag/include"
- 				else
-@@ -16358,9 +16358,9 @@ for flag in $with_clucene; do
- 				fi
- 			else
- # 32-bit checks
--				if test -e "$flag/lib/libclucene.la" || test -e "$flag/lib/libclucene.so"; then
-+				if test -e "$flag/lib/libclucene-core.la" || test -e "$flag/lib/libclucene-core.so"; then
- 					clucene_set_failed=$flag
--					CLUCENE_LIBS="-L$flag/lib -lclucene"
-+					CLUCENE_LIBS="-L$flag/lib -lclucene-core"
- 					if test -e "$flag/include/CLucene/clucene-config.h"; then
- 						CLUCENE_CXXFLAGS="-I$flag/include"
- 					else
-diff -up sword-1.6.2/m4/acx_clucene.m4.clucene2 sword-1.6.2/m4/acx_clucene.m4
---- sword-1.6.2/m4/acx_clucene.m4.clucene2	2007-05-19 23:28:23.000000000 +0200
-+++ sword-1.6.2/m4/acx_clucene.m4	2011-10-02 21:27:35.420704861 +0200
-@@ -29,9 +29,9 @@ for flag in $with_clucene; do
- 	if test -z "$clucene_set_failed"; then
- 		if test -e "$flag/include/CLucene.h"; then
- # 64-bit checks first
--			if test -e "$flag/lib64/libclucene.la" || test -e "$flag/lib64/libclucene.so"; then
-+			if test -e "$flag/lib64/libclucene-core.la" || test -e "$flag/lib64/libclucene-core.so"; then
- 				clucene_set_failed=$flag
--				CLUCENE_LIBS="-L$flag/lib64 -lclucene"
-+				CLUCENE_LIBS="-L$flag/lib64 -lclucene-core"
- 				if test -e "$flag/include/CLucene/clucene-config.h"; then
- 					CLUCENE_CXXFLAGS="-I$flag/include"
- 				else
-@@ -39,9 +39,9 @@ for flag in $with_clucene; do
- 				fi
- 			else
- # 32-bit checks
--				if test -e "$flag/lib/libclucene.la" || test -e "$flag/lib/libclucene.so"; then
-+				if test -e "$flag/lib/libclucene-core.la" || test -e "$flag/lib/libclucene-core.so"; then
- 					clucene_set_failed=$flag
--					CLUCENE_LIBS="-L$flag/lib -lclucene"
-+					CLUCENE_LIBS="-L$flag/lib -lclucene-core"
- 					if test -e "$flag/include/CLucene/clucene-config.h"; then
- 						CLUCENE_CXXFLAGS="-I$flag/include"
- 					else
-diff -up sword-1.6.2/src/modules/swmodule.cpp.clucene2 sword-1.6.2/src/modules/swmodule.cpp
---- sword-1.6.2/src/modules/swmodule.cpp.clucene2	2011-10-02 21:32:40.825795281 +0200
-+++ sword-1.6.2/src/modules/swmodule.cpp	2011-10-02 22:02:42.441506634 +0200
-@@ -40,7 +40,7 @@
- 
- #ifdef USELUCENE
- #include <CLucene.h>
--#include <CLucene/CLBackwards.h>
-+//#include <CLucene/CLBackwards.h>
- 
- //Lucence includes
- //#include "CLucene.h"
-@@ -59,6 +59,9 @@ using namespace lucene::search;
- 
- using std::vector;
- 
-+extern size_t lucene_utf8towcs(wchar_t *, const char *,  size_t maxslen);
-+extern size_t lucene_wcstoutf8 (char *,  const wchar_t *, size_t maxslen);
-+
- SWORD_NAMESPACE_START
- 
- SWDisplay SWModule::rawdisp;
-@@ -1144,7 +1147,7 @@ signed char SWModule::createSearchFramew
- 
- 			lucene_utf8towcs(wcharBuffer, keyText, MAX_CONV_SIZE); //keyText must be utf8
- //			doc->add( *(new Field("key", wcharBuffer, Field::STORE_YES | Field::INDEX_TOKENIZED)));
--			doc->add( *Field::Text(_T("key"), wcharBuffer ) );
-+			doc->add(*_CLNEW Field(_T("key"), wcharBuffer, Field::STORE_YES | Field::INDEX_TOKENIZED) );
- 
- 
- 			if (includeKeyInSearch) {
-@@ -1155,11 +1158,11 @@ signed char SWModule::createSearchFramew
- 			}
- 
- 			lucene_utf8towcs(wcharBuffer, content, MAX_CONV_SIZE); //content must be utf8
--			doc->add( *Field::UnStored(_T("content"), wcharBuffer) );
-+			doc->add(*_CLNEW Field(_T("content"), wcharBuffer, Field::STORE_NO | Field::INDEX_TOKENIZED));
- 
- 			if (strong.length() > 0) {
- 				lucene_utf8towcs(wcharBuffer, strong, MAX_CONV_SIZE);
--				doc->add( *Field::UnStored(_T("lemma"), wcharBuffer) );
-+				doc->add(*_CLNEW Field(_T("lemma"), wcharBuffer, Field::STORE_NO | Field::INDEX_TOKENIZED) );
- //printf("setting fields (%s).\ncontent: %s\nlemma: %s\n", (const char *)*key, content, strong.c_str());
- 			}
- 
-@@ -1280,12 +1283,12 @@ signed char SWModule::createSearchFramew
- 
- //printf("proxBuf after (%s).\nprox: %s\nproxLem: %s\n", (const char *)*key, proxBuf.c_str(), proxLem.c_str());
- 
--			doc->add( *Field::UnStored(_T("prox"), wcharBuffer) );
-+			doc->add(*_CLNEW Field(_T("prox"), wcharBuffer, Field::STORE_NO | Field::INDEX_TOKENIZED) );
- 			good = true;
- 		}
- 		if (proxLem.length() > 0) {
- 			lucene_utf8towcs(wcharBuffer, proxLem, MAX_CONV_SIZE); //keyText must be utf8
--			doc->add( *Field::UnStored(_T("proxlem"), wcharBuffer) );
-+			doc->add(*_CLNEW Field(_T("proxlem"), wcharBuffer, Field::STORE_NO | Field::INDEX_TOKENIZED) );
- 			good = true;
- 		}
- 		if (good) {
-@@ -1315,7 +1318,9 @@ signed char SWModule::createSearchFramew
- 		fsWriter = new IndexWriter(d, an, true);
- 	}
- 
--	Directory *dirs[] = { ramDir, 0 };
-+	ValueArray<Directory*> dirs(2);
-+	dirs[0] = ramDir;
-+	dirs[1] = 0;
- 	fsWriter->addIndexes(dirs);
- 	fsWriter->close();
- 
diff --git a/academic/sword/sword-curl-7.20.0-fix.patch b/academic/sword/sword-curl-7.20.0-fix.patch
deleted file mode 100644
index c3b7ddc0925f..000000000000
--- a/academic/sword/sword-curl-7.20.0-fix.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/mgr/curlftpt.cpp	2009-12-04 03:54:06.000000000 -0500
-+++ src/mgr/curlftpt.cpp.new	2010-03-20 12:41:50.449544991 -0400
-@@ -124,6 +124,7 @@
- 
- 
- CURLFTPTransport::~CURLFTPTransport() {
-+	curl_easy_setopt(session, CURLOPT_PROGRESSDATA, (void*)NULL);
- 	curl_easy_cleanup(session);
- }
- 
diff --git a/academic/sword/sword.SlackBuild b/academic/sword/sword.SlackBuild
index fbff2b0dedda..8306633a8e34 100644
--- a/academic/sword/sword.SlackBuild
+++ b/academic/sword/sword.SlackBuild
@@ -5,6 +5,8 @@
 # Copyright 2008-2011 Heinz Wiesinger, Amsterdam, The Netherlands
 # All rights reserved.
 #
+# changes updating to v1.7.4 Copyright 2015 Tim Dickson, Scotland
+#
 # Redistribution and use of this script, with or without modification, is
 # permitted provided that the following conditions are met:
 #
@@ -23,7 +25,7 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=sword
-VERSION=${VERSION:-1.6.2}
+VERSION=${VERSION:-1.7.4}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -68,10 +70,10 @@ find -L . \
  -exec chmod 755 {} \; -o \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
-
-patch -p1 < $CWD/sword-1.6.2-clucene2.patch
-patch -p1 < $CWD/curl.patch
-patch -p1 < $CWD/multimap.patch
+#these patches don't appear to be needed for slackware 14.1 but
+#have been left in the package just in case someone descovers they are required.
+#patch -p1 < $CWD/curl.patch
+#patch -p1 < $CWD/multimap.patch
 
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
diff --git a/academic/sword/sword.info b/academic/sword/sword.info
index 58e53de0ca0a..0af620baccb5 100644
--- a/academic/sword/sword.info
+++ b/academic/sword/sword.info
@@ -1,10 +1,10 @@
 PRGNAM="sword"
-VERSION="1.6.2"
+VERSION="1.7.4"
 HOMEPAGE="http://www.crosswire.org/sword"
-DOWNLOAD="http://crosswire.org/ftpmirror/pub/sword/source/v1.6/sword-1.6.2.tar.gz"
-MD5SUM="a7dc4456e20e915fec46d774b690e305"
+DOWNLOAD="http://crosswire.org/ftpmirror/pub/sword/source/v1.7/sword-1.7.4.tar.gz"
+MD5SUM="1677f02a86cbf07713d4e1d4c39791e6"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
-MAINTAINER="Heinz Wiesinger"
-EMAIL="pprkut@liwjatan.at"
+MAINTAINER="Tim Dickson"
+EMAIL="tim@googlemail.com"