ports/73971: update port: www/sarg, 1.4.1 -> 2.0.1
Maxim Tuliuk
mt at primats.org.ua
Mon Nov 15 15:40:25 UTC 2004
>Number: 73971
>Category: ports
>Synopsis: update port: www/sarg, 1.4.1 -> 2.0.1
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: maintainer-update
>Submitter-Id: current-users
>Arrival-Date: Mon Nov 15 15:40:24 GMT 2004
>Closed-Date:
>Last-Modified:
>Originator: Maxim Tuliuk
>Release: FreeBSD 5.3-RELEASE i386
>Organization:
ISP "TopNet"
>Environment:
System: FreeBSD zoo.top.net.ua 5.3-RELEASE FreeBSD 5.3-RELEASE #4: Wed Nov 10 18:28:20 EET 2004 root at zoo.top.net.ua:/usr/obj/usr/src/sys/host i386
>Description:
>How-To-Repeat:
>Fix:
diff -uNr sarg.old/Makefile sarg/Makefile
--- sarg.old/Makefile Tue May 11 15:50:42 2004
+++ sarg/Makefile Mon Nov 15 17:25:50 2004
@@ -6,24 +6,24 @@
#
PORTNAME= sarg
-PORTVERSION= 1.4.1
-PORTREVISION= 1
+PORTVERSION= 2.0.1
CATEGORIES= www
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
PATCH_SITES= http://sarg.sourceforge.net/
-PATCHFILES= sarg-1.4.1-index.sort.patch.gz
+PATCHFILES= sarg-2.0.1-largeurl.patch.gz
MAINTAINER= mt at primats.org.ua
COMMENT= Squid log analyzer and HTML report generator
+USE_GCC= yes
GNU_CONFIGURE= yes
-CONFIGURE_ARGS+= --prefix=${PREFIX} --exec-prefix=${PREFIX} --enable-bindir="${PREFIX}/bin" --enable-sysconfdir="${PREFIX}/etc/${PORTNAME}" --with-gcc
+CONFIGURE_ARGS= CC=gcc --enable-bindir="${PREFIX}/bin" --enable-sysconfdir="${PREFIX}/etc/${PORTNAME}" --enable-htmldir=${PREFIX}/www/${PORTNAME}
MAN1= sarg.1
post-extract:
- @${CHMOD} +x ${WRKSRC}/cfgaux ${WRKSRC}/include ${WRKSRC}/languages
+ @${CHMOD} +x ${WRKSRC}/sarg-php/locale
.include <bsd.port.mk>
diff -uNr sarg.old/distinfo sarg/distinfo
--- sarg.old/distinfo Tue May 11 15:50:42 2004
+++ sarg/distinfo Fri Nov 12 15:47:18 2004
@@ -1,4 +1,4 @@
-MD5 (sarg-1.4.1.tar.gz) = 357f8e175746e19dac4a61f4a2ef0aaf
-SIZE (sarg-1.4.1.tar.gz) = 125589
-MD5 (sarg-1.4.1-index.sort.patch.gz) = 6936ec8d08db58967f5c60d5b4a5ba19
-SIZE (sarg-1.4.1-index.sort.patch.gz) = 520
+MD5 (sarg-2.0.1.tar.gz) = a2f025eb47c2569dc1e39f383c989c78
+SIZE (sarg-2.0.1.tar.gz) = 321230
+MD5 (sarg-2.0.1-largeurl.patch.gz) = 8f1e2a713545a6ed3a1cfa30d28bfdb0
+SIZE (sarg-2.0.1-largeurl.patch.gz) = 509
diff -uNr sarg.old/files/patch-util.c sarg/files/patch-util.c
--- sarg.old/files/patch-util.c Thu Jan 1 03:00:00 1970
+++ sarg/files/patch-util.c Mon Nov 15 17:28:20 2004
@@ -0,0 +1,54 @@
+--- util.c.orig Mon Oct 4 00:37:03 2004
++++ util.c Mon Nov 15 17:27:48 2004
+@@ -483,6 +483,25 @@
+
+ }
+
++void my_mkdir(char *name)
++{
++ char w0[255];
++ char w1[255];
++ char w2[255];
++
++ strcpy(w0,name);
++ strcpy(w2,"/");
++ getword(w1,w0,'/');
++ while(strstr(w0,"/") != 0) {
++ getword(w1,w0,'/');
++ strcat(w2,w1);
++ mkdir(w2,0755);
++ strcat(w2,"/");
++ }
++ strcat(w2,w0);
++ mkdir(w2,0755);
++}
++
+ void vrfydir(char *dir, char *dirname, char *per1, char *addr, char *site, char *us, char *form)
+ {
+ FILE *img_in, *img_ou;
+@@ -902,25 +921,6 @@
+ fputs(html,fp_ou);
+ fputs("<table>\n",fp_ou);
+ }
+-}
+-
+-void my_mkdir(char *name)
+-{
+- char w0[255];
+- char w1[255];
+- char w2[255];
+-
+- strcpy(w0,name);
+- strcpy(w2,"/");
+- getword(w1,w0,'/');
+- while(strstr(w0,"/") != 0) {
+- getword(w1,w0,'/');
+- strcat(w2,w1);
+- mkdir(w2,0755);
+- strcat(w2,"/");
+- }
+- strcat(w2,w0);
+- mkdir(w2,0755);
+ }
+
+ char url_module(char *url, char *w2)
diff -uNr sarg.old/pkg-plist sarg/pkg-plist
--- sarg.old/pkg-plist Thu Apr 15 02:40:54 2004
+++ sarg/pkg-plist Mon Nov 15 17:22:46 2004
@@ -2,28 +2,55 @@
@unexec if cmp -s %D/etc/sarg/sarg.conf %D/etc/sarg/sarg.conf.default; then rm -f %D/etc/sarg/sarg.conf; fi
@exec [ ! -f %B/sarg.conf ] || cp -p %B/sarg/sarg.conf.default %B/sarg/sarg.conf
etc/sarg/sarg.conf.default
+etc/sarg/css.tpl
etc/sarg/exclude_codes
+etc/sarg/fonts/Verdana.TTF
+etc/sarg/images/datetime.png
+etc/sarg/images/graph.png
+etc/sarg/images/sarg-squidguard-block.png
+etc/sarg/images/sarg.png
+etc/sarg/languages/.new
+etc/sarg/languages/Bulgarian_windows1251
etc/sarg/languages/Catalan
-etc/sarg/languages/Russian_koi8
-etc/sarg/languages/German
-etc/sarg/languages/French
etc/sarg/languages/Czech
etc/sarg/languages/Dutch
-etc/sarg/languages/Bulgarian_windows1251
-etc/sarg/languages/Romanian
-etc/sarg/languages/Polish
+etc/sarg/languages/English
+etc/sarg/languages/French
+etc/sarg/languages/German
+etc/sarg/languages/Hungarian
+etc/sarg/languages/Indonesian
etc/sarg/languages/Italian
-etc/sarg/languages/Portuguese
etc/sarg/languages/Japanese
-etc/sarg/languages/Hungarian
etc/sarg/languages/Latvian
+etc/sarg/languages/Polish
+etc/sarg/languages/Portuguese
+etc/sarg/languages/Romanian
+etc/sarg/languages/Russian_koi8
etc/sarg/languages/Russian_windows1251
etc/sarg/languages/Serbian
-etc/sarg/languages/Indonesian
-etc/sarg/languages/English
etc/sarg/languages/Spanish
etc/sarg/languages/Turkish
etc/sarg/languages/Ukrainian_windows1251
-etc/sarg/languages/.new
+etc/sarg/sarg-php/COPYING
+etc/sarg/sarg-php/INSTALL
+etc/sarg/sarg-php/LANGUAGES
+etc/sarg/sarg-php/language.php
+etc/sarg/sarg-php/locale/en_EN/LC_MESSAGES/messages.mo
+etc/sarg/sarg-php/locale/en_EN/LC_MESSAGES/messages.po
+etc/sarg/sarg-php/locale/pt_BR/LC_MESSAGES/messages.mo
+etc/sarg/sarg-php/locale/pt_BR/LC_MESSAGES/messages.po
+etc/sarg/sarg-php/sarg-block-it.php
+etc/sarg/sarg-php/sarg-squidguard-block.php
+etc/sarg/sarg-php/sarg-squidguard-block2.php
+etc/sarg/sarg-php/style.php
+etc/sarg/sarg-php/translate.this
+ at dirrm etc/sarg/sarg-php/locale/pt_BR/LC_MESSAGES
+ at dirrm etc/sarg/sarg-php/locale/pt_BR
+ at dirrm etc/sarg/sarg-php/locale/en_EN/LC_MESSAGES
+ at dirrm etc/sarg/sarg-php/locale/en_EN
+ at dirrm etc/sarg/sarg-php/locale
+ at dirrm etc/sarg/sarg-php
@dirrm etc/sarg/languages
+ at dirrm etc/sarg/images
+ at dirrm etc/sarg/fonts
@dirrm etc/sarg
>Release-Note:
>Audit-Trail:
>Unformatted:
More information about the freebsd-ports-bugs
mailing list