removed trailing space
from michele@
Index: sarg/Makefile
===================================================================
RCS file: /cvs/ports/www/sarg/Makefile,v
retrieving revision 1.5
diff -u -r1.5 Makefile
--- sarg/Makefile 28 Jan 2006 21:22:07 -0000 1.5
+++ sarg/Makefile 14 May 2007 13:46:34 -0000
@@ -2,8 +2,8 @@
COMMENT= "Squid Analysis Report Generator"
-DISTNAME= sarg-2.1
-PKGNAME= ${DISTNAME}p0
+DISTNAME= sarg-2.2.3.1
+PKGNAME= ${DISTNAME}
CATEGORIES= www
HOMEPAGE= http://sarg.sourceforge.net/
Index: sarg/distinfo
===================================================================
RCS file: /cvs/ports/www/sarg/distinfo,v
retrieving revision 1.3
diff -u -r1.3 distinfo
--- sarg/distinfo 5 Apr 2007 17:26:25 -0000 1.3
+++ sarg/distinfo 14 May 2007 13:46:34 -0000
@@ -1,5 +1,5 @@
-MD5 (sarg-2.1.tar.gz) = FbHD+/9HrG6ndXPK51teYw==
-RMD160 (sarg-2.1.tar.gz) = Wycy1eSlvNTCsk5WlKPRlYHYewU=
-SHA1 (sarg-2.1.tar.gz) = 41I50Hb4tL+bnEHqaPdxH6mm2SA=
-SHA256 (sarg-2.1.tar.gz) = iewx87e4GH3h5O5PoKSr9oZ/JAS9kFm7++S+tgndWBg=
-SIZE (sarg-2.1.tar.gz) = 352935
+MD5 (sarg-2.2.3.1.tar.gz) = 6e2e2c386a89aaff31f048eb2a6c5b1a
+RMD160 (sarg-2.2.3.1.tar.gz) = 3a2ce81e3cf6e8559f3efb53c0e5b0b9526f08b6
+SHA1 (sarg-2.2.3.1.tar.gz) = 6433ef901641245e1283bbb9ae7f7be7959841eb
+SHA256 (sarg-2.2.3.1.tar.gz) = fc6d7e92c156b488941820a2d44eac6231d4237435e9fffd9f3ebda51296842e
+SIZE (sarg-2.2.3.1.tar.gz) = 641277
Index: sarg/patches/patch-configure
===================================================================
RCS file: /cvs/ports/www/sarg/patches/patch-configure,v
retrieving revision 1.3
diff -u -r1.3 patch-configure
--- sarg/patches/patch-configure 28 Jan 2006 21:22:07 -0000 1.3
+++ sarg/patches/patch-configure 14 May 2007 13:46:34 -0000
@@ -1,6 +1,7 @@
---- configure.orig Tue Nov 29 17:39:45 2005
-+++ configure Thu Jan 26 21:31:44 2006
-@@ -2331,12 +2331,6 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
+$OpenBSD$
+--- configure.orig Wed Apr 4 07:28:32 2007
++++ configure Wed Apr 4 07:29:17 2007
+@@ -2335,12 +2335,6 @@
;;
esac
@@ -13,3 +14,12 @@
case "$host" in
*-solaris*)
LDFLAGS="${LDFLAGS} -lsocket -lnsl"
+@@ -3990,7 +3984,7 @@
+
+ for ac_header in stdio.h stdlib.h string.h strings.h sys/time.h time.h unistd.h sys/dirent.h \
+ dirent.h sys/socket.h netdb.h arpa/inet.h sys/types.h netinet/in.h sys/stat.h \
+- ctype.h gd.h gdfontl.h gdfontt.h gdfonts.h gdfontmb.h gdfontg.h iconv.h \
++ ctype.h iconv.h \
+ errno.h sys/resource.h
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
Index: sarg/patches/patch-convlog_c
===================================================================
RCS file: /cvs/ports/www/sarg/patches/patch-convlog_c,v
retrieving revision 1.2
diff -u -r1.2 patch-convlog_c
--- sarg/patches/patch-convlog_c 28 Jan 2006 21:22:07 -0000 1.2
+++ sarg/patches/patch-convlog_c 14 May 2007 13:46:34 -0000
@@ -1,3 +1,4 @@
+$OpenBSD$
--- convlog.c.orig Tue Nov 29 17:39:45 2005
+++ convlog.c Thu Jan 26 21:31:44 2006
@@ -39,7 +39,7 @@ void convlog(char *arq, char *df, int df
Index: sarg/patches/patch-index_c
===================================================================
RCS file: sarg/patches/patch-index_c
diff -N sarg/patches/patch-index_c
--- sarg/patches/patch-index_c 28 Jan 2006 21:22:07 -0000 1.3
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,14 +0,0 @@
---- index.c.orig Tue Nov 29 17:39:45 2005
-+++ index.c Thu Jan 26 21:31:44 2006
-@@ -369,9 +369,9 @@ void make_index()
- unlink(wdir_tmp2);
- } else {
- if(strcmp(IndexSortOrder,"A") == 0)
-- sprintf(warea,"sort -t';' +6.5n +6.2M +6.0n '%s' -o '%s'", wdir_tmp, wdir_tmp2);
-+ sprintf(warea,"sort -t';' -k 7,7 %s -o %s", wdir_tmp, wdir_tmp2);
- else
-- sprintf(warea,"sort -t';' +6.5nr +6.2Mr +6.0nr '%s' -o '%s'", wdir_tmp, wdir_tmp2);
-+ sprintf(warea,"sort -t';' -r -k 7,7 %s -o %s", wdir_tmp, wdir_tmp2);
- system(warea);
- unlink(wdir_tmp);
- if((fp_ou=fopen(wdir,"w"))==NULL) {
Index: sarg/patches/patch-log_c
===================================================================
RCS file: /cvs/ports/www/sarg/patches/patch-log_c,v
retrieving revision 1.1
diff -u -r1.1 patch-log_c
--- sarg/patches/patch-log_c 28 Jan 2006 21:22:07 -0000 1.1
+++ sarg/patches/patch-log_c 14 May 2007 13:46:34 -0000
@@ -1,20 +1,35 @@
---- log.c.orig Tue Nov 29 17:39:45 2005
-+++ log.c Thu Jan 26 21:31:44 2006
-@@ -148,7 +148,7 @@ int main(argc,argv)
- SquidGuardLogFormat[0]='\0';
+$OpenBSD$
+--- log.c.orig Wed Apr 4 08:25:56 2007
++++ log.c Wed Apr 4 08:31:27 2007
+@@ -145,7 +145,7 @@
SquidGuardLogAlternate[0]='\0';
+ arq[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 @@ int main(argc,argv)
+@@ -160,7 +160,7 @@
strcpy(LogoTextColor,"#006699");
strcpy(FontSize,"9px");
strcpy(TempDir,"/tmp");
-- strcpy(OutputDir,"/usr/local/etc/httpd/htdocs/squid-reports");
+- strcpy(OutputDir,"/var/www/html/squid-reports");
+ strcpy(OutputDir,"/var/www/htdocs/sarg");
strcpy(Ip2Name,"no");
strcpy(DateFormat,"u");
strcpy(OverwriteReport,"no");
+@@ -197,11 +197,11 @@
+ strcpy(ShowSargInfo,"yes");
+ strcpy(ShowSargLogo,"yes");
+ strcpy(ParsedOutputLog,"no");
+- strcpy(ParsedOutputLogCompress,"/bin/gzip");
++ strcpy(ParsedOutputLogCompress,"/usr/bin/gzip");
+ strcpy(DisplayedValues,"abbreviation");
+ strcpy(HeaderFontSize,"9px");
+ strcpy(TitleFontSize,"11px");
+- strcpy(AuthUserFile,"/usr/local/sarg/passwd");
++ strcpy(AuthUserFile,"/etc/sarg/passwd");
+ strcpy(AuthName,"SARG, Restricted Access");
+ strcpy(AuthType,"basic");
+ strcpy(Require,"require user admin %u");
Index: sarg/patches/patch-sarg_conf
===================================================================
RCS file: /cvs/ports/www/sarg/patches/patch-sarg_conf,v
retrieving revision 1.1
diff -u -r1.1 patch-sarg_conf
--- sarg/patches/patch-sarg_conf 28 Jan 2006 21:22:07 -0000 1.1
+++ sarg/patches/patch-sarg_conf 14 May 2007 13:46:34 -0000
@@ -1,51 +1,56 @@
---- sarg.conf.orig Tue Nov 29 17:39:45 2005
-+++ sarg.conf Thu Jan 26 21:31:44 2006
-@@ -32,7 +32,7 @@
+$OpenBSD$
+--- sarg.conf.orig Tue Jan 2 17:11:26 2007
++++ sarg.conf Wed Apr 4 08:42:21 2007
+@@ -33,7 +33,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
++#access_log /var/squid/logs/access.log
# TAG: graphs yes|no
# Use graphics where is possible.
-@@ -139,7 +139,7 @@
+@@ -140,7 +140,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
++#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 @@
+@@ -270,7 +270,7 @@
# TAG: exclude_codes file
# Ignore records with these codes. Eg.: NONE/400
#
-#exclude_codes /usr/local/sarg/exclude_codes
-+#exclude_codes %%SYSCONFDIR%%/sarg/exclude_codes
++#exclude_codes %%SYSCONFDIR%%/sarg/exclude_codes
# TAG: replace_index string
# Replace "index.html" in the main index file with this string
-@@ -493,7 +493,7 @@ max_elapsed 28800000
- # TAG: parsed_output_log_compress /bin/gzip|/usr/bin/bzip2|nocompress
+@@ -497,10 +497,10 @@
+ #
+ #parsed_output_log none
+
+-# TAG: parsed_output_log_compress /bin/gzip|/usr/bin/bzip2|nocompress
++# TAG: parsed_output_log_compress /bin/bin/gzip|/usr/local/bin/bzip2|nocompress
# sarg logs compress util
#
-#parsed_output_log_compress /bin/gzip
-+#parsed_output_log_compress /usr/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 @@ max_elapsed 28800000
+@@ -533,7 +533,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
++#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 @@ max_elapsed 28800000
+@@ -541,7 +541,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.
@@ -54,7 +59,7 @@
# in $filename variable, and chown to a httpd owner.
#
# sarg will pass http://module_url?url=url
-@@ -555,7 +555,7 @@ max_elapsed 28800000
+@@ -562,7 +562,7 @@
# .data2 table text class, align:right, border colors
# .link link class
#
@@ -63,3 +68,12 @@
#
#external_css_file none
+@@ -576,7 +576,7 @@
+ # %u - user report
+ #
+ # user_authentication no
+-# AuthUserFile /usr/local/sarg/passwd
++# AuthUserFile %%SYSCONFDIR%%/sarg/passwd
+ # AuthName "SARG, Restricted Access"
+ # AuthType Basic
+ # Require user admin %u
Index: sarg/patches/patch-splitlog_c
===================================================================
RCS file: /cvs/ports/www/sarg/patches/patch-splitlog_c,v
retrieving revision 1.2
diff -u -r1.2 patch-splitlog_c
--- sarg/patches/patch-splitlog_c 28 Jan 2006 21:22:07 -0000 1.2
+++ sarg/patches/patch-splitlog_c 14 May 2007 13:46:34 -0000
@@ -1,3 +1,4 @@
+$openBSD$
--- splitlog.c.orig Tue Nov 29 17:39:45 2005
+++ splitlog.c Thu Jan 26 21:31:44 2006
@@ -39,7 +39,7 @@ void splitlog(char *arq, char *df, int d
Index: sarg/pkg/PLIST
===================================================================
RCS file: /cvs/ports/www/sarg/pkg/PLIST,v
retrieving revision 1.2
diff -u -r1.2 PLIST
--- sarg/pkg/PLIST 22 Jan 2006 11:05:02 -0000 1.2
+++ sarg/pkg/PLIST 14 May 2007 13:46:34 -0000
@@ -4,40 +4,75 @@
share/examples/sarg/
@sample ${SYSCONFDIR}/sarg/
share/examples/sarg/css.tpl
[EMAIL PROTECTED] ${SYSCONFDIR}/sarg/css.tpl
share/examples/sarg/exclude_codes
@sample ${SYSCONFDIR}/sarg/exclude_codes
share/examples/sarg/fonts/
[EMAIL PROTECTED] ${SYSCONFDIR}/sarg/fonts/
share/examples/sarg/fonts/FreeSans.ttf
[EMAIL PROTECTED] ${SYSCONFDIR}/sarg/fonts/FreeSans.ttf
share/examples/sarg/images/
[EMAIL PROTECTED] ${SYSCONFDIR}/sarg/images/
share/examples/sarg/images/datetime.png
[EMAIL PROTECTED] ${SYSCONFDIR}/sarg/images/datetime.png
share/examples/sarg/images/graph.png
[EMAIL PROTECTED] ${SYSCONFDIR}/sarg/images/graph.png
share/examples/sarg/images/sarg-squidguard-block.png
[EMAIL PROTECTED] ${SYSCONFDIR}/sarg/images/sarg-squidguard-block.png
share/examples/sarg/images/sarg.png
[EMAIL PROTECTED] ${SYSCONFDIR}/sarg/images/sarg.png
share/examples/sarg/languages/
[EMAIL PROTECTED] ${SYSCONFDIR}/sarg/languages/
share/examples/sarg/languages/Bulgarian_windows1251
[EMAIL PROTECTED] ${SYSCONFDIR}/sarg/languages/Bulgarian_windows1251
share/examples/sarg/languages/Catalan
[EMAIL PROTECTED] ${SYSCONFDIR}/sarg/languages/Catalan
share/examples/sarg/languages/Czech
[EMAIL PROTECTED] ${SYSCONFDIR}/sarg/languages/Czech
+share/examples/sarg/languages/Czech_UTF8
[EMAIL PROTECTED] ${SYSCONFDIR}/sarg/languages/Czech_UTF8
share/examples/sarg/languages/Dutch
[EMAIL PROTECTED] ${SYSCONFDIR}/sarg/languages/Dutch
share/examples/sarg/languages/English
[EMAIL PROTECTED] ${SYSCONFDIR}/sarg/languages/English
share/examples/sarg/languages/French
[EMAIL PROTECTED] ${SYSCONFDIR}/sarg/languages/French
share/examples/sarg/languages/German
[EMAIL PROTECTED] ${SYSCONFDIR}/sarg/languages/German
share/examples/sarg/languages/Greek
[EMAIL PROTECTED] ${SYSCONFDIR}/sarg/languages/Greek
share/examples/sarg/languages/Hungarian
[EMAIL PROTECTED] ${SYSCONFDIR}/sarg/languages/Hungarian
share/examples/sarg/languages/Indonesian
[EMAIL PROTECTED] ${SYSCONFDIR}/sarg/languages/Indonesian
share/examples/sarg/languages/Italian
[EMAIL PROTECTED] ${SYSCONFDIR}/sarg/languages/Italian
share/examples/sarg/languages/Japanese
[EMAIL PROTECTED] ${SYSCONFDIR}/sarg/languages/Japanese
share/examples/sarg/languages/Latvian
[EMAIL PROTECTED] ${SYSCONFDIR}/sarg/languages/Latvian
share/examples/sarg/languages/Polish
[EMAIL PROTECTED] ${SYSCONFDIR}/sarg/languages/Polish
share/examples/sarg/languages/Portuguese
[EMAIL PROTECTED] ${SYSCONFDIR}/sarg/languages/Portuguese
share/examples/sarg/languages/Romanian
[EMAIL PROTECTED] ${SYSCONFDIR}/sarg/languages/Romanian
share/examples/sarg/languages/Russian_UTF-8
[EMAIL PROTECTED] ${SYSCONFDIR}/sarg/languages/Russian_UTF-8
share/examples/sarg/languages/Russian_koi8
[EMAIL PROTECTED] ${SYSCONFDIR}/sarg/languages/Russian_koi8
share/examples/sarg/languages/Russian_windows1251
[EMAIL PROTECTED] ${SYSCONFDIR}/sarg/languages/Russian_windows1251
share/examples/sarg/languages/Serbian
[EMAIL PROTECTED] ${SYSCONFDIR}/sarg/languages/Serbian
share/examples/sarg/languages/Slovak
[EMAIL PROTECTED] ${SYSCONFDIR}/sarg/languages/Slovak
share/examples/sarg/languages/Spanish
[EMAIL PROTECTED] ${SYSCONFDIR}/sarg/languages/Spanish
share/examples/sarg/languages/Turkish
[EMAIL PROTECTED] ${SYSCONFDIR}/sarg/languages/Turkish
share/examples/sarg/languages/Ukrainian_windows1251
[EMAIL PROTECTED] ${SYSCONFDIR}/sarg/languages/Ukrainian_windows1251
share/examples/sarg/sarg-php/
share/examples/sarg/sarg-php/language.php
share/examples/sarg/sarg-php/locale/
