- Update to 2.0.1

PR:		ports/73971
Submitted by:	Maxim Tuliuk <mt@primats.org.ua> (maintainer)

4 files changed, 100 insertions, 20 deletions

diff --git a/www/sarg/Makefile b/www/sarg/Makefile
index cd30178704c3..5b705fd99687 100644
--- a/www/sarg/Makefile
+++ b/www/sarg/Makefile
@@ -6,24 +6,23 @@
 #
 
 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@primats.org.ua
 COMMENT=	Squid log analyzer and HTML report generator
 
 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 --git a/www/sarg/distinfo b/www/sarg/distinfo
index 2db3732b9ac2..a3ba20102c66 100644
--- a/www/sarg/distinfo
+++ b/www/sarg/distinfo
@@ -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 --git a/www/sarg/files/patch-util.c b/www/sarg/files/patch-util.c
new file mode 100644
index 000000000000..10bccaabbac6
--- /dev/null
+++ b/www/sarg/files/patch-util.c
@@ -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 --git a/www/sarg/pkg-plist b/www/sarg/pkg-plist
index 9f30edca9f7f..dafd1cc25e96 100644
--- a/www/sarg/pkg-plist
+++ b/www/sarg/pkg-plist
@@ -2,28 +2,55 @@ bin/sarg
 @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
+@dirrm etc/sarg/sarg-php/locale/pt_BR/LC_MESSAGES
+@dirrm etc/sarg/sarg-php/locale/pt_BR
+@dirrm etc/sarg/sarg-php/locale/en_EN/LC_MESSAGES
+@dirrm etc/sarg/sarg-php/locale/en_EN
+@dirrm etc/sarg/sarg-php/locale
+@dirrm etc/sarg/sarg-php
 @dirrm etc/sarg/languages
+@dirrm etc/sarg/images
+@dirrm etc/sarg/fonts
 @dirrm etc/sarg