- Update to 2.6.STABLE19

- Add a patch for Squid bug #2203 (Fixed in the 3.0 but not yet in the 2.6 series)
- Update maintainer mail address

PR:		ports/122383
Submitted by:	Thomas-Martin Seck <tmseck@web.de> (maintainer)

4 files changed, 32 insertions, 12 deletions

diff --git a/www/squid/Makefile b/www/squid/Makefile
index ec10451cc61..80d8e5a0371 100644
--- a/www/squid/Makefile
+++ b/www/squid/Makefile
@@ -75,7 +75,7 @@
 #     Enable experimental multicast notification of cachemisses.
 
 PORTNAME=	squid
-PORTVERSION=	2.6.18
+PORTVERSION=	2.6.19
 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.STABLE18
+DISTNAME=	squid-2.6.STABLE19
 DIST_SUBDIR=	squid2.6
 
 PATCH_SITES=	http://www.squid-cache.org/%SUBDIR%/ \
@@ -109,7 +109,7 @@ PATCH_SITE_SUBDIR=	Versions/v2/2.6/changesets
 PATCHFILES=
 PATCH_DIST_STRIP=	-p1
 
-MAINTAINER=	tmseck@netcologne.de
+MAINTAINER=	tmseck@web.de
 COMMENT=	HTTP Caching Proxy
 
 CONFLICTS=	squid-2.[^6]*
@@ -383,7 +383,8 @@ SQUID_LANGUAGES?=	Armenian Azerbaijani Bulgarian Catalan Czech Danish \
 			Hebrew Hungarian Italian Japanese Korean Lithuanian \
 			Polish Portuguese Romanian Russian-1251 Russian-koi8-r \
 			Serbian Simplify_Chinese Slovak Spanish Swedish \
-			Traditional_Chinese Turkish
+			Traditional_Chinese Turkish Ukrainian-1251 \
+			Ukrainian-koi8-u Ukrainian-utf8
 SQUID_DEFAULT_LANG?=	English
 CONFIGURE_ARGS+=	--enable-err-languages="${SQUID_LANGUAGES}" \
 			--enable-default-err-language=${SQUID_DEFAULT_LANG}
diff --git a/www/squid/distinfo b/www/squid/distinfo
index b065e16b4c1..c405396527c 100644
--- a/www/squid/distinfo
+++ b/www/squid/distinfo
@@ -1,3 +1,3 @@
-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
+MD5 (squid2.6/squid-2.6.STABLE19.tar.bz2) = e1f355ab907369903b5e28aff0fe8386
+SHA256 (squid2.6/squid-2.6.STABLE19.tar.bz2) = 018f8f31eb40fff14f4d86bc1a40c18a0ee67d1412316de13f5975df6d2a0178
+SIZE (squid2.6/squid-2.6.STABLE19.tar.bz2) = 1324732
diff --git a/www/squid/files/icap-2.6-bootstrap.patch b/www/squid/files/icap-2.6-bootstrap.patch
index 8f16c5dc26f..18cdaecd440 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: 2008-01-11
+Patch last updated: 2008-04-02
 
---- configure.orig	Thu Jan 10 13:34:23 2008
-+++ configure	Fri Jan 11 14:21:16 2008
+--- configure.orig	2008-04-02 22:26:33.000000000 +0200
++++ configure	2008-04-02 22:26:34.000000000 +0200
 @@ -728,6 +728,8 @@
  ENABLE_PINGER_FALSE
  USE_DELAY_POOLS_TRUE
@@ -43,8 +43,8 @@ Patch last updated: 2008-01-11
  
  # Define the identity of the package.
   PACKAGE='squid'
-- VERSION='2.6.STABLE18'
-+ VERSION='2.6.STABLE18+ICAP'
+- VERSION='2.6.STABLE19'
++ VERSION='2.6.STABLE19+ICAP'
  
  
  cat >>confdefs.h <<_ACEOF
diff --git a/www/squid/files/patch-configure b/www/squid/files/patch-configure
new file mode 100644
index 00000000000..e281d1e46b1
--- /dev/null
+++ b/www/squid/files/patch-configure
@@ -0,0 +1,19 @@
+Patch for Squid bug 2203:
+
+--with-maxfd inadvertently unsets LDFLAGS.
+--- configure.orig	2008-04-02 21:51:54.000000000 +0200
++++ configure	2008-04-02 21:55:28.000000000 +0200
+@@ -25795,11 +25795,12 @@
+ 
+ fi
+ 
++TLDFLAGS="$LDFLAGS"
++
+ if test -z "$SQUID_MAXFD"; then
+ 
+ { echo "$as_me:$LINENO: checking Maximum number of filedescriptors we can open" >&5
+ echo $ECHO_N "checking Maximum number of filedescriptors we can open... $ECHO_C" >&6; }
+-TLDFLAGS="$LDFLAGS"
+ case $host in
+ i386-unknown-freebsd*)
+     if echo "$LDFLAGS" | grep -q pthread; then