Hi, From: Landry Breuil <[email protected]> Date: 2020-05-27 5:47:33
> On Wed, May 27, 2020 at 01:48:55PM +0900, Masato Asou wrote: >> Hi, >> >> This is a new port sysutils/fluent-bit. Fluent bit is a Log Processor >> and Forwarder. > > Great stuff, i think i had a look at it some years ago and it looked > very-linuxy/not that much portable.. nice that you made it. > > some notes: > * why USE_NINJA=No ? > * why not taking maintainership ? > * it feels weird to force gmake usage w/ cmake.. in which voodooo > trickery does cmake end up generating $< -gmake rules ? cant the cmake > stuff be fixed instead ? > * 1.4.5 was released 2 days ago > * many portability patches without comments.. are you planning to push > those upstream via github ? > > other than that it reads good at first sight. > > Landry The original version has been updated from 1.4.4 to 1.4.6. The difference at the tail end is a comparison with the .tgz attached to the email below. ok? From: Masato Asou <[email protected]> Date: Mon, 01 Jun 2020 17:07:34 +0900 (JST) > From: Stuart Henderson <[email protected]> > Date: 2020-05-27 10:38:26 > >> On 2020/05/27 07:47, Landry Breuil wrote: >>> On Wed, May 27, 2020 at 01:48:55PM +0900, Masato Asou wrote: >>> > Hi, >>> > >>> > This is a new port sysutils/fluent-bit. Fluent bit is a Log Processor >>> > and Forwarder. >>> >>> Great stuff, i think i had a look at it some years ago and it looked >>> very-linuxy/not that much portable.. nice that you made it. >>> >>> some notes: >>> * why USE_NINJA=No ? >> >> Couple of reasons. One is that they don't want the full path in traces and >> are >> using some gmake-specific mess to define __FILENAME__ with the 'base' source >> directory stripped off (that's easily avoided by using __FILE__ instead). >> Another is that they bundle various dependencies and are building them by >> calling $(MAKE). Also some of those dependencies use gmake-specific things. > > </snip> > > I've applied your patch. > > How about this patch. diff --git a/sysutils/fluent-bit/Makefile b/sysutils/fluent-bit/Makefile index 622f4aaea80..d4f2dae8abb 100644 --- a/sysutils/fluent-bit/Makefile +++ b/sysutils/fluent-bit/Makefile @@ -2,13 +2,15 @@ COMMENT = fast log processor and forwarder -GH_ACCOUNT = fluent -GH_PROJECT = fluent-bit -GH_TAGNAME = v1.4.4 +VERSION = 1.4 +V = ${VERSION}.6 CATEGORIES = sysutils +DISTNAME = fluent-bit-${V} +EXTRACT_SUFX = .tar.gz HOMEPAGE = https://fluentbit.io/ +MASTER_SITES = ${HOMEPAGE:=releases/${VERSION}/} #MAINTAINER = diff --git a/sysutils/fluent-bit/distinfo b/sysutils/fluent-bit/distinfo index e3e4e31ba17..8adc6e0442b 100644 --- a/sysutils/fluent-bit/distinfo +++ b/sysutils/fluent-bit/distinfo @@ -1,2 +1,2 @@ -SHA256 (fluent-bit-1.4.4.tar.gz) = f9abc86ca56fbfc7b5c3fff1511f21e6eaa4c75cae7690e2fcca381872abf6f7 -SIZE (fluent-bit-1.4.4.tar.gz) = 12614962 +SHA256 (fluent-bit-1.4.6.tar.gz) = 4da02a9d0f42a82eab07ea3e5713007c0fd5539485da133515ae464789fc11fa +SIZE (fluent-bit-1.4.6.tar.gz) = 12509211 diff --git a/sysutils/fluent-bit/patches/patch-plugins_in_tail_tail_file_c b/sysutils/fluent-bit/patches/patch-plugins_in_tail_tail_file_c index 98028f8e44c..408b2e887c1 100644 --- a/sysutils/fluent-bit/patches/patch-plugins_in_tail_tail_file_c +++ b/sysutils/fluent-bit/patches/patch-plugins_in_tail_tail_file_c @@ -3,7 +3,7 @@ $OpenBSD$ Index: plugins/in_tail/tail_file.c --- plugins/in_tail/tail_file.c.orig +++ plugins/in_tail/tail_file.c -@@ -1041,9 +1041,8 @@ +@@ -1053,9 +1053,8 @@ { int ret; char *buf; @@ -15,7 +15,7 @@ Index: plugins/in_tail/tail_file.c #elif defined(__APPLE__) char path[PATH_MAX]; #elif defined(_MSC_VER) -@@ -1056,21 +1055,24 @@ +@@ -1068,21 +1067,24 @@ return NULL; } diff --git a/sysutils/fluent-bit/patches/patch-src_CMakeLists_txt b/sysutils/fluent-bit/patches/patch-src_CMakeLists_txt index aef2a395fcc..a73f2dc2428 100644 --- a/sysutils/fluent-bit/patches/patch-src_CMakeLists_txt +++ b/sysutils/fluent-bit/patches/patch-src_CMakeLists_txt @@ -3,7 +3,7 @@ $OpenBSD$ Index: src/CMakeLists.txt --- src/CMakeLists.txt.orig +++ src/CMakeLists.txt -@@ -191,6 +191,13 @@ if(CMAKE_SYSTEM_NAME MATCHES "Linux") +@@ -192,6 +192,13 @@ ) endif() diff --git a/sysutils/fluent-bit/patches/patch-src_flb_scheduler_c b/sysutils/fluent-bit/patches/patch-src_flb_scheduler_c index 539e9efafdb..19b75431bca 100644 --- a/sysutils/fluent-bit/patches/patch-src_flb_scheduler_c +++ b/sysutils/fluent-bit/patches/patch-src_flb_scheduler_c @@ -3,7 +3,7 @@ $OpenBSD$ Index: src/flb_scheduler.c --- src/flb_scheduler.c.orig +++ src/flb_scheduler.c -@@ -376,7 +376,7 @@ int flb_sched_event_handler(struct flb_config *config, +@@ -378,7 +378,7 @@ } else if (timer->type == FLB_SCHED_TIMER_FRAME) { sched = timer->data; diff --git a/sysutils/fluent-bit/patches/patch-src_fluent_bit_c b/sysutils/fluent-bit/patches/patch-src_fluent_bit_c index a8444c7d7f7..42b578b8017 100644 --- a/sysutils/fluent-bit/patches/patch-src_fluent_bit_c +++ b/sysutils/fluent-bit/patches/patch-src_fluent_bit_c @@ -3,7 +3,7 @@ $OpenBSD$ Index: src/fluent-bit.c --- src/fluent-bit.c.orig +++ src/fluent-bit.c -@@ -379,14 +379,8 @@ static void flb_signal_handler(int signal) +@@ -382,14 +382,8 @@ case SIGQUIT: case SIGHUP: #endif -- ASOU Masato
fluent-bit.tgz
Description: Binary data
