3 files changed, 100 insertions, 10 deletions

diff --git a/misc/bibletime-devel/Makefile b/misc/bibletime-devel/Makefile
index c9213879aa87..7370487339a8 100644
--- a/misc/bibletime-devel/Makefile
+++ b/misc/bibletime-devel/Makefile
@@ -6,17 +6,17 @@
 #
 
 PORTNAME=	bibletime
-PORTVERSION=	2.0.r1
-PORTREVISION=	1
+DISTVERSION=	2.1-20090609
 CATEGORIES=	misc kde
-MASTER_SITES=	SF
+MASTER_SITES=	LOCAL
+MASTER_SITE_SUBDIR=	tabthorpe
 PKGNAMESUFFIX=	-devel
 DISTNAME=	${PORTNAME}-${PORTVERSION:S/.r/.rc/}
 
 MAINTAINER=	tabthorpe@FreeBSD.org
-COMMENT=	An opensource Bible study application
+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
@@ -28,7 +28,7 @@ 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*
+CONFLICTS=	bibletime-kde4-2*
 
 .include <bsd.port.pre.mk>
 
@@ -37,7 +37,6 @@ BROKEN=	does on build on 6.x, use misc/bibletime-kde3
 .endif
 
 post-extract:
-	${MV} ${WRKDIR}/${DISTNAME} ${WRKDIR}/${PORTNAME}-${PORTVERSION}
 	${MKDIR} ${WRKSRC}/build
 
 do-configure:
diff --git a/misc/bibletime-devel/distinfo b/misc/bibletime-devel/distinfo
index f4e673239c8b..9189138015bd 100644
--- a/misc/bibletime-devel/distinfo
+++ b/misc/bibletime-devel/distinfo
@@ -1,3 +1,3 @@
-MD5 (bibletime-2.0.rc1.tar.gz) = 2ce4345a21612f7e14a8d732e8d54bc7
-SHA256 (bibletime-2.0.rc1.tar.gz) = 4811ab9f7fdd2fe960541e4cfa206984b2b8d39fd8bed6487434237c8a986f76
-SIZE (bibletime-2.0.rc1.tar.gz) = 4287640
+MD5 (bibletime-2.1.20090609.tar.gz) = 0a751bb7634940400fd7d2bdf43fffb5
+SHA256 (bibletime-2.1.20090609.tar.gz) = d17a67745f369991e0af650bc600f5c0f495c6a5eec349be6530066360233eef
+SIZE (bibletime-2.1.20090609.tar.gz) = 4294860
diff --git a/misc/bibletime-devel/pkg-plist b/misc/bibletime-devel/pkg-plist
index 7add9231ab0b..de46caace05c 100644
--- a/misc/bibletime-devel/pkg-plist
+++ b/misc/bibletime-devel/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