Version bump

(Portage version: 2.1.10.7/cvs/Linux x86_64)

4 files changed, 107 insertions, 56 deletions

diff --git a/net-analyzer/pnp4nagios/ChangeLog b/net-analyzer/pnp4nagios/ChangeLog
index cc1abfe604db..e037b1b40bf4 100644
--- a/net-analyzer/pnp4nagios/ChangeLog
+++ b/net-analyzer/pnp4nagios/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-analyzer/pnp4nagios
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/pnp4nagios/ChangeLog,v 1.33 2011/08/07 12:22:10 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/pnp4nagios/ChangeLog,v 1.34 2011/08/12 19:20:58 dertobi123 Exp $
+
+*pnp4nagios-0.6.14 (12 Aug 2011)
+
+  12 Aug 2011; Tobias Scherbaum <dertobi123@gentoo.org>
+  -pnp4nagios-0.4.12.ebuild, +pnp4nagios-0.6.14.ebuild,
+  +files/pnp4nagios-0.6.14-makefile.patch:
+  Version bump
 
   07 Aug 2011; Kacper Kowalik <xarthisius@gentoo.org> pnp4nagios-0.6.7.ebuild:
   ppc/ppc64 stable wrt #330539
diff --git a/net-analyzer/pnp4nagios/files/pnp4nagios-0.6.14-makefile.patch b/net-analyzer/pnp4nagios/files/pnp4nagios-0.6.14-makefile.patch
new file mode 100644
index 000000000000..469389d3ee31
--- /dev/null
+++ b/net-analyzer/pnp4nagios/files/pnp4nagios-0.6.14-makefile.patch
@@ -0,0 +1,32 @@
+diff -Naur pnp4nagios-0.6.14.orig/src/Makefile.in pnp4nagios-0.6.14/src/Makefile.in
+--- pnp4nagios-0.6.14.orig/src/Makefile.in	2011-08-10 17:18:46.000000000 +0200
++++ pnp4nagios-0.6.14/src/Makefile.in	2011-08-10 17:19:51.000000000 +0200
+@@ -83,7 +83,7 @@
+ #
+ ###############################
+ npcd: npcd.c $(NPCDOBJS) $(NPCDHEAD)
+-	$(CC) $(CFLAGS) -o $@ npcd.c $(NPCDOBJS) -lpthread
++	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ npcd.c $(NPCDOBJS) -lpthread
+ 
+ ###############################
+ #
+@@ -118,7 +118,6 @@
+ 
+ install:
+ 	$(MAKE) install-basic
+-	$(MAKE) strip-post-install
+ 
+ install-unstripped:
+ 	$(MAKE) install-basic
+diff -Naur pnp4nagios-0.6.14.orig/configure pnp4nagios-0.6.14/configure
+--- pnp4nagios-0.6.14.orig/configure	2011-08-12 09:01:12.000000000 +0200
++++ pnp4nagios-0.6.14/configure	2011-08-12 09:03:32.000000000 +0200
+@@ -5565,7 +5565,7 @@
+ 		PERFDATA_LOG="${localstatedir}/perfdata.log"
+ 		PERFDATA_DIR="${localstatedir}/perfdata"
+ 		PERFDATA_SPOOL_DIR="${localstatedir}/spool"
+-		mandir="\${prefix}/man"
++		mandir="/usr/share/man"
+ 	;;
+ esac
+ 
diff --git a/net-analyzer/pnp4nagios/pnp4nagios-0.4.12.ebuild b/net-analyzer/pnp4nagios/pnp4nagios-0.4.12.ebuild
deleted file mode 100644
index 1fb8a1a367b2..000000000000
--- a/net-analyzer/pnp4nagios/pnp4nagios-0.4.12.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/pnp4nagios/pnp4nagios-0.4.12.ebuild,v 1.6 2009/03/18 22:23:26 ranger 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="amd64 ppc ppc64 ~sparc x86"
-
-DEPEND=">=dev-lang/php-4.3
-	>=net-analyzer/rrdtool-1.2
-	net-analyzer/nagios-core"
-RDEPEND="${DEPEND}
-	virtual/perl-Getopt-Long
-	virtual/perl-Time-HiRes"
-
-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"
-}
-
-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.6.14.ebuild b/net-analyzer/pnp4nagios/pnp4nagios-0.6.14.ebuild
new file mode 100644
index 000000000000..a3e649fc3731
--- /dev/null
+++ b/net-analyzer/pnp4nagios/pnp4nagios-0.6.14.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/pnp4nagios/pnp4nagios-0.6.14.ebuild,v 1.1 2011/08/12 19:20:58 dertobi123 Exp $
+
+EAPI="2"
+
+inherit depend.apache eutils
+
+DESCRIPTION="A performance data analyzer for nagios"
+HOMEPAGE="http://www.pnp4nagios.org"
+
+SRC_URI="mirror://sourceforge/${PN}/PNP-0.6/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
+
+DEPEND="dev-lang/php[json,simplexml,zlib,xml,filter]
+	|| ( <dev-lang/php-5.3[pcre,reflection,spl] >=dev-lang/php-5.3 )
+	|| ( >=dev-lang/php-4.3[gd-external] >=dev-lang/php-4.3[gd] )
+	>=net-analyzer/rrdtool-1.2
+	net-analyzer/nagios-core"
+RDEPEND="${DEPEND}
+	virtual/perl-Getopt-Long
+	virtual/perl-Time-HiRes
+	media-fonts/dejavu
+	apache2? ( www-servers/apache[apache2_modules_rewrite] )"
+
+want_apache2
+
+pkg_setup() {
+	depend.apache_pkg_setup
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-makefile.patch
+}
+
+src_configure() {
+	econf \
+		--sysconfdir=/etc/pnp \
+		--datarootdir=/usr/share/pnp \
+		--mandir=/usr/share/man \
+		--with-perfdata-dir=/var/nagios/perfdata \
+		--with-perfdata-spool-dir=/var/spool/pnp  || die "econf failed"
+}
+
+src_compile() {
+	emake all || die "emake failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install install-config || die "emake install failed"
+	doinitd "${FILESDIR}/npcd"
+	rm "${D}/usr/share/pnp/install.php"
+
+	if use apache2 ; then
+		insinto "${APACHE_MODULES_CONFDIR}"
+		doins "${FILESDIR}"/98_pnp4nagios.conf
+	fi
+}
+
+pkg_postinst() {
+	elog "Please make sure to enable URL rewriting in Apache or any other"
+	elog "webserver you're using, to get pnp4nagios running!"
+}