ports/74711: update for fastest_cvsup port

[Ken Smith]

>Number:         74711
>Category:       ports
>Synopsis:       update for fastest_cvsup port
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Sun Dec 05 09:10:15 GMT 2004
>Closed-Date:
>Last-Modified:
>Originator:     Ken Smith
>Release:        FreeBSD 5.3-RELEASE-p1 amd64
>Organization:
FreeBSD
>Environment:
System: FreeBSD bloom.cse.buffalo.edu 5.3-RELEASE-p1 FreeBSD 5.3-RELEASE-p1 #2: Fri Nov 19 13:24:04 EST 2004 root at bloom.cse.buffalo.edu:/usr/obj/usr/src/sys/GENERIC amd64


>Description:
	This adds support for cvsup*.us.freebsd.org hosts (which is the
	new place for servers guaranteed to be in the USA) and makes
	the tld (Top Level Domain) hosts a separate thing.  TLD hosts are
	no longer guaranteed to be in the USA - they are generally reliable
	servers with good net connectivity and relatively high connection
	limits but can be anywhere in the world.

>How-To-Repeat:
	Running with "-c us" currently lists the cvsup*.freebsd.org machines
	which is wrong, should be cvsup*.us.freebsd.org.  Adding "-c tld"
	was fallout from fixing that.
>Fix:

	See patch below, but I'm not sure how to handle it.  I hate to dump
	it off on you guys because it seems like The Right Thing to do
	would be get its release files on Sourceforge updated.  But I
	haven't been successful contacting the original maintainer or
	gotten anything resembling contact info from what's at Sourceforge.
	So, not quite sure what to do with this...  If you need any sort
	of confirmation this change is valid for the cvsup mirror site
	structure <cvsup-master at freebsd dot org> can confirm though
	it might be me that answers... :-)

--- fastest_cvsup_orig	Tue Nov 30 10:55:49 2004
+++ fastest_cvsup	Thu Dec  2 02:07:32 2004
@@ -1,13 +1,15 @@
 #!/usr/bin/perl
 #-----------------------------------------------------------------------------#
 #
-#  Find fastest CVSup server script for FreeBSD - version 0.2.8
+#  Find fastest CVSup server script for FreeBSD - version 0.2.9
 #  Copyright (c) A.J.Robinson (ajr at subdimension.com) 2002
 #  Distributed under the BSD license.
 #
 #-----------------------------------------------------------------------------#
 #
 # Changes:
+# 0.2.9  - added 'us' country code for USA hosts and 'tld' for top-level
+#          domain machines (can be in any country)
 # 0.2.8  - fixed the progress meter, timestamped %FREEBSD_SERVERS
 # 0.2.7  - updated documentation, usage message and progress meter.
 # 0.2.6  - changed from freebsdmirrors.org to the online handbook.
@@ -82,7 +84,7 @@
   'ca' => 2,    # Canada
   'cn' => 1,    # China
   'cz' => 1,    # Czech Republic
-  'de' => 8,    # Germany
+  'de' => 7,    # Germany
   'dk' => 1,    # Denmark
   'ee' => 1,    # Estonia
   'es' => 3,    # Spain
@@ -110,8 +112,9 @@
   'tw' => 3,    # Taiwan
   'ua' => 5,    # Ukraine
   'uk' => 5,    # United Kingdom
-  'us' => 17,   # USA
+  'us' => 18,   # USA
   'za' => 2,    # South Africa
+  'tld' => 18,	# Top Level Domain
 );
 
 my %OTHER_SERVERS = (
@@ -177,6 +180,7 @@
         "         -Q           very quiet mode, no progress meter\n",
         "         -r           uses remote server list from FreeBSD Handbook\n",
         "         -c aa,bb,cc  queries servers in countries aa,bb,cc\n",
+        "            tld       queries servers in the top level domain\n",
         "            local     queries servers set as local in the script\n",
         "            all       queries all FreeBSD servers\n\n",
         "  See the man page, fastest_cvsup(7), for more details.\n\n";
@@ -307,12 +311,12 @@
             unless ( $cc_name{$cc} ) { $cc_name{$cc} = $country }
           }
 
-          # parse US servers
+          # parse TLD servers
 
           elsif ( $server =~ /cvsup([\d]*)\.freebsd\.org/i ) {
             my $i = $1 || 1;
-            if ( !$srv{'us'} or $srv{'us'} < $i ) { $srv{'us'} = $i }
-            unless ( $cc_name{'us'} ) { $cc_name{'us'} = $country }
+            if ( !$srv{'tld'} or $srv{'tld'} < $i ) { $srv{'tld'} = $i }
+            unless ( $cc_name{'tld'} ) { $cc_name{'tld'} = $country }
           }
         }
       }
@@ -419,7 +423,7 @@
 
   for ( my $i=1; $i<=$FREEBSD_SERVERS{$cc}; $i++ ) {
 
-    if ( $cc eq 'us' ) { # use no country code, include the '1'
+    if ( $cc eq 'tld' ) { # use no country code, include the '1'
       if ( $i == 1 ) { push(@first,"cvsup$i.freebsd.org"); }
       else           { push(@others,"cvsup$i.freebsd.org"); }
     }
@@ -575,7 +579,7 @@
 
 =head1 SYNOPSIS
 
-B<fastest_cvsup> [B<-h>] [B<-(q|Q)>] [B<-r>] B<-c> (B<country codes>|B<local>|B<all>)
+B<fastest_cvsup> [B<-h>] [B<-(q|Q)>] [B<-r>] B<-c> (B<country codes>|B<tld>|B<local>|B<all>)
 
 =head1 DESCRIPTION
 
@@ -619,6 +623,11 @@
 
 NetBSD and OpenBSD servers are lumped together under the 'netbsd' and
 'openbsd' codes respectively.
+
+=item B<-c tld>
+
+checks the servers in the Top Level Domain.  These can be anywhere in the
+world.
 
 =item B<-c local>
 


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