Apache herd package refresh

8 files changed, 98 insertions, 14 deletions

diff --git a/net-www/mod_watch/ChangeLog b/net-www/mod_watch/ChangeLog
index 4659a58b49d3..532eea0f4a9b 100644
--- a/net-www/mod_watch/ChangeLog
+++ b/net-www/mod_watch/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-www/mod_watch
-# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/mod_watch/ChangeLog,v 1.6 2004/11/04 08:16:46 urilith Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-www/mod_watch/ChangeLog,v 1.7 2005/01/09 12:20:14 hollow Exp $
+
+*mod_watch-4.03-r1 (09 Jan 2005)
+
+  09 Jan 2005; Benedikt Boehm <hollow@gentoo.org> metadata.xml,
+  +files/77_mod_watch.conf, +mod_watch-4.03-r1.ebuild:
+  Apache herd package refresh
 
   04 Nov 2004; Michael Tindal <urilith@gentoo.org> mod_watch-3.18.ebuild,
   mod_watch-3.18.ebuild, mod_watch-4.03.ebuild:
diff --git a/net-www/mod_watch/Manifest b/net-www/mod_watch/Manifest
index 260c714436a6..9eb5f6b3dc18 100644
--- a/net-www/mod_watch/Manifest
+++ b/net-www/mod_watch/Manifest
@@ -1,17 +1,20 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 d15770f17f996f0ea45d5b4935e7b4af ChangeLog 1076
-MD5 d2da0e45d7e39184d1cb7abbe3879086 metadata.xml 159
-MD5 b97270fcd1f9a68e15be483d508cdefe mod_watch-3.18.ebuild 1318
-MD5 e926746dc04c67bbf3635b0c5121bc92 mod_watch-4.03.ebuild 1095
+MD5 fa6b0444e82be20a5fc63df65a2bb6e7 ChangeLog 1259
+MD5 0d18f0fe5d603b41b988373892caf195 metadata.xml 226
+MD5 bf4b02a9ca5a0cdc1b4c88bebb1c09eb mod_watch-3.18.ebuild 1317
+MD5 088fcfa35e6dbd69d0bbe3aa2f80d801 mod_watch-4.03.ebuild 1094
+MD5 07ebc9e3a89da3cdf78072e556ccf045 mod_watch-4.03-r1.ebuild 1022
 MD5 2d99e90c1a0ac34fbc7ad74473f526f7 files/digest-mod_watch-3.18 60
 MD5 b25f10c1011d104c6daebadda90b25a6 files/digest-mod_watch-4.03 60
 MD5 50267e95c06324c0c4f9a603358501ad files/mod_watch.conf 627
+MD5 cc285f0ff6418e9efb599e45fe4c695c files/77_mod_watch.conf 748
+MD5 b25f10c1011d104c6daebadda90b25a6 files/digest-mod_watch-4.03-r1 60
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.9.10 (GNU/Linux)
+Version: GnuPG v1.4.0 (GNU/Linux)
 
-iD8DBQFBir0BI1lqEGTUzyQRAk0TAJ9RUYXID1GgxabAK7JY2rM7ceNCogCePWXA
-tvpc0oMqXU2Oxv62iZRpc3Q=
-=3kFg
+iD8DBQFB4SF9mPFBzbX68WERAlH7AKCPrmyYD4MXBxECAN0psbzT7KucAwCgjf1w
+F4qlB4vNAchYKSr3U3SElzo=
+=plvi
 -----END PGP SIGNATURE-----
diff --git a/net-www/mod_watch/files/77_mod_watch.conf b/net-www/mod_watch/files/77_mod_watch.conf
new file mode 100644
index 000000000000..9d438ab2b410
--- /dev/null
+++ b/net-www/mod_watch/files/77_mod_watch.conf
@@ -0,0 +1,33 @@
+<IfDefine WATCH>
+  <IfModule !mod_watch.c>
+    LoadModule watch_module    modules/mod_watch.so
+  </IfModule>
+</IfDefine>
+<IfModule mod_watch.c>
+  # Allows the URL used to query virtual host data:
+  #
+  #	http://www.snert.com/watch-info
+  #
+  <Location /watch-info>
+  SetHandler watch-info
+  </Location>
+
+  # Allows the URL used to query file owner and web
+  # server data:
+  #
+  #	http://www.snert.com/~achowe/watch-info
+  #	http://www.snert.com/~SERVER/watch-info
+  #
+  <Location /~*/watch-info>
+  SetHandler watch-info
+  </Location>
+
+  # Intended for debugging and analysis of shared memory
+  # hash table and weenie files:
+  #
+  #	http://www.snert.com/watch-table
+  #
+  <Location /watch-table>
+  SetHandler watch-table
+  </Location>
+</IfModule>
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
new file mode 100644
index 000000000000..ef8f18379da0
--- /dev/null
+++ b/net-www/mod_watch/files/digest-mod_watch-4.03-r1
@@ -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
index c054a8cd9b61..10510cb8be95 100644
--- a/net-www/mod_watch/metadata.xml
+++ b/net-www/mod_watch/metadata.xml
@@ -2,4 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>apache</herd>
+<maintainer>
+  <email>apache-devs@gentoo.org</email>
+</maintainer>
 </pkgmetadata>
diff --git a/net-www/mod_watch/mod_watch-3.18.ebuild b/net-www/mod_watch/mod_watch-3.18.ebuild
index a2ccd74eaafb..ae0652fac5a2 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-2004 Gentoo Foundation
+# Copyright 1999-2005 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.ebuild,v 1.5 2004/11/04 08:16:46 urilith Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/mod_watch/mod_watch-3.18.ebuild,v 1.6 2005/01/09 12:20:14 hollow 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-r1.ebuild b/net-www/mod_watch/mod_watch-4.03-r1.ebuild
new file mode 100644
index 000000000000..6d72bd223d0c
--- /dev/null
+++ b/net-www/mod_watch/mod_watch-4.03-r1.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2005 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.1 2005/01/09 12:20:14 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="~x86 ~ppc"
+DEPEND=">=sys-apps/sed-4"
+LICENSE="as-is"
+SLOT="0"
+IUSE=""
+
+S="${WORKDIR}/${PN}-4.3"
+
+APACHE2_MOD_CONF="77_mod_watch"
+APACHE2_MOD_DEFINE="WATCH"
+
+src_compile() {
+	sed -i \
+		-e "s:APXS=\\(.*\\):APXS=${APXS2} # \\1:" \
+		-e "s:APACHECTL=\\(.*\\):APACHECTL=${APACHECTL2} # \\1:" \
+		Makefile.dso || 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
+	dodoc *.shtml CHANGES.TXT LICENSE.TXT Contrib/*.txt
+	dodir /var/lib/mod_watch
+}
diff --git a/net-www/mod_watch/mod_watch-4.03.ebuild b/net-www/mod_watch/mod_watch-4.03.ebuild
index 94061e2a6f6a..6ada02e33388 100644
--- a/net-www/mod_watch/mod_watch-4.03.ebuild
+++ b/net-www/mod_watch/mod_watch-4.03.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 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.ebuild,v 1.5 2004/11/04 08:16:46 urilith Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/mod_watch/mod_watch-4.03.ebuild,v 1.6 2005/01/09 12:20:14 hollow Exp $
 
 DESCRIPTION="Bandwidth graphing for Apache with MRTG"
 HOMEPAGE="http://www.snert.com/Software/mod_watch/"