- Update to 1.5.9

PR:		ports/103734
Submitted by:	Thomas Abthorpe <thomas(at)goodking.ca> (maintainer)

10 files changed, 60 insertions, 42 deletions

diff --git a/misc/sword/Makefile b/misc/sword/Makefile
index 35522a87796c..fa332f6c91fe 100644
--- a/misc/sword/Makefile
+++ b/misc/sword/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	sword
-PORTVERSION=	1.5.8
+PORTVERSION=	1.5.9
 CATEGORIES=	misc
 MASTER_SITES=	ftp://ftp.crosswire.org/pub/sword/source/v1.5/ \
     		http://www.goodking.ca/pub/files/
@@ -16,16 +16,14 @@ COMMENT=	A project framework for manipulating Bible texts
 
 USE_GNOME=	pkgconfig
 USE_GMAKE=	yes
-USE_GCC=	3.2+
+USE_GCC=	3.4+
 GNU_CONFIGURE=	yes
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
-CONFIGURE_ARGS+=	--without-conf
+CONFIGURE_ARGS+=	--without-conf --without-clucene
 USE_LDCONFIG=	yes
 SUB_FILES=	pkg-message
 PKGMESSAGE=	${WRKDIR}/pkg-message
 
-.include <bsd.port.pre.mk>
-
 .if defined(WITHOUT_CURL)
 CONFIGURE_ARGS+=	--without-curl
 PLIST_SUB+=	INSTALLMGR="@comment "
@@ -56,4 +54,4 @@ post-install:
 register:
 	@(cd ${WRKSRC} && make register)
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/misc/sword/distinfo b/misc/sword/distinfo
index a2f49f6af447..addda689560f 100644
--- a/misc/sword/distinfo
+++ b/misc/sword/distinfo
@@ -1,3 +1,3 @@
-MD5 (sword-1.5.8.tar.gz) = c36398c84bfb044c0c66ef3ffcf29400
-SHA256 (sword-1.5.8.tar.gz) = aeb57fe89716807f331eb17fcf23ef1ba3ad3e7018cd2d32560677ffe6937ce9
-SIZE (sword-1.5.8.tar.gz) = 1714799
+MD5 (sword-1.5.9.tar.gz) = e1f1af8c2add8310d0bbcddc9af523b8
+SHA256 (sword-1.5.9.tar.gz) = dd170431235cc419cbe6c40362640927a78dc93e082623709abe1310fe804481
+SIZE (sword-1.5.9.tar.gz) = 1816315
diff --git a/misc/sword/files/pkg-message.in b/misc/sword/files/pkg-message.in
index fa3a2c01a95b..c4cd86f79ca2 100644
--- a/misc/sword/files/pkg-message.in
+++ b/misc/sword/files/pkg-message.in
@@ -1,7 +1,8 @@
-To use sword, you need to have bible, commentary and/or lexicon modules. You
-can install those from the crosswire website in two ways. If you live in a
-persecuted country however and do not wish to risk detection, you should *not*
-try this.
+To use sword, you need to have bible, commentary and/or lexicon
+modules. You can install those from the crosswire website in two
+ways. If you live in a persecuted country however and do not wish
+to risk detection, you should *not* try this.
+
   1. Use installmgr (doesn't work when port is built WITHOUT_CURL). E.g.:
      # installmgr -init
      # installmgr -r crosswire
@@ -11,5 +12,5 @@ try this.
        http://www.crosswire.org/sword/modules/
      and unpack them in %%PREFIX%%/share/sword.
 
-You probabely want to install a bible-application that uses sword, like
-cheatah, bibletime or gnomesword.
+You probabely want to install a bible-application that uses sword,
+like bibletime or gnomesword.
diff --git a/misc/sword/pkg-descr b/misc/sword/pkg-descr
index c4a498ba7422..c87f98fae37a 100644
--- a/misc/sword/pkg-descr
+++ b/misc/sword/pkg-descr
@@ -1,8 +1,8 @@
 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 build using this
-framework. An installed module set may be shared between any frontend
-using the framework.
+lexicons, dictionaries, etc.  Many frontends are built using this
+framework. An installed module set may be shared between many
+frontends using the framework.
 
 WWW: http://www.crosswire.org/sword/
diff --git a/misc/sword/pkg-plist b/misc/sword/pkg-plist
index 4d6129aa89dd..3234e4fbd15d 100644
--- a/misc/sword/pkg-plist
+++ b/misc/sword/pkg-plist
@@ -1,5 +1,6 @@
 bin/addld
 bin/diatheke
+bin/imp2gbs
 bin/imp2ld
 bin/imp2vs
 bin/installmgr
@@ -11,6 +12,7 @@ bin/mod2zmod
 bin/osis2mod
 bin/vpl2mod
 bin/vs2osisref
+bin/xml2gbs
 etc/sword.conf
 include/sword/Greek2Greek.h
 include/sword/GreekChars.h
@@ -40,6 +42,7 @@ include/sword/gbfrtf.h
 include/sword/gbfstrongs.h
 include/sword/gbfthml.h
 include/sword/gbfwebif.h
+include/sword/gbfwordjs.h
 include/sword/greeklexattribs.h
 include/sword/hebrewmcim.h
 include/sword/hrefcom.h
@@ -57,6 +60,7 @@ include/sword/osisheadings.h
 include/sword/osishtmlhref.h
 include/sword/osislemma.h
 include/sword/osismorph.h
+include/sword/osismorphsegmentation.h
 include/sword/osisosis.h
 include/sword/osisplain.h
 include/sword/osisredletterwords.h
@@ -65,6 +69,7 @@ include/sword/osisscripref.h
 include/sword/osisstrongs.h
 include/sword/osiswebif.h
 include/sword/osiswordjs.h
+include/sword/papyriplain.h
 include/sword/plainfootnotes.h
 include/sword/plainhtml.h
 include/sword/rawcom.h
@@ -109,6 +114,8 @@ include/sword/swtext.h
 include/sword/swunicod.h
 include/sword/swversion.h
 include/sword/sysdata.h
+include/sword/teiplain.h
+include/sword/teirtf.h
 include/sword/thmlfootnotes.h
 include/sword/thmlgbf.h
 include/sword/thmlheadings.h
@@ -144,6 +151,7 @@ include/sword/utf8utf16.h
 include/sword/utilstr.h
 include/sword/utilxml.h
 include/sword/versekey.h
+include/sword/versetreekey.h
 include/sword/zcom.h
 include/sword/zconf.h
 include/sword/zipcomprs.h
@@ -152,7 +160,7 @@ include/sword/zlib.h
 include/sword/zstr.h
 include/sword/ztext.h
 include/sword/zverse.h
-lib/libsword-1.5.8.so
+lib/libsword-1.5.9.so
 lib/libsword.a
 lib/libsword.la
 lib/libsword.so
@@ -160,6 +168,8 @@ libdata/pkgconfig/sword.pc
 %%DATADIR%%/locales.d/abbr.conf
 %%DATADIR%%/locales.d/af-utf8.conf
 %%DATADIR%%/locales.d/af.conf
+%%DATADIR%%/locales.d/ar_EG-cp1256.conf
+%%DATADIR%%/locales.d/ar_EG-utf8.conf
 %%DATADIR%%/locales.d/bg_BG-cp1251.conf
 %%DATADIR%%/locales.d/bg_BG-utf8.conf
 %%DATADIR%%/locales.d/cs-utf8.conf
@@ -181,6 +191,7 @@ libdata/pkgconfig/sword.pc
 %%DATADIR%%/locales.d/fi.conf
 %%DATADIR%%/locales.d/fr-utf8.conf
 %%DATADIR%%/locales.d/fr.conf
+%%DATADIR%%/locales.d/he-utf8.conf
 %%DATADIR%%/locales.d/hu-utf8.conf
 %%DATADIR%%/locales.d/hu.conf
 %%DATADIR%%/locales.d/id.conf
@@ -210,13 +221,12 @@ libdata/pkgconfig/sword.pc
 %%DATADIR%%/locales.d/sl.conf
 %%DATADIR%%/locales.d/sv-utf8.conf
 %%DATADIR%%/locales.d/sv.conf
+%%DATADIR%%/locales.d/th-utf8.conf
 %%DATADIR%%/locales.d/uk_UA-cp1251.conf
 %%DATADIR%%/locales.d/uk_UA-koi8-u.conf
 %%DATADIR%%/locales.d/uk_UA-utf8.conf
 @dirrm %%DATADIR%%/mods.d
 @dirrm %%DATADIR%%/locales.d
 @dirrm %%DATADIR%%
-@dirrm share/nls/en_US.US-ASCII
-@dirrm share/nls/POSIX
 @dirrm lib/sword
 @dirrm include/sword
diff --git a/misc/sword15/Makefile b/misc/sword15/Makefile
index 35522a87796c..fa332f6c91fe 100644
--- a/misc/sword15/Makefile
+++ b/misc/sword15/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	sword
-PORTVERSION=	1.5.8
+PORTVERSION=	1.5.9
 CATEGORIES=	misc
 MASTER_SITES=	ftp://ftp.crosswire.org/pub/sword/source/v1.5/ \
     		http://www.goodking.ca/pub/files/
@@ -16,16 +16,14 @@ COMMENT=	A project framework for manipulating Bible texts
 
 USE_GNOME=	pkgconfig
 USE_GMAKE=	yes
-USE_GCC=	3.2+
+USE_GCC=	3.4+
 GNU_CONFIGURE=	yes
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
-CONFIGURE_ARGS+=	--without-conf
+CONFIGURE_ARGS+=	--without-conf --without-clucene
 USE_LDCONFIG=	yes
 SUB_FILES=	pkg-message
 PKGMESSAGE=	${WRKDIR}/pkg-message
 
-.include <bsd.port.pre.mk>
-
 .if defined(WITHOUT_CURL)
 CONFIGURE_ARGS+=	--without-curl
 PLIST_SUB+=	INSTALLMGR="@comment "
@@ -56,4 +54,4 @@ post-install:
 register:
 	@(cd ${WRKSRC} && make register)
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/misc/sword15/distinfo b/misc/sword15/distinfo
index a2f49f6af447..addda689560f 100644
--- a/misc/sword15/distinfo
+++ b/misc/sword15/distinfo
@@ -1,3 +1,3 @@
-MD5 (sword-1.5.8.tar.gz) = c36398c84bfb044c0c66ef3ffcf29400
-SHA256 (sword-1.5.8.tar.gz) = aeb57fe89716807f331eb17fcf23ef1ba3ad3e7018cd2d32560677ffe6937ce9
-SIZE (sword-1.5.8.tar.gz) = 1714799
+MD5 (sword-1.5.9.tar.gz) = e1f1af8c2add8310d0bbcddc9af523b8
+SHA256 (sword-1.5.9.tar.gz) = dd170431235cc419cbe6c40362640927a78dc93e082623709abe1310fe804481
+SIZE (sword-1.5.9.tar.gz) = 1816315
diff --git a/misc/sword15/files/pkg-message.in b/misc/sword15/files/pkg-message.in
index fa3a2c01a95b..c4cd86f79ca2 100644
--- a/misc/sword15/files/pkg-message.in
+++ b/misc/sword15/files/pkg-message.in
@@ -1,7 +1,8 @@
-To use sword, you need to have bible, commentary and/or lexicon modules. You
-can install those from the crosswire website in two ways. If you live in a
-persecuted country however and do not wish to risk detection, you should *not*
-try this.
+To use sword, you need to have bible, commentary and/or lexicon
+modules. You can install those from the crosswire website in two
+ways. If you live in a persecuted country however and do not wish
+to risk detection, you should *not* try this.
+
   1. Use installmgr (doesn't work when port is built WITHOUT_CURL). E.g.:
      # installmgr -init
      # installmgr -r crosswire
@@ -11,5 +12,5 @@ try this.
        http://www.crosswire.org/sword/modules/
      and unpack them in %%PREFIX%%/share/sword.
 
-You probabely want to install a bible-application that uses sword, like
-cheatah, bibletime or gnomesword.
+You probabely want to install a bible-application that uses sword,
+like bibletime or gnomesword.
diff --git a/misc/sword15/pkg-descr b/misc/sword15/pkg-descr
index c4a498ba7422..c87f98fae37a 100644
--- a/misc/sword15/pkg-descr
+++ b/misc/sword15/pkg-descr
@@ -1,8 +1,8 @@
 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 build using this
-framework. An installed module set may be shared between any frontend
-using the framework.
+lexicons, dictionaries, etc.  Many frontends are built using this
+framework. An installed module set may be shared between many
+frontends using the framework.
 
 WWW: http://www.crosswire.org/sword/
diff --git a/misc/sword15/pkg-plist b/misc/sword15/pkg-plist
index 4d6129aa89dd..3234e4fbd15d 100644
--- a/misc/sword15/pkg-plist
+++ b/misc/sword15/pkg-plist
@@ -1,5 +1,6 @@
 bin/addld
 bin/diatheke
+bin/imp2gbs
 bin/imp2ld
 bin/imp2vs
 bin/installmgr
@@ -11,6 +12,7 @@ bin/mod2zmod
 bin/osis2mod
 bin/vpl2mod
 bin/vs2osisref
+bin/xml2gbs
 etc/sword.conf
 include/sword/Greek2Greek.h
 include/sword/GreekChars.h
@@ -40,6 +42,7 @@ include/sword/gbfrtf.h
 include/sword/gbfstrongs.h
 include/sword/gbfthml.h
 include/sword/gbfwebif.h
+include/sword/gbfwordjs.h
 include/sword/greeklexattribs.h
 include/sword/hebrewmcim.h
 include/sword/hrefcom.h
@@ -57,6 +60,7 @@ include/sword/osisheadings.h
 include/sword/osishtmlhref.h
 include/sword/osislemma.h
 include/sword/osismorph.h
+include/sword/osismorphsegmentation.h
 include/sword/osisosis.h
 include/sword/osisplain.h
 include/sword/osisredletterwords.h
@@ -65,6 +69,7 @@ include/sword/osisscripref.h
 include/sword/osisstrongs.h
 include/sword/osiswebif.h
 include/sword/osiswordjs.h
+include/sword/papyriplain.h
 include/sword/plainfootnotes.h
 include/sword/plainhtml.h
 include/sword/rawcom.h
@@ -109,6 +114,8 @@ include/sword/swtext.h
 include/sword/swunicod.h
 include/sword/swversion.h
 include/sword/sysdata.h
+include/sword/teiplain.h
+include/sword/teirtf.h
 include/sword/thmlfootnotes.h
 include/sword/thmlgbf.h
 include/sword/thmlheadings.h
@@ -144,6 +151,7 @@ include/sword/utf8utf16.h
 include/sword/utilstr.h
 include/sword/utilxml.h
 include/sword/versekey.h
+include/sword/versetreekey.h
 include/sword/zcom.h
 include/sword/zconf.h
 include/sword/zipcomprs.h
@@ -152,7 +160,7 @@ include/sword/zlib.h
 include/sword/zstr.h
 include/sword/ztext.h
 include/sword/zverse.h
-lib/libsword-1.5.8.so
+lib/libsword-1.5.9.so
 lib/libsword.a
 lib/libsword.la
 lib/libsword.so
@@ -160,6 +168,8 @@ libdata/pkgconfig/sword.pc
 %%DATADIR%%/locales.d/abbr.conf
 %%DATADIR%%/locales.d/af-utf8.conf
 %%DATADIR%%/locales.d/af.conf
+%%DATADIR%%/locales.d/ar_EG-cp1256.conf
+%%DATADIR%%/locales.d/ar_EG-utf8.conf
 %%DATADIR%%/locales.d/bg_BG-cp1251.conf
 %%DATADIR%%/locales.d/bg_BG-utf8.conf
 %%DATADIR%%/locales.d/cs-utf8.conf
@@ -181,6 +191,7 @@ libdata/pkgconfig/sword.pc
 %%DATADIR%%/locales.d/fi.conf
 %%DATADIR%%/locales.d/fr-utf8.conf
 %%DATADIR%%/locales.d/fr.conf
+%%DATADIR%%/locales.d/he-utf8.conf
 %%DATADIR%%/locales.d/hu-utf8.conf
 %%DATADIR%%/locales.d/hu.conf
 %%DATADIR%%/locales.d/id.conf
@@ -210,13 +221,12 @@ libdata/pkgconfig/sword.pc
 %%DATADIR%%/locales.d/sl.conf
 %%DATADIR%%/locales.d/sv-utf8.conf
 %%DATADIR%%/locales.d/sv.conf
+%%DATADIR%%/locales.d/th-utf8.conf
 %%DATADIR%%/locales.d/uk_UA-cp1251.conf
 %%DATADIR%%/locales.d/uk_UA-koi8-u.conf
 %%DATADIR%%/locales.d/uk_UA-utf8.conf
 @dirrm %%DATADIR%%/mods.d
 @dirrm %%DATADIR%%/locales.d
 @dirrm %%DATADIR%%
-@dirrm share/nls/en_US.US-ASCII
-@dirrm share/nls/POSIX
 @dirrm lib/sword
 @dirrm include/sword