diff options
author | Renat Lumpau <rl03@gentoo.org> | 2006-04-24 15:47:17 +0000 |
---|---|---|
committer | Renat Lumpau <rl03@gentoo.org> | 2006-04-24 15:47:17 +0000 |
commit | 6fd3677238810a31f59bbb4ad44bd2b3328c84e7 (patch) | |
tree | 224571cab3ffd4fff377ed215784116f13793572 /app-admin/webalizer | |
parent | Add ~x86-fbsd keyword. (diff) | |
download | gentoo-2-6fd3677238810a31f59bbb4ad44bd2b3328c84e7.tar.gz gentoo-2-6fd3677238810a31f59bbb4ad44bd2b3328c84e7.tar.bz2 gentoo-2-6fd3677238810a31f59bbb4ad44bd2b3328c84e7.zip |
Removed old versions; housekeeping
(Portage version: 2.1_pre9-r4)
(Signed Manifest commit)
Diffstat (limited to 'app-admin/webalizer')
-rw-r--r-- | app-admin/webalizer/Manifest | 61 | ||||
-rw-r--r-- | app-admin/webalizer/files/2.01.10/apache.webalizer | 11 | ||||
-rw-r--r-- | app-admin/webalizer/files/2.01.10/reconfig | 7 | ||||
-rw-r--r-- | app-admin/webalizer/files/digest-webalizer-2.01.10-r4 | 6 | ||||
-rw-r--r-- | app-admin/webalizer/files/digest-webalizer-2.01.10-r5 | 9 | ||||
-rw-r--r-- | app-admin/webalizer/files/output.c.patch | 157 | ||||
-rw-r--r-- | app-admin/webalizer/webalizer-2.01.10-r4.ebuild | 77 | ||||
-rw-r--r-- | app-admin/webalizer/webalizer-2.01.10-r5.ebuild | 97 |
8 files changed, 49 insertions, 376 deletions
diff --git a/app-admin/webalizer/Manifest b/app-admin/webalizer/Manifest index a143f170c736..df9adcfecaa8 100644 --- a/app-admin/webalizer/Manifest +++ b/app-admin/webalizer/Manifest @@ -1,16 +1,53 @@ -MD5 717e86e1b01c6a3110e3194da8b04947 ChangeLog 7998 -MD5 f04ad397866d35f9ede71fc6da2392ed files/2.01.10/apache.webalizer 306 -MD5 45d6e8c8bd9f76c0e22d80acc0603aff files/2.01.10/reconfig 394 -MD5 4b57ddf404077972cb8500151be066bd files/digest-webalizer-2.01.10-r12 1319 -MD5 4b57ddf404077972cb8500151be066bd files/digest-webalizer-2.01.10-r13 1319 -MD5 556575fd11faab14758f71662b90b6b1 files/digest-webalizer-2.01.10-r4 494 -MD5 c54a5157d05d808505a6fe4f899578a3 files/digest-webalizer-2.01.10-r5 789 -MD5 05805530b2e87a3d55e0056a45e330f5 files/output.c.patch 8088 +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + +AUX apache.webalizer 304 RMD160 b0a5f3f548e268dcf554794a19853e9505ba8eba SHA1 cd1f84610ccf08a2f719de9727840d1afa565322 SHA256 2affefc16b07c61c5a7c6383643cf8b9fb139fad49d29ffa1403b08f09b71411 size 304 +MD5 522b9bb50f7faed9ff3756705cf80d6b files/apache.webalizer 304 +RMD160 b0a5f3f548e268dcf554794a19853e9505ba8eba files/apache.webalizer 304 +SHA256 2affefc16b07c61c5a7c6383643cf8b9fb139fad49d29ffa1403b08f09b71411 files/apache.webalizer 304 +AUX webalizer-db4.2.patch 552 RMD160 bf9703f3713b53a97fd04ee372d55d17c17e70c0 SHA1 5255795f599f792c0373e4cc933d42189a6e57bd SHA256 51c12d7469d455842a2f9b223e8c27e1ea99a97e0a0ddb490844a80df44cf309 size 552 MD5 ff6044f61cca31af6541dc7ee28affd9 files/webalizer-db4.2.patch 552 +RMD160 bf9703f3713b53a97fd04ee372d55d17c17e70c0 files/webalizer-db4.2.patch 552 +SHA256 51c12d7469d455842a2f9b223e8c27e1ea99a97e0a0ddb490844a80df44cf309 files/webalizer-db4.2.patch 552 +AUX webalizer-language-list.txt 1520 RMD160 27d981a14e0bab35b036f386c3d2e716d3b29455 SHA1 0563e9b42eb63ca24d6dacf48126f0a9ec1a5a16 SHA256 9b946e766fdecccbbd480f520bd610afad78316aba4e7e0cea237da43039efd4 size 1520 MD5 94e47e69398034261ac6d26edab9eafb files/webalizer-language-list.txt 1520 +RMD160 27d981a14e0bab35b036f386c3d2e716d3b29455 files/webalizer-language-list.txt 1520 +SHA256 9b946e766fdecccbbd480f520bd610afad78316aba4e7e0cea237da43039efd4 files/webalizer-language-list.txt 1520 +AUX webalizer-readability.patch 8345 RMD160 45a75b03752370f9ddb818768ff0730ad829fe64 SHA1 b9515b7ed9585c8bd63d8cd3de02d3045044a975 SHA256 7b89611bccaf9f9b8abf824e270e6ffa4d5447080f1685cfce0ab3a23f2f3314 size 8345 MD5 766a26ff1600e3ea5359278a9dcd1025 files/webalizer-readability.patch 8345 +RMD160 45a75b03752370f9ddb818768ff0730ad829fe64 files/webalizer-readability.patch 8345 +SHA256 7b89611bccaf9f9b8abf824e270e6ffa4d5447080f1685cfce0ab3a23f2f3314 files/webalizer-readability.patch 8345 +DIST geolizer_2.01-10-patch.20050520.tar.bz2 35836 RMD160 b4abd8498b64c0298e6875ee802cdbeec9086806 SHA256 0914ec2a2401e8f8ae2735984d18714f5331d864c03347ca56ac3c22fb860378 size 35836 +DIST webalizer-2.01-10-RB07-patch.tar.gz 7778 RMD160 d7a0e672f5817a6a719b13a3dd46999cd6f3b7df SHA256 b7318aa386a26964aade84b56346d3ffddec8192a03933556c75cbf3a5b1cdc0 size 7778 +DIST webalizer-2.01-10-src.tar.bz2 252664 RMD160 4605ff9bd8ec1c74680b8fbfe703f2e81ae68e20 SHA256 f339e4b8879aeade0f889b7bc7eb85854a7746a16b267c4aa985cd5b8a112262 size 252664 +DIST webalizer-search.patch.gz 6424 RMD160 1db8210754f7b7f4fe49d99d51f01b5e7fbb3d13 SHA256 0d9bd3adb4c3e571a9231f0f1a6d689851ff53ffdad9c0e6e3e4e495ff709360 size 6424 +DIST webalizer.conf.gz 8986 RMD160 61751fa52c4e4bc29a8c3ba5956daf0a45138ec5 SHA256 b7da31865a8c13a66756247d68242d6478900f2c2b9b5698ed35c0c613fb9a71 size 8986 +EBUILD webalizer-2.01.10-r12.ebuild 4337 RMD160 7bfeeb95998cc65a60808e28ad6b80153a0ee407 SHA1 96c763cec57d6f5faae2b1e684e970ddd97b3b8c SHA256 0956653d64338905496851de718b32c37ee965899404ccb7902f97872fec4caa size 4337 +MD5 4a17f242d138145246866fc6c0cf5f17 webalizer-2.01.10-r12.ebuild 4337 +RMD160 7bfeeb95998cc65a60808e28ad6b80153a0ee407 webalizer-2.01.10-r12.ebuild 4337 +SHA256 0956653d64338905496851de718b32c37ee965899404ccb7902f97872fec4caa webalizer-2.01.10-r12.ebuild 4337 +EBUILD webalizer-2.01.10-r13.ebuild 4466 RMD160 7ca41692205e892633120c78d6528d29f42d0d2b SHA1 4136384f131682458200cece45096fa2bd876ffa SHA256 021b4ca60da3aed4fb06002e83a0c5a80c50bc11f5e3f022e4c8f3e27e1a0020 size 4466 +MD5 8a20e5657372637a8875c2d6540cde00 webalizer-2.01.10-r13.ebuild 4466 +RMD160 7ca41692205e892633120c78d6528d29f42d0d2b webalizer-2.01.10-r13.ebuild 4466 +SHA256 021b4ca60da3aed4fb06002e83a0c5a80c50bc11f5e3f022e4c8f3e27e1a0020 webalizer-2.01.10-r13.ebuild 4466 +MISC ChangeLog 8315 RMD160 7fd7120c03e987317cf57374078075df5c4e6f8d SHA1 1bf7448c43a9c629c60d52ab9ea1adedd1718238 SHA256 acd739c2cc875675b3679e53811dc4bec96bd082e0a2586382f8913bc11df2fe size 8315 +MD5 9c20d80642ea4bfe4b0a76000d4681d8 ChangeLog 8315 +RMD160 7fd7120c03e987317cf57374078075df5c4e6f8d ChangeLog 8315 +SHA256 acd739c2cc875675b3679e53811dc4bec96bd082e0a2586382f8913bc11df2fe ChangeLog 8315 +MISC metadata.xml 223 RMD160 5b4cf8ac1f9426b4b01d94c759aad5768f35fe74 SHA1 1b044a209c743679605d2ac885b26ce7fb55773b SHA256 9406913dbd824f7e31267676defffda846fda6a02ac643a45740cb88219b7a79 size 223 MD5 f4ab9f9db4e50708404d47337257cd4e metadata.xml 223 -MD5 3e4bedf1bfb47890e76a943d45b2cc56 webalizer-2.01.10-r12.ebuild 4344 -MD5 a8ad97da99ea81aa9cdb2d3347a119cf webalizer-2.01.10-r13.ebuild 4474 -MD5 4b6414b221213a91af1cbe2553f6f458 webalizer-2.01.10-r4.ebuild 2044 -MD5 4b576ff9d757d7b0ed639fb340f39e5f webalizer-2.01.10-r5.ebuild 2540 +RMD160 5b4cf8ac1f9426b4b01d94c759aad5768f35fe74 metadata.xml 223 +SHA256 9406913dbd824f7e31267676defffda846fda6a02ac643a45740cb88219b7a79 metadata.xml 223 +MD5 4b57ddf404077972cb8500151be066bd files/digest-webalizer-2.01.10-r12 1319 +RMD160 7ca1db406fcdee6d97f2c2301b726beaf854fe9a files/digest-webalizer-2.01.10-r12 1319 +SHA256 8d25ea7f8a46b22fc68875e96be12c2b738f7f758245aa63d1ab032af972cc19 files/digest-webalizer-2.01.10-r12 1319 +MD5 4b57ddf404077972cb8500151be066bd files/digest-webalizer-2.01.10-r13 1319 +RMD160 7ca1db406fcdee6d97f2c2301b726beaf854fe9a files/digest-webalizer-2.01.10-r13 1319 +SHA256 8d25ea7f8a46b22fc68875e96be12c2b738f7f758245aa63d1ab032af972cc19 files/digest-webalizer-2.01.10-r13 1319 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v1.4.2.2 (GNU/Linux) + +iD8DBQFETPMDEzitwsaoONoRAlS5AJ48twE+he0Ut7oVN1oEJvDYi7cO8gCgpd4l +jaVj9RAxIU9YqzPQVwRDiYY= +=8JBn +-----END PGP SIGNATURE----- diff --git a/app-admin/webalizer/files/2.01.10/apache.webalizer b/app-admin/webalizer/files/2.01.10/apache.webalizer deleted file mode 100644 index af8c8d68e52c..000000000000 --- a/app-admin/webalizer/files/2.01.10/apache.webalizer +++ /dev/null @@ -1,11 +0,0 @@ -# -# This is the config snippet for Webalizer -# -# $Header: /var/cvsroot/gentoo-x86/app-admin/webalizer/files/2.01.10/apache.webalizer,v 1.4 2006/01/06 21:00:11 rl03 Exp $ - -<Directory "/var/www/localhost/htdocs/webalizer"> - Options None - AllowOverride None - Order allow,deny - Allow from all -</Directory> diff --git a/app-admin/webalizer/files/2.01.10/reconfig b/app-admin/webalizer/files/2.01.10/reconfig deleted file mode 100644 index 57f6b84492ba..000000000000 --- a/app-admin/webalizer/files/2.01.10/reconfig +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/bash -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" - sed -e "s|DIR|${MY_INSTALLDIR}|g" -i ${file1} ${file2} /etc/webalizer.conf -fi diff --git a/app-admin/webalizer/files/digest-webalizer-2.01.10-r4 b/app-admin/webalizer/files/digest-webalizer-2.01.10-r4 deleted file mode 100644 index e8defe98f54e..000000000000 --- a/app-admin/webalizer/files/digest-webalizer-2.01.10-r4 +++ /dev/null @@ -1,6 +0,0 @@ -MD5 26d0a3c142423678daed2d6f579525d8 webalizer-2.01-10-src.tar.bz2 252664 -RMD160 4605ff9bd8ec1c74680b8fbfe703f2e81ae68e20 webalizer-2.01-10-src.tar.bz2 252664 -SHA256 f339e4b8879aeade0f889b7bc7eb85854a7746a16b267c4aa985cd5b8a112262 webalizer-2.01-10-src.tar.bz2 252664 -MD5 896ffc3eb54f42611b2412eafdf87cfc webalizer.conf.gz 8986 -RMD160 61751fa52c4e4bc29a8c3ba5956daf0a45138ec5 webalizer.conf.gz 8986 -SHA256 b7da31865a8c13a66756247d68242d6478900f2c2b9b5698ed35c0c613fb9a71 webalizer.conf.gz 8986 diff --git a/app-admin/webalizer/files/digest-webalizer-2.01.10-r5 b/app-admin/webalizer/files/digest-webalizer-2.01.10-r5 deleted file mode 100644 index a5ec6e652b26..000000000000 --- a/app-admin/webalizer/files/digest-webalizer-2.01.10-r5 +++ /dev/null @@ -1,9 +0,0 @@ -MD5 fa2e960702c72a16707854537053a966 geolizer_2.01-10-patch.20040216.tar.bz2 27688 -RMD160 a4e8acd79171741acbf2dade2ed0519c9e32bab3 geolizer_2.01-10-patch.20040216.tar.bz2 27688 -SHA256 b4580b7c4be990b2caa9696690edef3f3e7cfd235f6c46b20b520bd606692601 geolizer_2.01-10-patch.20040216.tar.bz2 27688 -MD5 26d0a3c142423678daed2d6f579525d8 webalizer-2.01-10-src.tar.bz2 252664 -RMD160 4605ff9bd8ec1c74680b8fbfe703f2e81ae68e20 webalizer-2.01-10-src.tar.bz2 252664 -SHA256 f339e4b8879aeade0f889b7bc7eb85854a7746a16b267c4aa985cd5b8a112262 webalizer-2.01-10-src.tar.bz2 252664 -MD5 896ffc3eb54f42611b2412eafdf87cfc webalizer.conf.gz 8986 -RMD160 61751fa52c4e4bc29a8c3ba5956daf0a45138ec5 webalizer.conf.gz 8986 -SHA256 b7da31865a8c13a66756247d68242d6478900f2c2b9b5698ed35c0c613fb9a71 webalizer.conf.gz 8986 diff --git a/app-admin/webalizer/files/output.c.patch b/app-admin/webalizer/files/output.c.patch deleted file mode 100644 index 9cf52580223f..000000000000 --- a/app-admin/webalizer/files/output.c.patch +++ /dev/null @@ -1,157 +0,0 @@ ---- output.c.orig 2001-06-15 10:34:24.000000000 +0200 -+++ output.c 2004-07-03 14:32:01.000000000 +0200 -@@ -140,6 +140,26 @@ - - FILE *out_fp; - -+ -+/*********************************************/ -+/* FORMAT_NUM - output format of number */ -+/*********************************************/ -+char * format_num(double in) -+{ -+ static char *jednotky[] = { -+ " B", " kB", " MB", " GB", " TB" -+ }; -+ char **jednotka, *tmp; -+ static char out[100]; -+ for (jednotka = jednotky; in > 1024 && jednotka < jednotky+4; in /= 1024, ++jednotka); -+ snprintf(out, 45, "%.2f", in); -+ for (tmp = out + strlen(out) - 1; tmp > out && *tmp == '0'; *tmp-- = 0); -+ if (*tmp == '.') *tmp = 0; -+ strcat(out, *jednotka); -+ return out; -+} -+ -+ - /*********************************************/ - /* WRITE_HTML_HEAD - output top of HTML page */ - /*********************************************/ -@@ -544,8 +564,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 +640,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 +734,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 +822,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 +907,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 +1090,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 +2060,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 +2426,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 +2447,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/webalizer-2.01.10-r4.ebuild b/app-admin/webalizer/webalizer-2.01.10-r4.ebuild deleted file mode 100644 index 6c142308fd87..000000000000 --- a/app-admin/webalizer/webalizer-2.01.10-r4.ebuild +++ /dev/null @@ -1,77 +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-r4.ebuild,v 1.18 2006/02/23 15:39:49 rl03 Exp $ - -MY_P=${P/.10/-10} -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 - mirror://gentoo/${PN}.conf.gz -" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="x86 ppc sparc hppa amd64" -IUSE="apache2" - -DEPEND="=sys-libs/db-1* - >=sys-libs/zlib-1.1.4 - >=media-libs/libpng-1.2 - >=media-libs/gd-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 - sed -i -e "s,db_185.h,db.h," configure -} - -src_compile() { - econf --enable-dns --with-db=/usr/include/db1/ || die - make || die -} - -src_install() { - into /usr - dobin webalizer - dosym webalizer /usr/bin/webazolver - doman webalizer.1 - - insinto /etc - doins ${WORKDIR}/${PN}.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 ${WORKDIR}/${PN}.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 - dodir /var/www/webalizer -} - -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 -} diff --git a/app-admin/webalizer/webalizer-2.01.10-r5.ebuild b/app-admin/webalizer/webalizer-2.01.10-r5.ebuild deleted file mode 100644 index 455ecaab9ecd..000000000000 --- a/app-admin/webalizer/webalizer-2.01.10-r5.ebuild +++ /dev/null @@ -1,97 +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-r5.ebuild,v 1.15 2006/02/23 15:39:49 rl03 Exp $ - -inherit eutils - -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 ) - mirror://gentoo/${PN}.conf.gz -" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="alpha ~amd64 ~hppa ~ppc ppc64 ~sparc ~x86" -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() { - into /usr - dobin webalizer - dosym webalizer /usr/bin/webazolver - doman webalizer.1 - - insinto /etc - doins ${WORKDIR}/${PN}.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 ${WORKDIR}/${PN}.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 - dodir /var/www/webalizer -} - -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 -} |