diff options
Diffstat (limited to 'net-mgmt')
| -rw-r--r-- | net-mgmt/nagios/Makefile | 3 | ||||
| -rw-r--r-- | net-mgmt/nagios/files/patch-configure.in | 53 | ||||
| -rw-r--r-- | net-mgmt/nagios/pkg-plist | 32 |
3 files changed, 6 insertions, 82 deletions
diff --git a/net-mgmt/nagios/Makefile b/net-mgmt/nagios/Makefile index f790e02de3c1..4eb22e995993 100644 --- a/net-mgmt/nagios/Makefile +++ b/net-mgmt/nagios/Makefile @@ -19,7 +19,6 @@ PORTSCOUT= limit:^3. USES= iconv perl5 uidfix USE_PERL5= build -USE_AUTOTOOLS= autoconf USE_PHP= yes USE_RC_SUBR= nagios @@ -34,7 +33,6 @@ CONFIGURE_ARGS= --with-command-user=${NAGIOSUSER} \ --with-cgiurl=${NAGIOSCGIURL} \ --sbindir=${PREFIX}/${NAGIOSWWWDIR}/cgi-bin \ --libexecdir=${PREFIX}/libexec/nagios \ - --datarootdir=${PREFIX}/${NAGIOSWWWDIR} \ --datadir=${PREFIX}/${NAGIOSWWWDIR} \ --sysconfdir=${PREFIX}/etc/nagios \ --localstatedir=${NAGIOSDIR} \ @@ -101,6 +99,7 @@ post-extract: .include <bsd.port.options.mk> post-patch: + @${REINPLACE_CMD} '/^INSTALL_OPTS=/d' ${WRKSRC}/configure .if ${PORT_OPTIONS:MUNHANDLED_HACK} @${REINPLACE_CMD} -e 's#;serviceprops=42\&#;serviceprops=10\&#g' \ -e 's#;hostprops=42\"#;hostprops=10\"#g' ${WRKSRC}/html/side.php diff --git a/net-mgmt/nagios/files/patch-configure.in b/net-mgmt/nagios/files/patch-configure.in deleted file mode 100644 index a9f0d7fc6a32..000000000000 --- a/net-mgmt/nagios/files/patch-configure.in +++ /dev/null @@ -1,53 +0,0 @@ ---- ./configure.in.orig 2013-08-30 19:46:14.000000000 +0200 -+++ ./configure.in 2014-01-14 13:57:06.000000000 +0100 -@@ -6,7 +6,6 @@ - - AC_INIT(base/nagios.c) - AC_CONFIG_HEADER(include/config.h include/snprintf.h) --AC_PREFIX_DEFAULT(/usr/local/nagios) - - PKG_NAME=nagios - PKG_VERSION="3.5.1" -@@ -125,7 +124,15 @@ - dnl Test for pthreads support - taken from ICU FreeBSD Port configure script - THREADLIBS="" - have_pthreads="no" -+have_thr="no" - -+dnl Prefer libthr(3) over libpthread(3) due to serious process hanging issues -+AC_CHECK_LIB(thr,pthread_create) -+if test $ac_cv_lib_thr_pthread_create = yes; then -+ THREADLIBS="-lthr" -+ have_pthreads="yes" -+ have_thr="yes" -+else - dnl FreeBSD: Try ports/linuxthreads first - Mammad Zadeh <mammad@yahoo-inc.com> - dnl FreeBSD -pthread check - Jonathan McDowell <noodles@earth.li> - AC_DEFUN([AC_PTHREAD_FREEBSD],[ -@@ -186,6 +193,7 @@ - if test $have_pthreads = "no"; then - AC_PTHREAD_FREEBSD - fi -+fi - - AC_SUBST(THREADLIBS) - -@@ -201,7 +209,7 @@ - AC_SUBST(nagios_grp) - AC_DEFINE_UNQUOTED(DEFAULT_NAGIOS_USER,"$nagios_user",[user name to run nagios]) - AC_DEFINE_UNQUOTED(DEFAULT_NAGIOS_GROUP,"$nagios_grp",[group name to run nagios]) --INSTALL_OPTS="-o $nagios_user -g $nagios_grp" -+INSTALL_OPTS="-o root -g wheel" - AC_SUBST(INSTALL_OPTS) - - AC_ARG_WITH(command_user,AC_HELP_STRING([--with-command-user=<user>],[sets user name for command access]),command_user=$withval,command_user=$nagios_user) -@@ -668,6 +676,9 @@ - - AC_DEFINE_UNQUOTED(EMBEDDEDPERL,,[Is embedded Perl being compiled in?]) - PERLLIBS="`perl -MExtUtils::Embed -e ldopts`" -+ if test x$have_thr = xyes; then -+ PERLLIBS="`echo $PERLLIBS | sed 's#pthread #lthr #'`" -+ fi - PERLDIR="`perl -MConfig -e 'print $Config{installsitearch}'`" - CFLAGS="${CFLAGS} `perl -MExtUtils::Embed -e ccopts`" - USEPERL=yes diff --git a/net-mgmt/nagios/pkg-plist b/net-mgmt/nagios/pkg-plist index 586d1e41bfd8..03d87a25ac36 100644 --- a/net-mgmt/nagios/pkg-plist +++ b/net-mgmt/nagios/pkg-plist @@ -1,10 +1,3 @@ -@exec mkdir -p %D/%%NAGIOSWWWDIR%%/ssi -@exec mkdir -p %%NAGIOSDIR%%/archives -@exec mkdir -p %%NAGIOSDIR%%/checkresults -@exec mkdir -p %%NAGIOSDIR%%/rw -@exec chmod 775 %%NAGIOSDIR%% %%NAGIOSDIR%%/archives %%NAGIOSDIR%%/checkresults %%NAGIOSDIR%%/rw -@exec chown %%NAGIOSUSER%%:%%NAGIOSGROUP%% %%NAGIOSDIR%% %%NAGIOSDIR%%/archives %%NAGIOSDIR%%/checkresults -@exec chown %%NAGIOSUSER%%:%%WWWGRP%% %%NAGIOSDIR%%/rw bin/nagios bin/nagiostats %%EMBEDDED_PERL%%bin/p1.pl @@ -380,25 +373,10 @@ etc/nagios/resource.cfg-sample %%NAGIOSWWWDIR%%/stylesheets/summary.css %%NAGIOSWWWDIR%%/stylesheets/tac.css %%NAGIOSWWWDIR%%/stylesheets/trends.css -@dirrmtry etc/nagios/objects -@dirrmtry etc/nagios -@dirrm %%NAGIOSWWWDIR%%/cgi-bin -@dirrm %%NAGIOSWWWDIR%%/contexthelp -@dirrm %%NAGIOSWWWDIR%%/docs/images -@dirrm %%NAGIOSWWWDIR%%/docs -@dirrm %%NAGIOSWWWDIR%%/images/logos -@dirrm %%NAGIOSWWWDIR%%/images -@dirrm %%NAGIOSWWWDIR%%/includes/rss/extlib -@dirrm %%NAGIOSWWWDIR%%/includes/rss -@dirrm %%NAGIOSWWWDIR%%/includes -@dirrm %%NAGIOSWWWDIR%%/js -@dirrm %%NAGIOSWWWDIR%%/media -@dirrm %%NAGIOSWWWDIR%%/ssi -@dirrm %%NAGIOSWWWDIR%%/stylesheets -@dirrmtry %%NAGIOSWWWDIR%% -@dirrmtry %%NAGIOSDIR%%/archives -@dirrmtry %%NAGIOSDIR%%/checkresults -@dirrmtry %%NAGIOSDIR%%/rw -@dirrmtry %%NAGIOSDIR%% +@dir %%NAGIOSWWWDIR%%/ssi +@dir(%%NAGIOSUSER%%,%%NAGIOSGROUP%%,775) %%NAGIOSDIR%%/archives +@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 |