ports/105418: [Maintainer] www/squid: point MASTER_SITES at HTTP mirrors; unbreak fetching

[Thomas-Martin Seck]

>Number:         105418
>Category:       ports
>Synopsis:       [Maintainer] www/squid: point MASTER_SITES at HTTP mirrors; unbreak fetching
>Confidential:   no
>Severity:       serious
>Priority:       high
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Sat Nov 11 23:30:16 GMT 2006
>Closed-Date:
>Last-Modified:
>Originator:     Thomas-Martin Seck
>Release:        FreeBSD 4.11-STABLE i386
>Organization:
a private site in Germany
>Environment:
FreeBSD ports collection as of November 11, 2006.

	
>Description:

The Squid project seems to have removed the distfiles for Squid 2.5
from their FTP server and most mirrors followed suit, cf fenner's
distfile survey for www/squid.

The distfiles are available via the HTTP mirrors for now so use
these instead.  While at it replace the www1.nl mirror with www2.nl
since the former seems to be a bit unresponsive at times.

In the short run I would like to move www/squid to www/squid25 and
www/squid26 to www/squid. Should I wait until 6.2 is out the door
or should I file a repocopy request right away?
	
>How-To-Repeat:
1) cd /usr/ports/www/squid && make fetch
2) see http://people.freebsd.org/~fenner/portsurvey/www.html#squid

	
>Fix:
Apply this patch:

Index: Makefile
===================================================================
--- Makefile	(revision 1039)
+++ Makefile	(revision 1040)
@@ -75,30 +75,21 @@
 PORTVERSION=	2.5.14
 PORTREVISION=	3
 CATEGORIES=	www
-MASTER_SITES=	\
-		ftp://ftp.squid-cache.org/pub/%SUBDIR%/ \
-		ftp://ftp.vistech.net/pub/squid/%SUBDIR%/ \
-		ftp://mirrors.24-7-solutions.net/pub/squid/%SUBDIR%/ \
-		ftp://sunsite.auc.dk/pub/infosystems/squid/%SUBDIR%/ \
-		ftp://ftp.nl.uu.net/pub/unix/www/squid/%SUBDIR%/ \
-		ftp://ftp.mirrorservice.org/sites/ftp.squid-cache.org/pub/%SUBDIR%/ \
-		ftp://ftp.ntua.gr/pub/www/Squid/%SUBDIR%/ \
-		ftp://ftp.ccs.neu.edu/pub/mirrors/squid.nlanr.net/pub/%SUBDIR%/ \
-		${MASTER_SITE_RINGSERVER:S,%SUBDIR%,net/www/squid/&,}
-MASTER_SITE_SUBDIR=	squid-2/STABLE
-DISTNAME=	squid-2.5.STABLE14
-DIST_SUBDIR=	squid2.5
-
-PATCH_SITES=	http://www.squid-cache.org/%SUBDIR%/ \
+MASTER_SITES=	http://www.squid-cache.org/%SUBDIR%/ \
 		http://www2.us.squid-cache.org/%SUBDIR%/ \
 		http://www3.us.squid-cache.org/%SUBDIR%/ \
 		http://www1.at.squid-cache.org/%SUBDIR%/ \
-		http://www1.nl.squid-cache.org/%SUBDIR%/ \
+		http://www2.nl.squid-cache.org/%SUBDIR%/ \
 		http://www1.ru.squid-cache.org/%SUBDIR%/ \
 		http://www1.uk.squid-cache.org/%SUBDIR%/ \
 		http://www1.gr.squid-cache.org/%SUBDIR%/ \
 		http://www1.jp.squid-cache.org/%SUBDIR%/ \
 		http://www1.tw.squid-cache.org/%SUBDIR%/
+MASTER_SITE_SUBDIR=	Versions/v2/2.5
+DISTNAME=	squid-2.5.STABLE14
+DIST_SUBDIR=	squid2.5
+
+PATCH_SITES=	${MASTER_SITES}
 PATCH_SITE_SUBDIR=	Versions/v2/2.5/bugs
 PATCHFILES=	squid-2.5.STABLE14-httpReplyDestroy.patch \
 		squid-2.5.STABLE14-hierarchy_tag.patch
	


>Release-Note:
>Audit-Trail:
>Unformatted: