21 files changed, 1 insertions, 827 deletions
diff --git a/MOVED b/MOVED
index 1f6d2c4a2260..9308c7eb75bd 100644
--- a/MOVED
+++ b/MOVED
@@ -1599,3 +1599,4 @@ editors/openoffice-1.1|editors/openoffice.org-1.1|2005-08-29|port should have a
 editors/openoffice-1.1-devel|editors/openoffice.org-1.1-devel|2005-08-29|port should have a correct PORTNAME
 editors/openoffice-2.0-devel|editors/openoffice.org-2.0-devel|2005-08-29|port should have a correct PORTNAME
 shells/zsh-devel|shells/zsh|2005-08-29|Development version of Zsh is no longer being released
+russian/nagios||2005-08-30|Obsoleted; new version is not planned
diff --git a/russian/Makefile b/russian/Makefile
index b2e46bfd69da..9c38d464ecf7 100644
--- a/russian/Makefile
+++ b/russian/Makefile
@@ -23,7 +23,6 @@
     SUBDIR += mtc
     SUBDIR += mueller-dic
     SUBDIR += muttprint
-    SUBDIR += nagios
     SUBDIR += napster
     SUBDIR += ooodict-ru_RU
     SUBDIR += p5-Lingua-RU-Charset
diff --git a/russian/nagios/Makefile b/russian/nagios/Makefile
deleted file mode 100644
index d66ed29aaf51..000000000000
--- a/russian/nagios/Makefile
+++ /dev/null
@@ -1,107 +0,0 @@
-# New ports collection makefile for:	nagios
-# Date created:				04 Feb 2004
-# Whom:					Roman Y. Bogdanov <sam@brj.pp.ru>
-#
-# $FreeBSD$
-#
-
-PORTNAME=	nagios
-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.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
-RUN_DEPENDS=	${LOCALBASE}/libexec/nagios/check_nagios:${PORTSDIR}/net-mgmt/nagios-plugins
-
-BROKEN=		Changes permissions of installed directory
-DEPRECATED=	${BROKEN}
-EXPIRATION_DATE=2005-09-22
-
-CONFLICTS=	nagios-1*
-
-USE_GETOPT_LONG=yes
-GNU_CONFIGURE=	yes
-USE_RC_SUBR=	yes
-USE_PERL5_BUILD=yes
-
-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}" \
-		LIBS="-L${LOCALBASE}/lib -lgd"
-CONFIGURE_ARGS=	--with-command-user=${NAGIOSUSER} \
-		--with-command-grp=www \
-		--with-nagios-user=${NAGIOSUSER} \
-		--with-nagios-grp=${NAGIOSGROUP} \
-		--with-template-objects \
-		--sbindir=${PREFIX}/share/nagios/cgi-bin \
-		--libexecdir=${PREFIX}/libexec/nagios \
-		--datadir=${PREFIX}/share/nagios \
-		--sysconfdir=${PREFIX}/etc/nagios \
-		--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' \
-		-e 's,%%PREFIX%%,${PREFIX},g' \
-		-e 's,%%RC_SUBR%%,${RC_SUBR},g'
-
-INSTALL_TARGET=	all install config install-config install-commandmode
-
-pre-patch:
-	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:
-	@${SH} ${PKGINSTALL} ${DISTNAME} PRE-INSTALL
-
-post-install:
-	@${INSTALL_SCRIPT} ${WRKDIR}/nagios.sh ${PREFIX}/etc/rc.d/
-	@${CAT} ${PKGMESSAGE}
-
-.include <bsd.port.post.mk>
diff --git a/russian/nagios/distinfo b/russian/nagios/distinfo
deleted file mode 100644
index 5501d650693d..000000000000
--- a/russian/nagios/distinfo
+++ /dev/null
@@ -1,4 +0,0 @@
-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
deleted file mode 100644
index 3b8854834e20..000000000000
--- a/russian/nagios/files/DEINSTALL.tmpl
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/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/files/INSTALL.tmpl b/russian/nagios/files/INSTALL.tmpl
deleted file mode 100644
index e408a3c23623..000000000000
--- a/russian/nagios/files/INSTALL.tmpl
+++ /dev/null
@@ -1,67 +0,0 @@
-#!/bin/sh
-#
-#	$FreeBSD: /tmp/pcvs/ports/russian/nagios/files/Attic/INSTALL.tmpl,v 1.1 2004-08-15 18:54:32 sem 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/russian/nagios/files/MESSAGE.tmpl b/russian/nagios/files/MESSAGE.tmpl
deleted file mode 100644
index a96b0d6243c3..000000000000
--- a/russian/nagios/files/MESSAGE.tmpl
+++ /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.
-*******************************************************************
-
diff --git a/russian/nagios/files/nagios.sh.tmpl b/russian/nagios/files/nagios.sh.tmpl
deleted file mode 100644
index 16b8b4506bf2..000000000000
--- a/russian/nagios/files/nagios.sh.tmpl
+++ /dev/null
@@ -1,55 +0,0 @@
-#!/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-aa b/russian/nagios/files/patch-aa
deleted file mode 100644
index 595da2b80d2c..000000000000
--- a/russian/nagios/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/russian/nagios/files/patch-ab b/russian/nagios/files/patch-ab
deleted file mode 100644
index 6634c8f6b40a..000000000000
--- a/russian/nagios/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/russian/nagios/files/patch-ad b/russian/nagios/files/patch-ad
deleted file mode 100644
index 4518f5907c41..000000000000
--- a/russian/nagios/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/russian/nagios/files/patch-ae b/russian/nagios/files/patch-ae
deleted file mode 100644
index 0bf8e064b3a7..000000000000
--- a/russian/nagios/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/russian/nagios/files/patch-ag b/russian/nagios/files/patch-ag
deleted file mode 100644
index 14027c5d9cc9..000000000000
--- a/russian/nagios/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/russian/nagios/files/patch-ai b/russian/nagios/files/patch-ai
deleted file mode 100644
index 433d6d74758d..000000000000
--- a/russian/nagios/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/russian/nagios/files/patch-xcddb.c b/russian/nagios/files/patch-xcddb.c
deleted file mode 100644
index 34bc8dc1759a..000000000000
--- a/russian/nagios/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/russian/nagios/files/patch-xdddb.c b/russian/nagios/files/patch-xdddb.c
deleted file mode 100644
index f1a942e7ae45..000000000000
--- a/russian/nagios/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/russian/nagios/files/patch-xeddb.c b/russian/nagios/files/patch-xeddb.c
deleted file mode 100644
index 2aaaa7db9043..000000000000
--- a/russian/nagios/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/russian/nagios/files/patch-xrddb.c b/russian/nagios/files/patch-xrddb.c
deleted file mode 100644
index 0f850674b63c..000000000000
--- a/russian/nagios/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/russian/nagios/files/patch-xsddb.c b/russian/nagios/files/patch-xsddb.c
deleted file mode 100644
index e9e1d169cc76..000000000000
--- a/russian/nagios/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/russian/nagios/pkg-descr b/russian/nagios/pkg-descr
deleted file mode 100644
index 8006ef72709f..000000000000
--- a/russian/nagios/pkg-descr
+++ /dev/null
@@ -1,3 +0,0 @@
-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
deleted file mode 100644
index fde2af858447..000000000000
--- a/russian/nagios/pkg-plist
+++ /dev/null
@@ -1,314 +0,0 @@
-@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
-@exec chown nagios:nagios /var/spool/nagios /var/spool/nagios/archives
-@exec chown nagios:nogroup /var/spool/nagios/rw
-bin/nagios
-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/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
-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 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
-@unexec rmdir 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