3 files changed, 15 insertions, 14 deletions

diff --git a/www/squid/Makefile b/www/squid/Makefile
index e6850ebe408d..ec10451cc617 100644
--- a/www/squid/Makefile
+++ b/www/squid/Makefile
@@ -75,7 +75,7 @@
 #     Enable experimental multicast notification of cachemisses.
 
 PORTNAME=	squid
-PORTVERSION=	2.6.17
+PORTVERSION=	2.6.18
 CATEGORIES=	www
 MASTER_SITES=	ftp://ftp.squid-cache.org/pub/%SUBDIR%/ \
 		ftp://mirrors.24-7-solutions.net/pub/squid/%SUBDIR%/ \
@@ -94,7 +94,7 @@ MASTER_SITES=	ftp://ftp.squid-cache.org/pub/%SUBDIR%/ \
 		http://www1.jp.squid-cache.org/Versions/v2/2.6/ \
 		http://www2.tw.squid-cache.org/Versions/v2/2.6/
 MASTER_SITE_SUBDIR=	squid-2/STABLE
-DISTNAME=	squid-2.6.STABLE17
+DISTNAME=	squid-2.6.STABLE18
 DIST_SUBDIR=	squid2.6
 
 PATCH_SITES=	http://www.squid-cache.org/%SUBDIR%/ \
@@ -393,7 +393,8 @@ CONFIGURE_ARGS+=	${SQUID_CONFIGURE_ARGS}
 
 CONFIGURE_ENV+=		CFLAGS="${CFLAGS}" \
 			CPPFLAGS="${CPPFLAGS}"\
-			LDFLAGS="${LDFLAGS}"
+			LDFLAGS="${LDFLAGS}" \
+			GREP="${GREP}"
 
 PLIST_DIRS=	etc/squid/icons libexec/squid
 PLIST_FILES=	${etc_files:S,^,etc/,} ${icon_files:S,^,etc/squid/icons/,} \
diff --git a/www/squid/distinfo b/www/squid/distinfo
index 70353b50618c..b065e16b4c15 100644
--- a/www/squid/distinfo
+++ b/www/squid/distinfo
@@ -1,3 +1,3 @@
-MD5 (squid2.6/squid-2.6.STABLE17.tar.bz2) = e6face0dff4ea054d3ba94236eb56ea1
-SHA256 (squid2.6/squid-2.6.STABLE17.tar.bz2) = e6aaa26b40c5310b4047460c7dec81d73ccb5b18d19be3d088d3de4334748bfd
-SIZE (squid2.6/squid-2.6.STABLE17.tar.bz2) = 1303134
+MD5 (squid2.6/squid-2.6.STABLE18.tar.bz2) = eb49bc06ea1a40421b6f1ac9e76d1757
+SHA256 (squid2.6/squid-2.6.STABLE18.tar.bz2) = 0ea808ba9efc3a1b1a9945aa20bd9411ee503b9182a5c75185d6bd2c53e47bcc
+SIZE (squid2.6/squid-2.6.STABLE18.tar.bz2) = 1304685
diff --git a/www/squid/files/icap-2.6-bootstrap.patch b/www/squid/files/icap-2.6-bootstrap.patch
index 34e333bcb79f..8f16c5dc26f6 100644
--- a/www/squid/files/icap-2.6-bootstrap.patch
+++ b/www/squid/files/icap-2.6-bootstrap.patch
@@ -7,10 +7,10 @@ ICAP patchset.
 
 Please see icap-2.6-core.patch for further information.
 
-Patch last updated: 2007-11-26
+Patch last updated: 2008-01-11
 
---- configure.orig	Mon Nov 26 14:39:31 2007
-+++ configure	Mon Nov 26 19:46:14 2007
+--- configure.orig	Thu Jan 10 13:34:23 2008
++++ configure	Fri Jan 11 14:21:16 2008
 @@ -728,6 +728,8 @@
  ENABLE_PINGER_FALSE
  USE_DELAY_POOLS_TRUE
@@ -43,8 +43,8 @@ Patch last updated: 2007-11-26
  
  # Define the identity of the package.
   PACKAGE='squid'
-- VERSION='2.6.STABLE17'
-+ VERSION='2.6.STABLE17+ICAP'
+- VERSION='2.6.STABLE18'
++ VERSION='2.6.STABLE18+ICAP'
  
  
  cat >>confdefs.h <<_ACEOF
@@ -207,7 +207,7 @@ Patch last updated: 2007-11-26
  if test -z "${NEED_OWN_STRSEP_TRUE}" && test -z "${NEED_OWN_STRSEP_FALSE}"; then
    { { echo "$as_me:$LINENO: error: conditional \"NEED_OWN_STRSEP\" was never defined.
  Usually this means the macro was only invoked conditionally." >&5
-@@ -27707,6 +27838,8 @@
+@@ -27708,6 +27839,8 @@
  ENABLE_PINGER_FALSE!$ENABLE_PINGER_FALSE$ac_delim
  USE_DELAY_POOLS_TRUE!$USE_DELAY_POOLS_TRUE$ac_delim
  USE_DELAY_POOLS_FALSE!$USE_DELAY_POOLS_FALSE$ac_delim
@@ -216,7 +216,7 @@ Patch last updated: 2007-11-26
  USE_SNMP_TRUE!$USE_SNMP_TRUE$ac_delim
  USE_SNMP_FALSE!$USE_SNMP_FALSE$ac_delim
  SNMPLIB!$SNMPLIB$ac_delim
-@@ -27773,6 +27906,10 @@
+@@ -27774,6 +27907,10 @@
  USE_DEVPOLL_FALSE!$USE_DEVPOLL_FALSE$ac_delim
  NEED_OWN_SNPRINTF_TRUE!$NEED_OWN_SNPRINTF_TRUE$ac_delim
  NEED_OWN_SNPRINTF_FALSE!$NEED_OWN_SNPRINTF_FALSE$ac_delim
@@ -227,7 +227,7 @@ Patch last updated: 2007-11-26
  NEED_OWN_STRSEP_TRUE!$NEED_OWN_STRSEP_TRUE$ac_delim
  NEED_OWN_STRSEP_FALSE!$NEED_OWN_STRSEP_FALSE$ac_delim
  REGEXLIB!$REGEXLIB$ac_delim
-@@ -27783,7 +27920,7 @@
+@@ -27784,7 +27921,7 @@
  LTLIBOBJS!$LTLIBOBJS$ac_delim
  _ACEOF