- Update to 2.0.a3

- Mark CONFLICTS with misc/bibletime-kde4

3 files changed, 65 insertions, 4 deletions

diff --git a/misc/bibletime-devel/Makefile b/misc/bibletime-devel/Makefile
index fbf01a231c0a..bd2f260b8ea7 100644
--- a/misc/bibletime-devel/Makefile
+++ b/misc/bibletime-devel/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	bibletime
-PORTVERSION=	2.0.a2
+PORTVERSION=	2.0.a3
 CATEGORIES=	misc kde
 MASTER_SITES=	SF
 PKGNAMESUFFIX=	-devel
@@ -27,6 +27,8 @@ USE_CMAKE=	yes
 USE_QT_VER=	4
 QT_COMPONENTS=	corelib dbus gui xml webkit qmake_build moc_build uic_build rcc_build
 
+CONFLICTS=	bibletime*-1.7*
+
 post-extract:
 	${MV} ${WRKDIR}/${DISTNAME} ${WRKDIR}/${PORTNAME}-${PORTVERSION}
 	${MKDIR} ${WRKSRC}/build
diff --git a/misc/bibletime-devel/distinfo b/misc/bibletime-devel/distinfo
index c218fdac24e1..8aba674d7702 100644
--- a/misc/bibletime-devel/distinfo
+++ b/misc/bibletime-devel/distinfo
@@ -1,3 +1,3 @@
-MD5 (bibletime-2.0.alpha2.tar.gz) = 059ac5d59f3cdc486cfbdcf531e51319
-SHA256 (bibletime-2.0.alpha2.tar.gz) = 7031c4e9578b616700a9bc565ecd8aec5d7187371da482f2c563f867e18185e2
-SIZE (bibletime-2.0.alpha2.tar.gz) = 4408698
+MD5 (bibletime-2.0.alpha3.tar.gz) = 4edac617f35ea83312f6e892f959c3d2
+SHA256 (bibletime-2.0.alpha3.tar.gz) = 505319eaff1b1ffd838869f8efddf0bdb2ef8b583feb2f6318fa68478beaae28
+SIZE (bibletime-2.0.alpha3.tar.gz) = 4478619
diff --git a/misc/bibletime-devel/pkg-plist b/misc/bibletime-devel/pkg-plist
index 68acba64afc8..00655ddc3ee9 100644
--- a/misc/bibletime-devel/pkg-plist
+++ b/misc/bibletime-devel/pkg-plist
@@ -5,6 +5,64 @@ 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_cascade_auto.png
+%%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_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/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
+%%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/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
@@ -502,6 +560,7 @@ share/icons/bibletime.svg
 @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