4 files changed, 123 insertions, 7 deletions
diff --git a/app-admin/webalizer/ChangeLog b/app-admin/webalizer/ChangeLog
index 96d67bfa2fcb..28a8c49565a7 100644
--- a/app-admin/webalizer/ChangeLog
+++ b/app-admin/webalizer/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-admin/webalizer
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/webalizer/ChangeLog,v 1.33 2005/01/01 11:35:04 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/webalizer/ChangeLog,v 1.34 2005/03/01 16:15:25 beu Exp $
+
+*webalizer-2.01.10-r7 (01 Mar 2005)
+
+  01 Mar 2005; Elfyn McBratney <beu@gentoo.org>
+  +webalizer-2.01.10-r7.ebuild:
+  Rev bump.  Updates to use the new apache paths.
 
   28 Dec 2004; Ciaran McCreesh <ciaranm@gentoo.org> :
   Change encoding to UTF-8 for GLEP 31 compliance
diff --git a/app-admin/webalizer/Manifest b/app-admin/webalizer/Manifest
index 8aad28c15cb5..675cf7c70f7e 100644
--- a/app-admin/webalizer/Manifest
+++ b/app-admin/webalizer/Manifest
@@ -1,12 +1,24 @@
-MD5 ce2532062e94968129c56ac5d33d1437 ChangeLog 4330
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 MD5 8583552359d0c1414cb52fa99fc5578c metadata.xml 284
-MD5 5833410c77eec8d9cff653e67949b5a6 webalizer-2.01.10-r4.ebuild 2056
-MD5 d74bed80f6183e16dcbd161ccde1ef3d webalizer-2.01.10-r5.ebuild 2553
+MD5 9c567af60ebde4c8c06cc6254ce012e7 webalizer-2.01.10-r7.ebuild 2483
+MD5 64dc0898c511fea500b1382892766841 ChangeLog 4491
 MD5 0ab2caabc1c6cbf6b9f4b8350587f931 webalizer-2.01.10-r6.ebuild 2735
+MD5 d74bed80f6183e16dcbd161ccde1ef3d webalizer-2.01.10-r5.ebuild 2553
+MD5 5833410c77eec8d9cff653e67949b5a6 webalizer-2.01.10-r4.ebuild 2056
+MD5 e1a2a43e4148a750fc8ef91e0af3ba99 files/digest-webalizer-2.01.10-r6 157
+MD5 05805530b2e87a3d55e0056a45e330f5 files/output.c.patch 8088
 MD5 99b845afaf9f7417f82f508992e4a5ab files/digest-webalizer-2.01.10-r4 74
 MD5 e1a2a43e4148a750fc8ef91e0af3ba99 files/digest-webalizer-2.01.10-r5 157
-MD5 05805530b2e87a3d55e0056a45e330f5 files/output.c.patch 8088
-MD5 e1a2a43e4148a750fc8ef91e0af3ba99 files/digest-webalizer-2.01.10-r6 157
-MD5 08dd05c168f790b0af0b1cb5c0fd8340 files/2.01.10/apache.webalizer 337
+MD5 e1a2a43e4148a750fc8ef91e0af3ba99 files/digest-webalizer-2.01.10-r7 157
 MD5 43ba0f621ebb8fd776052f4ef30f20d5 files/2.01.10/webalizer.conf 23910
 MD5 173d3eb05975b2d41d2cfda193208f1a files/2.01.10/reconfig 131
+MD5 08dd05c168f790b0af0b1cb5c0fd8340 files/2.01.10/apache.webalizer 337
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.2.6 (GNU/Linux)
+
+iD8DBQFCJJUpjUHll2nfF60RApkoAJoCPYgv4QIk8ib2x1vjv34xPPV91ACdFNGL
+IhYtxcb7sqa3GQtNHxh2Vus=
+=OgLk
+-----END PGP SIGNATURE-----
diff --git a/app-admin/webalizer/files/digest-webalizer-2.01.10-r7 b/app-admin/webalizer/files/digest-webalizer-2.01.10-r7
new file mode 100644
index 000000000000..1e08bbd23fa0
--- /dev/null
+++ b/app-admin/webalizer/files/digest-webalizer-2.01.10-r7
@@ -0,0 +1,2 @@
+MD5 26d0a3c142423678daed2d6f579525d8 webalizer-2.01-10-src.tar.bz2 252664
+MD5 fa2e960702c72a16707854537053a966 geolizer_2.01-10-patch.20040216.tar.bz2 27688
diff --git a/app-admin/webalizer/webalizer-2.01.10-r7.ebuild b/app-admin/webalizer/webalizer-2.01.10-r7.ebuild
new file mode 100644
index 000000000000..78c481881147
--- /dev/null
+++ b/app-admin/webalizer/webalizer-2.01.10-r7.ebuild
@@ -0,0 +1,96 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/webalizer/webalizer-2.01.10-r7.ebuild,v 1.1 2005/03/01 16:15:25 beu Exp $
+
+# uses webapps to create directories with right permissions
+# probably slight overkil but works well
+inherit eutils depend.apache webapp
+
+MY_PV=${PV/.10/-10}
+MY_P=${PN}-${MY_PV}
+S=${WORKDIR}/${MY_P}
+DESCRIPTION="Webserver log file analyzer"
+HOMEPAGE="http://www.mrunix.net/webalizer/"
+SRC_URI="ftp://ftp.mrunix.net/pub/webalizer/${MY_P}-src.tar.bz2
+	geoip? ( http://sysd.org/proj/geolizer_${MY_PV}-patch.20040216.tar.bz2 )"
+
+LICENSE="GPL-2"
+KEYWORDS="~x86 ~ppc ~sparc ~alpha ~hppa ~amd64 ~ppc64"
+IUSE="apache2 geoip"
+
+DEPEND="=sys-libs/db-1*
+	>=sys-libs/zlib-1.1.4
+	>=media-libs/libpng-1.2
+	>=media-libs/gd-1.8.3
+	geoip? ( dev-libs/geoip )"
+
+src_unpack() {
+	unpack ${A} ; cd ${S}
+	# fix --enable-dns; our db1 headers are in /usr/include/db1
+	#	mv dns_resolv.c dns_resolv.c.orig
+	#	sed -e 's%^\(#include \)\(<db.h>\)\(.*\)%\1<db1/db.h>\3%' \
+	#		dns_resolv.c.orig > dns_resolv.c
+	sed -i -e "s,db_185.h,db.h," configure
+
+	if use geoip; then
+		cd ${WORKDIR}
+		epatch ${WORKDIR}/geolizer_${MY_PV}-patch/geolizer.patch || die
+	else
+		# pretty printer for numbers
+		cd ${S} && epatch ${FILESDIR}/output.c.patch || die
+	fi
+}
+
+src_compile() {
+	if use geoip; then
+		myconf="`use_enable geoip`"
+	else
+		myconf="--enable-dns"
+	fi
+	myconf="${myconf} --with-db=/usr/include/db1/"
+	einfo "Configuration: ${myconf}"
+	econf ${myconf} || die
+	make || die
+}
+
+src_install() {
+	webapp_src_preinst
+
+	into /usr
+	dobin webalizer
+	dosym webalizer /usr/bin/webazolver
+	doman webalizer.1
+
+	insinto /etc
+	newins ${FILESDIR}/${PV}/webalizer.conf webalizer.conf
+
+	if use apache2; then
+		# patch for apache2
+		sed -i -e "s/apache/apache2/g" ${D}/etc/webalizer.conf
+		insinto /etc/apache2/conf
+	else
+		insinto /etc/apache/conf
+	fi
+
+	doins ${FILESDIR}/${PV}/webalizer.conf
+
+	if use apache2; then
+		insinto ${APACHE2_MODULES_CONFDIR}
+	else
+		insinto ${APACHE1_MODULES_CONFDIR}
+	fi
+	newins ${FILESDIR}/${PV}/apache.webalizer 55_webalizer.conf
+
+	dodoc README* CHANGES Copyright sample.conf
+	webapp_hook_script ${FILESDIR}/${PV}/reconfig
+	webapp_src_install
+}
+
+pkg_postinst(){
+	einfo
+	einfo "Just type webalizer to generate your stats."
+	einfo "You can also use cron to generate them e.g. every day."
+	einfo "They can be accessed via http://localhost/webalizer"
+	einfo
+	webapp_pkg_postinst
+}