8 files changed, 166 insertions, 43 deletions

diff --git a/misc/bibletime/Makefile b/misc/bibletime/Makefile
index ac6c8ee9c579..4abdc33fa675 100644
--- a/misc/bibletime/Makefile
+++ b/misc/bibletime/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	bibletime
-PORTVERSION=	1.2.2
-PORTREVISION=	2
+PORTVERSION=	1.4.1
 CATEGORIES=	misc
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -15,18 +14,13 @@ MASTER_SITE_SUBDIR=	${PORTNAME}
 MAINTAINER=	wvengen@stack.nl
 COMMENT=	A powerful Bible study application for KDE3
 
-LIB_DEPENDS=	sword.1:${PORTSDIR}/misc/sword
-.if !defined(NOPORTDOCS)
-RUN_DEPENDS=	${LOCALBASE}/share/doc/HTML/en/bibletime:${PORTSDIR}/misc/bibletime-doc
-.endif
+LIB_DEPENDS=	sword.4:${PORTSDIR}/misc/sword
 
 USE_KDELIBS_VER=3
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 USE_BZIP2=	yes
 USE_REINPLACE=	yes
-CONFIGURE_ARGS+=--program-transform-name="" \
-		--with-sworddir=${PREFIX}
 
 post-patch:
 	@${REINPLACE_CMD} -e "s^-lpthread^${PTHREAD_LIBS}^g" ${WRKSRC}/configure
diff --git a/misc/bibletime/distinfo b/misc/bibletime/distinfo
index 95d0993bdc8b..ab1ff079973b 100644
--- a/misc/bibletime/distinfo
+++ b/misc/bibletime/distinfo
@@ -1,2 +1,2 @@
-MD5 (bibletime-1.2.2.tar.bz2) = 681aceaa8415fd05b46100d896a99b9e
-SIZE (bibletime-1.2.2.tar.bz2) = 814427
+MD5 (bibletime-1.4.1.tar.bz2) = df6ab259b188b8555f9423c629d0b239
+SIZE (bibletime-1.4.1.tar.bz2) = 1647715
diff --git a/misc/bibletime/files/patch-Makefile.am b/misc/bibletime/files/patch-Makefile.am
new file mode 100644
index 000000000000..be8cfa387ba6
--- /dev/null
+++ b/misc/bibletime/files/patch-Makefile.am
@@ -0,0 +1,11 @@
+--- Makefile.am.orig	Thu Aug 19 21:50:04 2004
++++ Makefile.am	Thu Aug 19 21:50:17 2004
+@@ -56,7 +56,7 @@
+ 	cd $(top_srcdir) && $(MAKE) -f admin/Makefile.common configure.files
+ 
+ install-data-local:
+-	chmod 755 $(DESTDIR)$(kde_datadir)/bibletime -R
++	chmod -R 755 $(DESTDIR)$(kde_datadir)/bibletime
+ 	$(mkinstalldirs) $(kde_appsdir)/Applications
+ 	$(INSTALL_DATA) $(srcdir)/bibletime.desktop $(kde_appsdir)/Applications/bibletime.desktop
+ 
diff --git a/misc/bibletime/files/patch-Makefile.in b/misc/bibletime/files/patch-Makefile.in
new file mode 100644
index 000000000000..cfae67d2cef4
--- /dev/null
+++ b/misc/bibletime/files/patch-Makefile.in
@@ -0,0 +1,11 @@
+--- Makefile.in.orig	Thu Aug 19 21:50:07 2004
++++ Makefile.in	Thu Aug 19 21:50:29 2004
+@@ -762,7 +762,7 @@
+ 	cd $(top_srcdir) && $(MAKE) -f admin/Makefile.common configure.files
+ 
+ install-data-local:
+-	chmod 755 $(DESTDIR)$(kde_datadir)/bibletime -R
++	chmod -R 755 $(DESTDIR)$(kde_datadir)/bibletime
+ #>- 	$(mkinstalldirs) $(kde_appsdir)/Applications
+ #>+ 1
+ 	$(mkinstalldirs) $(DESTDIR)$(kde_appsdir)/Applications
diff --git a/misc/bibletime/files/patch-admin::ltmain.sh b/misc/bibletime/files/patch-admin::ltmain.sh
deleted file mode 100644
index 3938e1b81b69..000000000000
--- a/misc/bibletime/files/patch-admin::ltmain.sh
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ruN admin/ltmain.sh admin/ltmain.sh
---- admin/ltmain.sh	Fri Apr 12 13:40:12 2002
-+++ admin/ltmain.sh	Thu Jun 20 09:51:32 2002
-@@ -1239,7 +1239,7 @@
- 	  esac
- 	elif test "X$arg" = "X-lc_r"; then
- 	 case $host in
--	 *-*-openbsd* | *-*-freebsd*)
-+	 *-*-openbsd* | *-*-freebsd[0-4]*)
- 	   # Do not include libc_r directly, use -pthread flag.
- 	   continue
- 	   ;;
diff --git a/misc/bibletime/files/patch-bibletime::backend::cswordbackend.cpp b/misc/bibletime/files/patch-bibletime::backend::cswordbackend.cpp
new file mode 100644
index 000000000000..fd562d6d8a8c
--- /dev/null
+++ b/misc/bibletime/files/patch-bibletime::backend::cswordbackend.cpp
@@ -0,0 +1,11 @@
+--- bibletime/backend/cswordbackend.cpp	Thu Jan 29 01:37:40 2004
++++ bibletime/backend/cswordbackend.cpp	Sat Aug 21 15:12:25 2004
+@@ -66,7 +67,7 @@
+ }
+ 
+ CSwordBackend::CSwordBackend(const QString& path)
+-	: sword::SWMgr((!path.isEmpty() ? path.local8Bit() : 0), false, new sword::EncodingFilterMgr( sword::ENC_UTF8 ))
++        : sword::SWMgr((!path.isEmpty() ? (const char*)path.local8Bit() : 0), false, new sword::EncodingFilterMgr( sword::ENC_UTF8 ))
+ {
+   qWarning("backend constructed with a path argument! %s", path.latin1());
+ 	m_displays.entry = 0;
diff --git a/misc/bibletime/files/patch-bibletime::frontend::btinstallmgr.cpp b/misc/bibletime/files/patch-bibletime::frontend::btinstallmgr.cpp
new file mode 100644
index 000000000000..11d58dff49f9
--- /dev/null
+++ b/misc/bibletime/files/patch-bibletime::frontend::btinstallmgr.cpp
@@ -0,0 +1,24 @@
+--- bibletime/frontend/btinstallmgr.cpp.orig	Mon Aug 23 09:45:16 2004
++++ bibletime/frontend/btinstallmgr.cpp	Mon Aug 23 09:44:10 2004
+@@ -104,7 +104,7 @@
+     }
+     else {
+ //      conf["Install"][!setDataPath ? "DataPath" : "AugmentPath"] = t.local8Bit();
+-	    conf["Install"].insert( std::make_pair(!setDataPath ? "DataPath" : "AugmentPath", t.local8Bit()) );
++	    conf["Install"].insert( std::make_pair((const char*)(!setDataPath ? "DataPath" : "AugmentPath"), t.local8Bit()) );
+ 
+       setDataPath = true;
+     }
+@@ -176,10 +176,10 @@
+ 			is->directory--; //make one char shorter
+ 		}
+ 
+-    config["Sources"].insert( std::make_pair("FTPSource", is->getConfEnt()) );
++    config["Sources"].insert( std::make_pair((const char*)"FTPSource", is->getConfEnt()) );
+   }
+   else if (!strcmp(is->type, "DIR")) {
+-    config["Sources"].insert( std::make_pair("DIRSource", is->getConfEnt()) );
++    config["Sources"].insert( std::make_pair((const char*)"DIRSource", is->getConfEnt()) );
+   }
+   config.Save();
+ }
diff --git a/misc/bibletime/pkg-plist b/misc/bibletime/pkg-plist
index 5c748b59687d..1897472dd058 100644
--- a/misc/bibletime/pkg-plist
+++ b/misc/bibletime/pkg-plist
@@ -1,11 +1,76 @@
-share/apps/bibletime/printing/bw_muchtext.xml
-share/apps/bibletime/printing/standard.xml
-@unexec rmdir %D/share/apps/bibletime/printing 2>/dev/null || true
+bin/bibletime
+share/applnk/Applications/bibletime.desktop
 share/apps/bibletime/bibletimeui.rc
 share/apps/bibletime/pics/startuplogo.png
-@unexec rmdir %D/share/apps/bibletime/pics 2>/dev/null || true
-@unexec rmdir %D/share/apps/bibletime 2>/dev/null || true
-@unexec rmdir %D/share/apps 2>/dev/null || true
+share/apps/bibletime/tips
+share/doc/HTML/en/bibletime/handbook/common
+share/doc/HTML/en/bibletime/handbook/configure.png
+share/doc/HTML/en/bibletime/handbook/contents.png
+share/doc/HTML/en/bibletime/handbook/editdelete.png
+share/doc/HTML/en/bibletime/handbook/exit.png
+share/doc/HTML/en/bibletime/handbook/fileclose.png
+share/doc/HTML/en/bibletime/handbook/fileprint.png
+share/doc/HTML/en/bibletime/handbook/find.png
+share/doc/HTML/en/bibletime/handbook/go.png
+share/doc/HTML/en/bibletime/handbook/hdbk-bars-toolbar-Configtoolbar.png
+share/doc/HTML/en/bibletime/handbook/hdbk-conf-optdialog-color.png
+share/doc/HTML/en/bibletime/handbook/hdbk-conf-optdialog-fonts.png
+share/doc/HTML/en/bibletime/handbook/hdbk-conf-optdialog-start.png
+share/doc/HTML/en/bibletime/handbook/hdbk-conf-optdialog-sword.png
+share/doc/HTML/en/bibletime/handbook/hdbk-config-toolbar.png
+share/doc/HTML/en/bibletime/handbook/hdbk-config.docbook
+share/doc/HTML/en/bibletime/handbook/hdbk-inst-sources-installmgr.png
+share/doc/HTML/en/bibletime/handbook/hdbk-intro.docbook
+share/doc/HTML/en/bibletime/handbook/hdbk-op-change-range.png
+share/doc/HTML/en/bibletime/handbook/hdbk-op-crch-dia-choose.png
+share/doc/HTML/en/bibletime/handbook/hdbk-op-delete-verse.png
+share/doc/HTML/en/bibletime/handbook/hdbk-op-module-select-1.png
+share/doc/HTML/en/bibletime/handbook/hdbk-op-module-select-2.png
+share/doc/HTML/en/bibletime/handbook/hdbk-op-module-tree-1.png
+share/doc/HTML/en/bibletime/handbook/hdbk-op-module-tree-bookmark-bookmarkandfolder.png
+share/doc/HTML/en/bibletime/handbook/hdbk-op-pencil.png
+share/doc/HTML/en/bibletime/handbook/hdbk-op-search-dialog-modsel.png
+share/doc/HTML/en/bibletime/handbook/hdbk-op-search-dialog-options.png
+share/doc/HTML/en/bibletime/handbook/hdbk-op-search-dialog-range.png
+share/doc/HTML/en/bibletime/handbook/hdbk-op-search-dialog-searchanal.png
+share/doc/HTML/en/bibletime/handbook/hdbk-op-search-dialog-searchresult.png
+share/doc/HTML/en/bibletime/handbook/hdbk-op-search-dialog-searchtext.png
+share/doc/HTML/en/bibletime/handbook/hdbk-operation.docbook
+share/doc/HTML/en/bibletime/handbook/hdbk-start-screen-terms.png
+share/doc/HTML/en/bibletime/handbook/hdbk-start-sequence-tips.png
+share/doc/HTML/en/bibletime/handbook/hdbk-start.docbook
+share/doc/HTML/en/bibletime/handbook/hdbk-toolbars.docbook
+share/doc/HTML/en/bibletime/handbook/hi32-action-bt_bible.png
+share/doc/HTML/en/bibletime/handbook/hi32-action-bt_bible_add.png
+share/doc/HTML/en/bibletime/handbook/hi32-action-bt_book.png
+share/doc/HTML/en/bibletime/handbook/hi32-action-bt_book_add.png
+share/doc/HTML/en/bibletime/handbook/hi32-action-bt_cascade.png
+share/doc/HTML/en/bibletime/handbook/hi32-action-bt_cascade_auto.png
+share/doc/HTML/en/bibletime/handbook/hi32-action-bt_commentary.png
+share/doc/HTML/en/bibletime/handbook/hi32-action-bt_commentary_add.png
+share/doc/HTML/en/bibletime/handbook/hi32-action-bt_displayconfig.png
+share/doc/HTML/en/bibletime/handbook/hi32-action-bt_lexicon.png
+share/doc/HTML/en/bibletime/handbook/hi32-action-bt_lexicon_add.png
+share/doc/HTML/en/bibletime/handbook/hi32-action-bt_startconfig.png
+share/doc/HTML/en/bibletime/handbook/hi32-action-bt_swordconfig.png
+share/doc/HTML/en/bibletime/handbook/hi32-action-bt_sync.png
+share/doc/HTML/en/bibletime/handbook/hi32-action-bt_tile.png
+share/doc/HTML/en/bibletime/handbook/hi32-action-bt_tile_auto.png
+share/doc/HTML/en/bibletime/handbook/hi32-app-bibletime.png
+share/doc/HTML/en/bibletime/handbook/index.docbook
+share/doc/HTML/en/bibletime/handbook/kcmfontinst.png
+share/doc/HTML/en/bibletime/handbook/key_bindings.png
+share/doc/HTML/en/bibletime/handbook/ktip.png
+share/doc/HTML/en/bibletime/handbook/pencil.png
+share/doc/HTML/en/bibletime/handbook/queue.png
+share/doc/HTML/en/bibletime/handbook/start.png
+share/doc/HTML/en/bibletime/handbook/view_sidetree.png
+share/doc/HTML/en/bibletime/handbook/window_fullscreen.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
 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
@@ -18,6 +83,7 @@ share/icons/hicolor/16x16/actions/bt_commentary.png
 share/icons/hicolor/16x16/actions/bt_commentary_add.png
 share/icons/hicolor/16x16/actions/bt_commentary_locked.png
 share/icons/hicolor/16x16/actions/bt_displayconfig.png
+share/icons/hicolor/16x16/actions/bt_displaytranslit.png
 share/icons/hicolor/16x16/actions/bt_lexicon.png
 share/icons/hicolor/16x16/actions/bt_lexicon_add.png
 share/icons/hicolor/16x16/actions/bt_lexicon_locked.png
@@ -26,10 +92,7 @@ share/icons/hicolor/16x16/actions/bt_swordconfig.png
 share/icons/hicolor/16x16/actions/bt_sync.png
 share/icons/hicolor/16x16/actions/bt_tile.png
 share/icons/hicolor/16x16/actions/bt_tile_auto.png
-@unexec rmdir %D/share/icons/hicolor/16x16/actions 2>/dev/null || true
 share/icons/hicolor/16x16/apps/bibletime.png
-@unexec rmdir %D/share/icons/hicolor/16x16/apps 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor/16x16 2>/dev/null || true
 share/icons/hicolor/22x22/actions/bt_bible.png
 share/icons/hicolor/22x22/actions/bt_bible_add.png
 share/icons/hicolor/22x22/actions/bt_bible_locked.png
@@ -42,64 +105,85 @@ share/icons/hicolor/22x22/actions/bt_commentary.png
 share/icons/hicolor/22x22/actions/bt_commentary_add.png
 share/icons/hicolor/22x22/actions/bt_commentary_locked.png
 share/icons/hicolor/22x22/actions/bt_displayconfig.png
+share/icons/hicolor/22x22/actions/bt_displaytranslit.png
 share/icons/hicolor/22x22/actions/bt_lexicon.png
 share/icons/hicolor/22x22/actions/bt_lexicon_add.png
 share/icons/hicolor/22x22/actions/bt_lexicon_locked.png
 share/icons/hicolor/22x22/actions/bt_parallel.png
 share/icons/hicolor/22x22/actions/bt_startconfig.png
-share/icons/hicolor/22x22/actions/bt_sync.png
 share/icons/hicolor/22x22/actions/bt_swordconfig.png
+share/icons/hicolor/22x22/actions/bt_sync.png
 share/icons/hicolor/22x22/actions/bt_tile.png
 share/icons/hicolor/22x22/actions/bt_tile_auto.png
-@unexec rmdir %D/share/icons/hicolor/22x22/actions 2>/dev/null || true
 share/icons/hicolor/22x22/apps/bibletime.png
-@unexec rmdir %D/share/icons/hicolor/22x22/apps 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor/22x22 2>/dev/null || true
 share/icons/hicolor/32x32/actions/bt_bible.png
 share/icons/hicolor/32x32/actions/bt_bible_add.png
+share/icons/hicolor/32x32/actions/bt_bible_locked.png
 share/icons/hicolor/32x32/actions/bt_book.png
 share/icons/hicolor/32x32/actions/bt_book_add.png
+share/icons/hicolor/32x32/actions/bt_book_locked.png
 share/icons/hicolor/32x32/actions/bt_cascade.png
 share/icons/hicolor/32x32/actions/bt_cascade_auto.png
 share/icons/hicolor/32x32/actions/bt_commentary.png
 share/icons/hicolor/32x32/actions/bt_commentary_add.png
+share/icons/hicolor/32x32/actions/bt_commentary_locked.png
 share/icons/hicolor/32x32/actions/bt_displayconfig.png
+share/icons/hicolor/32x32/actions/bt_displaytranslit.png
 share/icons/hicolor/32x32/actions/bt_lexicon.png
 share/icons/hicolor/32x32/actions/bt_lexicon_add.png
+share/icons/hicolor/32x32/actions/bt_lexicon_locked.png
 share/icons/hicolor/32x32/actions/bt_startconfig.png
 share/icons/hicolor/32x32/actions/bt_swordconfig.png
 share/icons/hicolor/32x32/actions/bt_sync.png
 share/icons/hicolor/32x32/actions/bt_tile.png
 share/icons/hicolor/32x32/actions/bt_tile_auto.png
-@unexec rmdir %D/share/icons/hicolor/32x32/actions 2>/dev/null || true
 share/icons/hicolor/32x32/apps/bibletime.png
-@unexec rmdir %D/share/icons/hicolor/32x32/apps 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor/32x32 2>/dev/null || true
 share/icons/hicolor/48x48/actions/bt_bible.png
 share/icons/hicolor/48x48/actions/bt_bible_add.png
+share/icons/hicolor/48x48/actions/bt_bible_locked.png
 share/icons/hicolor/48x48/actions/bt_book.png
 share/icons/hicolor/48x48/actions/bt_book_add.png
+share/icons/hicolor/48x48/actions/bt_book_locked.png
 share/icons/hicolor/48x48/actions/bt_cascade.png
 share/icons/hicolor/48x48/actions/bt_cascade_auto.png
 share/icons/hicolor/48x48/actions/bt_commentary.png
 share/icons/hicolor/48x48/actions/bt_commentary_add.png
+share/icons/hicolor/48x48/actions/bt_commentary_locked.png
 share/icons/hicolor/48x48/actions/bt_displayconfig.png
+share/icons/hicolor/48x48/actions/bt_displaytranslit.png
 share/icons/hicolor/48x48/actions/bt_lexicon.png
 share/icons/hicolor/48x48/actions/bt_lexicon_add.png
+share/icons/hicolor/48x48/actions/bt_lexicon_locked.png
 share/icons/hicolor/48x48/actions/bt_startconfig.png
 share/icons/hicolor/48x48/actions/bt_swordconfig.png
 share/icons/hicolor/48x48/actions/bt_sync.png
 share/icons/hicolor/48x48/actions/bt_tile.png
 share/icons/hicolor/48x48/actions/bt_tile_auto.png
-@unexec rmdir %D/share/icons/hicolor/48x48/actions 2>/dev/null || true
 share/icons/hicolor/48x48/apps/bibletime.png
+share/icons/hicolor/64x64/apps/bibletime.png
+@unexec rmdir %D/share/icons/hicolor/64x64/apps 2>/dev/null || true
+@unexec rmdir %D/share/icons/hicolor/64x64 2>/dev/null || true
 @unexec rmdir %D/share/icons/hicolor/48x48/apps 2>/dev/null || true
+@unexec rmdir %D/share/icons/hicolor/48x48/actions 2>/dev/null || true
 @unexec rmdir %D/share/icons/hicolor/48x48 2>/dev/null || true
+@unexec rmdir %D/share/icons/hicolor/32x32/apps 2>/dev/null || true
+@unexec rmdir %D/share/icons/hicolor/32x32/actions 2>/dev/null || true
+@unexec rmdir %D/share/icons/hicolor/32x32 2>/dev/null || true
+@unexec rmdir %D/share/icons/hicolor/22x22/apps 2>/dev/null || true
+@unexec rmdir %D/share/icons/hicolor/22x22/actions 2>/dev/null || true
+@unexec rmdir %D/share/icons/hicolor/22x22 2>/dev/null || true
+@unexec rmdir %D/share/icons/hicolor/16x16/apps 2>/dev/null || true
+@unexec rmdir %D/share/icons/hicolor/16x16/actions 2>/dev/null || true
+@unexec rmdir %D/share/icons/hicolor/16x16 2>/dev/null || true
 @unexec rmdir %D/share/icons/hicolor 2>/dev/null || true
-@unexec rmdir %D/share/icons 2>/dev/null || true
-share/config/bt-printing
+@dirrm share/doc/HTML/en/bibletime/howto
+@dirrm share/doc/HTML/en/bibletime/handbook
+@dirrm share/doc/HTML/en/bibletime
+@unexec rmdir %D/share/doc/HTML/en 2>/dev/null || true
+@unexec rmdir %D/share/doc/HTML 2>/dev/null || true
 @unexec rmdir %D/share/config 2>/dev/null || true
-share/applnk/Applications/bibletime.desktop
+@unexec rmdir %D/share/apps/bibletime/pics
+@unexec rmdir %D/share/apps/bibletime 2>/dev/null || true
+@unexec rmdir %D/share/apps 2>/dev/null || true
 @unexec rmdir %D/share/applnk/Applications 2>/dev/null || true
 @unexec rmdir %D/share/applnk 2>/dev/null || true
-bin/bibletime