16 files changed, 0 insertions, 410 deletions

diff --git a/net-mgmt/nagios12/files/nagios.in b/net-mgmt/nagios12/files/nagios.in
deleted file mode 100644
index fd71477562ff..000000000000
--- a/net-mgmt/nagios12/files/nagios.in
+++ /dev/null
@@ -1,55 +0,0 @@
-#!/bin/sh
-#
-# $FreeBSD: /tmp/pcvs/ports/net-mgmt/nagios12/files/Attic/nagios.in,v 1.1 2008-09-03 00:30:56 pgollucci Exp $
-#
-
-#
-# Add the following lines to /etc/rc.conf to enable nagios:
-#
-#nagios_enable="YES"
-#
-
-. %%RC_SUBR%%
-
-name=nagios
-rcvar=`set_rcvar`
-
-prefix=%%PREFIX%%
-
-required_files=${prefix}/etc/nagios/nagios.cfg
-
-NagiosBin=${prefix}/bin/nagios
-NagiosCfg=${prefix}/etc/nagios/nagios.cfg
-NagiosVar=/var/spool/nagios
-NagiosLog=${NagiosVar}/status.log
-NagiosTmp=${NagiosVar}/nagios.tmp
-NagiosSav=${NagiosVar}/status.sav
-NagiosCmd=${NagiosVar}/rw/nagios.cmd
-NagiosRun=${NagiosVar}/nagios.lock
-
-pidfile=${NagiosRun}
-command=${NagiosBin}
-command_args="-d $NagiosCfg"
-nagios_user=nagios
-
-start_precmd=start_precmd
-stop_postcmd=stop_postcmd
-
-# set defaults
-
-nagios_enable=${nagios_enable:-"NO"}
-nagios_flags=${nagios_flags:-""}
-
-start_precmd()
-{
-  su -m ${nagios_user} -c "touch ${NagiosVar}/nagios.log ${NagiosSav}"
-  rm -f ${NagiosCmd}
-}
-
-stop_postcmd()
-{
-  rm -f $NagiosLog $NagiosTmp $NagiosRun $NagiosCmd
-}
-
-load_rc_config $name
-run_rc_command "$1"
diff --git a/net-mgmt/nagios12/files/patch-aa b/net-mgmt/nagios12/files/patch-aa
deleted file mode 100644
index 595da2b80d2c..000000000000
--- a/net-mgmt/nagios12/files/patch-aa
+++ /dev/null
@@ -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 ***"
diff --git a/net-mgmt/nagios12/files/patch-ab b/net-mgmt/nagios12/files/patch-ab
deleted file mode 100644
index 6634c8f6b40a..000000000000
--- a/net-mgmt/nagios12/files/patch-ab
+++ /dev/null
@@ -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@
- 
diff --git a/net-mgmt/nagios12/files/patch-ad b/net-mgmt/nagios12/files/patch-ad
deleted file mode 100644
index 4518f5907c41..000000000000
--- a/net-mgmt/nagios12/files/patch-ad
+++ /dev/null
@@ -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
diff --git a/net-mgmt/nagios12/files/patch-ae b/net-mgmt/nagios12/files/patch-ae
deleted file mode 100644
index 0bf8e064b3a7..000000000000
--- a/net-mgmt/nagios12/files/patch-ae
+++ /dev/null
@@ -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
diff --git a/net-mgmt/nagios12/files/patch-ag b/net-mgmt/nagios12/files/patch-ag
deleted file mode 100644
index 14027c5d9cc9..000000000000
--- a/net-mgmt/nagios12/files/patch-ag
+++ /dev/null
@@ -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
diff --git a/net-mgmt/nagios12/files/patch-ai b/net-mgmt/nagios12/files/patch-ai
deleted file mode 100644
index 433d6d74758d..000000000000
--- a/net-mgmt/nagios12/files/patch-ai
+++ /dev/null
@@ -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
diff --git a/net-mgmt/nagios12/files/patch-html-Makefile.in b/net-mgmt/nagios12/files/patch-html-Makefile.in
deleted file mode 100644
index 35e24b090687..000000000000
--- a/net-mgmt/nagios12/files/patch-html-Makefile.in
+++ /dev/null
@@ -1,12 +0,0 @@
---- html/Makefile.in.orig	Wed May 25 21:24:12 2005
-+++ html/Makefile.in	Wed May 25 21:24:54 2005
-@@ -33,7 +33,9 @@
- devclean: clean
- 
- install:
-+.if !exists($(DESTDIR)$(HTMLDIR))
- 	$(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)
-+.endif
- 	$(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
diff --git a/net-mgmt/nagios12/files/patch-xcddb.c b/net-mgmt/nagios12/files/patch-xcddb.c
deleted file mode 100644
index 34bc8dc1759a..000000000000
--- a/net-mgmt/nagios12/files/patch-xcddb.c
+++ /dev/null
@@ -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
- 
- 
diff --git a/net-mgmt/nagios12/files/patch-xdddb.c b/net-mgmt/nagios12/files/patch-xdddb.c
deleted file mode 100644
index f1a942e7ae45..000000000000
--- a/net-mgmt/nagios12/files/patch-xdddb.c
+++ /dev/null
@@ -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
- 
- 
diff --git a/net-mgmt/nagios12/files/patch-xeddb.c b/net-mgmt/nagios12/files/patch-xeddb.c
deleted file mode 100644
index 2aaaa7db9043..000000000000
--- a/net-mgmt/nagios12/files/patch-xeddb.c
+++ /dev/null
@@ -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
- 
- 
diff --git a/net-mgmt/nagios12/files/patch-xrddb.c b/net-mgmt/nagios12/files/patch-xrddb.c
deleted file mode 100644
index 0f850674b63c..000000000000
--- a/net-mgmt/nagios12/files/patch-xrddb.c
+++ /dev/null
@@ -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
- 
- 
diff --git a/net-mgmt/nagios12/files/patch-xsddb.c b/net-mgmt/nagios12/files/patch-xsddb.c
deleted file mode 100644
index e9e1d169cc76..000000000000
--- a/net-mgmt/nagios12/files/patch-xsddb.c
+++ /dev/null
@@ -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
- 
- 
diff --git a/net-mgmt/nagios12/files/pkg-deinstall.in b/net-mgmt/nagios12/files/pkg-deinstall.in
deleted file mode 100644
index fad8fb86716e..000000000000
--- a/net-mgmt/nagios12/files/pkg-deinstall.in
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/bin/sh
-#
-#	$FreeBSD: /tmp/pcvs/ports/net-mgmt/nagios12/files/Attic/pkg-deinstall.in,v 1.1 2008-09-03 00:30:56 pgollucci Exp $
-#
-
-USER=%%NAGIOSUSER%%
-GROUP=%%NAGIOSGROUP%%
-DIR=%%NAGIOSDIR%%
-
-if [ "$2" = "POST-DEINSTALL" ]; then
-
-    if /usr/sbin/pw group show "${GROUP}" 2>&1 >/dev/null; then
-	echo "You should manually remove the \"${GROUP}\" group."
-    fi
-
-    if /usr/sbin/pw user show "${USER}" 2>&1 >/dev/null; then
-	echo "You should manually remove the \"${USER}\" user."
-    fi
-
-    if [ -e ${DIR} ]; then
-	echo "You should manually remove the \"${DIR}\" directory."
-    fi
-fi
diff --git a/net-mgmt/nagios12/files/pkg-install.in b/net-mgmt/nagios12/files/pkg-install.in
deleted file mode 100644
index 829919b1a9b5..000000000000
--- a/net-mgmt/nagios12/files/pkg-install.in
+++ /dev/null
@@ -1,67 +0,0 @@
-#!/bin/sh
-#
-#	$FreeBSD: /tmp/pcvs/ports/net-mgmt/nagios12/files/Attic/pkg-install.in,v 1.1 2008-09-03 00:30:56 pgollucci Exp $
-#
-
-USER=%%NAGIOSUSER%%
-GROUP=%%NAGIOSGROUP%%
-DIR=%%NAGIOSDIR%%
-
-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 dflt question answer
-
-    question=$1
-    dflt=$2
-    while :; do
-        answer=$(ask "${question}" "${dflt}")
-        case "${answer}" in
-        [Yy]*)          return 0;;
-        [Nn]*)          return 1;;
-        esac
-        echo "Please answer yes or no."
-    done
-}
-
-if [ x"$2" = xPRE-INSTALL ]; then
-    if /usr/sbin/pw groupshow "${GROUP}" 2>/dev/null; then
-        echo "You already have a group \"${GROUP}\", so I will use it."
-    else
-        echo "You need a group \"${GROUP}\"."
-        if yesno "Would you like me to create it" y; then
-            /usr/sbin/pw groupadd ${GROUP} -h - || exit
-            echo "Done."
-        else
-            echo "Please create it, and try again."
-            exit 1
-        fi
-    fi
-
-    if /usr/sbin/pw user show "${USER}" 2>/dev/null; then
-        echo "You already have a user \"${USER}\", so I will use it."
-    else
-        echo "You need a user \"${USER}\"."
-        if yesno "Would you like me to create it" y; then
-            /usr/sbin/pw useradd ${USER} -g ${GROUP} -h - -d ${DIR} \
-                -s /nonexistent -c "Nagios pseudo-user" || exit
-            echo "Done."
-        else
-            echo "Please create it, and try again."
-            exit 1
-        fi
-    fi
-
-fi
diff --git a/net-mgmt/nagios12/files/pkg-message.in b/net-mgmt/nagios12/files/pkg-message.in
deleted file mode 100644
index a96b0d6243c3..000000000000
--- a/net-mgmt/nagios12/files/pkg-message.in
+++ /dev/null
@@ -1,15 +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 them to *.cfg and edit them to suit
- your needs. Documentation is available in HTML form in
- %%PREFIX%%/share/nagios/docs.
-
- If you don't already have a web server running, you need to install
- and configure it to finish your nagios installation.
-*******************************************************************
-