sync/ports
1
0
Fork 0
mirror of https://git.freebsd.org/ports.git synced 2025-07-18 17:59:20 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

- Update to 2.0b2

Browse source 
WARNING: This version removes MySQL and PostgreSQL support.

PR:		ports/77478
Submitted by:	Blaz Zupan <blaz@si.FreeBSD.org> (maintainer)
This commit is contained in:
Pav Lucistnik 2005-02-14 21:52:42 +00:00
parent 2a2d67cbb9
commit d051adb622
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=128860
60 changed files with 486 additions and 888 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

43
net-mgmt/nagios/Makefile
View file

@ -6,11 +6,11 @@
#
PORTNAME= nagios
PORTVERSION= 1.2
PORTREVISION= 1
PORTVERSION= 2.0.b2
CATEGORIES= net-mgmt
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR=nagios
DISTNAME= nagios-2.0b2
MAINTAINER= blaz@si.FreeBSD.org
COMMENT= Extremely powerful network monitoring system
@ -20,6 +20,7 @@ RUN_DEPENDS= ${LOCALBASE}/libexec/nagios/check_nagios:${PORTSDIR}/net-mgmt/nagio
USE_GETOPT_LONG=yes
GNU_CONFIGURE= yes
USE_AUTOCONF_VER= 259
USE_RC_SUBR= yes
USE_PERL5_BUILD=yes
@ -31,22 +32,17 @@ NAGIOSUSER?= nagios
NAGIOSGROUP?= nagios
NAGIOSDIR?= /var/spool/nagios
OPTIONS= MYSQL "MySQL suport" off \
PGSQL "PostgreSQL suport" off \
FILE_PERFDATA "Save performance data to files" off
.include <bsd.port.pre.mk>
CPPFLAGS= -I${LOCALBASE}/include
CPPFLAGS= -I${LOCALBASE}/include -fPIC
CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" \
LDFLAGS="${LDFLAGS}" \
CFLAGS="${CPPFLAGS} ${CFLAGS}" \
LIBS="-L${LOCALBASE}/lib -lgd"
CONFIGURE_ARGS= --with-command-user=${NAGIOSUSER} \
--with-command-grp=www \
--with-command-group=www \
--with-nagios-user=${NAGIOSUSER} \
--with-nagios-grp=${NAGIOSGROUP} \
--with-template-objects \
--with-nagios-group=${NAGIOSGROUP} \
--sbindir=${PREFIX}/share/nagios/cgi-bin \
--libexecdir=${PREFIX}/libexec/nagios \
--datadir=${PREFIX}/share/nagios \
@ -54,26 +50,6 @@ CONFIGURE_ARGS= --with-command-user=${NAGIOSUSER} \
--localstatedir=${NAGIOSDIR} \
--prefix=${PREFIX}
.if defined(WITH_MYSQL)
USE_MYSQL= yes
CONFIGURE_ARGS+= --with-mysql-lib=${LOCALBASE}/lib/mysql \
--with-mysql-inc=${LOCALBASE}/include/mysql \
--with-mysql-xdata
.else
CONFIGURE_ARGS+= --with-template-extinfo
.endif
.if defined(WITH_FILE_PERFDATA)
CONFIGURE_ARGS+=--with-file-perfdata
.endif
.if defined(WITH_PGSQL)
USE_PGSQL= yes
CONFIGURE_ARGS+=--with-pgsql-lib=${LOCALBASE}/pgsql \
--with-pgsql-inc=${LOCALBASE}/pgsql \
--with-pgsql-xdata
.endif
SED_SCRIPT= -e 's,%%NAGIOSUSER%%,${NAGIOSUSER},g' \
-e 's,%%NAGIOSGROUP%%,${NAGIOSGROUP},g' \
-e 's,%%NAGIOSDIR%%,${NAGIOSDIR},g' \
@ -83,8 +59,8 @@ SED_SCRIPT= -e 's,%%NAGIOSUSER%%,${NAGIOSUSER},g' \
INSTALL_TARGET= all install config install-config install-commandmode
pre-build:
for file in nagios.sh INSTALL DEINSTALL MESSAGE; do \
${SED} ${SED_SCRIPT} < ${FILESDIR}/$${file}.tmpl >${WRKDIR}/$${file}; \
for myfile in nagios.sh INSTALL DEINSTALL MESSAGE; do \
${SED} ${SED_SCRIPT} < ${FILESDIR}/$${myfile}.tmpl >${WRKDIR}/$${myfile}; \
done
pre-install:
@ -92,6 +68,9 @@ pre-install:
post-install:
@${INSTALL_SCRIPT} ${WRKDIR}/nagios.sh ${PREFIX}/etc/rc.d/
@${CHMOD} 775 ${NAGIOSDIR} ${NAGIOSDIR}/archives ${NAGIOSDIR}/rw
@${CHOWN} ${NAGIOSUSER}:${NAGIOSGROUP} ${NAGIOSDIR} ${NAGIOSDIR}/archives
@${CHOWN} ${NAGIOSUSER}:www ${NAGIOSDIR}/rw
@${CAT} ${PKGMESSAGE}
.include <bsd.port.post.mk>

4
net-mgmt/nagios/distinfo
View file

@ -1,2 +1,2 @@
MD5 (nagios-1.2.tar.gz) = 414d70e5269d5b8d7c21bf3ee129309f
SIZE (nagios-1.2.tar.gz) = 1625322
MD5 (nagios-2.0b2.tar.gz) = 72d21f961b28519529e8c96c35051fbc
SIZE (nagios-2.0b2.tar.gz) = 1703671

4
net-mgmt/nagios/files/nagios.sh.tmpl
View file

@ -20,7 +20,7 @@ required_files=${prefix}/etc/nagios/nagios.cfg
NagiosBin=${prefix}/bin/nagios
NagiosCfg=${prefix}/etc/nagios/nagios.cfg
NagiosVar=/var/spool/nagios
NagiosVar=%%NAGIOSDIR%%
NagiosLog=${NagiosVar}/status.log
NagiosTmp=${NagiosVar}/nagios.tmp
NagiosSav=${NagiosVar}/status.sav
@ -30,7 +30,7 @@ NagiosRun=${NagiosVar}/nagios.lock
pidfile=${NagiosRun}
command=${NagiosBin}
command_args="-d $NagiosCfg"
nagios_user=nagios
nagios_user=%%NAGIOSUSER%%
start_precmd=start_precmd
stop_postcmd=stop_postcmd

25
net-mgmt/nagios/files/patch-Makefile.in Normal file
View file

@ -0,0 +1,25 @@
--- Makefile.in.orig Thu Dec 16 02:15:24 2004
+++ Makefile.in Sat Feb 12 13:52:19 2005
@@ -204,14 +204,14 @@
install-config:
- $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(CFGDIR)
- $(INSTALL) -m 664 $(INSTALL_OPTS) sample-config/nagios.cfg $(DESTDIR)$(CFGDIR)/nagios.cfg-sample
- $(INSTALL) -m 664 $(INSTALL_OPTS) sample-config/cgi.cfg $(DESTDIR)$(CFGDIR)/cgi.cfg-sample
- $(INSTALL) -m 660 $(INSTALL_OPTS) sample-config/resource.cfg $(DESTDIR)$(CFGDIR)/resource.cfg-sample
- $(INSTALL) -m 664 $(INSTALL_OPTS) sample-config/template-object/bigger.cfg $(DESTDIR)$(CFGDIR)/bigger.cfg-sample
- $(INSTALL) -m 664 $(INSTALL_OPTS) sample-config/template-object/minimal.cfg $(DESTDIR)$(CFGDIR)/minimal.cfg-sample
- $(INSTALL) -m 664 $(INSTALL_OPTS) sample-config/template-object/checkcommands.cfg $(DESTDIR)$(CFGDIR)/checkcommands.cfg-sample
- $(INSTALL) -m 664 $(INSTALL_OPTS) sample-config/template-object/misccommands.cfg $(DESTDIR)$(CFGDIR)/misccommands.cfg-sample
+ $(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(CFGDIR)
+ $(INSTALL) -m 644 $(INSTALL_OPTS) sample-config/nagios.cfg $(DESTDIR)$(CFGDIR)/nagios.cfg-sample
+ $(INSTALL) -m 644 $(INSTALL_OPTS) sample-config/cgi.cfg $(DESTDIR)$(CFGDIR)/cgi.cfg-sample
+ $(INSTALL) -m 644 $(INSTALL_OPTS) sample-config/resource.cfg $(DESTDIR)$(CFGDIR)/resource.cfg-sample
+ $(INSTALL) -m 644 $(INSTALL_OPTS) sample-config/template-object/bigger.cfg $(DESTDIR)$(CFGDIR)/bigger.cfg-sample
+ $(INSTALL) -m 644 $(INSTALL_OPTS) sample-config/template-object/minimal.cfg $(DESTDIR)$(CFGDIR)/minimal.cfg-sample
+ $(INSTALL) -m 644 $(INSTALL_OPTS) sample-config/template-object/checkcommands.cfg $(DESTDIR)$(CFGDIR)/checkcommands.cfg-sample
+ $(INSTALL) -m 644 $(INSTALL_OPTS) sample-config/template-object/misccommands.cfg $(DESTDIR)$(CFGDIR)/misccommands.cfg-sample
@echo ""
@echo "*** Sample config file installed ***"

37
net-mgmt/nagios/files/patch-aa
View file

@ -1,37 +0,0 @@
--- Makefile.in.orig Sat Oct 26 02:47:15 2002
+++ Makefile.in Tue Nov 26 13:58:29 2002
@@ -28,7 +28,7 @@
INSTALL_OPTS=@INSTALL_OPTS@
COMMAND_OPTS=@COMMAND_OPTS@
INIT_DIR=@init_dir@
-INIT_OPTS=-o root -g root
+INIT_OPTS=-o root -g wheel
CGICFGDIR=$(CGIDIR)
PERLDIR=@PERLDIR@
@@ -196,6 +196,8 @@
$(INSTALL) -m 664 $(INSTALL_OPTS) sample-config/template-object/misccommands.cfg $(DESTDIR)$(CFGDIR)/misccommands.cfg-sample
$(INSTALL) -m 664 $(INSTALL_OPTS) sample-config/template-object/services.cfg $(DESTDIR)$(CFGDIR)/services.cfg-sample
$(INSTALL) -m 664 $(INSTALL_OPTS) sample-config/template-object/timeperiods.cfg $(DESTDIR)$(CFGDIR)/timeperiods.cfg-sample
+ $(INSTALL) -m 664 $(INSTALL_OPTS) sample-config/template-extinfo/hostextinfo.cfg $(DESTDIR)$(CFGDIR)/hostextinfo.cfg-sample
+ $(INSTALL) -m 664 $(INSTALL_OPTS) sample-config/template-extinfo/serviceextinfo.cfg $(DESTDIR)$(CFGDIR)/serviceextinfo.cfg-sample
@echo ""
@echo "*** Sample config file installed ***"
@@ -215,7 +217,7 @@
install-daemoninit:
$(INSTALL) -m 755 -d $(INIT_OPTS) $(DESTDIR)$(INIT_DIR)
- $(INSTALL) -m 774 $(INIT_OPTS) daemon-init $(DESTDIR)$(INIT_DIR)/nagios
+ $(INSTALL) -m 774 $(INIT_OPTS) daemon-init $(DESTDIR)$(INIT_DIR)/nagios.sh
@echo ""
@echo "*** Init script installed ***"
@@ -238,7 +240,6 @@
install-commandmode:
$(INSTALL) -m 775 $(COMMAND_OPTS) -d $(DESTDIR)$(LOGDIR)/rw
- chmod g+s $(DESTDIR)$(LOGDIR)/rw
@echo ""
@echo "*** External command directory configured ***"

10
net-mgmt/nagios/files/patch-ab
View file

@ -1,10 +0,0 @@
--- base/Makefile.in.orig Mon Nov 11 04:52:13 2002
+++ base/Makefile.in Tue Nov 26 13:46:41 2002
@@ -105,7 +105,6 @@
devclean: clean
install:
- $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(BINDIR)
$(INSTALL) -m 774 $(INSTALL_OPTS) @nagios_name@ $(DESTDIR)$(BINDIR)
$(STRIP) $(DESTDIR)$(BINDIR)/@nagios_name@

69
net-mgmt/nagios/files/patch-ad
View file

@ -1,69 +0,0 @@
--- configure.orig Tue Feb 3 05:45:08 2004
+++ configure Wed Feb 4 21:26:46 2004
@@ -11,7 +11,7 @@
ac_help=
ac_default_prefix=/usr/local
# Any additions from configure.in:
-ac_default_prefix=/usr/local/nagios
+#ac_default_prefix=/usr/local/nagios
ac_help="$ac_help
--with-nagios-user=<user> sets user name to run nagios"
ac_help="$ac_help
@@ -576,9 +576,9 @@
# Prefer explicitly selected file to automatically selected ones.
if test -z "$CONFIG_SITE"; then
if test "x$prefix" != xNONE; then
- CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site"
+ CONFIG_SITE="$prefix/share/nagios/config.site $prefix/etc/nagios/config.site"
else
- CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site"
+ CONFIG_SITE="$ac_default_prefix/share/nagios/config.site $ac_default_prefix/etc/nagios/config.site"
fi
fi
for ac_site_file in $CONFIG_SITE; do
@@ -2608,6 +2608,9 @@
LDFLAGS="${LDFLAGS} -L${withval}"
LD_RUN_PATH="${withval}${LD_RUN_PATH:+:}${LD_RUN_PATH}"
+else
+ LDFLAGS="${LDFLAGS} -L/usr/local/lib"
+ LD_RUN_PATH="/usr/local/ib${LD_RUN_PATH:+:}${LD_RUN_PATH}"
fi
# Check whether --with-gd-inc or --without-gd-inc was given.
@@ -2615,6 +2618,8 @@
withval="$with_gd_inc"
CFLAGS="${CFLAGS} -I${withval}"
+else
+ CFLAGS="${CFLAGS} -I/usr/local/include/gd"
fi
@@ -2692,14 +2697,14 @@
- echo $ac_n "checking for gdImagePng in -lgd (order 1)""... $ac_c" 1>&6
-echo "configure:2697: checking for gdImagePng in -lgd (order 1)" >&5
+ echo $ac_n "checking for gdImagePng in -lgd1 (order 1)""... $ac_c" 1>&6
+echo "configure:2697: checking for gdImagePng in -lgd1 (order 1)" >&5
ac_lib_var=`echo gd'_'gdImagePng'_'1 | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
ac_save_LIBS="$LIBS"
- LIBS="-lgd $ICONV -lz -lm -lpng -ljpeg $LIBS"
+ LIBS="-lgd1 $ICONV -lz -lm -lpng -ljpeg $LIBS"
cat > conftest.$ac_ext <<EOF
#line 2705 "configure"
#include "confdefs.h"
@@ -2729,7 +2734,7 @@
echo "$ac_t""yes" 1>&6
GDLIBFOUND=yep
- GDLIBS="-lgd $ICONV -lz -lm -lpng -ljpeg"
+ GDLIBS="-lgd1 $ICONV -lz -lm -lpng -ljpeg"
else
echo "$ac_t""no" 1>&6

11
net-mgmt/nagios/files/patch-ae
View file

@ -1,11 +0,0 @@
--- configure.in.orig Mon Apr 30 17:22:35 2001
+++ configure.in Tue May 1 19:36:54 2001
@@ -1,7 +1,7 @@
dnl Process this -*-m4-*- file with autoconf to produce a configure script.
AC_INIT(base/nagios.c)
AC_CONFIG_HEADER(common/config.h common/snprintf.h base/nagios.h cgi/cgiutils.h)
-AC_PREFIX_DEFAULT(/usr/local/nagios)
+AC_PREFIX_DEFAULT(/usr/local)
dnl Figure out how to invoke "install" and what install options to use.
AC_PROG_INSTALL

31
net-mgmt/nagios/files/patch-ag
View file

@ -1,31 +0,0 @@
--- functions Fri Apr 7 11:11:34 2000
+++ functions.new Sat Jun 10 13:31:31 2000
@@ -11,7 +11,7 @@
#
# First set up a default search path.
-PATH=/opt/gnu/bin:/sbin:/usr/sbin:/bin:/usr/bin:/usr/X11R6/bin
+PATH=/sbin:/usr/sbin:/bin:/usr/bin:/usr/X11R6/bin:/usr/local/bin:/usr/local/sbin
export PATH
# Get a sane screen width
@@ -174,7 +174,7 @@
# fi
# Finally try to extract it from ps
- pid=`ps -eo pid,ppid,fname | egrep -v $$ | awk 'BEGIN { prog=ARGV[1]; ARGC=1 } { if ((prog == $3) || (("(" prog ")") == $3) || (("[" prog "]") == $3) || ((prog ":") == $3)) { print $1 ; exit 0 } }' $1`
+ pid=`ps -axco pid,ppid,command | egrep -v $$ | awk 'BEGIN { prog=ARGV[1]; ARGC=1 } { if ((prog == $3) || (("(" prog ")") == $3) || (("[" prog "]") == $3) || ((prog ":") == $3)) { print $1 ; exit 0 } }' $1`
if [ "$pid" != "" ] ; then
echo $pid
return 0
@@ -206,8 +206,8 @@
fi
fi
- # See if /var/lock/subsys/$1 exists
- if [ -f /var/lock/subsys/$1 ]; then
+ # See if /var/spool/lock/$1 exists
+ if [ -f /var/spool/lock/$1 ]; then
echo "$1 dead but subsys locked"
return 2
fi

25
net-mgmt/nagios/files/patch-ai
View file

@ -1,25 +0,0 @@
--- daemon-init.in.orig Thu Apr 18 06:27:13 2002
+++ daemon-init.in Sun May 19 08:39:29 2002
@@ -68,11 +68,8 @@
# Source function library
-# Solaris doesn't have an rc.d directory, so do a test first
-if [ -f /etc/rc.d/init.d/functions ]; then
- . /etc/rc.d/init.d/functions
-elif [ -f /etc/init.d/functions ]; then
- . /etc/init.d/functions
+if [ -f @sysconfdir@/functions ]; then
+. @sysconfdir@/functions
fi
prefix=@prefix@
@@ -102,7 +99,7 @@
start)
echo "Starting network monitor: nagios"
- su -l $Nagios -c "touch $NagiosVar/nagios.log $NagiosSav"
+ su -m $Nagios -c "touch $NagiosVar/nagios.log $NagiosSav"
rm -f $NagiosCmd
$NagiosBin -d $NagiosCfg
if [ -d $NagiosLckDir ]; then touch $NagiosLckDir/$NagiosLckFile; fi

16
net-mgmt/nagios/files/patch-base-Makefile.in Normal file
View file

@ -0,0 +1,16 @@
--- base/Makefile.in.orig Thu Dec 9 07:48:33 2004
+++ base/Makefile.in Sat Feb 12 13:59:24 2005
@@ -181,10 +181,10 @@
devclean: distclean
install:
- $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(BINDIR)
- $(INSTALL) -m 774 $(INSTALL_OPTS) @nagios_name@ $(DESTDIR)$(BINDIR)
+ $(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(BINDIR)
+ $(INSTALL) -m 755 $(INSTALL_OPTS) @nagios_name@ $(DESTDIR)$(BINDIR)
$(STRIP) $(DESTDIR)$(BINDIR)/@nagios_name@
- $(INSTALL) -m 774 $(INSTALL_OPTS) @nagiostats_name@ $(DESTDIR)$(BINDIR)
+ $(INSTALL) -m 755 $(INSTALL_OPTS) @nagiostats_name@ $(DESTDIR)$(BINDIR)
$(STRIP) $(DESTDIR)$(BINDIR)/@nagiostats_name@

14
net-mgmt/nagios/files/patch-cgi-Makefile.in Normal file
View file

@ -0,0 +1,14 @@
--- cgi/Makefile.in.orig Mon Oct 25 07:05:54 2004
+++ cgi/Makefile.in Sat Feb 12 13:56:57 2005
@@ -191,9 +191,9 @@
devclean: distclean
install:
- $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(CGIDIR)
+ $(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(CGIDIR)
for file in *.cgi; do \
- $(INSTALL) -m 775 $(INSTALL_OPTS) $$file $(DESTDIR)$(CGIDIR); \
+ $(INSTALL) -m 755 $(INSTALL_OPTS) $$file $(DESTDIR)$(CGIDIR); \
$(STRIP) $(DESTDIR)$(CGIDIR)/$$file; \
done

19
net-mgmt/nagios/files/patch-configure.in Normal file
View file

@ -0,0 +1,19 @@
--- configure.in.orig Thu Feb 10 02:00:10 2005
+++ configure.in Sat Feb 12 14:11:54 2005
@@ -6,7 +6,6 @@
AC_INIT(base/nagios.c)
AC_CONFIG_HEADER(include/config.h include/snprintf.h include/nagios.h include/cgiutils.h)
-AC_PREFIX_DEFAULT(/usr/local/nagios)
PKG_NAME=nagios
PKG_VERSION="2.0b2"
@@ -137,7 +136,7 @@
AC_SUBST(nagios_grp)
AC_DEFINE_UNQUOTED(DEFAULT_NAGIOS_USER,"$nagios_user")
AC_DEFINE_UNQUOTED(DEFAULT_NAGIOS_GROUP,"$nagios_grp")
-INSTALL_OPTS="-o $nagios_user -g $nagios_grp"
+INSTALL_OPTS="-o root -g wheel"
AC_SUBST(INSTALL_OPTS)
AC_ARG_WITH(command_user,--with-command-user=<user> sets user name for command access,command_user=$withval,command_user=$nagios_user)

61
net-mgmt/nagios/files/patch-html-Makefile.in Normal file
View file

@ -0,0 +1,61 @@
--- html/Makefile.in.orig Thu Apr 10 05:46:02 2003
+++ html/Makefile.in Sat Feb 12 13:53:16 2005
@@ -33,37 +33,37 @@
devclean: distclean
install:
- $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)
- $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/media
- $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/stylesheets
- $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/contexthelp
- $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/docs
- $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/docs/images
- $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/images
- $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/images/logos
- $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/ssi
- $(INSTALL) -m 664 $(INSTALL_OPTS) robots.txt $(DESTDIR)$(HTMLDIR)
- $(INSTALL) -m 664 $(INSTALL_OPTS) docs/robots.txt $(DESTDIR)$(HTMLDIR)/docs
+ $(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)
+ $(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/media
+ $(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/stylesheets
+ $(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/contexthelp
+ $(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/docs
+ $(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/docs/images
+ $(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/images
+ $(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/images/logos
+ $(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/ssi
+ $(INSTALL) -m 644 $(INSTALL_OPTS) robots.txt $(DESTDIR)$(HTMLDIR)
+ $(INSTALL) -m 644 $(INSTALL_OPTS) docs/robots.txt $(DESTDIR)$(HTMLDIR)/docs
for file in *.html; \
- do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR); done
+ do $(INSTALL) -m 644 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR); done
for file in media/*.wav; \
- do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/media; done
+ do $(INSTALL) -m 644 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/media; done
for file in stylesheets/*.css; \
- do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/stylesheets; done
+ do $(INSTALL) -m 644 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/stylesheets; done
for file in contexthelp/*.html; \
- do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/contexthelp; done
+ do $(INSTALL) -m 644 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/contexthelp; done
for file in docs/*.html; \
- do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/docs; done
+ do $(INSTALL) -m 644 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/docs; done
for file in docs/images/*.*; \
- do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/docs/images; done
+ do $(INSTALL) -m 644 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/docs/images; done
for file in images/*.gif; \
- do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/images; done
+ do $(INSTALL) -m 644 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/images; done
for file in images/*.jpg; \
- do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/images; done
+ do $(INSTALL) -m 644 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/images; done
for file in images/*.png; \
- do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/images; done
+ do $(INSTALL) -m 644 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/images; done
for file in images/logos/*.*; \
- do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/images/logos; done
+ do $(INSTALL) -m 644 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/images/logos; done

11
net-mgmt/nagios/files/patch-xcddb.c
View file

@ -1,11 +0,0 @@
--- xdata/xcddb.c.orig Thu May 16 04:46:11 2002
+++ xdata/xcddb.c Thu Mar 6 23:14:25 2003
@@ -51,7 +51,7 @@
#endif
#ifdef USE_XCDPGSQL
-#include <pgsql/libpq-fe.h>
+#include <libpq-fe.h>
#endif

11
net-mgmt/nagios/files/patch-xdddb.c
View file

@ -1,11 +0,0 @@
--- xdata/xdddb.c.orig Thu May 16 04:46:11 2002
+++ xdata/xdddb.c Thu Mar 6 23:15:54 2003
@@ -51,7 +51,7 @@
#endif
#ifdef USE_XDDPGSQL
-#include <pgsql/libpq-fe.h>
+#include <libpq-fe.h>
#endif

11
net-mgmt/nagios/files/patch-xeddb.c
View file

@ -1,11 +0,0 @@
--- xdata/xeddb.c.orig Tue Feb 26 05:04:09 2002
+++ xdata/xeddb.c Thu Mar 6 23:16:01 2003
@@ -44,7 +44,7 @@
#endif
#ifdef USE_XEDPGSQL
-#include <pgsql/libpq-fe.h>
+#include <libpq-fe.h>
#endif

11
net-mgmt/nagios/files/patch-xrddb.c
View file

@ -1,11 +0,0 @@
--- xdata/xrddb.c.orig Thu May 16 04:46:11 2002
+++ xdata/xrddb.c Thu Mar 6 23:16:14 2003
@@ -43,7 +43,7 @@
#endif
#ifdef USE_XRDPGSQL
-#include <pgsql/libpq-fe.h>
+#include <libpq-fe.h>
#endif

11
net-mgmt/nagios/files/patch-xsddb.c
View file

@ -1,11 +0,0 @@
--- xdata/xsddb.c.orig Thu Nov 14 03:51:34 2002
+++ xdata/xsddb.c Thu Mar 6 23:16:27 2003
@@ -48,7 +48,7 @@
#endif
#ifdef USE_XSDPGSQL
-#include <pgsql/libpq-fe.h>
+#include <libpq-fe.h>
#endif

34
net-mgmt/nagios/pkg-plist
View file

@ -3,23 +3,16 @@
@exec mkdir -p /var/spool/nagios/rw
@exec chmod 775 /var/spool/nagios /var/spool/nagios/archives /var/spool/nagios/rw
@exec chown nagios:nagios /var/spool/nagios /var/spool/nagios/archives
@exec chown nagios:nogroup /var/spool/nagios/rw
@exec chown nagios:www /var/spool/nagios/rw
bin/nagios
bin/nagiostats
etc/nagios/bigger.cfg-sample
etc/nagios/cgi.cfg-sample
etc/nagios/checkcommands.cfg-sample
etc/nagios/contactgroups.cfg-sample
etc/nagios/contacts.cfg-sample
etc/nagios/dependencies.cfg-sample
etc/nagios/escalations.cfg-sample
etc/nagios/hostextinfo.cfg-sample
etc/nagios/hostgroups.cfg-sample
etc/nagios/hosts.cfg-sample
etc/nagios/minimal.cfg-sample
etc/nagios/misccommands.cfg-sample
etc/nagios/nagios.cfg-sample
etc/nagios/resource.cfg-sample
etc/nagios/serviceextinfo.cfg-sample
etc/nagios/services.cfg-sample
etc/nagios/timeperiods.cfg-sample
etc/rc.d/nagios.sh
share/nagios/cgi-bin/avail.cgi
share/nagios/cgi-bin/cmd.cgi
@ -71,6 +64,7 @@ share/nagios/contexthelp/I5.html
share/nagios/contexthelp/I6.html
share/nagios/contexthelp/I7.html
share/nagios/contexthelp/I8.html
share/nagios/contexthelp/I9.html
share/nagios/contexthelp/J1.html
share/nagios/contexthelp/K1.html
share/nagios/contexthelp/L1.html
@ -133,6 +127,7 @@ share/nagios/docs/images/interleaved1.png
share/nagios/docs/images/interleaved2.png
share/nagios/docs/images/interleaved3.png
share/nagios/docs/images/logofullsize.png
share/nagios/docs/images/mrtgstats.png
share/nagios/docs/images/network-heirarchy.png
share/nagios/docs/images/network-outage1.png
share/nagios/docs/images/network-outage2.png
@ -147,6 +142,7 @@ share/nagios/docs/images/statetransitions.png
share/nagios/docs/images/statetransitions2.png
share/nagios/docs/about.html
share/nagios/docs/addons.html
share/nagios/docs/adaptive.html
share/nagios/docs/beginners.html
share/nagios/docs/cgiauth.html
share/nagios/docs/cgiincludes.html
@ -166,7 +162,6 @@ share/nagios/docs/embeddedperl.html
share/nagios/docs/escalations.html
share/nagios/docs/eventhandlers.html
share/nagios/docs/extcommands.html
share/nagios/docs/faqs.html
share/nagios/docs/flapping.html
share/nagios/docs/freshness.html
share/nagios/docs/funstuff.html
@ -174,10 +169,10 @@ share/nagios/docs/index.html
share/nagios/docs/indirectchecks.html
share/nagios/docs/installing.html
share/nagios/docs/installweb.html
share/nagios/docs/int-portsentry.html
share/nagios/docs/int-snmptrap.html
share/nagios/docs/int-tcpwrappers.html
share/nagios/docs/macros.html
share/nagios/docs/nagiostats.html
share/nagios/docs/networkoutages.html
share/nagios/docs/networkreachability.html
share/nagios/docs/notifications.html
@ -201,14 +196,11 @@ share/nagios/docs/tuning.html
share/nagios/docs/verifyconfig.html
share/nagios/docs/volatileservices.html
share/nagios/docs/whatsnew.html
share/nagios/docs/xdata-db.html
share/nagios/docs/xeddefault.html
share/nagios/docs/xedtemplate.html
share/nagios/docs/xoddefault.html
share/nagios/docs/xodtemplate.html
share/nagios/docs/xpddefault.html
share/nagios/docs/xpdfile.html
share/nagios/images/ack.gif
share/nagios/images/action.gif
share/nagios/images/command.png
share/nagios/images/comment.gif
share/nagios/images/contexthelp1.gif
@ -216,6 +208,7 @@ share/nagios/images/contexthelp2.gif
share/nagios/images/critical.png
share/nagios/images/delay.gif
share/nagios/images/delete.gif
share/nagios/images/detail.gif
share/nagios/images/disabled.gif
share/nagios/images/down.gif
share/nagios/images/downtime.gif
@ -247,11 +240,7 @@ share/nagios/images/redudancy.png
share/nagios/images/redundancy.png
share/nagios/images/restart.gif
share/nagios/images/right.gif
share/nagios/images/sbconfig.png
share/nagios/images/sbgeneral.png
share/nagios/images/sblogo.jpg
share/nagios/images/sbmonitor.png
share/nagios/images/sbreport.png
share/nagios/images/serviceevent.gif
share/nagios/images/start.gif
share/nagios/images/status.gif
@ -285,6 +274,7 @@ share/nagios/side.html
share/nagios/stylesheets/avail.css
share/nagios/stylesheets/checksanity.css
share/nagios/stylesheets/cmd.css
share/nagios/stylesheets/common.css
share/nagios/stylesheets/config.css
share/nagios/stylesheets/extinfo.css
share/nagios/stylesheets/histogram.css
@ -308,7 +298,7 @@ share/nagios/stylesheets/trends.css
@dirrm share/nagios/media
@dirrm share/nagios/ssi
@dirrm share/nagios/stylesheets
@dirrm share/nagios
@unexec rmdir %D/share/nagios 2>/dev/null || true
@unexec rmdir /var/spool/nagios/archives 2>/dev/null || true
@unexec rmdir /var/spool/nagios/rw 2>/dev/null || true
@unexec rmdir /var/spool/nagios 2>/dev/null || true

43
net-mgmt/nagios12/Makefile
View file

@ -6,11 +6,11 @@
#
PORTNAME= nagios
PORTVERSION= 1.2
PORTREVISION= 1
PORTVERSION= 2.0.b2
CATEGORIES= net-mgmt
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR=nagios
DISTNAME= nagios-2.0b2
MAINTAINER= blaz@si.FreeBSD.org
COMMENT= Extremely powerful network monitoring system
@ -20,6 +20,7 @@ RUN_DEPENDS= ${LOCALBASE}/libexec/nagios/check_nagios:${PORTSDIR}/net-mgmt/nagio
USE_GETOPT_LONG=yes
GNU_CONFIGURE= yes
USE_AUTOCONF_VER= 259
USE_RC_SUBR= yes
USE_PERL5_BUILD=yes
@ -31,22 +32,17 @@ NAGIOSUSER?= nagios
NAGIOSGROUP?= nagios
NAGIOSDIR?= /var/spool/nagios
OPTIONS= MYSQL "MySQL suport" off \
PGSQL "PostgreSQL suport" off \
FILE_PERFDATA "Save performance data to files" off
.include <bsd.port.pre.mk>
CPPFLAGS= -I${LOCALBASE}/include
CPPFLAGS= -I${LOCALBASE}/include -fPIC
CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" \
LDFLAGS="${LDFLAGS}" \
CFLAGS="${CPPFLAGS} ${CFLAGS}" \
LIBS="-L${LOCALBASE}/lib -lgd"
CONFIGURE_ARGS= --with-command-user=${NAGIOSUSER} \
--with-command-grp=www \
--with-command-group=www \
--with-nagios-user=${NAGIOSUSER} \
--with-nagios-grp=${NAGIOSGROUP} \
--with-template-objects \
--with-nagios-group=${NAGIOSGROUP} \
--sbindir=${PREFIX}/share/nagios/cgi-bin \
--libexecdir=${PREFIX}/libexec/nagios \
--datadir=${PREFIX}/share/nagios \
@ -54,26 +50,6 @@ CONFIGURE_ARGS= --with-command-user=${NAGIOSUSER} \
--localstatedir=${NAGIOSDIR} \
--prefix=${PREFIX}
.if defined(WITH_MYSQL)
USE_MYSQL= yes
CONFIGURE_ARGS+= --with-mysql-lib=${LOCALBASE}/lib/mysql \
--with-mysql-inc=${LOCALBASE}/include/mysql \
--with-mysql-xdata
.else
CONFIGURE_ARGS+= --with-template-extinfo
.endif
.if defined(WITH_FILE_PERFDATA)
CONFIGURE_ARGS+=--with-file-perfdata
.endif
.if defined(WITH_PGSQL)
USE_PGSQL= yes
CONFIGURE_ARGS+=--with-pgsql-lib=${LOCALBASE}/pgsql \
--with-pgsql-inc=${LOCALBASE}/pgsql \
--with-pgsql-xdata
.endif
SED_SCRIPT= -e 's,%%NAGIOSUSER%%,${NAGIOSUSER},g' \
-e 's,%%NAGIOSGROUP%%,${NAGIOSGROUP},g' \
-e 's,%%NAGIOSDIR%%,${NAGIOSDIR},g' \
@ -83,8 +59,8 @@ SED_SCRIPT= -e 's,%%NAGIOSUSER%%,${NAGIOSUSER},g' \
INSTALL_TARGET= all install config install-config install-commandmode
pre-build:
for file in nagios.sh INSTALL DEINSTALL MESSAGE; do \
${SED} ${SED_SCRIPT} < ${FILESDIR}/$${file}.tmpl >${WRKDIR}/$${file}; \
for myfile in nagios.sh INSTALL DEINSTALL MESSAGE; do \
${SED} ${SED_SCRIPT} < ${FILESDIR}/$${myfile}.tmpl >${WRKDIR}/$${myfile}; \
done
pre-install:
@ -92,6 +68,9 @@ pre-install:
post-install:
@${INSTALL_SCRIPT} ${WRKDIR}/nagios.sh ${PREFIX}/etc/rc.d/
@${CHMOD} 775 ${NAGIOSDIR} ${NAGIOSDIR}/archives ${NAGIOSDIR}/rw
@${CHOWN} ${NAGIOSUSER}:${NAGIOSGROUP} ${NAGIOSDIR} ${NAGIOSDIR}/archives
@${CHOWN} ${NAGIOSUSER}:www ${NAGIOSDIR}/rw
@${CAT} ${PKGMESSAGE}
.include <bsd.port.post.mk>

4
net-mgmt/nagios12/distinfo
View file

@ -1,2 +1,2 @@
MD5 (nagios-1.2.tar.gz) = 414d70e5269d5b8d7c21bf3ee129309f
SIZE (nagios-1.2.tar.gz) = 1625322
MD5 (nagios-2.0b2.tar.gz) = 72d21f961b28519529e8c96c35051fbc
SIZE (nagios-2.0b2.tar.gz) = 1703671

4
net-mgmt/nagios12/files/nagios.sh.tmpl
View file

@ -20,7 +20,7 @@ required_files=${prefix}/etc/nagios/nagios.cfg
NagiosBin=${prefix}/bin/nagios
NagiosCfg=${prefix}/etc/nagios/nagios.cfg
NagiosVar=/var/spool/nagios
NagiosVar=%%NAGIOSDIR%%
NagiosLog=${NagiosVar}/status.log
NagiosTmp=${NagiosVar}/nagios.tmp
NagiosSav=${NagiosVar}/status.sav
@ -30,7 +30,7 @@ NagiosRun=${NagiosVar}/nagios.lock
pidfile=${NagiosRun}
command=${NagiosBin}
command_args="-d $NagiosCfg"
nagios_user=nagios
nagios_user=%%NAGIOSUSER%%
start_precmd=start_precmd
stop_postcmd=stop_postcmd

25
net-mgmt/nagios12/files/patch-Makefile.in Normal file
View file

@ -0,0 +1,25 @@
--- Makefile.in.orig Thu Dec 16 02:15:24 2004
+++ Makefile.in Sat Feb 12 13:52:19 2005
@@ -204,14 +204,14 @@
install-config:
- $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(CFGDIR)
- $(INSTALL) -m 664 $(INSTALL_OPTS) sample-config/nagios.cfg $(DESTDIR)$(CFGDIR)/nagios.cfg-sample
- $(INSTALL) -m 664 $(INSTALL_OPTS) sample-config/cgi.cfg $(DESTDIR)$(CFGDIR)/cgi.cfg-sample
- $(INSTALL) -m 660 $(INSTALL_OPTS) sample-config/resource.cfg $(DESTDIR)$(CFGDIR)/resource.cfg-sample
- $(INSTALL) -m 664 $(INSTALL_OPTS) sample-config/template-object/bigger.cfg $(DESTDIR)$(CFGDIR)/bigger.cfg-sample
- $(INSTALL) -m 664 $(INSTALL_OPTS) sample-config/template-object/minimal.cfg $(DESTDIR)$(CFGDIR)/minimal.cfg-sample
- $(INSTALL) -m 664 $(INSTALL_OPTS) sample-config/template-object/checkcommands.cfg $(DESTDIR)$(CFGDIR)/checkcommands.cfg-sample
- $(INSTALL) -m 664 $(INSTALL_OPTS) sample-config/template-object/misccommands.cfg $(DESTDIR)$(CFGDIR)/misccommands.cfg-sample
+ $(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(CFGDIR)
+ $(INSTALL) -m 644 $(INSTALL_OPTS) sample-config/nagios.cfg $(DESTDIR)$(CFGDIR)/nagios.cfg-sample
+ $(INSTALL) -m 644 $(INSTALL_OPTS) sample-config/cgi.cfg $(DESTDIR)$(CFGDIR)/cgi.cfg-sample
+ $(INSTALL) -m 644 $(INSTALL_OPTS) sample-config/resource.cfg $(DESTDIR)$(CFGDIR)/resource.cfg-sample
+ $(INSTALL) -m 644 $(INSTALL_OPTS) sample-config/template-object/bigger.cfg $(DESTDIR)$(CFGDIR)/bigger.cfg-sample
+ $(INSTALL) -m 644 $(INSTALL_OPTS) sample-config/template-object/minimal.cfg $(DESTDIR)$(CFGDIR)/minimal.cfg-sample
+ $(INSTALL) -m 644 $(INSTALL_OPTS) sample-config/template-object/checkcommands.cfg $(DESTDIR)$(CFGDIR)/checkcommands.cfg-sample
+ $(INSTALL) -m 644 $(INSTALL_OPTS) sample-config/template-object/misccommands.cfg $(DESTDIR)$(CFGDIR)/misccommands.cfg-sample
@echo ""
@echo "*** Sample config file installed ***"

37
net-mgmt/nagios12/files/patch-aa
View file

@ -1,37 +0,0 @@
--- Makefile.in.orig Sat Oct 26 02:47:15 2002
+++ Makefile.in Tue Nov 26 13:58:29 2002
@@ -28,7 +28,7 @@
INSTALL_OPTS=@INSTALL_OPTS@
COMMAND_OPTS=@COMMAND_OPTS@
INIT_DIR=@init_dir@
-INIT_OPTS=-o root -g root
+INIT_OPTS=-o root -g wheel
CGICFGDIR=$(CGIDIR)
PERLDIR=@PERLDIR@
@@ -196,6 +196,8 @@
$(INSTALL) -m 664 $(INSTALL_OPTS) sample-config/template-object/misccommands.cfg $(DESTDIR)$(CFGDIR)/misccommands.cfg-sample
$(INSTALL) -m 664 $(INSTALL_OPTS) sample-config/template-object/services.cfg $(DESTDIR)$(CFGDIR)/services.cfg-sample
$(INSTALL) -m 664 $(INSTALL_OPTS) sample-config/template-object/timeperiods.cfg $(DESTDIR)$(CFGDIR)/timeperiods.cfg-sample
+ $(INSTALL) -m 664 $(INSTALL_OPTS) sample-config/template-extinfo/hostextinfo.cfg $(DESTDIR)$(CFGDIR)/hostextinfo.cfg-sample
+ $(INSTALL) -m 664 $(INSTALL_OPTS) sample-config/template-extinfo/serviceextinfo.cfg $(DESTDIR)$(CFGDIR)/serviceextinfo.cfg-sample
@echo ""
@echo "*** Sample config file installed ***"
@@ -215,7 +217,7 @@
install-daemoninit:
$(INSTALL) -m 755 -d $(INIT_OPTS) $(DESTDIR)$(INIT_DIR)
- $(INSTALL) -m 774 $(INIT_OPTS) daemon-init $(DESTDIR)$(INIT_DIR)/nagios
+ $(INSTALL) -m 774 $(INIT_OPTS) daemon-init $(DESTDIR)$(INIT_DIR)/nagios.sh
@echo ""
@echo "*** Init script installed ***"
@@ -238,7 +240,6 @@
install-commandmode:
$(INSTALL) -m 775 $(COMMAND_OPTS) -d $(DESTDIR)$(LOGDIR)/rw
- chmod g+s $(DESTDIR)$(LOGDIR)/rw
@echo ""
@echo "*** External command directory configured ***"

10
net-mgmt/nagios12/files/patch-ab
View file

@ -1,10 +0,0 @@
--- base/Makefile.in.orig Mon Nov 11 04:52:13 2002
+++ base/Makefile.in Tue Nov 26 13:46:41 2002
@@ -105,7 +105,6 @@
devclean: clean
install:
- $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(BINDIR)
$(INSTALL) -m 774 $(INSTALL_OPTS) @nagios_name@ $(DESTDIR)$(BINDIR)
$(STRIP) $(DESTDIR)$(BINDIR)/@nagios_name@

69
net-mgmt/nagios12/files/patch-ad
View file

@ -1,69 +0,0 @@
--- configure.orig Tue Feb 3 05:45:08 2004
+++ configure Wed Feb 4 21:26:46 2004
@@ -11,7 +11,7 @@
ac_help=
ac_default_prefix=/usr/local
# Any additions from configure.in:
-ac_default_prefix=/usr/local/nagios
+#ac_default_prefix=/usr/local/nagios
ac_help="$ac_help
--with-nagios-user=<user> sets user name to run nagios"
ac_help="$ac_help
@@ -576,9 +576,9 @@
# Prefer explicitly selected file to automatically selected ones.
if test -z "$CONFIG_SITE"; then
if test "x$prefix" != xNONE; then
- CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site"
+ CONFIG_SITE="$prefix/share/nagios/config.site $prefix/etc/nagios/config.site"
else
- CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site"
+ CONFIG_SITE="$ac_default_prefix/share/nagios/config.site $ac_default_prefix/etc/nagios/config.site"
fi
fi
for ac_site_file in $CONFIG_SITE; do
@@ -2608,6 +2608,9 @@
LDFLAGS="${LDFLAGS} -L${withval}"
LD_RUN_PATH="${withval}${LD_RUN_PATH:+:}${LD_RUN_PATH}"
+else
+ LDFLAGS="${LDFLAGS} -L/usr/local/lib"
+ LD_RUN_PATH="/usr/local/ib${LD_RUN_PATH:+:}${LD_RUN_PATH}"
fi
# Check whether --with-gd-inc or --without-gd-inc was given.
@@ -2615,6 +2618,8 @@
withval="$with_gd_inc"
CFLAGS="${CFLAGS} -I${withval}"
+else
+ CFLAGS="${CFLAGS} -I/usr/local/include/gd"
fi
@@ -2692,14 +2697,14 @@
- echo $ac_n "checking for gdImagePng in -lgd (order 1)""... $ac_c" 1>&6
-echo "configure:2697: checking for gdImagePng in -lgd (order 1)" >&5
+ echo $ac_n "checking for gdImagePng in -lgd1 (order 1)""... $ac_c" 1>&6
+echo "configure:2697: checking for gdImagePng in -lgd1 (order 1)" >&5
ac_lib_var=`echo gd'_'gdImagePng'_'1 | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
ac_save_LIBS="$LIBS"
- LIBS="-lgd $ICONV -lz -lm -lpng -ljpeg $LIBS"
+ LIBS="-lgd1 $ICONV -lz -lm -lpng -ljpeg $LIBS"
cat > conftest.$ac_ext <<EOF
#line 2705 "configure"
#include "confdefs.h"
@@ -2729,7 +2734,7 @@
echo "$ac_t""yes" 1>&6
GDLIBFOUND=yep
- GDLIBS="-lgd $ICONV -lz -lm -lpng -ljpeg"
+ GDLIBS="-lgd1 $ICONV -lz -lm -lpng -ljpeg"
else
echo "$ac_t""no" 1>&6

11
net-mgmt/nagios12/files/patch-ae
View file

@ -1,11 +0,0 @@
--- configure.in.orig Mon Apr 30 17:22:35 2001
+++ configure.in Tue May 1 19:36:54 2001
@@ -1,7 +1,7 @@
dnl Process this -*-m4-*- file with autoconf to produce a configure script.
AC_INIT(base/nagios.c)
AC_CONFIG_HEADER(common/config.h common/snprintf.h base/nagios.h cgi/cgiutils.h)
-AC_PREFIX_DEFAULT(/usr/local/nagios)
+AC_PREFIX_DEFAULT(/usr/local)
dnl Figure out how to invoke "install" and what install options to use.
AC_PROG_INSTALL

31
net-mgmt/nagios12/files/patch-ag
View file

@ -1,31 +0,0 @@
--- functions Fri Apr 7 11:11:34 2000
+++ functions.new Sat Jun 10 13:31:31 2000
@@ -11,7 +11,7 @@
#
# First set up a default search path.
-PATH=/opt/gnu/bin:/sbin:/usr/sbin:/bin:/usr/bin:/usr/X11R6/bin
+PATH=/sbin:/usr/sbin:/bin:/usr/bin:/usr/X11R6/bin:/usr/local/bin:/usr/local/sbin
export PATH
# Get a sane screen width
@@ -174,7 +174,7 @@
# fi
# Finally try to extract it from ps
- pid=`ps -eo pid,ppid,fname | egrep -v $$ | awk 'BEGIN { prog=ARGV[1]; ARGC=1 } { if ((prog == $3) || (("(" prog ")") == $3) || (("[" prog "]") == $3) || ((prog ":") == $3)) { print $1 ; exit 0 } }' $1`
+ pid=`ps -axco pid,ppid,command | egrep -v $$ | awk 'BEGIN { prog=ARGV[1]; ARGC=1 } { if ((prog == $3) || (("(" prog ")") == $3) || (("[" prog "]") == $3) || ((prog ":") == $3)) { print $1 ; exit 0 } }' $1`
if [ "$pid" != "" ] ; then
echo $pid
return 0
@@ -206,8 +206,8 @@
fi
fi
- # See if /var/lock/subsys/$1 exists
- if [ -f /var/lock/subsys/$1 ]; then
+ # See if /var/spool/lock/$1 exists
+ if [ -f /var/spool/lock/$1 ]; then
echo "$1 dead but subsys locked"
return 2
fi

25
net-mgmt/nagios12/files/patch-ai
View file

@ -1,25 +0,0 @@
--- daemon-init.in.orig Thu Apr 18 06:27:13 2002
+++ daemon-init.in Sun May 19 08:39:29 2002
@@ -68,11 +68,8 @@
# Source function library
-# Solaris doesn't have an rc.d directory, so do a test first
-if [ -f /etc/rc.d/init.d/functions ]; then
- . /etc/rc.d/init.d/functions
-elif [ -f /etc/init.d/functions ]; then
- . /etc/init.d/functions
+if [ -f @sysconfdir@/functions ]; then
+. @sysconfdir@/functions
fi
prefix=@prefix@
@@ -102,7 +99,7 @@
start)
echo "Starting network monitor: nagios"
- su -l $Nagios -c "touch $NagiosVar/nagios.log $NagiosSav"
+ su -m $Nagios -c "touch $NagiosVar/nagios.log $NagiosSav"
rm -f $NagiosCmd
$NagiosBin -d $NagiosCfg
if [ -d $NagiosLckDir ]; then touch $NagiosLckDir/$NagiosLckFile; fi

16
net-mgmt/nagios12/files/patch-base-Makefile.in Normal file
View file

@ -0,0 +1,16 @@
--- base/Makefile.in.orig Thu Dec 9 07:48:33 2004
+++ base/Makefile.in Sat Feb 12 13:59:24 2005
@@ -181,10 +181,10 @@
devclean: distclean
install:
- $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(BINDIR)
- $(INSTALL) -m 774 $(INSTALL_OPTS) @nagios_name@ $(DESTDIR)$(BINDIR)
+ $(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(BINDIR)
+ $(INSTALL) -m 755 $(INSTALL_OPTS) @nagios_name@ $(DESTDIR)$(BINDIR)
$(STRIP) $(DESTDIR)$(BINDIR)/@nagios_name@
- $(INSTALL) -m 774 $(INSTALL_OPTS) @nagiostats_name@ $(DESTDIR)$(BINDIR)
+ $(INSTALL) -m 755 $(INSTALL_OPTS) @nagiostats_name@ $(DESTDIR)$(BINDIR)
$(STRIP) $(DESTDIR)$(BINDIR)/@nagiostats_name@

14
net-mgmt/nagios12/files/patch-cgi-Makefile.in Normal file
View file

@ -0,0 +1,14 @@
--- cgi/Makefile.in.orig Mon Oct 25 07:05:54 2004
+++ cgi/Makefile.in Sat Feb 12 13:56:57 2005
@@ -191,9 +191,9 @@
devclean: distclean
install:
- $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(CGIDIR)
+ $(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(CGIDIR)
for file in *.cgi; do \
- $(INSTALL) -m 775 $(INSTALL_OPTS) $$file $(DESTDIR)$(CGIDIR); \
+ $(INSTALL) -m 755 $(INSTALL_OPTS) $$file $(DESTDIR)$(CGIDIR); \
$(STRIP) $(DESTDIR)$(CGIDIR)/$$file; \
done

19
net-mgmt/nagios12/files/patch-configure.in Normal file
View file

@ -0,0 +1,19 @@
--- configure.in.orig Thu Feb 10 02:00:10 2005
+++ configure.in Sat Feb 12 14:11:54 2005
@@ -6,7 +6,6 @@
AC_INIT(base/nagios.c)
AC_CONFIG_HEADER(include/config.h include/snprintf.h include/nagios.h include/cgiutils.h)
-AC_PREFIX_DEFAULT(/usr/local/nagios)
PKG_NAME=nagios
PKG_VERSION="2.0b2"
@@ -137,7 +136,7 @@
AC_SUBST(nagios_grp)
AC_DEFINE_UNQUOTED(DEFAULT_NAGIOS_USER,"$nagios_user")
AC_DEFINE_UNQUOTED(DEFAULT_NAGIOS_GROUP,"$nagios_grp")
-INSTALL_OPTS="-o $nagios_user -g $nagios_grp"
+INSTALL_OPTS="-o root -g wheel"
AC_SUBST(INSTALL_OPTS)
AC_ARG_WITH(command_user,--with-command-user=<user> sets user name for command access,command_user=$withval,command_user=$nagios_user)

61
net-mgmt/nagios12/files/patch-html-Makefile.in Normal file
View file

@ -0,0 +1,61 @@
--- html/Makefile.in.orig Thu Apr 10 05:46:02 2003
+++ html/Makefile.in Sat Feb 12 13:53:16 2005
@@ -33,37 +33,37 @@
devclean: distclean
install:
- $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)
- $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/media
- $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/stylesheets
- $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/contexthelp
- $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/docs
- $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/docs/images
- $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/images
- $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/images/logos
- $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/ssi
- $(INSTALL) -m 664 $(INSTALL_OPTS) robots.txt $(DESTDIR)$(HTMLDIR)
- $(INSTALL) -m 664 $(INSTALL_OPTS) docs/robots.txt $(DESTDIR)$(HTMLDIR)/docs
+ $(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)
+ $(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/media
+ $(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/stylesheets
+ $(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/contexthelp
+ $(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/docs
+ $(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/docs/images
+ $(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/images
+ $(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/images/logos
+ $(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/ssi
+ $(INSTALL) -m 644 $(INSTALL_OPTS) robots.txt $(DESTDIR)$(HTMLDIR)
+ $(INSTALL) -m 644 $(INSTALL_OPTS) docs/robots.txt $(DESTDIR)$(HTMLDIR)/docs
for file in *.html; \
- do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR); done
+ do $(INSTALL) -m 644 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR); done
for file in media/*.wav; \
- do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/media; done
+ do $(INSTALL) -m 644 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/media; done
for file in stylesheets/*.css; \
- do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/stylesheets; done
+ do $(INSTALL) -m 644 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/stylesheets; done
for file in contexthelp/*.html; \
- do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/contexthelp; done
+ do $(INSTALL) -m 644 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/contexthelp; done
for file in docs/*.html; \
- do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/docs; done
+ do $(INSTALL) -m 644 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/docs; done
for file in docs/images/*.*; \
- do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/docs/images; done
+ do $(INSTALL) -m 644 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/docs/images; done
for file in images/*.gif; \
- do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/images; done
+ do $(INSTALL) -m 644 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/images; done
for file in images/*.jpg; \
- do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/images; done
+ do $(INSTALL) -m 644 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/images; done
for file in images/*.png; \
- do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/images; done
+ do $(INSTALL) -m 644 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/images; done
for file in images/logos/*.*; \
- do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/images/logos; done
+ do $(INSTALL) -m 644 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/images/logos; done

11
net-mgmt/nagios12/files/patch-xcddb.c
View file

@ -1,11 +0,0 @@
--- xdata/xcddb.c.orig Thu May 16 04:46:11 2002
+++ xdata/xcddb.c Thu Mar 6 23:14:25 2003
@@ -51,7 +51,7 @@
#endif
#ifdef USE_XCDPGSQL
-#include <pgsql/libpq-fe.h>
+#include <libpq-fe.h>
#endif

11
net-mgmt/nagios12/files/patch-xdddb.c
View file

@ -1,11 +0,0 @@
--- xdata/xdddb.c.orig Thu May 16 04:46:11 2002
+++ xdata/xdddb.c Thu Mar 6 23:15:54 2003
@@ -51,7 +51,7 @@
#endif
#ifdef USE_XDDPGSQL
-#include <pgsql/libpq-fe.h>
+#include <libpq-fe.h>
#endif

11
net-mgmt/nagios12/files/patch-xeddb.c
View file

@ -1,11 +0,0 @@
--- xdata/xeddb.c.orig Tue Feb 26 05:04:09 2002
+++ xdata/xeddb.c Thu Mar 6 23:16:01 2003
@@ -44,7 +44,7 @@
#endif
#ifdef USE_XEDPGSQL
-#include <pgsql/libpq-fe.h>
+#include <libpq-fe.h>
#endif

11
net-mgmt/nagios12/files/patch-xrddb.c
View file

@ -1,11 +0,0 @@
--- xdata/xrddb.c.orig Thu May 16 04:46:11 2002
+++ xdata/xrddb.c Thu Mar 6 23:16:14 2003
@@ -43,7 +43,7 @@
#endif
#ifdef USE_XRDPGSQL
-#include <pgsql/libpq-fe.h>
+#include <libpq-fe.h>
#endif

11
net-mgmt/nagios12/files/patch-xsddb.c
View file

@ -1,11 +0,0 @@
--- xdata/xsddb.c.orig Thu Nov 14 03:51:34 2002
+++ xdata/xsddb.c Thu Mar 6 23:16:27 2003
@@ -48,7 +48,7 @@
#endif
#ifdef USE_XSDPGSQL
-#include <pgsql/libpq-fe.h>
+#include <libpq-fe.h>
#endif

34
net-mgmt/nagios12/pkg-plist
View file

@ -3,23 +3,16 @@
@exec mkdir -p /var/spool/nagios/rw
@exec chmod 775 /var/spool/nagios /var/spool/nagios/archives /var/spool/nagios/rw
@exec chown nagios:nagios /var/spool/nagios /var/spool/nagios/archives
@exec chown nagios:nogroup /var/spool/nagios/rw
@exec chown nagios:www /var/spool/nagios/rw
bin/nagios
bin/nagiostats
etc/nagios/bigger.cfg-sample
etc/nagios/cgi.cfg-sample
etc/nagios/checkcommands.cfg-sample
etc/nagios/contactgroups.cfg-sample
etc/nagios/contacts.cfg-sample
etc/nagios/dependencies.cfg-sample
etc/nagios/escalations.cfg-sample
etc/nagios/hostextinfo.cfg-sample
etc/nagios/hostgroups.cfg-sample
etc/nagios/hosts.cfg-sample
etc/nagios/minimal.cfg-sample
etc/nagios/misccommands.cfg-sample
etc/nagios/nagios.cfg-sample
etc/nagios/resource.cfg-sample
etc/nagios/serviceextinfo.cfg-sample
etc/nagios/services.cfg-sample
etc/nagios/timeperiods.cfg-sample
etc/rc.d/nagios.sh
share/nagios/cgi-bin/avail.cgi
share/nagios/cgi-bin/cmd.cgi
@ -71,6 +64,7 @@ share/nagios/contexthelp/I5.html
share/nagios/contexthelp/I6.html
share/nagios/contexthelp/I7.html
share/nagios/contexthelp/I8.html
share/nagios/contexthelp/I9.html
share/nagios/contexthelp/J1.html
share/nagios/contexthelp/K1.html
share/nagios/contexthelp/L1.html
@ -133,6 +127,7 @@ share/nagios/docs/images/interleaved1.png
share/nagios/docs/images/interleaved2.png
share/nagios/docs/images/interleaved3.png
share/nagios/docs/images/logofullsize.png
share/nagios/docs/images/mrtgstats.png
share/nagios/docs/images/network-heirarchy.png
share/nagios/docs/images/network-outage1.png
share/nagios/docs/images/network-outage2.png
@ -147,6 +142,7 @@ share/nagios/docs/images/statetransitions.png
share/nagios/docs/images/statetransitions2.png
share/nagios/docs/about.html
share/nagios/docs/addons.html
share/nagios/docs/adaptive.html
share/nagios/docs/beginners.html
share/nagios/docs/cgiauth.html
share/nagios/docs/cgiincludes.html
@ -166,7 +162,6 @@ share/nagios/docs/embeddedperl.html
share/nagios/docs/escalations.html
share/nagios/docs/eventhandlers.html
share/nagios/docs/extcommands.html
share/nagios/docs/faqs.html
share/nagios/docs/flapping.html
share/nagios/docs/freshness.html
share/nagios/docs/funstuff.html
@ -174,10 +169,10 @@ share/nagios/docs/index.html
share/nagios/docs/indirectchecks.html
share/nagios/docs/installing.html
share/nagios/docs/installweb.html
share/nagios/docs/int-portsentry.html
share/nagios/docs/int-snmptrap.html
share/nagios/docs/int-tcpwrappers.html
share/nagios/docs/macros.html
share/nagios/docs/nagiostats.html
share/nagios/docs/networkoutages.html
share/nagios/docs/networkreachability.html
share/nagios/docs/notifications.html
@ -201,14 +196,11 @@ share/nagios/docs/tuning.html
share/nagios/docs/verifyconfig.html
share/nagios/docs/volatileservices.html
share/nagios/docs/whatsnew.html
share/nagios/docs/xdata-db.html
share/nagios/docs/xeddefault.html
share/nagios/docs/xedtemplate.html
share/nagios/docs/xoddefault.html
share/nagios/docs/xodtemplate.html
share/nagios/docs/xpddefault.html
share/nagios/docs/xpdfile.html
share/nagios/images/ack.gif
share/nagios/images/action.gif
share/nagios/images/command.png
share/nagios/images/comment.gif
share/nagios/images/contexthelp1.gif
@ -216,6 +208,7 @@ share/nagios/images/contexthelp2.gif
share/nagios/images/critical.png
share/nagios/images/delay.gif
share/nagios/images/delete.gif
share/nagios/images/detail.gif
share/nagios/images/disabled.gif
share/nagios/images/down.gif
share/nagios/images/downtime.gif
@ -247,11 +240,7 @@ share/nagios/images/redudancy.png
share/nagios/images/redundancy.png
share/nagios/images/restart.gif
share/nagios/images/right.gif
share/nagios/images/sbconfig.png
share/nagios/images/sbgeneral.png
share/nagios/images/sblogo.jpg
share/nagios/images/sbmonitor.png
share/nagios/images/sbreport.png
share/nagios/images/serviceevent.gif
share/nagios/images/start.gif
share/nagios/images/status.gif
@ -285,6 +274,7 @@ share/nagios/side.html
share/nagios/stylesheets/avail.css
share/nagios/stylesheets/checksanity.css
share/nagios/stylesheets/cmd.css
share/nagios/stylesheets/common.css
share/nagios/stylesheets/config.css
share/nagios/stylesheets/extinfo.css
share/nagios/stylesheets/histogram.css
@ -308,7 +298,7 @@ share/nagios/stylesheets/trends.css
@dirrm share/nagios/media
@dirrm share/nagios/ssi
@dirrm share/nagios/stylesheets
@dirrm share/nagios
@unexec rmdir %D/share/nagios 2>/dev/null || true
@unexec rmdir /var/spool/nagios/archives 2>/dev/null || true
@unexec rmdir /var/spool/nagios/rw 2>/dev/null || true
@unexec rmdir /var/spool/nagios 2>/dev/null || true

43
net-mgmt/nagios2/Makefile
View file

@ -6,11 +6,11 @@
#
PORTNAME= nagios
PORTVERSION= 1.2
PORTREVISION= 1
PORTVERSION= 2.0.b2
CATEGORIES= net-mgmt
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR=nagios
DISTNAME= nagios-2.0b2
MAINTAINER= blaz@si.FreeBSD.org
COMMENT= Extremely powerful network monitoring system
@ -20,6 +20,7 @@ RUN_DEPENDS= ${LOCALBASE}/libexec/nagios/check_nagios:${PORTSDIR}/net-mgmt/nagio
USE_GETOPT_LONG=yes
GNU_CONFIGURE= yes
USE_AUTOCONF_VER= 259
USE_RC_SUBR= yes
USE_PERL5_BUILD=yes
@ -31,22 +32,17 @@ NAGIOSUSER?= nagios
NAGIOSGROUP?= nagios
NAGIOSDIR?= /var/spool/nagios
OPTIONS= MYSQL "MySQL suport" off \
PGSQL "PostgreSQL suport" off \
FILE_PERFDATA "Save performance data to files" off
.include <bsd.port.pre.mk>
CPPFLAGS= -I${LOCALBASE}/include
CPPFLAGS= -I${LOCALBASE}/include -fPIC
CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" \
LDFLAGS="${LDFLAGS}" \
CFLAGS="${CPPFLAGS} ${CFLAGS}" \
LIBS="-L${LOCALBASE}/lib -lgd"
CONFIGURE_ARGS= --with-command-user=${NAGIOSUSER} \
--with-command-grp=www \
--with-command-group=www \
--with-nagios-user=${NAGIOSUSER} \
--with-nagios-grp=${NAGIOSGROUP} \
--with-template-objects \
--with-nagios-group=${NAGIOSGROUP} \
--sbindir=${PREFIX}/share/nagios/cgi-bin \
--libexecdir=${PREFIX}/libexec/nagios \
--datadir=${PREFIX}/share/nagios \
@ -54,26 +50,6 @@ CONFIGURE_ARGS= --with-command-user=${NAGIOSUSER} \
--localstatedir=${NAGIOSDIR} \
--prefix=${PREFIX}
.if defined(WITH_MYSQL)
USE_MYSQL= yes
CONFIGURE_ARGS+= --with-mysql-lib=${LOCALBASE}/lib/mysql \
--with-mysql-inc=${LOCALBASE}/include/mysql \
--with-mysql-xdata
.else
CONFIGURE_ARGS+= --with-template-extinfo
.endif
.if defined(WITH_FILE_PERFDATA)
CONFIGURE_ARGS+=--with-file-perfdata
.endif
.if defined(WITH_PGSQL)
USE_PGSQL= yes
CONFIGURE_ARGS+=--with-pgsql-lib=${LOCALBASE}/pgsql \
--with-pgsql-inc=${LOCALBASE}/pgsql \
--with-pgsql-xdata
.endif
SED_SCRIPT= -e 's,%%NAGIOSUSER%%,${NAGIOSUSER},g' \
-e 's,%%NAGIOSGROUP%%,${NAGIOSGROUP},g' \
-e 's,%%NAGIOSDIR%%,${NAGIOSDIR},g' \
@ -83,8 +59,8 @@ SED_SCRIPT= -e 's,%%NAGIOSUSER%%,${NAGIOSUSER},g' \
INSTALL_TARGET= all install config install-config install-commandmode
pre-build:
for file in nagios.sh INSTALL DEINSTALL MESSAGE; do \
${SED} ${SED_SCRIPT} < ${FILESDIR}/$${file}.tmpl >${WRKDIR}/$${file}; \
for myfile in nagios.sh INSTALL DEINSTALL MESSAGE; do \
${SED} ${SED_SCRIPT} < ${FILESDIR}/$${myfile}.tmpl >${WRKDIR}/$${myfile}; \
done
pre-install:
@ -92,6 +68,9 @@ pre-install:
post-install:
@${INSTALL_SCRIPT} ${WRKDIR}/nagios.sh ${PREFIX}/etc/rc.d/
@${CHMOD} 775 ${NAGIOSDIR} ${NAGIOSDIR}/archives ${NAGIOSDIR}/rw
@${CHOWN} ${NAGIOSUSER}:${NAGIOSGROUP} ${NAGIOSDIR} ${NAGIOSDIR}/archives
@${CHOWN} ${NAGIOSUSER}:www ${NAGIOSDIR}/rw
@${CAT} ${PKGMESSAGE}
.include <bsd.port.post.mk>

4
net-mgmt/nagios2/distinfo
View file

@ -1,2 +1,2 @@
MD5 (nagios-1.2.tar.gz) = 414d70e5269d5b8d7c21bf3ee129309f
SIZE (nagios-1.2.tar.gz) = 1625322
MD5 (nagios-2.0b2.tar.gz) = 72d21f961b28519529e8c96c35051fbc
SIZE (nagios-2.0b2.tar.gz) = 1703671

4
net-mgmt/nagios2/files/nagios.sh.tmpl
View file

@ -20,7 +20,7 @@ required_files=${prefix}/etc/nagios/nagios.cfg
NagiosBin=${prefix}/bin/nagios
NagiosCfg=${prefix}/etc/nagios/nagios.cfg
NagiosVar=/var/spool/nagios
NagiosVar=%%NAGIOSDIR%%
NagiosLog=${NagiosVar}/status.log
NagiosTmp=${NagiosVar}/nagios.tmp
NagiosSav=${NagiosVar}/status.sav
@ -30,7 +30,7 @@ NagiosRun=${NagiosVar}/nagios.lock
pidfile=${NagiosRun}
command=${NagiosBin}
command_args="-d $NagiosCfg"
nagios_user=nagios
nagios_user=%%NAGIOSUSER%%
start_precmd=start_precmd
stop_postcmd=stop_postcmd

25
net-mgmt/nagios2/files/patch-Makefile.in Normal file
View file

@ -0,0 +1,25 @@
--- Makefile.in.orig Thu Dec 16 02:15:24 2004
+++ Makefile.in Sat Feb 12 13:52:19 2005
@@ -204,14 +204,14 @@
install-config:
- $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(CFGDIR)
- $(INSTALL) -m 664 $(INSTALL_OPTS) sample-config/nagios.cfg $(DESTDIR)$(CFGDIR)/nagios.cfg-sample
- $(INSTALL) -m 664 $(INSTALL_OPTS) sample-config/cgi.cfg $(DESTDIR)$(CFGDIR)/cgi.cfg-sample
- $(INSTALL) -m 660 $(INSTALL_OPTS) sample-config/resource.cfg $(DESTDIR)$(CFGDIR)/resource.cfg-sample
- $(INSTALL) -m 664 $(INSTALL_OPTS) sample-config/template-object/bigger.cfg $(DESTDIR)$(CFGDIR)/bigger.cfg-sample
- $(INSTALL) -m 664 $(INSTALL_OPTS) sample-config/template-object/minimal.cfg $(DESTDIR)$(CFGDIR)/minimal.cfg-sample
- $(INSTALL) -m 664 $(INSTALL_OPTS) sample-config/template-object/checkcommands.cfg $(DESTDIR)$(CFGDIR)/checkcommands.cfg-sample
- $(INSTALL) -m 664 $(INSTALL_OPTS) sample-config/template-object/misccommands.cfg $(DESTDIR)$(CFGDIR)/misccommands.cfg-sample
+ $(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(CFGDIR)
+ $(INSTALL) -m 644 $(INSTALL_OPTS) sample-config/nagios.cfg $(DESTDIR)$(CFGDIR)/nagios.cfg-sample
+ $(INSTALL) -m 644 $(INSTALL_OPTS) sample-config/cgi.cfg $(DESTDIR)$(CFGDIR)/cgi.cfg-sample
+ $(INSTALL) -m 644 $(INSTALL_OPTS) sample-config/resource.cfg $(DESTDIR)$(CFGDIR)/resource.cfg-sample
+ $(INSTALL) -m 644 $(INSTALL_OPTS) sample-config/template-object/bigger.cfg $(DESTDIR)$(CFGDIR)/bigger.cfg-sample
+ $(INSTALL) -m 644 $(INSTALL_OPTS) sample-config/template-object/minimal.cfg $(DESTDIR)$(CFGDIR)/minimal.cfg-sample
+ $(INSTALL) -m 644 $(INSTALL_OPTS) sample-config/template-object/checkcommands.cfg $(DESTDIR)$(CFGDIR)/checkcommands.cfg-sample
+ $(INSTALL) -m 644 $(INSTALL_OPTS) sample-config/template-object/misccommands.cfg $(DESTDIR)$(CFGDIR)/misccommands.cfg-sample
@echo ""
@echo "*** Sample config file installed ***"

37
net-mgmt/nagios2/files/patch-aa
View file

@ -1,37 +0,0 @@
--- Makefile.in.orig Sat Oct 26 02:47:15 2002
+++ Makefile.in Tue Nov 26 13:58:29 2002
@@ -28,7 +28,7 @@
INSTALL_OPTS=@INSTALL_OPTS@
COMMAND_OPTS=@COMMAND_OPTS@
INIT_DIR=@init_dir@
-INIT_OPTS=-o root -g root
+INIT_OPTS=-o root -g wheel
CGICFGDIR=$(CGIDIR)
PERLDIR=@PERLDIR@
@@ -196,6 +196,8 @@
$(INSTALL) -m 664 $(INSTALL_OPTS) sample-config/template-object/misccommands.cfg $(DESTDIR)$(CFGDIR)/misccommands.cfg-sample
$(INSTALL) -m 664 $(INSTALL_OPTS) sample-config/template-object/services.cfg $(DESTDIR)$(CFGDIR)/services.cfg-sample
$(INSTALL) -m 664 $(INSTALL_OPTS) sample-config/template-object/timeperiods.cfg $(DESTDIR)$(CFGDIR)/timeperiods.cfg-sample
+ $(INSTALL) -m 664 $(INSTALL_OPTS) sample-config/template-extinfo/hostextinfo.cfg $(DESTDIR)$(CFGDIR)/hostextinfo.cfg-sample
+ $(INSTALL) -m 664 $(INSTALL_OPTS) sample-config/template-extinfo/serviceextinfo.cfg $(DESTDIR)$(CFGDIR)/serviceextinfo.cfg-sample
@echo ""
@echo "*** Sample config file installed ***"
@@ -215,7 +217,7 @@
install-daemoninit:
$(INSTALL) -m 755 -d $(INIT_OPTS) $(DESTDIR)$(INIT_DIR)
- $(INSTALL) -m 774 $(INIT_OPTS) daemon-init $(DESTDIR)$(INIT_DIR)/nagios
+ $(INSTALL) -m 774 $(INIT_OPTS) daemon-init $(DESTDIR)$(INIT_DIR)/nagios.sh
@echo ""
@echo "*** Init script installed ***"
@@ -238,7 +240,6 @@
install-commandmode:
$(INSTALL) -m 775 $(COMMAND_OPTS) -d $(DESTDIR)$(LOGDIR)/rw
- chmod g+s $(DESTDIR)$(LOGDIR)/rw
@echo ""
@echo "*** External command directory configured ***"

10
net-mgmt/nagios2/files/patch-ab
View file

@ -1,10 +0,0 @@
--- base/Makefile.in.orig Mon Nov 11 04:52:13 2002
+++ base/Makefile.in Tue Nov 26 13:46:41 2002
@@ -105,7 +105,6 @@
devclean: clean
install:
- $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(BINDIR)
$(INSTALL) -m 774 $(INSTALL_OPTS) @nagios_name@ $(DESTDIR)$(BINDIR)
$(STRIP) $(DESTDIR)$(BINDIR)/@nagios_name@

69
net-mgmt/nagios2/files/patch-ad
View file

@ -1,69 +0,0 @@
--- configure.orig Tue Feb 3 05:45:08 2004
+++ configure Wed Feb 4 21:26:46 2004
@@ -11,7 +11,7 @@
ac_help=
ac_default_prefix=/usr/local
# Any additions from configure.in:
-ac_default_prefix=/usr/local/nagios
+#ac_default_prefix=/usr/local/nagios
ac_help="$ac_help
--with-nagios-user=<user> sets user name to run nagios"
ac_help="$ac_help
@@ -576,9 +576,9 @@
# Prefer explicitly selected file to automatically selected ones.
if test -z "$CONFIG_SITE"; then
if test "x$prefix" != xNONE; then
- CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site"
+ CONFIG_SITE="$prefix/share/nagios/config.site $prefix/etc/nagios/config.site"
else
- CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site"
+ CONFIG_SITE="$ac_default_prefix/share/nagios/config.site $ac_default_prefix/etc/nagios/config.site"
fi
fi
for ac_site_file in $CONFIG_SITE; do
@@ -2608,6 +2608,9 @@
LDFLAGS="${LDFLAGS} -L${withval}"
LD_RUN_PATH="${withval}${LD_RUN_PATH:+:}${LD_RUN_PATH}"
+else
+ LDFLAGS="${LDFLAGS} -L/usr/local/lib"
+ LD_RUN_PATH="/usr/local/ib${LD_RUN_PATH:+:}${LD_RUN_PATH}"
fi
# Check whether --with-gd-inc or --without-gd-inc was given.
@@ -2615,6 +2618,8 @@
withval="$with_gd_inc"
CFLAGS="${CFLAGS} -I${withval}"
+else
+ CFLAGS="${CFLAGS} -I/usr/local/include/gd"
fi
@@ -2692,14 +2697,14 @@
- echo $ac_n "checking for gdImagePng in -lgd (order 1)""... $ac_c" 1>&6
-echo "configure:2697: checking for gdImagePng in -lgd (order 1)" >&5
+ echo $ac_n "checking for gdImagePng in -lgd1 (order 1)""... $ac_c" 1>&6
+echo "configure:2697: checking for gdImagePng in -lgd1 (order 1)" >&5
ac_lib_var=`echo gd'_'gdImagePng'_'1 | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
ac_save_LIBS="$LIBS"
- LIBS="-lgd $ICONV -lz -lm -lpng -ljpeg $LIBS"
+ LIBS="-lgd1 $ICONV -lz -lm -lpng -ljpeg $LIBS"
cat > conftest.$ac_ext <<EOF
#line 2705 "configure"
#include "confdefs.h"
@@ -2729,7 +2734,7 @@
echo "$ac_t""yes" 1>&6
GDLIBFOUND=yep
- GDLIBS="-lgd $ICONV -lz -lm -lpng -ljpeg"
+ GDLIBS="-lgd1 $ICONV -lz -lm -lpng -ljpeg"
else
echo "$ac_t""no" 1>&6

11
net-mgmt/nagios2/files/patch-ae
View file

@ -1,11 +0,0 @@
--- configure.in.orig Mon Apr 30 17:22:35 2001
+++ configure.in Tue May 1 19:36:54 2001
@@ -1,7 +1,7 @@
dnl Process this -*-m4-*- file with autoconf to produce a configure script.
AC_INIT(base/nagios.c)
AC_CONFIG_HEADER(common/config.h common/snprintf.h base/nagios.h cgi/cgiutils.h)
-AC_PREFIX_DEFAULT(/usr/local/nagios)
+AC_PREFIX_DEFAULT(/usr/local)
dnl Figure out how to invoke "install" and what install options to use.
AC_PROG_INSTALL

31
net-mgmt/nagios2/files/patch-ag
View file

@ -1,31 +0,0 @@
--- functions Fri Apr 7 11:11:34 2000
+++ functions.new Sat Jun 10 13:31:31 2000
@@ -11,7 +11,7 @@
#
# First set up a default search path.
-PATH=/opt/gnu/bin:/sbin:/usr/sbin:/bin:/usr/bin:/usr/X11R6/bin
+PATH=/sbin:/usr/sbin:/bin:/usr/bin:/usr/X11R6/bin:/usr/local/bin:/usr/local/sbin
export PATH
# Get a sane screen width
@@ -174,7 +174,7 @@
# fi
# Finally try to extract it from ps
- pid=`ps -eo pid,ppid,fname | egrep -v $$ | awk 'BEGIN { prog=ARGV[1]; ARGC=1 } { if ((prog == $3) || (("(" prog ")") == $3) || (("[" prog "]") == $3) || ((prog ":") == $3)) { print $1 ; exit 0 } }' $1`
+ pid=`ps -axco pid,ppid,command | egrep -v $$ | awk 'BEGIN { prog=ARGV[1]; ARGC=1 } { if ((prog == $3) || (("(" prog ")") == $3) || (("[" prog "]") == $3) || ((prog ":") == $3)) { print $1 ; exit 0 } }' $1`
if [ "$pid" != "" ] ; then
echo $pid
return 0
@@ -206,8 +206,8 @@
fi
fi
- # See if /var/lock/subsys/$1 exists
- if [ -f /var/lock/subsys/$1 ]; then
+ # See if /var/spool/lock/$1 exists
+ if [ -f /var/spool/lock/$1 ]; then
echo "$1 dead but subsys locked"
return 2
fi

25
net-mgmt/nagios2/files/patch-ai
View file

@ -1,25 +0,0 @@
--- daemon-init.in.orig Thu Apr 18 06:27:13 2002
+++ daemon-init.in Sun May 19 08:39:29 2002
@@ -68,11 +68,8 @@
# Source function library
-# Solaris doesn't have an rc.d directory, so do a test first
-if [ -f /etc/rc.d/init.d/functions ]; then
- . /etc/rc.d/init.d/functions
-elif [ -f /etc/init.d/functions ]; then
- . /etc/init.d/functions
+if [ -f @sysconfdir@/functions ]; then
+. @sysconfdir@/functions
fi
prefix=@prefix@
@@ -102,7 +99,7 @@
start)
echo "Starting network monitor: nagios"
- su -l $Nagios -c "touch $NagiosVar/nagios.log $NagiosSav"
+ su -m $Nagios -c "touch $NagiosVar/nagios.log $NagiosSav"
rm -f $NagiosCmd
$NagiosBin -d $NagiosCfg
if [ -d $NagiosLckDir ]; then touch $NagiosLckDir/$NagiosLckFile; fi

16
net-mgmt/nagios2/files/patch-base-Makefile.in Normal file
View file

@ -0,0 +1,16 @@
--- base/Makefile.in.orig Thu Dec 9 07:48:33 2004
+++ base/Makefile.in Sat Feb 12 13:59:24 2005
@@ -181,10 +181,10 @@
devclean: distclean
install:
- $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(BINDIR)
- $(INSTALL) -m 774 $(INSTALL_OPTS) @nagios_name@ $(DESTDIR)$(BINDIR)
+ $(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(BINDIR)
+ $(INSTALL) -m 755 $(INSTALL_OPTS) @nagios_name@ $(DESTDIR)$(BINDIR)
$(STRIP) $(DESTDIR)$(BINDIR)/@nagios_name@
- $(INSTALL) -m 774 $(INSTALL_OPTS) @nagiostats_name@ $(DESTDIR)$(BINDIR)
+ $(INSTALL) -m 755 $(INSTALL_OPTS) @nagiostats_name@ $(DESTDIR)$(BINDIR)
$(STRIP) $(DESTDIR)$(BINDIR)/@nagiostats_name@

14
net-mgmt/nagios2/files/patch-cgi-Makefile.in Normal file
View file

@ -0,0 +1,14 @@
--- cgi/Makefile.in.orig Mon Oct 25 07:05:54 2004
+++ cgi/Makefile.in Sat Feb 12 13:56:57 2005
@@ -191,9 +191,9 @@
devclean: distclean
install:
- $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(CGIDIR)
+ $(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(CGIDIR)
for file in *.cgi; do \
- $(INSTALL) -m 775 $(INSTALL_OPTS) $$file $(DESTDIR)$(CGIDIR); \
+ $(INSTALL) -m 755 $(INSTALL_OPTS) $$file $(DESTDIR)$(CGIDIR); \
$(STRIP) $(DESTDIR)$(CGIDIR)/$$file; \
done

19
net-mgmt/nagios2/files/patch-configure.in Normal file
View file

@ -0,0 +1,19 @@
--- configure.in.orig Thu Feb 10 02:00:10 2005
+++ configure.in Sat Feb 12 14:11:54 2005
@@ -6,7 +6,6 @@
AC_INIT(base/nagios.c)
AC_CONFIG_HEADER(include/config.h include/snprintf.h include/nagios.h include/cgiutils.h)
-AC_PREFIX_DEFAULT(/usr/local/nagios)
PKG_NAME=nagios
PKG_VERSION="2.0b2"
@@ -137,7 +136,7 @@
AC_SUBST(nagios_grp)
AC_DEFINE_UNQUOTED(DEFAULT_NAGIOS_USER,"$nagios_user")
AC_DEFINE_UNQUOTED(DEFAULT_NAGIOS_GROUP,"$nagios_grp")
-INSTALL_OPTS="-o $nagios_user -g $nagios_grp"
+INSTALL_OPTS="-o root -g wheel"
AC_SUBST(INSTALL_OPTS)
AC_ARG_WITH(command_user,--with-command-user=<user> sets user name for command access,command_user=$withval,command_user=$nagios_user)

61
net-mgmt/nagios2/files/patch-html-Makefile.in Normal file
View file

@ -0,0 +1,61 @@
--- html/Makefile.in.orig Thu Apr 10 05:46:02 2003
+++ html/Makefile.in Sat Feb 12 13:53:16 2005
@@ -33,37 +33,37 @@
devclean: distclean
install:
- $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)
- $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/media
- $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/stylesheets
- $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/contexthelp
- $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/docs
- $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/docs/images
- $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/images
- $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/images/logos
- $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/ssi
- $(INSTALL) -m 664 $(INSTALL_OPTS) robots.txt $(DESTDIR)$(HTMLDIR)
- $(INSTALL) -m 664 $(INSTALL_OPTS) docs/robots.txt $(DESTDIR)$(HTMLDIR)/docs
+ $(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)
+ $(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/media
+ $(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/stylesheets
+ $(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/contexthelp
+ $(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/docs
+ $(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/docs/images
+ $(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/images
+ $(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/images/logos
+ $(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/ssi
+ $(INSTALL) -m 644 $(INSTALL_OPTS) robots.txt $(DESTDIR)$(HTMLDIR)
+ $(INSTALL) -m 644 $(INSTALL_OPTS) docs/robots.txt $(DESTDIR)$(HTMLDIR)/docs
for file in *.html; \
- do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR); done
+ do $(INSTALL) -m 644 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR); done
for file in media/*.wav; \
- do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/media; done
+ do $(INSTALL) -m 644 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/media; done
for file in stylesheets/*.css; \
- do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/stylesheets; done
+ do $(INSTALL) -m 644 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/stylesheets; done
for file in contexthelp/*.html; \
- do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/contexthelp; done
+ do $(INSTALL) -m 644 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/contexthelp; done
for file in docs/*.html; \
- do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/docs; done
+ do $(INSTALL) -m 644 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/docs; done
for file in docs/images/*.*; \
- do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/docs/images; done
+ do $(INSTALL) -m 644 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/docs/images; done
for file in images/*.gif; \
- do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/images; done
+ do $(INSTALL) -m 644 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/images; done
for file in images/*.jpg; \
- do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/images; done
+ do $(INSTALL) -m 644 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/images; done
for file in images/*.png; \
- do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/images; done
+ do $(INSTALL) -m 644 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/images; done
for file in images/logos/*.*; \
- do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/images/logos; done
+ do $(INSTALL) -m 644 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/images/logos; done

11
net-mgmt/nagios2/files/patch-xcddb.c
View file

@ -1,11 +0,0 @@
--- xdata/xcddb.c.orig Thu May 16 04:46:11 2002
+++ xdata/xcddb.c Thu Mar 6 23:14:25 2003
@@ -51,7 +51,7 @@
#endif
#ifdef USE_XCDPGSQL
-#include <pgsql/libpq-fe.h>
+#include <libpq-fe.h>
#endif

11
net-mgmt/nagios2/files/patch-xdddb.c
View file

@ -1,11 +0,0 @@
--- xdata/xdddb.c.orig Thu May 16 04:46:11 2002
+++ xdata/xdddb.c Thu Mar 6 23:15:54 2003
@@ -51,7 +51,7 @@
#endif
#ifdef USE_XDDPGSQL
-#include <pgsql/libpq-fe.h>
+#include <libpq-fe.h>
#endif

11
net-mgmt/nagios2/files/patch-xeddb.c
View file

@ -1,11 +0,0 @@
--- xdata/xeddb.c.orig Tue Feb 26 05:04:09 2002
+++ xdata/xeddb.c Thu Mar 6 23:16:01 2003
@@ -44,7 +44,7 @@
#endif
#ifdef USE_XEDPGSQL
-#include <pgsql/libpq-fe.h>
+#include <libpq-fe.h>
#endif

11
net-mgmt/nagios2/files/patch-xrddb.c
View file

@ -1,11 +0,0 @@
--- xdata/xrddb.c.orig Thu May 16 04:46:11 2002
+++ xdata/xrddb.c Thu Mar 6 23:16:14 2003
@@ -43,7 +43,7 @@
#endif
#ifdef USE_XRDPGSQL
-#include <pgsql/libpq-fe.h>
+#include <libpq-fe.h>
#endif

11
net-mgmt/nagios2/files/patch-xsddb.c
View file

@ -1,11 +0,0 @@
--- xdata/xsddb.c.orig Thu Nov 14 03:51:34 2002
+++ xdata/xsddb.c Thu Mar 6 23:16:27 2003
@@ -48,7 +48,7 @@
#endif
#ifdef USE_XSDPGSQL
-#include <pgsql/libpq-fe.h>
+#include <libpq-fe.h>
#endif

34
net-mgmt/nagios2/pkg-plist
View file

@ -3,23 +3,16 @@
@exec mkdir -p /var/spool/nagios/rw
@exec chmod 775 /var/spool/nagios /var/spool/nagios/archives /var/spool/nagios/rw
@exec chown nagios:nagios /var/spool/nagios /var/spool/nagios/archives
@exec chown nagios:nogroup /var/spool/nagios/rw
@exec chown nagios:www /var/spool/nagios/rw
bin/nagios
bin/nagiostats
etc/nagios/bigger.cfg-sample
etc/nagios/cgi.cfg-sample
etc/nagios/checkcommands.cfg-sample
etc/nagios/contactgroups.cfg-sample
etc/nagios/contacts.cfg-sample
etc/nagios/dependencies.cfg-sample
etc/nagios/escalations.cfg-sample
etc/nagios/hostextinfo.cfg-sample
etc/nagios/hostgroups.cfg-sample
etc/nagios/hosts.cfg-sample
etc/nagios/minimal.cfg-sample
etc/nagios/misccommands.cfg-sample
etc/nagios/nagios.cfg-sample
etc/nagios/resource.cfg-sample
etc/nagios/serviceextinfo.cfg-sample
etc/nagios/services.cfg-sample
etc/nagios/timeperiods.cfg-sample
etc/rc.d/nagios.sh
share/nagios/cgi-bin/avail.cgi
share/nagios/cgi-bin/cmd.cgi
@ -71,6 +64,7 @@ share/nagios/contexthelp/I5.html
share/nagios/contexthelp/I6.html
share/nagios/contexthelp/I7.html
share/nagios/contexthelp/I8.html
share/nagios/contexthelp/I9.html
share/nagios/contexthelp/J1.html
share/nagios/contexthelp/K1.html
share/nagios/contexthelp/L1.html
@ -133,6 +127,7 @@ share/nagios/docs/images/interleaved1.png
share/nagios/docs/images/interleaved2.png
share/nagios/docs/images/interleaved3.png
share/nagios/docs/images/logofullsize.png
share/nagios/docs/images/mrtgstats.png
share/nagios/docs/images/network-heirarchy.png
share/nagios/docs/images/network-outage1.png
share/nagios/docs/images/network-outage2.png
@ -147,6 +142,7 @@ share/nagios/docs/images/statetransitions.png
share/nagios/docs/images/statetransitions2.png
share/nagios/docs/about.html
share/nagios/docs/addons.html
share/nagios/docs/adaptive.html
share/nagios/docs/beginners.html
share/nagios/docs/cgiauth.html
share/nagios/docs/cgiincludes.html
@ -166,7 +162,6 @@ share/nagios/docs/embeddedperl.html
share/nagios/docs/escalations.html
share/nagios/docs/eventhandlers.html
share/nagios/docs/extcommands.html
share/nagios/docs/faqs.html
share/nagios/docs/flapping.html
share/nagios/docs/freshness.html
share/nagios/docs/funstuff.html
@ -174,10 +169,10 @@ share/nagios/docs/index.html
share/nagios/docs/indirectchecks.html
share/nagios/docs/installing.html
share/nagios/docs/installweb.html
share/nagios/docs/int-portsentry.html
share/nagios/docs/int-snmptrap.html
share/nagios/docs/int-tcpwrappers.html
share/nagios/docs/macros.html
share/nagios/docs/nagiostats.html
share/nagios/docs/networkoutages.html
share/nagios/docs/networkreachability.html
share/nagios/docs/notifications.html
@ -201,14 +196,11 @@ share/nagios/docs/tuning.html
share/nagios/docs/verifyconfig.html
share/nagios/docs/volatileservices.html
share/nagios/docs/whatsnew.html
share/nagios/docs/xdata-db.html
share/nagios/docs/xeddefault.html
share/nagios/docs/xedtemplate.html
share/nagios/docs/xoddefault.html
share/nagios/docs/xodtemplate.html
share/nagios/docs/xpddefault.html
share/nagios/docs/xpdfile.html
share/nagios/images/ack.gif
share/nagios/images/action.gif
share/nagios/images/command.png
share/nagios/images/comment.gif
share/nagios/images/contexthelp1.gif
@ -216,6 +208,7 @@ share/nagios/images/contexthelp2.gif
share/nagios/images/critical.png
share/nagios/images/delay.gif
share/nagios/images/delete.gif
share/nagios/images/detail.gif
share/nagios/images/disabled.gif
share/nagios/images/down.gif
share/nagios/images/downtime.gif
@ -247,11 +240,7 @@ share/nagios/images/redudancy.png
share/nagios/images/redundancy.png
share/nagios/images/restart.gif
share/nagios/images/right.gif
share/nagios/images/sbconfig.png
share/nagios/images/sbgeneral.png
share/nagios/images/sblogo.jpg
share/nagios/images/sbmonitor.png
share/nagios/images/sbreport.png
share/nagios/images/serviceevent.gif
share/nagios/images/start.gif
share/nagios/images/status.gif
@ -285,6 +274,7 @@ share/nagios/side.html
share/nagios/stylesheets/avail.css
share/nagios/stylesheets/checksanity.css
share/nagios/stylesheets/cmd.css
share/nagios/stylesheets/common.css
share/nagios/stylesheets/config.css
share/nagios/stylesheets/extinfo.css
share/nagios/stylesheets/histogram.css
@ -308,7 +298,7 @@ share/nagios/stylesheets/trends.css
@dirrm share/nagios/media
@dirrm share/nagios/ssi
@dirrm share/nagios/stylesheets
@dirrm share/nagios
@unexec rmdir %D/share/nagios 2>/dev/null || true
@unexec rmdir /var/spool/nagios/archives 2>/dev/null || true
@unexec rmdir /var/spool/nagios/rw 2>/dev/null || true
@unexec rmdir /var/spool/nagios 2>/dev/null || true