aboutsummaryrefslogtreecommitdiffstats
path: root/www
diff options
context:
space:
mode:
authormadpilot <madpilot@FreeBSD.org>2014-04-24 02:41:40 +0800
committermadpilot <madpilot@FreeBSD.org>2014-04-24 02:41:40 +0800
commitbac83fdadfde3f7928b46f0675c9337a0b3c043c (patch)
tree0f7d1c5f7743c9c0d9f352ad17fdd3a46043734d /www
parent3f8d465bac062b36d6822ce7edfd2667e1405f35 (diff)
downloadfreebsd-ports-gnome-bac83fdadfde3f7928b46f0675c9337a0b3c043c.tar.gz
freebsd-ports-gnome-bac83fdadfde3f7928b46f0675c9337a0b3c043c.tar.zst
freebsd-ports-gnome-bac83fdadfde3f7928b46f0675c9337a0b3c043c.zip
- 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
Diffstat (limited to 'www')
-rw-r--r--www/squidguard/Makefile3
-rw-r--r--www/squidguard/pkg-plist4
2 files changed, 4 insertions, 3 deletions
diff --git a/www/squidguard/Makefile b/www/squidguard/Makefile
index e03d274ba317..ee1c29ce5c5f 100644
--- a/www/squidguard/Makefile
+++ b/www/squidguard/Makefile
@@ -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_INCLUDE_DIR} \
--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
diff --git a/www/squidguard/pkg-plist b/www/squidguard/pkg-plist
index 79f44efb4ad8..94736a84afd5 100644
--- a/www/squidguard/pkg-plist
+++ b/www/squidguard/pkg-plist
@@ -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