Fix missing prototypes. Declare some functions as void matching the

implementation.

8 files changed, 212 insertions, 43 deletions

diff --git a/misc/brs/Makefile b/misc/brs/Makefile
index aa122ebeec4..c3ea0daa980 100644
--- a/misc/brs/Makefile
+++ b/misc/brs/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.9 2008/06/20 01:09:25 joerg Exp $
+# $NetBSD: Makefile,v 1.10 2012/07/03 17:39:53 joerg Exp $
 #
 
 DISTNAME=	brs.4.00.l1
 PKGNAME=	brs-4.0
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	misc
 MASTER_SITES=	${MASTER_SITE_SUNSITE:=apps/religion/}
 
diff --git a/misc/brs/distinfo b/misc/brs/distinfo
index af41c5f2f79..da5e1d985aa 100644
--- a/misc/brs/distinfo
+++ b/misc/brs/distinfo
@@ -1,9 +1,11 @@
-$NetBSD: distinfo,v 1.5 2008/06/20 01:09:25 joerg Exp $
+$NetBSD: distinfo,v 1.6 2012/07/03 17:39:53 joerg Exp $
 
 SHA1 (brs.4.00.l1.tar.gz) = 12406ad5738caeb828e0773a45290ed5e098940a
 RMD160 (brs.4.00.l1.tar.gz) = 1445c754ffd16cbb00cb27003b748a46c7aadbe0
 Size (brs.4.00.l1.tar.gz) = 2651253 bytes
-SHA1 (patch-aa) = 054c845a340e5e28e627a02d589ff66c0ba2349d
-SHA1 (patch-ab) = 392a451cea87ba91f9a4316dc07c278dc86635b9
-SHA1 (patch-ac) = d00c82994c076dd7fc2eadbaf144fdd79a65152a
-SHA1 (patch-ad) = 40cafb5c0d4a20a83dfc88821bfe97aaefff7507
+SHA1 (patch-aa) = 8d224d526a5b8a8712b03fc2b06e1882cff9d321
+SHA1 (patch-ab) = fa5cfa52605b7b3f6b50f30c5405cb2106b2bd11
+SHA1 (patch-ac) = 1b6aca04c879d5e5011f36d8cfd0f59379c339f5
+SHA1 (patch-ad) = 33cac111acad1f727aee01bf50ec5893f21fe60e
+SHA1 (patch-bible.c) = 631c58cb6bcf5be81de7f601b3decbb374842c4c
+SHA1 (patch-brl.c) = 04a185efd0675a105a9d7c8602af8477d5d69eb2
diff --git a/misc/brs/patches/patch-aa b/misc/brs/patches/patch-aa
index 1b2693798b6..529f70fbad6 100644
--- a/misc/brs/patches/patch-aa
+++ b/misc/brs/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.3 2008/06/20 01:09:25 joerg Exp $
+$NetBSD: patch-aa,v 1.4 2012/07/03 17:39:53 joerg Exp $
 
---- Makefile.orig	1994-12-15 02:53:00.000000000 +0100
-+++ Makefile	2004-08-16 11:08:11.000000000 +0200
-@@ -46,16 +46,16 @@
+--- Makefile.orig	1994-12-15 01:53:00.000000000 +0000
++++ Makefile
+@@ -46,16 +46,16 @@ DATA	      = $(PROGRAM).data
  NINSTPKG      = $(PROGRAM).pkg
  
  # where to install this stuff
@@ -22,7 +22,7 @@ $NetBSD: patch-aa,v 1.3 2008/06/20 01:09:25 joerg Exp $
  
  # release directories.  Nobody should care about this but me
  FTPHOME	      = /mnt/ftp
-@@ -66,7 +66,7 @@
+@@ -66,7 +66,7 @@ NINSTPKGDIR   = $(NINSTDIR)/packages
  # This is only used by the author when making a new release ftp-able.
  INSTALL	      = .do cp
  
@@ -31,7 +31,7 @@ $NetBSD: patch-aa,v 1.3 2008/06/20 01:09:25 joerg Exp $
  
  MAKEFILE      = Makefile
  
-@@ -398,31 +398,12 @@
+@@ -398,31 +398,12 @@ ninstall:	$(NINSTPKG)
  # The "install" target could be of general use.  That's why there are
  # no explicit dependencies here.  They just confuse things...
  install:
diff --git a/misc/brs/patches/patch-ab b/misc/brs/patches/patch-ab
index b9a46c1b567..cbecdaa4f0c 100644
--- a/misc/brs/patches/patch-ab
+++ b/misc/brs/patches/patch-ab
@@ -1,7 +1,16 @@
-$NetBSD: patch-ab,v 1.1.1.1 2003/07/08 08:53:19 wiz Exp $
+$NetBSD: patch-ab,v 1.2 2012/07/03 17:39:53 joerg Exp $
 
---- bible.1.orig	Mon Dec 12 20:05:28 1994
+--- bible.1.orig	1994-12-12 19:05:28.000000000 +0000
 +++ bible.1
+@@ -96,7 +96,7 @@ kilobytes.
+ .I Bible\^
+ normally searches for the text data file first in the current directory,
+ and then in 
+-.BR /usr/local/lib .
++.BR /usr/pkg/libdata/brs .
+ The 
+ .B \-p
+ option may be used to change the search path.
 @@ -314,17 +314,17 @@ and
  Miscellaneous program control commands:
  
@@ -24,3 +33,15 @@ $NetBSD: patch-ab,v 1.1.1.1 2003/07/08 08:53:19 wiz Exp $
  Stop writing to a file.
  .TP
  .B \>, \<
+@@ -369,9 +369,9 @@ whole book as one might hope.  Similarly
+ results in a range of Matthew 1:1 to Revelation 1:1, instead of extending
+ all the way to Revelation 22:21.
+ .SH FILES
+-/usr/local/lib/bible.data
++/usr/pkg/libdata/brs/bible.data
+ .br
+-/usr/local/lib/bible.data.conc
++/usr/pkg/libdata/brs/bible.data.conc
+ .SH SEE ALSO
+ Rev3:20
+ .SH AUTHOR
diff --git a/misc/brs/patches/patch-ac b/misc/brs/patches/patch-ac
index 379897da1d0..0630aa197f2 100644
--- a/misc/brs/patches/patch-ac
+++ b/misc/brs/patches/patch-ac
@@ -1,60 +1,87 @@
-$NetBSD: patch-ac,v 1.1 2004/07/10 21:13:31 wiz Exp $
+$NetBSD: patch-ac,v 1.2 2012/07/03 17:39:53 joerg Exp $
 
---- tsl.c.orig	1994-12-12 04:55:31.000000000 +0100
+--- tsl.c.orig	1994-12-12 03:55:31.000000000 +0000
 +++ tsl.c
-@@ -95,7 +95,7 @@
- \*----------------------------------------------------------------------*/
- 
+@@ -97,3 +97,5 @@
  #include <stdio.h>
 -#include <varargs.h>
 +#include <stdarg.h>
++#include <stdlib.h>
++#include <string.h>
  /* #include <search.h> */
- #include "tsl.h"
+@@ -111,4 +113,2 @@ static char rcs_ident[]="@(#)$Header: ts
  
-@@ -145,7 +145,8 @@ int tsl_maxbuffusage=0x100000;	/* Max bu
+-char *malloc();
+-char *strtok();
  
+@@ -123,2 +123,5 @@ file_ptr_t *tsl_wtable=NULL;	/* Table of
  
++tsl_textread( long start, long vsize, char *vb );
++cmp_decompress( char *inb, char *outb, int insize );
++
+ /* buffer structures.
+@@ -147,3 +150,4 @@ int tsl_maxbuffusage=0x100000;	/* Max bu
  
 -tsl_error( fatal, va_alist )
 +void
 +tsl_error(int fatal, ...)
  /*----------------------------------------------------------------------
- |   NAME:
- |       tsl_error
-@@ -154,21 +155,16 @@ tsl_error( fatal, va_alist )
- |       Report an error specific to the TSL library.
- |       
+@@ -156,4 +160,2 @@ tsl_error( fatal, va_alist )
  |       fatal	 TRUE if the error should cause an exit.
 -|       va_alist Variable argument list for printing the error
 -|       	 report.
  |
- |   HISTORY:
- |       890904 cc Created.
- |
+@@ -163,5 +165,2 @@ tsl_error( fatal, va_alist )
  \*----------------------------------------------------------------------*/
 -
 -int fatal;
 -va_dcl
  {
-     va_list ap;
-     char *format;
+@@ -170,3 +169,3 @@ va_dcl
  
 -    va_start(ap);
 +    va_start(ap, fatal);
  
-     format = va_arg(ap, char *);
-     vfprintf(stderr, format, ap);
-@@ -626,11 +622,11 @@ int  memlimit;
-     if (tsl_maxbuffs < 1) tsl_maxbuffs = 1;
-     tsl_firstbuffer.next = &tsl_lastbuffer;
+@@ -182,3 +181,3 @@ va_dcl
+ 
+-tsl_scan_concordance( target, sbuf, range_start, range_end )
++tsl_scan_concordance( char *target, ref_t *sbuf, ref_t range_start, ref_t range_end )
+ /*----------------------------------------------------------------------
+@@ -205,6 +204,2 @@ tsl_scan_concordance( target, sbuf, rang
+ 
+-char *target;
+-ref_t *sbuf;
+-ref_t range_start;
+-ref_t range_end;
+ {
+@@ -322,3 +317,3 @@ ref_t range_end;
+ 
+-int tsl_gettext( vn, vc, vb, vbsize )
++int tsl_gettext( int vn, int vc, char *vb, int vbsize )
+ /*----------------------------------------------------------------------
+@@ -341,5 +336,2 @@ int tsl_gettext( vn, vc, vb, vbsize )
+ 
+-int vn, vc;
+-char *vb;
+-int vbsize;
+ {
+@@ -384,3 +376,3 @@ int vn, vc;
+ 
+-tsl_textread( start, vsize, vb )
++tsl_textread( long start, long vsize, char *vb )
+ /*----------------------------------------------------------------------
+@@ -407,4 +399,2 @@ tsl_textread( start, vsize, vb )
+ 
+-long start, vsize;
+-char *vb;
+ {
+@@ -628,3 +618,3 @@ int  memlimit;
      tsl_firstbuffer.prev = NULL;
 -    tsl_firstbuffer.win  = NULL;
 +    tsl_firstbuffer.win  = 0;
      tsl_firstbuffer.bufferp = NULL;
-     tsl_lastbuffer.prev = &tsl_firstbuffer;
+@@ -632,3 +622,3 @@ int  memlimit;
      tsl_lastbuffer.next = NULL;
 -    tsl_lastbuffer.win  = NULL;
 +    tsl_lastbuffer.win  = 0;
      tsl_lastbuffer.bufferp = NULL;
- 
-     /* Global buffer for compressed text.  Much bigger than needed. :-) */
diff --git a/misc/brs/patches/patch-ad b/misc/brs/patches/patch-ad
index d5c4fa1c121..ae52f8432bd 100644
--- a/misc/brs/patches/patch-ad
+++ b/misc/brs/patches/patch-ad
@@ -1,7 +1,16 @@
-$NetBSD: patch-ad,v 1.1 2004/08/16 11:54:20 salo Exp $
+$NetBSD: patch-ad,v 1.2 2012/07/03 17:39:53 joerg Exp $
 
---- compresslib.c.orig	1989-09-15 05:34:02.000000000 +0200
-+++ compresslib.c	2004-08-16 10:01:20.000000000 +0200
+--- compresslib.c.orig	1989-09-15 03:34:02.000000000 +0000
++++ compresslib.c
+@@ -43,7 +43,7 @@
+ |
+ \*----------------------------------------------------------------------*/
+ 
+-
++#include <string.h>
+ 
+ #define	min(a,b)	((a>b) ? b : a)
+ 
 @@ -112,7 +112,7 @@
  #ifdef PBITS		/* Preferred BITS for this memory size */
  # ifndef BITS
@@ -11,3 +20,23 @@ $NetBSD: patch-ad,v 1.1 2004/08/16 11:54:20 salo Exp $
  #endif /* PBITS */
  
  #if BITS == 16
+@@ -360,7 +360,7 @@ char_type *inb;
+ 
+ 
+ 
+-cmp_decompress( inb, outb, insize )
++cmp_decompress( char_type *inb, char_type *outb, int insize )
+ /*----------------------------------------------------------------------
+ |   NAME:
+ |       cmp_decompress
+@@ -392,10 +392,6 @@ cmp_decompress( inb, outb, insize )
+ |       	worked from stdin to stdout.
+ |
+ \*----------------------------------------------------------------------*/
+-
+-char_type *inb;
+-char_type *outb;
+-int insize;
+ {
+     register char_type *stackp;
+     register int finchar;
diff --git a/misc/brs/patches/patch-bible.c b/misc/brs/patches/patch-bible.c
new file mode 100644
index 00000000000..2bcde87d5b5
--- /dev/null
+++ b/misc/brs/patches/patch-bible.c
@@ -0,0 +1,48 @@
+$NetBSD: patch-bible.c,v 1.1 2012/07/03 17:39:53 joerg Exp $
+
+--- bible.c.orig	1994-12-12 19:30:47.000000000 +0000
++++ bible.c
+@@ -136,2 +136,3 @@
+ 
++#include <string.h>
+ #include <ctype.h>
+@@ -153,2 +154,3 @@ static char rcs_ident[]="@(#)$Header: bi
+ 
++void cmd_list(void);
+ 
+@@ -195,3 +197,4 @@ char help_text[]="\n\
+ 
+-
++tsl_scan_concordance( char *target, ref_t *sbuf, ref_t range_start, ref_t range_end );
++brl_init( char *dfname, char *dfpath, int memlimit );
+ 
+@@ -248,3 +251,3 @@ ref_t *buf;
+ 
+-
++void
+ cmd_ANDconcordance( word )
+@@ -305,3 +308,3 @@ char *word;
+ 
+-
++void
+ cmd_ORconcordance( word )
+@@ -369,3 +372,3 @@ char *word;
+ 
+-
++void
+ cmd_concordance( word )
+@@ -424,3 +427,3 @@ cmd_help()
+ 
+-
++void
+ cmd_inrange( range )
+@@ -493,3 +496,3 @@ char *range;
+ 
+-
++void
+ cmd_list()
+@@ -594,3 +597,3 @@ int verbose;
+ 
+-
++void
+ cmd_view()
diff --git a/misc/brs/patches/patch-brl.c b/misc/brs/patches/patch-brl.c
new file mode 100644
index 00000000000..fceeb8dc65e
--- /dev/null
+++ b/misc/brs/patches/patch-brl.c
@@ -0,0 +1,42 @@
+$NetBSD: patch-brl.c,v 1.1 2012/07/03 17:39:53 joerg Exp $
+
+--- brl.c.orig	1994-12-12 19:15:01.000000000 +0000
++++ brl.c
+@@ -140,7 +140,7 @@
+ |
+ \*----------------------------------------------------------------------*/
+ 
+-
++#include <string.h>
+ #include <stdio.h>
+ #include <ctype.h>
+ #include "tsl.h"
+@@ -289,6 +289,10 @@ char *bookabbrvstr[] = { "Gen",
+ 			   "BAD"
+ };
+ 
++tsl_init(char *dfname, char *path, int memlimit);
++int tsl_printtext( int vn, int vc );
++void tsl_error(int fatal, ...);
++int tsl_gettext( int vn, int vc, char *vb, int vbsize );
+ 
+ ref_t brl_cur_vnum;		/* Current context. */
+ 
+@@ -1118,7 +1122,7 @@ ref_t *absversep;
+ 
+ 
+ 
+-brl_init( dfname, dfpath, memlimit )
++brl_init( char *dfname, char *dfpath, int memlimit )
+ /*----------------------------------------------------------------------
+ |   NAME:
+ |       brl_init
+@@ -1137,8 +1141,6 @@ brl_init( dfname, dfpath, memlimit )
+ |
+ \*----------------------------------------------------------------------*/
+ 
+-int memlimit;
+-char *dfname, *dfpath;
+ {
+     if (dfname == NULL)
+ 	dfname = "bible.data";