From nobody Sat Nov 18 12:30:04 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 4SXY4s0ctJz5136K; Sat, 18 Nov 2023 12:30: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SXY4r6FKDz4XRf; Sat, 18 Nov 2023 12:30:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1700310604; 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=45of0EsEfOSUKNkTRxiZDyE8hv6hCc0D9SiG/0VaNT4=; b=EFPcJie8MLmsViGJxdowbIKBWD0XTr9eSmeafGVFWC47dPhgLW6B040MBzMtMuIzTspoOp Z01/k0tX+miRza6l6s6uLywKXAa1Hv8kr2I6d0K8PKY/DdlffcahZUA1BcBhww4XkLGBIe rJ4nP/mJA/HYuOd6sTMOKyBTjGTZatvH4qTxfA/rE/HacuwjD6Tie6KLNpLVzb9eMmM3wE pM1cCynZheC7Yg5K6Sl30lHXt5Zk0Ze01/BhOcya12ybtRBrWnNLvdppvk02Iw3wHXR0YT yz6+azwiRAq9hl/98oa038OKpRVHJX+u/SheFKo03xbP+79DIDQ83GHuziZdIA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1700310604; 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=45of0EsEfOSUKNkTRxiZDyE8hv6hCc0D9SiG/0VaNT4=; b=VphC+bvCCxrNm7/fiIzINkbxj9VyvB39ssPekVljiouVRRDhtyiJOYALA6BJ9nzrfOTL/p 9eMmSeJR3IHbvhyRLb2uFqYN3k1uqL+YBeUC766A61j7onltcz1cJiRhB61V9o1kQPnhsE pdPFDTZ8LzeqBxPbYA76gL5eB7uWYt0/vQMgoUFT1YbxWv3JEKFlAfvXxen7L1J9X5mQuh 5XGqdEJiwZpMrz1oI28im8N7Ianeqy2RUpBt6lE2DK+5lXcgPmyOuoEUpqy14RRDZWt1PM UoijI+A7iRYlA3JXV+vsbEf1a6WmOIF3fORmh0sP/xZrtVzS3YjXsnjZMTEZLQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1700310604; a=rsa-sha256; cv=none; b=H06aJPPCPKOzt6roSM8RJnlCsLlCanOXVNLKBUzIIyeWBXqNV+b5GxyWpaKDn1wIfVH1v2 HR2yiHLaZee04KdH9ltxGm01mj9VD19Pb1fqw/8k77pon3NiHZW0vrGZbVa2EEfxEVSXJ1 lYALMrYeqKIrIGWQTUJeE5nDl18ljYnakeUxi7RfxNZiLjjnQrpixLb6SsUjRIgvKmZwJ1 aMQHST9dS6aN1GX0zfInuHZykKgxRb9UFvNKTF1wxe0rbujvh0dmiNK4bub32Oj8ZgDCGK qBNi7XHC8QFCbHjMmxWIVd7p/tKR/vn7COTrSzdOWhnRae/vzw3qKOFbgYjSiQ== 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 4SXY4r5LXfzC4X; Sat, 18 Nov 2023 12:30:04 +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 3AICU4S2018771; Sat, 18 Nov 2023 12:30:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3AICU4Xi018766; Sat, 18 Nov 2023 12:30:04 GMT (envelope-from git) Date: Sat, 18 Nov 2023 12:30:04 GMT Message-Id: <202311181230.3AICU4Xi018766@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: 0eae56127aa0 - main - net-mgmt/nagios: Avoid deprecated @exec/@unexec 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: 0eae56127aa07f139d941688b0ba07df333f3637 Auto-Submitted: auto-generated The branch main has been updated by bofh: URL: https://cgit.FreeBSD.org/ports/commit/?id=0eae56127aa07f139d941688b0ba07df333f3637 commit 0eae56127aa07f139d941688b0ba07df333f3637 Author: Muhammad Moinur Rahman AuthorDate: 2023-11-18 08:30:00 +0000 Commit: Muhammad Moinur Rahman CommitDate: 2023-11-18 12:29:52 +0000 net-mgmt/nagios: Avoid deprecated @exec/@unexec Utilize USES=localbase while I am here Approved by: portmgr (blanket) --- net-mgmt/nagios/Makefile | 6 +----- net-mgmt/nagios/pkg-plist | 4 ++-- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/net-mgmt/nagios/Makefile b/net-mgmt/nagios/Makefile index 7b45efd48838..87d9812dc262 100644 --- a/net-mgmt/nagios/Makefile +++ b/net-mgmt/nagios/Makefile @@ -15,7 +15,7 @@ LIB_DEPENDS= libltdl.so:devel/libltdl \ PORTSCOUT= limit:^3. -USES= cpe perl5 php +USES= cpe localbase perl5 php USE_PERL5= build USE_RC_SUBR= nagios @@ -39,10 +39,6 @@ CONFIGURE_ARGS= --with-command-user=${NAGIOSUSER} \ ac_cv_lib_iconv_main=no CONFIGURE_ENV= PERL=${PERL} -CPPFLAGS+= -I${LOCALBASE}/include -CFLAGS+= ${CPPFLAGS} -LIBS+= -L${LOCALBASE}/lib - MAKE_JOBS_UNSAFE= yes INSTALL_TARGET= install install-commandmode install-config diff --git a/net-mgmt/nagios/pkg-plist b/net-mgmt/nagios/pkg-plist index cc15d8d5166d..8d631a192f0f 100644 --- a/net-mgmt/nagios/pkg-plist +++ b/net-mgmt/nagios/pkg-plist @@ -379,5 +379,5 @@ etc/nagios/resource.cfg-sample @dir(%%NAGIOSUSER%%,%%NAGIOSGROUP%%,775) %%NAGIOSDIR%%/checkresults @dir(%%NAGIOSUSER%%,%%WWWGRP%%,775) %%NAGIOSDIR%%/rw @dir(%%NAGIOSUSER%%,%%NAGIOSGROUP%%,775) %%NAGIOSDIR%% -@unexec if [ -d %%NAGIOSDIR%% ]; then echo "==> If you are permanently removing this port, you should do a ``rm -rf %%NAGIOSDIR%%`` to remove any files left behind."; fi -@unexec if [ -d %%ETCDIR%% ]; then echo "==> If you are permanently removing this port, you should do a ``rm -rf %%ETCDIR%%`` to remove any configuration files."; fi +@postunexec if [ -d %%NAGIOSDIR%% ]; then echo "==> If you are permanently removing this port, you should do a ``rm -rf %%NAGIOSDIR%%`` to remove any files left behind."; fi +@postunexec if [ -d %%ETCDIR%% ]; then echo "==> If you are permanently removing this port, you should do a ``rm -rf %%ETCDIR%%`` to remove any configuration files."; fi