2 files changed, 78 insertions, 16 deletions

diff --git a/sysutils/fastest_cvsup/Makefile b/sysutils/fastest_cvsup/Makefile
index f953f1b643d7..599b14711bc4 100644
--- a/sysutils/fastest_cvsup/Makefile
+++ b/sysutils/fastest_cvsup/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	fastest_cvsup
 PORTVERSION=	0.2.9
+PORTREVISION=	1
 CATEGORIES=	sysutils
 MASTER_SITES=	http://fastest-cvsup.sourceforge.net/download/
 
@@ -22,7 +23,7 @@ PLIST_FILES=	bin/fastest_cvsup
 .include <bsd.port.pre.mk>
 
 .if ${PERL_LEVEL} < 500805
-RUN_DEPENDS=	${SITE_PERL}/${PERL_ARCH}/Time/HiRes.pm:${PORTSDIR}/devel/p5-Time-HiRes
+RUN_DEPENDS+=	${SITE_PERL}/${PERL_ARCH}/Time/HiRes.pm:${PORTSDIR}/devel/p5-Time-HiRes
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/sysutils/fastest_cvsup/files/patch-fastest__cvsup b/sysutils/fastest_cvsup/files/patch-fastest__cvsup
index fcd2f058e61d..2396cdc654ae 100644
--- a/sysutils/fastest_cvsup/files/patch-fastest__cvsup
+++ b/sysutils/fastest_cvsup/files/patch-fastest__cvsup
@@ -1,5 +1,5 @@
---- fastest_cvsup.orig	Thu Sep 19 21:12:17 2002
-+++ fastest_cvsup	Mon Dec 13 18:06:56 2004
+--- fastest_cvsup.orig	Thu Sep 19 20:12:17 2002
++++ fastest_cvsup	Sat Apr 16 17:16:50 2005
 @@ -1,13 +1,15 @@
  #!/usr/bin/perl
  #-----------------------------------------------------------------------------#
@@ -17,27 +17,88 @@
  # 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
+@@ -74,16 +76,18 @@
+ # How many FreeBSD CVSup servers has each country got? (well, not strictly
+ # true... what's the highest cvsup number in use?
+ 
+-my %FREEBSD_SERVERS = (     # last updated: Thu Sep 19 12:56:23 2002
++my %FREEBSD_SERVERS = (     # last updated: Sat Apr 16 17:15:39 CST 2005
+   'ar' => 1,    # Argentina
+-  'at' => 1,    # Austria
+-  'au' => 5,    # Australia
+-  'br' => 4,    # Brazil
+-  'ca' => 2,    # Canada
+-  'cn' => 1,    # China
++  'at' => 2,    # Austria
++  'au' => 7,    # Australia
++  'br' => 5,    # Brazil
++  'ca' => 1,    # Canada
++  'ch' => 1,    # Switzerland
++  'cn' => 5,    # China
++  'cr' => 1,    # Costa Rica
    'cz' => 1,    # Czech Republic
 -  'de' => 7,    # Germany
+-  'dk' => 1,    # Denmark
 +  'de' => 8,    # Germany
-   'dk' => 1,    # Denmark
++  'dk' => 3,    # Denmark
    'ee' => 1,    # Estonia
    'es' => 3,    # Spain
-@@ -110,8 +112,9 @@
-   'tw' => 3,    # Taiwan
-   'ua' => 5,    # Ukraine
-   'uk' => 5,    # United Kingdom
+   'fi' => 2,    # Finland
+@@ -93,25 +97,32 @@
+   'ie' => 1,    # Ireland
+   'is' => 1,    # Iceland
+   'jp' => 6,    # Japan
+-  'kr' => 2,    # Korea
+-  'lt' => 2,    # Lithuania
++  'kg' => 1,    # Kyrgyzstan
++  'kr' => 3,    # Korea
++  'kw' => 1,    # Kuwait
++  'lt' => 3,    # Lithuania
+   'lv' => 1,    # Latvia
+-  'nl' => 3,    # Netherlands
++  'nl' => 5,    # Netherlands
+   'no' => 1,    # Norway
+   'nz' => 1,    # New Zealand
+-  'pl' => 1,    # Poland
+-  'pt' => 1,    # Portugal
+-  'ro' => 1,    # Romania
++  'ph' => 1,    # Philippines
++  'pl' => 3,    # Poland
++  'pt' => 3,    # Portugal
++  'ro' => 3,    # Romania
+   'ru' => 6,    # Russia
+-  'se' => 2,    # Sweden
+-  'si' => 1,    # Slovenia
++  'se' => 3,    # Sweden
++  'sg' => 1,    # Singapore
++  'si' => 2,    # Slovenia
+   'sk' => 2,    # Slovak Republic
+   'sm' => 1,    # San Marino
+-  'tw' => 3,    # Taiwan
+-  'ua' => 5,    # Ukraine
+-  'uk' => 5,    # United Kingdom
 -  'us' => 17,   # USA
++  'th' => 1,    # Thailand
++  'tr' => 1,    # Turkey
++  'tw' => 13,	# Taiwan
++  'ua' => 7,    # Ukraine
++  'uk' => 4,    # United Kingdom
 +  'us' => 18,   # USA
    'za' => 2,    # South Africa
 +  'tld' => 18,	# Top Level Domain
  );
  
  my %OTHER_SERVERS = (
-@@ -177,6 +180,7 @@
+@@ -141,6 +152,8 @@
+                  'rt.fm',
+                  'skeleton.phys.spbu.ru',
+                  'cvsup.jp.openbsd.org',
++                 'cvsup.tw.openbsd.org',
++                 'openbsd.cc.ntu.edu.tw',
+                  'wiretapped.net',
+                ],
+ );
+@@ -177,6 +190,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",
@@ -45,7 +106,7 @@
          "            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 @@
+@@ -307,12 +321,12 @@
              unless ( $cc_name{$cc} ) { $cc_name{$cc} = $country }
            }
  
@@ -61,7 +122,7 @@
            }
          }
        }
-@@ -419,7 +423,7 @@
+@@ -419,7 +433,7 @@
  
    for ( my $i=1; $i<=$FREEBSD_SERVERS{$cc}; $i++ ) {
  
@@ -70,7 +131,7 @@
        if ( $i == 1 ) { push(@first,"cvsup$i.freebsd.org"); }
        else           { push(@others,"cvsup$i.freebsd.org"); }
      }
-@@ -575,7 +579,7 @@
+@@ -575,7 +589,7 @@
  
  =head1 SYNOPSIS
  
@@ -79,7 +140,7 @@
  
  =head1 DESCRIPTION
  
-@@ -619,6 +623,11 @@
+@@ -619,6 +633,11 @@
  
  NetBSD and OpenBSD servers are lumped together under the 'netbsd' and
  'openbsd' codes respectively.