Remove need for -fwritable-strings so this can be built with gcc4.
From a slightly newer "upstream" version that is floating around on the net. Add missing includes.
This commit is contained in:
naddy
parent
d1c840d6c2
commit
d7367484a6
@ -1,4 +1,4 @@
|
||||
# $OpenBSD: Makefile,v 1.11 2007/09/15 23:54:16 merdely Exp $
|
||||
# $OpenBSD: Makefile,v 1.12 2010/08/04 14:05:46 naddy Exp $
|
||||
|
||||
NOT_FOR_ARCHS= ${LP64_ARCHS}
|
||||
|
||||
@ -7,6 +7,7 @@ COMMENT= bible reader
|
||||
DISTNAME= brs.4.00.l1
|
||||
|
||||
PKGNAME= brs-4.00l1
|
||||
REVISION= 0
|
||||
CATEGORIES= misc
|
||||
MASTER_SITES= ${MASTER_SITE_SUNSITE:=apps/religion/}
|
||||
|
||||
|
||||
@ -1,12 +1,12 @@
|
||||
$OpenBSD: patch-Makefile,v 1.1 2001/03/21 10:06:21 wilfried Exp $
|
||||
$OpenBSD: patch-Makefile,v 1.2 2010/08/04 14:05:46 naddy Exp $
|
||||
--- Makefile.orig Thu Dec 15 02:53:00 1994
|
||||
+++ Makefile Thu Mar 15 21:11:31 2001
|
||||
+++ Makefile Wed Aug 4 01:13:25 2010
|
||||
@@ -55,7 +55,7 @@ DESTMAN1 = $(DESTMAN)/man1
|
||||
|
||||
# I use environment variables for these...
|
||||
#CFLAGS = -g
|
||||
-CFLAGS = -O2 -fwritable-strings -DDESTLIB=\"$(DESTLIB)\"
|
||||
+CFLAGS += -fwritable-strings -DDESTLIB=\"$(DESTLIB)\"
|
||||
+CFLAGS += -DDESTLIB=\"$(DESTLIB)\"
|
||||
|
||||
# release directories. Nobody should care about this but me
|
||||
FTPHOME = /mnt/ftp
|
||||
|
||||
28
misc/brs/patches/patch-bible_c
Normal file
28
misc/brs/patches/patch-bible_c
Normal file
@ -0,0 +1,28 @@
|
||||
$OpenBSD: patch-bible_c,v 1.1 2010/08/04 14:05:46 naddy Exp $
|
||||
--- bible.c.orig Mon Dec 12 20:30:47 1994
|
||||
+++ bible.c Wed Aug 4 01:16:55 2010
|
||||
@@ -137,6 +137,7 @@
|
||||
#include <ctype.h>
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
+#include <string.h>
|
||||
#include "tsl.h"
|
||||
#include "brl.h"
|
||||
#include "version.h"
|
||||
@@ -151,6 +152,7 @@
|
||||
|
||||
static char rcs_ident[]="@(#)$Header: /home/cvs/ports/misc/brs/patches/Attic/patch-bible_c,v 1.1 2010/08/04 14:05:46 naddy Exp $";
|
||||
|
||||
+static char gen1_1[]="Gen1:1"; /* Avoid use of literal string in call */
|
||||
|
||||
char *myname; /* Program Name */
|
||||
int mem_limit; /* Limit on buffer space used by BRL */
|
||||
@@ -977,7 +979,7 @@ char **argv;
|
||||
/* read from stdin */
|
||||
printf( "%s: %s\n", myname, release_version );
|
||||
printf( "Hit '?' for help.\n" );
|
||||
- brl_printverse( "Gen1:1", pretty_printing, line_width, outf );
|
||||
+ brl_printverse( gen1_1, pretty_printing, line_width, outf );
|
||||
prompter();
|
||||
while(fgets(line, VSPECSZ, stdin) != NULL) {
|
||||
user_input( line );
|
||||
12
misc/brs/patches/patch-brl_c
Normal file
12
misc/brs/patches/patch-brl_c
Normal file
@ -0,0 +1,12 @@
|
||||
$OpenBSD: patch-brl_c,v 1.1 2010/08/04 14:05:46 naddy Exp $
|
||||
--- brl.c.orig Mon Dec 12 20:15:01 1994
|
||||
+++ brl.c Wed Aug 4 01:20:46 2010
|
||||
@@ -142,6 +142,8 @@
|
||||
|
||||
|
||||
#include <stdio.h>
|
||||
+#include <stdlib.h>
|
||||
+#include <string.h>
|
||||
#include <ctype.h>
|
||||
#include "tsl.h"
|
||||
#include "brl.h"
|
||||
11
misc/brs/patches/patch-compresslib_c
Normal file
11
misc/brs/patches/patch-compresslib_c
Normal file
@ -0,0 +1,11 @@
|
||||
$OpenBSD: patch-compresslib_c,v 1.1 2010/08/04 14:05:46 naddy Exp $
|
||||
--- compresslib.c.orig Wed Aug 4 01:19:51 2010
|
||||
+++ compresslib.c Wed Aug 4 01:20:17 2010
|
||||
@@ -176,6 +176,7 @@ char_type magic_header[] = { "\037\235" }; /* 1F 9D */
|
||||
static char rcs_ident[]="@(#)$Header: /home/cvs/ports/misc/brs/patches/Attic/patch-compresslib_c,v 1.1 2010/08/04 14:05:46 naddy Exp $";
|
||||
|
||||
#include <stdio.h>
|
||||
+#include <string.h>
|
||||
#include <ctype.h>
|
||||
#include <sys/types.h>
|
||||
|
||||
@ -1,16 +1,28 @@
|
||||
$OpenBSD: patch-tsl_c,v 1.1 2004/01/05 14:26:10 espie Exp $
|
||||
--- tsl.c.orig 2004-01-05 15:22:24.000000000 +0100
|
||||
+++ tsl.c 2004-01-05 15:23:41.000000000 +0100
|
||||
@@ -95,7 +95,7 @@
|
||||
$OpenBSD: patch-tsl_c,v 1.2 2010/08/04 14:05:46 naddy Exp $
|
||||
--- tsl.c.orig Mon Dec 12 04:55:31 1994
|
||||
+++ tsl.c Wed Aug 4 01:18:55 2010
|
||||
@@ -95,7 +95,9 @@
|
||||
\*----------------------------------------------------------------------*/
|
||||
|
||||
#include <stdio.h>
|
||||
-#include <varargs.h>
|
||||
+#include <stdlib.h>
|
||||
+#include <string.h>
|
||||
+#include <stdarg.h>
|
||||
/* #include <search.h> */
|
||||
#include "tsl.h"
|
||||
|
||||
@@ -145,7 +145,7 @@ int tsl_maxbuffusage=0x100000; /* Max bu
|
||||
@@ -109,9 +111,6 @@
|
||||
|
||||
static char rcs_ident[]="@(#)$Header: /home/cvs/ports/misc/brs/patches/Attic/patch-tsl_c,v 1.2 2010/08/04 14:05:46 naddy Exp $";
|
||||
|
||||
-char *malloc();
|
||||
-char *strtok();
|
||||
-
|
||||
FILE *tfp; /* Text data file pointer */
|
||||
FILE *cfp; /* Concordance data file pointer */
|
||||
struct tsl_conc_fileheader cfh; /* Concordance file header */
|
||||
@@ -145,7 +144,7 @@ int tsl_maxbuffusage=0x100000; /* Max buffer mem usage
|
||||
|
||||
|
||||
|
||||
@ -19,7 +31,7 @@ $OpenBSD: patch-tsl_c,v 1.1 2004/01/05 14:26:10 espie Exp $
|
||||
/*----------------------------------------------------------------------
|
||||
| NAME:
|
||||
| tsl_error
|
||||
@@ -162,15 +162,11 @@ tsl_error( fatal, va_alist )
|
||||
@@ -162,15 +161,11 @@ tsl_error( fatal, va_alist )
|
||||
|
|
||||
\*----------------------------------------------------------------------*/
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user