Close #15752.

4 files changed, 82 insertions, 14 deletions

diff --git a/app-admin/webalizer/ChangeLog b/app-admin/webalizer/ChangeLog
index 4e38ab802d78..d0ca9a66f54d 100644
--- a/app-admin/webalizer/ChangeLog
+++ b/app-admin/webalizer/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-admin/webalizer
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/webalizer/ChangeLog,v 1.12 2003/02/12 02:55:08 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/webalizer/ChangeLog,v 1.13 2003/06/22 19:33:00 woodchip Exp $
+
+*webalizer-2.01.10-r3 (22 Jun 2003)
+
+  22 Jun 2003; Donny Davies <woodchip@gentoo.org> webalizer-2.01.10-r3.ebuild:
+  Close #15752; make it install properly for Apache2.
 
   06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
  
@@ -13,8 +18,7 @@
   Added ppc to keywords
 
   26 Jul 2002; Calum Selkirk <cselkirk@gentoo.org> webalizer-2.01.10-r2.ebuild :
-  Changed DESCRIPTION to something descriptive ;)
-  Added RDEPEND
+  Changed DESCRIPTION to something descriptive ;) Added RDEPEND
   
   3 May 2002; Donny Davies <woodchip@gentoo.org> :
   Add LICENSE, SLOT, $Headers.
@@ -42,12 +46,3 @@
 
   12 Apr 2002; Seemant Kulleen <seemant@gentoo.org> webalizer-2.01.06-r1.ebuild:
   Compile against newest libpng
-
-*webalizer-2.01.06 (1 Feb 2002)
-
-  1 Feb 2002; G.Bevin <gbevin@gentoo.org> ChangeLog :
-  Added initial ChangeLog which should be updated whenever the package is
-  updated in any way. This changelog is targetted to users. This means that the
-  comments should well explained and written in clean English. The details about
-  writing correct changelogs are explained in the skel.ChangeLog file which you
-  can find in the root directory of the portage repository.
diff --git a/app-admin/webalizer/Manifest b/app-admin/webalizer/Manifest
index 031e4d20a0bf..99859a583ca4 100644
--- a/app-admin/webalizer/Manifest
+++ b/app-admin/webalizer/Manifest
@@ -1,5 +1,5 @@
-MD5 9e085bbe79f63c5f3a43dbf7f8de7c40 ChangeLog 2086
-MD5 b0f3895e6d98d8e582512bf35184c875 webalizer-2.01.10-r3.ebuild 1843
+MD5 5b822158845a035824fbb20412cce493 ChangeLog 1794
+MD5 1df93ff32133ee0345dc244e5c782e9e webalizer-2.01.10-r3.ebuild 1839
 MD5 f3b2ef74726177318f4a4631bcd869eb webalizer-2.01.10-r2.ebuild 1561
 MD5 243a553aac1ac7c50842856ce779c0d0 files/apache.webalizer 345
 MD5 99b845afaf9f7417f82f508992e4a5ab files/digest-webalizer-2.01.10-r2 74
diff --git a/app-admin/webalizer/files/digest-webalizer-2.01.10-r3 b/app-admin/webalizer/files/digest-webalizer-2.01.10-r3
new file mode 100644
index 000000000000..f8b15bb17a67
--- /dev/null
+++ b/app-admin/webalizer/files/digest-webalizer-2.01.10-r3
@@ -0,0 +1 @@
+MD5 26d0a3c142423678daed2d6f579525d8 webalizer-2.01-10-src.tar.bz2 252664
diff --git a/app-admin/webalizer/webalizer-2.01.10-r3.ebuild b/app-admin/webalizer/webalizer-2.01.10-r3.ebuild
new file mode 100644
index 000000000000..bf06f6904286
--- /dev/null
+++ b/app-admin/webalizer/webalizer-2.01.10-r3.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/webalizer/webalizer-2.01.10-r3.ebuild,v 1.1 2003/06/22 19:33:01 woodchip Exp $
+
+MY_P=${P/.10/-10}
+S=${WORKDIR}/${MY_P}
+DESCRIPTION="Webserver log file analyzer"
+SRC_URI="ftp://ftp.mrunix.net/pub/webalizer/${MY_P}-src.tar.bz2"
+HOMEPAGE="http://www.mrunix.net/webalizer/"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="x86 ppc sparc"
+
+DEPEND="=sys-libs/db-1*
+	>=sys-libs/zlib-1.1.4
+	>=media-libs/libpng-1.2
+	>=media-libs/libgd-1.8.3"
+
+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
+}
+
+src_compile() {
+	econf --enable-dns || die
+	make || die
+}
+
+src_install() {
+	into /usr
+	dobin webalizer
+	dosym webalizer /usr/bin/webazolver
+	doman webalizer.1
+
+	insinto /etc
+	newins ${FILESDIR}/webalizer-${PV}.conf webalizer.conf
+
+	if [ "`use apache2`" ]; then
+		# patch for apache2
+		cp ${D}/etc/webalizer.conf ${D}/etc/webalizer.conf.1;
+		sed -e "s/apache/apache2/g" ${D}/etc/webalizer.conf.1 > ${D}/etc/webalizer.conf;
+		rm ${D}/etc/webalizer.conf.1
+		insinto /etc/apache2/conf
+	else
+		insinto /etc/apache/conf
+	fi
+
+	doins ${FILESDIR}/apache.webalizer
+	dodoc README* CHANGES COPYING Copyright sample.conf
+	dodir /home/httpd/htdocs/webalizer
+}
+
+pkg_postinst() {
+	einfo
+	einfo "Execute: \"ebuild /var/db/pkg/net-www/${PF}/${PF}.ebuild config\""
+	einfo "to have your apache.conf auto-updated for use with webalizer."
+	einfo
+}
+
+pkg_config() {
+	if [ "`use apache2`" ]; then
+		CONF="/etc/apache2/conf/apache2.conf"
+	else
+		CONF="/etc/apache/conf/apache.conf"
+	fi
+	echo "Include  conf/apache.webalizer" \
+		>> ${ROOT}${CONF}
+}