svn commit: r352035 - branches/2014Q2/www/squidguard

[Guido Falsi]

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%%
- at exec rmdir %%DATADIR%% 2>/dev/null || true
- at exec rmdir %%LOGDIR%% 2>/dev/null || true
+ at unexec rmdir %%DATADIR%% 2>/dev/null || true
+ at unexec rmdir %%LOGDIR%% 2>/dev/null || true