summaryrefslogtreecommitdiff
path: root/www/squid
diff options
context:
space:
mode:
authorPeter Wemm <peter@FreeBSD.org>1998-02-08 03:39:06 +0000
committerPeter Wemm <peter@FreeBSD.org>1998-02-08 03:39:06 +0000
commit25343123ce959b6d0ef11230b70f3618d8616ff1 (patch)
treec4ccbbb086043796b15eb0c809b871edce68114e /www/squid
parentUpgrade to version 4.0.1 (diff)
Evan sent me a port update moments after I committed one. Pick out some
of the changes he's made.. (Although I'm not so sure about moving the cache to /var/spool/squid...) Reviewed by: Evan Champion <evanc@synapse.net>
Notes
Notes: svn path=/head/; revision=9624
Diffstat (limited to 'www/squid')
-rw-r--r--www/squid/Makefile24
-rw-r--r--www/squid/files/patch-ak18
-rw-r--r--www/squid/files/patch-al17
3 files changed, 48 insertions, 11 deletions
diff --git a/www/squid/Makefile b/www/squid/Makefile
index 9d78206655b7..b1a71f36f5f6 100644
--- a/www/squid/Makefile
+++ b/www/squid/Makefile
@@ -3,7 +3,7 @@
# Date created: Thu Nov 7 00:53:18 WST 1996
# Whom: Peter Wemm <peter@freebsd.org>
#
-# $Id: Makefile,v 1.38 1998/01/21 03:06:06 peter Exp $
+# $Id: Makefile,v 1.39 1998/02/08 03:04:58 peter Exp $
#
DISTNAME= squid-1.2.beta14
@@ -24,19 +24,27 @@ MAINTAINER= peter@freebsd.org
DIST_SUBDIR= squid1.2b14
GNU_CONFIGURE= yes
# Follow the apache port's lead...
-CONFIGURE_ARGS= --sysconfdir=${PREFIX}/etc/squid --bindir=${PREFIX}/sbin \
- --libexecdir=${PREFIX}/sbin --localstatedir=${PREFIX}/squid
+CONFIGURE_ARGS= --bindir=${PREFIX}/sbin --sysconfdir=${PREFIX}/etc/squid \
+ --localstatedir=${PREFIX}/squid
STRIP= # won't install scripts correctly othervise.
MAKEFILE= makefile
# Some other configure options..
-# - Use ASYNC disk I/O (Requires real pthreads, libc_r probably doesn't work)
-#CONFIGURE_ARGS+= --enable-async-io
# - Compile and use the malloc package from Doug Lea
#CONFIGURE_ARGS+= --enable-dlmalloc
+# - Compile and use the supplied GNUregex routines instead of BSD regex.
+#CONFIGURE_ARGS+= --enable-gnuregex
# - Use tree function to store ACL lists
#CONFIGURE_ARGS+= --enable-acltree=bin
#CONFIGURE_ARGS+= --enable-acltree=splay
+# - Enable simple malloc debugging
+#CONFIGURE_ARGS+= --enable-xmalloc-debug
+# - Detailed trace of memory allocations
+#CONFIGURE_ARGS+= --enable-xmalloc-debug-count
+# - Show malloc statistics in cachemgr status pages
+#CONFIGURE_ARGS+= --enable-xmalloc-statistics
+# - Use ASYNC disk I/O (Requires real pthreads, libc_r probably doesn't work)
+#CONFIGURE_ARGS+= --enable-async-io
# - Enable ICMP pinging for heirarchy stats and selection
#CONFIGURE_ARGS+= --enable-icmp
# - Enable delay hack to limit bandwidth usage
@@ -54,12 +62,6 @@ MAKEFILE= makefile
# - Enable ACL based on ethernet address (eg: for machines with dynamic DHCP
# assigned IP addresses)
#CONFIGURE_ARGS+= --enable-arp-acl
-# - Enable simple malloc debugging
-#CONFIGURE_ARGS+= --enable-xmalloc-debug
-# - Detailed trace of memory allocations
-#CONFIGURE_ARGS+= --enable-xmalloc-debug-count
-# - Show malloc statistics in cachemgr status pages
-#CONFIGURE_ARGS+= --enable-xmalloc-statistics
post-install:
cd ${WRKSRC}/src; make install-pinger
diff --git a/www/squid/files/patch-ak b/www/squid/files/patch-ak
new file mode 100644
index 000000000000..fa227112193b
--- /dev/null
+++ b/www/squid/files/patch-ak
@@ -0,0 +1,18 @@
+*** /tmp/configure.in Sat Feb 7 21:20:29 1998
+--- configure.in Sat Feb 7 21:24:48 1998
+***************
+*** 19,31 ****
+ REGEXLIB='' # -lregex
+ LIBREGEX='' # libregex.a
+
+- dnl use directory structure of cached as default (hack)
+- if test "$libexecdir" = '${exec_prefix}/libexec'; then
+- libexecdir='${bindir}'
+- localstatedir='${prefix}'
+-
+- fi
+-
+ if test -z "$CACHE_HTTP_PORT"; then
+ CACHE_HTTP_PORT="3128"
+ fi
+--- 19,24 ----
diff --git a/www/squid/files/patch-al b/www/squid/files/patch-al
new file mode 100644
index 000000000000..c770bfd3b646
--- /dev/null
+++ b/www/squid/files/patch-al
@@ -0,0 +1,17 @@
+*** /tmp/configure Sat Feb 7 21:20:29 1998
+--- configure Sat Feb 7 21:24:51 1998
+***************
+*** 608,619 ****
+ REGEXLIB='' # -lregex
+ LIBREGEX='' # libregex.a
+
+- if test "$libexecdir" = '${exec_prefix}/libexec'; then
+- libexecdir='${bindir}'
+- localstatedir='${prefix}'
+-
+- fi
+-
+ if test -z "$CACHE_HTTP_PORT"; then
+ CACHE_HTTP_PORT="3128"
+ fi
+--- 608,613 ----