update to Sarg 2.1 .

from maintainer Douglas Santos, with a few additions;
help and ok alek@

www/sarg/Makefile

@@ -1,12 +1,11 @@
-# $OpenBSD: Makefile,v 1.3 2005/11/13 17:32:26 pvalchev Exp $
+# $OpenBSD: Makefile,v 1.4 2006/01/22 11:05:01 aanriot Exp $
 
 COMMENT=		"Squid Analysis Report Generator"
 
-DISTNAME=		sarg-2.0.9
+DISTNAME=		sarg-2.1
-PKGNAME=		${DISTNAME}p0
 CATEGORIES=		www
 
-HOMEPAGE=	 	http://sarg.sourceforge.net/	
+HOMEPAGE=	 	http://sarg.sourceforge.net/
 
 MAINTAINER=		Douglas Santos <dsantos@hydroxyl.org>
 

www/sarg/distinfo

@@ -1,4 +1,4 @@
-MD5 (sarg-2.0.9.tar.gz) = 4d5a8eb6dd0c44dff446382ceacde31e
+MD5 (sarg-2.1.tar.gz) = 15b1c3fbff47ac6ea77573cae75b5e63
-RMD160 (sarg-2.0.9.tar.gz) = 9e47640565fe3391d06b0cd4e191ec37f14e0a86
+RMD160 (sarg-2.1.tar.gz) = 5b2732d5e4a5bcd4c2b24e5694a3d19581d87b05
-SHA1 (sarg-2.0.9.tar.gz) = 8a5d29a13a69541c90b4761b24b3d7fdad2d1bc6
+SHA1 (sarg-2.1.tar.gz) = e35239d076f8b4bf9b9c41ea68f7711fa9a6d920
-SIZE (sarg-2.0.9.tar.gz) = 404714
+SIZE (sarg-2.1.tar.gz) = 352935

www/sarg/patches/patch-configure

@@ -1,7 +1,6 @@
-$OpenBSD: patch-configure,v 1.1.1.1 2005/09/27 13:03:45 alek Exp $
+--- configure.orig	Sat Jan  7 14:40:01 2006
---- configure.orig	Tue Sep 27 13:48:07 2005
++++ configure	Sat Jan  7 14:40:40 2006
-+++ configure	Tue Sep 27 13:48:21 2005
+@@ -2331,12 +2331,6 @@
-@@ -2331,12 +2331,6 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
  ;;
  esac
  

www/sarg/patches/patch-convlog_c

@@ -0,0 +1,24 @@
+$OpenBSD: patch-convlog_c,v 1.1 2006/01/22 11:05:02 aanriot Exp $
+--- convlog.c.orig	Sun Jan 22 10:07:20 2006
++++ convlog.c	Sun Jan 22 10:09:00 2006
+@@ -52,16 +52,16 @@ void convlog(char *arq, char *df, int df
+       t=localtime(&tt);
+ 
+       if(dfrom) {
+-         strftime(wdata, 127, "%Y%m%d", t);
++         strftime(wdata, sizeof(wdata), "%Y%m%d", t);
+          idata=atoi(wdata);
+ 	 if(idata < dfrom || idata > duntil)
+          continue;
+       }
+ 
+       if(strncmp(df,"e",1) == 0)
+-         strftime(dia, 127, "%d/%m/%Y", t);
++         strftime(dia, sizeof(dia), "%d/%m/%Y", t);
+        else
+-         strftime(dia, 127, "%m/%d/%Y", t);
++         strftime(dia, sizeof(dia), "%m/%d/%Y", t);
+       sprintf(hora,"%02d:%02d:%02d",t->tm_hour,t->tm_min,t->tm_sec);
+ 
+       printf("%s %s %s",dia,hora,buf);
+

www/sarg/patches/patch-index_c

@@ -1,19 +0,0 @@
-$OpenBSD: patch-index_c,v 1.1 2005/11/13 17:32:27 pvalchev Exp $
---- index.c.orig	Thu Aug  4 19:32:44 2005
-+++ index.c	Fri Nov  4 17:06:04 2005
-@@ -113,11 +113,11 @@ void geraindex()
-    (void)closedir( dirp );
- 
-    if(strcmp(IndexSortOrder,"A") == 0)
--//      sprintf(html,"sort -t';' -k 7,7 %s -o %s", wdir_tmp, wdir_tmp2);
--      sprintf(html,"sort -t';' +6.5n +6.2M +6.0n '%s' -o '%s'", wdir_tmp, wdir_tmp2);
-+      sprintf(html,"sort -t';' -k 7,7 %s -o %s", wdir_tmp, wdir_tmp2);
-+//      sprintf(html,"sort -t';' +6.5n +6.2M +6.0n '%s' -o '%s'", wdir_tmp, wdir_tmp2);
-    else
--//      sprintf(html,"sort -t';' -r -k 7,7 %s -o %s", wdir_tmp, wdir_tmp2);
--      sprintf(html,"sort -t';' +6.5nr +6.2Mr +6.0nr '%s' -o '%s'", wdir_tmp, wdir_tmp2);
-+      sprintf(html,"sort -t';' -r -k 7,7 %s -o %s", wdir_tmp, wdir_tmp2);
-+//      sprintf(html,"sort -t';' +6.5nr +6.2Mr +6.0nr '%s' -o '%s'", wdir_tmp, wdir_tmp2);
- 
-    system(html);
- 

www/sarg/patches/patch-splitlog_c

@@ -0,0 +1,25 @@
+$OpenBSD: patch-splitlog_c,v 1.1 2006/01/22 11:05:02 aanriot Exp $
+--- splitlog.c.orig	Sun Jan 22 10:09:07 2006
++++ splitlog.c	Sun Jan 22 10:09:28 2006
+@@ -52,7 +52,7 @@ void splitlog(char *arq, char *df, int d
+       t=localtime(&tt);
+ 
+       if(dfrom) {
+-         strftime(wdata, 127, "%Y%m%d", t);
++         strftime(wdata, sizeof(wdata), "%Y%m%d", t);
+          idata=atoi(wdata);
+ 	 if(idata < dfrom || idata > duntil)
+          continue;
+@@ -64,9 +64,9 @@ void splitlog(char *arq, char *df, int d
+       }
+ 
+       if(strncmp(df,"e",1) == 0)
+-         strftime(dia, 127, "%d/%m/%Y", t);
++         strftime(dia, sizeof(dia), "%d/%m/%Y", t);
+        else
+-         strftime(dia, 127, "%m/%d/%Y", t);
++         strftime(dia, sizeof(dia), "%m/%d/%Y", t);
+ 
+       sprintf(hora,"%02d:%02d:%02d",t->tm_hour,t->tm_min,t->tm_sec);
+       printf("%s %s %s",dia,hora,buf);
+

www/sarg/patches/patch-squidguard_log_c

@@ -0,0 +1,13 @@
+$OpenBSD: patch-squidguard_log_c,v 1.1 2006/01/22 11:05:02 aanriot Exp $
+--- squidguard_log.c.orig	Sun Jan 22 10:10:50 2006
++++ squidguard_log.c	Sun Jan 22 10:11:54 2006
+@@ -105,7 +105,7 @@ void read_log(char *wentp, FILE *fp_ou)
+ 
+       if (strcmp(user,"-") == 0) {
+          strcpy(user,ip);
+-         bzero(ip, 30);
++         bzero(ip, sizeof(ip));
+       }
+       sprintf(tmp6,"%s %s%s%s %s %s %s %s\n",user,year,mon,day,hour,ip,url,list);
+       fputs(tmp6, fp_ou);
+

www/sarg/pkg/PLIST

@@ -1,10 +1,11 @@
-@comment $OpenBSD: PLIST,v 1.1.1.1 2005/09/27 13:03:45 alek Exp $
+@comment $OpenBSD: PLIST,v 1.2 2006/01/22 11:05:02 aanriot Exp $
 bin/sarg
 @man man/man1/sarg.1
 share/examples/sarg/
 @sample ${SYSCONFDIR}/sarg/
 share/examples/sarg/css.tpl
 share/examples/sarg/exclude_codes
+@sample ${SYSCONFDIR}/sarg/exclude_codes
 share/examples/sarg/fonts/
 share/examples/sarg/fonts/FreeSans.ttf
 share/examples/sarg/images/
@@ -29,6 +30,7 @@ share/examples/sarg/languages/Latvian
 share/examples/sarg/languages/Polish
 share/examples/sarg/languages/Portuguese
 share/examples/sarg/languages/Romanian
+share/examples/sarg/languages/Russian_UTF-8
 share/examples/sarg/languages/Russian_koi8
 share/examples/sarg/languages/Russian_windows1251
 share/examples/sarg/languages/Serbian
@@ -56,6 +58,7 @@ share/examples/sarg/sarg-php/locale/ru/LC_MESSAGES/
 share/examples/sarg/sarg-php/locale/ru/LC_MESSAGES/messages.mo
 share/examples/sarg/sarg-php/locale/ru/LC_MESSAGES/messages.po
 share/examples/sarg/sarg-php/sarg-block-it.php
+share/examples/sarg/sarg-php/sarg-realtime.php
 share/examples/sarg/sarg-php/sarg-squidguard-block.php
 share/examples/sarg/sarg-php/sarg-squidguard-block2.php
 share/examples/sarg/sarg-php/style.php