Update to version 0.3.3

Makefile clean ups to make portlint happy

PR:		22202
Submitted by:	Patrick Seal <patseal@hyperhost.net> MAINTAINER

3 files changed, 35 insertions, 16 deletions

diff --git a/misc/biblereader/Makefile b/misc/biblereader/Makefile
index 10d3e1b0ed8c..84139756ddb0 100644
--- a/misc/biblereader/Makefile
+++ b/misc/biblereader/Makefile
@@ -26,12 +26,12 @@ 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
+PLISTS+=	${PKGDIR}/pkg-plist.translations
 .endif
 .if defined(WITH_SUPPLEMENTS)
-DATAFILES+= 	${WRKDIR}/easton/easton.dict ${WRKDIR}/mhc/mhc
-PLISTS+= 	${PKGDIR}/pkg-plist.supplements
+DATAFILES+=	${WRKDIR}/easton/easton.dict ${WRKDIR}/mhc/mhc
+PLISTS+=	${PKGDIR}/pkg-plist.supplements
 .endif
 
 .if !defined(WITH_TRANSLATIONS)
diff --git a/misc/biblereader/distinfo b/misc/biblereader/distinfo
index ffb2dbfce59c..55e428e9ffd6 100644
--- a/misc/biblereader/distinfo
+++ b/misc/biblereader/distinfo
@@ -1,6 +1,8 @@
-MD5 (biblereader-0.3.2.tar.gz) = 76e8e0fdea5d2dedd069e1709fdf4243
-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
+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
diff --git a/misc/biblereader/files/patch-aa b/misc/biblereader/files/patch-aa
index 944e1e4fc803..b9c58d203a23 100644
--- a/misc/biblereader/files/patch-aa
+++ b/misc/biblereader/files/patch-aa
@@ -1,17 +1,34 @@
-*** Makefile.orig	Thu Jul 27 05:07:53 2000
---- Makefile	Mon Jul 31 10:54:11 2000
+*** Makefile.orig	Thu Sep 28 16:40:49 2000
+--- Makefile	Sat Oct 21 20:55:47 2000
 ***************
 *** 1,6 ****
-  CFLAGS=-Wall -g
+! 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
+  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 -g
+! CFLAGS?=-Wall
 ! 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
+  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