git: 0eae56127aa0 - main - net-mgmt/nagios: Avoid deprecated @exec/@unexec
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Sat, 18 Nov 2023 12:30:04 UTC
The branch main has been updated by bofh: URL: https://cgit.FreeBSD.org/ports/commit/?id=0eae56127aa07f139d941688b0ba07df333f3637 commit 0eae56127aa07f139d941688b0ba07df333f3637 Author: Muhammad Moinur Rahman <bofh@FreeBSD.org> AuthorDate: 2023-11-18 08:30:00 +0000 Commit: Muhammad Moinur Rahman <bofh@FreeBSD.org> 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