Update to 0.3.1

PR:		ports/20430
Submitted by:	Patrick Seal <patseal@hyperhost.net> (MAINTAINER)

6 files changed, 80 insertions, 26 deletions

diff --git a/misc/biblereader/Makefile b/misc/biblereader/Makefile
index 77c5530e14d7..92fa1a1e1403 100644
--- a/misc/biblereader/Makefile
+++ b/misc/biblereader/Makefile
@@ -6,11 +6,16 @@
 #
 
 PORTNAME=	biblereader
-PORTVERSION=	0.2.2
+PORTVERSION=	0.3.1
 CATEGORIES=	deskutils
 MASTER_SITES=	ftp://ftp.whitevine.com/biblereader/
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} kjv.tar.gz
-#EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
+.if defined(WITH_TRANSLATIONS)
+DISTFILES+=	asv.tar.gz darby.tar.gz
+.endif
+.if defined(WITH_SUPPLEMENTS)
+DISTFILES+=	easton.tar.gz mhc.tar.gz
+.endif
 
 MAINTAINER=	patseal@hyperhost.net
 
@@ -18,10 +23,43 @@ LIB_DEPENDS=	gtk12.2:${PORTSDIR}/x11-toolkits/gtk12
 
 USE_X_PREFIX=	yes
 MAKE_ENV=	GTK_CONFIG=${GTK_CONFIG}
+PLIST=      ${WRKDIR}/PLIST
+
+DATAFILES= ${WRKDIR}/kjv/kjv
+.if defined(WITH_TRANSLATIONS)
+DATAFILES+= ${WRKDIR}/asv/asv ${WRKDIR}/darby/darby
+PLISTS+= ${PKGDIR}/PLIST.translations
+.endif
+.if defined(WITH_SUPPLEMENTS)
+DATAFILES+= ${WRKDIR}/easton/easton.dict ${WRKDIR}/mhc/mhc
+PLISTS+= ${PKGDIR}/PLIST.supplements
+.endif
+
+PLISTS+=    ${PKGDIR}/PLIST
 
 GTK_CONFIG?=	${X11BASE}/bin/gtk12-config
 
-post-extract:
-	${CP} ${WRKDIR}/kjv/kjv ${WRKSRC}/kjv.txt
+.if !defined(WITH_TRANSLATIONS)
+pre-fetch:
+	@${ECHO_MSG}
+	@${ECHO_MSG} "If you want to download/install additional tranlations use"
+	@${ECHO_MSG} "\"make -DWITH_TRANSLATIONS\""
+	@${ECHO_MSG}
+.endif
+.if !defined(WITH_SUPPLEMENTS)
+	@${ECHO_MSG}
+	@${ECHO_MSG} "If you want download/install commentary and dictionary files please use"
+	@${ECHO_MSG} "\"make -DWITH_SUPPLEMENTS\""
+	@${ECHO_MSG}
+.endif
+
+do-install:
+	@echo ${DATAFILES}
+	${INSTALL_PROGRAM} ${WRKSRC}/biblereader ${PREFIX}/bin/biblereader
+	${MKDIR} ${PREFIX}/share/biblereader
+	@for file in ${DATAFILES}; do \
+		${INSTALL_DATA} $${file} ${PREFIX}/share/biblereader; \
+	done
+	@cat ${PLISTS} > ${PLIST}
 
 .include <bsd.port.mk>
diff --git a/misc/biblereader/distinfo b/misc/biblereader/distinfo
index 5ad4a78eae22..56fd5ea9a656 100644
--- a/misc/biblereader/distinfo
+++ b/misc/biblereader/distinfo
@@ -1,2 +1,6 @@
-MD5 (biblereader-0.2.2.tar.gz) = 557bd8990e682c892ec7dea74462365f
+MD5 (biblereader-0.3.1.tar.gz) = 4bc3a84a861aad78617db55621637d94
 MD5 (kjv.tar.gz) = 2f0c9c5902e10e8640b30b2f220a44ca
+MD5 (asv.tar.gz) = a61c435c5b1605d170f602d85587a473
+MD5 (darby.tar.gz) = ebe0b6690ea01a202a1ed79348e9a174
+MD5 (easton.tar.gz) = 3da6786ba207b50f92b7ce9dfe17f644
+MD5 (mhc.tar.gz) = a228c3c8e82adbec2ddc3e4f923adbc0
diff --git a/misc/biblereader/files/patch-aa b/misc/biblereader/files/patch-aa
index 2f0b967e5041..944e1e4fc803 100644
--- a/misc/biblereader/files/patch-aa
+++ b/misc/biblereader/files/patch-aa
@@ -1,11 +1,17 @@
---- Makefile.orig	Sun Jul 30 12:17:21 2000
-+++ Makefile	Sun Jul 30 12:18:34 2000
-@@ -1,6 +1,6 @@
- CFLAGS=-Wall
--CFLAGS+=`gtk-config --cflags`
--LIBS=`gtk-config --libs gtk`
-+CFLAGS+=`${GTK_CONFIG} --cflags`
-+LIBS=`${GTK_CONFIG} --libs gtk`
- OBJS=biblereader.o books.o regex.o font.o gui/gladesig.o gui/gladesrc.o prefs.o format.o
- PREFIX?=/usr/local
- 
+*** Makefile.orig	Thu Jul 27 05:07:53 2000
+--- Makefile	Mon Jul 31 10:54:11 2000
+***************
+*** 1,6 ****
+  CFLAGS=-Wall -g
+! CFLAGS+=`gtk-config --cflags`
+! LIBS=`gtk-config --libs gtk`
+  OBJS=biblereader.o books.o dictionary.o font.o history.o notes.o gui/dict_dialog.o gui/gtktextbible.o gui/gladesig.o gui/gladesrc.o gui/prefs_dialog.o prefs.o format.o
+  PREFIX?=/usr/local
+  TRANSLATION?=kjv
+--- 1,6 ----
+  CFLAGS=-Wall -g
+! CFLAGS+=`${GTK_CONFIG} --cflags`
+! LIBS=`${GTK_CONFIG} --libs gtk`
+  OBJS=biblereader.o books.o dictionary.o font.o history.o notes.o gui/dict_dialog.o gui/gtktextbible.o gui/gladesig.o gui/gladesrc.o gui/prefs_dialog.o prefs.o format.o
+  PREFIX?=/usr/local
+  TRANSLATION?=kjv
diff --git a/misc/biblereader/pkg-descr b/misc/biblereader/pkg-descr
index e6ca60a717b3..ecc12e949c1b 100644
--- a/misc/biblereader/pkg-descr
+++ b/misc/biblereader/pkg-descr
@@ -1,12 +1,16 @@
-BibleReader is a Bible browsing/searching program for Linux/X. It uses
-the popular Gtk+ widget set. Currently, BibleReader has the capacity to
-find a passage by reference, search for a phrase using regular
-expressions, and has a filter which enables searches to be limited to a
-selection of books. BibleReader comes with the King James Version
-(otherwise known as the Authorised Version) of the Bible. The BibleReader
-program is distributed under the GNU General Public License. The actual
-Bible text that is currently packaged with BibleReader (i.e. the KJV text
-of the Bible) is not copyrighted, as it's copyright has expired.
+BibleReader is a Bible study program for Linux/X, as well as any POSIX
+system which supports gtk+. It uses the popular Gtk+ widget set.
+Currently, BibleReader has the capacity to find a passage by reference,
+search for a phrase using an intuitive combination of boolean searching
+and regular expressions, and has a filter which enables searches to be
+limited to a selection of books. 
+
+The latest version of BibleReader is a great improvement over previous
+versions. It includes a  range of new features, including support for
+notes/commentaries, such as the Matthew Henry Commentary which has been
+made available in BibleReader format. Also, Bible dictionaries are now
+supported, and Easton's Bible dictionary has been placed in BibleReader
+format. 
 
 WWW: http://www.whitevine.com/biblereader/
 
diff --git a/misc/biblereader/pkg-plist b/misc/biblereader/pkg-plist
index 24602386578a..11295b4d263e 100644
--- a/misc/biblereader/pkg-plist
+++ b/misc/biblereader/pkg-plist
@@ -1,3 +1,3 @@
 bin/biblereader
-share/biblereader/kjv.txt
+share/biblereader/kjv
 @dirrm share/biblereader
diff --git a/misc/biblereader/pkg-plist.translations b/misc/biblereader/pkg-plist.translations
new file mode 100644
index 000000000000..3ecb786aaea4
--- /dev/null
+++ b/misc/biblereader/pkg-plist.translations
@@ -0,0 +1,2 @@
+share/biblereader/darby
+share/biblereader/asv