- Update to 2.1

4 files changed, 143 insertions, 15 deletions

diff --git a/misc/bibletime-kde4/Makefile b/misc/bibletime-kde4/Makefile
index d9f141d26205..be75fbef3279 100644
--- a/misc/bibletime-kde4/Makefile
+++ b/misc/bibletime-kde4/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	bibletime
-PORTVERSION=	2.0.1
+PORTVERSION=	2.1
 CATEGORIES=	misc kde
 MASTER_SITES=	SF
 PKGNAMESUFFIX=	-kde4
@@ -14,7 +14,7 @@ PKGNAMESUFFIX=	-kde4
 MAINTAINER=	tabthorpe@FreeBSD.org
 COMMENT=	An opensource Bible study tool
 
-RUN_DEPENDS=	${LOCALBASE}/lib/libsword-1.5.11.so:${PORTSDIR}/misc/sword15
+RUN_DEPENDS=	${LOCALBASE}/lib/libsword-1.6.0.so:${PORTSDIR}/misc/sword
 BUILD_DEPENDS=	${RUN_DEPENDS}
 LIB_DEPENDS=	boost_python:${PORTSDIR}/devel/boost-python \
 		clucene.0:${PORTSDIR}/textproc/clucene
diff --git a/misc/bibletime-kde4/distinfo b/misc/bibletime-kde4/distinfo
index b44ff4864296..8e128ff0da07 100644
--- a/misc/bibletime-kde4/distinfo
+++ b/misc/bibletime-kde4/distinfo
@@ -1,3 +1,3 @@
-MD5 (bibletime-2.0.1.tar.gz) = 1eaef5b96a9749932d50ac8f888c3778
-SHA256 (bibletime-2.0.1.tar.gz) = 7e7c97f13d19f4e3eb4eecd88dc2096c27b170f1cc1c1f66bea309f9583ba2dc
-SIZE (bibletime-2.0.1.tar.gz) = 4287313
+MD5 (bibletime-2.1.tar.gz) = 79bb28840f655e7e5d6ce759e41dd832
+SHA256 (bibletime-2.1.tar.gz) = 2fd170eeb76c78ed769243039fad0d3e813aab820882ac3a77bde8865937eaeb
+SIZE (bibletime-2.1.tar.gz) = 4367568
diff --git a/misc/bibletime-kde4/pkg-descr b/misc/bibletime-kde4/pkg-descr
index e4e3f6a1f992..afb4781dbf49 100644
--- a/misc/bibletime-kde4/pkg-descr
+++ b/misc/bibletime-kde4/pkg-descr
@@ -1,12 +1,5 @@
-BibleTime is a powerful Bible study application for the K Desktop
-Environment running on Unix operating systems.  BibleTime is based
-on the Sword library which provides access to all the different
-text modules created by the Crosswire Bible Society.
-
-Current features are: toolbar, splitted window with index and MDI
-interface, searching in one or more modules supporting regular
-expressions, graphical search analysis, bookmarks, drag & drop,
-WYSIWYG html editing for comments, printing and an extensive help
-system.
+BibleTime is an open source Bible study application, based on the
+Sword library which provides access to all the different text modules
+created by the Crosswire Bible Society.
 
 WWW:  http://www.bibletime.info/
diff --git a/misc/bibletime-kde4/pkg-plist b/misc/bibletime-kde4/pkg-plist
index 7add9231ab0b..e88a8b3e34c8 100644
--- a/misc/bibletime-kde4/pkg-plist
+++ b/misc/bibletime-kde4/pkg-plist
@@ -14,17 +14,30 @@ share/applications/bibletime.desktop
 %%DATADIR%%/docs/handbook/cs/hdbk-op.html
 %%DATADIR%%/docs/handbook/cs/hdbk-reference-hotkeys.html
 %%DATADIR%%/docs/handbook/cs/hdbk-reference-toolbar.html
+%%DATADIR%%/docs/handbook/cs/hdbk-reference-works.html
 %%DATADIR%%/docs/handbook/cs/hdbk-reference.html
 %%DATADIR%%/docs/handbook/cs/hdbk-startsequence.html
 %%DATADIR%%/docs/handbook/cs/hdbk-term.html
+%%DATADIR%%/docs/handbook/cs/i_back.png
+%%DATADIR%%/docs/handbook/cs/i_bible.png
+%%DATADIR%%/docs/handbook/cs/i_bible_add.png
 %%DATADIR%%/docs/handbook/cs/i_bibletime.png
+%%DATADIR%%/docs/handbook/cs/i_book.png
+%%DATADIR%%/docs/handbook/cs/i_book_add.png
 %%DATADIR%%/docs/handbook/cs/i_cascade.png
+%%DATADIR%%/docs/handbook/cs/i_commentary.png
+%%DATADIR%%/docs/handbook/cs/i_commentary_add.png
 %%DATADIR%%/docs/handbook/cs/i_configure.png
 %%DATADIR%%/docs/handbook/cs/i_configuresword.png
 %%DATADIR%%/docs/handbook/cs/i_contents2.png
+%%DATADIR%%/docs/handbook/cs/i_displayconfig.png
 %%DATADIR%%/docs/handbook/cs/i_exit.png
 %%DATADIR%%/docs/handbook/cs/i_fileclose.png
 %%DATADIR%%/docs/handbook/cs/i_find.png
+%%DATADIR%%/docs/handbook/cs/i_forward.png
+%%DATADIR%%/docs/handbook/cs/i_lexicon.png
+%%DATADIR%%/docs/handbook/cs/i_lexicon_add.png
+%%DATADIR%%/docs/handbook/cs/i_sync.png
 %%DATADIR%%/docs/handbook/cs/i_tile_horiz.png
 %%DATADIR%%/docs/handbook/cs/i_tile_vert.png
 %%DATADIR%%/docs/handbook/cs/i_view_index.png
@@ -44,17 +57,30 @@ share/applications/bibletime.desktop
 %%DATADIR%%/docs/handbook/de/hdbk-op.html
 %%DATADIR%%/docs/handbook/de/hdbk-reference-hotkeys.html
 %%DATADIR%%/docs/handbook/de/hdbk-reference-toolbar.html
+%%DATADIR%%/docs/handbook/de/hdbk-reference-works.html
 %%DATADIR%%/docs/handbook/de/hdbk-reference.html
 %%DATADIR%%/docs/handbook/de/hdbk-startsequence.html
 %%DATADIR%%/docs/handbook/de/hdbk-term.html
+%%DATADIR%%/docs/handbook/de/i_back.png
+%%DATADIR%%/docs/handbook/de/i_bible.png
+%%DATADIR%%/docs/handbook/de/i_bible_add.png
 %%DATADIR%%/docs/handbook/de/i_bibletime.png
+%%DATADIR%%/docs/handbook/de/i_book.png
+%%DATADIR%%/docs/handbook/de/i_book_add.png
 %%DATADIR%%/docs/handbook/de/i_cascade.png
+%%DATADIR%%/docs/handbook/de/i_commentary.png
+%%DATADIR%%/docs/handbook/de/i_commentary_add.png
 %%DATADIR%%/docs/handbook/de/i_configure.png
 %%DATADIR%%/docs/handbook/de/i_configuresword.png
 %%DATADIR%%/docs/handbook/de/i_contents2.png
+%%DATADIR%%/docs/handbook/de/i_displayconfig.png
 %%DATADIR%%/docs/handbook/de/i_exit.png
 %%DATADIR%%/docs/handbook/de/i_fileclose.png
 %%DATADIR%%/docs/handbook/de/i_find.png
+%%DATADIR%%/docs/handbook/de/i_forward.png
+%%DATADIR%%/docs/handbook/de/i_lexicon.png
+%%DATADIR%%/docs/handbook/de/i_lexicon_add.png
+%%DATADIR%%/docs/handbook/de/i_sync.png
 %%DATADIR%%/docs/handbook/de/i_tile_horiz.png
 %%DATADIR%%/docs/handbook/de/i_tile_vert.png
 %%DATADIR%%/docs/handbook/de/i_view_index.png
@@ -74,17 +100,30 @@ share/applications/bibletime.desktop
 %%DATADIR%%/docs/handbook/en/hdbk-op.html
 %%DATADIR%%/docs/handbook/en/hdbk-reference-hotkeys.html
 %%DATADIR%%/docs/handbook/en/hdbk-reference-toolbar.html
+%%DATADIR%%/docs/handbook/en/hdbk-reference-works.html
 %%DATADIR%%/docs/handbook/en/hdbk-reference.html
 %%DATADIR%%/docs/handbook/en/hdbk-startsequence.html
 %%DATADIR%%/docs/handbook/en/hdbk-term.html
+%%DATADIR%%/docs/handbook/en/i_back.png
+%%DATADIR%%/docs/handbook/en/i_bible.png
+%%DATADIR%%/docs/handbook/en/i_bible_add.png
 %%DATADIR%%/docs/handbook/en/i_bibletime.png
+%%DATADIR%%/docs/handbook/en/i_book.png
+%%DATADIR%%/docs/handbook/en/i_book_add.png
 %%DATADIR%%/docs/handbook/en/i_cascade.png
+%%DATADIR%%/docs/handbook/en/i_commentary.png
+%%DATADIR%%/docs/handbook/en/i_commentary_add.png
 %%DATADIR%%/docs/handbook/en/i_configure.png
 %%DATADIR%%/docs/handbook/en/i_configuresword.png
 %%DATADIR%%/docs/handbook/en/i_contents2.png
+%%DATADIR%%/docs/handbook/en/i_displayconfig.png
 %%DATADIR%%/docs/handbook/en/i_exit.png
 %%DATADIR%%/docs/handbook/en/i_fileclose.png
 %%DATADIR%%/docs/handbook/en/i_find.png
+%%DATADIR%%/docs/handbook/en/i_forward.png
+%%DATADIR%%/docs/handbook/en/i_lexicon.png
+%%DATADIR%%/docs/handbook/en/i_lexicon_add.png
+%%DATADIR%%/docs/handbook/en/i_sync.png
 %%DATADIR%%/docs/handbook/en/i_tile_horiz.png
 %%DATADIR%%/docs/handbook/en/i_tile_vert.png
 %%DATADIR%%/docs/handbook/en/i_view_index.png
@@ -104,17 +143,30 @@ share/applications/bibletime.desktop
 %%DATADIR%%/docs/handbook/fi/hdbk-op.html
 %%DATADIR%%/docs/handbook/fi/hdbk-reference-hotkeys.html
 %%DATADIR%%/docs/handbook/fi/hdbk-reference-toolbar.html
+%%DATADIR%%/docs/handbook/fi/hdbk-reference-works.html
 %%DATADIR%%/docs/handbook/fi/hdbk-reference.html
 %%DATADIR%%/docs/handbook/fi/hdbk-startsequence.html
 %%DATADIR%%/docs/handbook/fi/hdbk-term.html
+%%DATADIR%%/docs/handbook/fi/i_back.png
+%%DATADIR%%/docs/handbook/fi/i_bible.png
+%%DATADIR%%/docs/handbook/fi/i_bible_add.png
 %%DATADIR%%/docs/handbook/fi/i_bibletime.png
+%%DATADIR%%/docs/handbook/fi/i_book.png
+%%DATADIR%%/docs/handbook/fi/i_book_add.png
 %%DATADIR%%/docs/handbook/fi/i_cascade.png
+%%DATADIR%%/docs/handbook/fi/i_commentary.png
+%%DATADIR%%/docs/handbook/fi/i_commentary_add.png
 %%DATADIR%%/docs/handbook/fi/i_configure.png
 %%DATADIR%%/docs/handbook/fi/i_configuresword.png
 %%DATADIR%%/docs/handbook/fi/i_contents2.png
+%%DATADIR%%/docs/handbook/fi/i_displayconfig.png
 %%DATADIR%%/docs/handbook/fi/i_exit.png
 %%DATADIR%%/docs/handbook/fi/i_fileclose.png
 %%DATADIR%%/docs/handbook/fi/i_find.png
+%%DATADIR%%/docs/handbook/fi/i_forward.png
+%%DATADIR%%/docs/handbook/fi/i_lexicon.png
+%%DATADIR%%/docs/handbook/fi/i_lexicon_add.png
+%%DATADIR%%/docs/handbook/fi/i_sync.png
 %%DATADIR%%/docs/handbook/fi/i_tile_horiz.png
 %%DATADIR%%/docs/handbook/fi/i_tile_vert.png
 %%DATADIR%%/docs/handbook/fi/i_view_index.png
@@ -134,17 +186,30 @@ share/applications/bibletime.desktop
 %%DATADIR%%/docs/handbook/fr/hdbk-op.html
 %%DATADIR%%/docs/handbook/fr/hdbk-reference-hotkeys.html
 %%DATADIR%%/docs/handbook/fr/hdbk-reference-toolbar.html
+%%DATADIR%%/docs/handbook/fr/hdbk-reference-works.html
 %%DATADIR%%/docs/handbook/fr/hdbk-reference.html
 %%DATADIR%%/docs/handbook/fr/hdbk-startsequence.html
 %%DATADIR%%/docs/handbook/fr/hdbk-term.html
+%%DATADIR%%/docs/handbook/fr/i_back.png
+%%DATADIR%%/docs/handbook/fr/i_bible.png
+%%DATADIR%%/docs/handbook/fr/i_bible_add.png
 %%DATADIR%%/docs/handbook/fr/i_bibletime.png
+%%DATADIR%%/docs/handbook/fr/i_book.png
+%%DATADIR%%/docs/handbook/fr/i_book_add.png
 %%DATADIR%%/docs/handbook/fr/i_cascade.png
+%%DATADIR%%/docs/handbook/fr/i_commentary.png
+%%DATADIR%%/docs/handbook/fr/i_commentary_add.png
 %%DATADIR%%/docs/handbook/fr/i_configure.png
 %%DATADIR%%/docs/handbook/fr/i_configuresword.png
 %%DATADIR%%/docs/handbook/fr/i_contents2.png
+%%DATADIR%%/docs/handbook/fr/i_displayconfig.png
 %%DATADIR%%/docs/handbook/fr/i_exit.png
 %%DATADIR%%/docs/handbook/fr/i_fileclose.png
 %%DATADIR%%/docs/handbook/fr/i_find.png
+%%DATADIR%%/docs/handbook/fr/i_forward.png
+%%DATADIR%%/docs/handbook/fr/i_lexicon.png
+%%DATADIR%%/docs/handbook/fr/i_lexicon_add.png
+%%DATADIR%%/docs/handbook/fr/i_sync.png
 %%DATADIR%%/docs/handbook/fr/i_tile_horiz.png
 %%DATADIR%%/docs/handbook/fr/i_tile_vert.png
 %%DATADIR%%/docs/handbook/fr/i_view_index.png
@@ -164,17 +229,30 @@ share/applications/bibletime.desktop
 %%DATADIR%%/docs/handbook/hu/hdbk-op.html
 %%DATADIR%%/docs/handbook/hu/hdbk-reference-hotkeys.html
 %%DATADIR%%/docs/handbook/hu/hdbk-reference-toolbar.html
+%%DATADIR%%/docs/handbook/hu/hdbk-reference-works.html
 %%DATADIR%%/docs/handbook/hu/hdbk-reference.html
 %%DATADIR%%/docs/handbook/hu/hdbk-startsequence.html
 %%DATADIR%%/docs/handbook/hu/hdbk-term.html
+%%DATADIR%%/docs/handbook/hu/i_back.png
+%%DATADIR%%/docs/handbook/hu/i_bible.png
+%%DATADIR%%/docs/handbook/hu/i_bible_add.png
 %%DATADIR%%/docs/handbook/hu/i_bibletime.png
+%%DATADIR%%/docs/handbook/hu/i_book.png
+%%DATADIR%%/docs/handbook/hu/i_book_add.png
 %%DATADIR%%/docs/handbook/hu/i_cascade.png
+%%DATADIR%%/docs/handbook/hu/i_commentary.png
+%%DATADIR%%/docs/handbook/hu/i_commentary_add.png
 %%DATADIR%%/docs/handbook/hu/i_configure.png
 %%DATADIR%%/docs/handbook/hu/i_configuresword.png
 %%DATADIR%%/docs/handbook/hu/i_contents2.png
+%%DATADIR%%/docs/handbook/hu/i_displayconfig.png
 %%DATADIR%%/docs/handbook/hu/i_exit.png
 %%DATADIR%%/docs/handbook/hu/i_fileclose.png
 %%DATADIR%%/docs/handbook/hu/i_find.png
+%%DATADIR%%/docs/handbook/hu/i_forward.png
+%%DATADIR%%/docs/handbook/hu/i_lexicon.png
+%%DATADIR%%/docs/handbook/hu/i_lexicon_add.png
+%%DATADIR%%/docs/handbook/hu/i_sync.png
 %%DATADIR%%/docs/handbook/hu/i_tile_horiz.png
 %%DATADIR%%/docs/handbook/hu/i_tile_vert.png
 %%DATADIR%%/docs/handbook/hu/i_view_index.png
@@ -194,17 +272,30 @@ share/applications/bibletime.desktop
 %%DATADIR%%/docs/handbook/nl/hdbk-op.html
 %%DATADIR%%/docs/handbook/nl/hdbk-reference-hotkeys.html
 %%DATADIR%%/docs/handbook/nl/hdbk-reference-toolbar.html
+%%DATADIR%%/docs/handbook/nl/hdbk-reference-works.html
 %%DATADIR%%/docs/handbook/nl/hdbk-reference.html
 %%DATADIR%%/docs/handbook/nl/hdbk-startsequence.html
 %%DATADIR%%/docs/handbook/nl/hdbk-term.html
+%%DATADIR%%/docs/handbook/nl/i_back.png
+%%DATADIR%%/docs/handbook/nl/i_bible.png
+%%DATADIR%%/docs/handbook/nl/i_bible_add.png
 %%DATADIR%%/docs/handbook/nl/i_bibletime.png
+%%DATADIR%%/docs/handbook/nl/i_book.png
+%%DATADIR%%/docs/handbook/nl/i_book_add.png
 %%DATADIR%%/docs/handbook/nl/i_cascade.png
+%%DATADIR%%/docs/handbook/nl/i_commentary.png
+%%DATADIR%%/docs/handbook/nl/i_commentary_add.png
 %%DATADIR%%/docs/handbook/nl/i_configure.png
 %%DATADIR%%/docs/handbook/nl/i_configuresword.png
 %%DATADIR%%/docs/handbook/nl/i_contents2.png
+%%DATADIR%%/docs/handbook/nl/i_displayconfig.png
 %%DATADIR%%/docs/handbook/nl/i_exit.png
 %%DATADIR%%/docs/handbook/nl/i_fileclose.png
 %%DATADIR%%/docs/handbook/nl/i_find.png
+%%DATADIR%%/docs/handbook/nl/i_forward.png
+%%DATADIR%%/docs/handbook/nl/i_lexicon.png
+%%DATADIR%%/docs/handbook/nl/i_lexicon_add.png
+%%DATADIR%%/docs/handbook/nl/i_sync.png
 %%DATADIR%%/docs/handbook/nl/i_tile_horiz.png
 %%DATADIR%%/docs/handbook/nl/i_tile_vert.png
 %%DATADIR%%/docs/handbook/nl/i_view_index.png
@@ -215,6 +306,48 @@ share/applications/bibletime.desktop
 %%DATADIR%%/docs/handbook/nl/ss_mainterms.png
 %%DATADIR%%/docs/handbook/nl/ss_searchanal.png
 %%DATADIR%%/docs/handbook/nl/ss_searchopts.png
+%%DATADIR%%/docs/handbook/pt-br/hdbk-config.html
+%%DATADIR%%/docs/handbook/pt-br/hdbk-intro.html
+%%DATADIR%%/docs/handbook/pt-br/hdbk-op-bookshelfmanager.html
+%%DATADIR%%/docs/handbook/pt-br/hdbk-op-output.html
+%%DATADIR%%/docs/handbook/pt-br/hdbk-op-parts.html
+%%DATADIR%%/docs/handbook/pt-br/hdbk-op-search.html
+%%DATADIR%%/docs/handbook/pt-br/hdbk-op.html
+%%DATADIR%%/docs/handbook/pt-br/hdbk-reference-hotkeys.html
+%%DATADIR%%/docs/handbook/pt-br/hdbk-reference-works.html
+%%DATADIR%%/docs/handbook/pt-br/hdbk-reference.html
+%%DATADIR%%/docs/handbook/pt-br/hdbk-startsequence.html
+%%DATADIR%%/docs/handbook/pt-br/hdbk-term.html
+%%DATADIR%%/docs/handbook/pt-br/i_back.png
+%%DATADIR%%/docs/handbook/pt-br/i_bible.png
+%%DATADIR%%/docs/handbook/pt-br/i_bible_add.png
+%%DATADIR%%/docs/handbook/pt-br/i_bibletime.png
+%%DATADIR%%/docs/handbook/pt-br/i_book.png
+%%DATADIR%%/docs/handbook/pt-br/i_book_add.png
+%%DATADIR%%/docs/handbook/pt-br/i_cascade.png
+%%DATADIR%%/docs/handbook/pt-br/i_commentary.png
+%%DATADIR%%/docs/handbook/pt-br/i_commentary_add.png
+%%DATADIR%%/docs/handbook/pt-br/i_configure.png
+%%DATADIR%%/docs/handbook/pt-br/i_configuresword.png
+%%DATADIR%%/docs/handbook/pt-br/i_contents2.png
+%%DATADIR%%/docs/handbook/pt-br/i_displayconfig.png
+%%DATADIR%%/docs/handbook/pt-br/i_exit.png
+%%DATADIR%%/docs/handbook/pt-br/i_fileclose.png
+%%DATADIR%%/docs/handbook/pt-br/i_find.png
+%%DATADIR%%/docs/handbook/pt-br/i_forward.png
+%%DATADIR%%/docs/handbook/pt-br/i_lexicon.png
+%%DATADIR%%/docs/handbook/pt-br/i_lexicon_add.png
+%%DATADIR%%/docs/handbook/pt-br/i_sync.png
+%%DATADIR%%/docs/handbook/pt-br/i_tile_horiz.png
+%%DATADIR%%/docs/handbook/pt-br/i_tile_vert.png
+%%DATADIR%%/docs/handbook/pt-br/i_view_index.png
+%%DATADIR%%/docs/handbook/pt-br/i_view_mag.png
+%%DATADIR%%/docs/handbook/pt-br/i_window_fullscreen.png
+%%DATADIR%%/docs/handbook/pt-br/index.html
+%%DATADIR%%/docs/handbook/pt-br/ss_configfonts.png
+%%DATADIR%%/docs/handbook/pt-br/ss_mainterms.png
+%%DATADIR%%/docs/handbook/pt-br/ss_searchanal.png
+%%DATADIR%%/docs/handbook/pt-br/ss_searchopts.png
 %%DATADIR%%/docs/howto/bg/h2-basics-approaches.html
 %%DATADIR%%/docs/howto/bg/h2-basics-expository.html
 %%DATADIR%%/docs/howto/bg/h2-basics-interpretation.html
@@ -565,6 +698,7 @@ share/applications/bibletime.desktop
 %%DATADIR%%/locale/bibletime_ui_zh_TW.qm
 %%DATADIR%%/pics/startuplogo.png
 share/icons/bibletime.svg
+@dirrmtry share/icons
 @dirrm %%DATADIR%%/pics
 @dirrm %%DATADIR%%/locale
 @dirrm %%DATADIR%%/license
@@ -583,6 +717,7 @@ share/icons/bibletime.svg
 @dirrm %%DATADIR%%/docs/howto/cs
 @dirrm %%DATADIR%%/docs/howto/bg
 @dirrm %%DATADIR%%/docs/howto
+@dirrm %%DATADIR%%/docs/handbook/pt-br
 @dirrm %%DATADIR%%/docs/handbook/nl
 @dirrm %%DATADIR%%/docs/handbook/hu
 @dirrm %%DATADIR%%/docs/handbook/fr