From owner-svn-ports-all@FreeBSD.ORG  Wed Apr 23 18:41:41 2014
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 1EFF7D5;
 Wed, 23 Apr 2014 18:41:41 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 0BCEF18BA;
 Wed, 23 Apr 2014 18:41:41 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s3NIfeSX080361;
 Wed, 23 Apr 2014 18:41:40 GMT
 (envelope-from madpilot@svn.freebsd.org)
Received: (from madpilot@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s3NIfeQD080359;
 Wed, 23 Apr 2014 18:41:40 GMT
 (envelope-from madpilot@svn.freebsd.org)
Message-Id: <201404231841.s3NIfeQD080359@svn.freebsd.org>
From: Guido Falsi <madpilot@FreeBSD.org>
Date: Wed, 23 Apr 2014 18:41:40 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r351965 - head/www/squidguard
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.17
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all/>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 23 Apr 2014 18:41:41 -0000

Author: madpilot
Date: Wed Apr 23 18:41:40 2014
New Revision: 351965
URL: http://svnweb.freebsd.org/changeset/ports/351965
QAT: https://qat.redports.org/buildarchive/r351965/

Log:
  - Fix port when SQUID_UID != squid [1]
  
  While here fix a mistake I introduced in the plist.
  
  Submitted by:	garga@ (via irc) [1]
  MFH:		2014Q2

Modified:
  head/www/squidguard/Makefile
  head/www/squidguard/pkg-plist

Modified: head/www/squidguard/Makefile
==============================================================================
--- head/www/squidguard/Makefile	Wed Apr 23 18:22:33 2014	(r351964)
+++ head/www/squidguard/Makefile	Wed Apr 23 18:41:40 2014	(r351965)
@@ -2,7 +2,7 @@
 
 PORTNAME=	squidGuard
 PORTVERSION=	1.4
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	www
 MASTER_SITES=	http://www.squidguard.org/Downloads/:a \
 		http://www.squidguard.org/Downloads/Contrib/:b
@@ -24,6 +24,7 @@ CONFIGURE_ARGS=	--with-db-inc=${BDB_INCL
 		--with-sg-config=${ETCDIR}/${PORTNAME}.conf \
 		--with-sg-dbhome=${DATADIR} \
 		--with-sg-logdir=${LOGDIR} \
+		--with-squiduser=${SQUID_UID} \
 		--exec-prefix=${PREFIX}
 CPPFLAGS+=	-I${PREFIX}/include -I${LOCALBASE}/include
 

Modified: head/www/squidguard/pkg-plist
==============================================================================
--- head/www/squidguard/pkg-plist	Wed Apr 23 18:22:33 2014	(r351964)
+++ head/www/squidguard/pkg-plist	Wed Apr 23 18:41:40 2014	(r351965)
@@ -75,5 +75,5 @@ etc/squid/squidGuard.conf.sample
 @exec mkdir -p %%DATADIR%% || true
 @exec mkdir -p %%LOGDIR%% || true
 %%PORTEXAMPLES%%@exec chown -R %%SQUID_UID%%:%%SQUID_GID%% %%LOGDIR%%
-@exec rmdir %%DATADIR%% 2>/dev/null || true
-@exec rmdir %%LOGDIR%% 2>/dev/null || true
+@unexec rmdir %%DATADIR%% 2>/dev/null || true
+@unexec rmdir %%LOGDIR%% 2>/dev/null || true