From garga@data.galle.com.br  Wed Nov 30 16:19:06 2005
Return-Path: <garga@data.galle.com.br>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id E08A816A41F
	for <FreeBSD-gnats-submit@freebsd.org>; Wed, 30 Nov 2005 16:19:05 +0000 (GMT)
	(envelope-from garga@data.galle.com.br)
Received: from data.galle.com.br (data.galle.com.br [200.246.25.10])
	by mx1.FreeBSD.org (Postfix) with ESMTP id E93D243D5C
	for <FreeBSD-gnats-submit@freebsd.org>; Wed, 30 Nov 2005 16:19:04 +0000 (GMT)
	(envelope-from garga@data.galle.com.br)
Received: from data.galle.com.br (data.galle.com.br [200.246.25.10])
	by data.galle.com.br (8.13.4/8.13.4) with ESMTP id jAUGJ2KE011221;
	Wed, 30 Nov 2005 14:19:02 -0200 (BRDT)
	(envelope-from garga@data.galle.com.br)
Received: (from garga@localhost)
	by data.galle.com.br (8.13.4/8.13.3/Submit) id jAUGIsHH011216;
	Wed, 30 Nov 2005 14:18:54 -0200 (BRDT)
	(envelope-from garga)
Message-Id: <200511301618.jAUGIsHH011216@data.galle.com.br>
Date: Wed, 30 Nov 2005 14:18:54 -0200 (BRDT)
From: Renato Botelho <garga@freebsd.org>
To: FreeBSD-gnats-submit@freebsd.org
Cc: mt@primats.org.ua
Subject: [PATCH] www/sarg: update to 2.1
X-Send-Pr-Version: 3.113
X-GNATS-Notify: mt@primats.org.ua

>Number:         89766
>Category:       ports
>Synopsis:       [PATCH] www/sarg: update to 2.1
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    garga
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Wed Nov 30 16:20:02 GMT 2005
>Closed-Date:    Thu Dec 01 15:21:55 GMT 2005
>Last-Modified:  Thu Dec 01 15:21:55 GMT 2005
>Originator:     Renato Botelho
>Release:        FreeBSD 6.0-STABLE i386
>Organization:
>Environment:
System: FreeBSD data.galle.com.br 6.0-STABLE FreeBSD 6.0-STABLE #6: Fri Nov  4 15:09:42 BRDT
>Description:
- Update to 2.1

Added file(s):
- files/patch-datafile.c
- files/patch-realtime.c

Port maintainer (mt@primats.org.ua) is cc'd.

Generated with FreeBSD Port Tools 0.63
>How-To-Repeat:
>Fix:

--- sarg-2.1.patch begins here ---
Index: Makefile
===================================================================
RCS file: /home/pcvs/ports/www/sarg/Makefile,v
retrieving revision 1.17
diff -u -u -r1.17 Makefile
--- Makefile	29 Aug 2005 10:15:38 -0000	1.17
+++ Makefile	30 Nov 2005 16:18:18 -0000
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	sarg
-PORTVERSION=	2.0.9
+PORTVERSION=	2.1
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
Index: distinfo
===================================================================
RCS file: /home/pcvs/ports/www/sarg/distinfo,v
retrieving revision 1.14
diff -u -u -r1.14 distinfo
--- distinfo	29 Aug 2005 10:15:38 -0000	1.14
+++ distinfo	30 Nov 2005 16:18:18 -0000
@@ -1,2 +1,3 @@
-MD5 (sarg-2.0.9.tar.gz) = 4d5a8eb6dd0c44dff446382ceacde31e
-SIZE (sarg-2.0.9.tar.gz) = 404714
+MD5 (sarg-2.1.tar.gz) = 15b1c3fbff47ac6ea77573cae75b5e63
+SHA256 (sarg-2.1.tar.gz) = 89ec31f3b7b8187de1e4ee4fa0a4abf6867f2404bd9059bbfbe4beb609dd5818
+SIZE (sarg-2.1.tar.gz) = 352935
Index: pkg-plist
===================================================================
RCS file: /home/pcvs/ports/www/sarg/pkg-plist,v
retrieving revision 1.9
diff -u -u -r1.9 pkg-plist
--- pkg-plist	6 Jun 2005 12:01:47 -0000	1.9
+++ pkg-plist	30 Nov 2005 16:18:18 -0000
@@ -28,6 +28,7 @@
 etc/sarg/languages/Polish
 etc/sarg/languages/Portuguese
 etc/sarg/languages/Romanian
+etc/sarg/languages/Russian_UTF-8
 etc/sarg/languages/Russian_koi8
 etc/sarg/languages/Russian_windows1251
 etc/sarg/languages/Serbian
@@ -48,6 +49,7 @@
 etc/sarg/sarg-php/locale/ru/LC_MESSAGES/messages.mo
 etc/sarg/sarg-php/locale/ru/LC_MESSAGES/messages.po
 etc/sarg/sarg-php/sarg-block-it.php
+etc/sarg/sarg-php/sarg-realtime.php
 etc/sarg/sarg-php/sarg-squidguard-block.php
 etc/sarg/sarg-php/sarg-squidguard-block2.php
 etc/sarg/sarg-php/style.php
Index: files/patch-datafile.c
===================================================================
RCS file: files/patch-datafile.c
diff -N files/patch-datafile.c
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ files/patch-datafile.c	30 Nov 2005 16:18:18 -0000
@@ -0,0 +1,11 @@
+--- datafile.c.orig	Wed Nov 30 13:58:14 2005
++++ datafile.c	Wed Nov 30 13:58:23 2005
+@@ -25,7 +25,7 @@
+ 
+ #include "include/conf.h"
+ 
+-void saverecs(char *dirname, char *user, long long int nacc, char *url, long long int nbytes, char *ip, char *hora, char *dia, long long int nelap, long long int incache, long long int oucache);
++void saverecs2(char *dirname, char *user, long long int nacc, char *url, long long int nbytes, char *ip, char *hora, char *dia, long long int nelap, long long int incache, long long int oucache);
+ void grava_SmartFilter(char *dirname, char *user, char *ip, char *data, char *hora, char *url, char *smart);
+ 
+ void data_file(char *tmp)
Index: files/patch-realtime.c
===================================================================
RCS file: files/patch-realtime.c
diff -N files/patch-realtime.c
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ files/patch-realtime.c	30 Nov 2005 16:18:18 -0000
@@ -0,0 +1,11 @@
+--- realtime.c.orig	Wed Nov 30 13:58:09 2005
++++ realtime.c	Wed Nov 30 13:58:20 2005
+@@ -27,6 +27,8 @@
+ 
+ void getdata(char *, FILE *);
+ void datashow(char *);
++void getlog ();
++void header ();
+ 
+ char dat[128];
+ char tim[128];
--- sarg-2.1.patch ends here ---

>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->garga 
Responsible-Changed-By: garga 
Responsible-Changed-When: Wed Nov 30 16:24:21 GMT 2005 
Responsible-Changed-Why:  
I'll take it. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=89766 
State-Changed-From-To: open->feedback 
State-Changed-By: garga 
State-Changed-When: Wed Nov 30 16:24:35 GMT 2005 
State-Changed-Why:  
Ask for maintainer approval. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=89766 

From: Edwin Groothuis <edwin@FreeBSD.org>
To: mt@primats.org.ua
Cc: bug-followup@FreeBSD.org
Subject: Re: ports/89766: [PATCH] www/sarg: update to 2.1
Date: Wed, 30 Nov 2005 16:25:04 UT

 Maintainer of www/sarg,
 
 Please note that PR ports/89766 has just been submitted.
 
 If it contains a patch for an upgrade, an enhancement or a bug fix
 you agree on, reply to this email stating that you approve the patch
 and a committer will take care of it.
 
 The full text of the PR can be found at:
     http://www.freebsd.org/cgi/query-pr.cgi?pr=ports/89766
 
 -- 
 Edwin Groothuis
 edwin@FreeBSD.org
State-Changed-From-To: feedback->closed 
State-Changed-By: garga 
State-Changed-When: Thu Dec 1 15:21:54 GMT 2005 
State-Changed-Why:  
Committed. Thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=89766 
>Unformatted:
