3 files changed, 132 insertions, 37 deletions

diff --git a/misc/bibletime-kde4/Makefile b/misc/bibletime-kde4/Makefile
index 1515915273fc..5be99ddfb20b 100644
--- a/misc/bibletime-kde4/Makefile
+++ b/misc/bibletime-kde4/Makefile
@@ -6,29 +6,33 @@
 #
 
 PORTNAME=	bibletime
-PORTVERSION=	1.7
-PORTREVISION=	2
+PORTVERSION=	2.0
 CATEGORIES=	misc kde
 MASTER_SITES=	SF
 PKGNAMESUFFIX=	-kde4
 
 MAINTAINER=	tabthorpe@FreeBSD.org
-COMMENT=	A Bible study application for KDE4
+COMMENT=	An opensource Bible study application
 
-RUN_DEPENDS=	${LOCALBASE}/lib/libsword-1.5.11.so:${PORTSDIR}/misc/sword \
-		${LOCALBASE}/lib/libclucene.so:${PORTSDIR}/textproc/clucene
+RUN_DEPENDS=	${LOCALBASE}/lib/libsword-1.5.11.so:${PORTSDIR}/misc/sword
 BUILD_DEPENDS=	${RUN_DEPENDS}
 LIB_DEPENDS=	boost_python:${PORTSDIR}/devel/boost-python \
-		phonon.4:${PORTSDIR}/multimedia/phonon
+		clucene.0:${PORTSDIR}/textproc/clucene
 
 USE_OPENSSL=	yes
 KDE4_BUILDENV=	yes
-USE_KDE4=	kdeprefix kdelibs runtime workspace automoc4
+USE_KDE4=	kdeprefix runtime workspace automoc4
 USE_CMAKE=	yes
 USE_QT_VER=	4
 QT_COMPONENTS=	corelib dbus gui xml webkit qmake_build moc_build uic_build rcc_build
 
-CONFLICTS=	bibletime*-2.*
+CONFLICTS=	bibletime-devel-2*
+
+.include <bsd.port.pre.mk>
+
+.if ${OSVERSION} < 700042
+BROKEN=	does on build on 6.x, use misc/bibletime-kde3
+.endif
 
 post-extract:
 	${MKDIR} ${WRKSRC}/build
@@ -39,4 +43,4 @@ do-configure:
 		-D CMAKE_INSTALL_PREFIX=${PREFIX} \
 		${WRKSRC}/..
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/misc/bibletime-kde4/distinfo b/misc/bibletime-kde4/distinfo
index 911b7e39bebb..6b126fbd0371 100644
--- a/misc/bibletime-kde4/distinfo
+++ b/misc/bibletime-kde4/distinfo
@@ -1,3 +1,3 @@
-MD5 (bibletime-1.7.tar.gz) = 39b8de15c6e90a9fdf5bb5730933f658
-SHA256 (bibletime-1.7.tar.gz) = 3777a45c949d25237facd84b49e032a53563ef93c46158acf4201cbf2c8d27df
-SIZE (bibletime-1.7.tar.gz) = 4399630
+MD5 (bibletime-2.0.tar.gz) = 14510e326403e83a24da9c331c5b8352
+SHA256 (bibletime-2.0.tar.gz) = b1c8ac2c12946d35be8dc4451c70689126df8d4a90b0aec17d1b96b93ada1ba7
+SIZE (bibletime-2.0.tar.gz) = 4287082
diff --git a/misc/bibletime-kde4/pkg-plist b/misc/bibletime-kde4/pkg-plist
index a2c84d42e456..7add9231ab0b 100644
--- a/misc/bibletime-kde4/pkg-plist
+++ b/misc/bibletime-kde4/pkg-plist
@@ -5,6 +5,36 @@ share/applications/bibletime.desktop
 %%DATADIR%%/display-templates/Green.tmpl
 %%DATADIR%%/display-templates/HighContrast.tmpl
 %%DATADIR%%/display-templates/Simple.tmpl
+%%DATADIR%%/docs/handbook/cs/hdbk-config.html
+%%DATADIR%%/docs/handbook/cs/hdbk-intro.html
+%%DATADIR%%/docs/handbook/cs/hdbk-op-bookshelfmanager.html
+%%DATADIR%%/docs/handbook/cs/hdbk-op-output.html
+%%DATADIR%%/docs/handbook/cs/hdbk-op-parts.html
+%%DATADIR%%/docs/handbook/cs/hdbk-op-search.html
+%%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.html
+%%DATADIR%%/docs/handbook/cs/hdbk-startsequence.html
+%%DATADIR%%/docs/handbook/cs/hdbk-term.html
+%%DATADIR%%/docs/handbook/cs/i_bibletime.png
+%%DATADIR%%/docs/handbook/cs/i_cascade.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_exit.png
+%%DATADIR%%/docs/handbook/cs/i_fileclose.png
+%%DATADIR%%/docs/handbook/cs/i_find.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
+%%DATADIR%%/docs/handbook/cs/i_view_mag.png
+%%DATADIR%%/docs/handbook/cs/i_window_fullscreen.png
+%%DATADIR%%/docs/handbook/cs/index.html
+%%DATADIR%%/docs/handbook/cs/ss_configfonts.png
+%%DATADIR%%/docs/handbook/cs/ss_mainterms.png
+%%DATADIR%%/docs/handbook/cs/ss_searchanal.png
+%%DATADIR%%/docs/handbook/cs/ss_searchopts.png
 %%DATADIR%%/docs/handbook/de/hdbk-config.html
 %%DATADIR%%/docs/handbook/de/hdbk-intro.html
 %%DATADIR%%/docs/handbook/de/hdbk-op-bookshelfmanager.html
@@ -19,16 +49,17 @@ share/applications/bibletime.desktop
 %%DATADIR%%/docs/handbook/de/hdbk-term.html
 %%DATADIR%%/docs/handbook/de/i_bibletime.png
 %%DATADIR%%/docs/handbook/de/i_cascade.png
-%%DATADIR%%/docs/handbook/de/i_cascade_auto.png
 %%DATADIR%%/docs/handbook/de/i_configure.png
 %%DATADIR%%/docs/handbook/de/i_configuresword.png
-%%DATADIR%%/docs/handbook/de/i_configuretoolbars.png
+%%DATADIR%%/docs/handbook/de/i_contents2.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_fullscreen.png
-%%DATADIR%%/docs/handbook/de/i_sidetree.png
-%%DATADIR%%/docs/handbook/de/i_tile.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
+%%DATADIR%%/docs/handbook/de/i_view_mag.png
+%%DATADIR%%/docs/handbook/de/i_window_fullscreen.png
 %%DATADIR%%/docs/handbook/de/index.html
 %%DATADIR%%/docs/handbook/de/ss_configfonts.png
 %%DATADIR%%/docs/handbook/de/ss_mainterms.png
@@ -48,16 +79,17 @@ share/applications/bibletime.desktop
 %%DATADIR%%/docs/handbook/en/hdbk-term.html
 %%DATADIR%%/docs/handbook/en/i_bibletime.png
 %%DATADIR%%/docs/handbook/en/i_cascade.png
-%%DATADIR%%/docs/handbook/en/i_cascade_auto.png
 %%DATADIR%%/docs/handbook/en/i_configure.png
 %%DATADIR%%/docs/handbook/en/i_configuresword.png
-%%DATADIR%%/docs/handbook/en/i_configuretoolbars.png
+%%DATADIR%%/docs/handbook/en/i_contents2.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_fullscreen.png
-%%DATADIR%%/docs/handbook/en/i_sidetree.png
-%%DATADIR%%/docs/handbook/en/i_tile.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
+%%DATADIR%%/docs/handbook/en/i_view_mag.png
+%%DATADIR%%/docs/handbook/en/i_window_fullscreen.png
 %%DATADIR%%/docs/handbook/en/index.html
 %%DATADIR%%/docs/handbook/en/ss_configfonts.png
 %%DATADIR%%/docs/handbook/en/ss_mainterms.png
@@ -77,16 +109,17 @@ share/applications/bibletime.desktop
 %%DATADIR%%/docs/handbook/fi/hdbk-term.html
 %%DATADIR%%/docs/handbook/fi/i_bibletime.png
 %%DATADIR%%/docs/handbook/fi/i_cascade.png
-%%DATADIR%%/docs/handbook/fi/i_cascade_auto.png
 %%DATADIR%%/docs/handbook/fi/i_configure.png
 %%DATADIR%%/docs/handbook/fi/i_configuresword.png
-%%DATADIR%%/docs/handbook/fi/i_configuretoolbars.png
+%%DATADIR%%/docs/handbook/fi/i_contents2.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_fullscreen.png
-%%DATADIR%%/docs/handbook/fi/i_sidetree.png
-%%DATADIR%%/docs/handbook/fi/i_tile.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
+%%DATADIR%%/docs/handbook/fi/i_view_mag.png
+%%DATADIR%%/docs/handbook/fi/i_window_fullscreen.png
 %%DATADIR%%/docs/handbook/fi/index.html
 %%DATADIR%%/docs/handbook/fi/ss_configfonts.png
 %%DATADIR%%/docs/handbook/fi/ss_mainterms.png
@@ -106,21 +139,52 @@ share/applications/bibletime.desktop
 %%DATADIR%%/docs/handbook/fr/hdbk-term.html
 %%DATADIR%%/docs/handbook/fr/i_bibletime.png
 %%DATADIR%%/docs/handbook/fr/i_cascade.png
-%%DATADIR%%/docs/handbook/fr/i_cascade_auto.png
 %%DATADIR%%/docs/handbook/fr/i_configure.png
 %%DATADIR%%/docs/handbook/fr/i_configuresword.png
-%%DATADIR%%/docs/handbook/fr/i_configuretoolbars.png
+%%DATADIR%%/docs/handbook/fr/i_contents2.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_fullscreen.png
-%%DATADIR%%/docs/handbook/fr/i_sidetree.png
-%%DATADIR%%/docs/handbook/fr/i_tile.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
+%%DATADIR%%/docs/handbook/fr/i_view_mag.png
+%%DATADIR%%/docs/handbook/fr/i_window_fullscreen.png
 %%DATADIR%%/docs/handbook/fr/index.html
 %%DATADIR%%/docs/handbook/fr/ss_configfonts.png
 %%DATADIR%%/docs/handbook/fr/ss_mainterms.png
 %%DATADIR%%/docs/handbook/fr/ss_searchanal.png
 %%DATADIR%%/docs/handbook/fr/ss_searchopts.png
+%%DATADIR%%/docs/handbook/hu/hdbk-config.html
+%%DATADIR%%/docs/handbook/hu/hdbk-intro.html
+%%DATADIR%%/docs/handbook/hu/hdbk-op-bookshelfmanager.html
+%%DATADIR%%/docs/handbook/hu/hdbk-op-output.html
+%%DATADIR%%/docs/handbook/hu/hdbk-op-parts.html
+%%DATADIR%%/docs/handbook/hu/hdbk-op-search.html
+%%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.html
+%%DATADIR%%/docs/handbook/hu/hdbk-startsequence.html
+%%DATADIR%%/docs/handbook/hu/hdbk-term.html
+%%DATADIR%%/docs/handbook/hu/i_bibletime.png
+%%DATADIR%%/docs/handbook/hu/i_cascade.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_exit.png
+%%DATADIR%%/docs/handbook/hu/i_fileclose.png
+%%DATADIR%%/docs/handbook/hu/i_find.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
+%%DATADIR%%/docs/handbook/hu/i_view_mag.png
+%%DATADIR%%/docs/handbook/hu/i_window_fullscreen.png
+%%DATADIR%%/docs/handbook/hu/index.html
+%%DATADIR%%/docs/handbook/hu/ss_configfonts.png
+%%DATADIR%%/docs/handbook/hu/ss_mainterms.png
+%%DATADIR%%/docs/handbook/hu/ss_searchanal.png
+%%DATADIR%%/docs/handbook/hu/ss_searchopts.png
 %%DATADIR%%/docs/handbook/nl/hdbk-config.html
 %%DATADIR%%/docs/handbook/nl/hdbk-intro.html
 %%DATADIR%%/docs/handbook/nl/hdbk-op-bookshelfmanager.html
@@ -135,16 +199,17 @@ share/applications/bibletime.desktop
 %%DATADIR%%/docs/handbook/nl/hdbk-term.html
 %%DATADIR%%/docs/handbook/nl/i_bibletime.png
 %%DATADIR%%/docs/handbook/nl/i_cascade.png
-%%DATADIR%%/docs/handbook/nl/i_cascade_auto.png
 %%DATADIR%%/docs/handbook/nl/i_configure.png
 %%DATADIR%%/docs/handbook/nl/i_configuresword.png
-%%DATADIR%%/docs/handbook/nl/i_configuretoolbars.png
+%%DATADIR%%/docs/handbook/nl/i_contents2.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_fullscreen.png
-%%DATADIR%%/docs/handbook/nl/i_sidetree.png
-%%DATADIR%%/docs/handbook/nl/i_tile.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
+%%DATADIR%%/docs/handbook/nl/i_view_mag.png
+%%DATADIR%%/docs/handbook/nl/i_window_fullscreen.png
 %%DATADIR%%/docs/handbook/nl/index.html
 %%DATADIR%%/docs/handbook/nl/ss_configfonts.png
 %%DATADIR%%/docs/handbook/nl/ss_mainterms.png
@@ -270,6 +335,26 @@ share/applications/bibletime.desktop
 %%DATADIR%%/docs/howto/fr/h2-rules-parables.html
 %%DATADIR%%/docs/howto/fr/h2-rules.html
 %%DATADIR%%/docs/howto/fr/index.html
+%%DATADIR%%/docs/howto/hu/h2-basics-approaches.html
+%%DATADIR%%/docs/howto/hu/h2-basics-expository.html
+%%DATADIR%%/docs/howto/hu/h2-basics-interpretation.html
+%%DATADIR%%/docs/howto/hu/h2-basics-types.html
+%%DATADIR%%/docs/howto/hu/h2-basics-worksheet.html
+%%DATADIR%%/docs/howto/hu/h2-basics.html
+%%DATADIR%%/docs/howto/hu/h2-importance-breathed.html
+%%DATADIR%%/docs/howto/hu/h2-importance-exhortations.html
+%%DATADIR%%/docs/howto/hu/h2-importance-liberates.html
+%%DATADIR%%/docs/howto/hu/h2-importance-once.html
+%%DATADIR%%/docs/howto/hu/h2-importance-supplement.html
+%%DATADIR%%/docs/howto/hu/h2-importance-wars.html
+%%DATADIR%%/docs/howto/hu/h2-importance-works.html
+%%DATADIR%%/docs/howto/hu/h2-importance.html
+%%DATADIR%%/docs/howto/hu/h2-rules-context.html
+%%DATADIR%%/docs/howto/hu/h2-rules-hcontest.html
+%%DATADIR%%/docs/howto/hu/h2-rules-normal.html
+%%DATADIR%%/docs/howto/hu/h2-rules-parables.html
+%%DATADIR%%/docs/howto/hu/h2-rules.html
+%%DATADIR%%/docs/howto/hu/index.html
 %%DATADIR%%/docs/howto/it/h2-basics-approaches.html
 %%DATADIR%%/docs/howto/it/h2-basics-expository.html
 %%DATADIR%%/docs/howto/it/h2-basics-interpretation.html
@@ -375,6 +460,7 @@ share/applications/bibletime.desktop
 %%DATADIR%%/icons/bible_add.svg
 %%DATADIR%%/icons/bible_locked.svg
 %%DATADIR%%/icons/bible_remove.svg
+%%DATADIR%%/icons/bibletime.png
 %%DATADIR%%/icons/bibletime.svg
 %%DATADIR%%/icons/book.svg
 %%DATADIR%%/icons/book_add.svg
@@ -450,6 +536,7 @@ share/applications/bibletime.desktop
 %%DATADIR%%/icons/view_profile.svg
 %%DATADIR%%/icons/window_fullscreen.svg
 %%DATADIR%%/javascript/bthtml.js
+%%DATADIR%%/license/license.html
 %%DATADIR%%/locale/bibletime_ui_af.qm
 %%DATADIR%%/locale/bibletime_ui_bg.qm
 %%DATADIR%%/locale/bibletime_ui_cs.qm
@@ -480,6 +567,7 @@ share/applications/bibletime.desktop
 share/icons/bibletime.svg
 @dirrm %%DATADIR%%/pics
 @dirrm %%DATADIR%%/locale
+@dirrm %%DATADIR%%/license
 @dirrm %%DATADIR%%/javascript
 @dirrm %%DATADIR%%/icons
 @dirrm %%DATADIR%%/docs/howto/ru
@@ -487,6 +575,7 @@ share/icons/bibletime.svg
 @dirrm %%DATADIR%%/docs/howto/nl
 @dirrm %%DATADIR%%/docs/howto/ko
 @dirrm %%DATADIR%%/docs/howto/it
+@dirrm %%DATADIR%%/docs/howto/hu
 @dirrm %%DATADIR%%/docs/howto/fr
 @dirrm %%DATADIR%%/docs/howto/fi
 @dirrm %%DATADIR%%/docs/howto/en
@@ -495,10 +584,12 @@ share/icons/bibletime.svg
 @dirrm %%DATADIR%%/docs/howto/bg
 @dirrm %%DATADIR%%/docs/howto
 @dirrm %%DATADIR%%/docs/handbook/nl
+@dirrm %%DATADIR%%/docs/handbook/hu
 @dirrm %%DATADIR%%/docs/handbook/fr
 @dirrm %%DATADIR%%/docs/handbook/fi
 @dirrm %%DATADIR%%/docs/handbook/en
 @dirrm %%DATADIR%%/docs/handbook/de
+@dirrm %%DATADIR%%/docs/handbook/cs
 @dirrm %%DATADIR%%/docs/handbook
 @dirrm %%DATADIR%%/docs
 @dirrm %%DATADIR%%/display-templates