Use webapp.eclass. Closes #61399

6 files changed, 125 insertions, 19 deletions

diff --git a/app-admin/webalizer/ChangeLog b/app-admin/webalizer/ChangeLog
index d23f3d181cf9..fbd03820ac3d 100644
--- a/app-admin/webalizer/ChangeLog
+++ b/app-admin/webalizer/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-admin/webalizer
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/webalizer/ChangeLog,v 1.29 2004/07/17 17:02:09 tgall Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/webalizer/ChangeLog,v 1.30 2004/08/28 22:04:29 rl03 Exp $
+
+*webalizer-2.01.10-r6 (27 Aug 2004)
+
+  27 Aug 2004; Renat Lumpau <rl03@gentoo.org> +files/2.01.10/reconfig,
+  +webalizer-2.01.10-r6.ebuild:
+  -r6 uses webapp.eclass to create directories with right permissions. Closes
+  #61399.
 
   17 Jul 2004; Tom Gall <tgall@gentoo.org> webalizer-2.01.10-r5.ebuild:
   stable on ppc64, bug #55677
diff --git a/app-admin/webalizer/Manifest b/app-admin/webalizer/Manifest
index ba03574a33b7..755ba3649f86 100644
--- a/app-admin/webalizer/Manifest
+++ b/app-admin/webalizer/Manifest
@@ -1,19 +1,12 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 30e5366b0be61766d0b9f0284cea76bc ChangeLog 3897
-MD5 aa1e0b2898261e1a69ca61b5afbf0c6d metadata.xml 431
-MD5 470a5f4fdd8b8efaca7c5da87585bd93 webalizer-2.01.10-r4.ebuild 2056
+MD5 6f5fd40b7ad834361d483b607f6d9748 webalizer-2.01.10-r6.ebuild 2729
 MD5 745028b7c6d3cd96516f2e189d871d48 webalizer-2.01.10-r5.ebuild 2548
+MD5 470a5f4fdd8b8efaca7c5da87585bd93 webalizer-2.01.10-r4.ebuild 2056
+MD5 335bc503d4971a861d99eefd5d407e72 ChangeLog 4125
+MD5 aa1e0b2898261e1a69ca61b5afbf0c6d metadata.xml 431
+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 43ba0f621ebb8fd776052f4ef30f20d5 files/2.01.10/webalizer.conf 23910
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.4 (GNU/Linux)
-
-iD8DBQFA+eFxmdTrptrqvGERAgKBAJ0RENkLKHf//cqNF4ewkDn9oRLp5wCfYiSN
-zC++KzzNY4RTHd417DvTBaw=
-=ptnb
------END PGP SIGNATURE-----
+MD5 173d3eb05975b2d41d2cfda193208f1a files/2.01.10/reconfig 131
diff --git a/app-admin/webalizer/files/2.01.10/reconfig b/app-admin/webalizer/files/2.01.10/reconfig
new file mode 100644
index 000000000000..dc50871fcb5b
--- /dev/null
+++ b/app-admin/webalizer/files/2.01.10/reconfig
@@ -0,0 +1,4 @@
+#!/bin/bash
+if [ $1 = "start" -o $1 = "install" ]; then
+	sed -e "s|/var/www/webalizer|${MY_INSTALLDIR}|" -i /etc/webalizer.conf
+fi
diff --git a/app-admin/webalizer/files/digest-webalizer-2.01.10-r6 b/app-admin/webalizer/files/digest-webalizer-2.01.10-r6
new file mode 100644
index 000000000000..1e08bbd23fa0
--- /dev/null
+++ b/app-admin/webalizer/files/digest-webalizer-2.01.10-r6
@@ -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-r6.ebuild b/app-admin/webalizer/webalizer-2.01.10-r6.ebuild
new file mode 100644
index 000000000000..2fa046c826e3
--- /dev/null
+++ b/app-admin/webalizer/webalizer-2.01.10-r6.ebuild
@@ -0,0 +1,100 @@
+# Copyright 1999-2004 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-r6.ebuild,v 1.1 2004/08/28 22:04:29 rl03 Exp $
+
+# uses webapps to create directories with right permissions
+# probably slight overkil but works well
+inherit eutils 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
+
+	use apache2 || insinto /etc/apache/conf/addon-modules
+	use apache2 || newins ${FILESDIR}/${PV}/apache.webalizer webalizer.conf
+
+	use apache2 && insinto /etc/apache2/conf/modules.d
+	use apache2 && 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(){
+	if use apache2; then
+	einfo "to update your apache.conf just type"
+	einfo "echo \"Include  conf/addon-modules/webalizer.conf\" \
+		>> /etc/apache/conf/apache.conf"
+	fi
+	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
+}
diff --git a/app-admin/webmin/Manifest b/app-admin/webmin/Manifest
index 5431ccadedcc..3515f6b35b0b 100644
--- a/app-admin/webmin/Manifest
+++ b/app-admin/webmin/Manifest
@@ -1,12 +1,12 @@
-MD5 585b1883df60933b1de482e243f27f9d ChangeLog 8391
+MD5 3709556737859e7157057637f53dda0f ChangeLog 8486
 MD5 3923b6ae9bc25fc124e24e7747c8a802 metadata.xml 226
-MD5 f19f7b11073df55b1c3db965dd6936ae webmin-1.150.ebuild 2265
 MD5 75a2ff756dc8f861ce298cb35c8ea9e1 webmin-1.150-r1.ebuild 2369
-MD5 dec0388343156798ae62de2971b96dfa webmin-1.150-r2.ebuild 2688
-MD5 0d82309f5658287f6641399d0a29db7e files/init.d.webmin 859
+MD5 7b3b67769e6852868948e4b380ede13e webmin-1.150-r2.ebuild 2689
+MD5 f19f7b11073df55b1c3db965dd6936ae webmin-1.150.ebuild 2265
 MD5 03f188f36a9989ff035a883155a82e0b files/digest-webmin-1.150 65
 MD5 03f188f36a9989ff035a883155a82e0b files/digest-webmin-1.150-r1 65
 MD5 a947adc3399bbf729d969eb087a8d63c files/digest-webmin-1.150-r2 137
+MD5 0d82309f5658287f6641399d0a29db7e files/init.d.webmin 859
 MD5 bc8eb1c9de103599fc00b140b0ed1f9f files/uninstall.sh 260
 MD5 bb2acab90ada721c723d91a5a97c193c files/webmin-1.130-webalizer.patch 615
 MD5 a01d77a867d5469c7211685bfd04f6f6 files/webmin-1.140-apache2.patch 1227