4 files changed, 59 insertions, 21 deletions

diff --git a/www/sarg/Makefile b/www/sarg/Makefile
index 7700b1e7fbf9..7798489fb671 100644
--- a/www/sarg/Makefile
+++ b/www/sarg/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	sarg
-PORTVERSION=	2.2.7.1
-PORTREVISION=	3
+PORTVERSION=	2.3.1
 CATEGORIES=	www
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
 
@@ -18,6 +17,7 @@ OPTIONS=	GD "Enable GD support" on
 
 USE_GCC=	4.2+
 USE_ICONV=	yes
+USE_GMAKE=	yes
 USE_GETTEXT=	yes
 GNU_CONFIGURE=	yes
 MAKE_JOBS_SAFE=	yes
@@ -26,7 +26,6 @@ LDFLAGS+=	-L${LOCALBASE}/lib
 CONFIGURE_ENV=	CC="${CC}" LDFLAGS="${LDFLAGS}"
 CONFIGURE_ARGS=	--sysconfdir="${PREFIX}/etc/${PORTNAME}" \
 		--enable-sargphp="${PREFIX}/etc/${PORTNAME}" \
-		--enable-languagedir="${PREFIX}/etc/${PORTNAME}/languages" \
 		--enable-fontdir="${PREFIX}/etc/${PORTNAME}/fonts" \
 		--enable-imagedir="${PREFIX}/etc/${PORTNAME}/images"
 
@@ -42,11 +41,15 @@ CC=	gcc
 .endif
 
 .if !defined(WITHOUT_GD)
-GD_PORT?=	graphics/gd
-LIB_DEPENDS+=	gd.4:${PORTSDIR}/${GD_PORT}
+LIB_DEPENDS+=	gd.4:${PORTSDIR}/graphics/gd
 .endif
 
 pre-install:
 	${STRIP_CMD} ${WRKSRC}/sarg
 
+post-install:
+	@${RM} ${WRKSRC}/languages/.new
+	@${MKDIR} ${PREFIX}/etc/${PORTNAME}/languages
+	${INSTALL_DATA} ${WRKSRC}/languages/* ${PREFIX}/etc/${PORTNAME}/languages
+
 .include <bsd.port.post.mk>
diff --git a/www/sarg/distinfo b/www/sarg/distinfo
index e4a01ebcc3d2..d2efc0a117df 100644
--- a/www/sarg/distinfo
+++ b/www/sarg/distinfo
@@ -1,2 +1,2 @@
-SHA256 (sarg-2.2.7.1.tar.gz) = 209398e7690876ef9df04ba7f0b4b47c91ea8cdcfd7a54d78f15b5548a2dd32e
-SIZE (sarg-2.2.7.1.tar.gz) = 713786
+SHA256 (sarg-2.3.1.tar.gz) = 2228d5dea0e9ce7a3996e0ec238a4e8ca0681e809eda85e9bf334e76cd621d0f
+SIZE (sarg-2.3.1.tar.gz) = 1073514
diff --git a/www/sarg/files/patch-Makefile.in b/www/sarg/files/patch-Makefile.in
index 679142c02924..b6c12db24719 100644
--- a/www/sarg/files/patch-Makefile.in
+++ b/www/sarg/files/patch-Makefile.in
@@ -1,17 +1,29 @@
---- Makefile.in.orig	2010-01-20 09:19:16.000000000 -0200
-+++ Makefile.in	2010-02-08 09:58:51.000000000 -0200
-@@ -9,7 +9,7 @@
- CC 		= @CC@
- BINDIR   	= @bindir@
- IBINDIR   	= -DBINDIR=\"@bindir@\"
--MANDIR		= @mandir@
-+MANDIR		= @mandir@/man1
- SYSCONFDIR	= @sysconfdir@
- SARGPHPDIR	= @SARGPHPDIR@
- LANGDIR		= @LANGDIR@
-@@ -84,12 +84,11 @@
+--- Makefile.in.orig	2010-08-03 13:41:57.000000000 -0400
++++ Makefile.in	2011-06-11 22:34:52.000000000 -0400
+@@ -8,7 +8,7 @@
+ docdir      = @docdir@
+ CC          = @CC@
+ BINDIR      = @bindir@
+-MANDIR      = @mandir@
++MANDIR      = @mandir@/man1
+ SYSCONFDIR  = @sysconfdir@
+ SARGPHPDIR  = @SARGPHPDIR@
+ FONTDIR     = @FONTDIR@
+@@ -23,7 +23,7 @@
+ CPPFLAGS    = @CPPFLAGS@
+ LDFLAGS     = @LDFLAGS@
+ DEFS        = $(IBINDIR) $(ISYSCONFDIR) $(IFONTDIR) $(IIMAGEDIR) $(ISARGPHPDIR) $(ILOCALEDIR) @DEFS@
+-LIBS        = @LIBS@
++LIBS        = @LIBS@ -lintl
+ SRCDIR      = .
+ VPATH       = .
+ INSTALL     = cp
+@@ -77,14 +77,13 @@
+ 		mkdir -p $(DESTDIR)$(IMAGEDIR); \
+ 	fi
  	$(INSTALL_PROGRAM) sarg $(DESTDIR)$(BINDIR)/sarg
- 	chmod 755 $(DESTDIR)$(BINDIR)/sarg
+-	chmod 755 $(DESTDIR)$(BINDIR)/sarg
++	chmod 644 $(DESTDIR)$(BINDIR)/sarg
  	$(INSTALL_PROGRAM) sarg.1 $(DESTDIR)$(MANDIR)/sarg.1
 -	chmod 755 $(DESTDIR)$(MANDIR)/sarg.1
 +	chmod 644 $(DESTDIR)$(MANDIR)/sarg.1
@@ -22,5 +34,5 @@
 -	else \
 -		cp sarg.conf $(DESTDIR)$(SYSCONFDIR)/sarg.conf.default; \
  	fi
- 	cp -r ./languages/* $(DESTDIR)$(LANGDIR);
  	cp ./exclude_codes $(DESTDIR)$(SYSCONFDIR);
+ 	cp ./user_limit_block $(DESTDIR)$(SYSCONFDIR);
diff --git a/www/sarg/pkg-plist b/www/sarg/pkg-plist
index 346477f095b5..fd3cf83b81cb 100644
--- a/www/sarg/pkg-plist
+++ b/www/sarg/pkg-plist
@@ -12,6 +12,7 @@ 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/Afrikaans
 etc/sarg/languages/Bulgarian_windows1251
 etc/sarg/languages/Catalan
 etc/sarg/languages/Czech
@@ -57,6 +58,28 @@ etc/sarg/sarg-php/sarg-squidguard-block2.php
 etc/sarg/sarg-php/style.php
 etc/sarg/sarg-php/translate.this
 etc/sarg/user_limit_block
+share/locale/bg/LC_MESSAGES/sarg.mo
+share/locale/ca/LC_MESSAGES/sarg.mo
+share/locale/cs/LC_MESSAGES/sarg.mo
+share/locale/de/LC_MESSAGES/sarg.mo
+share/locale/el/LC_MESSAGES/sarg.mo
+share/locale/es/LC_MESSAGES/sarg.mo
+share/locale/fr/LC_MESSAGES/sarg.mo
+share/locale/hu/LC_MESSAGES/sarg.mo
+share/locale/id/LC_MESSAGES/sarg.mo
+share/locale/it/LC_MESSAGES/sarg.mo
+share/locale/ja/LC_MESSAGES/sarg.mo
+share/locale/lv/LC_MESSAGES/sarg.mo
+share/locale/nl/LC_MESSAGES/sarg.mo
+share/locale/pl/LC_MESSAGES/sarg.mo
+share/locale/pt/LC_MESSAGES/sarg.mo
+share/locale/ro/LC_MESSAGES/sarg.mo
+share/locale/ru/LC_MESSAGES/sarg.mo
+share/locale/sk/LC_MESSAGES/sarg.mo
+share/locale/sr/LC_MESSAGES/sarg.mo
+share/locale/tr/LC_MESSAGES/sarg.mo
+share/locale/uk/LC_MESSAGES/sarg.mo
+share/locale/zh_CN/LC_MESSAGES/sarg.mo
 @dirrm etc/sarg/sarg-php/locale/ru/LC_MESSAGES
 @dirrm etc/sarg/sarg-php/locale/ru
 @dirrm etc/sarg/sarg-php/locale/pt_BR/LC_MESSAGES