3 files changed, 29 insertions, 50 deletions

diff --git a/www/squid/Makefile b/www/squid/Makefile
index 4d73a62b31f5..9132d86597d3 100644
--- a/www/squid/Makefile
+++ b/www/squid/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	squid
-PORTVERSION=	2.5
-PORTREVISION=	4
+PORTVERSION=	2.5.4
 CATEGORIES=	www
 MASTER_SITES=	\
 	ftp://ftp.squid-cache.org/pub/%SUBDIR%/ \
@@ -16,34 +15,12 @@ MASTER_SITES=	\
 	ftp://ftp.net.lut.ac.uk/squid/%SUBDIR%/ \
 	${MASTER_SITE_RINGSERVER:S,%SUBDIR%,net/www/squid/&,}
 MASTER_SITE_SUBDIR=	squid-2/STABLE
-DISTNAME=	squid-2.5.STABLE3
+DISTNAME=	squid-2.5.STABLE4
 EXTRACT_SUFX=	.tar.bz2
 DIST_SUBDIR=	squid2.5
 
 PATCH_SITES=	http://www.squid-cache.org/Versions/v2/2.5/bugs/
-PATCHFILES=	squid-2.5.STABLE3-deny_info.patch \
-		squid-2.5.STABLE3-cache_dir_doc.patch \
-		squid-2.5.STABLE3-devnull.patch \
-		squid-2.5.STABLE3-log_quote.patch \
-		squid-2.5.STABLE3-rfc_reference.patch \
-		squid-2.5.STABLE3-external_acl_ident.patch \
-		squid-2.5.STABLE3-gcc-3_3.patch \
-		squid-2.5.STABLE3-carpfactor.patch \
-		squid-2.5.STABLE3-neighbor_type_domain.patch \
-		squid-2.5.STABLE3-header_access_peer.patch \
-		squid-2.5.STABLE3-memwarnsbrk.patch \
-		squid-2.5.STABLE3-hostscomments.patch \
-		squid-2.5.STABLE3-store_check_cachable_stats.patch \
-		squid-2.5.STABLE3-cachePeerPingsSentsnmp.patch \
-		squid-2.5.STABLE3-minimum_retry_timeout.patch \
-		squid-2.5.STABLE3-tcp_reset_leak.patch \
-		squid-2.5.STABLE3-hostheader.patch \
-		squid-2.5.STABLE3-reply_body_max_size.patch \
-		squid-2.5.STABLE3-ie_refresh.patch \
-		squid-2.5.STABLE3-http_reply_access-denied.patch \
-		squid-2.5.STABLE3-SENT_PASV.patch \
-		squid-2.5.STABLE3-peer_digest_not_found_assertion.patch \
-		squid-2.5.STABLE3-round_robin_max_size.patch
+PATCHFILES=
 PATCH_DIST_STRIP=	-p1
 
 MAINTAINER=	adrian@freebsd.org
diff --git a/www/squid/distinfo b/www/squid/distinfo
index 34d32a2ff371..65e31c810913 100644
--- a/www/squid/distinfo
+++ b/www/squid/distinfo
@@ -1,24 +1 @@
-MD5 (squid2.5/squid-2.5.STABLE3.tar.bz2) = ed5eb7835d00fdecc7dd7c1837542df2
-MD5 (squid2.5/squid-2.5.STABLE3-deny_info.patch) = fd6d2d1a5a75b06e86b743f51866c861
-MD5 (squid2.5/squid-2.5.STABLE3-cache_dir_doc.patch) = e7f6d2bd28430e10999b12001cbb4cae
-MD5 (squid2.5/squid-2.5.STABLE3-devnull.patch) = a31d669461e2893996f27b5d10ab06b9
-MD5 (squid2.5/squid-2.5.STABLE3-log_quote.patch) = 9e391cbb39226abc89281cd4138ddb98
-MD5 (squid2.5/squid-2.5.STABLE3-rfc_reference.patch) = 48996215282d80caf3b5cbbbdb7965b7
-MD5 (squid2.5/squid-2.5.STABLE3-external_acl_ident.patch) = a7ab2152b202bf9941ee8200f20b3032
-MD5 (squid2.5/squid-2.5.STABLE3-gcc-3_3.patch) = 49195dd7f3745c0f54c0ca07068b2d67
-MD5 (squid2.5/squid-2.5.STABLE3-carpfactor.patch) = ac2a5f8304b29951ee3579cce10a6ea6
-MD5 (squid2.5/squid-2.5.STABLE3-neighbor_type_domain.patch) = 3edd72ec42e0b49b36096a6a8fff6b2a
-MD5 (squid2.5/squid-2.5.STABLE3-header_access_peer.patch) = 5015f95e0db20ddcb25082a92f8861a8
-MD5 (squid2.5/squid-2.5.STABLE3-memwarnsbrk.patch) = 47cc7566f9584c6f8c764afcb95ce636
-MD5 (squid2.5/squid-2.5.STABLE3-hostscomments.patch) = dabea14824e5b3d48b211c933471036a
-MD5 (squid2.5/squid-2.5.STABLE3-store_check_cachable_stats.patch) = 04477bf0722026a67bbd6954b02c9374
-MD5 (squid2.5/squid-2.5.STABLE3-cachePeerPingsSentsnmp.patch) = b0ecd095062a21d72b15a817f4e821b5
-MD5 (squid2.5/squid-2.5.STABLE3-minimum_retry_timeout.patch) = b265b000b2f5d48a385f68c6d987cbea
-MD5 (squid2.5/squid-2.5.STABLE3-tcp_reset_leak.patch) = 49c5aeb54467e7cbf44edd2271006bb3
-MD5 (squid2.5/squid-2.5.STABLE3-hostheader.patch) = b786122d2353e1e607d1d02e18a86b61
-MD5 (squid2.5/squid-2.5.STABLE3-reply_body_max_size.patch) = f869e793478ad6c3c706424d0236dcaa
-MD5 (squid2.5/squid-2.5.STABLE3-ie_refresh.patch) = 82bfba0cde950541c6aef5e8b52db010
-MD5 (squid2.5/squid-2.5.STABLE3-http_reply_access-denied.patch) = 2abe9bd50e6561251dfd96d2583d15bc
-MD5 (squid2.5/squid-2.5.STABLE3-SENT_PASV.patch) = c394ec388054b1f86d419006250400bd
-MD5 (squid2.5/squid-2.5.STABLE3-peer_digest_not_found_assertion.patch) = f071e6e3ba5a56ce5d0350d7528b597c
-MD5 (squid2.5/squid-2.5.STABLE3-round_robin_max_size.patch) = 081a220c874765395394baa4482a8913
+MD5 (squid2.5/squid-2.5.STABLE4.tar.bz2) = 9894a1fe855b0cccdc14fbf014060990
diff --git a/www/squid/pkg-plist b/www/squid/pkg-plist
index 270dd86188ed..ed60ba42d402 100644
--- a/www/squid/pkg-plist
+++ b/www/squid/pkg-plist
@@ -461,6 +461,30 @@ etc/squid/errors/Korean/ERR_UNSUP_REQ
 etc/squid/errors/Korean/ERR_URN_RESOLVE
 etc/squid/errors/Korean/ERR_WRITE_ERROR
 etc/squid/errors/Korean/ERR_ZERO_SIZE_OBJECT
+etc/squid/errors/Lithuanian/ERR_ACCESS_DENIED
+etc/squid/errors/Lithuanian/ERR_CACHE_ACCESS_DENIED
+etc/squid/errors/Lithuanian/ERR_CACHE_MGR_ACCESS_DENIED
+etc/squid/errors/Lithuanian/ERR_CANNOT_FORWARD
+etc/squid/errors/Lithuanian/ERR_CONNECT_FAIL
+etc/squid/errors/Lithuanian/ERR_DNS_FAIL
+etc/squid/errors/Lithuanian/ERR_FORWARDING_DENIED
+etc/squid/errors/Lithuanian/ERR_FTP_DISABLED
+etc/squid/errors/Lithuanian/ERR_FTP_FAILURE
+etc/squid/errors/Lithuanian/ERR_FTP_PUT_CREATED
+etc/squid/errors/Lithuanian/ERR_FTP_PUT_ERROR
+etc/squid/errors/Lithuanian/ERR_FTP_PUT_MODIFIED
+etc/squid/errors/Lithuanian/ERR_INVALID_REQ
+etc/squid/errors/Lithuanian/ERR_INVALID_URL
+etc/squid/errors/Lithuanian/ERR_LIFETIME_EXP
+etc/squid/errors/Lithuanian/ERR_NO_RELAY
+etc/squid/errors/Lithuanian/ERR_ONLY_IF_CACHED_MISS
+etc/squid/errors/Lithuanian/ERR_READ_ERROR
+etc/squid/errors/Lithuanian/ERR_READ_TIMEOUT
+etc/squid/errors/Lithuanian/ERR_SOCKET_FAILURE
+etc/squid/errors/Lithuanian/ERR_UNSUP_REQ
+etc/squid/errors/Lithuanian/ERR_URN_RESOLVE
+etc/squid/errors/Lithuanian/ERR_WRITE_ERROR
+etc/squid/errors/Lithuanian/ERR_ZERO_SIZE_OBJECT
 etc/squid/errors/Polish/ERR_ACCESS_DENIED
 etc/squid/errors/Polish/ERR_CACHE_ACCESS_DENIED
 etc/squid/errors/Polish/ERR_CACHE_MGR_ACCESS_DENIED
@@ -847,6 +871,7 @@ sbin/squid
 @dirrm etc/squid/errors/Italian
 @dirrm etc/squid/errors/Japanese
 @dirrm etc/squid/errors/Korean
+@dirrm etc/squid/errors/Lithuanian
 @dirrm etc/squid/errors/Polish
 @dirrm etc/squid/errors/Portuguese
 @dirrm etc/squid/errors/Romanian