diff options
| author | delphij <delphij@FreeBSD.org> | 2007-06-22 06:53:11 +0000 |
|---|---|---|
| committer | delphij <delphij@FreeBSD.org> | 2007-06-22 06:53:11 +0000 |
| commit | 96a3c8b8ff5833df92d1906453501eb772b7a54b (patch) | |
| tree | f5443e0098430125150f6a6fa5aa01fe81ba9821 /sysutils/44bsd-more | |
| parent | 9b28a89d7d9902dc132e79975ca111fa957a159c (diff) | |
| download | FreeBSD-ports-96a3c8b8ff5833df92d1906453501eb772b7a54b.zip FreeBSD-ports-96a3c8b8ff5833df92d1906453501eb772b7a54b.tar.gz | |
Unbreak for gcc 4.2.
Approved by: maintainer timeout
PR: ports/112847
Diffstat (limited to 'sysutils/44bsd-more')
| -rw-r--r-- | sysutils/44bsd-more/Makefile | 4 | ||||
| -rw-r--r-- | sysutils/44bsd-more/files/patch-main.c | 21 | ||||
| -rw-r--r-- | sysutils/44bsd-more/files/patch-ncommand.c | 18 |
3 files changed, 37 insertions, 6 deletions
diff --git a/sysutils/44bsd-more/Makefile b/sysutils/44bsd-more/Makefile index 00cce5e..6aa3374 100644 --- a/sysutils/44bsd-more/Makefile +++ b/sysutils/44bsd-more/Makefile @@ -23,10 +23,6 @@ RELDATE= 20000521 .include <bsd.port.pre.mk> -.if ${OSVERSION} >= 700042 -BROKEN= Broken with gcc 4.2 -.endif - post-extract: -cd ${WRKSRC} && co RCS/*,v diff --git a/sysutils/44bsd-more/files/patch-main.c b/sysutils/44bsd-more/files/patch-main.c index 3e000da..00662f7 100644 --- a/sysutils/44bsd-more/files/patch-main.c +++ b/sysutils/44bsd-more/files/patch-main.c @@ -1,5 +1,5 @@ ---- main.c.orig Tue Aug 5 17:17:15 2003 -+++ main.c Tue Aug 5 17:21:34 2003 +--- ./main.c.orig 2007-06-22 14:48:44.602177005 +0800 ++++ ./main.c 2007-06-22 14:48:44.620758150 +0800 @@ -33,9 +33,9 @@ */ @@ -12,3 +12,20 @@ Regents of the University of California. All rights reserved.\n"; #endif /* not lint */ +@@ -68,6 +68,8 @@ + #include "less.h" + #include "pathnames.h" + ++static int str_read(void *, char *, size_t); ++ + int ispipe; + char *current_file, *previous_file, *current_name, *next_name; + int any_display; +@@ -410,7 +412,6 @@ + char *c; + int readrc(); + int savederrno; +- static int str_read(); + + /* The default builtin rc file */ + if ((c = getenv("HOME")) && diff --git a/sysutils/44bsd-more/files/patch-ncommand.c b/sysutils/44bsd-more/files/patch-ncommand.c new file mode 100644 index 0000000..39167e1 --- /dev/null +++ b/sysutils/44bsd-more/files/patch-ncommand.c @@ -0,0 +1,18 @@ +--- ./ncommand.c.orig 2007-06-22 14:48:44.603814341 +0800 ++++ ./ncommand.c 2007-06-22 14:48:44.631081101 +0800 +@@ -231,6 +231,7 @@ + */ + + static char *readvar(); ++static const char *getvar(char *, int); + + #define NCTXTS 128 + void *getstr_ctxts[NCTXTS]; /* could easily be made dynamic... */ +@@ -613,7 +614,6 @@ + { + int vlength; + char *vstart; +- static char *getvar(); + + if (**line != '{') { + SETERR (E_BADVAR); |
