I botch applying PR 22202. Fixed now.

Submitted by:	bento

4 files changed, 36 insertions, 16 deletions

diff --git a/misc/biblereader/Makefile b/misc/biblereader/Makefile
index 84139756ddb0..31eb621fbfca 100644
--- a/misc/biblereader/Makefile
+++ b/misc/biblereader/Makefile
@@ -6,15 +6,18 @@
 #
 
 PORTNAME=	biblereader
-PORTVERSION=	0.3.2
+PORTVERSION=	0.3.3
 CATEGORIES=	misc
 MASTER_SITES=	ftp://ftp.whitevine.com/biblereader/
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} kjv.tar.gz
 .if defined(WITH_TRANSLATIONS)
 DISTFILES+=	asv.tar.gz darby.tar.gz
 .endif
-.if defined(WITH_SUPPLEMENTS)
-DISTFILES+=	easton.tar.gz mhc.tar.gz
+.if defined(WITH_NOTES)
+DISTFILES+=	mhc.tar.gz
+.endif
+.if defined(WITH_DICTIONARIES)
+DISTFILES+=	easton.tar.gz strongs.tar.gz torrey.tar.gz
 .endif
 
 MAINTAINER=	patseal@hyperhost.net
@@ -24,34 +27,45 @@ USE_GTK=	yes
 PLIST=		${WRKDIR}/PLIST
 
 DATAFILES=	${WRKDIR}/kjv/kjv
-PLISTS=		${PKGDIR}/pkg-plist
 .if defined(WITH_TRANSLATIONS)
-DATAFILES+=	${WRKDIR}/asv/asv ${WRKDIR}/darby/darby
 PLISTS+=	${PKGDIR}/pkg-plist.translations
+DATAFILES+=	${WRKDIR}/asv/asv ${WRKDIR}/darby/darby
 .endif
-.if defined(WITH_SUPPLEMENTS)
-DATAFILES+=	${WRKDIR}/easton/easton.dict ${WRKDIR}/mhc/mhc
-PLISTS+=	${PKGDIR}/pkg-plist.supplements
+.if defined(WITH_NOTES)
+PLISTS+=	${PKGDIR}/pkg-plist.notes
+DATAFILES+=	${WRKDIR}/mhc/mhc
 .endif
+.if defined(WITH_DICTIONARIES)
+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
+.endif
+PLISTS+=	${PKGDIR}/pkg-plist
 
-.if !defined(WITH_TRANSLATIONS)
 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} "If you want to download/install additional tranlations use"
-	@${ECHO_MSG} "\"make -DWITH_TRANSLATIONS\""
+	@${ECHO_MSG} "To download/install commentary and notes use"
+	@${ECHO_MSG} "\"make install -DWITH_NOTES\""
 	@${ECHO_MSG}
 .endif
-.if !defined(WITH_SUPPLEMENTS)
+.if !defined(WITH_DICTIONARIES)
 	@${ECHO_MSG}
-	@${ECHO_MSG} "If you want download/install commentary and dictionary files please use"
-	@${ECHO_MSG} "\"make -DWITH_SUPPLEMENTS\""
+	@${ECHO_MSG} "To download/install dictionaries and notes use"
+	@${ECHO_MSG} "\"make install -DWITH_DICTONARIES\""
 	@${ECHO_MSG}
 .endif
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/biblereader ${PREFIX}/bin/biblereader
 	${MKDIR} ${PREFIX}/share/biblereader
-	@for file in ${DATAFILES}; do \
+	for file in ${DATAFILES}; do \
 		${INSTALL_DATA} $${file} ${PREFIX}/share/biblereader; \
 	done
 	@${CAT} ${PLISTS} > ${PLIST}
diff --git a/misc/biblereader/files/patch-aa b/misc/biblereader/files/patch-aa
index b9c58d203a23..5a7364aea6e2 100644
--- a/misc/biblereader/files/patch-aa
+++ b/misc/biblereader/files/patch-aa
@@ -9,7 +9,7 @@
   PREFIX?=/usr/local
   TRANSLATION?=kjv
 --- 1,6 ----
-! CFLAGS?=-Wall
+! 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
diff --git a/misc/biblereader/pkg-plist.dictionaries b/misc/biblereader/pkg-plist.dictionaries
new file mode 100644
index 000000000000..da2ffb8740b5
--- /dev/null
+++ b/misc/biblereader/pkg-plist.dictionaries
@@ -0,0 +1,5 @@
+share/biblereader/eastons.dict
+share/biblereader/kjv-strongs
+share/biblereader/strongs-greek.dict
+share/biblereader/strongs-hebrew.dict
+share/biblereader/torrey.dict
diff --git a/misc/biblereader/pkg-plist.notes b/misc/biblereader/pkg-plist.notes
new file mode 100644
index 000000000000..15d59a498b12
--- /dev/null
+++ b/misc/biblereader/pkg-plist.notes
@@ -0,0 +1 @@
+share/biblereader/mhc