4 files changed, 39 insertions, 21 deletions

diff --git a/misc/sword/Makefile b/misc/sword/Makefile
index 600511721909..9c5dbdb26015 100644
--- a/misc/sword/Makefile
+++ b/misc/sword/Makefile
@@ -6,11 +6,10 @@
 #
 
 PORTNAME=	sword
-PORTVERSION=	1.5.11
-PORTREVISION=	1
+PORTVERSION=	1.6.0
 CATEGORIES=	misc
-MASTER_SITES=	ftp://ftp.crosswire.org/pub/sword/source/v1.5/ \
-		http://crosswire.org/ftpmirror/pub/sword/source/v1.5/ \
+MASTER_SITES=	ftp://ftp.crosswire.org/pub/sword/source/v1.6/ \
+		http://crosswire.org/ftpmirror/pub/sword/source/v1.6/ \
 		LOCAL
 MASTER_SITE_SUBDIR=	tabthorpe
 
@@ -39,8 +38,8 @@ pre-everything::
 .endif
 
 post-patch:
-	@${REINPLACE_CMD} -e 's|1.10|1.10.1|g' ${WRKSRC}/aclocal.m4
-	@${REINPLACE_CMD} -e 's|2.61|2.62|g' ${WRKSRC}/aclocal.m4
+	@${REINPLACE_CMD} -e 's|1.10.2|1.10.1|g' ${WRKSRC}/aclocal.m4
+	@${REINPLACE_CMD} -e 's|2.63|2.62|g' ${WRKSRC}/aclocal.m4
 	@${REINPLACE_CMD} -e 's|$$(libdir)/pkgconfig|${PREFIX}/libdata/pkgconfig|g' \
 		${WRKSRC}/Makefile.am
 	@@${REINPLACE_CMD} -e 's|:=|=|' ${WRKSRC}/Makefile.am \
diff --git a/misc/sword/distinfo b/misc/sword/distinfo
index 88ebc6ff7e4f..8a74cc90c66c 100644
--- a/misc/sword/distinfo
+++ b/misc/sword/distinfo
@@ -1,3 +1,3 @@
-MD5 (sword-1.5.11.tar.gz) = 84a13fd3cf767902de91368424f30baa
-SHA256 (sword-1.5.11.tar.gz) = 120a881f12c7d2f4fa21cf39616f7246ce1eeae2d6268f432f404720988269a6
-SIZE (sword-1.5.11.tar.gz) = 1799625
+MD5 (sword-1.6.0.tar.gz) = 292ca38b2427168b19d629b48a428dde
+SHA256 (sword-1.6.0.tar.gz) = 8f1348c98015c656414f89ffa235afb3b1860cce2b242a81baeb16fde7678f4a
+SIZE (sword-1.6.0.tar.gz) = 1769084
diff --git a/misc/sword/pkg-descr b/misc/sword/pkg-descr
index c87f98fae37a..0bd334f20a22 100644
--- a/misc/sword/pkg-descr
+++ b/misc/sword/pkg-descr
@@ -1,8 +1,9 @@
-The SWORD Project is an effort to create an ever expanding software
-package 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 built using this
-framework. An installed module set may be shared between many
-frontends using the framework.
+The SWORD Project is the CrossWire Bible Society's free Bible
+software project. Its purpose is to create cross-platform open-source
+tools, covered by the GNU General Public License, that allow
+programmers and Bible societies to write new Bible software more
+quickly and easily. We also create Bible study software for all
+readers, students, scholars, and translators of the Bible, and have
+a growing collection of over 200 texts in over 50 languages.
 
 WWW: http://www.crosswire.org/sword/
diff --git a/misc/sword/pkg-plist b/misc/sword/pkg-plist
index 86bed7f49cb2..3d3545997602 100644
--- a/misc/sword/pkg-plist
+++ b/misc/sword/pkg-plist
@@ -13,13 +13,16 @@ bin/osis2mod
 bin/tei2mod
 bin/vpl2mod
 bin/vs2osisref
+bin/vs2osisreftxt
 bin/xml2gbs
-etc/sword.conf
+%%ETCDIR%%.conf
 include/sword/Greek2Greek.h
 include/sword/GreekChars.h
 include/sword/canon.h
+include/sword/canon_abbrevs.h
 include/sword/cipherfil.h
 include/sword/curlftpt.h
+include/sword/curlhttpt.h
 include/sword/defs.h
 include/sword/echomod.h
 include/sword/encfiltmgr.h
@@ -87,7 +90,6 @@ include/sword/regex.h
 include/sword/roman.h
 include/sword/rtfhtml.h
 include/sword/sapphire.h
-include/sword/scsuutf8.h
 include/sword/stringmgr.h
 include/sword/strkey.h
 include/sword/swbasicfilter.h
@@ -116,6 +118,7 @@ include/sword/swtext.h
 include/sword/swunicod.h
 include/sword/swversion.h
 include/sword/sysdata.h
+include/sword/teihtmlhref.h
 include/sword/teiplain.h
 include/sword/teirtf.h
 include/sword/thmlfootnotes.h
@@ -139,6 +142,7 @@ include/sword/unicodertf.h
 include/sword/untgz.h
 include/sword/url.h
 include/sword/utf16utf8.h
+include/sword/utf8arabicpoints.h
 include/sword/utf8arshaping.h
 include/sword/utf8bidireorder.h
 include/sword/utf8cantillation.h
@@ -153,6 +157,7 @@ include/sword/utf8utf16.h
 include/sword/utilstr.h
 include/sword/utilxml.h
 include/sword/versekey.h
+include/sword/versemgr.h
 include/sword/versetreekey.h
 include/sword/zcom.h
 include/sword/zconf.h
@@ -161,7 +166,7 @@ include/sword/zld.h
 include/sword/zstr.h
 include/sword/ztext.h
 include/sword/zverse.h
-lib/libsword-1.5.11.so
+lib/libsword-1.6.0.so
 lib/libsword.a
 lib/libsword.la
 lib/libsword.so
@@ -175,6 +180,8 @@ libdata/pkgconfig/sword.pc
 %%DATADIR%%/locales.d/bg_BG-utf8.conf
 %%DATADIR%%/locales.d/cs-utf8.conf
 %%DATADIR%%/locales.d/cs.conf
+%%DATADIR%%/locales.d/cy-utf8.conf
+%%DATADIR%%/locales.d/cy.conf
 %%DATADIR%%/locales.d/da-utf8.conf
 %%DATADIR%%/locales.d/da.conf
 %%DATADIR%%/locales.d/de-utf8.conf
@@ -191,23 +198,30 @@ libdata/pkgconfig/sword.pc
 %%DATADIR%%/locales.d/fa-utf8.conf
 %%DATADIR%%/locales.d/fi-utf8.conf
 %%DATADIR%%/locales.d/fi.conf
-%%DATADIR%%/locales.d/fr_abbrev-utf8.conf
-%%DATADIR%%/locales.d/fr_abbrev.conf
 %%DATADIR%%/locales.d/fr-utf8.conf
 %%DATADIR%%/locales.d/fr.conf
+%%DATADIR%%/locales.d/fr_abbrev-utf8.conf
+%%DATADIR%%/locales.d/fr_abbrev.conf
+%%DATADIR%%/locales.d/ga-utf8.conf
 %%DATADIR%%/locales.d/he-utf8.conf
 %%DATADIR%%/locales.d/hu-utf8.conf
 %%DATADIR%%/locales.d/hu.conf
+%%DATADIR%%/locales.d/id-utf8.conf
 %%DATADIR%%/locales.d/id.conf
 %%DATADIR%%/locales.d/it-utf8.conf
 %%DATADIR%%/locales.d/it.conf
-%%DATADIR%%/locales.d/ja.conf
+%%DATADIR%%/locales.d/ja-utf8.conf
 %%DATADIR%%/locales.d/ko-utf8.conf
 %%DATADIR%%/locales.d/ko.conf
 %%DATADIR%%/locales.d/ko_abbrev-utf8.conf
 %%DATADIR%%/locales.d/ko_abbrev.conf
+%%DATADIR%%/locales.d/la-utf8.conf
 %%DATADIR%%/locales.d/la.conf
 %%DATADIR%%/locales.d/lt-utf8.conf
+%%DATADIR%%/locales.d/mt-utf8.conf
+%%DATADIR%%/locales.d/nb-utf8.conf
+%%DATADIR%%/locales.d/nb.conf
+%%DATADIR%%/locales.d/nl-utf8.conf
 %%DATADIR%%/locales.d/nl.conf
 %%DATADIR%%/locales.d/no-utf8.conf
 %%DATADIR%%/locales.d/no.conf
@@ -217,12 +231,14 @@ libdata/pkgconfig/sword.pc
 %%DATADIR%%/locales.d/pt.conf
 %%DATADIR%%/locales.d/pt_BR-utf8.conf
 %%DATADIR%%/locales.d/pt_BR.conf
+%%DATADIR%%/locales.d/ro-utf8.conf
 %%DATADIR%%/locales.d/ro.conf
 %%DATADIR%%/locales.d/ru_RU-cp1251.conf
 %%DATADIR%%/locales.d/ru_RU-koi8-r.conf
 %%DATADIR%%/locales.d/ru_RU-utf8.conf
 %%DATADIR%%/locales.d/sk-utf8.conf
 %%DATADIR%%/locales.d/sk.conf
+%%DATADIR%%/locales.d/sl-utf8.conf
 %%DATADIR%%/locales.d/sl.conf
 %%DATADIR%%/locales.d/sv-utf8.conf
 %%DATADIR%%/locales.d/sv.conf
@@ -231,6 +247,8 @@ libdata/pkgconfig/sword.pc
 %%DATADIR%%/locales.d/uk_UA-koi8-u.conf
 %%DATADIR%%/locales.d/uk_UA-utf8.conf
 %%DATADIR%%/locales.d/vi-utf8.conf
+%%DATADIR%%/locales.d/zh_TW-utf8.conf
+%%DATADIR%%/locales.d/zh_english-utf8.conf
 @dirrm %%DATADIR%%/mods.d
 @dirrm %%DATADIR%%/locales.d
 @dirrm %%DATADIR%%