. Unbreak by finding a new MASTER_SITE.

. Update to 0.4.2.
. Trim pkg-descr.
. SIZEify.
. Try and divorce the port from a default translation to some extent by
  allow the default translation to be set with a knob.  Unfortunately the
  programme segfaults without a default translation, so, in a move sure
  to offend someone out there, default to the most modern translation
  rather than the oldest.  Use DEFAULT_TRANSLATION to affect this.

8 files changed, 99 insertions, 95 deletions

diff --git a/misc/biblereader/Makefile b/misc/biblereader/Makefile
index 66a291b8773e..1f8a99105f36 100644
--- a/misc/biblereader/Makefile
+++ b/misc/biblereader/Makefile
@@ -6,64 +6,56 @@
 #
 
 PORTNAME=	biblereader
-PORTVERSION=	0.3.3
-PORTREVISION=	1
+PORTVERSION=	0.4.2
 CATEGORIES=	misc
-MASTER_SITES=	# none
-DISTFILES=	${DISTNAME}${EXTRACT_SUFX} kjv.tar.gz
-.if defined(WITH_TRANSLATIONS)
-DISTFILES+=	asv.tar.gz darby.tar.gz
-.endif
-.if defined(WITH_NOTES)
-DISTFILES+=	mhc.tar.gz
-.endif
-.if defined(WITH_DICTIONARIES)
-DISTFILES+=	easton.tar.gz strongs.tar.gz torrey.tar.gz
-.endif
+MASTER_SITES=	http://runnhide.cjb.net/sword/
+DISTFILES=	${DISTNAME}${EXTRACT_SUFX}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A GUI based Bible program for X11
 
-BROKEN=		unfetchable
-USE_X_PREFIX=	yes
+USE_BZIP2=	yes
 USE_GNOME=	gtk12
+USE_REINPLACE=	yes
+USE_X_PREFIX=	yes
+
+OPTIONS=	TRANSLATIONS	"Install translations"	on \
+		COMMENTARIES	"Install commentaries"	on \
+		DICTIONARIES	"Install dictionaries"	on
+
 PLIST=		${WRKDIR}/PLIST
+# Can be set to asv, kjv or web
+DEFAULT_TRANSLATION?=	web
+
+.include <bsd.port.pre.mk>
 
-DATAFILES=	${WRKDIR}/kjv/kjv
 .if defined(WITH_TRANSLATIONS)
+DISTFILES+=	asv-0.4${EXTRACT_SUFX} kjv-0.4.1${EXTRACT_SUFX} \
+		web-0.4${EXTRACT_SUFX}
+DATAFILES+=	${WRKDIR}/asv-0.4/asv ${WRKDIR}/kjv-0.4.1/kjv \
+		${WRKDIR}/web-0.4/web
 PLISTS+=	${PKGDIR}/pkg-plist.translations
-DATAFILES+=	${WRKDIR}/asv/asv ${WRKDIR}/darby/darby
 .endif
-.if defined(WITH_NOTES)
-PLISTS+=	${PKGDIR}/pkg-plist.notes
-DATAFILES+=	${WRKDIR}/mhc/mhc
+.if defined(WITH_COMMENTARIES)
+DISTFILES+=	mhc${EXTRACT_SUFX} wesley${EXTRACT_SUFX}
+PLISTS+=	${PKGDIR}/pkg-plist.commentaries
+DATAFILES+=	${WRKDIR}/mhc/mhc ${WRKDIR}/wesley/wesley
 .endif
 .if defined(WITH_DICTIONARIES)
+DISTFILES+=	easton${EXTRACT_SUFX} strongs-0.4${EXTRACT_SUFX} \
+		torrey${EXTRACT_SUFX}
 PLISTS+=	${PKGDIR}/pkg-plist.dictionaries
-DATAFILES+=	${WRKDIR}/easton/eastons.dict ${WRKDIR}/torrey/torrey.dict
-DATAFILES+=	${WRKDIR}/strongs/kjv-strongs ${WRKDIR}/strongs/strongs-greek.dict ${WRKDIR}/strongs/strongs-hebrew.dict
+DATAFILES+=	${WRKDIR}/easton/eastons.dict ${WRKDIR}/torrey/torrey.dict \
+		${WRKDIR}/strongs-0.4/kjv-strongs \
+		${WRKDIR}/strongs-0.4/strongs-greek.dict \
+		${WRKDIR}/strongs-0.4/strongs-hebrew.dict
 .endif
 PLISTS+=	${PKGDIR}/pkg-plist
 
-pre-fetch:
-.if !defined(WITH_TRANSLATIONS)
-	@${ECHO_MSG}
-	@${ECHO_MSG} "To download/install additional translations use"
-	@${ECHO_MSG} "\"make install -DWITH_TRANSLATIONS\""
-	@${ECHO_MSG}
-.endif
-.if !defined(WITH_NOTES)
-	@${ECHO_MSG}
-	@${ECHO_MSG} "To download/install commentary and notes use"
-	@${ECHO_MSG} "\"make install -DWITH_NOTES\""
-	@${ECHO_MSG}
-.endif
-.if !defined(WITH_DICTIONARIES)
-	@${ECHO_MSG}
-	@${ECHO_MSG} "To download/install dictionaries and notes use"
-	@${ECHO_MSG} "\"make install -DWITH_DICTONARIES\""
-	@${ECHO_MSG}
-.endif
+do-configure:
+	${REINPLACE_CMD} -e "s:%%DATADIR%%:${DATADIR}:" \
+		-e "s:%%TRANSLATION%%:${DEFAULT_TRANSLATION}:" \
+		${WRKSRC}/Makefile
 
 pre-install:
 	@${CAT} ${PLISTS} > ${PLIST}
@@ -74,5 +66,9 @@ do-install:
 	for F in ${DATAFILES}; do \
 		${INSTALL_DATA} $${F} ${DATADIR}; \
 	done
+.if !defined(NOPORTDOCS)
+	${MKDIR} ${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}
+.endif
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/misc/biblereader/distinfo b/misc/biblereader/distinfo
index 55e428e9ffd6..9aa9533c67cd 100644
--- a/misc/biblereader/distinfo
+++ b/misc/biblereader/distinfo
@@ -1,8 +1,18 @@
-MD5 (biblereader-0.3.3.tar.gz) = 15839986838feeadbf63bbc0fa2aac7e
-MD5 (kjv.tar.gz) = bf77f7da9cf2edeb5053f134260f320c
-MD5 (asv.tar.gz) = 0cd9f0f27d8ee31e181663246dfba070
-MD5 (darby.tar.gz) = a3afb633dcc0148dbac763a2095b48a4
-MD5 (easton.tar.gz) = 59fc9087df6347a614d1c87d0b4e882f
-MD5 (mhc.tar.gz) = 894776c0ac7c12d1ca0b63c3ba489e0b
-MD5 (strongs.tar.gz) = 26dbd85bfe83f168e4a08a29dfd973e9
-MD5 (torrey.tar.gz) = 03409b3d3f88b5d5025d81b338429428
+MD5 (biblereader-0.4.2.tar.bz2) = e70bb5012b1c12f28f56bf7e870fde06
+SIZE (biblereader-0.4.2.tar.bz2) = 86257
+MD5 (asv-0.4.tar.bz2) = 37ef2ebfb853a760fd85d05ecd30838d
+SIZE (asv-0.4.tar.bz2) = 1625177
+MD5 (kjv-0.4.1.tar.bz2) = 0987ea267cc4fc242c163b2fef35f629
+SIZE (kjv-0.4.1.tar.bz2) = 3116580
+MD5 (easton.tar.bz2) = 7a893ab903edfcba1fea5e23896536ea
+SIZE (easton.tar.bz2) = 703215
+MD5 (strongs-0.4.tar.bz2) = c4fdd971be330d04945da25aeacc534f
+SIZE (strongs-0.4.tar.bz2) = 3095195
+MD5 (torrey.tar.bz2) = 94276d383ba92179437ddc892beb67ad
+SIZE (torrey.tar.bz2) = 266741
+MD5 (web-0.4.tar.bz2) = 7a2db4fe972ff21da589efe4558ad606
+SIZE (web-0.4.tar.bz2) = 1632560
+MD5 (mhc.tar.bz2) = f501166dc9bb506c69373dbf693638be
+SIZE (mhc.tar.bz2) = 939528
+MD5 (wesley.tar.bz2) = 25caacd36e849a5db5c72041514e3bc2
+SIZE (wesley.tar.bz2) = 1394616
diff --git a/misc/biblereader/files/patch-aa b/misc/biblereader/files/patch-aa
index 5a7364aea6e2..c5ab18b8b1b2 100644
--- a/misc/biblereader/files/patch-aa
+++ b/misc/biblereader/files/patch-aa
@@ -1,34 +1,36 @@
-*** Makefile.orig	Thu Sep 28 16:40:49 2000
---- Makefile	Sat Oct 21 20:55:47 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 markup.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
-! CFLAGS+=`${GTK_CONFIG} --cflags`
-! LIBS=`${GTK_CONFIG} --libs gtk`
-  OBJS=biblereader.o books.o dictionary.o font.o history.o notes.o markup.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
-***************
-*** 12,18 ****
-  	mkdir -p ${PREFIX}/share/biblereader
-  
-  biblereader: $(OBJS)
-! 	${CC} ${CFLAGS} -g -o $@ ${OBJS} ${LIBS}
-  
-  .c.o:
-  	${CC} ${CFLAGS} -DBIBLEPATH=\"${PREFIX}/share/biblereader/\" -DBIBLEVERSION=\"${TRANSLATION}\" -c $< -o $*.o
---- 12,18 ----
-  	mkdir -p ${PREFIX}/share/biblereader
-  
-  biblereader: $(OBJS)
-! 	${CC} ${CFLAGS} -o $@ ${OBJS} ${LIBS}
-  
-  .c.o:
-  	${CC} ${CFLAGS} -DBIBLEPATH=\"${PREFIX}/share/biblereader/\" -DBIBLEVERSION=\"${TRANSLATION}\" -c $< -o $*.o
+$FreeBSD$
+
+--- Makefile.orig	Fri Nov 22 21:50:08 2002
++++ Makefile	Mon Apr 19 10:37:43 2004
+@@ -1,24 +1,21 @@
+-CFLAGS=-Wall
+-CFLAGS+=`gtk-config --cflags`
+-LIBS=`gtk-config --libs gtk`
++CFLAGS+=-Wall
++CFLAGS+=`${GTK_CONFIG} --cflags`
++LIBS=`${GTK_CONFIG} --libs gtk`
+ OBJS=biblereader.o books.o dictionary.o font.o history.o notes.o markup.o words.o gui/dict_dialog.o gui/gtktextbible.o gui/gladesig.o gui/gladesrc.o gui/prefs_dialog.o prefs.o format.o
+-PREFIX?=/usr
+-TRANSLATION?=kjv
++DATADIR=%%DATADIR%%
++TRANSLATION=%%TRANSLATION%%
+ 
+ all: biblereader
+ 
+ install: all
+ 	install -cs -o root -g wheel -m 755 biblereader ${PREFIX}/bin
+-	mkdir -p ${PREFIX}/share/biblereader
+-	mkdir -p ${PREFIX}/share/biblereader/bibles
+-	mkdir -p ${PREFIX}/share/biblereader/notes
+-	mkdir -p ${PREFIX}/share/biblereader/dicts
++	mkdir -p ${DATADIR}
+ 
+ biblereader: $(OBJS)
+ 	${CC} ${CFLAGS} -o $@ ${OBJS} ${LIBS}
+ 
+ .c.o:
+-	${CC} ${CFLAGS} -DBIBLEPATH=\"${PREFIX}/share/biblereader/\" -DBIBLEVERSION=\"${TRANSLATION}\" -c $< -o $*.o
++	${CC} ${CFLAGS} -DBIBLEPATH=\"${DATADIR}/\" -DBIBLEVERSION=\"${TRANSLATION}\" -c $< -o $*.o
+ 
+ clean:
+ 	-rm -f *.o gui/*.o core a.out biblereader
diff --git a/misc/biblereader/pkg-descr b/misc/biblereader/pkg-descr
index ecc12e949c1b..424997c9a6a5 100644
--- a/misc/biblereader/pkg-descr
+++ b/misc/biblereader/pkg-descr
@@ -5,14 +5,7 @@ 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/
+WWW: http://runnhide.cjb.net/sword/
 
 - Patrick Seal
 patseal@hyperhost.net
diff --git a/misc/biblereader/pkg-plist b/misc/biblereader/pkg-plist
index a57292672d51..dca7c90b11ee 100644
--- a/misc/biblereader/pkg-plist
+++ b/misc/biblereader/pkg-plist
@@ -1,3 +1,4 @@
 bin/biblereader
-%%DATADIR%%/kjv
+%%PORTDOCS%%%%DOCSDIR%%/README
 @dirrm %%DATADIR%%
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
diff --git a/misc/biblereader/pkg-plist.commentaries b/misc/biblereader/pkg-plist.commentaries
new file mode 100644
index 000000000000..2c76485608d7
--- /dev/null
+++ b/misc/biblereader/pkg-plist.commentaries
@@ -0,0 +1,2 @@
+%%DATADIR%%/mhc
+%%DATADIR%%/wesley
diff --git a/misc/biblereader/pkg-plist.notes b/misc/biblereader/pkg-plist.notes
deleted file mode 100644
index fa70d65c4005..000000000000
--- a/misc/biblereader/pkg-plist.notes
+++ /dev/null
@@ -1 +0,0 @@
-%%DATADIR%%/mhc
diff --git a/misc/biblereader/pkg-plist.translations b/misc/biblereader/pkg-plist.translations
index f54884711e27..b28e4f53fc1e 100644
--- a/misc/biblereader/pkg-plist.translations
+++ b/misc/biblereader/pkg-plist.translations
@@ -1,2 +1,3 @@
-%%DATADIR%%/darby
 %%DATADIR%%/asv
+%%DATADIR%%/kjv
+%%DATADIR%%/web