Cleanup, version bump and add hint on how to configure apache for pnp4nagios (#232474)

(Portage version: 2.2_rc16/cvs/Linux 2.6.25-gentoo-r7 x86_64)

4 files changed, 22 insertions, 77 deletions

diff --git a/net-analyzer/pnp4nagios/ChangeLog b/net-analyzer/pnp4nagios/ChangeLog
index f12fe8fc1c2c..d671a45e887a 100644
--- a/net-analyzer/pnp4nagios/ChangeLog
+++ b/net-analyzer/pnp4nagios/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-analyzer/pnp4nagios
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/pnp4nagios/ChangeLog,v 1.4 2008/09/29 18:04:20 dertobi123 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/pnp4nagios/ChangeLog,v 1.5 2008/11/29 17:09:29 dertobi123 Exp $
+
+*pnp4nagios-0.4.12 (29 Nov 2008)
+
+  29 Nov 2008; Tobias Scherbaum <dertobi123@gentoo.org>
+  -pnp4nagios-0.4.7.ebuild, -pnp4nagios-0.4.10.ebuild,
+  -pnp4nagios-0.4.11.ebuild, +pnp4nagios-0.4.12.ebuild:
+  Cleanup, version bump and add hint on how to configure apache for pnp4nagios
+  (#232474)
 
 *pnp4nagios-0.4.11 (29 Sep 2008)
 
diff --git a/net-analyzer/pnp4nagios/pnp4nagios-0.4.11.ebuild b/net-analyzer/pnp4nagios/pnp4nagios-0.4.11.ebuild
deleted file mode 100644
index 15d7af60df31..000000000000
--- a/net-analyzer/pnp4nagios/pnp4nagios-0.4.11.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/pnp4nagios/pnp4nagios-0.4.11.ebuild,v 1.1 2008/09/29 18:04:20 dertobi123 Exp $
-
-inherit confutils
-
-MY_P=pnp-${PV}
-
-DESCRIPTION="A performance data analyzer for nagios"
-HOMEPAGE="http://www.pnp4nagios.org"
-
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-KEYWORDS="~x86 ~amd64 ~ppc"
-
-DEPEND=">=dev-lang/php-4.3
-	>=net-analyzer/rrdtool-1.2
-	net-analyzer/nagios-core"
-RDEPEND="${DEPEND}"
-
-S=${WORKDIR}/${MY_P}
-
-pkg_setup() {
-	confutils_require_built_with_all dev-lang/php gd pcre xml zlib
-}
-
-src_compile() {
-	econf \
-		--sysconfdir=/etc/pnp \
-		--datarootdir=/usr/share/pnp \
-		--with-perfdata-dir=/var/nagios/perfdata \
-		--with-perfdata-spool-dir=/var/spool/pnp  || die "econf failed"
-	emake all || die "emake failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" fullinstall || die "emake install failed"
-}
diff --git a/net-analyzer/pnp4nagios/pnp4nagios-0.4.10.ebuild b/net-analyzer/pnp4nagios/pnp4nagios-0.4.12.ebuild
index 8cc44b74cfb9..c73cdd3cf16f 100644
--- a/net-analyzer/pnp4nagios/pnp4nagios-0.4.10.ebuild
+++ b/net-analyzer/pnp4nagios/pnp4nagios-0.4.12.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/pnp4nagios/pnp4nagios-0.4.10.ebuild,v 1.1 2008/06/27 12:18:43 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/pnp4nagios/pnp4nagios-0.4.12.ebuild,v 1.1 2008/11/29 17:09:29 dertobi123 Exp $
 
 inherit confutils
 
@@ -39,3 +39,15 @@ src_compile() {
 src_install() {
 	emake DESTDIR="${D}" fullinstall || die "emake install failed"
 }
+
+pkg_postinst() {
+	elog "To include the pnp webinterface into your Nagios setup you could use"
+	elog "an Alias in you Apache configuration as follows:"
+
+	elog "\tAlias /nagios/pnp       /usr/share/pnp/"
+	elog "\t<Directory "/usr/share/pnp">"
+	elog "\t\tAllowOverride AuthConfig"
+	elog "\t\tOrder allow,deny"
+	elog "\t\tAllow from all"
+	elog "\t</Directory>"
+}
diff --git a/net-analyzer/pnp4nagios/pnp4nagios-0.4.7.ebuild b/net-analyzer/pnp4nagios/pnp4nagios-0.4.7.ebuild
deleted file mode 100644
index 92fd8f1c1b43..000000000000
--- a/net-analyzer/pnp4nagios/pnp4nagios-0.4.7.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/pnp4nagios/pnp4nagios-0.4.7.ebuild,v 1.2 2008/06/08 13:34:34 dertobi123 Exp $
-
-MY_P=pnp-${PV}
-
-DESCRIPTION="A performance data analyzer for nagios"
-HOMEPAGE="http://www.pnp4nagios.org"
-
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-KEYWORDS="~x86 ~amd64"
-
-DEPEND=">=dev-lang/php-4.3
-	>=net-analyzer/rrdtool-1.2
-	net-analyzer/nagios-core"
-RDEPEND="${DEPEND}"
-
-S=${WORKDIR}/${MY_P}
-
-src_compile() {
-	econf --prefix=/usr/nagios --datadir=/usr/nagios/share/pnp \
-		--sysconfdir=/usr/nagios/etc/pnp \
-		--with-perfdata-dir=/usr/nagios/share/perfdata || die "econf failed"
-	emake all || die "emake failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" fullinstall || die "emake install failed"
-}