5 files changed, 47 insertions, 9 deletions

diff --git a/www/sarg/Makefile b/www/sarg/Makefile
index 52de1fa3e591..b97993e0675c 100644
--- a/www/sarg/Makefile
+++ b/www/sarg/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	sarg
-PORTVERSION=	1.2.2.1
+PORTVERSION=	1.4.1
 CATEGORIES=	www
 MASTER_SITES=	http://web.onda.com.br/orso/
 
@@ -16,4 +16,6 @@ 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
 
+MAN1=		sarg.1
+
 .include <bsd.port.mk>
diff --git a/www/sarg/distinfo b/www/sarg/distinfo
index c943c1bc9134..557ad6af25e9 100644
--- a/www/sarg/distinfo
+++ b/www/sarg/distinfo
@@ -1 +1 @@
-MD5 (sarg-1.2.2.1.tar.gz) = f8b78d13d96793eb1c9a024bf9d816a5
+MD5 (sarg-1.4.1.tar.gz) = 357f8e175746e19dac4a61f4a2ef0aaf
diff --git a/www/sarg/files/patch-Makefile.in b/www/sarg/files/patch-Makefile.in
new file mode 100644
index 000000000000..47fb3b7e58c5
--- /dev/null
+++ b/www/sarg/files/patch-Makefile.in
@@ -0,0 +1,11 @@
+--- Makefile.in.orig	Fri Apr 25 20:20:55 2003
++++ Makefile.in	Wed May 14 11:51:27 2003
+@@ -58,7 +58,7 @@
+ 	$(INSTALL_PROGRAM) sarg $(BINDIR)/sarg
+ 	chmod 755 $(BINDIR)/sarg
+ 	$(INSTALL_PROGRAM) sarg.1 $(MANDIR)/sarg.1
+-	chmod 755 $(MANDIR)/sarg.1
++	chmod 644 $(MANDIR)/sarg.1
+ 	@if test ! -f $(SYSCONFDIR)/sarg.conf; then \
+ 		echo "cp $(SYSCONFDIR)/sarg.conf"; \
+ 		cp sarg.conf $(SYSCONFDIR)/sarg.conf; \
diff --git a/www/sarg/pkg-descr b/www/sarg/pkg-descr
index 7d209c0340ba..a06223d028de 100644
--- a/www/sarg/pkg-descr
+++ b/www/sarg/pkg-descr
@@ -1,6 +1,7 @@
-sqmgrlog is a Squid analisys report generator that allow you to
-view "where" your users are going through squid.  sqmgrlog generates
-reports in html, with many fields including users, IP addresses, bytes,
-sites and times.
+SARG is a Squid Analysis Report Generator that allow you to view "where"
+your users are going to on the Internet. It generates reports in html,
+with many fields, like: users, IP Addresses, bytes, sites and times.
 
-WWW: http://web.onda.com.br/orso/sqmgrlog.html
+Formely known as sqmgrlog.
+
+WWW: http://web.onda.com.br/orso/sarg.html
diff --git a/www/sarg/pkg-plist b/www/sarg/pkg-plist
index 74c50569a785..b1a7f7fbee8d 100644
--- a/www/sarg/pkg-plist
+++ b/www/sarg/pkg-plist
@@ -1,4 +1,28 @@
 bin/sarg
-@unexec if cmp -s %D/etc/sarg/sarg.conf.default %D/etc/sarg/sarg.conf; then rm -f %D/etc/sarg.conf; fi
+@unexec if cmp -s %D/etc/sarg/sarg.conf %D/etc/sarg/sarg.conf.default; then rm -f %D/etc/sarg.conf; fi
+@exec [ ! -f %B/sarg.conf ] || cp -p %B/sarg.conf.default %B/sarg.conf
 etc/sarg/sarg.conf.default
-@exec if [ ! -f %D/etc/sarg/sarg.conf ]; then cp %D/etc/sarg/%f %D/etc/sarg/sarg.conf; fi
+etc/sarg/exclude_codes
+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/Italian
+etc/sarg/languages/Portuguese
+etc/sarg/languages/Japanese
+etc/sarg/languages/Hungarian
+etc/sarg/languages/Latvian
+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
+@dirrm etc/sarg/languages