From nobody Sat Oct 15 21:58:52 2022 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 4MqcbK1cgtz4fq2X; Sat, 15 Oct 2022 21:58:53 +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 4MqcbK15vLz3L7Q; Sat, 15 Oct 2022 21:58:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1665871133; 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=G5opvkPgBK+HnfIIib/9OfNWAXB/Uk+PrC1u4vGLroo=; b=AkWMcmze0+StrqiusKjI4rUhcrxnFQtmnsj9iIvDiXZFFM4xYkYvCxZjZqZ5O9igTA95+Y qKhcVBlhtHZpptTAYKl8Solgb57so1PpuyE5E6PoBa4WHZHr02m67QxMQBasrijY/dDTQA PfNeIVtzsj7UoeADMwyBnO00T5YLvr0lkkWV+hsUMDddUQEGB+LxVBvGJwR9Y4EkV/ZVT+ p3FFo35S3eyY1bOsQKXEV/jNuudueZwf+jxEAGHhU+IJ3kiNfetFUqIZXqLdplwcftYjcO qHdpXQPcrwW02fqBuJLnQd2A/Zc4GaWOydsaJXVpFJW1qIw5LeP6RQncMU59nw== 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 4MqcbK08bZzFtl; Sat, 15 Oct 2022 21:58:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 29FLwqkI086201; Sat, 15 Oct 2022 21:58:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 29FLwq2j086200; Sat, 15 Oct 2022 21:58:52 GMT (envelope-from git) Date: Sat, 15 Oct 2022 21:58:52 GMT Message-Id: <202210152158.29FLwq2j086200@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Adam Weinberger Subject: git: d800a3eee01c - main - net-mgmt/fastnetmon: Use USES=luajit (defaults to luajit-devel) 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: adamw X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d800a3eee01c47efda0ec90dba8475e9c8bc021f Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1665871133; 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=G5opvkPgBK+HnfIIib/9OfNWAXB/Uk+PrC1u4vGLroo=; b=F6/8SajMnjuwjqBtsaRBn6a8YbmB0Cdp1IHXRmXhjFNUuwv4i4OjBATbVmBD2Z4+dW8XJe dwjHN3BUP55pDKmJlixsj5syHMHIdRbPKOu/TvBCK3FKMsWpUKxc7kxcD2yKBDmKgl/pfk Abwq1OoYKNnSeug8AxBrwXt5WXDIdLGEMh7cd2e4JZ/5TwO4NkRETn4Trch16Mis/13vxs QHh1QlZDj5m5/8icGGjW+66yEnlI/jm6xvmK/NStWQHVX5sp3I5MpiDV9wxGS8jBnbj5l1 R3i8Op0R5vi8VWFH3PsFH5RyAoiT68rhnVN9YHerHKKQXnufHghpdc6IfPFAfA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1665871133; a=rsa-sha256; cv=none; b=qOWsaImBpszpspILjFbv9wx9k3opGCAbRet3sAnmuT+Hf2qbziSQYetRN7jkeaNiIENu2v QSiRNg+cxTFGSaxe6YjrpDwRjww2/FqLeejuWEyymRPXZOUdvU7BFs9vEvKTX1sJGw0sY3 5V/GJ6Tu16p/w7AWqnLqTZvvDm9HKKqmf1961pBjLvVch1Sw/pK5idjxyr8BpKNpH+sca5 Lid7RmVjPN1y5BFOBYEEmbpBbZxoNIhODPIC/QhS0LhXk5JBO1sdDdSrEGb/yi3vEsIstU xSOmjPBTfuLfjhJtHH0B1XiN2vsJ44xpEITlQiCu09d8pvAHjFz/UMFLZpZL6g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by adamw: URL: https://cgit.FreeBSD.org/ports/commit/?id=d800a3eee01c47efda0ec90dba8475e9c8bc021f commit d800a3eee01c47efda0ec90dba8475e9c8bc021f Author: Adam Weinberger AuthorDate: 2022-10-15 21:58:37 +0000 Commit: Adam Weinberger CommitDate: 2022-10-15 21:58:46 +0000 net-mgmt/fastnetmon: Use USES=luajit (defaults to luajit-devel) --- net-mgmt/fastnetmon/Makefile | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/net-mgmt/fastnetmon/Makefile b/net-mgmt/fastnetmon/Makefile index e557db61e2be..095fc9c0c5a3 100644 --- a/net-mgmt/fastnetmon/Makefile +++ b/net-mgmt/fastnetmon/Makefile @@ -1,7 +1,7 @@ PORTNAME= fastnetmon PORTVERSION= 1.1.4 DISTVERSIONPREFIX= v -PORTREVISION= 7 +PORTREVISION= 8 CATEGORIES= net-mgmt security MAINTAINER= farrokhi@FreeBSD.org @@ -20,7 +20,7 @@ LIB_DEPENDS= libboost_regex.so:devel/boost-libs \ libjson-c.so:devel/json-c \ libbson-1.0.so:devel/libbson -USES= cmake compiler:c++11-lang +USES= cmake compiler:c++11-lang luajit USE_GITHUB= yes GH_ACCOUNT= pavel-odintsov @@ -44,14 +44,13 @@ CMAKE_INSTALL_PREFIX= ${PREFIX} .include -.if ${ARCH} == amd64 || ${ARCH} == armv6 || ${ARCH} == armv7 || ${ARCH} == i386 || ${ARCH} == powerpc -LIB_DEPENDS+= libluajit-5.1.so:lang/luajit -.elif ${ARCH:Mpowerpc64*} +.if ${ARCH} != amd64 && ${ARCH} != armv6 && ${ARCH} != armv7 && ${ARCH} != i386 && ${ARCH} != powerpc && empty(ARCH:Mpowerpc64*) +CMAKE_ARGS+= -DENABLE_LUA_SUPPORT:BOOL=OFF +.else +. if ${LUAJIT_VER} == luajit-devel || ${LUAJIT_VER} == luajit-openresty EXTRA_PATCHES= ${FILESDIR}/extra-patch-src_fast__library.h \ ${FILESDIR}/extra-patch-src_netflow__plugin_netflow__collector.cpp -LIB_DEPENDS+= libluajit-5.1.so:lang/luajit-openresty -.else -CMAKE_ARGS+= -DENABLE_LUA_SUPPORT:BOOL=OFF +. endif .endif post-patch: