net-mgmt/nagios: Avoid deprecated @exec/@unexec

Utilize USES=localbase while I am here Approved by: portmgr (blanket)
freebsd · Nov 18, 2023 · 0eae561 · 0eae561
1 parent 4f698c4
commit 0eae561
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 7 deletions.
diff --git 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
@@ -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