diff options
Diffstat (limited to 'app-admin/webalizer')
| -rw-r--r-- | app-admin/webalizer/ChangeLog | 14 | ||||
| -rw-r--r-- | app-admin/webalizer/files/apache.webalizer | 14 | ||||
| -rw-r--r-- | app-admin/webalizer/files/webalizer-readability.patch | 164 | ||||
| -rw-r--r-- | app-admin/webalizer/files/webalizer-storage-size.patch | 15 | ||||
| -rw-r--r-- | app-admin/webalizer/metadata.xml | 8 | ||||
| -rw-r--r-- | app-admin/webalizer/webalizer-2.01.10-r12.ebuild | 147 | ||||
| -rw-r--r-- | app-admin/webalizer/webalizer-2.01.10-r13.ebuild | 150 | ||||
| -rw-r--r-- | app-admin/webalizer/webalizer-2.01.10-r15.ebuild | 4 | ||||
| -rw-r--r-- | app-admin/webalizer/webalizer-2.01.10-r16.ebuild (renamed from app-admin/webalizer/webalizer-2.01.10-r14.ebuild) | 93 |
9 files changed, 82 insertions, 527 deletions
diff --git a/app-admin/webalizer/ChangeLog b/app-admin/webalizer/ChangeLog index 2fd1853dccc1..9b6709f99d1f 100644 --- a/app-admin/webalizer/ChangeLog +++ b/app-admin/webalizer/ChangeLog @@ -1,6 +1,16 @@ # ChangeLog for app-admin/webalizer -# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-admin/webalizer/ChangeLog,v 1.68 2007/07/10 20:53:03 gustavoz Exp $ +# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/app-admin/webalizer/ChangeLog,v 1.69 2008/02/23 16:52:34 hollow Exp $ + +*webalizer-2.01.10-r16 (23 Feb 2008) + + 23 Feb 2008; Benedikt Böhm <hollow@gentoo.org> files/apache.webalizer, + -files/webalizer-readability.patch, +files/webalizer-storage-size.patch, + metadata.xml, -webalizer-2.01.10-r12.ebuild, + -webalizer-2.01.10-r13.ebuild, -webalizer-2.01.10-r14.ebuild, + +webalizer-2.01.10-r16.ebuild: + ebuild cleanup wrt #208584; fixes #156785, #200855 and maybe #184732; bumps + geolizer and xtended to current versions 10 Jul 2007; Gustavo Zacarias <gustavoz@gentoo.org> webalizer-2.01.10-r15.ebuild: diff --git a/app-admin/webalizer/files/apache.webalizer b/app-admin/webalizer/files/apache.webalizer index 13e8ce1ff938..0dbab4111a92 100644 --- a/app-admin/webalizer/files/apache.webalizer +++ b/app-admin/webalizer/files/apache.webalizer @@ -1,11 +1,9 @@ -# # This is the config snippet for Webalizer -# -# $Header: /var/cvsroot/gentoo-x86/app-admin/webalizer/files/apache.webalizer,v 1.5 2006/04/24 15:46:58 rl03 Exp $ - <Directory "/var/www/localhost/htdocs/webalizer"> - Options None - AllowOverride None - Order allow,deny - Allow from all + Options None + AllowOverride None + Order allow,deny + Allow from all </Directory> + +# vim: ts=4 filetype=apache diff --git a/app-admin/webalizer/files/webalizer-readability.patch b/app-admin/webalizer/files/webalizer-readability.patch deleted file mode 100644 index e3ebe3f55d2d..000000000000 --- a/app-admin/webalizer/files/webalizer-readability.patch +++ /dev/null @@ -1,164 +0,0 @@ -This patch makes webalizer print byte counts in human readable format. - Tomas Janousek <tomi@nomi.cz>, Ondrej Novy <onovy@nomi.cz> - ---- output.c.old 2001-06-15 10:34:24.000000000 +0200 -+++ output.c 2004-09-05 21:45:40.000000000 +0200 -@@ -140,6 +140,30 @@ - - FILE *out_fp; - -+ -+/*********************************************/ -+/* FORMAT_NUM - output format of number */ -+/*********************************************/ -+char * format_num(double in) -+{ -+ static char *units[] = { "B", "KB", "MB", "GB", "TB" }; -+ char **unit, *tmp; -+ static char out[50]; -+ -+ /* convert it to X Y, where X is less than 1024 and Y is the unit */ -+ for (unit = units; in > 1024 && unit < units+sizeof(units)/sizeof(*units)-1; -+ in /= 1024, ++unit); -+ snprintf(out, 40, "%.2f", in); -+ -+ /* skip trailing zeros */ -+ for (tmp = out + strlen(out) - 1; tmp > out && *tmp == '0'; *tmp-- = 0); -+ if (*tmp == '.') *tmp = 0; -+ -+ strcat(out, " "); -+ strcat(out, *unit); -+ return out; -+} -+ - /*********************************************/ - /* WRITE_HTML_HEAD - output top of HTML page */ - /*********************************************/ -@@ -544,8 +568,8 @@ - "</FONT></TD></TR>\n",msg_h_total, msg_h_visits, t_visit); - /* Total XFer */ - fprintf(out_fp,"<TR><TD WIDTH=380><FONT SIZE=\"-1\">%s</FONT></TD>\n" \ -- "<TD ALIGN=right COLSPAN=2><FONT SIZE=\"-1\"><B>%.0f</B>" \ -- "</FONT></TD></TR>\n",msg_mtot_tx,t_xfer/1024); -+ "<TD ALIGN=right COLSPAN=2><FONT SIZE=\"-1\"><B>%s</B>" \ -+ "</FONT></TD></TR>\n",msg_mtot_tx,format_num(t_xfer)); - fprintf(out_fp,"<TR><TH HEIGHT=4></TH></TR>\n"); - /**********************************************/ - /* Unique Sites */ -@@ -620,10 +644,11 @@ - /* Max/Avg KBytes per Day */ - fprintf(out_fp,"<TR>" \ - "<TD><FONT SIZE=\"-1\">%s</FONT></TD>\n" \ -- "<TD ALIGN=right WIDTH=65><FONT SIZE=\"-1\"><B>%.0f</B></FONT></TD>\n" \ -- "<TD WIDTH=65 ALIGN=right><FONT SIZE=-1><B>%.0f</B>" \ -- "</FONT></TD></TR>\n",msg_mtot_mkd, -- (t_xfer/1024)/days_in_month,max_xfer/1024); -+ "<TD ALIGN=right WIDTH=65><FONT SIZE=\"-1\"><B>%s</B></FONT></TD>\n", -+ msg_mtot_mkd,format_num(t_xfer/days_in_month)); -+ fprintf(out_fp,"<TD WIDTH=65 ALIGN=right><FONT SIZE=-1><B>%s</B>" \ -+ "</FONT></TD></TR>\n",format_num(max_xfer)); -+ - fprintf(out_fp,"<TR><TH HEIGHT=4></TH></TR>\n"); - /**********************************************/ - /* response code totals */ -@@ -713,9 +738,9 @@ - "<TD ALIGN=right><FONT SIZE=\"-2\">%3.02f%%</FONT></TD>\n", - tm_site[i],PCENT(tm_site[i],t_site)); - fprintf(out_fp,"<TD ALIGN=right>" \ -- "<FONT SIZE=\"-1\"><B>%.0f</B></FONT></TD>\n" \ -+ "<FONT SIZE=\"-1\"><B>%s</B></FONT></TD>\n" \ - "<TD ALIGN=right><FONT SIZE=\"-2\">%3.02f%%</FONT></TD></TR>\n", -- tm_xfer[i]/1024,PCENT(tm_xfer[i],t_xfer)); -+ format_num(tm_xfer[i]),PCENT(tm_xfer[i],t_xfer)); - } - fprintf(out_fp,"<TR><TH HEIGHT=4></TH></TR>\n"); - fprintf(out_fp,"</TABLE>\n"); -@@ -801,11 +826,13 @@ - th_page[i]/days_in_month,th_page[i], - PCENT(th_page[i],t_page)); - fprintf(out_fp, -- "<TD ALIGN=right><FONT SIZE=\"-1\"><B>%.0f</B></FONT></TD>\n" \ -- "<TD ALIGN=right><FONT SIZE=\"-1\"><B>%.0f</B></FONT></TD>\n" \ -+ "<TD ALIGN=right><FONT SIZE=\"-1\"><B>%s</B></FONT></TD>\n", -+ format_num(th_xfer[i]/days_in_month)); -+ fprintf(out_fp, -+ "<TD ALIGN=right><FONT SIZE=\"-1\"><B>%s</B></FONT></TD>\n" \ - "<TD ALIGN=right><FONT SIZE=\"-2\">%3.02f%%</FONT></TD></TR>\n", -- (th_xfer[i]/days_in_month)/1024,th_xfer[i]/1024, -- PCENT(th_xfer[i],t_xfer)); -+ format_num(th_xfer[i]), -+ PCENT(th_xfer[i],t_xfer)); - avg_file += th_file[i]/days_in_month; - avg_xfer+= (th_xfer[i]/days_in_month)/1024; - } -@@ -884,14 +911,15 @@ - "<TD ALIGN=right><FONT SIZE=\"-2\">%3.02f%%</FONT></TD>\n" \ - "<TD ALIGN=right><FONT SIZE=\"-1\"><B>%lu</B></FONT></TD>\n" \ - "<TD ALIGN=right><FONT SIZE=\"-2\">%3.02f%%</FONT></TD>\n" \ -- "<TD ALIGN=right><FONT SIZE=\"-1\"><B>%.0f</B></FONT></TD>\n" \ -+ "<TD ALIGN=right><FONT SIZE=\"-1\"><B>%s</B></FONT></TD>\n" \ - "<TD ALIGN=right><FONT SIZE=\"-2\">%3.02f%%</FONT></TD>\n" \ - "<TD ALIGN=right><FONT SIZE=\"-1\"><B>%lu</B></FONT></TD>\n" \ - "<TD ALIGN=right><FONT SIZE=\"-2\">%3.02f%%</FONT></TD>\n" \ - "<TD ALIGN=left NOWRAP><FONT SIZE=\"-1\">", - i+1,hptr->count, - (t_hit==0)?0:((float)hptr->count/t_hit)*100.0,hptr->files, -- (t_file==0)?0:((float)hptr->files/t_file)*100.0,hptr->xfer/1024, -+ (t_file==0)?0:((float)hptr->files/t_file)*100.0, -+ format_num(hptr->xfer), - (t_xfer==0)?0:((float)hptr->xfer/t_xfer)*100.0,hptr->visit, - (t_visit==0)?0:((float)hptr->visit/t_visit)*100.0); - -@@ -1066,12 +1094,12 @@ - "<TD ALIGN=center><FONT SIZE=\"-1\"><B>%d</B></FONT></TD>\n" \ - "<TD ALIGN=right><FONT SIZE=\"-1\"><B>%lu</B></FONT></TD>\n" \ - "<TD ALIGN=right><FONT SIZE=\"-2\">%3.02f%%</FONT></TD>\n" \ -- "<TD ALIGN=right><FONT SIZE=\"-1\"><B>%.0f</B></FONT></TD>\n"\ -+ "<TD ALIGN=right><FONT SIZE=\"-1\"><B>%s</B></FONT></TD>\n"\ - "<TD ALIGN=right><FONT SIZE=\"-2\">%3.02f%%</FONT></TD>\n" \ - "<TD ALIGN=left NOWRAP><FONT SIZE=\"-1\">", - i+1,uptr->count, - (t_hit==0)?0:((float)uptr->count/t_hit)*100.0, -- uptr->xfer/1024, -+ format_num(uptr->xfer), - (t_xfer==0)?0:((float)uptr->xfer/t_xfer)*100.0); - - if (uptr->flag==OBJ_GRP) -@@ -2036,14 +2064,14 @@ - "<TD ALIGN=right><FONT SIZE=\"-2\">%3.02f%%</FONT></TD>\n" \ - "<TD ALIGN=right><FONT SIZE=\"-1\"><B>%lu</B></FONT></TD>\n" \ - "<TD ALIGN=right><FONT SIZE=\"-2\">%3.02f%%</FONT></TD>\n" \ -- "<TD ALIGN=right><FONT SIZE=\"-1\"><B>%.0f</B></FONT></TD>\n" \ -+ "<TD ALIGN=right><FONT SIZE=\"-1\"><B>%s</B></FONT></TD>\n" \ - "<TD ALIGN=right><FONT SIZE=\"-2\">%3.02f%%</FONT></TD>\n" \ - "<TD ALIGN=left NOWRAP><FONT SIZE=\"-1\">%s</FONT></TD></TR>\n", - i+1,top_ctrys[i]->count, - (t_hit==0)?0:((float)top_ctrys[i]->count/t_hit)*100.0, - top_ctrys[i]->files, - (t_file==0)?0:((float)top_ctrys[i]->files/t_file)*100.0, -- top_ctrys[i]->xfer/1024, -+ format_num(top_ctrys[i]->xfer), - (t_xfer==0)?0:((float)top_ctrys[i]->xfer/t_xfer)*100.0, - top_ctrys[i]->desc); - } -@@ -2402,8 +2430,9 @@ - hist_visit[s_mth]/days_in_month); - fprintf(out_fp,"<TD ALIGN=right><FONT SIZE=\"-1\">%lu</FONT></TD>\n", - hist_site[s_mth]); -- fprintf(out_fp,"<TD ALIGN=right><FONT SIZE=\"-1\">%.0f</FONT></TD>\n", -- hist_xfer[s_mth]); -+ fprintf(out_fp,"<TD ALIGN=right><FONT SIZE=\"-1\">%s</FONT></TD>\n", -+/* hist_xfer[s_mth]);*/ -+ format_num(hist_xfer[s_mth]*1024)); - fprintf(out_fp,"<TD ALIGN=right><FONT SIZE=\"-1\">%lu</FONT></TD>\n", - hist_visit[s_mth]); - fprintf(out_fp,"<TD ALIGN=right><FONT SIZE=\"-1\">%lu</FONT></TD>\n", -@@ -2422,7 +2451,7 @@ - fprintf(out_fp,"<TR><TH BGCOLOR=\"%s\" COLSPAN=6 ALIGN=left>" \ - "<FONT SIZE=\"-1\">%s</FONT></TH>\n",GREY,msg_h_totals); - fprintf(out_fp,"<TH BGCOLOR=\"%s\" ALIGN=right>" \ -- "<FONT SIZE=\"-1\">%.0f</FONT></TH>\n",GREY,gt_xfer); -+ "<FONT SIZE=\"-1\">%s</FONT></TH>\n",GREY,format_num(gt_xfer*1024)); - fprintf(out_fp,"<TH BGCOLOR=\"%s\" ALIGN=right>" \ - "<FONT SIZE=\"-1\">%.0f</FONT></TH>\n",GREY,gt_visits); - fprintf(out_fp,"<TH BGCOLOR=\"%s\" ALIGN=right>" \ diff --git a/app-admin/webalizer/files/webalizer-storage-size.patch b/app-admin/webalizer/files/webalizer-storage-size.patch new file mode 100644 index 000000000000..1d6030a689bd --- /dev/null +++ b/app-admin/webalizer/files/webalizer-storage-size.patch @@ -0,0 +1,15 @@ +--- webalizer.h 2008-02-23 16:34:29.090800118 +0000 ++++ webalizer.h.orig 2008-02-23 16:31:42.626195338 +0000 +@@ -17,10 +17,10 @@ + #define MAXURLH 128 /* Max URL field size in htab */ + #define MAXREF 1024 /* Max referrer field size */ + #define MAXREFH 128 /* Max referrer field size in htab */ +-#define MAXAGENT 128 /* Max user agent field size */ ++#define MAXAGENT 64 /* Max user agent field size */ + #define MAXCTRY 48 /* Max country name size */ + #define MAXSRCH 256 /* Max size of search string buffer */ +-#define MAXSRCHH 128 /* Max size of search str in htab */ ++#define MAXSRCHH 64 /* Max size of search str in htab */ + #define MAXIDENT 64 /* Max size of ident string (user) */ + + #define SLOP_VAL 3600 /* out of sequence slop (seconds) */ diff --git a/app-admin/webalizer/metadata.xml b/app-admin/webalizer/metadata.xml index 34d823eb35ab..12e965865bc5 100644 --- a/app-admin/webalizer/metadata.xml +++ b/app-admin/webalizer/metadata.xml @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> -<herd>web-apps</herd> -<maintainer> - <email>smithj@gentoo.org</email> -</maintainer> + <herd>web-apps</herd> + <maintainer> + <email>smithj@gentoo.org</email> + </maintainer> </pkgmetadata> diff --git a/app-admin/webalizer/webalizer-2.01.10-r12.ebuild b/app-admin/webalizer/webalizer-2.01.10-r12.ebuild deleted file mode 100644 index 5c1b3f75b6c4..000000000000 --- a/app-admin/webalizer/webalizer-2.01.10-r12.ebuild +++ /dev/null @@ -1,147 +0,0 @@ -# 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-r12.ebuild,v 1.15 2006/07/09 20:26:47 rl03 Exp $ - -# uses webapp.eclass to create directories with right permissions -# probably slight overkill but works well -inherit eutils webapp - -SLOT="0" -WEBAPP_MANUAL_SLOT="yes" - -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.20050520.tar.bz2 ) - xtended? ( http://www.irc.unizh.ch/users/pfrei/webalizer/rb07/${PN}-${MY_PV}-RB07-patch.tar.gz ) - mirror://gentoo/${PN}-search.patch.gz - mirror://gentoo/${PN}.conf.gz -" - -LICENSE="GPL-2" -KEYWORDS="alpha amd64 hppa ppc ppc64 sparc x86" -IUSE="apache2 geoip nls search xtended" - -DEPEND="!geoip? ( =sys-libs/db-4.2* ) - >=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 - - if use search && ! use geoip; then - elog "Please enable the geoip USE flag if you wish to use search" - fi - - # 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} - - if use geoip; then - epatch ${WORKDIR}/geolizer_${MY_PV}-patch/geolizer.patch || die - if use search; then - epatch ${WORKDIR}/${PN}-search.patch || die - fi - use xtended && elog "Xtended doesn't work with geolizer, skipping" - else - epatch ${FILESDIR}/${PN}-db4.2.patch || die - epatch ${FILESDIR}/${PN}-readability.patch || die - if use xtended; then - epatch ${WORKDIR}/${PN}-${MY_PV}-RB07-patch || die - fi - fi -} - -src_compile() { - local myconf=" --enable-dns \ - --with-db=/usr/include/db4.2/ \ - --with-dblib=db-4.2" - use geoip && myconf="${myconf} --enable-geoip" - - # 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 ${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 ${WORKDIR}/${PN}.conf - use apache2 && sed -i -e "s/apache/apache2/g" ${D}/etc/webalizer.conf - - dodoc *README* CHANGES Copyright sample.conf ${FILESDIR}/apache.webalizer - webapp_src_install -} - -pkg_postinst(){ - elog - elog "It is suggested that you restart apache before using webalizer" - elog "You may want to review /etc/webalizer.conf and ensure that" - elog "OutputDir is set correctly" - elog - elog "Then just type webalizer to generate your stats." - elog "You can also use cron to generate them e.g. every day." - elog "They can be accessed via http://localhost/webalizer" - elog - elog "A sample Apache config file has been installed into" - elog "/usr/share/doc/${PF}/apache.webalizer" - elog "Please edit and install it as necessary" - elog - - 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 - - if use xtended; then - elog "Read http://www.irc.unizh.ch/users/pfrei/webalizer/rb07/INSTALL" - elog "if you are switching from stock webalizer to xtended" - fi - - webapp_pkg_postinst -} diff --git a/app-admin/webalizer/webalizer-2.01.10-r13.ebuild b/app-admin/webalizer/webalizer-2.01.10-r13.ebuild deleted file mode 100644 index 5b35513f5479..000000000000 --- a/app-admin/webalizer/webalizer-2.01.10-r13.ebuild +++ /dev/null @@ -1,150 +0,0 @@ -# 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-r13.ebuild,v 1.4 2006/07/09 20:26:47 rl03 Exp $ - -# uses webapp.eclass to create directories with right permissions -# probably slight overkill but works well -inherit eutils webapp db-use autotools - -SLOT="0" -WEBAPP_MANUAL_SLOT="yes" - -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.20050520.tar.bz2 ) - xtended? ( http://www.irc.unizh.ch/users/pfrei/webalizer/rb07/${PN}-${MY_PV}-RB07-patch.tar.gz ) - mirror://gentoo/${PN}-search.patch.gz - mirror://gentoo/${PN}.conf.gz -" - -LICENSE="GPL-2" -KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86" -IUSE="apache2 geoip nls search xtended" - -DEPEND="!geoip? ( >=sys-libs/db-4.2 ) - >=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 - - if use search && ! use geoip; then - elog "Please enable the geoip USE flag if you wish to use search" - fi - - # 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} - - if use geoip; then - epatch ${WORKDIR}/geolizer_${MY_PV}-patch/geolizer.patch || die - if use search; then - epatch ${WORKDIR}/${PN}-search.patch || die - fi - use xtended && elog "Xtended doesn't work with geolizer, skipping" - else - epatch ${FILESDIR}/${PN}-db4.2.patch || die - epatch ${FILESDIR}/${PN}-readability.patch || die - if use xtended; then - epatch ${WORKDIR}/${PN}-${MY_PV}-RB07-patch || die - fi - fi - - # bugzy 121816: prevent truncated useragent fields - sed -i -e 's:^#define MAXAGENT 64:#define MAXAGENT 128:' webalizer.h -} - -src_compile() { - local myconf=" --enable-dns \ - --with-db=$(db_includedir) \ - --with-dblib=$(db_libname)" - use geoip && myconf="${myconf} --enable-geoip" - - # 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 - eautoreconf - - econf ${myconf} || die "econf failed" - - emake || die "emake failed" -} - -src_install() { - webapp_src_preinst - - into /usr - dobin webalizer - dosym webalizer /usr/bin/webazolver - doman webalizer.1 - - insinto /etc - doins ${WORKDIR}/${PN}.conf - use apache2 && sed -i -e "s/apache/apache2/g" ${D}/etc/webalizer.conf - - dodoc *README* CHANGES Copyright sample.conf ${FILESDIR}/apache.webalizer - webapp_src_install -} - -pkg_postinst(){ - elog - elog "It is suggested that you restart apache before using webalizer" - elog "You may want to review /etc/webalizer.conf and ensure that" - elog "OutputDir is set correctly" - elog - elog "Then just type webalizer to generate your stats." - elog "You can also use cron to generate them e.g. every day." - elog "They can be accessed via http://localhost/webalizer" - elog - elog "A sample Apache config file has been installed into" - elog "/usr/share/doc/${PF}/apache.webalizer" - elog "Please edit and install it as necessary" - elog - - 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 - - if use xtended; then - elog "Read http://www.irc.unizh.ch/users/pfrei/webalizer/rb07/INSTALL" - elog "if you are switching from stock webalizer to xtended" - fi - - webapp_pkg_postinst -} diff --git a/app-admin/webalizer/webalizer-2.01.10-r15.ebuild b/app-admin/webalizer/webalizer-2.01.10-r15.ebuild index 586bea5915e3..2eab0de4b0d7 100644 --- a/app-admin/webalizer/webalizer-2.01.10-r15.ebuild +++ b/app-admin/webalizer/webalizer-2.01.10-r15.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2007 Gentoo Foundation +# Copyright 1999-2008 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-r15.ebuild,v 1.8 2007/07/10 20:53:03 gustavoz Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-admin/webalizer/webalizer-2.01.10-r15.ebuild,v 1.9 2008/02/23 16:52:34 hollow Exp $ # uses webapp.eclass to create directories with right permissions # probably slight overkill but works well diff --git a/app-admin/webalizer/webalizer-2.01.10-r14.ebuild b/app-admin/webalizer/webalizer-2.01.10-r16.ebuild index ae5d427b3f91..8e681a3eb09a 100644 --- a/app-admin/webalizer/webalizer-2.01.10-r14.ebuild +++ b/app-admin/webalizer/webalizer-2.01.10-r16.ebuild @@ -1,31 +1,32 @@ -# Copyright 1999-2006 Gentoo Foundation +# Copyright 1999-2008 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-r14.ebuild,v 1.2 2006/10/20 02:39:54 rl03 Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-admin/webalizer/webalizer-2.01.10-r16.ebuild,v 1.1 2008/02/23 16:52:34 hollow Exp $ # uses webapp.eclass to create directories with right permissions # probably slight overkill but works well -inherit eutils webapp db-use autotools +inherit confutils eutils webapp db-use autotools -SLOT="0" WEBAPP_MANUAL_SLOT="yes" MY_PV=${PV/.10/-10} MY_P=${PN}-${MY_PV} -S=${WORKDIR}/${MY_P} -XTENDED_VER="RB16" -XTENDED_URL="rb16" + +XTENDED_VER="RB21" +XTENDED_URL="rb21" +GEOLIZER_VER="20070115" + 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.20050520.tar.bz2 ) - xtended? ( - http://www.irc.unizh.ch/users/pfrei/webalizer/${XTENDED_URL}/${PN}-${MY_PV}-${XTENDED_VER}-patch.tar.gz ) - mirror://gentoo/${PN}.conf.gz -" + geoip? ( + http://sysd.org/stas/files/active/0/geolizer_${MY_PV}-patch.${GEOLIZER_VER}.tar.gz ) + xtended? ( http://patrickfrei.ch/webalizer/${XTENDED_URL}/${PN}-${MY_PV}-${XTENDED_VER}-patch.tar.gz ) + mirror://gentoo/${PN}.conf.gz" LICENSE="GPL-2" KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86" -IUSE="apache2 geoip nls xtended" +IUSE="geoip nls xtended" +SLOT="0" DEPEND=">=sys-libs/db-4.2 >=sys-libs/zlib-1.1.4 @@ -33,18 +34,14 @@ DEPEND=">=sys-libs/db-4.2 >=media-libs/gd-1.8.3 geoip? ( dev-libs/geoip )" +S="${WORKDIR}"/${MY_P} + 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 + confutils_require_built_with_all media-libs/gd png # USE=nls has no real meaning if LINGUAS isn't set - if use nls && [ -z "${LINGUAS}" ]; then + 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" @@ -52,65 +49,61 @@ pkg_setup() { } src_unpack() { - unpack ${A} ; cd ${S} + unpack ${A} + cd "${S}" - if use geoip; then - epatch ${WORKDIR}/geolizer_${MY_PV}-patch/geolizer.patch || die - use xtended && elog "Xtended doesn't work with geolizer, skipping" + if use geoip && ! use xtended; then + epatch "${WORKDIR}"/geolizer_${MY_PV}-patch/geolizer.patch else - epatch ${FILESDIR}/${PN}-db4.2.patch || die + epatch "${FILESDIR}"/${PN}-db4.2.patch if use xtended; then - epatch ${WORKDIR}/${PN}-${MY_PV}-${XTENDED_VER}-patch || die + epatch "${WORKDIR}"/${PN}-${MY_PV}-${XTENDED_VER}-patch + else + epatch "${FILESDIR}"/${PN}-storage-size.patch fi fi - # bug 121816: prevent truncated useragent fields - sed -i -e 's:^#define MAXAGENT 64:#define MAXAGENT 128:' webalizer.h + eautoreconf } src_compile() { - local myconf=" --enable-dns \ - --with-db=$(db_includedir) \ - --with-dblib=$(db_libname)" - use geoip && myconf="${myconf} --enable-geoip" - # 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}" + local longlang="$(grep ^${LINGUAS:0:2} "${FILESDIR}"/webalizer-language-list.txt)" + local myconf="${myconf} --with-language=${longlang:3}" else - myconf="${myconf} --with-language=english" + local myconf="${myconf} --with-language=english" fi - # stupid broken configuration file - eautoreconf - - econf ${myconf} || die "econf failed" - + econf --enable-dns \ + --with-db=$(db_includedir) \ + --with-dblib=$(db_libname) \ + $(use_enable geoip) \ + ${myconf} \ + || die "econf failed" emake || die "emake failed" } src_install() { webapp_src_preinst - into /usr dobin webalizer dosym webalizer /usr/bin/webazolver doman webalizer.1 insinto /etc - doins ${WORKDIR}/${PN}.conf - use apache2 && sed -i -e "s/apache/apache2/g" ${D}/etc/webalizer.conf + doins "${WORKDIR}"/${PN}.conf + dosed "s/apache/apache2/g" /etc/webalizer.conf + + dodoc CHANGES *README* INSTALL sample.conf "${FILESDIR}"/apache.webalizer - dodoc *README* CHANGES Copyright sample.conf ${FILESDIR}/apache.webalizer webapp_src_install } -pkg_postinst(){ +pkg_postinst() { elog elog "It is suggested that you restart apache before using webalizer" elog "You may want to review /etc/webalizer.conf and ensure that" @@ -125,7 +118,7 @@ pkg_postinst(){ elog "Please edit and install it as necessary" elog - if [ ${#LINGUAS} -gt 2 ] && use nls; then + 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" @@ -136,7 +129,7 @@ pkg_postinst(){ fi if use xtended; then - elog "Read http://www.irc.unizh.ch/users/pfrei/webalizer/${XTENDED_URL}/INSTALL" + elog "Read http://patrickfrei.ch/webalizer/${XTENDED_URL}/INSTALL" elog "if you are switching from stock webalizer to xtended" fi |