Added apache2 version of mod_watch. Closes #4644.

6 files changed, 82 insertions, 6 deletions

diff --git a/net-www/mod_watch/ChangeLog b/net-www/mod_watch/ChangeLog
index 5c06ac2e91c9..69fbe4d4aa5b 100644
--- a/net-www/mod_watch/ChangeLog
+++ b/net-www/mod_watch/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for net-www/mod_watch
-# Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/mod_watch/ChangeLog,v 1.1 2003/06/22 19:19:53 woodchip Exp $
+# Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-www/mod_watch/ChangeLog,v 1.2 2004/04/21 18:39:43 zul Exp $
+
+*mod_watch-4.03 (21 Apr 2004)
+
+  21 Apr 2004; Chuck Short <zul@gentoo.org> metadata.xml,
+  mod_watch-3.18.ebuild, mod_watch-4.03.ebuild:
+  Added metadata.xml, Updated header.
+
+*mod_watch-4.03 (21 Apr 2004)
+
+  21 Apr 2004; Chuck Short <zul@gentoo.org> mod_watch-4.03.ebuild:
+  Added apache2 version of mod_watch. Closes #43644.
 
 *mod_watch-3.18 (22 Jun 2003)
 
diff --git a/net-www/mod_watch/Manifest b/net-www/mod_watch/Manifest
index 720199d06a16..484db3f4614e 100644
--- a/net-www/mod_watch/Manifest
+++ b/net-www/mod_watch/Manifest
@@ -1,4 +1,7 @@
-MD5 41d9e516415a502e312803c1955f3848 mod_watch-3.18.ebuild 1320
-MD5 b81fc6e040c28312d22882327fe9d9cf ChangeLog 377
+MD5 e0ccbc7e750dba989bd69ba1a3721262 mod_watch-3.18.ebuild 1315
+MD5 9018034de11367f0dad636bdd1243d2f mod_watch-4.03.ebuild 1544
+MD5 9b89021b61d4f9e27249a50ab817c1f9 ChangeLog 700
+MD5 d2da0e45d7e39184d1cb7abbe3879086 metadata.xml 159
 MD5 50267e95c06324c0c4f9a603358501ad files/mod_watch.conf 627
 MD5 2d99e90c1a0ac34fbc7ad74473f526f7 files/digest-mod_watch-3.18 60
+MD5 b25f10c1011d104c6daebadda90b25a6 files/digest-mod_watch-4.03 60
diff --git a/net-www/mod_watch/files/digest-mod_watch-4.03 b/net-www/mod_watch/files/digest-mod_watch-4.03
new file mode 100644
index 000000000000..ef8f18379da0
--- /dev/null
+++ b/net-www/mod_watch/files/digest-mod_watch-4.03
@@ -0,0 +1 @@
+MD5 06d57713adb935f16596d22256bca913 mod_watch403.tgz 99583
diff --git a/net-www/mod_watch/metadata.xml b/net-www/mod_watch/metadata.xml
new file mode 100644
index 000000000000..c054a8cd9b61
--- /dev/null
+++ b/net-www/mod_watch/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>apache</herd>
+</pkgmetadata>
diff --git a/net-www/mod_watch/mod_watch-3.18.ebuild b/net-www/mod_watch/mod_watch-3.18.ebuild
index a935139a54ac..cc596f7040a6 100644
--- a/net-www/mod_watch/mod_watch-3.18.ebuild
+++ b/net-www/mod_watch/mod_watch-3.18.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/mod_watch/mod_watch-3.18.ebuild,v 1.2 2003/06/22 19:33:45 woodchip Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/mod_watch/mod_watch-3.18.ebuild,v 1.3 2004/04/21 18:39:43 zul Exp $
 
 DESCRIPTION="Bandwidth graphing for Apache with MRTG"
 HOMEPAGE="http://www.snert.com/Software/mod_watch/"
diff --git a/net-www/mod_watch/mod_watch-4.03.ebuild b/net-www/mod_watch/mod_watch-4.03.ebuild
new file mode 100644
index 000000000000..542fedee34c1
--- /dev/null
+++ b/net-www/mod_watch/mod_watch-4.03.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-www/mod_watch/mod_watch-4.03.ebuild,v 1.1 2004/04/21 18:39:43 zul Exp $
+
+DESCRIPTION="Bandwidth graphing for Apache with MRTG"
+HOMEPAGE="http://www.snert.com/Software/mod_watch/"
+KEYWORDS="~x86"
+
+MY_V="`echo ${PV} | sed -e 's:\.::g'`"
+S=${WORKDIR}/${P}
+SRC_URI="http://www.snert.com/Software/download/${PN}${MY_V}.tgz"
+
+DEPEND="=net-www/apache-2*
+	>=sys-apps/sed-4"
+LICENSE="as-is"
+SLOT="0"
+S="${WORKDIR}/${PN}-4.3"
+
+src_compile() {
+	sed -i \
+		-e "s:APXS=/home/apache2/bin/apxs:APXS=/usr/sbin/apxs2:" \
+		-e "s:APACHECTL=apachectl:APACHECTL=/usr/sbin/apache2ctl:" \
+		Makefile.dso || die "Path fixing failed."
+	make -f Makefile.dso build || die "Make failed."
+}
+
+src_install() {
+	exeinto /usr/lib/apache2-extramodules
+	doexe .libs/mod_watch.so
+
+	exeinto /usr/sbin
+	doexe apache2mrtg.pl
+	doexe mod_watch.pl
+
+	dodir /var/lib/mod_watch
+	dohtml index.shtml
+
+	insinto /etc/apache2/conf/addon-modules
+	doins ${FILESDIR}/mod_watch.conf
+}
+
+pkg_postinst() {
+	einfo
+	einfo "Execute \"ebuild /usr/portage/net-www/${PF}/${PF}.ebuild config\""
+	einfo "to have your apache.conf auto-updated for use with this module."
+	einfo "You should then edit your /etc/conf.d/apache file to suit."
+	einfo
+}
+
+pkg_config() {
+	${ROOT}/usr/sbin/apacheaddmod \
+		${ROOT}/etc/apache/conf/apache.conf \
+		extramodules/mod_watch.so mod_watch.c watch_module \
+		define=WATCH addconf=conf/addon-modules/mod_watch.conf
+	:;
+}