Date: Tue, 6 Aug 2013 22:36:56 +0000 (UTC) From: Lars Engels <lme@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r324325 - head/net-mgmt/icinga Message-ID: <201308062236.r76Mauhw091542@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: lme Date: Tue Aug 6 22:36:56 2013 New Revision: 324325 URL: http://svnweb.freebsd.org/changeset/ports/324325 Log: - Fix plist so that /var/{log,spool}/icinga are included in the package - Drop unconditional dependency on Perl - Remove unneeded chmod g+s on the rw directory as this is the default behaviour on FreeBSD - Bump PORTREVISION Modified: head/net-mgmt/icinga/Makefile head/net-mgmt/icinga/pkg-plist (contents, props changed) Modified: head/net-mgmt/icinga/Makefile ============================================================================== --- head/net-mgmt/icinga/Makefile Tue Aug 6 19:08:57 2013 (r324324) +++ head/net-mgmt/icinga/Makefile Tue Aug 6 22:36:56 2013 (r324325) @@ -3,6 +3,7 @@ PORTNAME= icinga PORTVERSION= 1.9.3 +PORTREVISION= 1 CATEGORIES= net-mgmt MASTER_SITES= SF @@ -15,7 +16,6 @@ LIB_DEPENDS= gd:${PORTSDIR}/graphics/gd RUN_DEPENDS= ${LOCALBASE}/libexec/nagios/check_nagios:${PORTSDIR}/net-mgmt/nagios-plugins USES= iconv -USE_PERL5_BUILD= yes USE_AUTOTOOLS= autoconf libltdl USE_RC_SUBR= icinga @@ -90,7 +90,7 @@ APACHE_DESC= Depend on Apache and insta .include <bsd.port.options.mk> .if ${PORT_OPTIONS:MEMBEDDED_PERL} -USE_PERL5= yes +USE_PERL5_BUILD= yes CONFIGURE_ARGS+= --enable-embedded-perl \ --with-perlcache PLIST_SUB+= EMBEDDED_PERL="" @@ -156,7 +156,6 @@ post-install: .endif @${CHMOD} 775 ${ICINGADIR} ${ICINGALOGDIR}/archives \ ${ICINGADIR}/checkresults ${ICINGADIR}/rw - @${CHMOD} g+s ${ICINGADIR}/rw @${CHOWN} ${ICINGAUSER}:${ICINGAGROUP} ${ICINGADIR} \ ${ICINGALOGDIR}/archives ${ICINGADIR}/checkresults @${CHOWN} ${ICINGAUSER}:${WWWGRP} ${ICINGADIR}/rw Modified: head/net-mgmt/icinga/pkg-plist ============================================================================== --- head/net-mgmt/icinga/pkg-plist Tue Aug 6 19:08:57 2013 (r324324) +++ head/net-mgmt/icinga/pkg-plist Tue Aug 6 22:36:56 2013 (r324325) @@ -1,3 +1,10 @@ +@exec mkdir -p %D/%%ICINGAWWWDIR%%/ssi +@exec mkdir -p %%ICINGALOGDIR%%/archives +@exec mkdir -p %%ICINGADIR%%/checkresults +@exec mkdir -p %%ICINGADIR%%/rw +@exec chmod 775 %%ICINGADIR%% %%ICINGALOGDIR%%/archives %%ICINGADIR%%/checkresults %%ICINGADIR%%/rw +@exec chown %%ICINGAUSER%%:%%ICINGAGROUP%% %%ICINGADIR%% %%ICINGALOGDIR%%/archives %%ICINGADIR%%/checkresults +@exec chown %%ICINGAUSER%%:%%WWWGRP%% %%ICINGADIR%%/rw bin/icinga bin/icingastats %%IDOUTILS%%bin/ido2db @@ -877,3 +884,11 @@ libexec/icinga/eventhandlers/submit_chec @dirrm etc/icinga/modules @dirrm etc/icinga/conf.d @dirrm etc/icinga +@dirrmtry %%ICINGALOGDIR%%/archives +@dirrmtry %%ICINGALOGDIR%% +@dirrmtry %%ICINGADIR%%/checkresults +@dirrmtry %%ICINGADIR%%/rw +@dirrmtry %%ICINGADIR%% +@unexec if [ -d %%ICINGADIR%% ]; then echo "==> If you are permanently removing this port, you should do a ``rm -rf %%ICINGADIR%%`` to remove any files left behind."; fi +@unexec if [ -d %%ICINGALOGDIR%% ]; then echo "==> If you are permanently removing this port, you should do a ``rm -rf %%ICINGADIR%%`` 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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201308062236.r76Mauhw091542>