- Update to 1.6

PR:		ports/103735
Submitted by:	Thomas Abthorpe <thomas(at)goodking.ca> (maintainer)

20 files changed, 100 insertions, 72 deletions

diff --git a/misc/bibletime-devel/Makefile b/misc/bibletime-devel/Makefile
index f647253f0f2..183dc1578d3 100644
--- a/misc/bibletime-devel/Makefile
+++ b/misc/bibletime-devel/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	bibletime
-PORTVERSION=	1.5.3
+PORTVERSION=	1.6
 CATEGORIES=	misc
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -14,13 +14,17 @@ MASTER_SITE_SUBDIR=	${PORTNAME}
 MAINTAINER=	thomas@goodking.ca
 COMMENT=	A powerful Bible study application for KDE3
 
-RUN_DEPENDS=	${LOCALBASE}/lib/libsword.so:${PORTSDIR}/misc/sword
+RUN_DEPENDS=	${LOCALBASE}/lib/libsword.so:${PORTSDIR}/misc/sword \
+		${LOCALBASE}/lib/libclucene.so:${PORTSDIR}/textproc/clucene
 BUILD_DEPENDS=	${RUN_DEPENDS}
 
 USE_KDELIBS_VER=3
 USE_AUTOTOOLS=	libtool:15
 USE_GMAKE=	yes
 USE_BZIP2=	yes
+GNU_CONFIGURE=	yes
+CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
+CONFIGURE_ARGS+=	--enable-static-clucene
 INSTALLS_ICONS=	yes
 
 .include <bsd.port.pre.mk>
diff --git a/misc/bibletime-devel/distinfo b/misc/bibletime-devel/distinfo
index 748c8e03f34..7a451b20b46 100644
--- a/misc/bibletime-devel/distinfo
+++ b/misc/bibletime-devel/distinfo
@@ -1,3 +1,3 @@
-MD5 (bibletime-1.5.3.tar.bz2) = 9094cc2369c1e92617bcf563f6cf71c4
-SHA256 (bibletime-1.5.3.tar.bz2) = 95a868a18b85ffb9f52671c3e2cb386ef09a0ca9651a78e929cb88a35b0b6aa5
-SIZE (bibletime-1.5.3.tar.bz2) = 1172436
+MD5 (bibletime-1.6.tar.bz2) = 44ba2d9bd907d38ea86ad5ff565d6af0
+SHA256 (bibletime-1.6.tar.bz2) = ef3e83a27bfafb0a73141c417628b27692161b5dbde2cafdca1af31751d5b886
+SIZE (bibletime-1.6.tar.bz2) = 1228793
diff --git a/misc/bibletime-devel/files/patch-Makefile.am b/misc/bibletime-devel/files/patch-Makefile.am
index 42d791b7b39..675d8dc1bd1 100644
--- a/misc/bibletime-devel/files/patch-Makefile.am
+++ b/misc/bibletime-devel/files/patch-Makefile.am
@@ -1,11 +1,11 @@
---- Makefile.am.orig	Sun Oct 16 06:13:14 2005
-+++ Makefile.am	Tue Jul 11 15:23:47 2006
-@@ -54,7 +54,7 @@
+--- Makefile.am.orig	Fri Sep 22 12:01:51 2006
++++ Makefile.am	Fri Sep 22 12:04:19 2006
+@@ -55,7 +55,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) $(top_builddir)/bibletime.desktop $(kde_appsdir)/Applications/bibletime.desktop
+ 	$(mkinstalldirs) $(datadir)/applications
+ 	$(INSTALL_DATA) $(top_builddir)/bibletime.desktop $(datadir)/applications/bibletime.desktop
  
diff --git a/misc/bibletime-devel/files/patch-Makefile.in b/misc/bibletime-devel/files/patch-Makefile.in
index 3557270186a..03a77507a74 100644
--- a/misc/bibletime-devel/files/patch-Makefile.in
+++ b/misc/bibletime-devel/files/patch-Makefile.in
@@ -1,11 +1,11 @@
---- Makefile.in.orig	Sun Nov 13 15:24:02 2005
-+++ Makefile.in	Tue Jul 11 15:13:07 2006
-@@ -772,7 +772,7 @@
+--- Makefile.in.orig	Fri Sep 22 08:56:37 2006
++++ Makefile.in	Fri Sep 22 12:38:32 2006
+@@ -844,7 +844,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
+ #>- 	$(mkinstalldirs) $(datadir)/applications
  #>+ 1
- 	$(mkinstalldirs) $(DESTDIR)$(kde_appsdir)/Applications
+ 	$(mkinstalldirs) $(DESTDIR)$(datadir)/applications
diff --git a/misc/bibletime-devel/pkg-plist b/misc/bibletime-devel/pkg-plist
index efcd1c64967..29fdb45bdfa 100644
--- a/misc/bibletime-devel/pkg-plist
+++ b/misc/bibletime-devel/pkg-plist
@@ -1,6 +1,6 @@
 bin/bibletime
 include/bibletimeinterface.h
-share/applnk/Applications/bibletime.desktop
+share/applications/bibletime.desktop
 share/apps/bibletime/bibletimeui.rc
 share/apps/bibletime/pics/startuplogo.png
 share/apps/bibletime/tips
@@ -67,6 +67,7 @@ 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_findstrongs.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
@@ -89,6 +90,7 @@ 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_findstrongs.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
@@ -112,6 +114,7 @@ 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_findstrongs.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
@@ -160,6 +163,7 @@ share/doc/HTML/en/common/common
 @dirrmtry share/icons/hicolor/16x16/actions
 @dirrmtry share/icons/hicolor/16x16
 @dirrmtry share/icons/hicolor
+@dirrmtry share/icons
 @dirrm share/doc/HTML/en/bibletime/howto
 @dirrm share/doc/HTML/en/bibletime/handbook
 @dirrm share/doc/HTML/en/bibletime
@@ -169,5 +173,4 @@ share/doc/HTML/en/common/common
 @dirrm share/apps/bibletime/pics
 @dirrm share/apps/bibletime
 @dirrmtry share/apps
-@dirrmtry share/applnk/Applications
-@dirrmtry share/applnk
+@dirrmtry share/applications
diff --git a/misc/bibletime-kde3/Makefile b/misc/bibletime-kde3/Makefile
index f647253f0f2..183dc1578d3 100644
--- a/misc/bibletime-kde3/Makefile
+++ b/misc/bibletime-kde3/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	bibletime
-PORTVERSION=	1.5.3
+PORTVERSION=	1.6
 CATEGORIES=	misc
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -14,13 +14,17 @@ MASTER_SITE_SUBDIR=	${PORTNAME}
 MAINTAINER=	thomas@goodking.ca
 COMMENT=	A powerful Bible study application for KDE3
 
-RUN_DEPENDS=	${LOCALBASE}/lib/libsword.so:${PORTSDIR}/misc/sword
+RUN_DEPENDS=	${LOCALBASE}/lib/libsword.so:${PORTSDIR}/misc/sword \
+		${LOCALBASE}/lib/libclucene.so:${PORTSDIR}/textproc/clucene
 BUILD_DEPENDS=	${RUN_DEPENDS}
 
 USE_KDELIBS_VER=3
 USE_AUTOTOOLS=	libtool:15
 USE_GMAKE=	yes
 USE_BZIP2=	yes
+GNU_CONFIGURE=	yes
+CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
+CONFIGURE_ARGS+=	--enable-static-clucene
 INSTALLS_ICONS=	yes
 
 .include <bsd.port.pre.mk>
diff --git a/misc/bibletime-kde3/distinfo b/misc/bibletime-kde3/distinfo
index 748c8e03f34..7a451b20b46 100644
--- a/misc/bibletime-kde3/distinfo
+++ b/misc/bibletime-kde3/distinfo
@@ -1,3 +1,3 @@
-MD5 (bibletime-1.5.3.tar.bz2) = 9094cc2369c1e92617bcf563f6cf71c4
-SHA256 (bibletime-1.5.3.tar.bz2) = 95a868a18b85ffb9f52671c3e2cb386ef09a0ca9651a78e929cb88a35b0b6aa5
-SIZE (bibletime-1.5.3.tar.bz2) = 1172436
+MD5 (bibletime-1.6.tar.bz2) = 44ba2d9bd907d38ea86ad5ff565d6af0
+SHA256 (bibletime-1.6.tar.bz2) = ef3e83a27bfafb0a73141c417628b27692161b5dbde2cafdca1af31751d5b886
+SIZE (bibletime-1.6.tar.bz2) = 1228793
diff --git a/misc/bibletime-kde3/files/patch-Makefile.am b/misc/bibletime-kde3/files/patch-Makefile.am
index 42d791b7b39..675d8dc1bd1 100644
--- a/misc/bibletime-kde3/files/patch-Makefile.am
+++ b/misc/bibletime-kde3/files/patch-Makefile.am
@@ -1,11 +1,11 @@
---- Makefile.am.orig	Sun Oct 16 06:13:14 2005
-+++ Makefile.am	Tue Jul 11 15:23:47 2006
-@@ -54,7 +54,7 @@
+--- Makefile.am.orig	Fri Sep 22 12:01:51 2006
++++ Makefile.am	Fri Sep 22 12:04:19 2006
+@@ -55,7 +55,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) $(top_builddir)/bibletime.desktop $(kde_appsdir)/Applications/bibletime.desktop
+ 	$(mkinstalldirs) $(datadir)/applications
+ 	$(INSTALL_DATA) $(top_builddir)/bibletime.desktop $(datadir)/applications/bibletime.desktop
  
diff --git a/misc/bibletime-kde3/files/patch-Makefile.in b/misc/bibletime-kde3/files/patch-Makefile.in
index 3557270186a..03a77507a74 100644
--- a/misc/bibletime-kde3/files/patch-Makefile.in
+++ b/misc/bibletime-kde3/files/patch-Makefile.in
@@ -1,11 +1,11 @@
---- Makefile.in.orig	Sun Nov 13 15:24:02 2005
-+++ Makefile.in	Tue Jul 11 15:13:07 2006
-@@ -772,7 +772,7 @@
+--- Makefile.in.orig	Fri Sep 22 08:56:37 2006
++++ Makefile.in	Fri Sep 22 12:38:32 2006
+@@ -844,7 +844,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
+ #>- 	$(mkinstalldirs) $(datadir)/applications
  #>+ 1
- 	$(mkinstalldirs) $(DESTDIR)$(kde_appsdir)/Applications
+ 	$(mkinstalldirs) $(DESTDIR)$(datadir)/applications
diff --git a/misc/bibletime-kde3/pkg-plist b/misc/bibletime-kde3/pkg-plist
index efcd1c64967..29fdb45bdfa 100644
--- a/misc/bibletime-kde3/pkg-plist
+++ b/misc/bibletime-kde3/pkg-plist
@@ -1,6 +1,6 @@
 bin/bibletime
 include/bibletimeinterface.h
-share/applnk/Applications/bibletime.desktop
+share/applications/bibletime.desktop
 share/apps/bibletime/bibletimeui.rc
 share/apps/bibletime/pics/startuplogo.png
 share/apps/bibletime/tips
@@ -67,6 +67,7 @@ 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_findstrongs.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
@@ -89,6 +90,7 @@ 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_findstrongs.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
@@ -112,6 +114,7 @@ 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_findstrongs.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
@@ -160,6 +163,7 @@ share/doc/HTML/en/common/common
 @dirrmtry share/icons/hicolor/16x16/actions
 @dirrmtry share/icons/hicolor/16x16
 @dirrmtry share/icons/hicolor
+@dirrmtry share/icons
 @dirrm share/doc/HTML/en/bibletime/howto
 @dirrm share/doc/HTML/en/bibletime/handbook
 @dirrm share/doc/HTML/en/bibletime
@@ -169,5 +173,4 @@ share/doc/HTML/en/common/common
 @dirrm share/apps/bibletime/pics
 @dirrm share/apps/bibletime
 @dirrmtry share/apps
-@dirrmtry share/applnk/Applications
-@dirrmtry share/applnk
+@dirrmtry share/applications
diff --git a/misc/bibletime-kde4/Makefile b/misc/bibletime-kde4/Makefile
index f647253f0f2..183dc1578d3 100644
--- a/misc/bibletime-kde4/Makefile
+++ b/misc/bibletime-kde4/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	bibletime
-PORTVERSION=	1.5.3
+PORTVERSION=	1.6
 CATEGORIES=	misc
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -14,13 +14,17 @@ MASTER_SITE_SUBDIR=	${PORTNAME}
 MAINTAINER=	thomas@goodking.ca
 COMMENT=	A powerful Bible study application for KDE3
 
-RUN_DEPENDS=	${LOCALBASE}/lib/libsword.so:${PORTSDIR}/misc/sword
+RUN_DEPENDS=	${LOCALBASE}/lib/libsword.so:${PORTSDIR}/misc/sword \
+		${LOCALBASE}/lib/libclucene.so:${PORTSDIR}/textproc/clucene
 BUILD_DEPENDS=	${RUN_DEPENDS}
 
 USE_KDELIBS_VER=3
 USE_AUTOTOOLS=	libtool:15
 USE_GMAKE=	yes
 USE_BZIP2=	yes
+GNU_CONFIGURE=	yes
+CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
+CONFIGURE_ARGS+=	--enable-static-clucene
 INSTALLS_ICONS=	yes
 
 .include <bsd.port.pre.mk>
diff --git a/misc/bibletime-kde4/distinfo b/misc/bibletime-kde4/distinfo
index 748c8e03f34..7a451b20b46 100644
--- a/misc/bibletime-kde4/distinfo
+++ b/misc/bibletime-kde4/distinfo
@@ -1,3 +1,3 @@
-MD5 (bibletime-1.5.3.tar.bz2) = 9094cc2369c1e92617bcf563f6cf71c4
-SHA256 (bibletime-1.5.3.tar.bz2) = 95a868a18b85ffb9f52671c3e2cb386ef09a0ca9651a78e929cb88a35b0b6aa5
-SIZE (bibletime-1.5.3.tar.bz2) = 1172436
+MD5 (bibletime-1.6.tar.bz2) = 44ba2d9bd907d38ea86ad5ff565d6af0
+SHA256 (bibletime-1.6.tar.bz2) = ef3e83a27bfafb0a73141c417628b27692161b5dbde2cafdca1af31751d5b886
+SIZE (bibletime-1.6.tar.bz2) = 1228793
diff --git a/misc/bibletime-kde4/files/patch-Makefile.am b/misc/bibletime-kde4/files/patch-Makefile.am
index 42d791b7b39..675d8dc1bd1 100644
--- a/misc/bibletime-kde4/files/patch-Makefile.am
+++ b/misc/bibletime-kde4/files/patch-Makefile.am
@@ -1,11 +1,11 @@
---- Makefile.am.orig	Sun Oct 16 06:13:14 2005
-+++ Makefile.am	Tue Jul 11 15:23:47 2006
-@@ -54,7 +54,7 @@
+--- Makefile.am.orig	Fri Sep 22 12:01:51 2006
++++ Makefile.am	Fri Sep 22 12:04:19 2006
+@@ -55,7 +55,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) $(top_builddir)/bibletime.desktop $(kde_appsdir)/Applications/bibletime.desktop
+ 	$(mkinstalldirs) $(datadir)/applications
+ 	$(INSTALL_DATA) $(top_builddir)/bibletime.desktop $(datadir)/applications/bibletime.desktop
  
diff --git a/misc/bibletime-kde4/files/patch-Makefile.in b/misc/bibletime-kde4/files/patch-Makefile.in
index 3557270186a..03a77507a74 100644
--- a/misc/bibletime-kde4/files/patch-Makefile.in
+++ b/misc/bibletime-kde4/files/patch-Makefile.in
@@ -1,11 +1,11 @@
---- Makefile.in.orig	Sun Nov 13 15:24:02 2005
-+++ Makefile.in	Tue Jul 11 15:13:07 2006
-@@ -772,7 +772,7 @@
+--- Makefile.in.orig	Fri Sep 22 08:56:37 2006
++++ Makefile.in	Fri Sep 22 12:38:32 2006
+@@ -844,7 +844,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
+ #>- 	$(mkinstalldirs) $(datadir)/applications
  #>+ 1
- 	$(mkinstalldirs) $(DESTDIR)$(kde_appsdir)/Applications
+ 	$(mkinstalldirs) $(DESTDIR)$(datadir)/applications
diff --git a/misc/bibletime-kde4/pkg-plist b/misc/bibletime-kde4/pkg-plist
index efcd1c64967..29fdb45bdfa 100644
--- a/misc/bibletime-kde4/pkg-plist
+++ b/misc/bibletime-kde4/pkg-plist
@@ -1,6 +1,6 @@
 bin/bibletime
 include/bibletimeinterface.h
-share/applnk/Applications/bibletime.desktop
+share/applications/bibletime.desktop
 share/apps/bibletime/bibletimeui.rc
 share/apps/bibletime/pics/startuplogo.png
 share/apps/bibletime/tips
@@ -67,6 +67,7 @@ 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_findstrongs.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
@@ -89,6 +90,7 @@ 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_findstrongs.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
@@ -112,6 +114,7 @@ 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_findstrongs.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
@@ -160,6 +163,7 @@ share/doc/HTML/en/common/common
 @dirrmtry share/icons/hicolor/16x16/actions
 @dirrmtry share/icons/hicolor/16x16
 @dirrmtry share/icons/hicolor
+@dirrmtry share/icons
 @dirrm share/doc/HTML/en/bibletime/howto
 @dirrm share/doc/HTML/en/bibletime/handbook
 @dirrm share/doc/HTML/en/bibletime
@@ -169,5 +173,4 @@ share/doc/HTML/en/common/common
 @dirrm share/apps/bibletime/pics
 @dirrm share/apps/bibletime
 @dirrmtry share/apps
-@dirrmtry share/applnk/Applications
-@dirrmtry share/applnk
+@dirrmtry share/applications
diff --git a/misc/bibletime/Makefile b/misc/bibletime/Makefile
index f647253f0f2..183dc1578d3 100644
--- a/misc/bibletime/Makefile
+++ b/misc/bibletime/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	bibletime
-PORTVERSION=	1.5.3
+PORTVERSION=	1.6
 CATEGORIES=	misc
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -14,13 +14,17 @@ MASTER_SITE_SUBDIR=	${PORTNAME}
 MAINTAINER=	thomas@goodking.ca
 COMMENT=	A powerful Bible study application for KDE3
 
-RUN_DEPENDS=	${LOCALBASE}/lib/libsword.so:${PORTSDIR}/misc/sword
+RUN_DEPENDS=	${LOCALBASE}/lib/libsword.so:${PORTSDIR}/misc/sword \
+		${LOCALBASE}/lib/libclucene.so:${PORTSDIR}/textproc/clucene
 BUILD_DEPENDS=	${RUN_DEPENDS}
 
 USE_KDELIBS_VER=3
 USE_AUTOTOOLS=	libtool:15
 USE_GMAKE=	yes
 USE_BZIP2=	yes
+GNU_CONFIGURE=	yes
+CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
+CONFIGURE_ARGS+=	--enable-static-clucene
 INSTALLS_ICONS=	yes
 
 .include <bsd.port.pre.mk>
diff --git a/misc/bibletime/distinfo b/misc/bibletime/distinfo
index 748c8e03f34..7a451b20b46 100644
--- a/misc/bibletime/distinfo
+++ b/misc/bibletime/distinfo
@@ -1,3 +1,3 @@
-MD5 (bibletime-1.5.3.tar.bz2) = 9094cc2369c1e92617bcf563f6cf71c4
-SHA256 (bibletime-1.5.3.tar.bz2) = 95a868a18b85ffb9f52671c3e2cb386ef09a0ca9651a78e929cb88a35b0b6aa5
-SIZE (bibletime-1.5.3.tar.bz2) = 1172436
+MD5 (bibletime-1.6.tar.bz2) = 44ba2d9bd907d38ea86ad5ff565d6af0
+SHA256 (bibletime-1.6.tar.bz2) = ef3e83a27bfafb0a73141c417628b27692161b5dbde2cafdca1af31751d5b886
+SIZE (bibletime-1.6.tar.bz2) = 1228793
diff --git a/misc/bibletime/files/patch-Makefile.am b/misc/bibletime/files/patch-Makefile.am
index 42d791b7b39..675d8dc1bd1 100644
--- a/misc/bibletime/files/patch-Makefile.am
+++ b/misc/bibletime/files/patch-Makefile.am
@@ -1,11 +1,11 @@
---- Makefile.am.orig	Sun Oct 16 06:13:14 2005
-+++ Makefile.am	Tue Jul 11 15:23:47 2006
-@@ -54,7 +54,7 @@
+--- Makefile.am.orig	Fri Sep 22 12:01:51 2006
++++ Makefile.am	Fri Sep 22 12:04:19 2006
+@@ -55,7 +55,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) $(top_builddir)/bibletime.desktop $(kde_appsdir)/Applications/bibletime.desktop
+ 	$(mkinstalldirs) $(datadir)/applications
+ 	$(INSTALL_DATA) $(top_builddir)/bibletime.desktop $(datadir)/applications/bibletime.desktop
  
diff --git a/misc/bibletime/files/patch-Makefile.in b/misc/bibletime/files/patch-Makefile.in
index 3557270186a..03a77507a74 100644
--- a/misc/bibletime/files/patch-Makefile.in
+++ b/misc/bibletime/files/patch-Makefile.in
@@ -1,11 +1,11 @@
---- Makefile.in.orig	Sun Nov 13 15:24:02 2005
-+++ Makefile.in	Tue Jul 11 15:13:07 2006
-@@ -772,7 +772,7 @@
+--- Makefile.in.orig	Fri Sep 22 08:56:37 2006
++++ Makefile.in	Fri Sep 22 12:38:32 2006
+@@ -844,7 +844,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
+ #>- 	$(mkinstalldirs) $(datadir)/applications
  #>+ 1
- 	$(mkinstalldirs) $(DESTDIR)$(kde_appsdir)/Applications
+ 	$(mkinstalldirs) $(DESTDIR)$(datadir)/applications
diff --git a/misc/bibletime/pkg-plist b/misc/bibletime/pkg-plist
index efcd1c64967..29fdb45bdfa 100644
--- a/misc/bibletime/pkg-plist
+++ b/misc/bibletime/pkg-plist
@@ -1,6 +1,6 @@
 bin/bibletime
 include/bibletimeinterface.h
-share/applnk/Applications/bibletime.desktop
+share/applications/bibletime.desktop
 share/apps/bibletime/bibletimeui.rc
 share/apps/bibletime/pics/startuplogo.png
 share/apps/bibletime/tips
@@ -67,6 +67,7 @@ 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_findstrongs.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
@@ -89,6 +90,7 @@ 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_findstrongs.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
@@ -112,6 +114,7 @@ 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_findstrongs.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
@@ -160,6 +163,7 @@ share/doc/HTML/en/common/common
 @dirrmtry share/icons/hicolor/16x16/actions
 @dirrmtry share/icons/hicolor/16x16
 @dirrmtry share/icons/hicolor
+@dirrmtry share/icons
 @dirrm share/doc/HTML/en/bibletime/howto
 @dirrm share/doc/HTML/en/bibletime/handbook
 @dirrm share/doc/HTML/en/bibletime
@@ -169,5 +173,4 @@ share/doc/HTML/en/common/common
 @dirrm share/apps/bibletime/pics
 @dirrm share/apps/bibletime
 @dirrmtry share/apps
-@dirrmtry share/applnk/Applications
-@dirrmtry share/applnk
+@dirrmtry share/applications