- Fixed pkglint warnings.

- Moved the binary from sbin to bin, since the manual page is also in
  category 1.
- Replaced /var with ${VARBASE}.
- Sorted PLIST.
- Bumped PKGREVISION.

2 files changed, 23 insertions, 20 deletions

diff --git a/www/sarg/Makefile b/www/sarg/Makefile
index 70a5bb156cc..850af7dba8d 100644
--- a/www/sarg/Makefile
+++ b/www/sarg/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.10 2006/06/23 16:23:10 minskim Exp $
+# $NetBSD: Makefile,v 1.11 2006/07/10 03:46:49 rillig Exp $
 
 DISTNAME=		sarg-2.1
+PKGREVISION=		1
 CATEGORIES=		www
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=sarg/}
 
@@ -13,7 +14,7 @@ COMMENT=		Squid-Cache proxy server Analysis Report Generator
 
 GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--with-gcc					\
-			--enable-bindir=${PREFIX}/sbin			\
+			--enable-bindir=${PREFIX}/bin			\
 			--enable-mandir=${PREFIX}/${PKGMANDIR}/man1	\
 			--enable-sysconfdir=${PKG_SYSCONFDIR:Q}
 
@@ -24,13 +25,15 @@ EGDIR=			${PREFIX}/share/examples/sarg
 EGLNG=			${EGDIR}/languages
 CFLNG=			${PKG_SYSCONFDIR}/languages
 
-SQUID_ACCESSLOG?=	/var/squid/logs/access.log
-SARG_REPORTSDIR?=	/var/sarg
+.include "../../mk/bsd.prefs.mk"
+
+SQUID_ACCESSLOG?=	${VARBASE}/squid/logs/access.log
+SARG_REPORTSDIR?=	${VARBASE}/sarg
 
 OWN_DIRS+=		${SARG_REPORTSDIR} ${CFLNG}
 
 SUBST_CLASSES+=		sargconf
-SUBST_MESSAGE.sargconf=	[Adjust values in SARG configuration files]
+SUBST_MESSAGE.sargconf=	Adjusting values in SARG configuration files.
 SUBST_STAGE.sargconf=	post-configure
 SUBST_FILES.sargconf=	sarg.conf sarg.1
 SUBST_SED.sargconf=	-e 's,@PKG_SYSCONFDIR@,${PKG_SYSCONFDIR},g'
@@ -73,8 +76,8 @@ CONF_FILES=		${EGDIR}/sarg.conf ${PKG_SYSCONFDIR}/sarg.conf	\
 				${CFLNG}/Ukrainian_windows1251
 
 post-extract:
-			@${FIND} ${WRKSRC} -type d -exec ${CHMOD} +x {} \;
-			@${RM} ${WRKSRC}/languages/.new
+	${FIND} ${WRKSRC} -type d -exec ${CHMOD} +x {} \;
+	${RM} ${WRKSRC}/languages/.new
 
 .include "../../converters/libiconv/buildlink3.mk"
 .include "../../graphics/gd/buildlink3.mk"
diff --git a/www/sarg/PLIST b/www/sarg/PLIST
index 157eff2437f..3ebf5384281 100644
--- a/www/sarg/PLIST
+++ b/www/sarg/PLIST
@@ -1,7 +1,6 @@
-@comment $NetBSD: PLIST,v 1.2 2006/05/22 03:44:55 ben Exp $
-sbin/sarg
+@comment $NetBSD: PLIST,v 1.3 2006/07/10 03:46:49 rillig Exp $
+bin/sarg
 man/man1/sarg.1
-share/examples/sarg/sarg.conf
 share/examples/sarg/css.tpl
 share/examples/sarg/exclude_codes
 share/examples/sarg/fonts/FreeSans.ttf
@@ -27,9 +26,9 @@ share/examples/sarg/languages/Latvian
 share/examples/sarg/languages/Polish
 share/examples/sarg/languages/Portuguese
 share/examples/sarg/languages/Romanian
+share/examples/sarg/languages/Russian_UTF-8
 share/examples/sarg/languages/Russian_koi8
 share/examples/sarg/languages/Russian_windows1251
-share/examples/sarg/languages/Russian_UTF-8
 share/examples/sarg/languages/Serbian
 share/examples/sarg/languages/Slovak
 share/examples/sarg/languages/Spanish
@@ -53,17 +52,18 @@ share/examples/sarg/sarg-php/sarg-squidguard-block.php
 share/examples/sarg/sarg-php/sarg-squidguard-block2.php
 share/examples/sarg/sarg-php/style.php
 share/examples/sarg/sarg-php/translate.this
-@dirrm share/examples/sarg/fonts
-@dirrm share/examples/sarg/images
-@dirrm share/examples/sarg/languages
-@dirrm share/examples/sarg/sarg-php/locale/en_EN/LC_MESSAGES
-@dirrm share/examples/sarg/sarg-php/locale/en_EN
-@dirrm share/examples/sarg/sarg-php/locale/fr/LC_MESSAGES
-@dirrm share/examples/sarg/sarg-php/locale/fr
-@dirrm share/examples/sarg/sarg-php/locale/pt_BR/LC_MESSAGES
-@dirrm share/examples/sarg/sarg-php/locale/pt_BR
+share/examples/sarg/sarg.conf
 @dirrm share/examples/sarg/sarg-php/locale/ru/LC_MESSAGES
 @dirrm share/examples/sarg/sarg-php/locale/ru
+@dirrm share/examples/sarg/sarg-php/locale/pt_BR/LC_MESSAGES
+@dirrm share/examples/sarg/sarg-php/locale/pt_BR
+@dirrm share/examples/sarg/sarg-php/locale/fr/LC_MESSAGES
+@dirrm share/examples/sarg/sarg-php/locale/fr
+@dirrm share/examples/sarg/sarg-php/locale/en_EN/LC_MESSAGES
+@dirrm share/examples/sarg/sarg-php/locale/en_EN
 @dirrm share/examples/sarg/sarg-php/locale
 @dirrm share/examples/sarg/sarg-php
+@dirrm share/examples/sarg/languages
+@dirrm share/examples/sarg/images
+@dirrm share/examples/sarg/fonts
 @dirrm share/examples/sarg