diff options
author | Adrian Chadd <adrian@FreeBSD.org> | 2003-01-31 09:02:49 +0000 |
---|---|---|
committer | Adrian Chadd <adrian@FreeBSD.org> | 2003-01-31 09:02:49 +0000 |
commit | 2314294cfdf6f0e974dbebc65dfeabdd493fb927 (patch) | |
tree | 1dd215003a71691ea3ad9f6ad13ae6c0e77717a3 /www | |
parent | Applied patch from PR. (diff) |
Grab the patch against squid24 from a PR..
PR: 42747
Notes
Notes:
svn path=/head/; revision=74340
Diffstat (limited to '')
-rw-r--r-- | www/squid/Makefile | 12 | ||||
-rw-r--r-- | www/squid25/Makefile | 12 | ||||
-rw-r--r-- | www/squid26/Makefile | 12 | ||||
-rw-r--r-- | www/squid27/Makefile | 12 | ||||
-rw-r--r-- | www/squid30/Makefile | 12 | ||||
-rw-r--r-- | www/squid31/Makefile | 12 |
6 files changed, 48 insertions, 24 deletions
diff --git a/www/squid/Makefile b/www/squid/Makefile index 38770314f07b..ab126f4c2d78 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 38770314f07b..ab126f4c2d78 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 38770314f07b..ab126f4c2d78 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 38770314f07b..ab126f4c2d78 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 38770314f07b..ab126f4c2d78 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 38770314f07b..ab126f4c2d78 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; \ |