diff options
| author | Oliver Braun <obraun@FreeBSD.org> | 2006-09-21 21:13:42 +0000 |
|---|---|---|
| committer | Oliver Braun <obraun@FreeBSD.org> | 2006-09-21 21:13:42 +0000 |
| commit | c5ed4911be1508c001a46a904a3ad413451864fc (patch) | |
| tree | 1496a9f8997330c2ac53e9434b1c4ff6d8639004 /sysutils/multitail | |
| parent | d810b394bbce8046be3cc2951e94f62ca2db4f8a (diff) | |
| download | ports-c5ed4911be1508c001a46a904a3ad413451864fc.tar.gz ports-c5ed4911be1508c001a46a904a3ad413451864fc.zip | |
Fix build on 4-STABLE.
Notes
Notes:
svn path=/head/; revision=173558
Diffstat (limited to 'sysutils/multitail')
| -rw-r--r-- | sysutils/multitail/Makefile | 3 | ||||
| -rw-r--r-- | sysutils/multitail/files/extra-patch-cv.c | 14 | ||||
| -rw-r--r-- | sysutils/multitail/files/extra-patch-stripstring.c | 11 |
3 files changed, 24 insertions, 4 deletions
diff --git a/sysutils/multitail/Makefile b/sysutils/multitail/Makefile index b37f44deebc0..b0f24dd7d198 100644 --- a/sysutils/multitail/Makefile +++ b/sysutils/multitail/Makefile @@ -23,7 +23,8 @@ PORTDOCS= readme.txt license.txt .include <bsd.port.pre.mk> .if ${OSVERSION} < 500000 -EXTRA_PATCHES= ${FILESDIR}/extra-patch-config.c ${FILESDIR}/extra-patch-cv.c +EXTRA_PATCHES= ${FILESDIR}/extra-patch-config.c ${FILESDIR}/extra-patch-cv.c \ + ${FILESDIR}/extra-patch-stripstring.c .endif post-patch: diff --git a/sysutils/multitail/files/extra-patch-cv.c b/sysutils/multitail/files/extra-patch-cv.c index 197903aab522..d6acd7dd4466 100644 --- a/sysutils/multitail/files/extra-patch-cv.c +++ b/sysutils/multitail/files/extra-patch-cv.c @@ -1,6 +1,14 @@ ---- cv.c.orig Tue Apr 18 15:54:34 2006 -+++ cv.c Sun Apr 30 18:20:44 2006 -@@ -81,6 +81,7 @@ +--- cv.c.orig Fri Sep 8 08:38:28 2006 ++++ cv.c Thu Sep 21 21:09:36 2006 +@@ -105,6 +105,7 @@ + + case CONVTYPE_EPOCHTODATE: + { ++ #define atoll(a) strtoll((a), (char **)NULL, 10) + char *new_str = epoch_to_str((time_t)atoll(what)); + + if (new_str) +@@ -131,6 +132,7 @@ case CONVTYPE_DECTOHEX: { diff --git a/sysutils/multitail/files/extra-patch-stripstring.c b/sysutils/multitail/files/extra-patch-stripstring.c new file mode 100644 index 000000000000..8bc0cb059e93 --- /dev/null +++ b/sysutils/multitail/files/extra-patch-stripstring.c @@ -0,0 +1,11 @@ +--- stripstring.c.orig Fri Sep 8 08:38:28 2006 ++++ stripstring.c Thu Sep 21 21:08:24 2006 +@@ -417,7 +417,7 @@ + + char do_strip_column(char *delimiter, int col_nr, char *in, char *strip_what) + { +- char changed = 0;; ++ char changed = 0; + char *p = in; + int del_len = strlen(delimiter); + int col_i; |