ports/136122: [Maintainer] www/squid, www/squid30: update MASTER_SITE_SUBDIR

[Thomas-Martin Seck]

>Number:         136122
>Category:       ports
>Synopsis:       [Maintainer] www/squid, www/squid30: update MASTER_SITE_SUBDIR
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Sun Jun 28 10:30:06 UTC 2009
>Closed-Date:
>Last-Modified:
>Originator:     Thomas-Martin Seck
>Release:        FreeBSD 7.2-RELEASE i386
>Organization:
a private site in Germany
>Environment:
FreeBSD ports collection as of June 28, 2009.

	
>Description:
The Squid developers reorganized the FTP directory structure. Tarballs for
actively maintained versions (2.7, 3.0 and 3.1) are now stored in the
FTP server's /pub/squid/ directory. Update MASTER_SITE_SUBDIR accordingly.

This change needs to be checked against the distfile survey in a few
days once all FTP mirrors have synchronized themselves with the
main Squid FTP server, especially with regards to the ring server network.

	
>How-To-Repeat:
	
>Fix:
Patch for www/squid:

Index: Makefile
===================================================================
--- Makefile	(.../www/squid)	(revision 1635)
+++ Makefile	(.../local/squid)	(revision 1635)
@@ -94,7 +94,7 @@
 		http://www1.uk.squid-cache.org/Versions/v2/2.7/ \
 		http://www1.jp.squid-cache.org/Versions/v2/2.7/ \
 		http://www2.tw.squid-cache.org/Versions/v2/2.7/
-MASTER_SITE_SUBDIR=	squid-2/STABLE
+MASTER_SITE_SUBDIR=	squid
 DISTNAME=	squid-2.7.STABLE${SQUID_STABLE_VER}
 DIST_SUBDIR=	squid2.7
 
Patch for www/squid30:

Index: Makefile
===================================================================
--- Makefile	(.../www/squid30)	(revision 1635)
+++ Makefile	(.../local/squid30)	(revision 1635)
@@ -78,7 +78,7 @@
 		http://www1.uk.squid-cache.org/Versions/v3/3.0/ \
 		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
+MASTER_SITE_SUBDIR=	squid
 DISTNAME=	squid-3.0.STABLE${SQUID_STABLE_VER}
 DIST_SUBDIR=	squid3.0
 
@@ -101,7 +101,7 @@
 
 SQUID_STABLE_VER=	16
 
-CONFLICTS=	squid-2.[0-9].* cacheboy-[0-9]*
+CONFLICTS=	squid-2.[0-9].* squid-3.[^0].* cacheboy-[0-9]*
 GNU_CONFIGURE=	yes
 USE_BZIP2=	yes
 USE_PERL5=	yes
>Release-Note:
>Audit-Trail:
>Unformatted: