3 files changed, 17 insertions, 20 deletions

diff --git a/www/free-sa/Makefile b/www/free-sa/Makefile
index 3e96eb75e471..b9d05b4388ab 100644
--- a/www/free-sa/Makefile
+++ b/www/free-sa/Makefile
@@ -6,16 +6,13 @@
 #
 
 PORTNAME=	free-sa
-PORTVERSION=	1.5.0
-PORTREVISION=	1
+PORTVERSION=	1.5.1
 CATEGORIES=	www
 MASTER_SITES=	SF
 
 MAINTAINER=	toxa@toxahost.ru
 COMMENT=	Statistic analyzer for daemons log files similar to SARG
 
-USE_GMAKE=	yes
-
 PORTDOCS=	COPYING INSTALL README README.DEV ChangeLog FAQ THANKS
 DOCSDIR=	share/doc/free-sa-${DISTVERSION}
 
diff --git a/www/free-sa/distinfo b/www/free-sa/distinfo
index b619dd03ebd3..716ca4d3d89f 100644
--- a/www/free-sa/distinfo
+++ b/www/free-sa/distinfo
@@ -1,3 +1,3 @@
-MD5 (free-sa-1.5.0.tar.gz) = 247d942cbe5cbb86c7d2fc1616646c4c
-SHA256 (free-sa-1.5.0.tar.gz) = 740641a99a8d4c7555ba8719795779a6bf65a6d356950b6f4cdb1db91e2aa9af
-SIZE (free-sa-1.5.0.tar.gz) = 81469
+MD5 (free-sa-1.5.1.tar.gz) = b92c990932f9feae8f4f73e8ffef69fa
+SHA256 (free-sa-1.5.1.tar.gz) = 4d3fd13ee288c892e335833376a563a0ad2ba3ac240af00bb177a27311ad0d07
+SIZE (free-sa-1.5.1.tar.gz) = 81984
diff --git a/www/free-sa/pkg-plist b/www/free-sa/pkg-plist
index 6115aa6ec85b..b76ee1b5348c 100644
--- a/www/free-sa/pkg-plist
+++ b/www/free-sa/pkg-plist
@@ -1,3 +1,4 @@
+@unexec /bin/rm -f %D/www/data/free-sa/themes/default
 bin/free-sa
 etc/free-sa/downloads-archives.sample
 etc/free-sa/downloads-cddvd.sample
@@ -7,16 +8,16 @@ etc/free-sa/downloads-code.sample
 etc/free-sa/downloads-video.sample
 etc/free-sa/downloads.sample
 etc/free-sa/free-sa.conf.sample
-share/free-sa/be.cp1251
-share/free-sa/cs.iso88592
-share/free-sa/de.iso88591
-share/free-sa/en.iso88591
-share/free-sa/et.iso88591
-share/free-sa/fr.iso88591
-share/free-sa/it.iso88591
-share/free-sa/ru.koi8r
-share/free-sa/sk.iso88592
-share/free-sa/es.iso88591
+%%DATADIR%%/be.cp1251
+%%DATADIR%%/cs.iso88592
+%%DATADIR%%/de.iso88591
+%%DATADIR%%/en.iso88591
+%%DATADIR%%/et.iso88591
+%%DATADIR%%/fr.iso88591
+%%DATADIR%%/it.iso88591
+%%DATADIR%%/ru.koi8r
+%%DATADIR%%/sk.iso88592
+%%DATADIR%%/es.iso88591
 www/data/free-sa/sa.js
 www/data/free-sa/c.png
 www/data/free-sa/d.png
@@ -26,7 +27,6 @@ www/data/free-sa/gsa.css
 www/data/free-sa/lsa.css
 www/data/free-sa/rsa.css
 www/data/free-sa/cgi-bin/free-sa.cgi
-www/data/free-sa/themes/default
 www/data/free-sa/themes/rbsec/c.png
 www/data/free-sa/themes/rbsec/d.png
 www/data/free-sa/themes/rbsec/g.png
@@ -63,8 +63,7 @@ www/data/free-sa/themes/blues/gsa.css
 www/data/free-sa/themes/blues/lsa.css
 www/data/free-sa/themes/blues/rsa.css
 www/data/free-sa/themes/sa.js
-@dirrm etc/free-sa
-@dirrm share/free-sa
+@dirrm %%DATADIR%%
 @dirrm www/data/free-sa/themes/rbsec
 @dirrm www/data/free-sa/themes/sarg
 @dirrm www/data/free-sa/themes/silver
@@ -73,4 +72,5 @@ www/data/free-sa/themes/sa.js
 @dirrm www/data/free-sa/themes
 @dirrm www/data/free-sa/cgi-bin
 @dirrm www/data/free-sa
+@dirrm etc/free-sa
 @dirrmtry www/data