From owner-svn-src-all@FreeBSD.ORG  Sun May 22 09:48:25 2011
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id C7F0F106566C;
	Sun, 22 May 2011 09:48:25 +0000 (UTC) (envelope-from uqs@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 9E5478FC0A;
	Sun, 22 May 2011 09:48:25 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p4M9mPwv068193;
	Sun, 22 May 2011 09:48:25 GMT (envelope-from uqs@svn.freebsd.org)
Received: (from uqs@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id p4M9mP2m068191;
	Sun, 22 May 2011 09:48:25 GMT (envelope-from uqs@svn.freebsd.org)
Message-Id: <201105220948.p4M9mP2m068191@svn.freebsd.org>
From: Ulrich Spoerlein <uqs@FreeBSD.org>
Date: Sun, 22 May 2011 09:48:25 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r222171 - head/tools/tools/iso
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 22 May 2011 09:48:25 -0000

Author: uqs
Date: Sun May 22 09:48:25 2011
New Revision: 222171
URL: http://svn.freebsd.org/changeset/base/222171

Log:
  Update URLs and fix regex to work with current version of the files.

Modified:
  head/tools/tools/iso/check-iso3166.pl

Modified: head/tools/tools/iso/check-iso3166.pl
==============================================================================
--- head/tools/tools/iso/check-iso3166.pl	Sun May 22 03:18:25 2011	(r222170)
+++ head/tools/tools/iso/check-iso3166.pl	Sun May 22 09:48:25 2011	(r222171)
@@ -4,8 +4,8 @@
 # $FreeBSD$
 #
 # This script compares the file iso3166 (from head/share/misc) with the files
-# list-en1-semic-2.txt (from
-# http://www.iso.org/iso/list-en1-semic-2.txt) and iso3166-countrycodes.txt
+# list-en1-semic-3.txt (from
+# http://www.iso.org/iso/list-en1-semic-3.txt) and iso3166-countrycodes.txt
 # (from ftp://ftp.ripe.net/) to see if there any differences.
 #
 # Created by Edwin Groothuis <edwin@FreeBSD.org> for the FreeBSD project.
@@ -41,7 +41,7 @@ my %old = ();
 
 my %new1 = ();
 {
-	open(FIN, "iso3166-countrycodes.txt") or die "Cannot open iso3166-countrycodes.txt, which can be retrieved from ftp://ftp.ripe.net/";
+	open(FIN, "iso3166-countrycodes.txt") or die "Cannot open iso3166-countrycodes.txt, which can be retrieved from ftp://ftp.ripe.net/iso3166-countrycodes.txt";
 	my @lines = <FIN>;
 	close(FIN);
 	chomp(@lines);
@@ -56,7 +56,7 @@ my %new1 = ();
 		next if ($l eq "");
 
 		die "Invalid line: $l\n"
-			if ($l !~ /^(.+?)[\t ][\t ]+([A-Z]{2})[\t ]+([A-Z]{3})[\t ]+(\d+)[\t ]*$/);
+			if ($l !~ /^(.+?)[\t ]+([A-Z]{2})[\t ]+([A-Z]{3})[\t ]+(\d+)[\t ]*$/);
 		my $two = $2;
 		my $three = $3;
 		my $number = $4;
@@ -71,7 +71,7 @@ my %new1 = ();
 
 my %new2 = ();
 {
-	open(FIN, "list-en1-semic-2.txt") or die "Cannot open list-en1-semic-2.txt, which can be retrieved from http://www.iso.org/iso/list-en1-semic-2.txt";
+	open(FIN, "list-en1-semic-3.txt") or die "Cannot open list-en1-semic-3.txt, which can be retrieved from http://www.iso.org/iso/list-en1-semic-3.txt";
 	my @lines = <FIN>;
 	close(FIN);
 	chomp(@lines);