- Update to 1.5.3

- Pass maintainership to submitter
- Reformat pkg-descr
- Workaround for sword 1.5.8 (LIB_DEPENDS -> {RUN,BUILD}_DEPENDS)

PR:		ports/100213
Submitted by	Thomas Abthorpe <thomas goodking.ca>

8 files changed, 97 insertions, 116 deletions

diff --git a/misc/bibletime/Makefile b/misc/bibletime/Makefile
index 7514e1720b26..06126f789199 100644
--- a/misc/bibletime/Makefile
+++ b/misc/bibletime/Makefile
@@ -6,21 +6,22 @@
 #
 
 PORTNAME=	bibletime
-PORTVERSION=	1.4.1
-PORTREVISION=	3
+PORTVERSION=	1.5.3
 CATEGORIES=	misc
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	thomas@goodking.ca
 COMMENT=	A powerful Bible study application for KDE3
 
-LIB_DEPENDS=	sword.4:${PORTSDIR}/misc/sword
+RUN_DEPENDS=	${LOCALBASE}/lib/libsword.so:${PORTSDIR}/misc/sword
+BUILD_DEPENDS=	${RUN_DEPENDS}
 
 USE_KDELIBS_VER=3
 USE_AUTOTOOLS=	libtool:15
 USE_GMAKE=	yes
 USE_BZIP2=	yes
+INSTALLS_ICONS=	yes
 
 post-patch:
 	@${REINPLACE_CMD} -e "s^-lpthread^${PTHREAD_LIBS}^g" ${WRKSRC}/configure
diff --git a/misc/bibletime/distinfo b/misc/bibletime/distinfo
index ae9ef4dd7600..748c8e03f344 100644
--- a/misc/bibletime/distinfo
+++ b/misc/bibletime/distinfo
@@ -1,3 +1,3 @@
-MD5 (bibletime-1.4.1.tar.bz2) = df6ab259b188b8555f9423c629d0b239
-SHA256 (bibletime-1.4.1.tar.bz2) = cac2185f5bfbbcee1e7665e97369e6cb3ef27ebc78f9cea274b84c2ba0b44be8
-SIZE (bibletime-1.4.1.tar.bz2) = 1647715
+MD5 (bibletime-1.5.3.tar.bz2) = 9094cc2369c1e92617bcf563f6cf71c4
+SHA256 (bibletime-1.5.3.tar.bz2) = 95a868a18b85ffb9f52671c3e2cb386ef09a0ca9651a78e929cb88a35b0b6aa5
+SIZE (bibletime-1.5.3.tar.bz2) = 1172436
diff --git a/misc/bibletime/files/patch-Makefile.am b/misc/bibletime/files/patch-Makefile.am
index be8cfa387ba6..42d791b7b39f 100644
--- a/misc/bibletime/files/patch-Makefile.am
+++ b/misc/bibletime/files/patch-Makefile.am
@@ -1,11 +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 @@
+--- Makefile.am.orig	Sun Oct 16 06:13:14 2005
++++ Makefile.am	Tue Jul 11 15:23:47 2006
+@@ -54,7 +54,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
+ 	$(INSTALL_DATA) $(top_builddir)/bibletime.desktop $(kde_appsdir)/Applications/bibletime.desktop
  
diff --git a/misc/bibletime/files/patch-Makefile.in b/misc/bibletime/files/patch-Makefile.in
index cfae67d2cef4..3557270186ae 100644
--- a/misc/bibletime/files/patch-Makefile.in
+++ b/misc/bibletime/files/patch-Makefile.in
@@ -1,6 +1,6 @@
---- Makefile.in.orig	Thu Aug 19 21:50:07 2004
-+++ Makefile.in	Thu Aug 19 21:50:29 2004
-@@ -762,7 +762,7 @@
+--- Makefile.in.orig	Sun Nov 13 15:24:02 2005
++++ Makefile.in	Tue Jul 11 15:13:07 2006
+@@ -772,7 +772,7 @@
  	cd $(top_srcdir) && $(MAKE) -f admin/Makefile.common configure.files
  
  install-data-local:
diff --git a/misc/bibletime/files/patch-bibletime::backend::cswordbackend.cpp b/misc/bibletime/files/patch-bibletime::backend::cswordbackend.cpp
index fd562d6d8a8c..f14425d2f1f0 100644
--- a/misc/bibletime/files/patch-bibletime::backend::cswordbackend.cpp
+++ b/misc/bibletime/files/patch-bibletime::backend::cswordbackend.cpp
@@ -1,11 +1,9 @@
---- 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 @@
- }
+--- bibletime/backend/cswordbackend.cpp.orig	Sat Sep 10 04:19:40 2005
++++ bibletime/backend/cswordbackend.cpp	Thu Jul 13 08:58:04 2006
+@@ -1,3 +1,6 @@
++//
++// please send this patch- to the attic.
++//
+ /********* Read the file LICENSE for license details. *********/
  
- 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;
+ //BibleTime includes
diff --git a/misc/bibletime/files/patch-bibletime::frontend::btinstallmgr.cpp b/misc/bibletime/files/patch-bibletime::frontend::btinstallmgr.cpp
index 11d58dff49f9..d20435f830f3 100644
--- a/misc/bibletime/files/patch-bibletime::frontend::btinstallmgr.cpp
+++ b/misc/bibletime/files/patch-bibletime::frontend::btinstallmgr.cpp
@@ -1,24 +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()) );
+--- bibletime/frontend/btinstallmgr.cpp.orig	Sat Oct  1 08:18:03 2005
++++ bibletime/frontend/btinstallmgr.cpp	Tue Jul 11 11:07:41 2006
+@@ -97,7 +97,7 @@
+ 				continue;
+ 			}
+ 			else {
+-				conf["Install"].insert( std::make_pair(!setDataPath ? SWBuf("DataPath") : SWBuf("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
- 		}
+ 				setDataPath = true;
+ 			}
+@@ -167,10 +167,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();
- }
+-			config["Sources"].insert( std::make_pair(SWBuf("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(SWBuf("DIRSource"), is->getConfEnt()) );
++			config["Sources"].insert( std::make_pair((const char*)"DIRSource", is->getConfEnt()) );
+ 		}
+ 		config.Save();
+ 	}
diff --git a/misc/bibletime/pkg-descr b/misc/bibletime/pkg-descr
index d73877f626e6..e4e3f6a1f992 100644
--- a/misc/bibletime/pkg-descr
+++ b/misc/bibletime/pkg-descr
@@ -1,13 +1,12 @@
-BibleTime is a powerful Bible study application for the K Desktop Environment
-running on Unix operating systems.  BibleTime is based on the Sword library
-which provides access to all the different text modules created by the
-Crosswire Bible Society. 
+BibleTime is a powerful Bible study application for the K Desktop
+Environment running on Unix operating systems.  BibleTime is based
+on the Sword library which provides access to all the different
+text modules created by the Crosswire Bible Society.
 
-Current features are: toolbar, splitted window with index and MDI interface,
-searching in one or more modules supporting regular expressions, graphical
-search analysis, bookmarks, drag & drop, WYSIWYG html editing for comments,
-printing and an extensive help system.
+Current features are: toolbar, splitted window with index and MDI
+interface, searching in one or more modules supporting regular
+expressions, graphical search analysis, bookmarks, drag & drop,
+WYSIWYG html editing for comments, printing and an extensive help
+system.
 
-WWW:  http://www.bibletime.de/
-
-- Willem van Engen <wvengen@stack.nl>
+WWW:  http://www.bibletime.info/
diff --git a/misc/bibletime/pkg-plist b/misc/bibletime/pkg-plist
index add36c508a16..efcd1c649673 100644
--- a/misc/bibletime/pkg-plist
+++ b/misc/bibletime/pkg-plist
@@ -1,71 +1,54 @@
 bin/bibletime
+include/bibletimeinterface.h
 share/applnk/Applications/bibletime.desktop
 share/apps/bibletime/bibletimeui.rc
 share/apps/bibletime/pics/startuplogo.png
 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-reference.docbook
 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/i_bible.png
+share/doc/HTML/en/bibletime/handbook/i_bible_add.png
+share/doc/HTML/en/bibletime/handbook/i_bibletime.png
+share/doc/HTML/en/bibletime/handbook/i_book.png
+share/doc/HTML/en/bibletime/handbook/i_book_add.png
+share/doc/HTML/en/bibletime/handbook/i_cascade.png
+share/doc/HTML/en/bibletime/handbook/i_cascade_auto.png
+share/doc/HTML/en/bibletime/handbook/i_commentary.png
+share/doc/HTML/en/bibletime/handbook/i_commentary_add.png
+share/doc/HTML/en/bibletime/handbook/i_configure.png
+share/doc/HTML/en/bibletime/handbook/i_configureaccels.png
+share/doc/HTML/en/bibletime/handbook/i_configuredisplay.png
+share/doc/HTML/en/bibletime/handbook/i_configurefonts.png
+share/doc/HTML/en/bibletime/handbook/i_configurestart.png
+share/doc/HTML/en/bibletime/handbook/i_configuresword.png
+share/doc/HTML/en/bibletime/handbook/i_configuretoolbars.png
+share/doc/HTML/en/bibletime/handbook/i_contents.png
+share/doc/HTML/en/bibletime/handbook/i_delete.png
+share/doc/HTML/en/bibletime/handbook/i_editdelete.png
+share/doc/HTML/en/bibletime/handbook/i_exit.png
+share/doc/HTML/en/bibletime/handbook/i_fileclose.png
+share/doc/HTML/en/bibletime/handbook/i_fileprint.png
+share/doc/HTML/en/bibletime/handbook/i_find.png
+share/doc/HTML/en/bibletime/handbook/i_fullscreen.png
+share/doc/HTML/en/bibletime/handbook/i_go.png
+share/doc/HTML/en/bibletime/handbook/i_ktip.png
+share/doc/HTML/en/bibletime/handbook/i_lexicon.png
+share/doc/HTML/en/bibletime/handbook/i_lexicon_add.png
+share/doc/HTML/en/bibletime/handbook/i_pencil.png
+share/doc/HTML/en/bibletime/handbook/i_sidetree.png
+share/doc/HTML/en/bibletime/handbook/i_sync.png
+share/doc/HTML/en/bibletime/handbook/i_tile.png
+share/doc/HTML/en/bibletime/handbook/i_tile_auto.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/handbook/ss_configfonts.png
+share/doc/HTML/en/bibletime/handbook/ss_configtoolbar.png
+share/doc/HTML/en/bibletime/handbook/ss_mainterms.png
+share/doc/HTML/en/bibletime/handbook/ss_searchanal.png
+share/doc/HTML/en/bibletime/handbook/ss_searchopts.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
@@ -183,8 +166,8 @@ share/doc/HTML/en/common/common
 @dirrmtry share/doc/HTML/en
 @dirrmtry share/doc/HTML
 @dirrmtry share/config
-@unexec rmdir %D/share/apps/bibletime/pics
-@dirrmtry share/apps/bibletime
+@dirrm share/apps/bibletime/pics
+@dirrm share/apps/bibletime
 @dirrmtry share/apps
 @dirrmtry share/applnk/Applications
 @dirrmtry share/applnk