diff options
| author | obraun <obraun@FreeBSD.org> | 2006-09-22 05:13:42 +0800 |
|---|---|---|
| committer | obraun <obraun@FreeBSD.org> | 2006-09-22 05:13:42 +0800 |
| commit | c55be33c70edb791ef0a9821923911001f433501 (patch) | |
| tree | 4969377e31b17fe6283783645755e2e6d7d99663 /sysutils | |
| parent | 2fa3b57b0bfd372d685785e1768b7c82d789b846 (diff) | |
| download | freebsd-ports-gnome-c55be33c70edb791ef0a9821923911001f433501.tar.gz freebsd-ports-gnome-c55be33c70edb791ef0a9821923911001f433501.tar.zst freebsd-ports-gnome-c55be33c70edb791ef0a9821923911001f433501.zip | |
Fix build on 4-STABLE.
Diffstat (limited to 'sysutils')
| -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; |