Date: Mon, 12 Jun 2000 04:49:10 +0200 (CEST) From: dl@tyfon.net To: FreeBSD-gnats-submit@freebsd.org Subject: ports/19211: port updates www/squidguard Message-ID: <20000612024910.AF57A1C5CB@hq1.tyfon.net>
next in thread | raw e-mail | index | archive | help
>Number: 19211
>Category: ports
>Synopsis: port updates www/squidguard
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Sun Jun 11 19:50:01 PDT 2000
>Closed-Date:
>Last-Modified:
>Originator: Dan Larsson
>Release: FreeBSD 4.0-STABLE i386
>Organization:
Tyfon Svenska AB
>Environment:
FreeBSD 4.0-STABLE i386
>Description:
Changed port to handle user specified data locations
>How-To-Repeat:
>Fix:
diff -ru squidguard.orig/Makefile squidguard/Makefile
--- squidguard.orig/Makefile Mon Jun 12 02:29:01 2000
+++ squidguard/Makefile Mon Jun 12 04:18:25 2000
@@ -21,9 +21,18 @@
--with-db-lib=${PREFIX}/lib \
--with-sg-config=${PREFIX}/etc/squid/squidguard.conf \
--with-sg-dbhome=${DATADIR} \
- --with-sg-logdir=/var/log
+ --with-sg-logdir=${LOGDIR}
+### To change any of the below paths add it to your make arg
+
+.if !defined(DATADIR)
DATADIR= /var/db/${PORTNAME}
+.endif
+.if !defined(LOGDIR)
+LOGDIR= /var/log
+.endif
+
+PLIST_SUB= DATADIR=${DATADIR}
### To optimize squidGuard add OPTIMIZE=YES to your make arg
@@ -81,7 +90,8 @@
@if [ ! -f ${PREFIX}/etc/squid/squidguard.conf ] ; then \
${ECHO_MSG} "===> Installing sample configuration file" ; \
- ${SED} -e 's!%%DATADIR%%!${DATADIR}!' ${WRKSRC}/samples/sample.conf > \
+ ${SED} -e 's!%%DATADIR%%!${DATADIR}!' -e 's!%%LOGDIR%%!${LOGDIR}!' \
+ ${WRKSRC}/samples/sample.conf > \
${PREFIX}/etc/squid/squidguard.conf.sample ; \
${CHOWN} root.nobody ${PREFIX}/etc/squid/squidguard.conf.sample ; \
${CHMOD} 640 ${PREFIX}/etc/squid/squidguard.conf.sample ; \
@@ -89,6 +99,10 @@
else \
${ECHO_MSG} "===> Existing configuration file found - sample not installed" ; \
fi
+
+.if !exists(${LOGDIR})
+ @${MKDIR} ${LOGDIR}
+.endif
### View short howto message
diff -ru squidguard.orig/patches/patch-ac squidguard/patches/patch-ac
--- squidguard.orig/patches/patch-ac Sun Jun 11 21:47:47 2000
+++ squidguard/patches/patch-ac Mon Jun 12 03:46:36 2000
@@ -1,5 +1,5 @@
--- samples/sample.conf.in.orig Sun Jun 11 21:45:41 2000
-+++ samples/sample.conf.in Sun Jun 11 21:46:54 2000
++++ samples/sample.conf.in Sun Jun 12 03:44:13 2000
@@ -1,9 +1,9 @@
#
-# CONFIG FILE FOR SQUIDGUARD
@@ -9,7 +9,7 @@
-dbhome @prefix@/squidGuard/db
-logdir @prefix@/squidGuard/logs
+dbhome %%DATADIR%%
-+logdir /var/log
++logdir %%LOGDIR%%
#
# TIME RULES:
diff -ru squidguard.orig/pkg/PLIST squidguard/pkg/PLIST
--- squidguard.orig/pkg/PLIST Mon Jun 12 01:45:34 2000
+++ squidguard/pkg/PLIST Mon Jun 12 04:05:11 2000
@@ -10,32 +10,32 @@
share/doc/squidGuard/installation.txt
share/doc/squidGuard/squidGuard.gif
@dirrm share/doc/squidGuard
-@cwd /var/db/squidGuard
+@cwd %%DATADIR%%
ads/domains
ads/domains.db
ads/urls
ads/urls.db
-@dirrm ads
agressive/domains
agressive/domains.db
agressive/urls
agressive/urls.db
-@dirrm agressive
drugs/domains
drugs/domains.db
drugs/urls
drugs/urls.db
-@dirrm drugs
hacking/domains
hacking/domains.db
hacking/urls
hacking/urls.db
-@dirrm hacking
porn/domains
porn/domains.db
porn/expressions
porn/urls
porn/urls.db
+@dirrm ads
+@dirrm agressive
+@dirrm drugs
+@dirrm hacking
@dirrm porn
-@cwd /var/db
-@dirrm squidGuard
+@cwd /
+@dirrm %%DATADIR%%
>Release-Note:
>Audit-Trail:
>Unformatted:
To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20000612024910.AF57A1C5CB>