2.0.9 -> 2.1
? sarg.diff
Index: Makefile
===================================================================
RCS file: /cvs/ports/www/sarg/Makefile,v
retrieving revision 1.3
diff -u -r1.3 Makefile
--- Makefile 13 Nov 2005 17:32:26 -0000 1.3
+++ Makefile 21 Jan 2006 18:40:14 -0000
@@ -2,11 +2,10 @@
COMMENT= "Squid Analysis Report Generator"
-DISTNAME= sarg-2.0.9
-PKGNAME= ${DISTNAME}p0
+DISTNAME= sarg-2.1
CATEGORIES= www
-HOMEPAGE= http://sarg.sourceforge.net/
+HOMEPAGE= http://sarg.sourceforge.net/
MAINTAINER= Douglas Santos <[EMAIL PROTECTED]>
@@ -23,7 +22,7 @@
CONFIGURE_STYLE= gnu
CONFIGURE_ARGS= --enable-bindir=${LOCALBASE}/bin \
--enable-sysconfdir=${SYSCONFDIR}/sarg \
- --enable-htmldir=/var/www/htdocs/sarg \
+ --enable-htmldir=/var/www/htdocs/sarg
NO_REGRESS= Yes
@@ -31,7 +30,7 @@
MODGNU_CONFIG_GUESS_DIRS=${WRKSRC}/cfgaux
post-extract:
- @chmod 755 ${WRKSRC}/sarg-php/locale
+ @chmod 755 ${WRKSRC}/sarg-php/locale
post-build:
@perl -pi -e \
Index: distinfo
===================================================================
RCS file: /cvs/ports/www/sarg/distinfo,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 distinfo
--- distinfo 27 Sep 2005 13:03:45 -0000 1.1.1.1
+++ distinfo 21 Jan 2006 18:40:14 -0000
@@ -1,4 +1,4 @@
-MD5 (sarg-2.0.9.tar.gz) = 4d5a8eb6dd0c44dff446382ceacde31e
-RMD160 (sarg-2.0.9.tar.gz) = 9e47640565fe3391d06b0cd4e191ec37f14e0a86
-SHA1 (sarg-2.0.9.tar.gz) = 8a5d29a13a69541c90b4761b24b3d7fdad2d1bc6
-SIZE (sarg-2.0.9.tar.gz) = 404714
+MD5 (sarg-2.1.tar.gz) = 15b1c3fbff47ac6ea77573cae75b5e63
+RMD160 (sarg-2.1.tar.gz) = 5b2732d5e4a5bcd4c2b24e5694a3d19581d87b05
+SHA1 (sarg-2.1.tar.gz) = e35239d076f8b4bf9b9c41ea68f7711fa9a6d920
+SIZE (sarg-2.1.tar.gz) = 352935
Index: patches/patch-configure
===================================================================
RCS file: /cvs/ports/www/sarg/patches/patch-configure,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 patch-configure
--- patches/patch-configure 27 Sep 2005 13:03:45 -0000 1.1.1.1
+++ patches/patch-configure 21 Jan 2006 18:40:14 -0000
@@ -1,7 +1,6 @@
-$OpenBSD: patch-configure,v 1.1.1.1 2005/09/27 13:03:45 alek Exp $
---- configure.orig Tue Sep 27 13:48:07 2005
-+++ configure Tue Sep 27 13:48:21 2005
-@@ -2331,12 +2331,6 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
+--- configure.orig Sat Jan 7 14:40:01 2006
++++ configure Sat Jan 7 14:40:40 2006
+@@ -2331,12 +2331,6 @@
;;
esac
Index: patches/patch-convlog_c
===================================================================
RCS file: patches/patch-convlog_c
diff -N patches/patch-convlog_c
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-convlog_c 21 Jan 2006 18:40:14 -0000
@@ -0,0 +1,11 @@
+--- convlog.c.orig Sat Jan 21 14:57:31 2006
++++ convlog.c Sat Jan 21 14:58:11 2006
+@@ -39,7 +39,7 @@
+ struct tm *t;
+
+ if(arq[0] == '\0')
+- strcpy(arq,"/usr/local/squid/logs/access.log");
++ strcpy(arq,"/var/squid/logs/access.log");
+
+ if((fp_in=fopen(arq,"r"))==NULL) {
+ fprintf(stderr, "SARG: (convlog) %s: %s\n",text[8],arq);
Index: patches/patch-index_c
===================================================================
RCS file: patches/patch-index_c
diff -N patches/patch-index_c
--- patches/patch-index_c 13 Nov 2005 17:32:27 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -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);
-
Index: patches/patch-log_c
===================================================================
RCS file: patches/patch-log_c
diff -N patches/patch-log_c
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-log_c 21 Jan 2006 18:40:14 -0000
@@ -0,0 +1,20 @@
+--- log.c.orig Sat Jan 21 13:58:21 2006
++++ log.c Sat Jan 21 14:56:14 2006
+@@ -148,7 +148,7 @@
+ SquidGuardLogFormat[0]='\0';
+ SquidGuardLogAlternate[0]='\0';
+
+- strcpy(AccessLog,"/usr/local/squid/var/logs/access.log");
++ strcpy(AccessLog,"/var/squid/logs/access.log");
+ sprintf(ExcludeCodes,"%s/exclude_codes",SYSCONFDIR);
+ strcpy(GraphDaysBytesBarColor,"orange");
+ strcpy(BgColor,"#ffffff");
+@@ -163,7 +163,7 @@
+ strcpy(LogoTextColor,"#006699");
+ strcpy(FontSize,"9px");
+ strcpy(TempDir,"/tmp");
+- strcpy(OutputDir,"/usr/local/etc/httpd/htdocs/squid-reports");
++ strcpy(OutputDir,"/var/www/htdocs/sarg");
+ strcpy(Ip2Name,"no");
+ strcpy(DateFormat,"u");
+ strcpy(OverwriteReport,"no");
Index: patches/patch-sarg_conf
===================================================================
RCS file: patches/patch-sarg_conf
diff -N patches/patch-sarg_conf
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-sarg_conf 21 Jan 2006 18:40:14 -0000
@@ -0,0 +1,65 @@
+--- sarg.conf.orig Sat Jan 21 14:52:36 2006
++++ sarg.conf Sat Jan 21 15:09:29 2006
+@@ -32,7 +32,7 @@
+ # Where is the access.log file
+ # sarg -l file
+ #
+-#access_log /usr/local/squid/var/logs/access.log
++#access_log /var/squid/logs/access.log
+
+ # TAG: graphs yes|no
+ # Use graphics where is possible.
+@@ -139,7 +139,7 @@
+ # The reports will be saved in that directory
+ # sarg -o dir
+ #
+-#output_dir /var/www/html/squid-reports
++#output_dir /var/www/htdocs/sarg
+
+ # TAG: output_email
+ # Email address to send the reports. If you use this tag, no html
reports will be generated.
+@@ -269,7 +269,7 @@
+ # TAG: exclude_codes file
+ # Ignore records with these codes. Eg.: NONE/400
+ #
+-#exclude_codes /usr/local/sarg/exclude_codes
++#exclude_codes /etc/sarg/exclude_codes
+
+ # TAG: replace_index string
+ # Replace "index.html" in the main index file with this string
+@@ -493,7 +493,7 @@
+ # TAG: parsed_output_log_compress /bin/gzip|/usr/bin/bzip2|nocompress
+ # sarg logs compress util
+ #
+-#parsed_output_log_compress /bin/gzip
++#parsed_output_log_compress /usr/bin/gzip
+
+ # TAG: displayed_values bytes|abbreviation
+ # how the values will be displayed in reports.
+@@ -526,7 +526,7 @@
+ # Sarg will create sarg-php directory with some PHP modules:
+ # - sarg-squidguard-block.php - add urls from user reports to squidGuard
DB
+ #
+-#www_document_root /var/www/html
++#www_document_root /var/www/htdocs
+
+ # TAG: block_it module_url
+ # This tag allow you to pass urls from user reports to a cgi or php
module,
+@@ -534,7 +534,7 @@
+ #
+ # Eg.: block_it /sarg-php/sarg-block-it.php
+ # sarg-block-it is a php that will append a url to a flat file.
+-# You must change /var/www/html/sarg-php/sarg-block-it to point to your
file
++# You must change /var/www/htdocs/sarg-php/sarg-block-it to point to your
file
+ # in $filename variable, and chown to a httpd owner.
+ #
+ # sarg will pass http://module_url?url=url
+@@ -555,7 +555,7 @@
+ # .data2 table text class, align:right, border colors
+ # .link link class
+ #
+-# There is a sample in /usr/local/sarg/etc/css.tpl
++# There is a sample in /etc/sarg/css.tpl
+ #
+ #external_css_file none
+
Index: patches/patch-splitlog_c
===================================================================
RCS file: patches/patch-splitlog_c
diff -N patches/patch-splitlog_c
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-splitlog_c 21 Jan 2006 18:40:14 -0000
@@ -0,0 +1,11 @@
+--- splitlog.c.orig Sat Jan 21 14:59:38 2006
++++ splitlog.c Sat Jan 21 14:59:57 2006
+@@ -39,7 +39,7 @@
+ struct tm *t;
+
+ if(arq[0] == '\0')
+- strcpy(arq,"/usr/local/squid/logs/access.log");
++ strcpy(arq,"/var/squid/logs/access.log");
+
+ if((fp_in=fopen(arq,"r"))==NULL) {
+ fprintf(stderr, "SARG: (splitlog) %s: %s\n",text[8],arq);
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/www/sarg/pkg/PLIST,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 PLIST
--- pkg/PLIST 27 Sep 2005 13:03:45 -0000 1.1.1.1
+++ pkg/PLIST 21 Jan 2006 18:40:14 -0000
@@ -29,6 +29,7 @@
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 +57,7 @@
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
