summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Black <dragonheart@gentoo.org>2005-01-25 10:39:51 +0000
committerDaniel Black <dragonheart@gentoo.org>2005-01-25 10:39:51 +0000
commit8fb5fd08fdab1ece7c5c03b5008afed799a58baf (patch)
treecf6971a347ef90222c1417e75dab6002b5f9c0c9
parentFix access violation caused by libnetsnmp when USE=snmp, bug 79068. (diff)
downloadgentoo-2-8fb5fd08fdab1ece7c5c03b5008afed799a58baf.tar.gz
gentoo-2-8fb5fd08fdab1ece7c5c03b5008afed799a58baf.tar.bz2
gentoo-2-8fb5fd08fdab1ece7c5c03b5008afed799a58baf.zip
fixed depends and a few other things thanks to Michael Stewart <vericgar@gentoo.org>
(Portage version: 2.0.51-r14)
-rw-r--r--net-analyzer/nagios-core/Manifest12
-rw-r--r--net-analyzer/nagios-core/nagios-core-1.2-r4.ebuild10
2 files changed, 4 insertions, 18 deletions
diff --git a/net-analyzer/nagios-core/Manifest b/net-analyzer/nagios-core/Manifest
index a2e2331fa996..90bd4faf4fba 100644
--- a/net-analyzer/nagios-core/Manifest
+++ b/net-analyzer/nagios-core/Manifest
@@ -1,11 +1,8 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
MD5 2b01bf3690a35ffdce51bc4ecee618cd ChangeLog 8249
MD5 a1ece421fae3536d1e5dd9b5ecb0215d metadata.xml 928
MD5 e4ffec908f9991ffd916e63a4bb2c002 nagios-core-1.2-r3.ebuild 7167
MD5 b2b5a4982c7a888addfc7c5bb2ec173e nagios-core-1.2-r2.ebuild 6619
-MD5 499c8d31513da57d7991d07c03563377 nagios-core-1.2-r4.ebuild 7287
+MD5 95ad335a6b7647f34b17ef0f95e9a8bf nagios-core-1.2-r4.ebuild 7095
MD5 8e2eaa206717b94fb41508c7ab17a135 nagios-core-1.2-r1.ebuild 6669
MD5 673bda0ac6ab9230d23331e7f3846b7b files/99_nagios.conf 350
MD5 565ce2a690d50aeb542e7afe44b8c733 files/Makefile-distclean.diff.bz2 1133
@@ -18,10 +15,3 @@ MD5 cd183719838dc2a8b9cafa8a639f4ad2 files/digest-nagios-core-1.2-r3 63
MD5 cd183719838dc2a8b9cafa8a639f4ad2 files/digest-nagios-core-1.2-r1 63
MD5 cee7d66cc61be3558af44ab177d99e1f files/submit_check_result_via_nsca.patch 585
MD5 cd183719838dc2a8b9cafa8a639f4ad2 files/digest-nagios-core-1.2-r4 63
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.0 (GNU/Linux)
-
-iD8DBQFB9hmomdTrptrqvGERAkS1AKCENzSYwatpFxI4B8EDpWHkqqTowACeKqzv
-2CupK1emMHlKzB6x3qeGNDs=
-=GFTo
------END PGP SIGNATURE-----
diff --git a/net-analyzer/nagios-core/nagios-core-1.2-r4.ebuild b/net-analyzer/nagios-core/nagios-core-1.2-r4.ebuild
index 39f1f0de7e59..a0c3f75c5fdf 100644
--- a/net-analyzer/nagios-core/nagios-core-1.2-r4.ebuild
+++ b/net-analyzer/nagios-core/nagios-core-1.2-r4.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2005 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-r4.ebuild,v 1.1 2005/01/25 10:04:18 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-core/nagios-core-1.2-r4.ebuild,v 1.2 2005/01/25 10:39:51 dragonheart Exp $
inherit eutils depend.apache toolchain-funcs
@@ -15,16 +15,13 @@ SLOT="0"
KEYWORDS="~x86 ~sparc ~ppc ~amd64"
IUSE="noweb mysql postgres perl debug apache2"
-# place inside !noweb beside the other apache depend
-# apache2? ( ${APACHE2_DEPEND} )
DEPEND="virtual/mailx
!noweb? (
>=media-libs/jpeg-6b-r3
>=media-libs/libpng-1.2.5-r4
>=media-libs/gd-1.8.3-r5
- !apache2? ( ${APACHE1_DEPEND} )
+ ${APACHE_DEPEND}
)
-
perl? ( >=dev-lang/perl-5.6.1-r7 )
mysql? ( >=dev-db/mysql-3.23.56 )
postgres? ( !mysql? ( >=dev-db/postgresql-7.3.2 ) )"
@@ -202,7 +199,7 @@ pkg_preinst() {
pkg_postinst() {
einfo
- einfo "The example config files are located at /usr/share/doc/${P}/sample-configs/."
+ einfo "The example config files are located at /usr/share/doc/${PF}/sample-configs/."
einfo
einfo "Also, if you want nagios to start at boot time"
einfo "remember to execute:"
@@ -219,7 +216,6 @@ 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 ${APACHE1_CONFDIR}/apache.conf and add \"Include modules.d/nagios.conf\""
fi
einfo