From fd76d6a4489927b1bdbb411ec7e8ba4f95d5a631 Mon Sep 17 00:00:00 2001 From: Benedikt Boehm Date: Tue, 6 Jun 2006 09:56:00 +0000 Subject: [PATCH] fix #129578 Package-Manager: portage-2.1_rc3-r1 --- net-www/mod_watch/ChangeLog | 10 ++++- .../mod_watch/files/digest-mod_watch-3.18-r1 | 2 + .../mod_watch/files/digest-mod_watch-3.18-r2 | 3 ++ .../mod_watch/files/digest-mod_watch-4.03-r1 | 2 + .../mod_watch/files/digest-mod_watch-4.03-r2 | 3 ++ net-www/mod_watch/mod_watch-3.18-r2.ebuild | 36 +++++++++++++++ net-www/mod_watch/mod_watch-4.03-r1.ebuild | 7 ++- net-www/mod_watch/mod_watch-4.03-r2.ebuild | 44 +++++++++++++++++++ 8 files changed, 104 insertions(+), 3 deletions(-) create mode 100644 net-www/mod_watch/files/digest-mod_watch-3.18-r2 create mode 100644 net-www/mod_watch/files/digest-mod_watch-4.03-r2 create mode 100644 net-www/mod_watch/mod_watch-3.18-r2.ebuild create mode 100644 net-www/mod_watch/mod_watch-4.03-r2.ebuild diff --git a/net-www/mod_watch/ChangeLog b/net-www/mod_watch/ChangeLog index deb719955357..f36f90f9ab1c 100644 --- a/net-www/mod_watch/ChangeLog +++ b/net-www/mod_watch/ChangeLog @@ -1,6 +1,14 @@ # ChangeLog for net-www/mod_watch # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-www/mod_watch/ChangeLog,v 1.14 2006/06/05 02:38:42 vericgar Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-www/mod_watch/ChangeLog,v 1.15 2006/06/06 09:56:00 hollow Exp $ + +*mod_watch-4.03-r2 (06 Jun 2006) +*mod_watch-3.18-r2 (06 Jun 2006) + + 06 Jun 2006; Benedikt Böhm -files/mod_watch.conf, + +mod_watch-3.18-r2.ebuild, mod_watch-4.03-r1.ebuild, + +mod_watch-4.03-r2.ebuild: + fix #129578 05 Jun 2006; Michael Stewart -mod_watch-3.18.ebuild, -mod_watch-4.03.ebuild: diff --git a/net-www/mod_watch/files/digest-mod_watch-3.18-r1 b/net-www/mod_watch/files/digest-mod_watch-3.18-r1 index 16e42eb12c72..f5f4eff6c9ea 100644 --- a/net-www/mod_watch/files/digest-mod_watch-3.18-r1 +++ b/net-www/mod_watch/files/digest-mod_watch-3.18-r1 @@ -1 +1,3 @@ MD5 1409df800f24214bed16ca753b9967ff mod_watch318.tgz 94668 +RMD160 a30c07e18543a812b00fbfbc9230a91faef236b2 mod_watch318.tgz 94668 +SHA256 8eb266af5ed49546b12cc2c679945e94ad95b4f232dca66cea2a94ed3df5ac6f mod_watch318.tgz 94668 diff --git a/net-www/mod_watch/files/digest-mod_watch-3.18-r2 b/net-www/mod_watch/files/digest-mod_watch-3.18-r2 new file mode 100644 index 000000000000..f5f4eff6c9ea --- /dev/null +++ b/net-www/mod_watch/files/digest-mod_watch-3.18-r2 @@ -0,0 +1,3 @@ +MD5 1409df800f24214bed16ca753b9967ff mod_watch318.tgz 94668 +RMD160 a30c07e18543a812b00fbfbc9230a91faef236b2 mod_watch318.tgz 94668 +SHA256 8eb266af5ed49546b12cc2c679945e94ad95b4f232dca66cea2a94ed3df5ac6f mod_watch318.tgz 94668 diff --git a/net-www/mod_watch/files/digest-mod_watch-4.03-r1 b/net-www/mod_watch/files/digest-mod_watch-4.03-r1 index ef8f18379da0..cd02ba95b682 100644 --- a/net-www/mod_watch/files/digest-mod_watch-4.03-r1 +++ b/net-www/mod_watch/files/digest-mod_watch-4.03-r1 @@ -1 +1,3 @@ MD5 06d57713adb935f16596d22256bca913 mod_watch403.tgz 99583 +RMD160 016bfdf8c98aa4a9275080a564f842f29f48bd94 mod_watch403.tgz 99583 +SHA256 65c62c6fa0a94bbde5c3453f9827b80ed922f8450527d2e75417a78094aedc40 mod_watch403.tgz 99583 diff --git a/net-www/mod_watch/files/digest-mod_watch-4.03-r2 b/net-www/mod_watch/files/digest-mod_watch-4.03-r2 new file mode 100644 index 000000000000..cd02ba95b682 --- /dev/null +++ b/net-www/mod_watch/files/digest-mod_watch-4.03-r2 @@ -0,0 +1,3 @@ +MD5 06d57713adb935f16596d22256bca913 mod_watch403.tgz 99583 +RMD160 016bfdf8c98aa4a9275080a564f842f29f48bd94 mod_watch403.tgz 99583 +SHA256 65c62c6fa0a94bbde5c3453f9827b80ed922f8450527d2e75417a78094aedc40 mod_watch403.tgz 99583 diff --git a/net-www/mod_watch/mod_watch-3.18-r2.ebuild b/net-www/mod_watch/mod_watch-3.18-r2.ebuild new file mode 100644 index 000000000000..8e985ef0c636 --- /dev/null +++ b/net-www/mod_watch/mod_watch-3.18-r2.ebuild @@ -0,0 +1,36 @@ +# Copyright 1999-2006 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-www/mod_watch/mod_watch-3.18-r2.ebuild,v 1.1 2006/06/06 09:56:00 hollow Exp $ + +inherit apache-module + +DESCRIPTION="Bandwidth graphing for Apache with MRTG" +HOMEPAGE="http://www.snert.com/Software/mod_watch/" +KEYWORDS="~x86" + +MY_V=${PV/./} +SRC_URI="http://www.snert.com/Software/download/${PN}${MY_V}.tgz" + +IUSE="" +LICENSE="as-is" +SLOT="1" + +APACHE1_MOD_CONF="77_mod_watch" +APACHE1_MOD_DEFINE="WATCH" +APXS1_ARGS="-c mod_watch.c Memory.c Mutex.c Shared.c SharedHash.c NetworkTable.c" + +DOCFILES="CHANGES.TXT LICENSE.TXT" + +need_apache1 + +src_compile() { + sed -i -e "s:/usr/local/sbin:/usr/sbin:" \ + apache2mrtg.pl || die "Path fixing failed." + + apache1_src_compile +} + +src_install() { + apache1_src_install + dosbin apache2mrtg.pl mod_watch.pl +} diff --git a/net-www/mod_watch/mod_watch-4.03-r1.ebuild b/net-www/mod_watch/mod_watch-4.03-r1.ebuild index f1128e91b3ef..0bbc9a515bf3 100644 --- a/net-www/mod_watch/mod_watch-4.03-r1.ebuild +++ b/net-www/mod_watch/mod_watch-4.03-r1.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2005 Gentoo Foundation +# Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-www/mod_watch/mod_watch-4.03-r1.ebuild,v 1.5 2005/11/01 18:16:56 dertobi123 Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-www/mod_watch/mod_watch-4.03-r1.ebuild,v 1.6 2006/06/06 09:56:00 hollow Exp $ inherit eutils apache-module @@ -31,6 +31,9 @@ src_compile() { -e "s:APACHECTL=\\(.*\\):APACHECTL=${APACHECTL2} # \\1:" \ Makefile.dso || die "Path fixing failed." + sed -i -e "s:/usr/local/sbin:/usr/sbin:" \ + apache2mrtg.pl || die "Path fixing failed." + emake -f Makefile.dso build || die "Make failed." } diff --git a/net-www/mod_watch/mod_watch-4.03-r2.ebuild b/net-www/mod_watch/mod_watch-4.03-r2.ebuild new file mode 100644 index 000000000000..c0577eac8ab7 --- /dev/null +++ b/net-www/mod_watch/mod_watch-4.03-r2.ebuild @@ -0,0 +1,44 @@ +# Copyright 1999-2006 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-www/mod_watch/mod_watch-4.03-r2.ebuild,v 1.1 2006/06/06 09:56:00 hollow Exp $ + +inherit eutils apache-module + +MY_V=${PV/./} + +DESCRIPTION="Bandwidth graphing for Apache with MRTG" +HOMEPAGE="http://www.snert.com/Software/mod_watch/" +SRC_URI="http://www.snert.com/Software/download/${PN}${MY_V}.tgz" + +KEYWORDS="~ppc ~x86" +DEPEND="" +LICENSE="as-is" +SLOT="0" +IUSE="" + +S="${WORKDIR}/${PN}-4.3" + +APACHE2_MOD_CONF="77_mod_watch" +APACHE2_MOD_DEFINE="WATCH" + +DOCFILES="*.shtml CHANGES.TXT LICENSE.TXT Contrib/*.txt" + +need_apache2 + +src_compile() { + sed -i \ + -e "s:APXS=\\(.*\\):APXS=${APXS2} # \\1:" \ + -e "s:APACHECTL=\\(.*\\):APACHECTL=${APACHECTL2} # \\1:" \ + Makefile.dso || die "Path fixing failed." + + sed -i -e "s:/usr/local/sbin:/usr/sbin:" \ + apache2mrtg.pl || die "Path fixing failed." + + emake -f Makefile.dso build || die "Make failed." +} + +src_install() { + apache2_src_install + dosbin apache2mrtg.pl mod_watch.pl Contrib/mod_watch_list.pl + keepdir /var/lib/mod_watch +} -- 2.26.2