- Update to 2.0.b2

3 files changed, 71 insertions, 36 deletions

diff --git a/misc/bibletime-devel/Makefile b/misc/bibletime-devel/Makefile
index bd2f260b8ea7..da53e9d6fa3b 100644
--- a/misc/bibletime-devel/Makefile
+++ b/misc/bibletime-devel/Makefile
@@ -6,11 +6,11 @@
 #
 
 PORTNAME=	bibletime
-PORTVERSION=	2.0.a3
+PORTVERSION=	2.0.b2
 CATEGORIES=	misc kde
 MASTER_SITES=	SF
 PKGNAMESUFFIX=	-devel
-DISTNAME=	${PORTNAME}-${PORTVERSION:S/.a/.alpha/}
+DISTNAME=	${PORTNAME}-${PORTVERSION:S/.b/.beta/}
 
 MAINTAINER=	tabthorpe@FreeBSD.org
 COMMENT=	An opensource Bible study application
@@ -29,6 +29,12 @@ QT_COMPONENTS=	corelib dbus gui xml webkit qmake_build moc_build uic_build rcc_b
 
 CONFLICTS=	bibletime*-1.7*
 
+.include <bsd.port.pre.mk>
+
+.if ${OSVERSION} < 700042
+BROKEN=	does on build on 6.x, use misc/bibletime-kde3
+.endif
+
 post-extract:
 	${MV} ${WRKDIR}/${DISTNAME} ${WRKDIR}/${PORTNAME}-${PORTVERSION}
 	${MKDIR} ${WRKSRC}/build
@@ -39,4 +45,4 @@ do-configure:
 		-D CMAKE_INSTALL_PREFIX=${PREFIX} \
 		${WRKSRC}/..
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/misc/bibletime-devel/distinfo b/misc/bibletime-devel/distinfo
index 8aba674d7702..bdbb8d3e6506 100644
--- a/misc/bibletime-devel/distinfo
+++ b/misc/bibletime-devel/distinfo
@@ -1,3 +1,3 @@
-MD5 (bibletime-2.0.alpha3.tar.gz) = 4edac617f35ea83312f6e892f959c3d2
-SHA256 (bibletime-2.0.alpha3.tar.gz) = 505319eaff1b1ffd838869f8efddf0bdb2ef8b583feb2f6318fa68478beaae28
-SIZE (bibletime-2.0.alpha3.tar.gz) = 4478619
+MD5 (bibletime-2.0.beta2.tar.gz) = 63b49b45bca43d981281a0ae8a57be04
+SHA256 (bibletime-2.0.beta2.tar.gz) = d191db11645dfcd6cb419cfdeab01f25fe91a94f995ddf158d6ecab7025f29b2
+SIZE (bibletime-2.0.beta2.tar.gz) = 4507646
diff --git a/misc/bibletime-devel/pkg-plist b/misc/bibletime-devel/pkg-plist
index 00655ddc3ee9..e4a77020a989 100644
--- a/misc/bibletime-devel/pkg-plist
+++ b/misc/bibletime-devel/pkg-plist
@@ -23,12 +23,16 @@ share/applications/bibletime.desktop
 %%DATADIR%%/docs/handbook/cs/i_configure.png
 %%DATADIR%%/docs/handbook/cs/i_configuresword.png
 %%DATADIR%%/docs/handbook/cs/i_configuretoolbars.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_fullscreen.png
 %%DATADIR%%/docs/handbook/cs/i_sidetree.png
 %%DATADIR%%/docs/handbook/cs/i_tile.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
@@ -52,41 +56,16 @@ share/applications/bibletime.desktop
 %%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/index.html
-%%DATADIR%%/docs/handbook/de/ss_configfonts.png
-%%DATADIR%%/docs/handbook/de/ss_mainterms.png
-%%DATADIR%%/docs/handbook/de/ss_searchanal.png
-%%DATADIR%%/docs/handbook/de/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
-%%DATADIR%%/docs/handbook/de/hdbk-op-output.html
-%%DATADIR%%/docs/handbook/de/hdbk-op-parts.html
-%%DATADIR%%/docs/handbook/de/hdbk-op-search.html
-%%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.html
-%%DATADIR%%/docs/handbook/de/hdbk-startsequence.html
-%%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_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_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
@@ -110,12 +89,16 @@ share/applications/bibletime.desktop
 %%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_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
@@ -139,12 +122,16 @@ share/applications/bibletime.desktop
 %%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_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
@@ -168,17 +155,54 @@ share/applications/bibletime.desktop
 %%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_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_cascade_auto.png
+%%DATADIR%%/docs/handbook/hu/i_configure.png
+%%DATADIR%%/docs/handbook/hu/i_configuresword.png
+%%DATADIR%%/docs/handbook/hu/i_configuretoolbars.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_fullscreen.png
+%%DATADIR%%/docs/handbook/hu/i_sidetree.png
+%%DATADIR%%/docs/handbook/hu/i_tile.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
@@ -197,12 +221,16 @@ share/applications/bibletime.desktop
 %%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_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
@@ -509,6 +537,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
@@ -535,7 +564,6 @@ share/applications/bibletime.desktop
 %%DATADIR%%/locale/bibletime_ui_vi.qm
 %%DATADIR%%/locale/bibletime_ui_zh_CN.qm
 %%DATADIR%%/locale/bibletime_ui_zh_TW.qm
-%%DATADIR%%/license/license.html
 %%DATADIR%%/pics/startuplogo.png
 share/icons/bibletime.svg
 @dirrm %%DATADIR%%/pics
@@ -556,6 +584,7 @@ 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