3 files changed, 5 insertions, 69 deletions

diff --git a/www/squid31/Makefile b/www/squid31/Makefile
index 4e803449e9ce..b79778497d81 100644
--- a/www/squid31/Makefile
+++ b/www/squid31/Makefile
@@ -62,8 +62,7 @@
 #     requests.
 
 PORTNAME=	squid
-PORTVERSION=	3.0.5
-PORTREVISION=	1
+PORTVERSION=	3.0.6
 CATEGORIES=	www
 MASTER_SITES=	ftp://ftp.squid-cache.org/pub/%SUBDIR%/ \
 		ftp://mirrors.24-7-solutions.net/pub/squid/%SUBDIR%/ \
@@ -82,7 +81,7 @@ MASTER_SITES=	ftp://ftp.squid-cache.org/pub/%SUBDIR%/ \
 		http://www1.jp.squid-cache.org/Versions/v3/3.0/ \
 		http://www2.tw.squid-cache.org/Versions/v3/3.0/
 MASTER_SITE_SUBDIR=	squid-3/STABLE
-DISTNAME=	squid-3.0.STABLE5
+DISTNAME=	squid-3.0.STABLE6
 DIST_SUBDIR=	squid3.0
 
 PATCH_SITES=	http://www.squid-cache.org/%SUBDIR%/ \
diff --git a/www/squid31/distinfo b/www/squid31/distinfo
index 2d9c3e7af6b6..31841b5fa2fe 100644
--- a/www/squid31/distinfo
+++ b/www/squid31/distinfo
@@ -1,3 +1,3 @@
-MD5 (squid3.0/squid-3.0.STABLE5.tar.bz2) = 60255e66bca8203afb9a635f318b9c65
-SHA256 (squid3.0/squid-3.0.STABLE5.tar.bz2) = fc5023aebcdfbdde8e3390e5beedbf15780a6b4bef55e635df0983c1e5658cd4
-SIZE (squid3.0/squid-3.0.STABLE5.tar.bz2) = 1772673
+MD5 (squid3.0/squid-3.0.STABLE6.tar.bz2) = 231323a73346041cec825e785960e348
+SHA256 (squid3.0/squid-3.0.STABLE6.tar.bz2) = b01879f3d342bc031b9e92d006e50ae4d6cfeb918cda241c1f2e740becf1a720
+SIZE (squid3.0/squid-3.0.STABLE6.tar.bz2) = 1770652
diff --git a/www/squid31/files/patch-tools-Makefile.in b/www/squid31/files/patch-tools-Makefile.in
deleted file mode 100644
index a340337d0aa2..000000000000
--- a/www/squid31/files/patch-tools-Makefile.in
+++ /dev/null
@@ -1,63 +0,0 @@
-This patch is mostly a patch for Squid bug #2346; the default location of the
-cachemgr.cgi configuration file was not correctly passed to the preprocessor
-during compilation.
-
---- tools/Makefile.in.orig	2008-05-10 16:54:15.000000000 +0200
-+++ tools/Makefile.in	2008-05-10 16:56:22.000000000 +0200
-@@ -61,7 +61,7 @@
- binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
- libexecPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
- PROGRAMS = $(bin_PROGRAMS) $(libexec_PROGRAMS)
--am_cachemgr__CGIEXT__OBJECTS = cachemgr.$(OBJEXT)
-+am_cachemgr__CGIEXT__OBJECTS = cachemgr__CGIEXT_-cachemgr.$(OBJEXT)
- cachemgr__CGIEXT__OBJECTS = $(am_cachemgr__CGIEXT__OBJECTS)
- cachemgr__CGIEXT__LDADD = $(LDADD)
- am__DEPENDENCIES_1 =
-@@ -318,7 +318,7 @@
- SUBDIRS = 
- squidclient_SOURCES = squidclient.cc
- cachemgr__CGIEXT__SOURCES = cachemgr.cc
--cachemgr__CGIEXT__CFLAGS = -DDEFAULT_CACHEMGR_CONFIG=\"$(DEFAULT_CACHEMGR_CONFIG)\" $(AM_CFLAGS)
-+cachemgr__CGIEXT__CXXFLAGS = -DDEFAULT_CACHEMGR_CONFIG=\"$(DEFAULT_CACHEMGR_CONFIG)\" $(AM_CFLAGS)
- LDADD = -L../lib -lmiscutil $(XTRA_LIBS)
- EXTRA_DIST = \
- 	cachemgr.conf
-@@ -440,7 +440,7 @@
- distclean-compile:
- 	-rm -f *.tab.c
- 
--@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cachemgr.Po@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cachemgr__CGIEXT_-cachemgr.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/squidclient.Po@am__quote@
- 
- .cc.o:
-@@ -467,6 +467,20 @@
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ $<
- 
-+cachemgr__CGIEXT_-cachemgr.o: cachemgr.cc
-+@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(cachemgr__CGIEXT__CXXFLAGS) $(CXXFLAGS) -MT cachemgr__CGIEXT_-cachemgr.o -MD -MP -MF "$(DEPDIR)/cachemgr__CGIEXT_-cachemgr.Tpo" -c -o cachemgr__CGIEXT_-cachemgr.o `test -f 'cachemgr.cc' || echo '$(srcdir)/'`cachemgr.cc; \
-+@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/cachemgr__CGIEXT_-cachemgr.Tpo" "$(DEPDIR)/cachemgr__CGIEXT_-cachemgr.Po"; else rm -f "$(DEPDIR)/cachemgr__CGIEXT_-cachemgr.Tpo"; exit 1; fi
-+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='cachemgr.cc' object='cachemgr__CGIEXT_-cachemgr.o' libtool=no @AMDEPBACKSLASH@
-+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(cachemgr__CGIEXT__CXXFLAGS) $(CXXFLAGS) -c -o cachemgr__CGIEXT_-cachemgr.o `test -f 'cachemgr.cc' || echo '$(srcdir)/'`cachemgr.cc
-+
-+cachemgr__CGIEXT_-cachemgr.obj: cachemgr.cc
-+@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(cachemgr__CGIEXT__CXXFLAGS) $(CXXFLAGS) -MT cachemgr__CGIEXT_-cachemgr.obj -MD -MP -MF "$(DEPDIR)/cachemgr__CGIEXT_-cachemgr.Tpo" -c -o cachemgr__CGIEXT_-cachemgr.obj `if test -f 'cachemgr.cc'; then $(CYGPATH_W) 'cachemgr.cc'; else $(CYGPATH_W) '$(srcdir)/cachemgr.cc'; fi`; \
-+@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/cachemgr__CGIEXT_-cachemgr.Tpo" "$(DEPDIR)/cachemgr__CGIEXT_-cachemgr.Po"; else rm -f "$(DEPDIR)/cachemgr__CGIEXT_-cachemgr.Tpo"; exit 1; fi
-+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='cachemgr.cc' object='cachemgr__CGIEXT_-cachemgr.obj' libtool=no @AMDEPBACKSLASH@
-+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(cachemgr__CGIEXT__CXXFLAGS) $(CXXFLAGS) -c -o cachemgr__CGIEXT_-cachemgr.obj `if test -f 'cachemgr.cc'; then $(CYGPATH_W) 'cachemgr.cc'; else $(CYGPATH_W) '$(srcdir)/cachemgr.cc'; fi`
-+
- mostlyclean-libtool:
- 	-rm -f *.lo
- 
-@@ -835,6 +849,8 @@
- $(OBJS): $(top_srcdir)/include/version.h ../include/autoconf.h
- 
- install-data-local:
-+	@echo "$(INSTALL_DATA) $(srcdir)/cachemgr.conf $(DESTDIR)$(DEFAULT_CACHEMGR_CONFIG).default"; \
-+	$(INSTALL_DATA) $(srcdir)/cachemgr.conf $(DESTDIR)$(DEFAULT_CACHEMGR_CONFIG).default;
- 	@if test -f $(DESTDIR)$(DEFAULT_CACHEMGR_CONFIG) ; then \
- 	        echo "$@ will not overwrite existing $(DESTDIR)$(DEFAULT_CACHEMGR_CONFIG)" ; \
- 	else \