Revbump for bug #106621.

Package-Manager: portage-2.0.53

9 files changed, 178 insertions, 21 deletions

diff --git a/app-admin/webalizer/ChangeLog b/app-admin/webalizer/ChangeLog
index 622fe481f991..7bc66041d43c 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.40 2005/09/10 14:10:14 agriffis Exp $
+# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/webalizer/ChangeLog,v 1.41 2006/01/06 20:57:01 rl03 Exp $
+
+*webalizer-2.01.10-r11 (06 Jan 2006)
+
+  06 Jan 2006; Renat Lumpau <rl03@gentoo.org> files/2.01.10/reconfig,
+  files/2.01.10/webalizer.conf, +webalizer-2.01.10-r11.ebuild:
+  Revbump for bug #106621.
 
   10 Sep 2005; Aron Griffis <agriffis@gentoo.org>
   webalizer-2.01.10-r5.ebuild:
diff --git a/app-admin/webalizer/Manifest b/app-admin/webalizer/Manifest
index 54f9fb015f28..7406416efcea 100644
--- a/app-admin/webalizer/Manifest
+++ b/app-admin/webalizer/Manifest
@@ -1,18 +1,30 @@
-MD5 db9541cf1c0142945af2a4c72fd78508 webalizer-2.01.10-r10.ebuild 3856
-MD5 f4ab9f9db4e50708404d47337257cd4e metadata.xml 223
-MD5 e7883822bb2a1bcd2b8409ba709a964e webalizer-2.01.10-r5.ebuild 2550
-MD5 e07be0b4516c1e9044aa0c668866b570 webalizer-2.01.10-r8.ebuild 2486
-MD5 db9a44f5ecf0d70528a96d303dc782a6 ChangeLog 5830
-MD5 5833410c77eec8d9cff653e67949b5a6 webalizer-2.01.10-r4.ebuild 2056
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 35ed78fda1726b5124d346c0cbd4f8a8 ChangeLog 6025
+MD5 72cc13055db3923e3b42824671712ed1 files/2.01.10/apache.webalizer 274
+MD5 45d6e8c8bd9f76c0e22d80acc0603aff files/2.01.10/reconfig 394
+MD5 7a71200318400e9c4a33e23bfc65904d files/2.01.10/webalizer.conf 23927
+MD5 363fe90869a7e9ea50f37ac714bdac2a files/digest-webalizer-2.01.10-r10 157
+MD5 363fe90869a7e9ea50f37ac714bdac2a files/digest-webalizer-2.01.10-r11 157
+MD5 99b845afaf9f7417f82f508992e4a5ab files/digest-webalizer-2.01.10-r4 74
+MD5 363fe90869a7e9ea50f37ac714bdac2a files/digest-webalizer-2.01.10-r5 157
+MD5 363fe90869a7e9ea50f37ac714bdac2a files/digest-webalizer-2.01.10-r8 157
 MD5 05805530b2e87a3d55e0056a45e330f5 files/output.c.patch 8088
+MD5 006af7bcfeb1e8648c1787c63d28470c files/webalizer-db4-with-geoip.patch 574
 MD5 cc68675ea63960bbc80d15110e41bf74 files/webalizer-db4.patch 574
-MD5 e1a2a43e4148a750fc8ef91e0af3ba99 files/digest-webalizer-2.01.10-r10 157
-MD5 99b845afaf9f7417f82f508992e4a5ab files/digest-webalizer-2.01.10-r4 74
 MD5 94e47e69398034261ac6d26edab9eafb files/webalizer-language-list.txt 1520
-MD5 006af7bcfeb1e8648c1787c63d28470c files/webalizer-db4-with-geoip.patch 574
 MD5 766a26ff1600e3ea5359278a9dcd1025 files/webalizer-readability.patch 8345
-MD5 e1a2a43e4148a750fc8ef91e0af3ba99 files/digest-webalizer-2.01.10-r5 157
-MD5 e1a2a43e4148a750fc8ef91e0af3ba99 files/digest-webalizer-2.01.10-r8 157
-MD5 7f29ecf09808176c22585f5205c6eceb files/2.01.10/reconfig 410
-MD5 d121e2b8e931e69a97c720cf30251959 files/2.01.10/webalizer.conf 23895
-MD5 72cc13055db3923e3b42824671712ed1 files/2.01.10/apache.webalizer 274
+MD5 f4ab9f9db4e50708404d47337257cd4e metadata.xml 223
+MD5 db9541cf1c0142945af2a4c72fd78508 webalizer-2.01.10-r10.ebuild 3856
+MD5 b71e077d377e71a2277e7d6ab0279498 webalizer-2.01.10-r11.ebuild 3939
+MD5 5833410c77eec8d9cff653e67949b5a6 webalizer-2.01.10-r4.ebuild 2056
+MD5 e7883822bb2a1bcd2b8409ba709a964e webalizer-2.01.10-r5.ebuild 2550
+MD5 e07be0b4516c1e9044aa0c668866b570 webalizer-2.01.10-r8.ebuild 2486
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDvtmoEzitwsaoONoRAkcwAKC+QrR4dSwvDsiwF+ipfzWE94PsygCgmv5z
+IcG0+Sy6XrESs0GTM+Z/wf8=
+=IdxJ
+-----END PGP SIGNATURE-----
diff --git a/app-admin/webalizer/files/2.01.10/reconfig b/app-admin/webalizer/files/2.01.10/reconfig
index 2e2f2cba82a2..57f6b84492ba 100644
--- a/app-admin/webalizer/files/2.01.10/reconfig
+++ b/app-admin/webalizer/files/2.01.10/reconfig
@@ -1,5 +1,5 @@
 #!/bin/bash
-if [ $1 = "start" -o $1 = "install" ]; then
+if [ $1 = "install" ]; then
 	# somewhat braindead - not sure which Apache we're using, so try both
 	[[ -a /etc/apache/modules.d/55_webalizer.conf ]] && file1="/etc/apache/modules.d/55_webalizer.conf"
 	[[ -a /etc/apache2/modules.d/55_webalizer.conf ]] && file2="/etc/apache2/modules.d/55_webalizer.conf"
diff --git a/app-admin/webalizer/files/2.01.10/webalizer.conf b/app-admin/webalizer/files/2.01.10/webalizer.conf
index b82707937968..af0a07e8643c 100644
--- a/app-admin/webalizer/files/2.01.10/webalizer.conf
+++ b/app-admin/webalizer/files/2.01.10/webalizer.conf
@@ -39,7 +39,7 @@ LogFile        /var/log/apache/access_log
 # should be a full path name, however relative ones might work as well.
 # If no output directory is specified, the current directory will be used.
 
-OutputDir      DIR
+OutputDir      /var/www/localhost/htdocs/webalizer
 
 # HistoryName allows you to specify the name of the history file produced
 # by the Webalizer.  The history file keeps the data for up to 12 months
diff --git a/app-admin/webalizer/files/digest-webalizer-2.01.10-r10 b/app-admin/webalizer/files/digest-webalizer-2.01.10-r10
index 1e08bbd23fa0..6843932aff40 100644
--- a/app-admin/webalizer/files/digest-webalizer-2.01.10-r10
+++ b/app-admin/webalizer/files/digest-webalizer-2.01.10-r10
@@ -1,2 +1,2 @@
-MD5 26d0a3c142423678daed2d6f579525d8 webalizer-2.01-10-src.tar.bz2 252664
 MD5 fa2e960702c72a16707854537053a966 geolizer_2.01-10-patch.20040216.tar.bz2 27688
+MD5 26d0a3c142423678daed2d6f579525d8 webalizer-2.01-10-src.tar.bz2 252664
diff --git a/app-admin/webalizer/files/digest-webalizer-2.01.10-r11 b/app-admin/webalizer/files/digest-webalizer-2.01.10-r11
new file mode 100644
index 000000000000..6843932aff40
--- /dev/null
+++ b/app-admin/webalizer/files/digest-webalizer-2.01.10-r11
@@ -0,0 +1,2 @@
+MD5 fa2e960702c72a16707854537053a966 geolizer_2.01-10-patch.20040216.tar.bz2 27688
+MD5 26d0a3c142423678daed2d6f579525d8 webalizer-2.01-10-src.tar.bz2 252664
diff --git a/app-admin/webalizer/files/digest-webalizer-2.01.10-r5 b/app-admin/webalizer/files/digest-webalizer-2.01.10-r5
index 1e08bbd23fa0..6843932aff40 100644
--- a/app-admin/webalizer/files/digest-webalizer-2.01.10-r5
+++ b/app-admin/webalizer/files/digest-webalizer-2.01.10-r5
@@ -1,2 +1,2 @@
-MD5 26d0a3c142423678daed2d6f579525d8 webalizer-2.01-10-src.tar.bz2 252664
 MD5 fa2e960702c72a16707854537053a966 geolizer_2.01-10-patch.20040216.tar.bz2 27688
+MD5 26d0a3c142423678daed2d6f579525d8 webalizer-2.01-10-src.tar.bz2 252664
diff --git a/app-admin/webalizer/files/digest-webalizer-2.01.10-r8 b/app-admin/webalizer/files/digest-webalizer-2.01.10-r8
index 1e08bbd23fa0..6843932aff40 100644
--- a/app-admin/webalizer/files/digest-webalizer-2.01.10-r8
+++ b/app-admin/webalizer/files/digest-webalizer-2.01.10-r8
@@ -1,2 +1,2 @@
-MD5 26d0a3c142423678daed2d6f579525d8 webalizer-2.01-10-src.tar.bz2 252664
 MD5 fa2e960702c72a16707854537053a966 geolizer_2.01-10-patch.20040216.tar.bz2 27688
+MD5 26d0a3c142423678daed2d6f579525d8 webalizer-2.01-10-src.tar.bz2 252664
diff --git a/app-admin/webalizer/webalizer-2.01.10-r11.ebuild b/app-admin/webalizer/webalizer-2.01.10-r11.ebuild
new file mode 100644
index 000000000000..e17fa0f16f7f
--- /dev/null
+++ b/app-admin/webalizer/webalizer-2.01.10-r11.ebuild
@@ -0,0 +1,137 @@
+# Copyright 1999-2006 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-r11.ebuild,v 1.1 2006/01/06 20:57:01 rl03 Exp $
+
+# uses webapp.eclass 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 nls"
+
+DEPEND="=sys-libs/db-4.1*
+	>=sys-libs/zlib-1.1.4
+	>=media-libs/libpng-1.2
+	>=media-libs/gd-1.8.3
+	geoip? ( dev-libs/geoip )"
+
+pkg_setup() {
+	webapp_pkg_setup
+
+	# prevents "undefined reference" errors... see bug #65163
+	if ! built_with_use media-libs/gd png; then
+		ewarn "media-libs/gd must be built with png for this package"
+		ewarn "to function."
+		die "recompile gd with USE=\"png\""
+	fi
+
+	# USE=nls has no real meaning if LINGUAS isn't set
+	if use nls && [ -z "${LINGUAS}" ]; then
+		ewarn "you must set LINGUAS in /etc/make.conf"
+		ewarn "if you want to USE=nls"
+		die "please either set LINGUAS or do not use nls"
+	fi
+}
+
+src_unpack() {
+	unpack ${A} ; cd ${S}
+
+	sed -i -e "s,db_185.h,db.h," configure
+
+	# geoip patch messes up db4.1 patch, so both are dependent on geoip USE
+	# flag, even though both of the db patches do the _exact_ same thing
+	if use geoip; then
+		cd ${WORKDIR}
+		epatch ${WORKDIR}/geolizer_${MY_PV}-patch/geolizer.patch || die
+		cd ${S}
+		epatch ${FILESDIR}/${PN}-db4-with-geoip.patch || die
+	else
+		epatch ${FILESDIR}/${PN}-readability.patch || die
+		epatch ${FILESDIR}/${PN}-db4.patch || die
+	fi
+}
+
+src_compile() {
+	local myconf
+
+	# method of lookup established
+	if use geoip; then
+		myconf="${myconf} --enable-geoip"
+	else
+		myconf="${myconf} --enable-dns"
+	fi
+
+	# really dirty hack; necessary due to a really gross ./configure
+	# basically, it just sets the natural language the program uses
+	# unfortunatly, this program only allows for one lang, so only the first
+	# entry in LINGUAS is used
+	if use nls; then
+		local longlang
+		longlang="$(grep ^${LINGUAS:0:2} ${FILESDIR}/webalizer-language-list.txt)"
+		myconf="${myconf} --with-language=${longlang:3}"
+	else
+		myconf="${myconf} --with-language=english"
+	fi
+
+	# stupid broken configuration file
+	autoconf
+
+	econf \
+		--with-db=/usr/include/db4.1/ \
+		${myconf} || die "econf failed"
+
+	emake || die "make failed"
+}
+
+src_install() {
+	webapp_src_preinst
+
+	into /usr
+	dobin webalizer
+	dosym webalizer /usr/bin/webazolver
+	doman webalizer.1
+
+	insinto /etc
+	doins ${FILESDIR}/${PV}/webalizer.conf
+	use apache2 && sed -i -e "s/apache/apache2/g" ${D}/etc/webalizer.conf
+
+	dodoc README* CHANGES Copyright sample.conf ${FILESDIR}/${PV}/apache.webalizer
+	webapp_src_install
+}
+
+pkg_postinst(){
+	einfo
+	einfo "It is suggested that you restart apache before using webalizer"
+	einfo "You may want to review /etc/webalizer.conf and ensure that"
+	einfo "OutputDir is set correctly"
+	einfo
+	einfo "Then 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
+	einfo "A sample Apache config file has been installed into"
+	einfo "/usr/share/doc/${PF}/apache.webalizer"
+	einfo "Please edit and install it as necessary"
+	einfo
+
+	if [ ${#LINGUAS} -gt 2 ] && use nls; then
+		ewarn
+		ewarn "You have more than one language in LINGUAS"
+		ewarn "Due to the limitations of this packge, it was built"
+		ewarn "only with ${LINGUAS:0:2} support. If this is not what"
+		ewarn "you intended, please place the language you desire"
+		ewarn "_first_ in the list of LINGUAS in /etc/make.conf"
+		ewarn
+	fi
+
+	webapp_pkg_postinst
+}