From 5075a92b7386209736997e0de280b10912bb507b Mon Sep 17 00:00:00 2001 From: adrian Date: Fri, 31 Jan 2003 09:02:49 +0000 Subject: Grab the patch against squid24 from a PR.. PR: 42747 --- www/squid/Makefile | 12 ++++++++---- www/squid25/Makefile | 12 ++++++++---- www/squid26/Makefile | 12 ++++++++---- www/squid27/Makefile | 12 ++++++++---- www/squid30/Makefile | 12 ++++++++---- www/squid31/Makefile | 12 ++++++++---- 6 files changed, 48 insertions(+), 24 deletions(-) (limited to 'www') diff --git a/www/squid/Makefile b/www/squid/Makefile index 3877031..ab126f4 100644 --- a/www/squid/Makefile +++ b/www/squid/Makefile @@ -121,10 +121,14 @@ post-install: strip ${PREFIX}/libexec/${file} ; \ fi .endfor - ${MKDIR} ${PREFIX}/squid/logs - ${CHOWN} nobody:nogroup ${PREFIX}/squid/logs - ${MKDIR} ${PREFIX}/squid/cache - ${CHOWN} nobody:nogroup ${PREFIX}/squid/cache + @if [ ! -d ${PREFIX}/squid/logs ]; then \ + ${MKDIR} ${PREFIX}/squid/logs; \ + ${CHOWN} nobody:nogroup ${PREFIX}/squid/logs; \ + fi + @if [ ! -d ${PREFIX}/squid/cache ]; then \ + ${MKDIR} ${PREFIX}/squid/cache; \ + ${CHOWN} nobody:nogroup ${PREFIX}/squid/cache; \ + fi @if [ ! -f ${PREFIX}/etc/rc.d/squid.sh ]; then \ ${ECHO} "Installing ${PREFIX}/etc/rc.d/squid.sh startup file."; \ ${INSTALL_SCRIPT} -m 751 ${FILESDIR}/squid.sh ${PREFIX}/etc/rc.d/squid.sh; \ diff --git a/www/squid25/Makefile b/www/squid25/Makefile index 3877031..ab126f4 100644 --- a/www/squid25/Makefile +++ b/www/squid25/Makefile @@ -121,10 +121,14 @@ post-install: strip ${PREFIX}/libexec/${file} ; \ fi .endfor - ${MKDIR} ${PREFIX}/squid/logs - ${CHOWN} nobody:nogroup ${PREFIX}/squid/logs - ${MKDIR} ${PREFIX}/squid/cache - ${CHOWN} nobody:nogroup ${PREFIX}/squid/cache + @if [ ! -d ${PREFIX}/squid/logs ]; then \ + ${MKDIR} ${PREFIX}/squid/logs; \ + ${CHOWN} nobody:nogroup ${PREFIX}/squid/logs; \ + fi + @if [ ! -d ${PREFIX}/squid/cache ]; then \ + ${MKDIR} ${PREFIX}/squid/cache; \ + ${CHOWN} nobody:nogroup ${PREFIX}/squid/cache; \ + fi @if [ ! -f ${PREFIX}/etc/rc.d/squid.sh ]; then \ ${ECHO} "Installing ${PREFIX}/etc/rc.d/squid.sh startup file."; \ ${INSTALL_SCRIPT} -m 751 ${FILESDIR}/squid.sh ${PREFIX}/etc/rc.d/squid.sh; \ diff --git a/www/squid26/Makefile b/www/squid26/Makefile index 3877031..ab126f4 100644 --- a/www/squid26/Makefile +++ b/www/squid26/Makefile @@ -121,10 +121,14 @@ post-install: strip ${PREFIX}/libexec/${file} ; \ fi .endfor - ${MKDIR} ${PREFIX}/squid/logs - ${CHOWN} nobody:nogroup ${PREFIX}/squid/logs - ${MKDIR} ${PREFIX}/squid/cache - ${CHOWN} nobody:nogroup ${PREFIX}/squid/cache + @if [ ! -d ${PREFIX}/squid/logs ]; then \ + ${MKDIR} ${PREFIX}/squid/logs; \ + ${CHOWN} nobody:nogroup ${PREFIX}/squid/logs; \ + fi + @if [ ! -d ${PREFIX}/squid/cache ]; then \ + ${MKDIR} ${PREFIX}/squid/cache; \ + ${CHOWN} nobody:nogroup ${PREFIX}/squid/cache; \ + fi @if [ ! -f ${PREFIX}/etc/rc.d/squid.sh ]; then \ ${ECHO} "Installing ${PREFIX}/etc/rc.d/squid.sh startup file."; \ ${INSTALL_SCRIPT} -m 751 ${FILESDIR}/squid.sh ${PREFIX}/etc/rc.d/squid.sh; \ diff --git a/www/squid27/Makefile b/www/squid27/Makefile index 3877031..ab126f4 100644 --- a/www/squid27/Makefile +++ b/www/squid27/Makefile @@ -121,10 +121,14 @@ post-install: strip ${PREFIX}/libexec/${file} ; \ fi .endfor - ${MKDIR} ${PREFIX}/squid/logs - ${CHOWN} nobody:nogroup ${PREFIX}/squid/logs - ${MKDIR} ${PREFIX}/squid/cache - ${CHOWN} nobody:nogroup ${PREFIX}/squid/cache + @if [ ! -d ${PREFIX}/squid/logs ]; then \ + ${MKDIR} ${PREFIX}/squid/logs; \ + ${CHOWN} nobody:nogroup ${PREFIX}/squid/logs; \ + fi + @if [ ! -d ${PREFIX}/squid/cache ]; then \ + ${MKDIR} ${PREFIX}/squid/cache; \ + ${CHOWN} nobody:nogroup ${PREFIX}/squid/cache; \ + fi @if [ ! -f ${PREFIX}/etc/rc.d/squid.sh ]; then \ ${ECHO} "Installing ${PREFIX}/etc/rc.d/squid.sh startup file."; \ ${INSTALL_SCRIPT} -m 751 ${FILESDIR}/squid.sh ${PREFIX}/etc/rc.d/squid.sh; \ diff --git a/www/squid30/Makefile b/www/squid30/Makefile index 3877031..ab126f4 100644 --- a/www/squid30/Makefile +++ b/www/squid30/Makefile @@ -121,10 +121,14 @@ post-install: strip ${PREFIX}/libexec/${file} ; \ fi .endfor - ${MKDIR} ${PREFIX}/squid/logs - ${CHOWN} nobody:nogroup ${PREFIX}/squid/logs - ${MKDIR} ${PREFIX}/squid/cache - ${CHOWN} nobody:nogroup ${PREFIX}/squid/cache + @if [ ! -d ${PREFIX}/squid/logs ]; then \ + ${MKDIR} ${PREFIX}/squid/logs; \ + ${CHOWN} nobody:nogroup ${PREFIX}/squid/logs; \ + fi + @if [ ! -d ${PREFIX}/squid/cache ]; then \ + ${MKDIR} ${PREFIX}/squid/cache; \ + ${CHOWN} nobody:nogroup ${PREFIX}/squid/cache; \ + fi @if [ ! -f ${PREFIX}/etc/rc.d/squid.sh ]; then \ ${ECHO} "Installing ${PREFIX}/etc/rc.d/squid.sh startup file."; \ ${INSTALL_SCRIPT} -m 751 ${FILESDIR}/squid.sh ${PREFIX}/etc/rc.d/squid.sh; \ diff --git a/www/squid31/Makefile b/www/squid31/Makefile index 3877031..ab126f4 100644 --- a/www/squid31/Makefile +++ b/www/squid31/Makefile @@ -121,10 +121,14 @@ post-install: strip ${PREFIX}/libexec/${file} ; \ fi .endfor - ${MKDIR} ${PREFIX}/squid/logs - ${CHOWN} nobody:nogroup ${PREFIX}/squid/logs - ${MKDIR} ${PREFIX}/squid/cache - ${CHOWN} nobody:nogroup ${PREFIX}/squid/cache + @if [ ! -d ${PREFIX}/squid/logs ]; then \ + ${MKDIR} ${PREFIX}/squid/logs; \ + ${CHOWN} nobody:nogroup ${PREFIX}/squid/logs; \ + fi + @if [ ! -d ${PREFIX}/squid/cache ]; then \ + ${MKDIR} ${PREFIX}/squid/cache; \ + ${CHOWN} nobody:nogroup ${PREFIX}/squid/cache; \ + fi @if [ ! -f ${PREFIX}/etc/rc.d/squid.sh ]; then \ ${ECHO} "Installing ${PREFIX}/etc/rc.d/squid.sh startup file."; \ ${INSTALL_SCRIPT} -m 751 ${FILESDIR}/squid.sh ${PREFIX}/etc/rc.d/squid.sh; \ -- cgit v1.1