- Re-add old patches.

- Remove recent patches.

17 files changed, 240 insertions, 137 deletions

diff --git a/net-mgmt/nagios12/files/nagios.sh.tmpl b/net-mgmt/nagios12/files/nagios.sh.tmpl
index 5355f3c382b7..d3cd0691f819 100644
--- a/net-mgmt/nagios12/files/nagios.sh.tmpl
+++ b/net-mgmt/nagios12/files/nagios.sh.tmpl
@@ -20,7 +20,7 @@ required_files=${prefix}/etc/nagios/nagios.cfg
 
 NagiosBin=${prefix}/bin/nagios
 NagiosCfg=${prefix}/etc/nagios/nagios.cfg
-NagiosVar=%%NAGIOSDIR%%
+NagiosVar=/var/spool/nagios
 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=%%NAGIOSUSER%%
+nagios_user=nagios
 
 start_precmd=start_precmd
 stop_postcmd=stop_postcmd
diff --git a/net-mgmt/nagios12/files/patch-Makefile.in b/net-mgmt/nagios12/files/patch-Makefile.in
deleted file mode 100644
index 4d0a7a146117..000000000000
--- a/net-mgmt/nagios12/files/patch-Makefile.in
+++ /dev/null
@@ -1,25 +0,0 @@
---- 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 ***"
diff --git a/net-mgmt/nagios12/files/patch-aa b/net-mgmt/nagios12/files/patch-aa
new file mode 100644
index 000000000000..595da2b80d2c
--- /dev/null
+++ b/net-mgmt/nagios12/files/patch-aa
@@ -0,0 +1,37 @@
+--- 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
new file mode 100644
index 000000000000..6634c8f6b40a
--- /dev/null
+++ b/net-mgmt/nagios12/files/patch-ab
@@ -0,0 +1,10 @@
+--- 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
new file mode 100644
index 000000000000..4518f5907c41
--- /dev/null
+++ b/net-mgmt/nagios12/files/patch-ad
@@ -0,0 +1,69 @@
+--- 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
new file mode 100644
index 000000000000..0bf8e064b3a7
--- /dev/null
+++ b/net-mgmt/nagios12/files/patch-ae
@@ -0,0 +1,11 @@
+--- 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
new file mode 100644
index 000000000000..14027c5d9cc9
--- /dev/null
+++ b/net-mgmt/nagios12/files/patch-ag
@@ -0,0 +1,31 @@
+--- 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
new file mode 100644
index 000000000000..433d6d74758d
--- /dev/null
+++ b/net-mgmt/nagios12/files/patch-ai
@@ -0,0 +1,25 @@
+--- 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-base-Makefile.in b/net-mgmt/nagios12/files/patch-base-Makefile.in
deleted file mode 100644
index 4e83fe27623a..000000000000
--- a/net-mgmt/nagios12/files/patch-base-Makefile.in
+++ /dev/null
@@ -1,16 +0,0 @@
---- 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@
- 
- 
diff --git a/net-mgmt/nagios12/files/patch-cgi-Makefile.in b/net-mgmt/nagios12/files/patch-cgi-Makefile.in
deleted file mode 100644
index 27e6a10cf9bd..000000000000
--- a/net-mgmt/nagios12/files/patch-cgi-Makefile.in
+++ /dev/null
@@ -1,14 +0,0 @@
---- 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
- 
diff --git a/net-mgmt/nagios12/files/patch-configure.in b/net-mgmt/nagios12/files/patch-configure.in
deleted file mode 100644
index d10acf12fd5e..000000000000
--- a/net-mgmt/nagios12/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/nagios12/files/patch-html-Makefile.in b/net-mgmt/nagios12/files/patch-html-Makefile.in
deleted file mode 100644
index a34e47dc2970..000000000000
--- a/net-mgmt/nagios12/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/nagios12/files/patch-xcddb.c b/net-mgmt/nagios12/files/patch-xcddb.c
new file mode 100644
index 000000000000..34bc8dc1759a
--- /dev/null
+++ b/net-mgmt/nagios12/files/patch-xcddb.c
@@ -0,0 +1,11 @@
+--- 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
new file mode 100644
index 000000000000..f1a942e7ae45
--- /dev/null
+++ b/net-mgmt/nagios12/files/patch-xdddb.c
@@ -0,0 +1,11 @@
+--- 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
new file mode 100644
index 000000000000..2aaaa7db9043
--- /dev/null
+++ b/net-mgmt/nagios12/files/patch-xeddb.c
@@ -0,0 +1,11 @@
+--- 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
new file mode 100644
index 000000000000..0f850674b63c
--- /dev/null
+++ b/net-mgmt/nagios12/files/patch-xrddb.c
@@ -0,0 +1,11 @@
+--- 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
new file mode 100644
index 000000000000..e9e1d169cc76
--- /dev/null
+++ b/net-mgmt/nagios12/files/patch-xsddb.c
@@ -0,0 +1,11 @@
+--- 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
+ 
+