cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix compile with gcc3

Browse Source
This commit is contained in:
espie 2004-01-02 22:12:55 +00:00
parent 470cc12072
commit 14a18656f7
2 changed files with 20 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
misc/mshell/patches/patch-Makefile
View File

@ -1,14 +1,15 @@
$OpenBSD: patch-Makefile,v 1.1 2002/12/23 07:42:00 pvalchev Exp $
--- Makefile.orig Sun Dec 22 23:47:32 2002
+++ Makefile Sun Dec 22 23:47:32 2002
@@ -8,14 +8,43 @@
$OpenBSD: patch-Makefile,v 1.2 2004/01/02 22:12:55 espie Exp $
--- Makefile.orig 2003-12-31 10:32:36.000000000 +0100
+++ Makefile 2004-01-02 23:06:23.000000000 +0100
@@ -8,14 +8,44 @@
#
# Check mshell.h for other options, e.g., max menu sizes.
-CFLAGS = -O -DBSD -DMENUDIR='"/nyx/lib/menus"' -DLOGDIR='"/nyx/lib/logs"'
+CFLAGS += -DBSD -DMENUDIR=\"${PREFIX}/lib/menus\" -DMAILDIR='"/var/mail/"' \
+ -DGLOBAL_MACRO_FILE=\"${PREFIX}/lib/menus/macros\" \
+ -DCOMMAND_LIST=\"${PREFIX}/lib/menus/commands\"
+ -DCOMMAND_LIST=\"${PREFIX}/lib/menus/commands\" \
+ -Dlog=mylog
OBJS = mshell.o main.o string.o functions1.o functions2.o chdir.o mail.o \
settatr.o setenv.o xsystem.o dl.o macro.o

18
misc/mshell/patches/patch-string_c
View File

@ -1,10 +1,12 @@
$OpenBSD: patch-string_c,v 1.1 2002/12/23 07:42:00 pvalchev Exp $
--- string.c.orig Sun Dec 22 23:50:21 2002
+++ string.c Sun Dec 22 23:50:27 2002
@@ -4,6 +4,17 @@
$OpenBSD: patch-string_c,v 1.2 2004/01/02 22:12:55 espie Exp $
--- string.c.orig 2004-01-02 23:06:35.000000000 +0100
+++ string.c 2004-01-02 23:07:59.000000000 +0100
@@ -4,6 +4,19 @@
#define strchr index
#endif
+char *strsave(char *);
+
+char *
+gets (char *s)
+{
@ -19,3 +21,11 @@ $OpenBSD: patch-string_c,v 1.1 2002/12/23 07:42:00 pvalchev Exp $
/* function to find the position of sub_string in main_string
* ---------------------------------------------------------- */
@@ -260,7 +273,6 @@ char *string;
/* if it has a multi-command delim, save rest for next time */
#define MULTI_CMD_DELIM ','
if (p = index(string, MULTI_CMD_DELIM)) {
- char *strsave();
struct inp_link *l;
*p++ = EOS;
if ((l=getnode(sizeof(*l))) && (l->input=strsave(p)))