From nobody Tue Jul 25 08:36:38 2023 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4R99P26BkSz4p2Ql; Tue, 25 Jul 2023 08:36:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4R99P25bzYz46HG; Tue, 25 Jul 2023 08:36:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690274198; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=BX/jjFiHvjFHZrpax5qlebYyFqDMVcpKcyqkFlbIG6o=; b=HqyTC/W7+mp1ZBskpTi7JZpOO3YHd9OYm6UnGr2mF6KMLwnwm6h2ph7Q5OEcRF1dif//ko C79eP4SR1jEcj8naPQxOGIOzAO5CbTpV3xPtMnhuoY8oR4jUSt5xfzLZpfgcgJqb8ptJTE UpM2O5DN1fkzFn9MxGCIN0W3tvLC0xE65P97WZwG9cuyNH/q60QH7fRpZRp38SyxViDPKU 1QtOncTMGNmfDEgEaolQlyQC4Mh+IPI/hb8ZlraJRZhEHPQuCxIriFL/f37A3O9IJauy1t 1qvyYWEFasfvfvYjLRHUJu+kttTfgrueQpRrFnxTq7MvJvYlS661b/TSgs4WBw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690274198; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=BX/jjFiHvjFHZrpax5qlebYyFqDMVcpKcyqkFlbIG6o=; b=erw46+Q+7dQo7Ya/DSGbwEMtlL7pKeshs8Wg+S4AAEhDtJnu5NyBjnm5y9Lnxwfmc+G2UP mZbzVCsO/56ONtN/U8OHO4/wgatx03IYZX7X7okVDEDfHdYNvySNslzc+gpBcQ0PB8+bhy VaWd+cILDqy3lGFBlxWctH890Rr+265y8feGmiMlIXwhUss93eiO1puFh45L444Rh2pgwL /7tQz87hYlKt2oOSyNR/l1cx2KdIDFz9F6+Uc7talHNFD67uT3d2jl2VAFsWCNCKzk97OE sdbGtmb4kHHfpJynu1OhvODEnOvjOR8mZDHiv8jrpn15Z1O2kcJvlZ8gkjwrsQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1690274198; a=rsa-sha256; cv=none; b=Jwc+2JHIBlveR3ykcoY6ZsSqCyDPntMZQobfSTBB3d+M4r/MG2y9ZlkSHk5vT1qUhLEDtI /2ByDASWrmOj/ZvzpgIziM4jVL3Q5ZC03Wv1k0f7Cs8u2bjbPT7P5MUWMi6kLptyeYpok+ m/asJBhtGmo+aRt+BoN9BWufBBBCdLCDry3LGfv0+LpIMy7HoCOMG8v4UgYoWMXQvfWclw Wl0mPGm+Oi9N8tRJ2VfBJSwsTFKADPinUFfisFmwsywDfk8dvVxSh10ptjSN9rCn+AfeUb zrdkz50NoPxolaCdi8N893847ZyDg8gbS2R30vzCSDMCZshBWiTjKCngs1xe7A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4R99P24hwlztCC; Tue, 25 Jul 2023 08:36:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 36P8aclb054083; Tue, 25 Jul 2023 08:36:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 36P8acpU054082; Tue, 25 Jul 2023 08:36:38 GMT (envelope-from git) Date: Tue, 25 Jul 2023 08:36:38 GMT Message-Id: <202307250836.36P8acpU054082@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Muhammad Moinur Rahman Subject: git: 08bec39ed843 - main - net-mgmt/nfdump: Fix build with llvm16 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bofh X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 08bec39ed8435ffb6ab1efef775eca980f295dfe Auto-Submitted: auto-generated The branch main has been updated by bofh: URL: https://cgit.FreeBSD.org/ports/commit/?id=08bec39ed8435ffb6ab1efef775eca980f295dfe commit 08bec39ed8435ffb6ab1efef775eca980f295dfe Author: Muhammad Moinur Rahman AuthorDate: 2023-07-25 08:02:00 +0000 Commit: Muhammad Moinur Rahman CommitDate: 2023-07-25 08:36:27 +0000 net-mgmt/nfdump: Fix build with llvm16 - Remove non default OPTION NFDUMP15 as it's no longer a valid CONFIGURE args - Convert to OPTIONSNG - Pet portclippy Approved by: portmgr (blanket) Sponsored by: The FreeBSD Foundation --- net-mgmt/nfdump/Makefile | 154 +++++++++++++++-------------------------------- 1 file changed, 48 insertions(+), 106 deletions(-) diff --git a/net-mgmt/nfdump/Makefile b/net-mgmt/nfdump/Makefile index 092de5f3a23b..5b6c4e02378b 100644 --- a/net-mgmt/nfdump/Makefile +++ b/net-mgmt/nfdump/Makefile @@ -1,7 +1,7 @@ PORTNAME= nfdump PORTVERSION= 1.6.20 -PORTREVISION= 1 DISTVERSIONPREFIX=v +PORTREVISION= 1 CATEGORIES= net-mgmt MAINTAINER= pi@FreeBSD.org @@ -12,74 +12,60 @@ LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/BSD-license.txt USES= autoreconf compiler:c11 cpe libtool pkgconfig +CPE_VENDOR= nfdump_project USE_CSTD= gnu89 -USE_LDCONFIG= yes USE_GITHUB= yes GH_ACCOUNT= phaag -CPE_VENDOR= nfdump_project +USE_LDCONFIG= yes GNU_CONFIGURE= yes + MAKE_JOBS_UNSAFE= yes +PLIST_FILES= bin/nfanon bin/nfcapd bin/nfdump bin/nfexpire bin/nfreplay \ + lib/libnfdump-${PORTVERSION}.so \ + man/man1/nfanon.1.gz man/man1/nfcapd.1.gz man/man1/nfdump.1.gz \ + man/man1/nfexpire.1.gz man/man1/nfreplay.1.gz +PORTDOCS= AUTHORS ChangeLog INSTALL NEWS README + #flow-tools support OPTIONS_DEFINE= DOCS FT2NFDUMP NFPROFILE FIXTIMEBUG READPCAP NFTRACK \ - SFLOW NFPCAPD NFDUMP15 NSEL INFLUXDB + SFLOW NFPCAPD NSEL INFLUXDB OPTIONS_DEFAULT= NFPROFILE +FIXTIMEBUG_DESC= With fixing swap time bug of some v5 FT2NFDUMP_DESC= With Flow-tools to nfdump converter +INFLUXDB_DESC= Enable stats to InfluxDB +NFPCAPD_DESC= Build nfpcapd collector daemon also NFPROFILE_DESC= With nfprofile (nfsen requires it) -FIXTIMEBUG_DESC= With fixing swap time bug of some v5 -READPCAP_DESC= With pcap support NFTRACK_DESC= With PortTracker support -SFLOW_DESC= Build sflow collector daemon also -NFPCAPD_DESC= Build nfpcapd collector daemon also -NFDUMP15_DESC= Enable compatibility with version 1.5 NSEL_DESC= Read and process ASA/NSEL/NEL event data -INFLUXDB_DESC= Enable stats to InfluxDB - -post-patch: - ${REINPLACE_CMD} 's|-ggdb||' ${WRKSRC}/bin/Makefile.am - -.include - -#for compatibility -# -.if ${PORT_OPTIONS:MNFDUMP15} -CONFIGURE_ARGS+= --enable-compat15 -.else -CONFIGURE_ARGS+= --disable-compat15 -.endif - -.if ${PORT_OPTIONS:MNSEL} -CONFIGURE_ARGS+= --enable-nsel -.else -CONFIGURE_ARGS+= --disable-nsel -.endif - -PLIST_FILES= bin/nfanon bin/nfcapd bin/nfdump bin/nfexpire bin/nfreplay \ - lib/libnfdump-${PORTVERSION}.so \ - man/man1/nfanon.1.gz man/man1/nfcapd.1.gz man/man1/nfdump.1.gz \ - man/man1/nfexpire.1.gz man/man1/nfreplay.1.gz -PORTDOCS= AUTHORS ChangeLog INSTALL NEWS README - -.if ${PORT_OPTIONS:MFIXTIMEBUG} -CONFIGURE_ARGS+= --enable-fixtimebug -.else -CONFIGURE_ARGS+= --disable-fixtimebug -.endif - -.if ${PORT_OPTIONS:MNFPROFILE} -CONFIGURE_ARGS+= --enable-nfprofile -PLIST_FILES+= bin/nfprofile man/man1/nfprofile.1.gz -.else -CONFIGURE_ARGS+= --disable-nfprofile -.endif +READPCAP_DESC= With pcap support +SFLOW_DESC= Build sflow collector daemon also -.if ${PORT_OPTIONS:MNFTRACK} -CONFIGURE_ARGS+= --enable-nftrack -PLIST_FILES+= bin/nftrack -.else -CONFIGURE_ARGS+= --disable-nftrack +FIXTIMEBUG_CONFIGURE_ENABLE= fixtimebug +FT2NFDUMP_BUILD_DEPENDS= flow-cat:net-mgmt/flow-tools +FT2NFDUMP_LIB_DEPENDS= libft.so:net-mgmt/flow-tools +FT2NFDUMP_CONFIGURE_ON= --enable-ftconv --with-ftpath=${LOCALBASE} +FT2NFDUMP_PLIST_FILES= bin/ft2nfdump man/man1/ft2nfdump.1.gz +INFLUXDB_LIB_DEPENDS= libcurl.so:ftp/curl +INFLUXDB_CONFIGURE_ENABLE= influxdb +NFPCAPD_CONFIGURE_ENABLE= nfpcapd +NFPCAPD_PLIST_FILES= bin/nfpcapd man/man1/nfpcapd.1.gz +NFPROFILE_CONFIGURE_ENABLE= nfprofile +NFPROFILE_PLIST_FILES= bin/nfprofile man/man1/nfprofile.1.gz +NFTRACK_CONFIGURE_ENABLE= nftrack +NFTRACK_PLIST_FILES= bin/nftrack +NSEL_CONFIGURE_ENABLE= nsel +READPCAP_LIB_DEPENDS= libpcap.so:net/libpcap +READPCAP_CONFIGURE_ENABLE= readpcap +SFLOW_CONFIGURE_ENABLE= sflow +SFLOW_PLIST_FILES= bin/sfcapd man/man1/sfcapd.1.gz + +.include + +.if ${COMPILER_TYPE} == clang && ${COMPILER_VERSION} >= 160 +CPPFLAGS+= -Wno-error=incompatible-function-pointer-types .endif .if ${PORT_OPTIONS:MNFPROFILE} || ${PORT_OPTIONS:MNFTRACK} @@ -88,81 +74,37 @@ BUILD_DEPENDS+= rrdtool:databases/rrdtool RUN_DEPENDS+= rrdtool:databases/rrdtool .endif -#flow-tools support -.if ${PORT_OPTIONS:MFT2NFDUMP} -BUILD_DEPENDS+= flow-cat:net-mgmt/flow-tools -LIB_DEPENDS+= libft.so:net-mgmt/flow-tools -CONFIGURE_ARGS+= --enable-ftconv --with-ftpath=${LOCALBASE} -PLIST_FILES+= bin/ft2nfdump man/man1/ft2nfdump.1.gz -.endif - -.if ${PORT_OPTIONS:MREADPCAP} -CONFIGURE_ARGS+= --enable-readpcap -LIB_DEPENDS+= libpcap.so:net/libpcap -.else -CONFIGURE_ARGS+= --disable-readpcap -.endif - -#sflow capture support -.if ${PORT_OPTIONS:MSFLOW} -CONFIGURE_ARGS+= --enable-sflow -PLIST_FILES+= bin/sfcapd man/man1/sfcapd.1.gz -.else -CONFIGURE_ARGS+= --disable-sflow -.endif - -#nfpcapd capture support -.if ${PORT_OPTIONS:MNFPCAPD} -CONFIGURE_ARGS+= --enable-nfpcapd -PLIST_FILES+= bin/nfpcapd man/man1/nfpcapd.1.gz -.else -CONFIGURE_ARGS+= --disable-nfpcapd -.endif - -#influxdb support -.if ${PORT_OPTIONS:MINFLUXDB} -CONFIGURE_ARGS+= --enable-influxdb -LIB_DEPENDS+= libcurl.so:ftp/curl -.else -CONFIGURE_ARGS+= --disable-influxdb -.endif +post-patch: + ${REINPLACE_CMD} 's|-ggdb||' ${WRKSRC}/bin/Makefile.am do-install: .for binary in nfanon nfcapd nfdump nfexpire nfreplay ${INSTALL_PROGRAM} ${WRKSRC}/bin/.libs/${binary} ${STAGEDIR}${PREFIX}/bin + ${INSTALL_MAN} ${WRKSRC}/man/${binary}.1 ${STAGEDIR}${PREFIX}/man/man1 .endfor ${INSTALL_LIB} ${WRKSRC}/bin/.libs/libnfdump-${PORTVERSION}.so ${STAGEDIR}${PREFIX}/lib -.if ${PORT_OPTIONS:MNFPROFILE} +do-install-NFPROFILE-on: ${INSTALL_PROGRAM} ${WRKSRC}/bin/.libs/nfprofile ${STAGEDIR}${PREFIX}/bin ${INSTALL_MAN} ${WRKSRC}/man/nfprofile.1 ${STAGEDIR}${PREFIX}/man/man1 -.endif -.if ${PORT_OPTIONS:MNFTRACK} +do-install-NFTRACK-on: ${INSTALL_PROGRAM} ${WRKSRC}/bin/.libs/nftrack ${STAGEDIR}${PREFIX}/bin -.endif -.if ${PORT_OPTIONS:MFT2NFDUMP} +do-install-FT2NFDUMP-on: ${INSTALL_PROGRAM} ${WRKSRC}/bin/.libs/ft2nfdump ${STAGEDIR}${PREFIX}/bin ${INSTALL_MAN} ${WRKSRC}/man/ft2nfdump.1 ${STAGEDIR}${PREFIX}/man/man1 -.endif -.if ${PORT_OPTIONS:MSFLOW} +do-install-SFLOW-on: ${INSTALL_PROGRAM} ${WRKSRC}/bin/.libs/sfcapd ${STAGEDIR}${PREFIX}/bin ${INSTALL_MAN} ${WRKSRC}/man/sfcapd.1 ${STAGEDIR}${PREFIX}/man/man1 -.endif -.if ${PORT_OPTIONS:MNFPCAPD} +do-install-NFPCAPD-on: ${INSTALL_PROGRAM} ${WRKSRC}/bin/.libs/nfpcapd ${STAGEDIR}${PREFIX}/bin ${INSTALL_MAN} ${WRKSRC}/man/nfpcapd.1 ${STAGEDIR}${PREFIX}/man/man1 -.endif - -.for filename in nfanon nfdump nfcapd nfexpire nfreplay - ${INSTALL_MAN} ${WRKSRC}/man/${filename}.1 ${STAGEDIR}${PREFIX}/man/man1 -.endfor post-install-DOCS-on: ${MKDIR} ${STAGEDIR}${DOCSDIR} cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR} -.include +.include