git: 6c9d67008917 - main - sysutils/fluent-bit: Clean up the makefile

From: Mateusz Piotrowski <0mp_at_FreeBSD.org>
Date: Fri, 26 Jul 2024 12:57:31 UTC
The branch main has been updated by 0mp:

URL: https://cgit.FreeBSD.org/ports/commit/?id=6c9d67008917466915f15e47d09712270bd27baa

commit 6c9d67008917466915f15e47d09712270bd27baa
Author:     Mateusz Piotrowski <0mp@FreeBSD.org>
AuthorDate: 2024-07-25 12:27:06 +0000
Commit:     Mateusz Piotrowski <0mp@FreeBSD.org>
CommitDate: 2024-07-26 12:53:23 +0000

    sysutils/fluent-bit: Clean up the makefile
    
    No functional changes intended.
    
    Approved by:    portmgr blanket
    Sponsored by:   trivago N.V.
    Sponsored by:   Klara, Inc.
---
 sysutils/fluent-bit/Makefile | 30 ++++++++++++++++--------------
 1 file changed, 16 insertions(+), 14 deletions(-)

diff --git a/sysutils/fluent-bit/Makefile b/sysutils/fluent-bit/Makefile
index cb7b0b008b3e..5aa86d960292 100644
--- a/sysutils/fluent-bit/Makefile
+++ b/sysutils/fluent-bit/Makefile
@@ -9,25 +9,24 @@ WWW=		https://fluentbit.io/
 
 LICENSE=	APACHE20
 
-BROKEN_mips=		fails to build: conflicting types for 'restrict'
-BROKEN_mips64=		fails to build: conflicting types for 'restrict'
+BROKEN_mips=	fails to build: conflicting types for 'restrict'
+BROKEN_mips64=	fails to build: conflicting types for 'restrict'
 
+LIB_DEPENDS=	libyaml.so:textproc/libyaml
+
+USES=		bison cmake:noninja compiler:c11 gmake localbase:ldflags
 USE_GITHUB=	yes
 GH_ACCOUNT=	fluent
+USE_RC_SUBR=	${PORTNAME}
 
-USES=		bison cmake:noninja compiler:c11 gmake localbase:ldflags
+CMAKE_ARGS=	-DFLB_DEBUG=Off \
+		-DFLB_LUAJIT=Off \
+		-DFLB_TRACE=Off
+LDFLAGS+=	-lexecinfo
 
-OPTIONS_DEFINE=		SSL PGSQL
+OPTIONS_DEFINE=		PGSQL SSL
 OPTIONS_DEFAULT=	SSL
 
-LIB_DEPENDS=		libyaml.so:textproc/libyaml
-LDFLAGS+=		-lexecinfo
-CMAKE_ARGS=		-DFLB_DEBUG=Off -DFLB_TRACE=Off -DFLB_LUAJIT=Off
-
-SSL_USES=		ssl
-SSL_CMAKE_ON=		-DFLB_TLS=On
-SSL_CMAKE_OFF=		-DFLB_TLS=Off
-
 EXAMPLES_CMAKE_ON=	-DFLB_EXAMPLES=On
 EXAMPLES_CMAKE_OFF=	-DFLB_EXAMPLES=Off
 
@@ -35,11 +34,14 @@ PGSQL_USES=		pgsql
 PGSQL_CMAKE_ON=		-DFLB_OUT_PGSQL=On
 PGSQL_CMAKE_OFF=	-DFLB_OUT_PGSQL=Off
 
-USE_RC_SUBR=	${PORTNAME}
+SSL_USES=	ssl
+SSL_CMAKE_ON=	-DFLB_TLS=On
+SSL_CMAKE_OFF=	-DFLB_TLS=Off
 
 .include <bsd.port.options.mk>
 
-.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400079 || ( ${OSVERSION} >= 1302505 && ${OSVERSION} < 1400000 ))
+.if ${OPSYS} == FreeBSD && (${OSVERSION} >= 1400079 || (${OSVERSION} >= 1302505 && \
+	${OSVERSION} < 1400000))
 CFLAGS+=	-Wno-error=int-conversion
 .endif