From owner-svn-ports-branches@FreeBSD.ORG Thu Apr 24 17:58:56 2014 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 85D1C3F0; Thu, 24 Apr 2014 17:58:56 +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 582DE19F2; Thu, 24 Apr 2014 17:58:56 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s3OHwuTA057972; Thu, 24 Apr 2014 17:58:56 GMT (envelope-from madpilot@svn.freebsd.org) Received: (from madpilot@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s3OHwtDH057970; Thu, 24 Apr 2014 17:58:55 GMT (envelope-from madpilot@svn.freebsd.org) Message-Id: <201404241758.s3OHwtDH057970@svn.freebsd.org> From: Guido Falsi Date: Thu, 24 Apr 2014 17:58:55 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r352035 - branches/2014Q2/www/squidguard X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 24 Apr 2014 17:58:56 -0000 Author: madpilot Date: Thu Apr 24 17:58:55 2014 New Revision: 352035 URL: http://svnweb.freebsd.org/changeset/ports/352035 QAT: https://qat.redports.org/buildarchive/r352035/ Log: MFH: r351965 - Fix port when SQUID_UID != squid [1] While here fix a mistake I introduced in the plist. Submitted by: garga@ (via irc) [1] Approved by: portmgr (miwi) Modified: branches/2014Q2/www/squidguard/Makefile branches/2014Q2/www/squidguard/pkg-plist Directory Properties: branches/2014Q2/ (props changed) Modified: branches/2014Q2/www/squidguard/Makefile ============================================================================== --- branches/2014Q2/www/squidguard/Makefile Thu Apr 24 17:48:57 2014 (r352034) +++ branches/2014Q2/www/squidguard/Makefile Thu Apr 24 17:58:55 2014 (r352035) @@ -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: branches/2014Q2/www/squidguard/pkg-plist ============================================================================== --- branches/2014Q2/www/squidguard/pkg-plist Thu Apr 24 17:48:57 2014 (r352034) +++ branches/2014Q2/www/squidguard/pkg-plist Thu Apr 24 17:58:55 2014 (r352035) @@ -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