- Update to 1.6.2

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

16 files changed, 236 insertions, 264 deletions

diff --git a/misc/bibletime-devel/Makefile b/misc/bibletime-devel/Makefile
index c38425b27752..e913caa18ae7 100644
--- a/misc/bibletime-devel/Makefile
+++ b/misc/bibletime-devel/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	bibletime
-PORTVERSION=	1.6.1
+PORTVERSION=	1.6.2
 CATEGORIES=	misc
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -27,6 +27,8 @@ CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ARGS+=	--enable-static-clucene
 INSTALLS_ICONS=	yes
 
+DOCSDIR=	share/doc/HTML/en/bibletime
+
 .include <bsd.port.pre.mk>
 
 .if ${OSVERSION} < 500000
diff --git a/misc/bibletime-devel/distinfo b/misc/bibletime-devel/distinfo
index bf98f66b9a99..4f9a2ad94a7e 100644
--- a/misc/bibletime-devel/distinfo
+++ b/misc/bibletime-devel/distinfo
@@ -1,3 +1,3 @@
-MD5 (bibletime-1.6.1.tar.bz2) = d8a256c9078a858cd5130bdc19ffd7bb
-SHA256 (bibletime-1.6.1.tar.bz2) = 2063274fa79052416fdb29121fd9951f0007625226e39590e8061d766cdb7abb
-SIZE (bibletime-1.6.1.tar.bz2) = 1227796
+MD5 (bibletime-1.6.2.tar.bz2) = b2b8b624d21d397201aec742d43501e5
+SHA256 (bibletime-1.6.2.tar.bz2) = 63a4180f0781f28a5e0efbcf09c6f53f63bdc6fba19d58ffe2ac496cdc086750
+SIZE (bibletime-1.6.2.tar.bz2) = 1234620
diff --git a/misc/bibletime-devel/files/patch-bibletime::backend::cswordbackend.cpp b/misc/bibletime-devel/files/patch-bibletime::backend::cswordbackend.cpp
deleted file mode 100644
index f14425d2f1f0..000000000000
--- a/misc/bibletime-devel/files/patch-bibletime::backend::cswordbackend.cpp
+++ /dev/null
@@ -1,9 +0,0 @@
---- bibletime/backend/cswordbackend.cpp.orig	Sat Sep 10 04:19:40 2005
-+++ bibletime/backend/cswordbackend.cpp	Thu Jul 13 08:58:04 2006
-@@ -1,3 +1,6 @@
-+//
-+// please send this patch- to the attic.
-+//
- /********* Read the file LICENSE for license details. *********/
- 
- //BibleTime includes
diff --git a/misc/bibletime-devel/pkg-plist b/misc/bibletime-devel/pkg-plist
index 27db53b56628..6050ee65269b 100644
--- a/misc/bibletime-devel/pkg-plist
+++ b/misc/bibletime-devel/pkg-plist
@@ -4,56 +4,56 @@ share/applications/bibletime.desktop
 share/apps/bibletime/bibletimeui.rc
 share/apps/bibletime/pics/startuplogo.png
 share/apps/bibletime/tips
-share/doc/HTML/en/bibletime/handbook/common
-share/doc/HTML/en/bibletime/handbook/hdbk-config.docbook
-share/doc/HTML/en/bibletime/handbook/hdbk-intro.docbook
-share/doc/HTML/en/bibletime/handbook/hdbk-operation.docbook
-share/doc/HTML/en/bibletime/handbook/hdbk-reference.docbook
-share/doc/HTML/en/bibletime/handbook/hdbk-start.docbook
-share/doc/HTML/en/bibletime/handbook/i_bible.png
-share/doc/HTML/en/bibletime/handbook/i_bible_add.png
-share/doc/HTML/en/bibletime/handbook/i_bibletime.png
-share/doc/HTML/en/bibletime/handbook/i_book.png
-share/doc/HTML/en/bibletime/handbook/i_book_add.png
-share/doc/HTML/en/bibletime/handbook/i_cascade.png
-share/doc/HTML/en/bibletime/handbook/i_cascade_auto.png
-share/doc/HTML/en/bibletime/handbook/i_commentary.png
-share/doc/HTML/en/bibletime/handbook/i_commentary_add.png
-share/doc/HTML/en/bibletime/handbook/i_configure.png
-share/doc/HTML/en/bibletime/handbook/i_configureaccels.png
-share/doc/HTML/en/bibletime/handbook/i_configuredisplay.png
-share/doc/HTML/en/bibletime/handbook/i_configurefonts.png
-share/doc/HTML/en/bibletime/handbook/i_configurestart.png
-share/doc/HTML/en/bibletime/handbook/i_configuresword.png
-share/doc/HTML/en/bibletime/handbook/i_configuretoolbars.png
-share/doc/HTML/en/bibletime/handbook/i_contents.png
-share/doc/HTML/en/bibletime/handbook/i_delete.png
-share/doc/HTML/en/bibletime/handbook/i_editdelete.png
-share/doc/HTML/en/bibletime/handbook/i_exit.png
-share/doc/HTML/en/bibletime/handbook/i_fileclose.png
-share/doc/HTML/en/bibletime/handbook/i_fileprint.png
-share/doc/HTML/en/bibletime/handbook/i_find.png
-share/doc/HTML/en/bibletime/handbook/i_fullscreen.png
-share/doc/HTML/en/bibletime/handbook/i_go.png
-share/doc/HTML/en/bibletime/handbook/i_ktip.png
-share/doc/HTML/en/bibletime/handbook/i_lexicon.png
-share/doc/HTML/en/bibletime/handbook/i_lexicon_add.png
-share/doc/HTML/en/bibletime/handbook/i_pencil.png
-share/doc/HTML/en/bibletime/handbook/i_sidetree.png
-share/doc/HTML/en/bibletime/handbook/i_sync.png
-share/doc/HTML/en/bibletime/handbook/i_tile.png
-share/doc/HTML/en/bibletime/handbook/i_tile_auto.png
-share/doc/HTML/en/bibletime/handbook/index.docbook
-share/doc/HTML/en/bibletime/handbook/ss_configfonts.png
-share/doc/HTML/en/bibletime/handbook/ss_configtoolbar.png
-share/doc/HTML/en/bibletime/handbook/ss_mainterms.png
-share/doc/HTML/en/bibletime/handbook/ss_searchanal.png
-share/doc/HTML/en/bibletime/handbook/ss_searchopts.png
-share/doc/HTML/en/bibletime/howto/common
-share/doc/HTML/en/bibletime/howto/how2-basics.docbook
-share/doc/HTML/en/bibletime/howto/how2-importance.docbook
-share/doc/HTML/en/bibletime/howto/how2-interpretation.docbook
-share/doc/HTML/en/bibletime/howto/index.docbook
+%%DOCSDIR%%/handbook/common
+%%DOCSDIR%%/handbook/hdbk-config.docbook
+%%DOCSDIR%%/handbook/hdbk-intro.docbook
+%%DOCSDIR%%/handbook/hdbk-operation.docbook
+%%DOCSDIR%%/handbook/hdbk-reference.docbook
+%%DOCSDIR%%/handbook/hdbk-start.docbook
+%%DOCSDIR%%/handbook/i_bible.png
+%%DOCSDIR%%/handbook/i_bible_add.png
+%%DOCSDIR%%/handbook/i_bibletime.png
+%%DOCSDIR%%/handbook/i_book.png
+%%DOCSDIR%%/handbook/i_book_add.png
+%%DOCSDIR%%/handbook/i_cascade.png
+%%DOCSDIR%%/handbook/i_cascade_auto.png
+%%DOCSDIR%%/handbook/i_commentary.png
+%%DOCSDIR%%/handbook/i_commentary_add.png
+%%DOCSDIR%%/handbook/i_configure.png
+%%DOCSDIR%%/handbook/i_configureaccels.png
+%%DOCSDIR%%/handbook/i_configuredisplay.png
+%%DOCSDIR%%/handbook/i_configurefonts.png
+%%DOCSDIR%%/handbook/i_configurestart.png
+%%DOCSDIR%%/handbook/i_configuresword.png
+%%DOCSDIR%%/handbook/i_configuretoolbars.png
+%%DOCSDIR%%/handbook/i_contents.png
+%%DOCSDIR%%/handbook/i_delete.png
+%%DOCSDIR%%/handbook/i_editdelete.png
+%%DOCSDIR%%/handbook/i_exit.png
+%%DOCSDIR%%/handbook/i_fileclose.png
+%%DOCSDIR%%/handbook/i_fileprint.png
+%%DOCSDIR%%/handbook/i_find.png
+%%DOCSDIR%%/handbook/i_fullscreen.png
+%%DOCSDIR%%/handbook/i_go.png
+%%DOCSDIR%%/handbook/i_ktip.png
+%%DOCSDIR%%/handbook/i_lexicon.png
+%%DOCSDIR%%/handbook/i_lexicon_add.png
+%%DOCSDIR%%/handbook/i_pencil.png
+%%DOCSDIR%%/handbook/i_sidetree.png
+%%DOCSDIR%%/handbook/i_sync.png
+%%DOCSDIR%%/handbook/i_tile.png
+%%DOCSDIR%%/handbook/i_tile_auto.png
+%%DOCSDIR%%/handbook/index.docbook
+%%DOCSDIR%%/handbook/ss_configfonts.png
+%%DOCSDIR%%/handbook/ss_configtoolbar.png
+%%DOCSDIR%%/handbook/ss_mainterms.png
+%%DOCSDIR%%/handbook/ss_searchanal.png
+%%DOCSDIR%%/handbook/ss_searchopts.png
+%%DOCSDIR%%/howto/common
+%%DOCSDIR%%/howto/how2-basics.docbook
+%%DOCSDIR%%/howto/how2-importance.docbook
+%%DOCSDIR%%/howto/how2-interpretation.docbook
+%%DOCSDIR%%/howto/index.docbook
 share/icons/hicolor/16x16/actions/bt_bible.png
 share/icons/hicolor/16x16/actions/bt_bible_add.png
 share/icons/hicolor/16x16/actions/bt_bible_locked.png
@@ -148,9 +148,9 @@ share/icons/hicolor/48x48/actions/bt_tile_auto.png
 share/icons/hicolor/48x48/apps/bibletime.png
 share/icons/hicolor/64x64/apps/bibletime.png
 share/doc/HTML/en/common/common
-@dirrm share/doc/HTML/en/bibletime/howto
-@dirrm share/doc/HTML/en/bibletime/handbook
-@dirrm share/doc/HTML/en/bibletime
+@dirrm %%DOCSDIR%%/howto
+@dirrm %%DOCSDIR%%/handbook
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
 @dirrmtry share/doc/HTML/en
 @dirrmtry share/doc/HTML
 @dirrmtry share/config
diff --git a/misc/bibletime-kde3/Makefile b/misc/bibletime-kde3/Makefile
index c38425b27752..e913caa18ae7 100644
--- a/misc/bibletime-kde3/Makefile
+++ b/misc/bibletime-kde3/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	bibletime
-PORTVERSION=	1.6.1
+PORTVERSION=	1.6.2
 CATEGORIES=	misc
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -27,6 +27,8 @@ CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ARGS+=	--enable-static-clucene
 INSTALLS_ICONS=	yes
 
+DOCSDIR=	share/doc/HTML/en/bibletime
+
 .include <bsd.port.pre.mk>
 
 .if ${OSVERSION} < 500000
diff --git a/misc/bibletime-kde3/distinfo b/misc/bibletime-kde3/distinfo
index bf98f66b9a99..4f9a2ad94a7e 100644
--- a/misc/bibletime-kde3/distinfo
+++ b/misc/bibletime-kde3/distinfo
@@ -1,3 +1,3 @@
-MD5 (bibletime-1.6.1.tar.bz2) = d8a256c9078a858cd5130bdc19ffd7bb
-SHA256 (bibletime-1.6.1.tar.bz2) = 2063274fa79052416fdb29121fd9951f0007625226e39590e8061d766cdb7abb
-SIZE (bibletime-1.6.1.tar.bz2) = 1227796
+MD5 (bibletime-1.6.2.tar.bz2) = b2b8b624d21d397201aec742d43501e5
+SHA256 (bibletime-1.6.2.tar.bz2) = 63a4180f0781f28a5e0efbcf09c6f53f63bdc6fba19d58ffe2ac496cdc086750
+SIZE (bibletime-1.6.2.tar.bz2) = 1234620
diff --git a/misc/bibletime-kde3/files/patch-bibletime::backend::cswordbackend.cpp b/misc/bibletime-kde3/files/patch-bibletime::backend::cswordbackend.cpp
deleted file mode 100644
index f14425d2f1f0..000000000000
--- a/misc/bibletime-kde3/files/patch-bibletime::backend::cswordbackend.cpp
+++ /dev/null
@@ -1,9 +0,0 @@
---- bibletime/backend/cswordbackend.cpp.orig	Sat Sep 10 04:19:40 2005
-+++ bibletime/backend/cswordbackend.cpp	Thu Jul 13 08:58:04 2006
-@@ -1,3 +1,6 @@
-+//
-+// please send this patch- to the attic.
-+//
- /********* Read the file LICENSE for license details. *********/
- 
- //BibleTime includes
diff --git a/misc/bibletime-kde3/pkg-plist b/misc/bibletime-kde3/pkg-plist
index 27db53b56628..6050ee65269b 100644
--- a/misc/bibletime-kde3/pkg-plist
+++ b/misc/bibletime-kde3/pkg-plist
@@ -4,56 +4,56 @@ share/applications/bibletime.desktop
 share/apps/bibletime/bibletimeui.rc
 share/apps/bibletime/pics/startuplogo.png
 share/apps/bibletime/tips
-share/doc/HTML/en/bibletime/handbook/common
-share/doc/HTML/en/bibletime/handbook/hdbk-config.docbook
-share/doc/HTML/en/bibletime/handbook/hdbk-intro.docbook
-share/doc/HTML/en/bibletime/handbook/hdbk-operation.docbook
-share/doc/HTML/en/bibletime/handbook/hdbk-reference.docbook
-share/doc/HTML/en/bibletime/handbook/hdbk-start.docbook
-share/doc/HTML/en/bibletime/handbook/i_bible.png
-share/doc/HTML/en/bibletime/handbook/i_bible_add.png
-share/doc/HTML/en/bibletime/handbook/i_bibletime.png
-share/doc/HTML/en/bibletime/handbook/i_book.png
-share/doc/HTML/en/bibletime/handbook/i_book_add.png
-share/doc/HTML/en/bibletime/handbook/i_cascade.png
-share/doc/HTML/en/bibletime/handbook/i_cascade_auto.png
-share/doc/HTML/en/bibletime/handbook/i_commentary.png
-share/doc/HTML/en/bibletime/handbook/i_commentary_add.png
-share/doc/HTML/en/bibletime/handbook/i_configure.png
-share/doc/HTML/en/bibletime/handbook/i_configureaccels.png
-share/doc/HTML/en/bibletime/handbook/i_configuredisplay.png
-share/doc/HTML/en/bibletime/handbook/i_configurefonts.png
-share/doc/HTML/en/bibletime/handbook/i_configurestart.png
-share/doc/HTML/en/bibletime/handbook/i_configuresword.png
-share/doc/HTML/en/bibletime/handbook/i_configuretoolbars.png
-share/doc/HTML/en/bibletime/handbook/i_contents.png
-share/doc/HTML/en/bibletime/handbook/i_delete.png
-share/doc/HTML/en/bibletime/handbook/i_editdelete.png
-share/doc/HTML/en/bibletime/handbook/i_exit.png
-share/doc/HTML/en/bibletime/handbook/i_fileclose.png
-share/doc/HTML/en/bibletime/handbook/i_fileprint.png
-share/doc/HTML/en/bibletime/handbook/i_find.png
-share/doc/HTML/en/bibletime/handbook/i_fullscreen.png
-share/doc/HTML/en/bibletime/handbook/i_go.png
-share/doc/HTML/en/bibletime/handbook/i_ktip.png
-share/doc/HTML/en/bibletime/handbook/i_lexicon.png
-share/doc/HTML/en/bibletime/handbook/i_lexicon_add.png
-share/doc/HTML/en/bibletime/handbook/i_pencil.png
-share/doc/HTML/en/bibletime/handbook/i_sidetree.png
-share/doc/HTML/en/bibletime/handbook/i_sync.png
-share/doc/HTML/en/bibletime/handbook/i_tile.png
-share/doc/HTML/en/bibletime/handbook/i_tile_auto.png
-share/doc/HTML/en/bibletime/handbook/index.docbook
-share/doc/HTML/en/bibletime/handbook/ss_configfonts.png
-share/doc/HTML/en/bibletime/handbook/ss_configtoolbar.png
-share/doc/HTML/en/bibletime/handbook/ss_mainterms.png
-share/doc/HTML/en/bibletime/handbook/ss_searchanal.png
-share/doc/HTML/en/bibletime/handbook/ss_searchopts.png
-share/doc/HTML/en/bibletime/howto/common
-share/doc/HTML/en/bibletime/howto/how2-basics.docbook
-share/doc/HTML/en/bibletime/howto/how2-importance.docbook
-share/doc/HTML/en/bibletime/howto/how2-interpretation.docbook
-share/doc/HTML/en/bibletime/howto/index.docbook
+%%DOCSDIR%%/handbook/common
+%%DOCSDIR%%/handbook/hdbk-config.docbook
+%%DOCSDIR%%/handbook/hdbk-intro.docbook
+%%DOCSDIR%%/handbook/hdbk-operation.docbook
+%%DOCSDIR%%/handbook/hdbk-reference.docbook
+%%DOCSDIR%%/handbook/hdbk-start.docbook
+%%DOCSDIR%%/handbook/i_bible.png
+%%DOCSDIR%%/handbook/i_bible_add.png
+%%DOCSDIR%%/handbook/i_bibletime.png
+%%DOCSDIR%%/handbook/i_book.png
+%%DOCSDIR%%/handbook/i_book_add.png
+%%DOCSDIR%%/handbook/i_cascade.png
+%%DOCSDIR%%/handbook/i_cascade_auto.png
+%%DOCSDIR%%/handbook/i_commentary.png
+%%DOCSDIR%%/handbook/i_commentary_add.png
+%%DOCSDIR%%/handbook/i_configure.png
+%%DOCSDIR%%/handbook/i_configureaccels.png
+%%DOCSDIR%%/handbook/i_configuredisplay.png
+%%DOCSDIR%%/handbook/i_configurefonts.png
+%%DOCSDIR%%/handbook/i_configurestart.png
+%%DOCSDIR%%/handbook/i_configuresword.png
+%%DOCSDIR%%/handbook/i_configuretoolbars.png
+%%DOCSDIR%%/handbook/i_contents.png
+%%DOCSDIR%%/handbook/i_delete.png
+%%DOCSDIR%%/handbook/i_editdelete.png
+%%DOCSDIR%%/handbook/i_exit.png
+%%DOCSDIR%%/handbook/i_fileclose.png
+%%DOCSDIR%%/handbook/i_fileprint.png
+%%DOCSDIR%%/handbook/i_find.png
+%%DOCSDIR%%/handbook/i_fullscreen.png
+%%DOCSDIR%%/handbook/i_go.png
+%%DOCSDIR%%/handbook/i_ktip.png
+%%DOCSDIR%%/handbook/i_lexicon.png
+%%DOCSDIR%%/handbook/i_lexicon_add.png
+%%DOCSDIR%%/handbook/i_pencil.png
+%%DOCSDIR%%/handbook/i_sidetree.png
+%%DOCSDIR%%/handbook/i_sync.png
+%%DOCSDIR%%/handbook/i_tile.png
+%%DOCSDIR%%/handbook/i_tile_auto.png
+%%DOCSDIR%%/handbook/index.docbook
+%%DOCSDIR%%/handbook/ss_configfonts.png
+%%DOCSDIR%%/handbook/ss_configtoolbar.png
+%%DOCSDIR%%/handbook/ss_mainterms.png
+%%DOCSDIR%%/handbook/ss_searchanal.png
+%%DOCSDIR%%/handbook/ss_searchopts.png
+%%DOCSDIR%%/howto/common
+%%DOCSDIR%%/howto/how2-basics.docbook
+%%DOCSDIR%%/howto/how2-importance.docbook
+%%DOCSDIR%%/howto/how2-interpretation.docbook
+%%DOCSDIR%%/howto/index.docbook
 share/icons/hicolor/16x16/actions/bt_bible.png
 share/icons/hicolor/16x16/actions/bt_bible_add.png
 share/icons/hicolor/16x16/actions/bt_bible_locked.png
@@ -148,9 +148,9 @@ share/icons/hicolor/48x48/actions/bt_tile_auto.png
 share/icons/hicolor/48x48/apps/bibletime.png
 share/icons/hicolor/64x64/apps/bibletime.png
 share/doc/HTML/en/common/common
-@dirrm share/doc/HTML/en/bibletime/howto
-@dirrm share/doc/HTML/en/bibletime/handbook
-@dirrm share/doc/HTML/en/bibletime
+@dirrm %%DOCSDIR%%/howto
+@dirrm %%DOCSDIR%%/handbook
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
 @dirrmtry share/doc/HTML/en
 @dirrmtry share/doc/HTML
 @dirrmtry share/config
diff --git a/misc/bibletime-kde4/Makefile b/misc/bibletime-kde4/Makefile
index c38425b27752..e913caa18ae7 100644
--- a/misc/bibletime-kde4/Makefile
+++ b/misc/bibletime-kde4/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	bibletime
-PORTVERSION=	1.6.1
+PORTVERSION=	1.6.2
 CATEGORIES=	misc
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -27,6 +27,8 @@ CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ARGS+=	--enable-static-clucene
 INSTALLS_ICONS=	yes
 
+DOCSDIR=	share/doc/HTML/en/bibletime
+
 .include <bsd.port.pre.mk>
 
 .if ${OSVERSION} < 500000
diff --git a/misc/bibletime-kde4/distinfo b/misc/bibletime-kde4/distinfo
index bf98f66b9a99..4f9a2ad94a7e 100644
--- a/misc/bibletime-kde4/distinfo
+++ b/misc/bibletime-kde4/distinfo
@@ -1,3 +1,3 @@
-MD5 (bibletime-1.6.1.tar.bz2) = d8a256c9078a858cd5130bdc19ffd7bb
-SHA256 (bibletime-1.6.1.tar.bz2) = 2063274fa79052416fdb29121fd9951f0007625226e39590e8061d766cdb7abb
-SIZE (bibletime-1.6.1.tar.bz2) = 1227796
+MD5 (bibletime-1.6.2.tar.bz2) = b2b8b624d21d397201aec742d43501e5
+SHA256 (bibletime-1.6.2.tar.bz2) = 63a4180f0781f28a5e0efbcf09c6f53f63bdc6fba19d58ffe2ac496cdc086750
+SIZE (bibletime-1.6.2.tar.bz2) = 1234620
diff --git a/misc/bibletime-kde4/files/patch-bibletime::backend::cswordbackend.cpp b/misc/bibletime-kde4/files/patch-bibletime::backend::cswordbackend.cpp
deleted file mode 100644
index f14425d2f1f0..000000000000
--- a/misc/bibletime-kde4/files/patch-bibletime::backend::cswordbackend.cpp
+++ /dev/null
@@ -1,9 +0,0 @@
---- bibletime/backend/cswordbackend.cpp.orig	Sat Sep 10 04:19:40 2005
-+++ bibletime/backend/cswordbackend.cpp	Thu Jul 13 08:58:04 2006
-@@ -1,3 +1,6 @@
-+//
-+// please send this patch- to the attic.
-+//
- /********* Read the file LICENSE for license details. *********/
- 
- //BibleTime includes
diff --git a/misc/bibletime-kde4/pkg-plist b/misc/bibletime-kde4/pkg-plist
index 27db53b56628..6050ee65269b 100644
--- a/misc/bibletime-kde4/pkg-plist
+++ b/misc/bibletime-kde4/pkg-plist
@@ -4,56 +4,56 @@ share/applications/bibletime.desktop
 share/apps/bibletime/bibletimeui.rc
 share/apps/bibletime/pics/startuplogo.png
 share/apps/bibletime/tips
-share/doc/HTML/en/bibletime/handbook/common
-share/doc/HTML/en/bibletime/handbook/hdbk-config.docbook
-share/doc/HTML/en/bibletime/handbook/hdbk-intro.docbook
-share/doc/HTML/en/bibletime/handbook/hdbk-operation.docbook
-share/doc/HTML/en/bibletime/handbook/hdbk-reference.docbook
-share/doc/HTML/en/bibletime/handbook/hdbk-start.docbook
-share/doc/HTML/en/bibletime/handbook/i_bible.png
-share/doc/HTML/en/bibletime/handbook/i_bible_add.png
-share/doc/HTML/en/bibletime/handbook/i_bibletime.png
-share/doc/HTML/en/bibletime/handbook/i_book.png
-share/doc/HTML/en/bibletime/handbook/i_book_add.png
-share/doc/HTML/en/bibletime/handbook/i_cascade.png
-share/doc/HTML/en/bibletime/handbook/i_cascade_auto.png
-share/doc/HTML/en/bibletime/handbook/i_commentary.png
-share/doc/HTML/en/bibletime/handbook/i_commentary_add.png
-share/doc/HTML/en/bibletime/handbook/i_configure.png
-share/doc/HTML/en/bibletime/handbook/i_configureaccels.png
-share/doc/HTML/en/bibletime/handbook/i_configuredisplay.png
-share/doc/HTML/en/bibletime/handbook/i_configurefonts.png
-share/doc/HTML/en/bibletime/handbook/i_configurestart.png
-share/doc/HTML/en/bibletime/handbook/i_configuresword.png
-share/doc/HTML/en/bibletime/handbook/i_configuretoolbars.png
-share/doc/HTML/en/bibletime/handbook/i_contents.png
-share/doc/HTML/en/bibletime/handbook/i_delete.png
-share/doc/HTML/en/bibletime/handbook/i_editdelete.png
-share/doc/HTML/en/bibletime/handbook/i_exit.png
-share/doc/HTML/en/bibletime/handbook/i_fileclose.png
-share/doc/HTML/en/bibletime/handbook/i_fileprint.png
-share/doc/HTML/en/bibletime/handbook/i_find.png
-share/doc/HTML/en/bibletime/handbook/i_fullscreen.png
-share/doc/HTML/en/bibletime/handbook/i_go.png
-share/doc/HTML/en/bibletime/handbook/i_ktip.png
-share/doc/HTML/en/bibletime/handbook/i_lexicon.png
-share/doc/HTML/en/bibletime/handbook/i_lexicon_add.png
-share/doc/HTML/en/bibletime/handbook/i_pencil.png
-share/doc/HTML/en/bibletime/handbook/i_sidetree.png
-share/doc/HTML/en/bibletime/handbook/i_sync.png
-share/doc/HTML/en/bibletime/handbook/i_tile.png
-share/doc/HTML/en/bibletime/handbook/i_tile_auto.png
-share/doc/HTML/en/bibletime/handbook/index.docbook
-share/doc/HTML/en/bibletime/handbook/ss_configfonts.png
-share/doc/HTML/en/bibletime/handbook/ss_configtoolbar.png
-share/doc/HTML/en/bibletime/handbook/ss_mainterms.png
-share/doc/HTML/en/bibletime/handbook/ss_searchanal.png
-share/doc/HTML/en/bibletime/handbook/ss_searchopts.png
-share/doc/HTML/en/bibletime/howto/common
-share/doc/HTML/en/bibletime/howto/how2-basics.docbook
-share/doc/HTML/en/bibletime/howto/how2-importance.docbook
-share/doc/HTML/en/bibletime/howto/how2-interpretation.docbook
-share/doc/HTML/en/bibletime/howto/index.docbook
+%%DOCSDIR%%/handbook/common
+%%DOCSDIR%%/handbook/hdbk-config.docbook
+%%DOCSDIR%%/handbook/hdbk-intro.docbook
+%%DOCSDIR%%/handbook/hdbk-operation.docbook
+%%DOCSDIR%%/handbook/hdbk-reference.docbook
+%%DOCSDIR%%/handbook/hdbk-start.docbook
+%%DOCSDIR%%/handbook/i_bible.png
+%%DOCSDIR%%/handbook/i_bible_add.png
+%%DOCSDIR%%/handbook/i_bibletime.png
+%%DOCSDIR%%/handbook/i_book.png
+%%DOCSDIR%%/handbook/i_book_add.png
+%%DOCSDIR%%/handbook/i_cascade.png
+%%DOCSDIR%%/handbook/i_cascade_auto.png
+%%DOCSDIR%%/handbook/i_commentary.png
+%%DOCSDIR%%/handbook/i_commentary_add.png
+%%DOCSDIR%%/handbook/i_configure.png
+%%DOCSDIR%%/handbook/i_configureaccels.png
+%%DOCSDIR%%/handbook/i_configuredisplay.png
+%%DOCSDIR%%/handbook/i_configurefonts.png
+%%DOCSDIR%%/handbook/i_configurestart.png
+%%DOCSDIR%%/handbook/i_configuresword.png
+%%DOCSDIR%%/handbook/i_configuretoolbars.png
+%%DOCSDIR%%/handbook/i_contents.png
+%%DOCSDIR%%/handbook/i_delete.png
+%%DOCSDIR%%/handbook/i_editdelete.png
+%%DOCSDIR%%/handbook/i_exit.png
+%%DOCSDIR%%/handbook/i_fileclose.png
+%%DOCSDIR%%/handbook/i_fileprint.png
+%%DOCSDIR%%/handbook/i_find.png
+%%DOCSDIR%%/handbook/i_fullscreen.png
+%%DOCSDIR%%/handbook/i_go.png
+%%DOCSDIR%%/handbook/i_ktip.png
+%%DOCSDIR%%/handbook/i_lexicon.png
+%%DOCSDIR%%/handbook/i_lexicon_add.png
+%%DOCSDIR%%/handbook/i_pencil.png
+%%DOCSDIR%%/handbook/i_sidetree.png
+%%DOCSDIR%%/handbook/i_sync.png
+%%DOCSDIR%%/handbook/i_tile.png
+%%DOCSDIR%%/handbook/i_tile_auto.png
+%%DOCSDIR%%/handbook/index.docbook
+%%DOCSDIR%%/handbook/ss_configfonts.png
+%%DOCSDIR%%/handbook/ss_configtoolbar.png
+%%DOCSDIR%%/handbook/ss_mainterms.png
+%%DOCSDIR%%/handbook/ss_searchanal.png
+%%DOCSDIR%%/handbook/ss_searchopts.png
+%%DOCSDIR%%/howto/common
+%%DOCSDIR%%/howto/how2-basics.docbook
+%%DOCSDIR%%/howto/how2-importance.docbook
+%%DOCSDIR%%/howto/how2-interpretation.docbook
+%%DOCSDIR%%/howto/index.docbook
 share/icons/hicolor/16x16/actions/bt_bible.png
 share/icons/hicolor/16x16/actions/bt_bible_add.png
 share/icons/hicolor/16x16/actions/bt_bible_locked.png
@@ -148,9 +148,9 @@ share/icons/hicolor/48x48/actions/bt_tile_auto.png
 share/icons/hicolor/48x48/apps/bibletime.png
 share/icons/hicolor/64x64/apps/bibletime.png
 share/doc/HTML/en/common/common
-@dirrm share/doc/HTML/en/bibletime/howto
-@dirrm share/doc/HTML/en/bibletime/handbook
-@dirrm share/doc/HTML/en/bibletime
+@dirrm %%DOCSDIR%%/howto
+@dirrm %%DOCSDIR%%/handbook
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
 @dirrmtry share/doc/HTML/en
 @dirrmtry share/doc/HTML
 @dirrmtry share/config
diff --git a/misc/bibletime/Makefile b/misc/bibletime/Makefile
index c38425b27752..e913caa18ae7 100644
--- a/misc/bibletime/Makefile
+++ b/misc/bibletime/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	bibletime
-PORTVERSION=	1.6.1
+PORTVERSION=	1.6.2
 CATEGORIES=	misc
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -27,6 +27,8 @@ CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ARGS+=	--enable-static-clucene
 INSTALLS_ICONS=	yes
 
+DOCSDIR=	share/doc/HTML/en/bibletime
+
 .include <bsd.port.pre.mk>
 
 .if ${OSVERSION} < 500000
diff --git a/misc/bibletime/distinfo b/misc/bibletime/distinfo
index bf98f66b9a99..4f9a2ad94a7e 100644
--- a/misc/bibletime/distinfo
+++ b/misc/bibletime/distinfo
@@ -1,3 +1,3 @@
-MD5 (bibletime-1.6.1.tar.bz2) = d8a256c9078a858cd5130bdc19ffd7bb
-SHA256 (bibletime-1.6.1.tar.bz2) = 2063274fa79052416fdb29121fd9951f0007625226e39590e8061d766cdb7abb
-SIZE (bibletime-1.6.1.tar.bz2) = 1227796
+MD5 (bibletime-1.6.2.tar.bz2) = b2b8b624d21d397201aec742d43501e5
+SHA256 (bibletime-1.6.2.tar.bz2) = 63a4180f0781f28a5e0efbcf09c6f53f63bdc6fba19d58ffe2ac496cdc086750
+SIZE (bibletime-1.6.2.tar.bz2) = 1234620
diff --git a/misc/bibletime/files/patch-bibletime::backend::cswordbackend.cpp b/misc/bibletime/files/patch-bibletime::backend::cswordbackend.cpp
deleted file mode 100644
index f14425d2f1f0..000000000000
--- a/misc/bibletime/files/patch-bibletime::backend::cswordbackend.cpp
+++ /dev/null
@@ -1,9 +0,0 @@
---- bibletime/backend/cswordbackend.cpp.orig	Sat Sep 10 04:19:40 2005
-+++ bibletime/backend/cswordbackend.cpp	Thu Jul 13 08:58:04 2006
-@@ -1,3 +1,6 @@
-+//
-+// please send this patch- to the attic.
-+//
- /********* Read the file LICENSE for license details. *********/
- 
- //BibleTime includes
diff --git a/misc/bibletime/pkg-plist b/misc/bibletime/pkg-plist
index 27db53b56628..6050ee65269b 100644
--- a/misc/bibletime/pkg-plist
+++ b/misc/bibletime/pkg-plist
@@ -4,56 +4,56 @@ share/applications/bibletime.desktop
 share/apps/bibletime/bibletimeui.rc
 share/apps/bibletime/pics/startuplogo.png
 share/apps/bibletime/tips
-share/doc/HTML/en/bibletime/handbook/common
-share/doc/HTML/en/bibletime/handbook/hdbk-config.docbook
-share/doc/HTML/en/bibletime/handbook/hdbk-intro.docbook
-share/doc/HTML/en/bibletime/handbook/hdbk-operation.docbook
-share/doc/HTML/en/bibletime/handbook/hdbk-reference.docbook
-share/doc/HTML/en/bibletime/handbook/hdbk-start.docbook
-share/doc/HTML/en/bibletime/handbook/i_bible.png
-share/doc/HTML/en/bibletime/handbook/i_bible_add.png
-share/doc/HTML/en/bibletime/handbook/i_bibletime.png
-share/doc/HTML/en/bibletime/handbook/i_book.png
-share/doc/HTML/en/bibletime/handbook/i_book_add.png
-share/doc/HTML/en/bibletime/handbook/i_cascade.png
-share/doc/HTML/en/bibletime/handbook/i_cascade_auto.png
-share/doc/HTML/en/bibletime/handbook/i_commentary.png
-share/doc/HTML/en/bibletime/handbook/i_commentary_add.png
-share/doc/HTML/en/bibletime/handbook/i_configure.png
-share/doc/HTML/en/bibletime/handbook/i_configureaccels.png
-share/doc/HTML/en/bibletime/handbook/i_configuredisplay.png
-share/doc/HTML/en/bibletime/handbook/i_configurefonts.png
-share/doc/HTML/en/bibletime/handbook/i_configurestart.png
-share/doc/HTML/en/bibletime/handbook/i_configuresword.png
-share/doc/HTML/en/bibletime/handbook/i_configuretoolbars.png
-share/doc/HTML/en/bibletime/handbook/i_contents.png
-share/doc/HTML/en/bibletime/handbook/i_delete.png
-share/doc/HTML/en/bibletime/handbook/i_editdelete.png
-share/doc/HTML/en/bibletime/handbook/i_exit.png
-share/doc/HTML/en/bibletime/handbook/i_fileclose.png
-share/doc/HTML/en/bibletime/handbook/i_fileprint.png
-share/doc/HTML/en/bibletime/handbook/i_find.png
-share/doc/HTML/en/bibletime/handbook/i_fullscreen.png
-share/doc/HTML/en/bibletime/handbook/i_go.png
-share/doc/HTML/en/bibletime/handbook/i_ktip.png
-share/doc/HTML/en/bibletime/handbook/i_lexicon.png
-share/doc/HTML/en/bibletime/handbook/i_lexicon_add.png
-share/doc/HTML/en/bibletime/handbook/i_pencil.png
-share/doc/HTML/en/bibletime/handbook/i_sidetree.png
-share/doc/HTML/en/bibletime/handbook/i_sync.png
-share/doc/HTML/en/bibletime/handbook/i_tile.png
-share/doc/HTML/en/bibletime/handbook/i_tile_auto.png
-share/doc/HTML/en/bibletime/handbook/index.docbook
-share/doc/HTML/en/bibletime/handbook/ss_configfonts.png
-share/doc/HTML/en/bibletime/handbook/ss_configtoolbar.png
-share/doc/HTML/en/bibletime/handbook/ss_mainterms.png
-share/doc/HTML/en/bibletime/handbook/ss_searchanal.png
-share/doc/HTML/en/bibletime/handbook/ss_searchopts.png
-share/doc/HTML/en/bibletime/howto/common
-share/doc/HTML/en/bibletime/howto/how2-basics.docbook
-share/doc/HTML/en/bibletime/howto/how2-importance.docbook
-share/doc/HTML/en/bibletime/howto/how2-interpretation.docbook
-share/doc/HTML/en/bibletime/howto/index.docbook
+%%DOCSDIR%%/handbook/common
+%%DOCSDIR%%/handbook/hdbk-config.docbook
+%%DOCSDIR%%/handbook/hdbk-intro.docbook
+%%DOCSDIR%%/handbook/hdbk-operation.docbook
+%%DOCSDIR%%/handbook/hdbk-reference.docbook
+%%DOCSDIR%%/handbook/hdbk-start.docbook
+%%DOCSDIR%%/handbook/i_bible.png
+%%DOCSDIR%%/handbook/i_bible_add.png
+%%DOCSDIR%%/handbook/i_bibletime.png
+%%DOCSDIR%%/handbook/i_book.png
+%%DOCSDIR%%/handbook/i_book_add.png
+%%DOCSDIR%%/handbook/i_cascade.png
+%%DOCSDIR%%/handbook/i_cascade_auto.png
+%%DOCSDIR%%/handbook/i_commentary.png
+%%DOCSDIR%%/handbook/i_commentary_add.png
+%%DOCSDIR%%/handbook/i_configure.png
+%%DOCSDIR%%/handbook/i_configureaccels.png
+%%DOCSDIR%%/handbook/i_configuredisplay.png
+%%DOCSDIR%%/handbook/i_configurefonts.png
+%%DOCSDIR%%/handbook/i_configurestart.png
+%%DOCSDIR%%/handbook/i_configuresword.png
+%%DOCSDIR%%/handbook/i_configuretoolbars.png
+%%DOCSDIR%%/handbook/i_contents.png
+%%DOCSDIR%%/handbook/i_delete.png
+%%DOCSDIR%%/handbook/i_editdelete.png
+%%DOCSDIR%%/handbook/i_exit.png
+%%DOCSDIR%%/handbook/i_fileclose.png
+%%DOCSDIR%%/handbook/i_fileprint.png
+%%DOCSDIR%%/handbook/i_find.png
+%%DOCSDIR%%/handbook/i_fullscreen.png
+%%DOCSDIR%%/handbook/i_go.png
+%%DOCSDIR%%/handbook/i_ktip.png
+%%DOCSDIR%%/handbook/i_lexicon.png
+%%DOCSDIR%%/handbook/i_lexicon_add.png
+%%DOCSDIR%%/handbook/i_pencil.png
+%%DOCSDIR%%/handbook/i_sidetree.png
+%%DOCSDIR%%/handbook/i_sync.png
+%%DOCSDIR%%/handbook/i_tile.png
+%%DOCSDIR%%/handbook/i_tile_auto.png
+%%DOCSDIR%%/handbook/index.docbook
+%%DOCSDIR%%/handbook/ss_configfonts.png
+%%DOCSDIR%%/handbook/ss_configtoolbar.png
+%%DOCSDIR%%/handbook/ss_mainterms.png
+%%DOCSDIR%%/handbook/ss_searchanal.png
+%%DOCSDIR%%/handbook/ss_searchopts.png
+%%DOCSDIR%%/howto/common
+%%DOCSDIR%%/howto/how2-basics.docbook
+%%DOCSDIR%%/howto/how2-importance.docbook
+%%DOCSDIR%%/howto/how2-interpretation.docbook
+%%DOCSDIR%%/howto/index.docbook
 share/icons/hicolor/16x16/actions/bt_bible.png
 share/icons/hicolor/16x16/actions/bt_bible_add.png
 share/icons/hicolor/16x16/actions/bt_bible_locked.png
@@ -148,9 +148,9 @@ share/icons/hicolor/48x48/actions/bt_tile_auto.png
 share/icons/hicolor/48x48/apps/bibletime.png
 share/icons/hicolor/64x64/apps/bibletime.png
 share/doc/HTML/en/common/common
-@dirrm share/doc/HTML/en/bibletime/howto
-@dirrm share/doc/HTML/en/bibletime/handbook
-@dirrm share/doc/HTML/en/bibletime
+@dirrm %%DOCSDIR%%/howto
+@dirrm %%DOCSDIR%%/handbook
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
 @dirrmtry share/doc/HTML/en
 @dirrmtry share/doc/HTML
 @dirrmtry share/config