From nobody Wed Jan 8 14:37:05 2025 X-Original-To: dev-commits-ports-all@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 4YSr8x4qmPz5kXkq; Wed, 08 Jan 2025 14:37:05 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YSr8x45Xkz4kN8; Wed, 8 Jan 2025 14:37:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1736347025; 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=ybf8jFniZHFcNsRT6JeQCPubFqPRYLOVVBDD5cENFB4=; b=pm+u52u8rrl+TYVvgjMdR8/gK9OuRVl3fYpuQe1mauwWK9mkXuRJ3aT9z/Cm7fJLnd0gkX zmOjixUM88VxCTcnBuUaBONCdNqCjf7rV5jAzU+YhHxVudLBI5rGmDb59T67SQuYF1WDiG EMEVTDszknB5vzV0AmP9oja3weOolY6lMIq2Oym1Nmp/G4DGahDRbbTPEBq2jMGiP4gI9E 5QWg/kpt2asUxrWqtfnh3rrit3XEPMNzLCM6HnZ0vC/wWHnelxwGrdkGY1WkLJj7CwVO72 Lbyb9f8m4zWZ5envN6jCvSHu8TJ4MHRkwLyWpfm2T5P7LllWmAt4R3bdLmpxAg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1736347025; 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=ybf8jFniZHFcNsRT6JeQCPubFqPRYLOVVBDD5cENFB4=; b=VLiLr0CAeIUYpl6xXGCxxNuh0vgwXxNXUs8spcafw1NhQC/4MMyzoEG3B8qGC7Q/Jce13H flFZcxHQZEsiWzlpTf91WdJcRDlBThc/wEj3ArrbNd/CCgJip2vYKX8HeFZNr9E6EMAypa DPkKRqdR6cXZTfUHyP0ywQ2MlH3HRC2CjTd1By4VZUjHw+iEkAX8KFGnCeICqmE81MM8Pf ctG5Hmlrg/jkO9hzUZzbbAJ6O1Ce/gDcP7VsJWxIErNsydWgnqrO8sfByon09GGnHDRZcf 4+lYxDUZRepSsit+jpIGoqLUf1dSvfDxr8Vz1Rxih4fc5TeAfWkU2h5XJ6iIug== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1736347025; a=rsa-sha256; cv=none; b=f/5f08o0NxmRk2W1Z11lHxWeit1XjZfu4kQt9RHnMR+FetVLm1APzkwX849/7msqAtTGrt VxK/3wWKx16mstiuQB0RKTIn6Kl7PH7R50C8AKlccuPxUhGVvgyE6oYIgX0+NJBTgvnn1K oAs1LVcylHV8cfac8kFUxEto2VG6+07obVb3eYvofyfCLeuaDvuG6JdtraPW2Gk2S0Q1np 9isI/pGJyg5SPBa4S+HcbuPvGaf/2XXcxN03lh1WN/LzQBgezhHktsdmuiTui+hWX5btqv d0wXZP06xrYKKMA1m2aiHHZG7LnpkBpDPVevEEVLBjlx8cOLBeREF56vD6exhg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4YSr8x3Nqtz10gq; Wed, 08 Jan 2025 14:37:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 508Eb5rQ011302; Wed, 8 Jan 2025 14:37:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 508Eb5bZ011299; Wed, 8 Jan 2025 14:37:05 GMT (envelope-from git) Date: Wed, 8 Jan 2025 14:37:05 GMT Message-Id: <202501081437.508Eb5bZ011299@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Xavier Beaudouin Subject: git: 521c4c6e6500 - main - net-mgmt/nrpe: Adding monplugins flavor to nrpe List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-all@freebsd.org Sender: owner-dev-commits-ports-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kiwi X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 521c4c6e650075b92d0f9e9256af54c9b8913732 Auto-Submitted: auto-generated The branch main has been updated by kiwi: URL: https://cgit.FreeBSD.org/ports/commit/?id=521c4c6e650075b92d0f9e9256af54c9b8913732 commit 521c4c6e650075b92d0f9e9256af54c9b8913732 Author: Xavier Beaudouin AuthorDate: 2025-01-08 10:10:10 +0000 Commit: Xavier Beaudouin CommitDate: 2025-01-08 14:35:34 +0000 net-mgmt/nrpe: Adding monplugins flavor to nrpe Some user asked to add a flavor to permit to have nrpe already packaged with monplugins. This patch add this functionality and has been tested (both flavors default and monplugins with poudriere under 13.4-RELEASE). Sponsored by: Klara, Inc. Approved by: 0mp (mentor) Approved by: bofh (maintainer) Differential Revision: https://reviews.freebsd.org/D48111 --- net-mgmt/nrpe/Makefile | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/net-mgmt/nrpe/Makefile b/net-mgmt/nrpe/Makefile index 011ab87d0645..02b1cdbce02d 100644 --- a/net-mgmt/nrpe/Makefile +++ b/net-mgmt/nrpe/Makefile @@ -10,6 +10,10 @@ WWW= https://www.nagios.org/ LICENSE= GPLv2+ LICENSE_FILE= ${WRKSRC}/LICENSE.md +FLAVORS= default monplugins +FLAVOR?= ${FLAVORS:[1]} +monplugins_PKGNAMESUFFIX= -monplugins + USES= perl5 USE_GITHUB= yes GH_ACCOUNT= NagiosEnterprises @@ -36,7 +40,7 @@ PLIST_SUB= NAGIOSUSER=${NAGIOSUSER} \ NRPE_PIDDIR=${NRPE_PIDDIR} OPTIONS_DEFINE= SSL ARGS -OPTIONS_DEFAULT=NAGPLUGINS SSL +OPTIONS_DEFAULT=SSL OPTIONS_RADIO= PLUGINS OPTIONS_RADIO_PLUGINS= MONPLUGINS NAGPLUGINS @@ -57,6 +61,14 @@ NAGIOSGROUP?= nagios NRPE_PIDDIR?= /var/run/nrpe +.if ${FLAVOR:U} == default +OPTIONS_DEFAULT+= NAGPLUGINS +.endif + +.if ${FLAVOR:U} == monplugins +OPTIONS_DEFAULT+= MONPLUGINS +.endif + post-patch: @${REINPLACE_CMD} -e 's|/var/run/nrpe.pid|${NRPE_PIDDIR}/nrpe.pid|g' \ -e 's|/usr/lib/nagios/plugins/|${LOCALBASE}/libexec/nagios/|g' \