From b6ebf76c131f97ea6d4793173fad50273fa7fa2d Mon Sep 17 00:00:00 2001
From: sturm <sturm@openbsd.org>
Date: Tue, 1 Jul 2008 06:03:58 +0000
Subject: [PATCH] update to nagios 3.0.3

---
 net/nagios/nagios/Makefile                   |  9 ++---
 net/nagios/nagios/distinfo                   | 10 +++---
 net/nagios/nagios/patches/patch-base_utils_c |  8 ++---
 net/nagios/nagios/pkg/PLIST-main             |  6 ++--
 net/nagios/nagios/pkg/PLIST-web              | 35 ++++++++++----------
 5 files changed, 34 insertions(+), 34 deletions(-)

diff --git a/net/nagios/nagios/Makefile b/net/nagios/nagios/Makefile
index 1b6fc478c52..6409d02e279 100644
--- a/net/nagios/nagios/Makefile
+++ b/net/nagios/nagios/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.29 2008/05/22 11:49:34 sturm Exp $
+# $OpenBSD: Makefile,v 1.30 2008/07/01 06:03:58 sturm Exp $
 
 COMMENT-main=	host and service monitor
 COMMENT-web=	cgis and webpages for nagios
 
-V=		3.0.2
+V=		3.0.3
 DISTNAME=	nagios-${V}
 PKGNAME-main=	nagios-${V}
 PKGNAME-web=	nagios-web-${V}
@@ -67,8 +67,9 @@ WANTLIB-web=
 LIB_DEPENDS-web=
 RUN_DEPENDS-web=:nagios-${V}-chroot:net/nagios/nagios,chroot
 .else
-WANTLIB-web=	${WANTLIB} fontconfig freetype iconv intl jpeg z
-LIB_DEPENDS-web=glib-2.0::devel/glib2 \
+WANTLIB-web=	${WANTLIB} fontconfig freetype jpeg z
+LIB_DEPENDS-web=${MODGETTEXT_LIB_DEPENDS} \
+		glib-2.0::devel/glib2 \
 		gd::graphics/gd \
 		png::graphics/png
 RUN_DEPENDS-web=:nagios-${V}-!chroot:net/nagios/nagios
diff --git a/net/nagios/nagios/distinfo b/net/nagios/nagios/distinfo
index d107c128ccc..39bbef5b613 100644
--- a/net/nagios/nagios/distinfo
+++ b/net/nagios/nagios/distinfo
@@ -1,5 +1,5 @@
-MD5 (nagios-3.0.2.tar.gz) = AI1xqsCGYLwAf3Ew6oKrgA==
-RMD160 (nagios-3.0.2.tar.gz) = KZmZ9NiBngZAb+v8MxM/eGS0jps=
-SHA1 (nagios-3.0.2.tar.gz) = LjJPXoZ0VLr2zKLnGQN64NqcJxU=
-SHA256 (nagios-3.0.2.tar.gz) = LX6ubouiCkDx/D9Xot1A4vKlbkJE20U2ZRINWXm32Yo=
-SIZE (nagios-3.0.2.tar.gz) = 2759331
+MD5 (nagios-3.0.3.tar.gz) = FR33vxm2lvdJhBD7dvt8rw==
+RMD160 (nagios-3.0.3.tar.gz) = Lw7pkcS69nuV/PXUb9ezTYuhEY4=
+SHA1 (nagios-3.0.3.tar.gz) = KraJlu9lP4VrYJ0QCh7kGk9Jrq0=
+SHA256 (nagios-3.0.3.tar.gz) = ZeltfaGCtA1Pmoxj2h74Yf37lQK+NqmD+KLoA/cR1Tw=
+SIZE (nagios-3.0.3.tar.gz) = 2759396
diff --git a/net/nagios/nagios/patches/patch-base_utils_c b/net/nagios/nagios/patches/patch-base_utils_c
index 75c275bbcfd..08d6af2472c 100644
--- a/net/nagios/nagios/patches/patch-base_utils_c
+++ b/net/nagios/nagios/patches/patch-base_utils_c
@@ -1,7 +1,7 @@
-$OpenBSD: patch-base_utils_c,v 1.1 2008/03/19 17:15:53 sturm Exp $
---- base/utils.c.orig	Mon Mar 10 21:58:33 2008
-+++ base/utils.c	Wed Mar 19 18:04:29 2008
-@@ -3482,7 +3482,7 @@ char *mmap_fgets_multiline(mmapfile *temp_mmapfile){
+$OpenBSD: patch-base_utils_c,v 1.2 2008/07/01 06:03:58 sturm Exp $
+--- base/utils.c.orig	Mon Jun 23 22:47:41 2008
++++ base/utils.c	Mon Jun 30 20:26:25 2008
+@@ -3483,7 +3483,7 @@ char *mmap_fgets_multiline(mmapfile *temp_mmapfile){
  			}
  
  		/* one backslash found, so we should continue reading the next line */
diff --git a/net/nagios/nagios/pkg/PLIST-main b/net/nagios/nagios/pkg/PLIST-main
index 2b91897be44..86febfb85b0 100644
--- a/net/nagios/nagios/pkg/PLIST-main
+++ b/net/nagios/nagios/pkg/PLIST-main
@@ -1,9 +1,9 @@
-@comment $OpenBSD: PLIST-main,v 1.4 2008/03/18 20:25:11 sturm Exp $
+@comment $OpenBSD: PLIST-main,v 1.5 2008/07/01 06:03:58 sturm Exp $
 @pkgpath ${BASE_PKGPATH}
 @newgroup _nagios:550
 @newuser _nagios:550:_nagios:daemon:Nagios user:/var/www/nagios:/sbin/nologin
-bin/nagiostats
-sbin/nagios
+@bin bin/nagiostats
+@bin sbin/nagios
 share/examples/nagios/
 @sample ${CHROOT}${SYSCONFDIR}/nagios/
 share/examples/nagios/cgi.cfg
diff --git a/net/nagios/nagios/pkg/PLIST-web b/net/nagios/nagios/pkg/PLIST-web
index 8e6948e01a9..8540dd6410d 100644
--- a/net/nagios/nagios/pkg/PLIST-web
+++ b/net/nagios/nagios/pkg/PLIST-web
@@ -1,22 +1,21 @@
-@comment $OpenBSD: PLIST-web,v 1.2 2008/03/18 20:25:11 sturm Exp $
+@comment $OpenBSD: PLIST-web,v 1.3 2008/07/01 06:03:58 sturm Exp $
 cgi-bin/nagios/
-cgi-bin/nagios/avail.cgi
-cgi-bin/nagios/cmd.cgi
-cgi-bin/nagios/config.cgi
-cgi-bin/nagios/extinfo.cgi
-cgi-bin/nagios/histogram.cgi
-cgi-bin/nagios/history.cgi
-cgi-bin/nagios/notifications.cgi
-cgi-bin/nagios/outages.cgi
-cgi-bin/nagios/showlog.cgi
-cgi-bin/nagios/status.cgi
-cgi-bin/nagios/statusmap.cgi
-cgi-bin/nagios/statuswml.cgi
-cgi-bin/nagios/statuswrl.cgi
-cgi-bin/nagios/summary.cgi
-cgi-bin/nagios/tac.cgi
-cgi-bin/nagios/trends.cgi
-nagios/
+@bin cgi-bin/nagios/avail.cgi
+@bin cgi-bin/nagios/cmd.cgi
+@bin cgi-bin/nagios/config.cgi
+@bin cgi-bin/nagios/extinfo.cgi
+@bin cgi-bin/nagios/histogram.cgi
+@bin cgi-bin/nagios/history.cgi
+@bin cgi-bin/nagios/notifications.cgi
+@bin cgi-bin/nagios/outages.cgi
+@bin cgi-bin/nagios/showlog.cgi
+@bin cgi-bin/nagios/status.cgi
+@bin cgi-bin/nagios/statusmap.cgi
+@bin cgi-bin/nagios/statuswml.cgi
+@bin cgi-bin/nagios/statuswrl.cgi
+@bin cgi-bin/nagios/summary.cgi
+@bin cgi-bin/nagios/tac.cgi
+@bin cgi-bin/nagios/trends.cgi
 nagios/contexthelp/
 nagios/contexthelp/A1.html
 nagios/contexthelp/A2.html