diff --git a/www/sarg/Makefile b/www/sarg/Makefile
index 861f86765372..c64e85ddb81e 100644
--- a/www/sarg/Makefile
+++ b/www/sarg/Makefile
@@ -1,45 +1,45 @@
 PORTNAME=	sarg
 PORTVERSION=	2.4.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	www
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	garga@FreeBSD.org
 COMMENT=	Squid log analyzer and HTML report generator
 WWW=		https://sarg.sourceforge.net/
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 OPTIONS_DEFINE=	GD PHP NLS PCRE LDAP ICONV
 OPTIONS_DEFAULT=GD PHP PCRE LDAP ICONV
 OPTIONS_SUB=	yes
 
 PHP_DESC=	Install PHP for reporting generating
 
 USES=		autoreconf gmake
-GNU_CONFIGURE=	yes
+HAS_CONFIGURE=	yes
 CONFIGURE_ARGS=	--sysconfdir="${ETCDIR}" \
 		--enable-fontdir="${ETCDIR}/fonts" \
 		--enable-imagedir="${ETCDIR}/images"
 CPPFLAGS+=	-I${LOCALBASE}/include
 LIBS+=		-L${LOCALBASE}/lib
 CFLAGS+=	-fcommon
 
 NLS_USES=		gettext
 NLS_USES_OFF=		gettext-tools
 NLS_CONFIGURE_ENABLE=	nls
 NLS_LIBS=		-lintl
 GD_CONFIGURE_WITH=	gd
 GD_LIB_DEPENDS=		libgd.so:graphics/gd
 PHP_CONFIGURE_ON=	--enable-sargphp="${ETCDIR}"
 PHP_CONFIGURE_OFF=	--disable-sargphp
 PCRE_CONFIGURE_WITH=	pcre
 PCRE_LIB_DEPENDS=	libpcre.so:devel/pcre
 LDAP_USES=		ldap
 LDAP_CONFIGURE_WITH=	ldap
 ICONV_USES=		iconv
 ICONV_CONFIGURE_WITH=	iconv
 ICONV_LDFLAGS=		${ICONV_LIB}
 
 .include <bsd.port.mk>
diff --git a/www/sarg/pkg-plist b/www/sarg/pkg-plist
index 62adea631555..ec3212c2a040 100644
--- a/www/sarg/pkg-plist
+++ b/www/sarg/pkg-plist
@@ -1,61 +1,61 @@
 bin/sarg
 @sample etc/sarg/sarg.conf.sample
 etc/sarg/css.tpl
 etc/sarg/exclude_codes
 etc/sarg/fonts/DejaVuSans.ttf
 etc/sarg/fonts/FreeSans.ttf
 etc/sarg/fonts/README
 etc/sarg/fonts/license
 etc/sarg/images/datetime.png
 etc/sarg/images/graph.png
 etc/sarg/images/sarg-squidguard-block.png
 etc/sarg/images/sarg.png
-man/man1/sarg.1.gz
+share/man/man1/sarg.1.gz
 %%PHP%%etc/sarg/sarg-php/COPYING
 %%PHP%%etc/sarg/sarg-php/INSTALL
 %%PHP%%etc/sarg/sarg-php/LANGUAGES
 %%PHP%%etc/sarg/sarg-php/config.php.inc
 %%PHP%%etc/sarg/sarg-php/locale/en_EN/LC_MESSAGES/messages.mo
 %%PHP%%etc/sarg/sarg-php/locale/en_EN/LC_MESSAGES/messages.po
 %%PHP%%etc/sarg/sarg-php/locale/es/LC_MESSAGES/messages.mo
 %%PHP%%etc/sarg/sarg-php/locale/es/LC_MESSAGES/messages.po
 %%PHP%%etc/sarg/sarg-php/locale/fr/LC_MESSAGES/messages.mo
 %%PHP%%etc/sarg/sarg-php/locale/fr/LC_MESSAGES/messages.po
 %%PHP%%etc/sarg/sarg-php/locale/pt_BR/LC_MESSAGES/messages.mo
 %%PHP%%etc/sarg/sarg-php/locale/pt_BR/LC_MESSAGES/messages.po
 %%PHP%%etc/sarg/sarg-php/locale/ru/LC_MESSAGES/messages.mo
 %%PHP%%etc/sarg/sarg-php/locale/ru/LC_MESSAGES/messages.po
 %%PHP%%etc/sarg/sarg-php/sarg-block-it.php
 %%PHP%%etc/sarg/sarg-php/sarg-realtime.php
 %%PHP%%etc/sarg/sarg-php/sarg-squidguard-block.php
 %%PHP%%etc/sarg/sarg-php/sarg-squidguard-block2.php
 %%PHP%%etc/sarg/sarg-php/style.php
 %%PHP%%etc/sarg/sarg-php/translate.this
 %%PHP%%etc/sarg/sarg-php/update-mo.sh
 %%PHP%%etc/sarg/sarg-php/update-po.sh
 %%PHP%%etc/sarg/sarg-php/url_validator.php.inc
 etc/sarg/user_limit_block
 %%NLS%%share/locale/bg/LC_MESSAGES/sarg.mo
 %%NLS%%share/locale/ca/LC_MESSAGES/sarg.mo
 %%NLS%%share/locale/cs/LC_MESSAGES/sarg.mo
 %%NLS%%share/locale/da/LC_MESSAGES/sarg.mo
 %%NLS%%share/locale/de/LC_MESSAGES/sarg.mo
 %%NLS%%share/locale/el/LC_MESSAGES/sarg.mo
 %%NLS%%share/locale/es/LC_MESSAGES/sarg.mo
 %%NLS%%share/locale/fr/LC_MESSAGES/sarg.mo
 %%NLS%%share/locale/hu/LC_MESSAGES/sarg.mo
 %%NLS%%share/locale/id/LC_MESSAGES/sarg.mo
 %%NLS%%share/locale/it/LC_MESSAGES/sarg.mo
 %%NLS%%share/locale/ja/LC_MESSAGES/sarg.mo
 %%NLS%%share/locale/lv/LC_MESSAGES/sarg.mo
 %%NLS%%share/locale/nl/LC_MESSAGES/sarg.mo
 %%NLS%%share/locale/pl/LC_MESSAGES/sarg.mo
 %%NLS%%share/locale/pt/LC_MESSAGES/sarg.mo
 %%NLS%%share/locale/pt_BR/LC_MESSAGES/sarg.mo
 %%NLS%%share/locale/ro/LC_MESSAGES/sarg.mo
 %%NLS%%share/locale/ru/LC_MESSAGES/sarg.mo
 %%NLS%%share/locale/sk/LC_MESSAGES/sarg.mo
 %%NLS%%share/locale/sr/LC_MESSAGES/sarg.mo
 %%NLS%%share/locale/tr/LC_MESSAGES/sarg.mo
 %%NLS%%share/locale/uk/LC_MESSAGES/sarg.mo
 %%NLS%%share/locale/zh_CN/LC_MESSAGES/sarg.mo