diff options
| author | Peter Wemm <peter@FreeBSD.org> | 1996-11-06 16:37:26 +0000 |
|---|---|---|
| committer | Peter Wemm <peter@FreeBSD.org> | 1996-11-06 16:37:26 +0000 |
| commit | a6d6133eb72fcd6b8e86a25adeb96df2174b83e1 (patch) | |
| tree | c0f8e957cc2d4ccbd4c9df42903cc906fe942f7d /www | |
| parent | Upgrade to version 3.2 (diff) | |
Update from squid-1.0.0 to 1.0.20. There are a large number of bug fixes
and stability measures.
This port installs in a "FreeBSD-native" tree (like apache) rather than
with a mini hierarchy under /usr/local/squid/{bin,etc,cache,logs,...}
(the default behavior seems to have changed between 1.0.0 and 1.0.20)
Also, build a rc.d/squid.sh script.
Notes
Notes:
svn path=/head/; revision=4314
Diffstat (limited to 'www')
45 files changed, 405 insertions, 315 deletions
diff --git a/www/squid/Makefile b/www/squid/Makefile index 1befb9b30298..866cdd8a9410 100644 --- a/www/squid/Makefile +++ b/www/squid/Makefile @@ -1,31 +1,42 @@ # New ports collection makefile for: squid -# Version required: 1.0.0 +# Version required: 1.0.20 # Date created: Fri May 17 04:02:53 EET DST 1996 # Whom: Andrew Stesin <stesin@elvisti.kiev.ua> # -# $Id: Makefile,v 1.1.1.1 1996/06/03 02:21:13 asami Exp $ +# $Id: Makefile,v 1.2 1996/07/10 21:48:58 asami Exp $ # -DISTNAME= squid-1.0.0 -PKGNAME= squid-1.0 +DISTNAME= squid-1.0.20 CATEGORIES+= www MASTER_SITES= \ - ftp://www.nlanr.net/Software/Squid/ \ - ftp://www.unimelb.edu.au/pub/cwis/servers/unix/squid/ \ - ftp://sunsite.auc.dk/pub/infosystems/squid/ \ - ftp://ftp.net.lut.ac.uk/squid/ + ftp://squid.nlanr.net/pub/squid-1.0/ \ + ftp://www.unimelb.edu.au/pub/cwis/servers/unix/squid/squid-1.0/ \ + ftp://sunsite.auc.dk/pub/infosystems/squid/squid-1.0/ \ + ftp://ftp.net.lut.ac.uk/squid/squid-1.0/ EXTRACT_SUFX= -src.tar.gz MAINTAINER= stesin@elvisti.kiev.ua GNU_CONFIGURE= yes -CONFIGURE_ARGS= --sysconfdir=${PREFIX}/etc -CONFIGURE_ENV= env "STD_CFLAGS=${CFLAGS}" +# Follow the apache port's lead... +CONFIGURE_ARGS= --sysconfdir=${PREFIX}/etc/squid --bindir=${PREFIX}/sbin \ + --libexecdir=${PREFIX}/sbin --localstatedir=${PREFIX}/squid STRIP= # won't install scripts correctly othervise. +MAKEFILE= makefile post-install: .for file in cachemgr.cgi client dnsserver ftpget squid - strip ${PREFIX}/bin/${file} + strip ${PREFIX}/sbin/${file} .endfor + ${MKDIR} ${PREFIX}/squid/logs + ${MKDIR} ${PREFIX}/squid/cache + @if [ ! -f ${PREFIX}/etc/rc.d/squid.sh ]; then \ + echo "Installing ${PREFIX}/etc/rc.d/squid.sh startup file."; \ + echo "#!/bin/sh" > ${PREFIX}/etc/rc.d/squid.sh; \ + echo "if [ -x /usr/local/sbin/RunCache -a -f /usr/local/etc/squid/squid.conf ]; then" >> ${PREFIX}/etc/rc.d/squid.sh; \ + echo " (cd /tmp; /usr/local/sbin/RunCache &) ; echo -n ' squid'" >> ${PREFIX}/etc/rc.d/squid.sh; \ + echo "fi" >> ${PREFIX}/etc/rc.d/squid.sh; \ + chmod 751 ${PREFIX}/etc/rc.d/squid.sh; \ + fi .include <bsd.port.mk> diff --git a/www/squid/distinfo b/www/squid/distinfo index ebf12fa6b2c4..987e4dcfa1cc 100644 --- a/www/squid/distinfo +++ b/www/squid/distinfo @@ -1 +1 @@ -MD5 (squid-1.0.0-src.tar.gz) = a16ecec2fc688234607f6f60c9ef4e3e +MD5 (squid-1.0.20-src.tar.gz) = 832c7402e5b2d7b81822b67a0f7b6267 diff --git a/www/squid/pkg-descr b/www/squid/pkg-descr index 4a03e4124d58..41d6d63d1fe5 100644 --- a/www/squid/pkg-descr +++ b/www/squid/pkg-descr @@ -7,10 +7,10 @@ This software is based on the Harvest Object Cache developed by the University of Colorado and the University of Southern California. The Harvest home page is http://harvest.cs.colorado.edu/. -FreeBSD PORTER'S NOTES. To this moment, Squid is poorly documented. +ARPA funding for the Harvest project has ended, the squid project has +continued development of the cache where Harvest finished. + +FreeBSD PORTER'S NOTES. To this moment, Squid is not well documented. But you aren't lost in space: there is a mailing list, <squid-users@nlanr.net>, where you will find some support and help. -I also _strongly_ suggest you to examine Web pages noticed above. -If you have comments/questions/suggestions about FreeBSD port -- ask -me. Andrew Stesin. - +I also _strongly_ suggest you to examine Web pages noted above. diff --git a/www/squid/pkg-install b/www/squid/pkg-install index 8f5ca748d66f..d85e7bbe68b7 100644 --- a/www/squid/pkg-install +++ b/www/squid/pkg-install @@ -9,10 +9,6 @@ case $2 in echo "==> Post-installation configuration of ${PKGNAME}" echo "" echo " o you DO need running nameservice to start and run ${PKGNAME}" - echo " o add the following line to /etc/rc.local to start" - echo " ${PKGNAME} automatically:" - echo "" - echo " (cd /tmp; exec ${PREFIX:-/usr/local}/bin/RunCache) &" echo "" echo " o use the ${PKGNAME} proxy and caching WWW Server by" echo " configuring your WWW Navigator (Netscape, Mosaic,...)" @@ -25,12 +21,12 @@ case $2 in echo " ACTUAL locations of cache \"spool\", logfiles, pidfile!" tput me read skip - chown root:wheel ${PREFIX:-/usr/local}/etc/squid.conf* - chmod 644 ${PREFIX:-/usr/local}/etc/squid.conf* - [ -f ${PREFIX:-/usr/local}/etc/squid.conf ] || \ - cp -fp ${PREFIX:-/usr/local}/etc/squid.conf.default \ - ${PREFIX:-/usr/local}/etc/squid.conf - ${EDITOR:-vi} ${PREFIX:-/usr/local}/etc/squid.conf + chown root:wheel ${PREFIX:-/usr/local}/etc/squid/squid.conf* + chmod 644 ${PREFIX:-/usr/local}/etc/squid/squid.conf* + [ -f ${PREFIX:-/usr/local}/etc/squid/squid.conf ] || \ + cp -fp ${PREFIX:-/usr/local}/etc/squid/squid.conf.default \ + ${PREFIX:-/usr/local}/etc/squid/squid.conf + ${EDITOR:-vi} ${PREFIX:-/usr/local}/etc/squid/squid.conf ;; *) echo "Unexpected Argument $2!!!" diff --git a/www/squid/pkg-plist b/www/squid/pkg-plist index b5d11ef67b1e..d2506d04b87a 100644 --- a/www/squid/pkg-plist +++ b/www/squid/pkg-plist @@ -1,8 +1,11 @@ -bin/RunCache -bin/RunAccel -bin/squid -bin/client -bin/dnsserver -bin/ftpget -bin/cachemgr.cgi -etc/squid.conf.default +sbin/RunCache +sbin/RunAccel +sbin/squid +sbin/client +sbin/dnsserver +sbin/ftpget +sbin/cachemgr.cgi +etc/squid/squid.conf.default +etc/rc.d/squid.sh +@exec mkdir -p %D/squid/cache +@exec mkdir -p %D/squid/logs diff --git a/www/squid22/Makefile b/www/squid22/Makefile index 1befb9b30298..866cdd8a9410 100644 --- a/www/squid22/Makefile +++ b/www/squid22/Makefile @@ -1,31 +1,42 @@ # New ports collection makefile for: squid -# Version required: 1.0.0 +# Version required: 1.0.20 # Date created: Fri May 17 04:02:53 EET DST 1996 # Whom: Andrew Stesin <stesin@elvisti.kiev.ua> # -# $Id: Makefile,v 1.1.1.1 1996/06/03 02:21:13 asami Exp $ +# $Id: Makefile,v 1.2 1996/07/10 21:48:58 asami Exp $ # -DISTNAME= squid-1.0.0 -PKGNAME= squid-1.0 +DISTNAME= squid-1.0.20 CATEGORIES+= www MASTER_SITES= \ - ftp://www.nlanr.net/Software/Squid/ \ - ftp://www.unimelb.edu.au/pub/cwis/servers/unix/squid/ \ - ftp://sunsite.auc.dk/pub/infosystems/squid/ \ - ftp://ftp.net.lut.ac.uk/squid/ + ftp://squid.nlanr.net/pub/squid-1.0/ \ + ftp://www.unimelb.edu.au/pub/cwis/servers/unix/squid/squid-1.0/ \ + ftp://sunsite.auc.dk/pub/infosystems/squid/squid-1.0/ \ + ftp://ftp.net.lut.ac.uk/squid/squid-1.0/ EXTRACT_SUFX= -src.tar.gz MAINTAINER= stesin@elvisti.kiev.ua GNU_CONFIGURE= yes -CONFIGURE_ARGS= --sysconfdir=${PREFIX}/etc -CONFIGURE_ENV= env "STD_CFLAGS=${CFLAGS}" +# Follow the apache port's lead... +CONFIGURE_ARGS= --sysconfdir=${PREFIX}/etc/squid --bindir=${PREFIX}/sbin \ + --libexecdir=${PREFIX}/sbin --localstatedir=${PREFIX}/squid STRIP= # won't install scripts correctly othervise. +MAKEFILE= makefile post-install: .for file in cachemgr.cgi client dnsserver ftpget squid - strip ${PREFIX}/bin/${file} + strip ${PREFIX}/sbin/${file} .endfor + ${MKDIR} ${PREFIX}/squid/logs + ${MKDIR} ${PREFIX}/squid/cache + @if [ ! -f ${PREFIX}/etc/rc.d/squid.sh ]; then \ + echo "Installing ${PREFIX}/etc/rc.d/squid.sh startup file."; \ + echo "#!/bin/sh" > ${PREFIX}/etc/rc.d/squid.sh; \ + echo "if [ -x /usr/local/sbin/RunCache -a -f /usr/local/etc/squid/squid.conf ]; then" >> ${PREFIX}/etc/rc.d/squid.sh; \ + echo " (cd /tmp; /usr/local/sbin/RunCache &) ; echo -n ' squid'" >> ${PREFIX}/etc/rc.d/squid.sh; \ + echo "fi" >> ${PREFIX}/etc/rc.d/squid.sh; \ + chmod 751 ${PREFIX}/etc/rc.d/squid.sh; \ + fi .include <bsd.port.mk> diff --git a/www/squid22/distinfo b/www/squid22/distinfo index ebf12fa6b2c4..987e4dcfa1cc 100644 --- a/www/squid22/distinfo +++ b/www/squid22/distinfo @@ -1 +1 @@ -MD5 (squid-1.0.0-src.tar.gz) = a16ecec2fc688234607f6f60c9ef4e3e +MD5 (squid-1.0.20-src.tar.gz) = 832c7402e5b2d7b81822b67a0f7b6267 diff --git a/www/squid22/pkg-descr b/www/squid22/pkg-descr index 4a03e4124d58..41d6d63d1fe5 100644 --- a/www/squid22/pkg-descr +++ b/www/squid22/pkg-descr @@ -7,10 +7,10 @@ This software is based on the Harvest Object Cache developed by the University of Colorado and the University of Southern California. The Harvest home page is http://harvest.cs.colorado.edu/. -FreeBSD PORTER'S NOTES. To this moment, Squid is poorly documented. +ARPA funding for the Harvest project has ended, the squid project has +continued development of the cache where Harvest finished. + +FreeBSD PORTER'S NOTES. To this moment, Squid is not well documented. But you aren't lost in space: there is a mailing list, <squid-users@nlanr.net>, where you will find some support and help. -I also _strongly_ suggest you to examine Web pages noticed above. -If you have comments/questions/suggestions about FreeBSD port -- ask -me. Andrew Stesin. - +I also _strongly_ suggest you to examine Web pages noted above. diff --git a/www/squid22/pkg-install b/www/squid22/pkg-install index 8f5ca748d66f..d85e7bbe68b7 100644 --- a/www/squid22/pkg-install +++ b/www/squid22/pkg-install @@ -9,10 +9,6 @@ case $2 in echo "==> Post-installation configuration of ${PKGNAME}" echo "" echo " o you DO need running nameservice to start and run ${PKGNAME}" - echo " o add the following line to /etc/rc.local to start" - echo " ${PKGNAME} automatically:" - echo "" - echo " (cd /tmp; exec ${PREFIX:-/usr/local}/bin/RunCache) &" echo "" echo " o use the ${PKGNAME} proxy and caching WWW Server by" echo " configuring your WWW Navigator (Netscape, Mosaic,...)" @@ -25,12 +21,12 @@ case $2 in echo " ACTUAL locations of cache \"spool\", logfiles, pidfile!" tput me read skip - chown root:wheel ${PREFIX:-/usr/local}/etc/squid.conf* - chmod 644 ${PREFIX:-/usr/local}/etc/squid.conf* - [ -f ${PREFIX:-/usr/local}/etc/squid.conf ] || \ - cp -fp ${PREFIX:-/usr/local}/etc/squid.conf.default \ - ${PREFIX:-/usr/local}/etc/squid.conf - ${EDITOR:-vi} ${PREFIX:-/usr/local}/etc/squid.conf + chown root:wheel ${PREFIX:-/usr/local}/etc/squid/squid.conf* + chmod 644 ${PREFIX:-/usr/local}/etc/squid/squid.conf* + [ -f ${PREFIX:-/usr/local}/etc/squid/squid.conf ] || \ + cp -fp ${PREFIX:-/usr/local}/etc/squid/squid.conf.default \ + ${PREFIX:-/usr/local}/etc/squid/squid.conf + ${EDITOR:-vi} ${PREFIX:-/usr/local}/etc/squid/squid.conf ;; *) echo "Unexpected Argument $2!!!" diff --git a/www/squid22/pkg-plist b/www/squid22/pkg-plist index b5d11ef67b1e..d2506d04b87a 100644 --- a/www/squid22/pkg-plist +++ b/www/squid22/pkg-plist @@ -1,8 +1,11 @@ -bin/RunCache -bin/RunAccel -bin/squid -bin/client -bin/dnsserver -bin/ftpget -bin/cachemgr.cgi -etc/squid.conf.default +sbin/RunCache +sbin/RunAccel +sbin/squid +sbin/client +sbin/dnsserver +sbin/ftpget +sbin/cachemgr.cgi +etc/squid/squid.conf.default +etc/rc.d/squid.sh +@exec mkdir -p %D/squid/cache +@exec mkdir -p %D/squid/logs diff --git a/www/squid23/Makefile b/www/squid23/Makefile index 1befb9b30298..866cdd8a9410 100644 --- a/www/squid23/Makefile +++ b/www/squid23/Makefile @@ -1,31 +1,42 @@ # New ports collection makefile for: squid -# Version required: 1.0.0 +# Version required: 1.0.20 # Date created: Fri May 17 04:02:53 EET DST 1996 # Whom: Andrew Stesin <stesin@elvisti.kiev.ua> # -# $Id: Makefile,v 1.1.1.1 1996/06/03 02:21:13 asami Exp $ +# $Id: Makefile,v 1.2 1996/07/10 21:48:58 asami Exp $ # -DISTNAME= squid-1.0.0 -PKGNAME= squid-1.0 +DISTNAME= squid-1.0.20 CATEGORIES+= www MASTER_SITES= \ - ftp://www.nlanr.net/Software/Squid/ \ - ftp://www.unimelb.edu.au/pub/cwis/servers/unix/squid/ \ - ftp://sunsite.auc.dk/pub/infosystems/squid/ \ - ftp://ftp.net.lut.ac.uk/squid/ + ftp://squid.nlanr.net/pub/squid-1.0/ \ + ftp://www.unimelb.edu.au/pub/cwis/servers/unix/squid/squid-1.0/ \ + ftp://sunsite.auc.dk/pub/infosystems/squid/squid-1.0/ \ + ftp://ftp.net.lut.ac.uk/squid/squid-1.0/ EXTRACT_SUFX= -src.tar.gz MAINTAINER= stesin@elvisti.kiev.ua GNU_CONFIGURE= yes -CONFIGURE_ARGS= --sysconfdir=${PREFIX}/etc -CONFIGURE_ENV= env "STD_CFLAGS=${CFLAGS}" +# Follow the apache port's lead... +CONFIGURE_ARGS= --sysconfdir=${PREFIX}/etc/squid --bindir=${PREFIX}/sbin \ + --libexecdir=${PREFIX}/sbin --localstatedir=${PREFIX}/squid STRIP= # won't install scripts correctly othervise. +MAKEFILE= makefile post-install: .for file in cachemgr.cgi client dnsserver ftpget squid - strip ${PREFIX}/bin/${file} + strip ${PREFIX}/sbin/${file} .endfor + ${MKDIR} ${PREFIX}/squid/logs + ${MKDIR} ${PREFIX}/squid/cache + @if [ ! -f ${PREFIX}/etc/rc.d/squid.sh ]; then \ + echo "Installing ${PREFIX}/etc/rc.d/squid.sh startup file."; \ + echo "#!/bin/sh" > ${PREFIX}/etc/rc.d/squid.sh; \ + echo "if [ -x /usr/local/sbin/RunCache -a -f /usr/local/etc/squid/squid.conf ]; then" >> ${PREFIX}/etc/rc.d/squid.sh; \ + echo " (cd /tmp; /usr/local/sbin/RunCache &) ; echo -n ' squid'" >> ${PREFIX}/etc/rc.d/squid.sh; \ + echo "fi" >> ${PREFIX}/etc/rc.d/squid.sh; \ + chmod 751 ${PREFIX}/etc/rc.d/squid.sh; \ + fi .include <bsd.port.mk> diff --git a/www/squid23/distinfo b/www/squid23/distinfo index ebf12fa6b2c4..987e4dcfa1cc 100644 --- a/www/squid23/distinfo +++ b/www/squid23/distinfo @@ -1 +1 @@ -MD5 (squid-1.0.0-src.tar.gz) = a16ecec2fc688234607f6f60c9ef4e3e +MD5 (squid-1.0.20-src.tar.gz) = 832c7402e5b2d7b81822b67a0f7b6267 diff --git a/www/squid23/pkg-descr b/www/squid23/pkg-descr index 4a03e4124d58..41d6d63d1fe5 100644 --- a/www/squid23/pkg-descr +++ b/www/squid23/pkg-descr @@ -7,10 +7,10 @@ This software is based on the Harvest Object Cache developed by the University of Colorado and the University of Southern California. The Harvest home page is http://harvest.cs.colorado.edu/. -FreeBSD PORTER'S NOTES. To this moment, Squid is poorly documented. +ARPA funding for the Harvest project has ended, the squid project has +continued development of the cache where Harvest finished. + +FreeBSD PORTER'S NOTES. To this moment, Squid is not well documented. But you aren't lost in space: there is a mailing list, <squid-users@nlanr.net>, where you will find some support and help. -I also _strongly_ suggest you to examine Web pages noticed above. -If you have comments/questions/suggestions about FreeBSD port -- ask -me. Andrew Stesin. - +I also _strongly_ suggest you to examine Web pages noted above. diff --git a/www/squid23/pkg-install b/www/squid23/pkg-install index 8f5ca748d66f..d85e7bbe68b7 100644 --- a/www/squid23/pkg-install +++ b/www/squid23/pkg-install @@ -9,10 +9,6 @@ case $2 in echo "==> Post-installation configuration of ${PKGNAME}" echo "" echo " o you DO need running nameservice to start and run ${PKGNAME}" - echo " o add the following line to /etc/rc.local to start" - echo " ${PKGNAME} automatically:" - echo "" - echo " (cd /tmp; exec ${PREFIX:-/usr/local}/bin/RunCache) &" echo "" echo " o use the ${PKGNAME} proxy and caching WWW Server by" echo " configuring your WWW Navigator (Netscape, Mosaic,...)" @@ -25,12 +21,12 @@ case $2 in echo " ACTUAL locations of cache \"spool\", logfiles, pidfile!" tput me read skip - chown root:wheel ${PREFIX:-/usr/local}/etc/squid.conf* - chmod 644 ${PREFIX:-/usr/local}/etc/squid.conf* - [ -f ${PREFIX:-/usr/local}/etc/squid.conf ] || \ - cp -fp ${PREFIX:-/usr/local}/etc/squid.conf.default \ - ${PREFIX:-/usr/local}/etc/squid.conf - ${EDITOR:-vi} ${PREFIX:-/usr/local}/etc/squid.conf + chown root:wheel ${PREFIX:-/usr/local}/etc/squid/squid.conf* + chmod 644 ${PREFIX:-/usr/local}/etc/squid/squid.conf* + [ -f ${PREFIX:-/usr/local}/etc/squid/squid.conf ] || \ + cp -fp ${PREFIX:-/usr/local}/etc/squid/squid.conf.default \ + ${PREFIX:-/usr/local}/etc/squid/squid.conf + ${EDITOR:-vi} ${PREFIX:-/usr/local}/etc/squid/squid.conf ;; *) echo "Unexpected Argument $2!!!" diff --git a/www/squid23/pkg-plist b/www/squid23/pkg-plist index b5d11ef67b1e..d2506d04b87a 100644 --- a/www/squid23/pkg-plist +++ b/www/squid23/pkg-plist @@ -1,8 +1,11 @@ -bin/RunCache -bin/RunAccel -bin/squid -bin/client -bin/dnsserver -bin/ftpget -bin/cachemgr.cgi -etc/squid.conf.default +sbin/RunCache +sbin/RunAccel +sbin/squid +sbin/client +sbin/dnsserver +sbin/ftpget +sbin/cachemgr.cgi +etc/squid/squid.conf.default +etc/rc.d/squid.sh +@exec mkdir -p %D/squid/cache +@exec mkdir -p %D/squid/logs diff --git a/www/squid24/Makefile b/www/squid24/Makefile index 1befb9b30298..866cdd8a9410 100644 --- a/www/squid24/Makefile +++ b/www/squid24/Makefile @@ -1,31 +1,42 @@ # New ports collection makefile for: squid -# Version required: 1.0.0 +# Version required: 1.0.20 # Date created: Fri May 17 04:02:53 EET DST 1996 # Whom: Andrew Stesin <stesin@elvisti.kiev.ua> # -# $Id: Makefile,v 1.1.1.1 1996/06/03 02:21:13 asami Exp $ +# $Id: Makefile,v 1.2 1996/07/10 21:48:58 asami Exp $ # -DISTNAME= squid-1.0.0 -PKGNAME= squid-1.0 +DISTNAME= squid-1.0.20 CATEGORIES+= www MASTER_SITES= \ - ftp://www.nlanr.net/Software/Squid/ \ - ftp://www.unimelb.edu.au/pub/cwis/servers/unix/squid/ \ - ftp://sunsite.auc.dk/pub/infosystems/squid/ \ - ftp://ftp.net.lut.ac.uk/squid/ + ftp://squid.nlanr.net/pub/squid-1.0/ \ + ftp://www.unimelb.edu.au/pub/cwis/servers/unix/squid/squid-1.0/ \ + ftp://sunsite.auc.dk/pub/infosystems/squid/squid-1.0/ \ + ftp://ftp.net.lut.ac.uk/squid/squid-1.0/ EXTRACT_SUFX= -src.tar.gz MAINTAINER= stesin@elvisti.kiev.ua GNU_CONFIGURE= yes -CONFIGURE_ARGS= --sysconfdir=${PREFIX}/etc -CONFIGURE_ENV= env "STD_CFLAGS=${CFLAGS}" +# Follow the apache port's lead... +CONFIGURE_ARGS= --sysconfdir=${PREFIX}/etc/squid --bindir=${PREFIX}/sbin \ + --libexecdir=${PREFIX}/sbin --localstatedir=${PREFIX}/squid STRIP= # won't install scripts correctly othervise. +MAKEFILE= makefile post-install: .for file in cachemgr.cgi client dnsserver ftpget squid - strip ${PREFIX}/bin/${file} + strip ${PREFIX}/sbin/${file} .endfor + ${MKDIR} ${PREFIX}/squid/logs + ${MKDIR} ${PREFIX}/squid/cache + @if [ ! -f ${PREFIX}/etc/rc.d/squid.sh ]; then \ + echo "Installing ${PREFIX}/etc/rc.d/squid.sh startup file."; \ + echo "#!/bin/sh" > ${PREFIX}/etc/rc.d/squid.sh; \ + echo "if [ -x /usr/local/sbin/RunCache -a -f /usr/local/etc/squid/squid.conf ]; then" >> ${PREFIX}/etc/rc.d/squid.sh; \ + echo " (cd /tmp; /usr/local/sbin/RunCache &) ; echo -n ' squid'" >> ${PREFIX}/etc/rc.d/squid.sh; \ + echo "fi" >> ${PREFIX}/etc/rc.d/squid.sh; \ + chmod 751 ${PREFIX}/etc/rc.d/squid.sh; \ + fi .include <bsd.port.mk> diff --git a/www/squid24/distinfo b/www/squid24/distinfo index ebf12fa6b2c4..987e4dcfa1cc 100644 --- a/www/squid24/distinfo +++ b/www/squid24/distinfo @@ -1 +1 @@ -MD5 (squid-1.0.0-src.tar.gz) = a16ecec2fc688234607f6f60c9ef4e3e +MD5 (squid-1.0.20-src.tar.gz) = 832c7402e5b2d7b81822b67a0f7b6267 diff --git a/www/squid24/pkg-descr b/www/squid24/pkg-descr index 4a03e4124d58..41d6d63d1fe5 100644 --- a/www/squid24/pkg-descr +++ b/www/squid24/pkg-descr @@ -7,10 +7,10 @@ This software is based on the Harvest Object Cache developed by the University of Colorado and the University of Southern California. The Harvest home page is http://harvest.cs.colorado.edu/. -FreeBSD PORTER'S NOTES. To this moment, Squid is poorly documented. +ARPA funding for the Harvest project has ended, the squid project has +continued development of the cache where Harvest finished. + +FreeBSD PORTER'S NOTES. To this moment, Squid is not well documented. But you aren't lost in space: there is a mailing list, <squid-users@nlanr.net>, where you will find some support and help. -I also _strongly_ suggest you to examine Web pages noticed above. -If you have comments/questions/suggestions about FreeBSD port -- ask -me. Andrew Stesin. - +I also _strongly_ suggest you to examine Web pages noted above. diff --git a/www/squid24/pkg-install b/www/squid24/pkg-install index 8f5ca748d66f..d85e7bbe68b7 100644 --- a/www/squid24/pkg-install +++ b/www/squid24/pkg-install @@ -9,10 +9,6 @@ case $2 in echo "==> Post-installation configuration of ${PKGNAME}" echo "" echo " o you DO need running nameservice to start and run ${PKGNAME}" - echo " o add the following line to /etc/rc.local to start" - echo " ${PKGNAME} automatically:" - echo "" - echo " (cd /tmp; exec ${PREFIX:-/usr/local}/bin/RunCache) &" echo "" echo " o use the ${PKGNAME} proxy and caching WWW Server by" echo " configuring your WWW Navigator (Netscape, Mosaic,...)" @@ -25,12 +21,12 @@ case $2 in echo " ACTUAL locations of cache \"spool\", logfiles, pidfile!" tput me read skip - chown root:wheel ${PREFIX:-/usr/local}/etc/squid.conf* - chmod 644 ${PREFIX:-/usr/local}/etc/squid.conf* - [ -f ${PREFIX:-/usr/local}/etc/squid.conf ] || \ - cp -fp ${PREFIX:-/usr/local}/etc/squid.conf.default \ - ${PREFIX:-/usr/local}/etc/squid.conf - ${EDITOR:-vi} ${PREFIX:-/usr/local}/etc/squid.conf + chown root:wheel ${PREFIX:-/usr/local}/etc/squid/squid.conf* + chmod 644 ${PREFIX:-/usr/local}/etc/squid/squid.conf* + [ -f ${PREFIX:-/usr/local}/etc/squid/squid.conf ] || \ + cp -fp ${PREFIX:-/usr/local}/etc/squid/squid.conf.default \ + ${PREFIX:-/usr/local}/etc/squid/squid.conf + ${EDITOR:-vi} ${PREFIX:-/usr/local}/etc/squid/squid.conf ;; *) echo "Unexpected Argument $2!!!" diff --git a/www/squid24/pkg-plist b/www/squid24/pkg-plist index b5d11ef67b1e..d2506d04b87a 100644 --- a/www/squid24/pkg-plist +++ b/www/squid24/pkg-plist @@ -1,8 +1,11 @@ -bin/RunCache -bin/RunAccel -bin/squid -bin/client -bin/dnsserver -bin/ftpget -bin/cachemgr.cgi -etc/squid.conf.default +sbin/RunCache +sbin/RunAccel +sbin/squid +sbin/client +sbin/dnsserver +sbin/ftpget +sbin/cachemgr.cgi +etc/squid/squid.conf.default +etc/rc.d/squid.sh +@exec mkdir -p %D/squid/cache +@exec mkdir -p %D/squid/logs diff --git a/www/squid25/Makefile b/www/squid25/Makefile index 1befb9b30298..866cdd8a9410 100644 --- a/www/squid25/Makefile +++ b/www/squid25/Makefile @@ -1,31 +1,42 @@ # New ports collection makefile for: squid -# Version required: 1.0.0 +# Version required: 1.0.20 # Date created: Fri May 17 04:02:53 EET DST 1996 # Whom: Andrew Stesin <stesin@elvisti.kiev.ua> # -# $Id: Makefile,v 1.1.1.1 1996/06/03 02:21:13 asami Exp $ +# $Id: Makefile,v 1.2 1996/07/10 21:48:58 asami Exp $ # -DISTNAME= squid-1.0.0 -PKGNAME= squid-1.0 +DISTNAME= squid-1.0.20 CATEGORIES+= www MASTER_SITES= \ - ftp://www.nlanr.net/Software/Squid/ \ - ftp://www.unimelb.edu.au/pub/cwis/servers/unix/squid/ \ - ftp://sunsite.auc.dk/pub/infosystems/squid/ \ - ftp://ftp.net.lut.ac.uk/squid/ + ftp://squid.nlanr.net/pub/squid-1.0/ \ + ftp://www.unimelb.edu.au/pub/cwis/servers/unix/squid/squid-1.0/ \ + ftp://sunsite.auc.dk/pub/infosystems/squid/squid-1.0/ \ + ftp://ftp.net.lut.ac.uk/squid/squid-1.0/ EXTRACT_SUFX= -src.tar.gz MAINTAINER= stesin@elvisti.kiev.ua GNU_CONFIGURE= yes -CONFIGURE_ARGS= --sysconfdir=${PREFIX}/etc -CONFIGURE_ENV= env "STD_CFLAGS=${CFLAGS}" +# Follow the apache port's lead... +CONFIGURE_ARGS= --sysconfdir=${PREFIX}/etc/squid --bindir=${PREFIX}/sbin \ + --libexecdir=${PREFIX}/sbin --localstatedir=${PREFIX}/squid STRIP= # won't install scripts correctly othervise. +MAKEFILE= makefile post-install: .for file in cachemgr.cgi client dnsserver ftpget squid - strip ${PREFIX}/bin/${file} + strip ${PREFIX}/sbin/${file} .endfor + ${MKDIR} ${PREFIX}/squid/logs + ${MKDIR} ${PREFIX}/squid/cache + @if [ ! -f ${PREFIX}/etc/rc.d/squid.sh ]; then \ + echo "Installing ${PREFIX}/etc/rc.d/squid.sh startup file."; \ + echo "#!/bin/sh" > ${PREFIX}/etc/rc.d/squid.sh; \ + echo "if [ -x /usr/local/sbin/RunCache -a -f /usr/local/etc/squid/squid.conf ]; then" >> ${PREFIX}/etc/rc.d/squid.sh; \ + echo " (cd /tmp; /usr/local/sbin/RunCache &) ; echo -n ' squid'" >> ${PREFIX}/etc/rc.d/squid.sh; \ + echo "fi" >> ${PREFIX}/etc/rc.d/squid.sh; \ + chmod 751 ${PREFIX}/etc/rc.d/squid.sh; \ + fi .include <bsd.port.mk> diff --git a/www/squid25/distinfo b/www/squid25/distinfo index ebf12fa6b2c4..987e4dcfa1cc 100644 --- a/www/squid25/distinfo +++ b/www/squid25/distinfo @@ -1 +1 @@ -MD5 (squid-1.0.0-src.tar.gz) = a16ecec2fc688234607f6f60c9ef4e3e +MD5 (squid-1.0.20-src.tar.gz) = 832c7402e5b2d7b81822b67a0f7b6267 diff --git a/www/squid25/pkg-descr b/www/squid25/pkg-descr index 4a03e4124d58..41d6d63d1fe5 100644 --- a/www/squid25/pkg-descr +++ b/www/squid25/pkg-descr @@ -7,10 +7,10 @@ This software is based on the Harvest Object Cache developed by the University of Colorado and the University of Southern California. The Harvest home page is http://harvest.cs.colorado.edu/. -FreeBSD PORTER'S NOTES. To this moment, Squid is poorly documented. +ARPA funding for the Harvest project has ended, the squid project has +continued development of the cache where Harvest finished. + +FreeBSD PORTER'S NOTES. To this moment, Squid is not well documented. But you aren't lost in space: there is a mailing list, <squid-users@nlanr.net>, where you will find some support and help. -I also _strongly_ suggest you to examine Web pages noticed above. -If you have comments/questions/suggestions about FreeBSD port -- ask -me. Andrew Stesin. - +I also _strongly_ suggest you to examine Web pages noted above. diff --git a/www/squid25/pkg-install b/www/squid25/pkg-install index 8f5ca748d66f..d85e7bbe68b7 100644 --- a/www/squid25/pkg-install +++ b/www/squid25/pkg-install @@ -9,10 +9,6 @@ case $2 in echo "==> Post-installation configuration of ${PKGNAME}" echo "" echo " o you DO need running nameservice to start and run ${PKGNAME}" - echo " o add the following line to /etc/rc.local to start" - echo " ${PKGNAME} automatically:" - echo "" - echo " (cd /tmp; exec ${PREFIX:-/usr/local}/bin/RunCache) &" echo "" echo " o use the ${PKGNAME} proxy and caching WWW Server by" echo " configuring your WWW Navigator (Netscape, Mosaic,...)" @@ -25,12 +21,12 @@ case $2 in echo " ACTUAL locations of cache \"spool\", logfiles, pidfile!" tput me read skip - chown root:wheel ${PREFIX:-/usr/local}/etc/squid.conf* - chmod 644 ${PREFIX:-/usr/local}/etc/squid.conf* - [ -f ${PREFIX:-/usr/local}/etc/squid.conf ] || \ - cp -fp ${PREFIX:-/usr/local}/etc/squid.conf.default \ - ${PREFIX:-/usr/local}/etc/squid.conf - ${EDITOR:-vi} ${PREFIX:-/usr/local}/etc/squid.conf + chown root:wheel ${PREFIX:-/usr/local}/etc/squid/squid.conf* + chmod 644 ${PREFIX:-/usr/local}/etc/squid/squid.conf* + [ -f ${PREFIX:-/usr/local}/etc/squid/squid.conf ] || \ + cp -fp ${PREFIX:-/usr/local}/etc/squid/squid.conf.default \ + ${PREFIX:-/usr/local}/etc/squid/squid.conf + ${EDITOR:-vi} ${PREFIX:-/usr/local}/etc/squid/squid.conf ;; *) echo "Unexpected Argument $2!!!" diff --git a/www/squid25/pkg-plist b/www/squid25/pkg-plist index b5d11ef67b1e..d2506d04b87a 100644 --- a/www/squid25/pkg-plist +++ b/www/squid25/pkg-plist @@ -1,8 +1,11 @@ -bin/RunCache -bin/RunAccel -bin/squid -bin/client -bin/dnsserver -bin/ftpget -bin/cachemgr.cgi -etc/squid.conf.default +sbin/RunCache +sbin/RunAccel +sbin/squid +sbin/client +sbin/dnsserver +sbin/ftpget +sbin/cachemgr.cgi +etc/squid/squid.conf.default +etc/rc.d/squid.sh +@exec mkdir -p %D/squid/cache +@exec mkdir -p %D/squid/logs diff --git a/www/squid26/Makefile b/www/squid26/Makefile index 1befb9b30298..866cdd8a9410 100644 --- a/www/squid26/Makefile +++ b/www/squid26/Makefile @@ -1,31 +1,42 @@ # New ports collection makefile for: squid -# Version required: 1.0.0 +# Version required: 1.0.20 # Date created: Fri May 17 04:02:53 EET DST 1996 # Whom: Andrew Stesin <stesin@elvisti.kiev.ua> # -# $Id: Makefile,v 1.1.1.1 1996/06/03 02:21:13 asami Exp $ +# $Id: Makefile,v 1.2 1996/07/10 21:48:58 asami Exp $ # -DISTNAME= squid-1.0.0 -PKGNAME= squid-1.0 +DISTNAME= squid-1.0.20 CATEGORIES+= www MASTER_SITES= \ - ftp://www.nlanr.net/Software/Squid/ \ - ftp://www.unimelb.edu.au/pub/cwis/servers/unix/squid/ \ - ftp://sunsite.auc.dk/pub/infosystems/squid/ \ - ftp://ftp.net.lut.ac.uk/squid/ + ftp://squid.nlanr.net/pub/squid-1.0/ \ + ftp://www.unimelb.edu.au/pub/cwis/servers/unix/squid/squid-1.0/ \ + ftp://sunsite.auc.dk/pub/infosystems/squid/squid-1.0/ \ + ftp://ftp.net.lut.ac.uk/squid/squid-1.0/ EXTRACT_SUFX= -src.tar.gz MAINTAINER= stesin@elvisti.kiev.ua GNU_CONFIGURE= yes -CONFIGURE_ARGS= --sysconfdir=${PREFIX}/etc -CONFIGURE_ENV= env "STD_CFLAGS=${CFLAGS}" +# Follow the apache port's lead... +CONFIGURE_ARGS= --sysconfdir=${PREFIX}/etc/squid --bindir=${PREFIX}/sbin \ + --libexecdir=${PREFIX}/sbin --localstatedir=${PREFIX}/squid STRIP= # won't install scripts correctly othervise. +MAKEFILE= makefile post-install: .for file in cachemgr.cgi client dnsserver ftpget squid - strip ${PREFIX}/bin/${file} + strip ${PREFIX}/sbin/${file} .endfor + ${MKDIR} ${PREFIX}/squid/logs + ${MKDIR} ${PREFIX}/squid/cache + @if [ ! -f ${PREFIX}/etc/rc.d/squid.sh ]; then \ + echo "Installing ${PREFIX}/etc/rc.d/squid.sh startup file."; \ + echo "#!/bin/sh" > ${PREFIX}/etc/rc.d/squid.sh; \ + echo "if [ -x /usr/local/sbin/RunCache -a -f /usr/local/etc/squid/squid.conf ]; then" >> ${PREFIX}/etc/rc.d/squid.sh; \ + echo " (cd /tmp; /usr/local/sbin/RunCache &) ; echo -n ' squid'" >> ${PREFIX}/etc/rc.d/squid.sh; \ + echo "fi" >> ${PREFIX}/etc/rc.d/squid.sh; \ + chmod 751 ${PREFIX}/etc/rc.d/squid.sh; \ + fi .include <bsd.port.mk> diff --git a/www/squid26/distinfo b/www/squid26/distinfo index ebf12fa6b2c4..987e4dcfa1cc 100644 --- a/www/squid26/distinfo +++ b/www/squid26/distinfo @@ -1 +1 @@ -MD5 (squid-1.0.0-src.tar.gz) = a16ecec2fc688234607f6f60c9ef4e3e +MD5 (squid-1.0.20-src.tar.gz) = 832c7402e5b2d7b81822b67a0f7b6267 diff --git a/www/squid26/pkg-descr b/www/squid26/pkg-descr index 4a03e4124d58..41d6d63d1fe5 100644 --- a/www/squid26/pkg-descr +++ b/www/squid26/pkg-descr @@ -7,10 +7,10 @@ This software is based on the Harvest Object Cache developed by the University of Colorado and the University of Southern California. The Harvest home page is http://harvest.cs.colorado.edu/. -FreeBSD PORTER'S NOTES. To this moment, Squid is poorly documented. +ARPA funding for the Harvest project has ended, the squid project has +continued development of the cache where Harvest finished. + +FreeBSD PORTER'S NOTES. To this moment, Squid is not well documented. But you aren't lost in space: there is a mailing list, <squid-users@nlanr.net>, where you will find some support and help. -I also _strongly_ suggest you to examine Web pages noticed above. -If you have comments/questions/suggestions about FreeBSD port -- ask -me. Andrew Stesin. - +I also _strongly_ suggest you to examine Web pages noted above. diff --git a/www/squid26/pkg-install b/www/squid26/pkg-install index 8f5ca748d66f..d85e7bbe68b7 100644 --- a/www/squid26/pkg-install +++ b/www/squid26/pkg-install @@ -9,10 +9,6 @@ case $2 in echo "==> Post-installation configuration of ${PKGNAME}" echo "" echo " o you DO need running nameservice to start and run ${PKGNAME}" - echo " o add the following line to /etc/rc.local to start" - echo " ${PKGNAME} automatically:" - echo "" - echo " (cd /tmp; exec ${PREFIX:-/usr/local}/bin/RunCache) &" echo "" echo " o use the ${PKGNAME} proxy and caching WWW Server by" echo " configuring your WWW Navigator (Netscape, Mosaic,...)" @@ -25,12 +21,12 @@ case $2 in echo " ACTUAL locations of cache \"spool\", logfiles, pidfile!" tput me read skip - chown root:wheel ${PREFIX:-/usr/local}/etc/squid.conf* - chmod 644 ${PREFIX:-/usr/local}/etc/squid.conf* - [ -f ${PREFIX:-/usr/local}/etc/squid.conf ] || \ - cp -fp ${PREFIX:-/usr/local}/etc/squid.conf.default \ - ${PREFIX:-/usr/local}/etc/squid.conf - ${EDITOR:-vi} ${PREFIX:-/usr/local}/etc/squid.conf + chown root:wheel ${PREFIX:-/usr/local}/etc/squid/squid.conf* + chmod 644 ${PREFIX:-/usr/local}/etc/squid/squid.conf* + [ -f ${PREFIX:-/usr/local}/etc/squid/squid.conf ] || \ + cp -fp ${PREFIX:-/usr/local}/etc/squid/squid.conf.default \ + ${PREFIX:-/usr/local}/etc/squid/squid.conf + ${EDITOR:-vi} ${PREFIX:-/usr/local}/etc/squid/squid.conf ;; *) echo "Unexpected Argument $2!!!" diff --git a/www/squid26/pkg-plist b/www/squid26/pkg-plist index b5d11ef67b1e..d2506d04b87a 100644 --- a/www/squid26/pkg-plist +++ b/www/squid26/pkg-plist @@ -1,8 +1,11 @@ -bin/RunCache -bin/RunAccel -bin/squid -bin/client -bin/dnsserver -bin/ftpget -bin/cachemgr.cgi -etc/squid.conf.default +sbin/RunCache +sbin/RunAccel +sbin/squid +sbin/client +sbin/dnsserver +sbin/ftpget +sbin/cachemgr.cgi +etc/squid/squid.conf.default +etc/rc.d/squid.sh +@exec mkdir -p %D/squid/cache +@exec mkdir -p %D/squid/logs diff --git a/www/squid27/Makefile b/www/squid27/Makefile index 1befb9b30298..866cdd8a9410 100644 --- a/www/squid27/Makefile +++ b/www/squid27/Makefile @@ -1,31 +1,42 @@ # New ports collection makefile for: squid -# Version required: 1.0.0 +# Version required: 1.0.20 # Date created: Fri May 17 04:02:53 EET DST 1996 # Whom: Andrew Stesin <stesin@elvisti.kiev.ua> # -# $Id: Makefile,v 1.1.1.1 1996/06/03 02:21:13 asami Exp $ +# $Id: Makefile,v 1.2 1996/07/10 21:48:58 asami Exp $ # -DISTNAME= squid-1.0.0 -PKGNAME= squid-1.0 +DISTNAME= squid-1.0.20 CATEGORIES+= www MASTER_SITES= \ - ftp://www.nlanr.net/Software/Squid/ \ - ftp://www.unimelb.edu.au/pub/cwis/servers/unix/squid/ \ - ftp://sunsite.auc.dk/pub/infosystems/squid/ \ - ftp://ftp.net.lut.ac.uk/squid/ + ftp://squid.nlanr.net/pub/squid-1.0/ \ + ftp://www.unimelb.edu.au/pub/cwis/servers/unix/squid/squid-1.0/ \ + ftp://sunsite.auc.dk/pub/infosystems/squid/squid-1.0/ \ + ftp://ftp.net.lut.ac.uk/squid/squid-1.0/ EXTRACT_SUFX= -src.tar.gz MAINTAINER= stesin@elvisti.kiev.ua GNU_CONFIGURE= yes -CONFIGURE_ARGS= --sysconfdir=${PREFIX}/etc -CONFIGURE_ENV= env "STD_CFLAGS=${CFLAGS}" +# Follow the apache port's lead... +CONFIGURE_ARGS= --sysconfdir=${PREFIX}/etc/squid --bindir=${PREFIX}/sbin \ + --libexecdir=${PREFIX}/sbin --localstatedir=${PREFIX}/squid STRIP= # won't install scripts correctly othervise. +MAKEFILE= makefile post-install: .for file in cachemgr.cgi client dnsserver ftpget squid - strip ${PREFIX}/bin/${file} + strip ${PREFIX}/sbin/${file} .endfor + ${MKDIR} ${PREFIX}/squid/logs + ${MKDIR} ${PREFIX}/squid/cache + @if [ ! -f ${PREFIX}/etc/rc.d/squid.sh ]; then \ + echo "Installing ${PREFIX}/etc/rc.d/squid.sh startup file."; \ + echo "#!/bin/sh" > ${PREFIX}/etc/rc.d/squid.sh; \ + echo "if [ -x /usr/local/sbin/RunCache -a -f /usr/local/etc/squid/squid.conf ]; then" >> ${PREFIX}/etc/rc.d/squid.sh; \ + echo " (cd /tmp; /usr/local/sbin/RunCache &) ; echo -n ' squid'" >> ${PREFIX}/etc/rc.d/squid.sh; \ + echo "fi" >> ${PREFIX}/etc/rc.d/squid.sh; \ + chmod 751 ${PREFIX}/etc/rc.d/squid.sh; \ + fi .include <bsd.port.mk> diff --git a/www/squid27/distinfo b/www/squid27/distinfo index ebf12fa6b2c4..987e4dcfa1cc 100644 --- a/www/squid27/distinfo +++ b/www/squid27/distinfo @@ -1 +1 @@ -MD5 (squid-1.0.0-src.tar.gz) = a16ecec2fc688234607f6f60c9ef4e3e +MD5 (squid-1.0.20-src.tar.gz) = 832c7402e5b2d7b81822b67a0f7b6267 diff --git a/www/squid27/pkg-descr b/www/squid27/pkg-descr index 4a03e4124d58..41d6d63d1fe5 100644 --- a/www/squid27/pkg-descr +++ b/www/squid27/pkg-descr @@ -7,10 +7,10 @@ This software is based on the Harvest Object Cache developed by the University of Colorado and the University of Southern California. The Harvest home page is http://harvest.cs.colorado.edu/. -FreeBSD PORTER'S NOTES. To this moment, Squid is poorly documented. +ARPA funding for the Harvest project has ended, the squid project has +continued development of the cache where Harvest finished. + +FreeBSD PORTER'S NOTES. To this moment, Squid is not well documented. But you aren't lost in space: there is a mailing list, <squid-users@nlanr.net>, where you will find some support and help. -I also _strongly_ suggest you to examine Web pages noticed above. -If you have comments/questions/suggestions about FreeBSD port -- ask -me. Andrew Stesin. - +I also _strongly_ suggest you to examine Web pages noted above. diff --git a/www/squid27/pkg-install b/www/squid27/pkg-install index 8f5ca748d66f..d85e7bbe68b7 100644 --- a/www/squid27/pkg-install +++ b/www/squid27/pkg-install @@ -9,10 +9,6 @@ case $2 in echo "==> Post-installation configuration of ${PKGNAME}" echo "" echo " o you DO need running nameservice to start and run ${PKGNAME}" - echo " o add the following line to /etc/rc.local to start" - echo " ${PKGNAME} automatically:" - echo "" - echo " (cd /tmp; exec ${PREFIX:-/usr/local}/bin/RunCache) &" echo "" echo " o use the ${PKGNAME} proxy and caching WWW Server by" echo " configuring your WWW Navigator (Netscape, Mosaic,...)" @@ -25,12 +21,12 @@ case $2 in echo " ACTUAL locations of cache \"spool\", logfiles, pidfile!" tput me read skip - chown root:wheel ${PREFIX:-/usr/local}/etc/squid.conf* - chmod 644 ${PREFIX:-/usr/local}/etc/squid.conf* - [ -f ${PREFIX:-/usr/local}/etc/squid.conf ] || \ - cp -fp ${PREFIX:-/usr/local}/etc/squid.conf.default \ - ${PREFIX:-/usr/local}/etc/squid.conf - ${EDITOR:-vi} ${PREFIX:-/usr/local}/etc/squid.conf + chown root:wheel ${PREFIX:-/usr/local}/etc/squid/squid.conf* + chmod 644 ${PREFIX:-/usr/local}/etc/squid/squid.conf* + [ -f ${PREFIX:-/usr/local}/etc/squid/squid.conf ] || \ + cp -fp ${PREFIX:-/usr/local}/etc/squid/squid.conf.default \ + ${PREFIX:-/usr/local}/etc/squid/squid.conf + ${EDITOR:-vi} ${PREFIX:-/usr/local}/etc/squid/squid.conf ;; *) echo "Unexpected Argument $2!!!" diff --git a/www/squid27/pkg-plist b/www/squid27/pkg-plist index b5d11ef67b1e..d2506d04b87a 100644 --- a/www/squid27/pkg-plist +++ b/www/squid27/pkg-plist @@ -1,8 +1,11 @@ -bin/RunCache -bin/RunAccel -bin/squid -bin/client -bin/dnsserver -bin/ftpget -bin/cachemgr.cgi -etc/squid.conf.default +sbin/RunCache +sbin/RunAccel +sbin/squid +sbin/client +sbin/dnsserver +sbin/ftpget +sbin/cachemgr.cgi +etc/squid/squid.conf.default +etc/rc.d/squid.sh +@exec mkdir -p %D/squid/cache +@exec mkdir -p %D/squid/logs diff --git a/www/squid30/Makefile b/www/squid30/Makefile index 1befb9b30298..866cdd8a9410 100644 --- a/www/squid30/Makefile +++ b/www/squid30/Makefile @@ -1,31 +1,42 @@ # New ports collection makefile for: squid -# Version required: 1.0.0 +# Version required: 1.0.20 # Date created: Fri May 17 04:02:53 EET DST 1996 # Whom: Andrew Stesin <stesin@elvisti.kiev.ua> # -# $Id: Makefile,v 1.1.1.1 1996/06/03 02:21:13 asami Exp $ +# $Id: Makefile,v 1.2 1996/07/10 21:48:58 asami Exp $ # -DISTNAME= squid-1.0.0 -PKGNAME= squid-1.0 +DISTNAME= squid-1.0.20 CATEGORIES+= www MASTER_SITES= \ - ftp://www.nlanr.net/Software/Squid/ \ - ftp://www.unimelb.edu.au/pub/cwis/servers/unix/squid/ \ - ftp://sunsite.auc.dk/pub/infosystems/squid/ \ - ftp://ftp.net.lut.ac.uk/squid/ + ftp://squid.nlanr.net/pub/squid-1.0/ \ + ftp://www.unimelb.edu.au/pub/cwis/servers/unix/squid/squid-1.0/ \ + ftp://sunsite.auc.dk/pub/infosystems/squid/squid-1.0/ \ + ftp://ftp.net.lut.ac.uk/squid/squid-1.0/ EXTRACT_SUFX= -src.tar.gz MAINTAINER= stesin@elvisti.kiev.ua GNU_CONFIGURE= yes -CONFIGURE_ARGS= --sysconfdir=${PREFIX}/etc -CONFIGURE_ENV= env "STD_CFLAGS=${CFLAGS}" +# Follow the apache port's lead... +CONFIGURE_ARGS= --sysconfdir=${PREFIX}/etc/squid --bindir=${PREFIX}/sbin \ + --libexecdir=${PREFIX}/sbin --localstatedir=${PREFIX}/squid STRIP= # won't install scripts correctly othervise. +MAKEFILE= makefile post-install: .for file in cachemgr.cgi client dnsserver ftpget squid - strip ${PREFIX}/bin/${file} + strip ${PREFIX}/sbin/${file} .endfor + ${MKDIR} ${PREFIX}/squid/logs + ${MKDIR} ${PREFIX}/squid/cache + @if [ ! -f ${PREFIX}/etc/rc.d/squid.sh ]; then \ + echo "Installing ${PREFIX}/etc/rc.d/squid.sh startup file."; \ + echo "#!/bin/sh" > ${PREFIX}/etc/rc.d/squid.sh; \ + echo "if [ -x /usr/local/sbin/RunCache -a -f /usr/local/etc/squid/squid.conf ]; then" >> ${PREFIX}/etc/rc.d/squid.sh; \ + echo " (cd /tmp; /usr/local/sbin/RunCache &) ; echo -n ' squid'" >> ${PREFIX}/etc/rc.d/squid.sh; \ + echo "fi" >> ${PREFIX}/etc/rc.d/squid.sh; \ + chmod 751 ${PREFIX}/etc/rc.d/squid.sh; \ + fi .include <bsd.port.mk> diff --git a/www/squid30/distinfo b/www/squid30/distinfo index ebf12fa6b2c4..987e4dcfa1cc 100644 --- a/www/squid30/distinfo +++ b/www/squid30/distinfo @@ -1 +1 @@ -MD5 (squid-1.0.0-src.tar.gz) = a16ecec2fc688234607f6f60c9ef4e3e +MD5 (squid-1.0.20-src.tar.gz) = 832c7402e5b2d7b81822b67a0f7b6267 diff --git a/www/squid30/pkg-descr b/www/squid30/pkg-descr index 4a03e4124d58..41d6d63d1fe5 100644 --- a/www/squid30/pkg-descr +++ b/www/squid30/pkg-descr @@ -7,10 +7,10 @@ This software is based on the Harvest Object Cache developed by the University of Colorado and the University of Southern California. The Harvest home page is http://harvest.cs.colorado.edu/. -FreeBSD PORTER'S NOTES. To this moment, Squid is poorly documented. +ARPA funding for the Harvest project has ended, the squid project has +continued development of the cache where Harvest finished. + +FreeBSD PORTER'S NOTES. To this moment, Squid is not well documented. But you aren't lost in space: there is a mailing list, <squid-users@nlanr.net>, where you will find some support and help. -I also _strongly_ suggest you to examine Web pages noticed above. -If you have comments/questions/suggestions about FreeBSD port -- ask -me. Andrew Stesin. - +I also _strongly_ suggest you to examine Web pages noted above. diff --git a/www/squid30/pkg-install b/www/squid30/pkg-install index 8f5ca748d66f..d85e7bbe68b7 100644 --- a/www/squid30/pkg-install +++ b/www/squid30/pkg-install @@ -9,10 +9,6 @@ case $2 in echo "==> Post-installation configuration of ${PKGNAME}" echo "" echo " o you DO need running nameservice to start and run ${PKGNAME}" - echo " o add the following line to /etc/rc.local to start" - echo " ${PKGNAME} automatically:" - echo "" - echo " (cd /tmp; exec ${PREFIX:-/usr/local}/bin/RunCache) &" echo "" echo " o use the ${PKGNAME} proxy and caching WWW Server by" echo " configuring your WWW Navigator (Netscape, Mosaic,...)" @@ -25,12 +21,12 @@ case $2 in echo " ACTUAL locations of cache \"spool\", logfiles, pidfile!" tput me read skip - chown root:wheel ${PREFIX:-/usr/local}/etc/squid.conf* - chmod 644 ${PREFIX:-/usr/local}/etc/squid.conf* - [ -f ${PREFIX:-/usr/local}/etc/squid.conf ] || \ - cp -fp ${PREFIX:-/usr/local}/etc/squid.conf.default \ - ${PREFIX:-/usr/local}/etc/squid.conf - ${EDITOR:-vi} ${PREFIX:-/usr/local}/etc/squid.conf + chown root:wheel ${PREFIX:-/usr/local}/etc/squid/squid.conf* + chmod 644 ${PREFIX:-/usr/local}/etc/squid/squid.conf* + [ -f ${PREFIX:-/usr/local}/etc/squid/squid.conf ] || \ + cp -fp ${PREFIX:-/usr/local}/etc/squid/squid.conf.default \ + ${PREFIX:-/usr/local}/etc/squid/squid.conf + ${EDITOR:-vi} ${PREFIX:-/usr/local}/etc/squid/squid.conf ;; *) echo "Unexpected Argument $2!!!" diff --git a/www/squid30/pkg-plist b/www/squid30/pkg-plist index b5d11ef67b1e..d2506d04b87a 100644 --- a/www/squid30/pkg-plist +++ b/www/squid30/pkg-plist @@ -1,8 +1,11 @@ -bin/RunCache -bin/RunAccel -bin/squid -bin/client -bin/dnsserver -bin/ftpget -bin/cachemgr.cgi -etc/squid.conf.default +sbin/RunCache +sbin/RunAccel +sbin/squid +sbin/client +sbin/dnsserver +sbin/ftpget +sbin/cachemgr.cgi +etc/squid/squid.conf.default +etc/rc.d/squid.sh +@exec mkdir -p %D/squid/cache +@exec mkdir -p %D/squid/logs diff --git a/www/squid31/Makefile b/www/squid31/Makefile index 1befb9b30298..866cdd8a9410 100644 --- a/www/squid31/Makefile +++ b/www/squid31/Makefile @@ -1,31 +1,42 @@ # New ports collection makefile for: squid -# Version required: 1.0.0 +# Version required: 1.0.20 # Date created: Fri May 17 04:02:53 EET DST 1996 # Whom: Andrew Stesin <stesin@elvisti.kiev.ua> # -# $Id: Makefile,v 1.1.1.1 1996/06/03 02:21:13 asami Exp $ +# $Id: Makefile,v 1.2 1996/07/10 21:48:58 asami Exp $ # -DISTNAME= squid-1.0.0 -PKGNAME= squid-1.0 +DISTNAME= squid-1.0.20 CATEGORIES+= www MASTER_SITES= \ - ftp://www.nlanr.net/Software/Squid/ \ - ftp://www.unimelb.edu.au/pub/cwis/servers/unix/squid/ \ - ftp://sunsite.auc.dk/pub/infosystems/squid/ \ - ftp://ftp.net.lut.ac.uk/squid/ + ftp://squid.nlanr.net/pub/squid-1.0/ \ + ftp://www.unimelb.edu.au/pub/cwis/servers/unix/squid/squid-1.0/ \ + ftp://sunsite.auc.dk/pub/infosystems/squid/squid-1.0/ \ + ftp://ftp.net.lut.ac.uk/squid/squid-1.0/ EXTRACT_SUFX= -src.tar.gz MAINTAINER= stesin@elvisti.kiev.ua GNU_CONFIGURE= yes -CONFIGURE_ARGS= --sysconfdir=${PREFIX}/etc -CONFIGURE_ENV= env "STD_CFLAGS=${CFLAGS}" +# Follow the apache port's lead... +CONFIGURE_ARGS= --sysconfdir=${PREFIX}/etc/squid --bindir=${PREFIX}/sbin \ + --libexecdir=${PREFIX}/sbin --localstatedir=${PREFIX}/squid STRIP= # won't install scripts correctly othervise. +MAKEFILE= makefile post-install: .for file in cachemgr.cgi client dnsserver ftpget squid - strip ${PREFIX}/bin/${file} + strip ${PREFIX}/sbin/${file} .endfor + ${MKDIR} ${PREFIX}/squid/logs + ${MKDIR} ${PREFIX}/squid/cache + @if [ ! -f ${PREFIX}/etc/rc.d/squid.sh ]; then \ + echo "Installing ${PREFIX}/etc/rc.d/squid.sh startup file."; \ + echo "#!/bin/sh" > ${PREFIX}/etc/rc.d/squid.sh; \ + echo "if [ -x /usr/local/sbin/RunCache -a -f /usr/local/etc/squid/squid.conf ]; then" >> ${PREFIX}/etc/rc.d/squid.sh; \ + echo " (cd /tmp; /usr/local/sbin/RunCache &) ; echo -n ' squid'" >> ${PREFIX}/etc/rc.d/squid.sh; \ + echo "fi" >> ${PREFIX}/etc/rc.d/squid.sh; \ + chmod 751 ${PREFIX}/etc/rc.d/squid.sh; \ + fi .include <bsd.port.mk> diff --git a/www/squid31/distinfo b/www/squid31/distinfo index ebf12fa6b2c4..987e4dcfa1cc 100644 --- a/www/squid31/distinfo +++ b/www/squid31/distinfo @@ -1 +1 @@ -MD5 (squid-1.0.0-src.tar.gz) = a16ecec2fc688234607f6f60c9ef4e3e +MD5 (squid-1.0.20-src.tar.gz) = 832c7402e5b2d7b81822b67a0f7b6267 diff --git a/www/squid31/pkg-descr b/www/squid31/pkg-descr index 4a03e4124d58..41d6d63d1fe5 100644 --- a/www/squid31/pkg-descr +++ b/www/squid31/pkg-descr @@ -7,10 +7,10 @@ This software is based on the Harvest Object Cache developed by the University of Colorado and the University of Southern California. The Harvest home page is http://harvest.cs.colorado.edu/. -FreeBSD PORTER'S NOTES. To this moment, Squid is poorly documented. +ARPA funding for the Harvest project has ended, the squid project has +continued development of the cache where Harvest finished. + +FreeBSD PORTER'S NOTES. To this moment, Squid is not well documented. But you aren't lost in space: there is a mailing list, <squid-users@nlanr.net>, where you will find some support and help. -I also _strongly_ suggest you to examine Web pages noticed above. -If you have comments/questions/suggestions about FreeBSD port -- ask -me. Andrew Stesin. - +I also _strongly_ suggest you to examine Web pages noted above. diff --git a/www/squid31/pkg-install b/www/squid31/pkg-install index 8f5ca748d66f..d85e7bbe68b7 100644 --- a/www/squid31/pkg-install +++ b/www/squid31/pkg-install @@ -9,10 +9,6 @@ case $2 in echo "==> Post-installation configuration of ${PKGNAME}" echo "" echo " o you DO need running nameservice to start and run ${PKGNAME}" - echo " o add the following line to /etc/rc.local to start" - echo " ${PKGNAME} automatically:" - echo "" - echo " (cd /tmp; exec ${PREFIX:-/usr/local}/bin/RunCache) &" echo "" echo " o use the ${PKGNAME} proxy and caching WWW Server by" echo " configuring your WWW Navigator (Netscape, Mosaic,...)" @@ -25,12 +21,12 @@ case $2 in echo " ACTUAL locations of cache \"spool\", logfiles, pidfile!" tput me read skip - chown root:wheel ${PREFIX:-/usr/local}/etc/squid.conf* - chmod 644 ${PREFIX:-/usr/local}/etc/squid.conf* - [ -f ${PREFIX:-/usr/local}/etc/squid.conf ] || \ - cp -fp ${PREFIX:-/usr/local}/etc/squid.conf.default \ - ${PREFIX:-/usr/local}/etc/squid.conf - ${EDITOR:-vi} ${PREFIX:-/usr/local}/etc/squid.conf + chown root:wheel ${PREFIX:-/usr/local}/etc/squid/squid.conf* + chmod 644 ${PREFIX:-/usr/local}/etc/squid/squid.conf* + [ -f ${PREFIX:-/usr/local}/etc/squid/squid.conf ] || \ + cp -fp ${PREFIX:-/usr/local}/etc/squid/squid.conf.default \ + ${PREFIX:-/usr/local}/etc/squid/squid.conf + ${EDITOR:-vi} ${PREFIX:-/usr/local}/etc/squid/squid.conf ;; *) echo "Unexpected Argument $2!!!" diff --git a/www/squid31/pkg-plist b/www/squid31/pkg-plist index b5d11ef67b1e..d2506d04b87a 100644 --- a/www/squid31/pkg-plist +++ b/www/squid31/pkg-plist @@ -1,8 +1,11 @@ -bin/RunCache -bin/RunAccel -bin/squid -bin/client -bin/dnsserver -bin/ftpget -bin/cachemgr.cgi -etc/squid.conf.default +sbin/RunCache +sbin/RunAccel +sbin/squid +sbin/client +sbin/dnsserver +sbin/ftpget +sbin/cachemgr.cgi +etc/squid/squid.conf.default +etc/rc.d/squid.sh +@exec mkdir -p %D/squid/cache +@exec mkdir -p %D/squid/logs |