Access violation blooper fixed

3 files changed, 19 insertions, 16 deletions

diff --git a/net-analyzer/nagios-core/Manifest b/net-analyzer/nagios-core/Manifest
index 95cd88869fff..6a331ceb518b 100644
--- a/net-analyzer/nagios-core/Manifest
+++ b/net-analyzer/nagios-core/Manifest
@@ -1,8 +1,8 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 1a285b4d637ab46d4e58df0e3747ec0c nagios-core-1.2-r3.ebuild 7200
-MD5 1cfd13915abfbb204b3192d331c26c8e nagios-core-1.2-r2.ebuild 6717
+MD5 c3b5b8c6d3d06023bc413b33283f6d3d nagios-core-1.2-r3.ebuild 7209
+MD5 5d90cb6a1094f63a9d60da163780aaac nagios-core-1.2-r2.ebuild 6729
 MD5 3ae1e81ebcd5cce03882585a81309596 ChangeLog 7305
 MD5 a1ece421fae3536d1e5dd9b5ecb0215d metadata.xml 928
 MD5 8e2eaa206717b94fb41508c7ab17a135 nagios-core-1.2-r1.ebuild 6669
@@ -20,7 +20,7 @@ MD5 cd183719838dc2a8b9cafa8a639f4ad2 files/digest-nagios-core-1.2-r3 63
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.2.6 (GNU/Linux)
 
-iD8DBQFBdqgFT+MN7JbqCpMRAuCPAKCGl7BHM12JsKOEmcvgSGyWuGz9SQCeKvDv
-fs1aOTXvqgSpP7x1x3L0w/Y=
-=vFKo
+iD8DBQFBdqzVT+MN7JbqCpMRAucBAJ9FM12rUfkV4EFWK4RDK1I/TjsE/wCfdnyc
+N7fMrBpVBHwsgjKElUbeTqQ=
+=KtNL
 -----END PGP SIGNATURE-----
diff --git a/net-analyzer/nagios-core/nagios-core-1.2-r2.ebuild b/net-analyzer/nagios-core/nagios-core-1.2-r2.ebuild
index 249bef5d9c1c..d39558ea0cae 100644
--- a/net-analyzer/nagios-core/nagios-core-1.2-r2.ebuild
+++ b/net-analyzer/nagios-core/nagios-core-1.2-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-core/nagios-core-1.2-r2.ebuild,v 1.7 2004/10/20 18:01:49 eldad Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-core/nagios-core-1.2-r2.ebuild,v 1.8 2004/10/20 18:22:24 eldad Exp $
 
 inherit eutils
 
@@ -156,7 +156,6 @@ src_install() {
 		else
 			insinto /etc/apache/conf/addon-modules
 			doins ${FILESDIR}/nagios.conf
-			echo "Include  conf/addon-modules/nagios.conf" >> ${ROOT}/etc/apache/conf/apache.conf
 		fi
 	fi
 
@@ -173,18 +172,21 @@ pkg_preinst() {
 	keepdir /var/nagios/archives
 	chown -R nagios:nagios ${D}/var/nagios || die "Failed Chown of ${D}/var/nagios"
 	keepdir /var/nagios/rw
-	if use noweb; then
-		chown nagios:nagios ${D}/var/nagios/rw || die "Failed Chown of ${D}/var/nagios/rw"
-	else
-		chown nagios:apache ${D}/var/nagios/rw || die "Failed Chown of ${D}/var/nagios/rw"
-	fi
+
 	enewgroup nagios
+
 	if use noweb; then
 		enewuser nagios -1 /bin/bash /dev/null nagios
 	else
 		enewuser nagios -1 /bin/bash /dev/null apache
 		usermod -G apache nagios
 	fi
+
+	if use noweb; then
+		chown nagios:nagios ${D}/var/nagios/rw || die "Failed Chown of ${D}/var/nagios/rw"
+	else
+		chown nagios:apache ${D}/var/nagios/rw || die "Failed Chown of ${D}/var/nagios/rw"
+	fi
 }
 
 pkg_postinst() {
@@ -205,6 +207,7 @@ pkg_postinst() {
 			einfo " Edit /etc/conf.d/apache2 and add \"-D NAGIOS\""
 		else
 			einfo " Edit /etc/conf.d/apache and add \"-D NAGIOS\""
+			einfo " Edit /etc/apache/conf/apache.conf and add \"Include  conf/addon-modules/nagios.conf\""
 		fi
 
 		einfo
diff --git a/net-analyzer/nagios-core/nagios-core-1.2-r3.ebuild b/net-analyzer/nagios-core/nagios-core-1.2-r3.ebuild
index 93092d522f67..6b7a1380daa7 100644
--- a/net-analyzer/nagios-core/nagios-core-1.2-r3.ebuild
+++ b/net-analyzer/nagios-core/nagios-core-1.2-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-core/nagios-core-1.2-r3.ebuild,v 1.2 2004/10/20 18:01:49 eldad Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-core/nagios-core-1.2-r3.ebuild,v 1.3 2004/10/20 18:22:24 eldad Exp $
 
 inherit eutils
 
@@ -168,7 +168,6 @@ src_install() {
 		else
 			insinto /etc/apache/conf/addon-modules
 			doins ${FILESDIR}/nagios.conf
-			echo "Include  conf/addon-modules/nagios.conf" >> ${ROOT}/etc/apache/conf/apache.conf
 		fi
 	fi
 
@@ -187,12 +186,12 @@ pkg_preinst() {
 	enewgroup nagios
 
 	if use noweb; then
-		chown nagios:nagios ${D}/var/nagios/rw || die "Failed Chown of ${D}/var/nagios/rw"
 		enewuser nagios -1 /bin/bash /dev/null nagios
+		chown nagios:nagios ${D}/var/nagios/rw || die "Failed Chown of ${D}/var/nagios/rw"
 	else
-		chown nagios:apache ${D}/var/nagios/rw || die "Failed Chown of ${D}/var/nagios/rw"
 		enewuser nagios -1 /bin/bash /dev/null apache
 		usermod -G apache nagios
+		chown nagios:apache ${D}/var/nagios/rw || die "Failed Chown of ${D}/var/nagios/rw"
 	fi
 
 	for dir in etc/nagios usr/nagios var/nagios usr/nagios/contrib
@@ -219,6 +218,7 @@ pkg_postinst() {
 			einfo " Edit /etc/conf.d/apache2 and add \"-D NAGIOS\""
 		else
 			einfo " Edit /etc/conf.d/apache and add \"-D NAGIOS\""
+			einfo " Edit /etc/apache/conf/apache.conf and add \"Include  conf/addon-modules/nagios.conf\""
 		fi
 
 		einfo