This commit was manufactured by cvs2svn to create tag 'RELEASE_7_0_0'.release/7.0.0

12 files changed, 0 insertions, 418 deletions

diff --git a/net-mgmt/nagios2/files/nagios.sh.in b/net-mgmt/nagios2/files/nagios.sh.in
deleted file mode 100644
index e1afec9ced54..000000000000
--- a/net-mgmt/nagios2/files/nagios.sh.in
+++ /dev/null
@@ -1,70 +0,0 @@
-#!/bin/sh
-#
-# $FreeBSD$
-#
-
-# PROVIDE: nagios
-# REQUIRE: DAEMON
-# BEFORE: LOGIN
-# KEYWORD: shutdown
-
-#
-# Add the following lines to /etc/rc.conf to enable nagios:
-# nagios_enable (bool):    Set to "NO" by default.
-#                          Set it to "YES" to enable nagios.
-# nagios_flags (str):      Set to "" by default.
-# nagios_configfile (str): Set to "%%PREFIX%%/etc/nagios/nagios.cfg" by default.
-#
-
-. %%RC_SUBR%%
-
-name="nagios"
-rcvar=`set_rcvar`
-
-command="%%PREFIX%%/bin/nagios"
-command_args="-d"
-extra_commands="reload"
-pidfile="%%NAGIOSDIR%%/nagios.lock"
-nagios_user="%%NAGIOSUSER%%"
-
-start_precmd="start_precmd"
-stop_postcmd="stop_postcmd"
-restart_precmd="nagios_checkconfig"
-reload_precmd="nagios_checkconfig"
-sig_reload=HUP
-
-[ -z "${nagios_enable}" ]       && nagios_enable="NO"
-[ -z "${nagios_flags}" ]        && nagios_flags=""
-[ -z "${nagios_configfile}" ]   && nagios_configfile="%%PREFIX%%/etc/nagios/nagios.cfg"
-
-load_rc_config "${name}"
-
-required_files="${nagios_configfile}"
-command_args="${command_args} ${nagios_configfile}"
-
-nagios_checkconfig() {
-  echo -n "Performing sanity check of nagios configuration: "
-  ${command} -v ${nagios_configfile} 2>&1 >/dev/null
-  if [ $? != 0 ]; then
-    echo "FAILED"
-    ${command} -v ${nagios_configfile}
-    return 1
-  else
-    echo "OK"
-  fi
-}
-
-start_precmd() {
-  if ! nagios_checkconfig; then
-    return 1
-  fi
-
-  su -m "${nagios_user}" -c "touch \"%%NAGIOSDIR%%/nagios.log\" \"%%NAGIOSDIR%%/status.sav\""
-  rm -f "%%NAGIOSDIR%%/rw/nagios.cmd"
-}
-
-stop_postcmd() {
-  rm -f "%%NAGIOSDIR%%/nagios.tmp" "%%NAGIOSDIR%%/rw/nagios.cmd"
-}
-
-run_rc_command "$1"
diff --git a/net-mgmt/nagios2/files/patch-Makefile.in b/net-mgmt/nagios2/files/patch-Makefile.in
deleted file mode 100644
index f98d44cb9bd7..000000000000
--- a/net-mgmt/nagios2/files/patch-Makefile.in
+++ /dev/null
@@ -1,30 +0,0 @@
---- Makefile.in.orig	Tue Nov 28 12:59:04 2006
-+++ Makefile.in	Sat Dec  9 08:04:47 2006
-@@ -186,7 +186,7 @@
- 	$(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(LOGDIR)
- 	$(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(LOGDIR)/archives
- 	if [ $(INSTALLPERLSTUFF) = yes ]; then \
--		$(INSTALL) -m 664 $(INSTALL_OPTS) p1.pl $(DESTDIR)$(BINDIR); \
-+		$(INSTALL) -m 644 $(INSTALL_OPTS) p1.pl $(DESTDIR)$(BINDIR); \
- 	fi;
- 
- 	@echo ""
-@@ -213,12 +213,12 @@
- 
- 
- 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/localhost.cfg $(DESTDIR)$(CFGDIR)/localhost.cfg-sample
--	$(INSTALL) -m 664 $(INSTALL_OPTS) sample-config/template-object/commands.cfg $(DESTDIR)$(CFGDIR)/commands.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/localhost.cfg $(DESTDIR)$(CFGDIR)/localhost.cfg-sample
-+	$(INSTALL) -m 644 $(INSTALL_OPTS) sample-config/template-object/commands.cfg $(DESTDIR)$(CFGDIR)/commands.cfg-sample
- 
- 	@echo ""
- 	@echo "*** Sample config file installed ***"
diff --git a/net-mgmt/nagios2/files/patch-base-Makefile.in b/net-mgmt/nagios2/files/patch-base-Makefile.in
deleted file mode 100644
index 2b8138e62835..000000000000
--- a/net-mgmt/nagios2/files/patch-base-Makefile.in
+++ /dev/null
@@ -1,15 +0,0 @@
---- base/Makefile.in.orig	Wed May 31 02:01:44 2006
-+++ base/Makefile.in	Sat Jun  3 11:09:48 2006
-@@ -188,9 +188,9 @@
- 	 $(MAKE) install-basic
- 
- install-basic:
--	$(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(BINDIR)
--	$(INSTALL) -m 774 $(INSTALL_OPTS) @nagios_name@ $(DESTDIR)$(BINDIR)
--	$(INSTALL) -m 774 $(INSTALL_OPTS) @nagiostats_name@ $(DESTDIR)$(BINDIR)
-+	$(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(BINDIR)
-+	$(INSTALL) -m 755 $(INSTALL_OPTS) @nagios_name@ $(DESTDIR)$(BINDIR)
-+	$(INSTALL) -m 755 $(INSTALL_OPTS) @nagiostats_name@ $(DESTDIR)$(BINDIR)
- 
- strip-post-install:
- 	$(STRIP) $(DESTDIR)$(BINDIR)/@nagios_name@
diff --git a/net-mgmt/nagios2/files/patch-cgi-Makefile.in b/net-mgmt/nagios2/files/patch-cgi-Makefile.in
deleted file mode 100644
index e746d0009c95..000000000000
--- a/net-mgmt/nagios2/files/patch-cgi-Makefile.in
+++ /dev/null
@@ -1,14 +0,0 @@
---- cgi/Makefile.in.orig	Wed May 31 02:01:44 2006
-+++ cgi/Makefile.in	Sat Jun  3 11:14:04 2006
-@@ -198,9 +198,9 @@
- 	 $(MAKE) install-basic
- 
- install-basic:
--	$(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); \
- 	done
- 
- strip-post-install:
diff --git a/net-mgmt/nagios2/files/patch-configure.in b/net-mgmt/nagios2/files/patch-configure.in
deleted file mode 100644
index d10acf12fd5e..000000000000
--- a/net-mgmt/nagios2/files/patch-configure.in
+++ /dev/null
@@ -1,19 +0,0 @@
---- 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)
diff --git a/net-mgmt/nagios2/files/patch-contrib-Makefile.in b/net-mgmt/nagios2/files/patch-contrib-Makefile.in
deleted file mode 100644
index dd80e3019859..000000000000
--- a/net-mgmt/nagios2/files/patch-contrib-Makefile.in
+++ /dev/null
@@ -1,17 +0,0 @@
---- contrib/Makefile.in.orig	Tue Nov 15 12:19:36 2005
-+++ contrib/Makefile.in	Wed Dec 28 17:49:25 2005
-@@ -46,10 +46,10 @@
- devclean: distclean
- 
- install:
--	$(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(CGIDIR)
--	$(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(BINDIR)
--	for f in $(CGIS); do $(INSTALL) -m 775 $(INSTALL_OPTS) $$f $(DESTDIR)$(CGIDIR); done
--	for f in $(UTILS); do $(INSTALL) -m 775 $(INSTALL_OPTS) $$f $(DESTDIR)$(BINDIR); done
-+	$(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(CGIDIR)
-+	$(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(BINDIR)
-+	for f in $(CGIS); do $(INSTALL) -m 755 $(INSTALL_OPTS) $$f $(DESTDIR)$(CGIDIR); done
-+	for f in $(UTILS); do $(INSTALL) -m 755 $(INSTALL_OPTS) $$f $(DESTDIR)$(BINDIR); done
- 
- ##############################################################################
- # rules and dependencies for actual target programs
diff --git a/net-mgmt/nagios2/files/patch-html-Makefile.in b/net-mgmt/nagios2/files/patch-html-Makefile.in
deleted file mode 100644
index a34e47dc2970..000000000000
--- a/net-mgmt/nagios2/files/patch-html-Makefile.in
+++ /dev/null
@@ -1,61 +0,0 @@
---- 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
- 
- 
- 
diff --git a/net-mgmt/nagios2/files/patch-html-docs-xodtemplate.html b/net-mgmt/nagios2/files/patch-html-docs-xodtemplate.html
deleted file mode 100644
index 156de7c7a396..000000000000
--- a/net-mgmt/nagios2/files/patch-html-docs-xodtemplate.html
+++ /dev/null
@@ -1,24 +0,0 @@
---- html/docs/xodtemplate.html.orig	Wed Dec 27 05:03:22 2006
-+++ html/docs/xodtemplate.html	Sat Jan 27 18:56:48 2007
-@@ -493,9 +493,9 @@
- <p class="SectionBody">
- <pre>
- define service{
--	host_name		linux-server
--	service_description	check-disk-sda1
--	check_command		check-disk!/dev/sda1
-+	host_name		freebsd-server
-+	service_description	check-disk-ad0s1a
-+	check_command		check-disk!/dev/ad0s1a
- 	max_check_attempts	5
- 	normal_check_interval	5
- 	retry_check_interval	3
-@@ -503,7 +503,7 @@
- 	notification_interval	30
- 	notification_period	24x7
- 	notification_options	w,c,r
--	contact_groups		linux-admins
-+	contact_groups		freebsd-admins
- 	}
- </pre>
- </p>
diff --git a/net-mgmt/nagios2/files/patch-sample-config-template-object-localhost.cfg.in b/net-mgmt/nagios2/files/patch-sample-config-template-object-localhost.cfg.in
deleted file mode 100644
index ff3f25aac049..000000000000
--- a/net-mgmt/nagios2/files/patch-sample-config-template-object-localhost.cfg.in
+++ /dev/null
@@ -1,36 +0,0 @@
---- sample-config/template-object/localhost.cfg.in.orig	Tue Nov 28 12:59:05 2006
-+++ sample-config/template-object/localhost.cfg.in	Sat Jan 27 19:01:52 2007
-@@ -151,15 +151,15 @@
-         }
- 
- 
--# Linux host definition template - This is NOT a real host, just a template!
-+# FreeBSD host definition template - This is NOT a real host, just a template!
- 
- define host{
--	name				linux-server	; The name of this host template
-+	name				freebsd-server	; The name of this host template
- 	use				generic-host	; This template inherits other values from the generic-host template
--	check_period			24x7		; By default, Linux hosts are checked round the clock
--	max_check_attempts		10		; Check each Linux host 10 times (max)
--        check_command           	check-host-alive ; Default command to check Linux hosts
--	notification_period		workhours	; Linux admins hate to be woken up, so we only notify during the day
-+	check_period			24x7		; By default, FreeBSD hosts are checked round the clock
-+	max_check_attempts		10		; Check each FreeBSD host 10 times (max)
-+        check_command           	check-host-alive ; Default command to check FreeBSD hosts
-+	notification_period		workhours	; FreeBSD admins hate to be woken up, so we only notify during the day
- 							; Note that the notification_period variable is being overridden from
- 							; the value that is inherited from the generic-host template!
- 	notification_interval		120		; Resend notification every 2 hours
-@@ -173,9 +173,9 @@
- # local host (this machine).
- 
- define host{
--        use                     linux-server            ; Name of host template to use
-+        use                     freebsd-server            ; Name of host template to use
- 							; This host definition will inherit all variables that are defined
--							; in (or inherited by) the linux-server host template definition.
-+							; in (or inherited by) the freebsd-server host template definition.
-         host_name               localhost
-         alias                   localhost
-         address                 127.0.0.1
diff --git a/net-mgmt/nagios2/files/pkg-deinstall.in b/net-mgmt/nagios2/files/pkg-deinstall.in
deleted file mode 100644
index 6b20aa9bc962..000000000000
--- a/net-mgmt/nagios2/files/pkg-deinstall.in
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/bin/sh
-#
-# $FreeBSD$
-#
-
-NAGIOSDIR=%%NAGIOSDIR%%
-NAGIOSUSER=%%NAGIOSUSER%%
-NAGIOSGROUP=%%NAGIOSGROUP%%
-
-if [ "$2" = "POST-DEINSTALL" ]; then
-  if /usr/sbin/pw group show "${NAGIOSGROUP}" 2>&1 >/dev/null; then
-    echo "You should manually remove the \"${NAGIOSGROUP}\" group."
-  fi
-
-  if /usr/sbin/pw user show "${NAGIOSUSER}" 2>&1 >/dev/null; then
-    echo "You should manually remove the \"${NAGIOSUSER}\" user."
-  fi
-
-  if [ -e "${NAGIOSDIR}" ]; then
-    echo "You should manually remove the \"${NAGIOSDIR}\" directory."
-  fi
-fi
diff --git a/net-mgmt/nagios2/files/pkg-install.in b/net-mgmt/nagios2/files/pkg-install.in
deleted file mode 100644
index f670f79b45ff..000000000000
--- a/net-mgmt/nagios2/files/pkg-install.in
+++ /dev/null
@@ -1,74 +0,0 @@
-#!/bin/sh
-#
-# $FreeBSD$
-#
-
-NAGIOSDIR=%%NAGIOSDIR%%
-NAGIOSUSER=%%NAGIOSUSER%%
-NAGIOSGROUP=%%NAGIOSGROUP%%
-NAGIOSUID=%%NAGIOSUID%%
-NAGIOSGID=%%NAGIOSGID%%
-
-ask() {
-  local question default answer
-
-  question=$1
-  default=$2
-  if [ -z "${PACKAGE_BUILDING}" ]; then
-    read -p "${question} [${default}]? " answer
-  fi
-  if [ "x${answer}" = "x" ]; then
-    answer=${default}
-  fi
-  echo ${answer}
-}
-
-yesno() {
-  local default question answer
-
-  question=$1
-  default=$2
-  while :; do
-    answer=$(ask "${question}" "${default}")
-    case "${answer}" in
-      [Yy][Ee][Ss]|[Yy])
-        return 0
-        ;;
-      [Nn][Oo]|[Nn])
-        return 1
-        ;;
-    esac
-    echo "Please answer yes or no."
-   done
-}
-
-if [ "$2" = "PRE-INSTALL" ]; then
-  if /usr/sbin/pw group show "${NAGIOSGROUP}" 2>&1 >/dev/null; then
-    echo "You already have a \"${NAGIOSGROUP}\" group, so I will use it."
-  else
-    echo "You need a \"${NAGIOSGROUP}\" group."
-    if yesno "Would you like me to create it" "YES"; then
-      /usr/sbin/pw groupadd "${NAGIOSGROUP}" -g "${NAGIOSGID}" -h - || \
-        /usr/sbin/pw groupadd "${NAGIOSGROUP}" -h - || exit
-      echo "Done."
-    else
-      echo "Please create the \"${NAGIOSGROUP}\" group manually and try again."
-      exit 1
-    fi
-  fi
-
-  if /usr/sbin/pw user show "${NAGIOSUSER}" 2>&1 >/dev/null; then
-    echo "You already have a \"${NAGIOSUSER}\" user, so I will use it."
-  else
-    echo "You need a \"${NAGIOSUSER}\" user."
-    if yesno "Would you like me to create it" "YES"; then
-      /usr/sbin/pw useradd "${NAGIOSUSER}" -u "${NAGIOSUID}" -g "${NAGIOSGROUP}" -h - -d "${NAGIOSDIR}" \
-        -s /sbin/nologin -c "Nagios pseudo-user" || \
-        /usr/sbin/pw useradd "${NAGIOSUSER}" -g "${NAGIOSGROUP}" -h - -d "${NAGIOSDIR}" \
-        -s /sbin/nologin -c "Nagios pseudo-user" || exit
-    else
-      echo "Please create the \"${NAGIOSUSER}\" user manually and try again."
-      exit 1
-    fi
-  fi
-fi
diff --git a/net-mgmt/nagios2/files/pkg-message.in b/net-mgmt/nagios2/files/pkg-message.in
deleted file mode 100644
index 41b08b6bcc67..000000000000
--- a/net-mgmt/nagios2/files/pkg-message.in
+++ /dev/null
@@ -1,36 +0,0 @@
-**********************************************************************
-
- Enable nagios in /etc/rc.conf with the following line:
-
-   nagios_enable="YES"
-
- Configuration templates are available in %%PREFIX%%/etc/nagios as
- *.cfg-sample files.  Copy then to *.cfg files where required and
- edit to suit your needs.  Documentation is available in HTML form
- in %%PREFIX%%/%%NAGIOSWWWDIR%%/docs.
-
- If you don't already have a web server running, you will need to
- install and configure one to finish off your nagios installation.
- When used with Apache, the following should be sufficient to publish
- the web component of nagios (modification of allow list encouraged):
-
-   <Directory %%PREFIX%%/%%NAGIOSWWWDIR%%>
-     Order allow,deny
-     Allow from all
-   </Directory>
-
-   <Directory %%PREFIX%%/%%NAGIOSWWWDIR%%/cgi-bin>
-     Options ExecCGI
-   </Directory>
-
-  ScriptAlias %%NAGIOSCGIURL%%/ %%PREFIX%%/%%NAGIOSWWWDIR%%/cgi-bin/
-  Alias %%NAGIOSHTMURL%%/  %%PREFIX%%/%%NAGIOSWWWDIR%%/
-
-**********************************************************************
-
- Users experiencing troubles with logos used in the Status Map CGI
- should first check the value of the physical_html_path variable
- defined in %%PREFIX%%/etc/nagios/cgi.cfg.  Refer to the example in
- %%PREFIX%%/etc/nagios/cgi.cfg-sample for the correct value.
-
-**********************************************************************