13 files changed, 509 insertions, 343 deletions

diff --git a/russian/nagios/Makefile b/russian/nagios/Makefile
index 33f546347410..96cbf522daed 100644
--- a/russian/nagios/Makefile
+++ b/russian/nagios/Makefile
@@ -6,70 +6,98 @@
 #
 
 PORTNAME=	nagios
-PORTVERSION=	1.1
+PORTVERSION=	1.2
 CATEGORIES=	russian net-mgmt
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}:main \
 		http://onix.opennet.ru/files/:ruspatch
 MASTER_SITE_SUBDIR=nagios
-DISTFILES=	nagios-1.1.tar.gz:main nagios_rus_1_1.tar.gz:ruspatch
+DISTFILES=	nagios-1.2.tar.gz:main nagios_rus_1_2.tar.gz:ruspatch
 
 MAINTAINER=	sam@brj.pp.ru
 COMMENT=	Extremely powerful network monitoring system with Russian language
 
-LIB_DEPENDS=    gd.4:${PORTSDIR}/graphics/gd
+LIB_DEPENDS=	gd.4:${PORTSDIR}/graphics/gd
 RUN_DEPENDS=	${LOCALBASE}/libexec/nagios/check_nagios:${PORTSDIR}/net-mgmt/nagios-plugins
 
 CONFLICTS=	nagios-1*
 
 USE_GETOPT_LONG=yes
 GNU_CONFIGURE=	yes
+USE_RC_SUBR=	yes
+USE_PERL5_BUILD=yes
 
-CPPFLAGS=	${INCGD} -I${LOCALBASE}/include
+PKGINSTALL=	${WRKDIR}/INSTALL
+PKGDEINSTALL=	${WRKDIR}/DEINSTALL
+PKGMESSAGE=	${WRKDIR}/MESSAGE
+
+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
 CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" \
 		LDFLAGS="${LDFLAGS}" \
-		CFLAGS="${CPPFLAGS} ${CFLAGS} ${INCGD}" \
-		LIBS="-L${LOCALBASE}/lib ${LIBGD}"
-CONFIGURE_ARGS+=	\
-		--with-command-user=nagios \
+		CFLAGS="${CPPFLAGS} ${CFLAGS}" \
+		LIBS="-L${LOCALBASE}/lib -lgd"
+CONFIGURE_ARGS=	--with-command-user=${NAGIOSUSER} \
 		--with-command-grp=www \
-		--with-nagios-user=nagios \
-		--with-nagios-grp=nagios \
+		--with-nagios-user=${NAGIOSUSER} \
+		--with-nagios-grp=${NAGIOSGROUP} \
 		--with-template-objects \
-		--with-template-extinfo \
-		--with-init-dir=${PREFIX}/etc/rc.d \
-		--with-gd-lib=${LOCALBASE}/lib \
 		--sbindir=${PREFIX}/share/nagios/cgi-bin \
 		--libexecdir=${PREFIX}/libexec/nagios \
 		--datadir=${PREFIX}/share/nagios \
 		--sysconfdir=${PREFIX}/etc/nagios \
-		--localstatedir=/var/spool/nagios \
+		--localstatedir=${NAGIOSDIR} \
+		--prefix=${PREFIX}
 
-.if defined(WITH_MYSQL)||defined(WITH_NAGMIN)
+.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(NAGIOS_FILE_PERFDATA)
+.if defined(WITH_FILE_PERFDATA)
 CONFIGURE_ARGS+=--with-file-perfdata
 .endif
 
-.if defined(WITH_POSTGRES)
+.if defined(WITH_PGSQL)
 LIB_DEPENDS+=	pq.3:${PORTSDIR}/databases/postgresql7
 CONFIGURE_ARGS+=--with-pgsql-lib=${LOCALBASE}/pgsql \
 		--with-pgsql-inc=${LOCALBASE}/pgsql \
 		--with-pgsql-xdata
 .endif
 
-INSTALL_TARGET=	all install config install-config install-daemoninit install-commandmode
+SED_SCRIPT=	-e 's,%%NAGIOSUSER%%,${NAGIOSUSER},g' \
+		-e 's,%%NAGIOSGROUP%%,${NAGIOSGROUP},g' \
+		-e 's,%%NAGIOSDIR%%,${NAGIOSDIR},g' \
+		-e 's,%%PREFIX%%,${PREFIX},g' \
+		-e 's,%%RC_SUBR%%,${RC_SUBR},g'
+
+INSTALL_TARGET=	all install config install-config install-commandmode
 
 pre-patch:
-	${CP} -R ${WRKSRC}/../nagios_rus_1_1/cgi/* ${WRKSRC}/cgi/
-	${CP} -R ${WRKSRC}/../nagios_rus_1_1/html/* ${WRKSRC}/html/
-	${CP} -R ${WRKSRC}/../nagios_rus_1_1/html/images/* ${WRKSRC}/html/images/
+	cd ${WRKDIR} && ${PATCH} < ${WRKSRC}/../russian.cgi.patch
+
+pre-build:
+	for f in nagios.sh INSTALL DEINSTALL MESSAGE; do \
+		${SED} ${SED_SCRIPT} < ${FILESDIR}/$${f}.tmpl >${WRKDIR}/$${f}; \
+	done
 
 pre-install:
-	@PKG_PREFIX="${PREFIX}" ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL
+	@${SH} ${PKGINSTALL} ${DISTNAME} PRE-INSTALL
+
+post-install:
+	@${INSTALL_SCRIPT} ${WRKDIR}/nagios.sh ${PREFIX}/etc/rc.d/
+	@${CAT} ${PKGMESSAGE}
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/russian/nagios/distinfo b/russian/nagios/distinfo
index 172e2a50e5f5..5501d650693d 100644
--- a/russian/nagios/distinfo
+++ b/russian/nagios/distinfo
@@ -1,2 +1,4 @@
-MD5 (nagios-1.1.tar.gz) = 5f48ecd9bad2c4d7c9d88d0b6f347ecf
-MD5 (nagios_rus_1_1.tar.gz) = 81253c03ccaa5b30059a11b9e6a707c2
+MD5 (nagios-1.2.tar.gz) = 414d70e5269d5b8d7c21bf3ee129309f
+SIZE (nagios-1.2.tar.gz) = 1625322
+MD5 (nagios_rus_1_2.tar.gz) = 0cb7198f8a97ffa0c8825eb77b61ea30
+SIZE (nagios_rus_1_2.tar.gz) = 105762
diff --git a/russian/nagios/files/DEINSTALL.tmpl b/russian/nagios/files/DEINSTALL.tmpl
new file mode 100644
index 000000000000..3b8854834e20
--- /dev/null
+++ b/russian/nagios/files/DEINSTALL.tmpl
@@ -0,0 +1,23 @@
+#!/bin/sh
+#
+#	$FreeBSD: /tmp/pcvs/ports/russian/nagios/files/Attic/DEINSTALL.tmpl,v 1.1 2004-08-15 18:54:32 sem 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/russian/nagios/pkg-install b/russian/nagios/files/INSTALL.tmpl
index dbc6461bb05e..e408a3c23623 100644
--- a/russian/nagios/pkg-install
+++ b/russian/nagios/files/INSTALL.tmpl
@@ -1,12 +1,11 @@
 #!/bin/sh
 #
-#	$FreeBSD$
+#	$FreeBSD: /tmp/pcvs/ports/russian/nagios/files/Attic/INSTALL.tmpl,v 1.1 2004-08-15 18:54:32 sem Exp $
 #
 
-PKG_PREFIX=${PKG_PREFIX:=/usr/local}
-
-user=nagios
-group=nagios
+USER=%%NAGIOSUSER%%
+GROUP=%%NAGIOSGROUP%%
+DIR=%%NAGIOSDIR%%
 
 ask() {
     local question default answer
@@ -38,12 +37,12 @@ yesno() {
 }
 
 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."
+    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}\"."
+        echo "You need a group \"${GROUP}\"."
         if yesno "Would you like me to create it" y; then
-            /usr/sbin/pw groupadd ${group} -h - || exit
+            /usr/sbin/pw groupadd ${GROUP} -h - || exit
             echo "Done."
         else
             echo "Please create it, and try again."
@@ -51,12 +50,12 @@ if [ x"$2" = xPRE-INSTALL ]; then
         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."
+    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}\"."
+        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 ${PKG_PREFIX}/var/nagios \
+            /usr/sbin/pw useradd ${USER} -g ${GROUP} -h - -d ${DIR} \
                 -s /nonexistent -c "Nagios pseudo-user" || exit
             echo "Done."
         else
diff --git a/russian/nagios/files/MESSAGE.tmpl b/russian/nagios/files/MESSAGE.tmpl
new file mode 100644
index 000000000000..a96b0d6243c3
--- /dev/null
+++ b/russian/nagios/files/MESSAGE.tmpl
@@ -0,0 +1,15 @@
+
+*******************************************************************
+ 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.
+*******************************************************************
+
diff --git a/russian/nagios/files/nagios.sh.tmpl b/russian/nagios/files/nagios.sh.tmpl
new file mode 100644
index 000000000000..16b8b4506bf2
--- /dev/null
+++ b/russian/nagios/files/nagios.sh.tmpl
@@ -0,0 +1,55 @@
+#!/bin/sh
+#
+# $FreeBSD: /tmp/pcvs/ports/russian/nagios/files/Attic/nagios.sh.tmpl,v 1.1 2004-08-15 18:54:32 sem 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/russian/nagios/files/patch-ad b/russian/nagios/files/patch-ad
index 10c3db33738b..4518f5907c41 100644
--- a/russian/nagios/files/patch-ad
+++ b/russian/nagios/files/patch-ad
@@ -1,5 +1,5 @@
---- configure.orig	Tue Jun  3 12:47:57 2003
-+++ configure	Thu Jul 31 16:35:45 2003
+--- 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
@@ -40,30 +40,30 @@
  	
  fi
  
-@@ -2748,14 +2753,14 @@
- 	fi
+@@ -2692,14 +2697,14 @@
  
- 		if test x$GDLIBFOUND = x; then
--		echo $ac_n "checking for gdImagePng in -lgd (order 3)""... $ac_c" 1>&6
--echo "configure:2753: checking for gdImagePng in -lgd (order 3)" >&5
-+		echo $ac_n "checking for gdImagePng in -lgd1 (order 3)""... $ac_c" 1>&6
-+echo "configure:2753: checking for gdImagePng in -lgd1 (order 3)" >&5
- 					ac_lib_var=`echo gd'_'gdImagePng'_'3 | sed 'y%./+-%__p_%'`
+ 
+ 	
+-		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 -lpng -lz -lm $LIBS"
-+	LIBS="-lgd1 -lz -lm -lpng -ljpeg $LIBS"
+-	LIBS="-lgd $ICONV -lz -lm -lpng -ljpeg $LIBS"
++	LIBS="-lgd1 $ICONV -lz -lm -lpng -ljpeg $LIBS"
  	cat > conftest.$ac_ext <<EOF
- #line 2761 "configure"
+ #line 2705 "configure"
  #include "confdefs.h"
-@@ -2785,7 +2790,7 @@
+@@ -2729,7 +2734,7 @@
  	  echo "$ac_t""yes" 1>&6
  	  
  			GDLIBFOUND=yep
--			GDLIBS="-lgd -lpng -lz -lm"
-+			GDLIBS="-lgd1 -lz -lm -lpng"
+-			GDLIBS="-lgd $ICONV -lz -lm -lpng -ljpeg"
++			GDLIBS="-lgd1 $ICONV -lz -lm -lpng -ljpeg"
  	        	
  	else
  	  echo "$ac_t""no" 1>&6
diff --git a/russian/nagios/files/patch-xdddb.c b/russian/nagios/files/patch-xdddb.c
new file mode 100644
index 000000000000..f1a942e7ae45
--- /dev/null
+++ b/russian/nagios/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/russian/nagios/files/patch-xeddb.c b/russian/nagios/files/patch-xeddb.c
new file mode 100644
index 000000000000..2aaaa7db9043
--- /dev/null
+++ b/russian/nagios/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/russian/nagios/files/patch-xrddb.c b/russian/nagios/files/patch-xrddb.c
new file mode 100644
index 000000000000..0f850674b63c
--- /dev/null
+++ b/russian/nagios/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/russian/nagios/files/patch-xsddb.c b/russian/nagios/files/patch-xsddb.c
new file mode 100644
index 000000000000..e9e1d169cc76
--- /dev/null
+++ b/russian/nagios/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
+ 
+ 
diff --git a/russian/nagios/pkg-descr b/russian/nagios/pkg-descr
index e4da8a078204..8006ef72709f 100644
--- a/russian/nagios/pkg-descr
+++ b/russian/nagios/pkg-descr
@@ -1,3 +1,3 @@
-nagios v 1.1 with Russian language patches
+nagios v 1.2 with Russian language patches
 
 WWW: http://onix.opennet.ru/
diff --git a/russian/nagios/pkg-plist b/russian/nagios/pkg-plist
index 96865c1dcdce..2f1a32523a20 100644
--- a/russian/nagios/pkg-plist
+++ b/russian/nagios/pkg-plist
@@ -1,4 +1,4 @@
-@exec mkdir -p %D/%%DATADIR%%//ssi
+@exec mkdir -p %D/share/nagios/ssi
 @exec mkdir -p /var/spool/nagios/archives
 @exec mkdir -p /var/spool/nagios/rw
 @exec chmod 775 /var/spool/nagios /var/spool/nagios/archives /var/spool/nagios/rw
@@ -21,294 +21,294 @@ etc/nagios/serviceextinfo.cfg-sample
 etc/nagios/services.cfg-sample
 etc/nagios/timeperiods.cfg-sample
 etc/rc.d/nagios.sh
-%%DATADIR%%/cgi-bin/avail.cgi
-%%DATADIR%%/cgi-bin/cmd.cgi
-%%DATADIR%%/cgi-bin/config.cgi
-%%DATADIR%%/cgi-bin/extinfo.cgi
-%%DATADIR%%/cgi-bin/histogram.cgi
-%%DATADIR%%/cgi-bin/history.cgi
-%%DATADIR%%/cgi-bin/notifications.cgi
-%%DATADIR%%/cgi-bin/outages.cgi
-%%DATADIR%%/cgi-bin/showlog.cgi
-%%DATADIR%%/cgi-bin/status.cgi
-%%DATADIR%%/cgi-bin/statusmap.cgi
-%%DATADIR%%/cgi-bin/statuswml.cgi
-%%DATADIR%%/cgi-bin/statuswrl.cgi
-%%DATADIR%%/cgi-bin/summary.cgi
-%%DATADIR%%/cgi-bin/tac.cgi
-%%DATADIR%%/cgi-bin/trends.cgi
-%%DATADIR%%/contexthelp/A1.html
-%%DATADIR%%/contexthelp/A2.html
-%%DATADIR%%/contexthelp/A3.html
-%%DATADIR%%/contexthelp/A4.html
-%%DATADIR%%/contexthelp/A5.html
-%%DATADIR%%/contexthelp/A6.html
-%%DATADIR%%/contexthelp/A7.html
-%%DATADIR%%/contexthelp/B1.html
-%%DATADIR%%/contexthelp/C1.html
-%%DATADIR%%/contexthelp/D1.html
-%%DATADIR%%/contexthelp/E1.html
-%%DATADIR%%/contexthelp/F1.html
-%%DATADIR%%/contexthelp/G1.html
-%%DATADIR%%/contexthelp/G2.html
-%%DATADIR%%/contexthelp/G3.html
-%%DATADIR%%/contexthelp/G4.html
-%%DATADIR%%/contexthelp/G5.html
-%%DATADIR%%/contexthelp/G6.html
-%%DATADIR%%/contexthelp/H1.html
-%%DATADIR%%/contexthelp/H2.html
-%%DATADIR%%/contexthelp/H3.html
-%%DATADIR%%/contexthelp/H4.html
-%%DATADIR%%/contexthelp/H5.html
-%%DATADIR%%/contexthelp/H6.html
-%%DATADIR%%/contexthelp/H7.html
-%%DATADIR%%/contexthelp/H8.html
-%%DATADIR%%/contexthelp/I1.html
-%%DATADIR%%/contexthelp/I2.html
-%%DATADIR%%/contexthelp/I3.html
-%%DATADIR%%/contexthelp/I4.html
-%%DATADIR%%/contexthelp/I5.html
-%%DATADIR%%/contexthelp/I6.html
-%%DATADIR%%/contexthelp/I7.html
-%%DATADIR%%/contexthelp/I8.html
-%%DATADIR%%/contexthelp/J1.html
-%%DATADIR%%/contexthelp/K1.html
-%%DATADIR%%/contexthelp/L1.html
-%%DATADIR%%/contexthelp/L10.html
-%%DATADIR%%/contexthelp/L11.html
-%%DATADIR%%/contexthelp/L12.html
-%%DATADIR%%/contexthelp/L13.html
-%%DATADIR%%/contexthelp/L2.html
-%%DATADIR%%/contexthelp/L3.html
-%%DATADIR%%/contexthelp/L4.html
-%%DATADIR%%/contexthelp/L5.html
-%%DATADIR%%/contexthelp/L6.html
-%%DATADIR%%/contexthelp/L7.html
-%%DATADIR%%/contexthelp/L8.html
-%%DATADIR%%/contexthelp/L9.html
-%%DATADIR%%/contexthelp/M1.html
-%%DATADIR%%/contexthelp/M2.html
-%%DATADIR%%/contexthelp/M3.html
-%%DATADIR%%/contexthelp/M4.html
-%%DATADIR%%/contexthelp/M5.html
-%%DATADIR%%/contexthelp/M6.html
-%%DATADIR%%/contexthelp/N1.html
-%%DATADIR%%/contexthelp/N2.html
-%%DATADIR%%/contexthelp/N3.html
-%%DATADIR%%/contexthelp/N4.html
-%%DATADIR%%/contexthelp/N5.html
-%%DATADIR%%/contexthelp/N6.html
-%%DATADIR%%/contexthelp/N7.html
-%%DATADIR%%/docs/images/activepassive.png
-%%DATADIR%%/docs/images/cgi-avail-a.png
-%%DATADIR%%/docs/images/cgi-avail-b.png
-%%DATADIR%%/docs/images/cgi-cmd.png
-%%DATADIR%%/docs/images/cgi-config.png
-%%DATADIR%%/docs/images/cgi-extinfo-a.png
-%%DATADIR%%/docs/images/cgi-extinfo-b.png
-%%DATADIR%%/docs/images/cgi-extinfo-c.png
-%%DATADIR%%/docs/images/cgi-extinfo-d.png
-%%DATADIR%%/docs/images/cgi-histogram.png
-%%DATADIR%%/docs/images/cgi-history.png
-%%DATADIR%%/docs/images/cgi-notifications.png
-%%DATADIR%%/docs/images/cgi-outages.png
-%%DATADIR%%/docs/images/cgi-showlog.png
-%%DATADIR%%/docs/images/cgi-status-a.png
-%%DATADIR%%/docs/images/cgi-status-b.png
-%%DATADIR%%/docs/images/cgi-status-c.png
-%%DATADIR%%/docs/images/cgi-status-d.png
-%%DATADIR%%/docs/images/cgi-statusmap.png
-%%DATADIR%%/docs/images/cgi-statuswml.png
-%%DATADIR%%/docs/images/cgi-statuswrl.png
-%%DATADIR%%/docs/images/cgi-summary.png
-%%DATADIR%%/docs/images/cgi-tac.png
-%%DATADIR%%/docs/images/cgi-trends.png
-%%DATADIR%%/docs/images/checktiming.png
-%%DATADIR%%/docs/images/distributed.png
-%%DATADIR%%/docs/images/host-dependencies.png
-%%DATADIR%%/docs/images/indirecthostcheck.png
-%%DATADIR%%/docs/images/indirectsvccheck.png
-%%DATADIR%%/docs/images/indirectsvccheck2.png
-%%DATADIR%%/docs/images/interleaved1.png
-%%DATADIR%%/docs/images/interleaved2.png
-%%DATADIR%%/docs/images/interleaved3.png
-%%DATADIR%%/docs/images/logofullsize.png
-%%DATADIR%%/docs/images/network-heirarchy.png
-%%DATADIR%%/docs/images/network-outage1.png
-%%DATADIR%%/docs/images/network-outage2.png
-%%DATADIR%%/docs/images/noninterleaved1.png
-%%DATADIR%%/docs/images/noninterleaved2.png
-%%DATADIR%%/docs/images/physical-network.png
-%%DATADIR%%/docs/images/plugintheory.png
-%%DATADIR%%/docs/images/redudancy.png
-%%DATADIR%%/docs/images/redundancy.png
-%%DATADIR%%/docs/images/service-dependencies.png
-%%DATADIR%%/docs/images/statetransitions.png
-%%DATADIR%%/docs/images/statetransitions2.png
-%%DATADIR%%/docs/about.html
-%%DATADIR%%/docs/addons.html
-%%DATADIR%%/docs/beginners.html
-%%DATADIR%%/docs/cgiauth.html
-%%DATADIR%%/docs/cgiincludes.html
-%%DATADIR%%/docs/cgis.html
-%%DATADIR%%/docs/checkscheduling.html
-%%DATADIR%%/docs/clusters.html
-%%DATADIR%%/docs/commandfile.html
-%%DATADIR%%/docs/config.html
-%%DATADIR%%/docs/configcgi.html
-%%DATADIR%%/docs/configextinfo.html
-%%DATADIR%%/docs/configmain.html
-%%DATADIR%%/docs/configobject.html
-%%DATADIR%%/docs/dependencies.html
-%%DATADIR%%/docs/distributed.html
-%%DATADIR%%/docs/downtime.html
-%%DATADIR%%/docs/embeddedperl.html
-%%DATADIR%%/docs/escalations.html
-%%DATADIR%%/docs/eventhandlers.html
-%%DATADIR%%/docs/extcommands.html
-%%DATADIR%%/docs/faqs.html
-%%DATADIR%%/docs/flapping.html
-%%DATADIR%%/docs/freshness.html
-%%DATADIR%%/docs/funstuff.html
-%%DATADIR%%/docs/index.html
-%%DATADIR%%/docs/indirectchecks.html
-%%DATADIR%%/docs/installing.html
-%%DATADIR%%/docs/installweb.html
-%%DATADIR%%/docs/int-portsentry.html
-%%DATADIR%%/docs/int-snmptrap.html
-%%DATADIR%%/docs/int-tcpwrappers.html
-%%DATADIR%%/docs/macros.html
-%%DATADIR%%/docs/networkoutages.html
-%%DATADIR%%/docs/networkreachability.html
-%%DATADIR%%/docs/notifications.html
-%%DATADIR%%/docs/parallelization.html
-%%DATADIR%%/docs/passivechecks.html
-%%DATADIR%%/docs/perfdata.html
-%%DATADIR%%/docs/plugins.html
-%%DATADIR%%/docs/plugintheory.html
-%%DATADIR%%/docs/redundancy.html
-%%DATADIR%%/docs/robots.txt
-%%DATADIR%%/docs/security.html
-%%DATADIR%%/docs/stalking.html
-%%DATADIR%%/docs/starting.html
-%%DATADIR%%/docs/statetypes.html
-%%DATADIR%%/docs/stoprestart.html
-%%DATADIR%%/docs/templaterecursion.html
-%%DATADIR%%/docs/templatetricks.html
-%%DATADIR%%/docs/timeperiods.html
-%%DATADIR%%/docs/toc.html
-%%DATADIR%%/docs/tuning.html
-%%DATADIR%%/docs/verifyconfig.html
-%%DATADIR%%/docs/volatileservices.html
-%%DATADIR%%/docs/whatsnew.html
-%%DATADIR%%/docs/xdata-db.html
-%%DATADIR%%/docs/xeddefault.html
-%%DATADIR%%/docs/xedtemplate.html
-%%DATADIR%%/docs/xoddefault.html
-%%DATADIR%%/docs/xodtemplate.html
-%%DATADIR%%/docs/xpddefault.html
-%%DATADIR%%/docs/xpdfile.html
-%%DATADIR%%/images/ack.gif
-%%DATADIR%%/images/command.png
-%%DATADIR%%/images/comment.gif
-%%DATADIR%%/images/contexthelp1.gif
-%%DATADIR%%/images/contexthelp2.gif
-%%DATADIR%%/images/critical.png
-%%DATADIR%%/images/delay.gif
-%%DATADIR%%/images/delete.gif
-%%DATADIR%%/images/disabled.gif
-%%DATADIR%%/images/down.gif
-%%DATADIR%%/images/downtime.gif
-%%DATADIR%%/images/empty.gif
-%%DATADIR%%/images/enabled.gif
-%%DATADIR%%/images/extinfo.gif
-%%DATADIR%%/images/flapping.gif
-%%DATADIR%%/images/greendot.gif
-%%DATADIR%%/images/histogram.png
-%%DATADIR%%/images/history.gif
-%%DATADIR%%/images/hostevent.gif
-%%DATADIR%%/images/info.png
-%%DATADIR%%/images/left.gif
-%%DATADIR%%/images/logofullsize.jpg
-%%DATADIR%%/images/logos/nagios.gd2
-%%DATADIR%%/images/logos/nagios.gif
-%%DATADIR%%/images/logos/nagiosvrml.png
-%%DATADIR%%/images/logos/unknown.gd2
-%%DATADIR%%/images/logos/unknown.gif
-%%DATADIR%%/images/logrotate.png
-%%DATADIR%%/images/ndisabled.gif
-%%DATADIR%%/images/noack.gif
-%%DATADIR%%/images/notes.gif
-%%DATADIR%%/images/notify.gif
-%%DATADIR%%/images/orangedot.gif
-%%DATADIR%%/images/passiveonly.gif
-%%DATADIR%%/images/recovery.png
-%%DATADIR%%/images/redudancy.png
-%%DATADIR%%/images/redundancy.png
-%%DATADIR%%/images/restart.gif
-%%DATADIR%%/images/right.gif
-%%DATADIR%%/images/sbconfig.png
-%%DATADIR%%/images/sbgeneral.png
-%%DATADIR%%/images/sblogo.jpg
-%%DATADIR%%/images/sbmonitor.png
-%%DATADIR%%/images/sbreport.png
-%%DATADIR%%/images/serviceevent.gif
-%%DATADIR%%/images/start.gif
-%%DATADIR%%/images/status.gif
-%%DATADIR%%/images/status2.gif
-%%DATADIR%%/images/status3.gif
-%%DATADIR%%/images/status4.gif
-%%DATADIR%%/images/stop.gif
-%%DATADIR%%/images/tacdisabled.jpg
-%%DATADIR%%/images/tacdisabled.png
-%%DATADIR%%/images/tacenabled.jpg
-%%DATADIR%%/images/tacenabled.png
-%%DATADIR%%/images/thermcrit.png
-%%DATADIR%%/images/thermok.png
-%%DATADIR%%/images/thermwarn.png
-%%DATADIR%%/images/trends.gif
-%%DATADIR%%/images/trendshost.png
-%%DATADIR%%/images/trendssvc.png
-%%DATADIR%%/images/unknown.png
-%%DATADIR%%/images/up.gif
-%%DATADIR%%/images/warning.png
-%%DATADIR%%/images/weblogo1.png
-%%DATADIR%%/images/zoom1.gif
-%%DATADIR%%/images/zoom2.gif
-%%DATADIR%%/index.html
-%%DATADIR%%/main.html
-%%DATADIR%%/media/critical.wav
-%%DATADIR%%/media/hostdown.wav
-%%DATADIR%%/media/warning.wav
-%%DATADIR%%/robots.txt
-%%DATADIR%%/side.html
-%%DATADIR%%/stylesheets/avail.css
-%%DATADIR%%/stylesheets/checksanity.css
-%%DATADIR%%/stylesheets/cmd.css
-%%DATADIR%%/stylesheets/config.css
-%%DATADIR%%/stylesheets/extinfo.css
-%%DATADIR%%/stylesheets/histogram.css
-%%DATADIR%%/stylesheets/history.css
-%%DATADIR%%/stylesheets/ministatus.css
-%%DATADIR%%/stylesheets/notifications.css
-%%DATADIR%%/stylesheets/outages.css
-%%DATADIR%%/stylesheets/showlog.css
-%%DATADIR%%/stylesheets/status.css
-%%DATADIR%%/stylesheets/statusmap.css
-%%DATADIR%%/stylesheets/summary.css
-%%DATADIR%%/stylesheets/tac.css
-%%DATADIR%%/stylesheets/trends.css
+share/nagios/cgi-bin/avail.cgi
+share/nagios/cgi-bin/cmd.cgi
+share/nagios/cgi-bin/config.cgi
+share/nagios/cgi-bin/extinfo.cgi
+share/nagios/cgi-bin/histogram.cgi
+share/nagios/cgi-bin/history.cgi
+share/nagios/cgi-bin/notifications.cgi
+share/nagios/cgi-bin/outages.cgi
+share/nagios/cgi-bin/showlog.cgi
+share/nagios/cgi-bin/status.cgi
+share/nagios/cgi-bin/statusmap.cgi
+share/nagios/cgi-bin/statuswml.cgi
+share/nagios/cgi-bin/statuswrl.cgi
+share/nagios/cgi-bin/summary.cgi
+share/nagios/cgi-bin/tac.cgi
+share/nagios/cgi-bin/trends.cgi
+share/nagios/contexthelp/A1.html
+share/nagios/contexthelp/A2.html
+share/nagios/contexthelp/A3.html
+share/nagios/contexthelp/A4.html
+share/nagios/contexthelp/A5.html
+share/nagios/contexthelp/A6.html
+share/nagios/contexthelp/A7.html
+share/nagios/contexthelp/B1.html
+share/nagios/contexthelp/C1.html
+share/nagios/contexthelp/D1.html
+share/nagios/contexthelp/E1.html
+share/nagios/contexthelp/F1.html
+share/nagios/contexthelp/G1.html
+share/nagios/contexthelp/G2.html
+share/nagios/contexthelp/G3.html
+share/nagios/contexthelp/G4.html
+share/nagios/contexthelp/G5.html
+share/nagios/contexthelp/G6.html
+share/nagios/contexthelp/H1.html
+share/nagios/contexthelp/H2.html
+share/nagios/contexthelp/H3.html
+share/nagios/contexthelp/H4.html
+share/nagios/contexthelp/H5.html
+share/nagios/contexthelp/H6.html
+share/nagios/contexthelp/H7.html
+share/nagios/contexthelp/H8.html
+share/nagios/contexthelp/I1.html
+share/nagios/contexthelp/I2.html
+share/nagios/contexthelp/I3.html
+share/nagios/contexthelp/I4.html
+share/nagios/contexthelp/I5.html
+share/nagios/contexthelp/I6.html
+share/nagios/contexthelp/I7.html
+share/nagios/contexthelp/I8.html
+share/nagios/contexthelp/J1.html
+share/nagios/contexthelp/K1.html
+share/nagios/contexthelp/L1.html
+share/nagios/contexthelp/L10.html
+share/nagios/contexthelp/L11.html
+share/nagios/contexthelp/L12.html
+share/nagios/contexthelp/L13.html
+share/nagios/contexthelp/L2.html
+share/nagios/contexthelp/L3.html
+share/nagios/contexthelp/L4.html
+share/nagios/contexthelp/L5.html
+share/nagios/contexthelp/L6.html
+share/nagios/contexthelp/L7.html
+share/nagios/contexthelp/L8.html
+share/nagios/contexthelp/L9.html
+share/nagios/contexthelp/M1.html
+share/nagios/contexthelp/M2.html
+share/nagios/contexthelp/M3.html
+share/nagios/contexthelp/M4.html
+share/nagios/contexthelp/M5.html
+share/nagios/contexthelp/M6.html
+share/nagios/contexthelp/N1.html
+share/nagios/contexthelp/N2.html
+share/nagios/contexthelp/N3.html
+share/nagios/contexthelp/N4.html
+share/nagios/contexthelp/N5.html
+share/nagios/contexthelp/N6.html
+share/nagios/contexthelp/N7.html
+share/nagios/docs/images/activepassive.png
+share/nagios/docs/images/cgi-avail-a.png
+share/nagios/docs/images/cgi-avail-b.png
+share/nagios/docs/images/cgi-cmd.png
+share/nagios/docs/images/cgi-config.png
+share/nagios/docs/images/cgi-extinfo-a.png
+share/nagios/docs/images/cgi-extinfo-b.png
+share/nagios/docs/images/cgi-extinfo-c.png
+share/nagios/docs/images/cgi-extinfo-d.png
+share/nagios/docs/images/cgi-histogram.png
+share/nagios/docs/images/cgi-history.png
+share/nagios/docs/images/cgi-notifications.png
+share/nagios/docs/images/cgi-outages.png
+share/nagios/docs/images/cgi-showlog.png
+share/nagios/docs/images/cgi-status-a.png
+share/nagios/docs/images/cgi-status-b.png
+share/nagios/docs/images/cgi-status-c.png
+share/nagios/docs/images/cgi-status-d.png
+share/nagios/docs/images/cgi-statusmap.png
+share/nagios/docs/images/cgi-statuswml.png
+share/nagios/docs/images/cgi-statuswrl.png
+share/nagios/docs/images/cgi-summary.png
+share/nagios/docs/images/cgi-tac.png
+share/nagios/docs/images/cgi-trends.png
+share/nagios/docs/images/checktiming.png
+share/nagios/docs/images/distributed.png
+share/nagios/docs/images/host-dependencies.png
+share/nagios/docs/images/indirecthostcheck.png
+share/nagios/docs/images/indirectsvccheck.png
+share/nagios/docs/images/indirectsvccheck2.png
+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/network-heirarchy.png
+share/nagios/docs/images/network-outage1.png
+share/nagios/docs/images/network-outage2.png
+share/nagios/docs/images/noninterleaved1.png
+share/nagios/docs/images/noninterleaved2.png
+share/nagios/docs/images/physical-network.png
+share/nagios/docs/images/plugintheory.png
+share/nagios/docs/images/redudancy.png
+share/nagios/docs/images/redundancy.png
+share/nagios/docs/images/service-dependencies.png
+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/beginners.html
+share/nagios/docs/cgiauth.html
+share/nagios/docs/cgiincludes.html
+share/nagios/docs/cgis.html
+share/nagios/docs/checkscheduling.html
+share/nagios/docs/clusters.html
+share/nagios/docs/commandfile.html
+share/nagios/docs/config.html
+share/nagios/docs/configcgi.html
+share/nagios/docs/configextinfo.html
+share/nagios/docs/configmain.html
+share/nagios/docs/configobject.html
+share/nagios/docs/dependencies.html
+share/nagios/docs/distributed.html
+share/nagios/docs/downtime.html
+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
+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/networkoutages.html
+share/nagios/docs/networkreachability.html
+share/nagios/docs/notifications.html
+share/nagios/docs/parallelization.html
+share/nagios/docs/passivechecks.html
+share/nagios/docs/perfdata.html
+share/nagios/docs/plugins.html
+share/nagios/docs/plugintheory.html
+share/nagios/docs/redundancy.html
+share/nagios/docs/robots.txt
+share/nagios/docs/security.html
+share/nagios/docs/stalking.html
+share/nagios/docs/starting.html
+share/nagios/docs/statetypes.html
+share/nagios/docs/stoprestart.html
+share/nagios/docs/templaterecursion.html
+share/nagios/docs/templatetricks.html
+share/nagios/docs/timeperiods.html
+share/nagios/docs/toc.html
+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/command.png
+share/nagios/images/comment.gif
+share/nagios/images/contexthelp1.gif
+share/nagios/images/contexthelp2.gif
+share/nagios/images/critical.png
+share/nagios/images/delay.gif
+share/nagios/images/delete.gif
+share/nagios/images/disabled.gif
+share/nagios/images/down.gif
+share/nagios/images/downtime.gif
+share/nagios/images/empty.gif
+share/nagios/images/enabled.gif
+share/nagios/images/extinfo.gif
+share/nagios/images/flapping.gif
+share/nagios/images/greendot.gif
+share/nagios/images/histogram.png
+share/nagios/images/history.gif
+share/nagios/images/hostevent.gif
+share/nagios/images/info.png
+share/nagios/images/left.gif
+share/nagios/images/logofullsize.jpg
+share/nagios/images/logos/nagios.gd2
+share/nagios/images/logos/nagios.gif
+share/nagios/images/logos/nagiosvrml.png
+share/nagios/images/logos/unknown.gd2
+share/nagios/images/logos/unknown.gif
+share/nagios/images/logrotate.png
+share/nagios/images/ndisabled.gif
+share/nagios/images/noack.gif
+share/nagios/images/notes.gif
+share/nagios/images/notify.gif
+share/nagios/images/orangedot.gif
+share/nagios/images/passiveonly.gif
+share/nagios/images/recovery.png
+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
+share/nagios/images/status2.gif
+share/nagios/images/status3.gif
+share/nagios/images/status4.gif
+share/nagios/images/stop.gif
+share/nagios/images/tacdisabled.jpg
+share/nagios/images/tacdisabled.png
+share/nagios/images/tacenabled.jpg
+share/nagios/images/tacenabled.png
+share/nagios/images/thermcrit.png
+share/nagios/images/thermok.png
+share/nagios/images/thermwarn.png
+share/nagios/images/trends.gif
+share/nagios/images/trendshost.png
+share/nagios/images/trendssvc.png
+share/nagios/images/unknown.png
+share/nagios/images/up.gif
+share/nagios/images/warning.png
+share/nagios/images/weblogo1.png
+share/nagios/images/zoom1.gif
+share/nagios/images/zoom2.gif
+share/nagios/index.html
+share/nagios/main.html
+share/nagios/media/critical.wav
+share/nagios/media/hostdown.wav
+share/nagios/media/warning.wav
+share/nagios/robots.txt
+share/nagios/side.html
+share/nagios/stylesheets/avail.css
+share/nagios/stylesheets/checksanity.css
+share/nagios/stylesheets/cmd.css
+share/nagios/stylesheets/config.css
+share/nagios/stylesheets/extinfo.css
+share/nagios/stylesheets/histogram.css
+share/nagios/stylesheets/history.css
+share/nagios/stylesheets/ministatus.css
+share/nagios/stylesheets/notifications.css
+share/nagios/stylesheets/outages.css
+share/nagios/stylesheets/showlog.css
+share/nagios/stylesheets/status.css
+share/nagios/stylesheets/statusmap.css
+share/nagios/stylesheets/summary.css
+share/nagios/stylesheets/tac.css
+share/nagios/stylesheets/trends.css
 @unexec rmdir %D/etc/nagios 2>/dev/null || true
-@dirrm %%DATADIR%%/cgi-bin
-@dirrm %%DATADIR%%/contexthelp
-@dirrm %%DATADIR%%/docs/images
-@dirrm %%DATADIR%%/docs
-@dirrm %%DATADIR%%/images/logos
-@dirrm %%DATADIR%%/images
-@dirrm %%DATADIR%%/media
-@dirrm %%DATADIR%%/ssi
-@dirrm %%DATADIR%%/stylesheets
-@dirrm %%DATADIR%%/
+@dirrm share/nagios/cgi-bin
+@dirrm share/nagios/contexthelp
+@dirrm share/nagios/docs/images
+@dirrm share/nagios/docs
+@dirrm share/nagios/images/logos
+@dirrm share/nagios/images
+@dirrm share/nagios/media
+@dirrm share/nagios/ssi
+@dirrm share/nagios/stylesheets
+@dirrm share/nagios
 @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