diff options
author | kim <kim> | 1998-10-09 17:49:20 +0000 |
---|---|---|
committer | kim <kim> | 1998-10-09 17:49:20 +0000 |
commit | 59540f2b909d15db255d38d236a0e795a2ec7d1d (patch) | |
tree | 3e0e4639fce2a51f6bbc7ea6b8791ea4b467c393 /www | |
parent | 064b7b80d3b47688f11a141f9f312750d49fe3e2 (diff) | |
download | pkgsrc-59540f2b909d15db255d38d236a0e795a2ec7d1d.tar.gz |
A package to track the current version of squid.
Diffstat (limited to 'www')
-rw-r--r-- | www/squid-current/Makefile | 64 | ||||
-rw-r--r-- | www/squid-current/files/md5 | 3 | ||||
-rw-r--r-- | www/squid-current/files/squid.sh | 10 | ||||
-rw-r--r-- | www/squid-current/patches/patch-aa | 129 | ||||
-rw-r--r-- | www/squid-current/patches/patch-ab | 15 | ||||
-rw-r--r-- | www/squid-current/patches/patch-ac | 17 | ||||
-rw-r--r-- | www/squid-current/patches/patch-ad | 21 | ||||
-rw-r--r-- | www/squid-current/patches/patch-ae | 21 | ||||
-rw-r--r-- | www/squid-current/patches/patch-af | 30 | ||||
-rw-r--r-- | www/squid-current/patches/patch-ag | 21 | ||||
-rw-r--r-- | www/squid-current/pkg/COMMENT | 1 | ||||
-rw-r--r-- | www/squid-current/pkg/DESCR | 15 | ||||
-rw-r--r-- | www/squid-current/pkg/INSTALL | 31 | ||||
-rw-r--r-- | www/squid-current/pkg/PLIST | 10 |
14 files changed, 388 insertions, 0 deletions
diff --git a/www/squid-current/Makefile b/www/squid-current/Makefile new file mode 100644 index 00000000000..9db4b2384b2 --- /dev/null +++ b/www/squid-current/Makefile @@ -0,0 +1,64 @@ +# $NetBSD: Makefile,v 1.1.1.1 1998/10/09 17:49:20 kim Exp $ +# + +DISTNAME= squid-2.0.RELEASE +CATEGORIES= www +MASTER_SITES= \ + ftp://squid.nlanr.net/pub/squid-2/ \ + ftp://ftp.gw.com/pub/unix/squid/squid-2/ \ + ftp://ftp.funet.fi/pub/mirrors/squid.nlanr.net/pub/squid-2/ \ + ftp://www.unimelb.edu.au/pub/cwis/servers/unix/squid/squid-2/ \ + ftp://sunsite.auc.dk/pub/infosystems/squid/squid-2/ \ + ftp://ftp.net.lut.ac.uk/squid/squid-2/ +EXTRACT_SUFX= -src.tar.gz + +CONFLICTS= squid-1.1.21 squid-2.0.PRE1 + +MAINTAINER= kim@tac.nyc.ny.us +HOMEPAGE= http://squid.nlanr.net/Squid/ + +GNU_CONFIGURE= yes +CONFIGURE_ARGS= --sysconfdir=/etc \ + --localstatedir=/var/squid + +# Options you might want to enable +CONFIGURE_ARGS+= --enable-cachemgr-hostname=localhost +CONFIGURE_ARGS+= --enable-icmp +CONFIGURE_ARGS+= --enable-snmp + +MAKEFILE= makefile +MAKE_ENV+= INSTALL_SCRIPT="${INSTALL_SCRIPT}" + +post-build: + ${SED} s#@PREFIX@#${PREFIX}#g <${FILESDIR}/squid.sh >${WRKDIR}/squid.sh + +PLIST_SRC= ${PKGDIR}/PLIST ${WRKDIR}/PLIST.share + +pre-install: + @-rm -f ${WRKDIR}/PLIST.share + @${MKDIR} ${PREFIX}/share/squid + @${MKDIR} ${PREFIX}/share/squid/errors + @${MKDIR} ${PREFIX}/share/squid/icons + @( \ + cd ${WRKSRC}/errors/English; \ + ls ERR_* | sed -e 's@^@share/squid/errors/@'; \ + echo "@dirrm share/squid/errors"; \ + cd ${WRKSRC}/icons; \ + ls anthony-*.gif | sed -e 's@^@share/squid/icons/@'; \ + echo "@dirrm share/squid/icons"; \ + echo "share/squid/mib.txt"; \ + echo "share/squid/mime.conf"; \ + echo "share/squid/mime.conf.default"; \ + echo "share/squid/squid.conf.default"; \ + echo "@dirrm share/squid"; \ + ) > ${WRKDIR}/PLIST.share + +# This is GNU ${datadir}/squid/squid.conf +DEFCONF= ${PREFIX}/share/squid/squid.conf + +post-install: + cd ${WRKSRC}/src; make install-pinger + ${INSTALL_SCRIPT} ${WRKDIR}/squid.sh ${PREFIX}/etc/rc.d/squid.sh + @${SH} ${PKGDIR}/INSTALL ${PKGNAME} ${DEFCONF} POST-INSTALL + +.include <../../mk/bsd.pkg.mk> diff --git a/www/squid-current/files/md5 b/www/squid-current/files/md5 new file mode 100644 index 00000000000..97dffe844d3 --- /dev/null +++ b/www/squid-current/files/md5 @@ -0,0 +1,3 @@ +$NetBSD: md5,v 1.1.1.1 1998/10/09 17:49:20 kim Exp $ + +MD5 (squid-2.0.RELEASE-src.tar.gz) = dc2da8400c003b1d16848ae4674b6f8e diff --git a/www/squid-current/files/squid.sh b/www/squid-current/files/squid.sh new file mode 100644 index 00000000000..e6e013667b4 --- /dev/null +++ b/www/squid-current/files/squid.sh @@ -0,0 +1,10 @@ +#!/bin/sh +# +# $NetBSD: squid.sh,v 1.1.1.1 1998/10/09 17:49:20 kim Exp $ +# +if [ -x @PREFIX@/sbin/RunCache -a -f /etc/squid.conf ]; +then + @PREFIX@/sbin/RunCache >/dev/null 2>&1 & + echo -n ' squid' +fi +exit 0 diff --git a/www/squid-current/patches/patch-aa b/www/squid-current/patches/patch-aa new file mode 100644 index 00000000000..5f9bb5006d1 --- /dev/null +++ b/www/squid-current/patches/patch-aa @@ -0,0 +1,129 @@ +$NetBSD: patch-aa,v 1.1.1.1 1998/10/09 17:49:20 kim Exp $ + +--- src/Makefile.in.orig Mon Aug 17 19:27:15 1998 ++++ src/Makefile.in Thu Oct 1 17:00:53 1998 +@@ -12,6 +12,8 @@ + cgi_suffix = @cgi_suffix@ + top_srcdir = @top_srcdir@ + bindir = @bindir@ ++sbindir = @sbindir@ ++datadir = @datadir@ + libexecdir = @libexecdir@ + sysconfdir = @sysconfdir@ + localstatedir = @localstatedir@ +@@ -29,18 +31,18 @@ + + DEFAULT_PREFIX = $(prefix) + DEFAULT_CONFIG_FILE = $(sysconfdir)/squid.conf +-DEFAULT_MIME_TABLE = $(sysconfdir)/mime.conf ++DEFAULT_MIME_TABLE = $(datadir)/squid/mime.conf + DEFAULT_DNSSERVER = $(libexecdir)/$(DNSSERVER_EXE) + DEFAULT_CACHE_LOG = $(localstatedir)/logs/cache.log + DEFAULT_ACCESS_LOG = $(localstatedir)/logs/access.log + DEFAULT_STORE_LOG = $(localstatedir)/logs/store.log +-DEFAULT_PID_FILE = $(localstatedir)/logs/squid.pid ++DEFAULT_PID_FILE = /var/run/squid.pid + DEFAULT_SWAP_DIR = $(localstatedir)/cache + DEFAULT_PINGER = $(libexecdir)/$(PINGER_EXE) + DEFAULT_UNLINKD = $(libexecdir)/$(UNLINKD_EXE) +-DEFAULT_ICON_DIR = $(sysconfdir)/icons +-DEFAULT_ERROR_DIR = $(sysconfdir)/errors +-DEFAULT_MIB_PATH = $(sysconfdir)/mib.txt ++DEFAULT_ICON_DIR = $(datadir)/squid/icons ++DEFAULT_ERROR_DIR = $(datadir)/squid/errors ++DEFAULT_MIB_PATH = $(datadir)/squid/mib.txt + + CC = @CC@ + MAKEDEPEND = @MAKEDEPEND@ +@@ -264,9 +266,9 @@ + echo "mkdir $(exec_prefix)"; \ + mkdir $(exec_prefix); \ + fi +- -@if test ! -d $(bindir); then \ +- echo "mkdir $(bindir)"; \ +- mkdir $(bindir); \ ++ -@if test ! -d $(sbindir); then \ ++ echo "mkdir $(sbindir)"; \ ++ mkdir $(sbindir); \ + fi + -@if test ! -d $(libexecdir); then \ + echo "mkdir $(libexecdir)"; \ +@@ -276,28 +278,28 @@ + echo "mkdir $(sysconfdir)"; \ + mkdir $(sysconfdir); \ + fi +- -@if test ! -d $(localstatedir); then \ +- echo "mkdir $(localstatedir)"; \ +- mkdir $(localstatedir); \ +- fi +- -@if test ! -d $(localstatedir)/logs; then \ +- echo "mkdir $(localstatedir)/logs"; \ +- mkdir $(localstatedir)/logs; \ +- fi ++# -@if test ! -d $(localstatedir); then \ ++# echo "mkdir $(localstatedir)"; \ ++# mkdir $(localstatedir); \ ++# fi ++# -@if test ! -d $(localstatedir)/logs; then \ ++# echo "mkdir $(localstatedir)/logs"; \ ++# mkdir $(localstatedir)/logs; \ ++# fi + + # Michael Lupp <mike@nemesis.saar.de> wants to know about additions + # to the install target. + install: all install-mkdirs + @for f in $(PROGS); do \ +- if test -f $(bindir)/$$f; then \ +- echo $(MV) $(bindir)/$$f $(bindir)/-$$f; \ +- $(MV) $(bindir)/$$f $(bindir)/-$$f; \ ++ if test -f $(sbindir)/$$f; then \ ++ echo $(MV) $(sbindir)/$$f $(sbindir)/-$$f; \ ++ $(MV) $(sbindir)/$$f $(sbindir)/-$$f; \ + fi; \ +- echo $(INSTALL_BIN) $$f $(bindir); \ +- $(INSTALL_BIN) $$f $(bindir); \ +- if test -f $(bindir)/-$$f; then \ +- echo $(RM) -f $(bindir)/-$$f; \ +- $(RM) -f $(bindir)/-$$f; \ ++ echo $(INSTALL_BIN) $$f $(sbindir); \ ++ $(INSTALL_BIN) $$f $(sbindir); \ ++ if test -f $(sbindir)/-$$f; then \ ++ echo $(RM) -f $(sbindir)/-$$f; \ ++ $(RM) -f $(sbindir)/-$$f; \ + fi; \ + done + @for f in $(UTILS); do \ +@@ -325,20 +327,20 @@ + fi; \ + done + $(INSTALL_FILE) $(srcdir)/mib.txt $(DEFAULT_MIB_PATH) +- $(INSTALL_FILE) squid.conf $(sysconfdir)/squid.conf.default +- @if test -f $(sysconfdir)/squid.conf ; then \ +- echo "$@ will not overwrite existing $(sysconfdir)/squid.conf" ; \ +- else \ +- echo "$(INSTALL_FILE) squid.conf $(sysconfdir)"; \ +- $(INSTALL_FILE) squid.conf $(sysconfdir); \ +- fi +- +- $(INSTALL_FILE) $(srcdir)/mime.conf $(sysconfdir)/mime.conf.default +- @if test -f $(sysconfdir)/mime.conf ; then \ +- echo "$@ will not overwrite existing $(sysconfdir)/mime.conf" ; \ ++ $(INSTALL_FILE) squid.conf $(datadir)/squid/squid.conf.default ++# @if test -f $(DEFAULT_CONFIG_FILE) ; then \ ++# echo "$@ will not overwrite existing $(DEFAULT_CONFIG_FILE)" ; \ ++# else \ ++# echo "$(INSTALL_FILE) squid.conf $(DEFAULT_CONFIG_FILE)"; \ ++# $(INSTALL_FILE) squid.conf $(DEFAULT_CONFIG_FILE); \ ++# fi ++ ++ $(INSTALL_FILE) $(srcdir)/mime.conf $(DEFAULT_MIME_TABLE).default ++ @if test -f $(DEFAULT_MIME_TABLE) ; then \ ++ echo "$@ will not overwrite existing $(DEFAULT_MIME_TABLE)" ; \ + else \ +- echo "$(INSTALL_FILE) $(srcdir)/mime.conf $(sysconfdir)"; \ +- $(INSTALL_FILE) $(srcdir)/mime.conf $(sysconfdir); \ ++ echo "$(INSTALL_FILE) $(srcdir)/mime.conf $(DEFAULT_MIME_TABLE)"; \ ++ $(INSTALL_FILE) $(srcdir)/mime.conf $(DEFAULT_MIME_TABLE); \ + fi + + install-pinger: diff --git a/www/squid-current/patches/patch-ab b/www/squid-current/patches/patch-ab new file mode 100644 index 00000000000..01366e96de4 --- /dev/null +++ b/www/squid-current/patches/patch-ab @@ -0,0 +1,15 @@ +$NetBSD: patch-ab,v 1.1.1.1 1998/10/09 17:49:20 kim Exp $ + +--- scripts/Makefile.in.orig Sat May 4 00:56:18 1996 ++++ scripts/Makefile.in Sat May 23 21:36:03 1998 +@@ -29,8 +29,8 @@ + echo "mkdir $(bindir)"; \ + mkdir $(bindir); \ + fi +- $(INSTALL_BIN) RunCache $(bindir) +- $(INSTALL_BIN) RunAccel $(bindir) ++ $(INSTALL_SCRIPT) RunCache $(bindir) ++ $(INSTALL_SCRIPT) RunAccel $(bindir) + + clean: + diff --git a/www/squid-current/patches/patch-ac b/www/squid-current/patches/patch-ac new file mode 100644 index 00000000000..e946d55d6eb --- /dev/null +++ b/www/squid-current/patches/patch-ac @@ -0,0 +1,17 @@ +$NetBSD: patch-ac,v 1.1.1.1 1998/10/09 17:49:20 kim Exp $ + +--- scripts/RunCache.in.orig Tue Aug 4 16:59:32 1998 ++++ scripts/RunCache.in Thu Oct 1 15:30:29 1998 +@@ -16,10 +16,10 @@ + + failcount=0 + while : ; do +- echo "Running: squid -sY $conf >> $logdir/squid.out 2>&1" ++ echo "Running: squid -Y $conf >> $logdir/squid.out 2>&1" + echo "Startup: `date`" >> $logdir/squid.out + start=`date '+%d%H%M%S'` +- squid -sY $conf >> $logdir/squid.out 2>&1 ++ squid -Y $conf >> $logdir/squid.out 2>&1 + stop=`date '+%d%H%M%S'` + t=`expr $stop - $start` + if test 0 -le $t -a $t -lt 5 ; then diff --git a/www/squid-current/patches/patch-ad b/www/squid-current/patches/patch-ad new file mode 100644 index 00000000000..aba39fd9f5f --- /dev/null +++ b/www/squid-current/patches/patch-ad @@ -0,0 +1,21 @@ +$NetBSD: patch-ad,v 1.1.1.1 1998/10/09 17:49:20 kim Exp $ + +--- errors/Makefile.in.orig Fri Apr 24 01:26:39 1998 ++++ errors/Makefile.in Thu Oct 1 16:25:32 1998 +@@ -4,6 +4,7 @@ + exec_prefix = @exec_prefix@ + top_srcdir = @top_srcdir@ + bindir = @bindir@ ++datadir = @datadir@ + libexecdir = @libexecdir@ + sysconfdir = @sysconfdir@ + localstatedir = @localstatedir@ +@@ -15,7 +16,7 @@ + + INSTALL = @INSTALL@ + INSTALL_FILE = @INSTALL_DATA@ +-DEFAULT_ERROR_DIR = $(sysconfdir)/errors ++DEFAULT_ERROR_DIR = $(datadir)/squid/errors + + LANGUAGE = @ERR_LANGUAGE@ + diff --git a/www/squid-current/patches/patch-ae b/www/squid-current/patches/patch-ae new file mode 100644 index 00000000000..916c759ddbb --- /dev/null +++ b/www/squid-current/patches/patch-ae @@ -0,0 +1,21 @@ +$NetBSD: patch-ae,v 1.1.1.1 1998/10/09 17:49:20 kim Exp $ + +--- icons/Makefile.in.orig Mon Feb 2 14:39:25 1998 ++++ icons/Makefile.in Thu Oct 1 16:26:08 1998 +@@ -4,6 +4,7 @@ + exec_prefix = @exec_prefix@ + top_srcdir = @top_srcdir@ + bindir = @bindir@ ++datadir = @datadir@ + libexecdir = @libexecdir@ + sysconfdir = @sysconfdir@ + localstatedir = @localstatedir@ +@@ -15,7 +16,7 @@ + + INSTALL = @INSTALL@ + INSTALL_FILE = @INSTALL_DATA@ +-DEFAULT_ICON_DIR = $(sysconfdir)/icons ++DEFAULT_ICON_DIR = $(datadir)/squid/icons + + SHARFILE = $(srcdir)/icons.shar + ICONS = anthony-binhex.gif \ diff --git a/www/squid-current/patches/patch-af b/www/squid-current/patches/patch-af new file mode 100644 index 00000000000..f9eadb40c4b --- /dev/null +++ b/www/squid-current/patches/patch-af @@ -0,0 +1,30 @@ +$NetBSD: patch-af,v 1.1.1.1 1998/10/09 17:49:20 kim Exp $ + +--- scripts/Makefile.in.orig Thu Oct 1 16:06:14 1998 ++++ scripts/Makefile.in Thu Oct 1 16:29:14 1998 +@@ -7,6 +7,7 @@ + exec_prefix = @exec_prefix@ + top_srcdir = @top_srcdir@ + bindir = @bindir@ ++sbindir = @sbindir@ + sysconfdir = @sysconfdir@ + srcdir = @srcdir@ + VPATH = @srcdir@ +@@ -25,12 +26,12 @@ + echo "mkdir $(exec_prefix)"; \ + mkdir $(exec_prefix); \ + fi +- @if test ! -d $(bindir); then \ +- echo "mkdir $(bindir)"; \ +- mkdir $(bindir); \ ++ @if test ! -d $(sbindir); then \ ++ echo "mkdir $(sbindir)"; \ ++ mkdir $(sbindir); \ + fi +- $(INSTALL_SCRIPT) RunCache $(bindir) +- $(INSTALL_SCRIPT) RunAccel $(bindir) ++ $(INSTALL_SCRIPT) RunCache $(sbindir) ++ $(INSTALL_SCRIPT) RunAccel $(sbindir) + + clean: + diff --git a/www/squid-current/patches/patch-ag b/www/squid-current/patches/patch-ag new file mode 100644 index 00000000000..4839ccf90ac --- /dev/null +++ b/www/squid-current/patches/patch-ag @@ -0,0 +1,21 @@ +$NetBSD: patch-ag,v 1.1.1.1 1998/10/09 17:49:20 kim Exp $ + +--- configure.orig Tue Sep 22 19:46:09 1998 ++++ configure Thu Oct 1 17:39:47 1998 +@@ -636,11 +636,11 @@ + REGEXLIB='' # -lregex + LIBREGEX='' # libregex.a + +-if test "$libexecdir" = '${exec_prefix}/libexec'; then +- libexecdir='${bindir}' +- localstatedir='${prefix}' +- +-fi ++#if test "$libexecdir" = '${exec_prefix}/libexec'; then ++# libexecdir='${bindir}' ++# localstatedir='${prefix}' ++# ++#fi + + case "$host_os" in + cygwin32) diff --git a/www/squid-current/pkg/COMMENT b/www/squid-current/pkg/COMMENT new file mode 100644 index 00000000000..4df36232a32 --- /dev/null +++ b/www/squid-current/pkg/COMMENT @@ -0,0 +1 @@ +Post-Harvest_cached WWW proxy cache and accelerator diff --git a/www/squid-current/pkg/DESCR b/www/squid-current/pkg/DESCR new file mode 100644 index 00000000000..23fd31028a5 --- /dev/null +++ b/www/squid-current/pkg/DESCR @@ -0,0 +1,15 @@ +This is the Squid Internet Object Cache developed by the National +Laboratory for Applied Networking Research (NLANR) and Internet +volunteers. This software is freely available for anyone to use. + +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/. + +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. +We also _strongly_ suggest you to examine Web pages noted above. diff --git a/www/squid-current/pkg/INSTALL b/www/squid-current/pkg/INSTALL new file mode 100644 index 00000000000..93071e03b21 --- /dev/null +++ b/www/squid-current/pkg/INSTALL @@ -0,0 +1,31 @@ +#!/bin/sh +# +# $NetBSD: INSTALL,v 1.1.1.1 1998/10/09 17:49:20 kim Exp $ +# + +PKGNAME=$1 +DEFCONF=$2 + +case $3 in + PRE-INSTALL) + ;; + POST-INSTALL) + echo "" + echo " o you DO need running nameservice to start and run ${PKGNAME}" + echo "" + echo " o use the ${PKGNAME} proxy and caching WWW Server by" + echo " configuring your WWW Navigator (Netscape, Mosaic,...)" + echo " to use it as a proxy server." + echo "" + echo " o copy \"${DEFCONF}\" to \"/etc/squid.conf\"" + echo " and edit it as required. You should pay attention to" + echo " the ACTUAL locations of the cache \"spool\" logfiles" + echo " and pidfile." + echo "" + ;; + *) + echo "Unexpected Argument $3!!!" + exit 1 + ;; +esac +exit 0 diff --git a/www/squid-current/pkg/PLIST b/www/squid-current/pkg/PLIST new file mode 100644 index 00000000000..027ad2abf53 --- /dev/null +++ b/www/squid-current/pkg/PLIST @@ -0,0 +1,10 @@ +@comment $NetBSD: PLIST,v 1.1.1.1 1998/10/09 17:49:20 kim Exp $ +etc/rc.d/squid.sh +libexec/cachemgr.cgi +libexec/dnsserver +libexec/pinger +libexec/unlinkd +sbin/RunAccel +sbin/RunCache +sbin/client +sbin/squid |