From owner-svn-src-vendor@FreeBSD.ORG Mon Apr 19 20:54:01 2010 Return-Path: Delivered-To: svn-src-vendor@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 0924B1065687; Mon, 19 Apr 2010 20:54:01 +0000 (UTC) (envelope-from edwin@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id EAD138FC18; Mon, 19 Apr 2010 20:54:00 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o3JKs02e013056; Mon, 19 Apr 2010 20:54:00 GMT (envelope-from edwin@svn.freebsd.org) Received: (from edwin@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o3JKs0id013052; Mon, 19 Apr 2010 20:54:00 GMT (envelope-from edwin@svn.freebsd.org) Message-Id: <201004192054.o3JKs0id013052@svn.freebsd.org> From: Edwin Groothuis Date: Mon, 19 Apr 2010 20:54:00 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-vendor@freebsd.org X-SVN-Group: vendor MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r206865 - vendor/tzdata/dist X-BeenThere: svn-src-vendor@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the vendor work area tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 19 Apr 2010 20:54:01 -0000 Author: edwin Date: Mon Apr 19 20:54:00 2010 New Revision: 206865 URL: http://svn.freebsd.org/changeset/base/206865 Log: Vendor import of tzdata2010i: - Marocca will have DST this year between May and August - Historical data for Taiwan - No more DST for the Argentinian province/state San Luis this year. Obtained from: ftp://elsie.nci.nih.gov/pub/ Modified: vendor/tzdata/dist/africa vendor/tzdata/dist/asia vendor/tzdata/dist/southamerica Modified: vendor/tzdata/dist/africa ============================================================================== --- vendor/tzdata/dist/africa Mon Apr 19 20:53:37 2010 (r206864) +++ vendor/tzdata/dist/africa Mon Apr 19 20:54:00 2010 (r206865) @@ -1,5 +1,5 @@ # 
-# @(#)africa	8.23
+# @(#)africa	8.26
 # This file is in the public domain, so clarified as of
 # 2009-05-17 by Arthur David Olson.
 
@@ -680,6 +680,21 @@ Zone	Indian/Mayotte	3:00:56 -	LMT	1911 J
 # http://www.worldtimezone.com/dst_news/dst_news_morocco03.html
 # 
 
+# From Steffen Thorsen (2010-04-13):
+# Several news media in Morocco report that the Ministry of Modernization
+# of Public Sectors has announced that Morocco will have DST from
+# 2010-05-02 to 2010-08-08.
+#
+# Example:
+# 
+# http://www.lavieeco.com/actualites/4099-le-maroc-passera-a-l-heure-d-ete-gmt1-le-2-mai.html
+# 
+# (French)
+# Our page:
+# 
+# http://www.timeanddate.com/news/time/morocco-starts-dst-2010.html
+# 
+
 # RULE	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
 
 Rule	Morocco	1939	only	-	Sep	12	 0:00	1:00	S
@@ -701,6 +716,8 @@ Rule	Morocco	2008	only	-	Jun	 1	 0:00	1:
 Rule	Morocco	2008	only	-	Sep	 1	 0:00	0	-
 Rule	Morocco	2009	only	-	Jun	 1	 0:00	1:00	S
 Rule	Morocco	2009	only	-	Aug	 21	 0:00	0	-
+Rule	Morocco	2010	only	-	May	 2	 0:00	1:00	S
+Rule	Morocco	2010	only	-	Aug	 8	 0:00	0	-
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone Africa/Casablanca	-0:30:20 -	LMT	1913 Oct 26
 			 0:00	Morocco	WE%sT	1984 Mar 16
@@ -942,6 +959,24 @@ Zone	Africa/Lome	0:04:52 -	LMT	1893
 # Therefore, the standard time will be kept unchanged the whole year long."
 # So foregoing DST seems to be an exception (albeit one that may be repeated in the  future).
 
+# From Alexander Krivenyshev (2010-03-27):
+# According to some news reports Tunis confirmed not to use DST in 2010
+#
+# (translation):
+# "The Tunisian government has decided to abandon DST, which was scheduled on
+# Sunday...
+# Tunisian authorities had suspended the DST for the first time last year also
+# coincided with the month of Ramadan..."
+#
+# (in Arabic)
+# 
+# http://www.moheet.com/show_news.aspx?nid=358861&pg=1
+# 
+# http://www.almadenahnews.com/newss/news.php?c=118&id=38036
+# or
+# 
+# http://www.worldtimezone.com/dst_news/dst_news_tunis02.html
+
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
 Rule	Tunisia	1939	only	-	Apr	15	23:00s	1:00	S
 Rule	Tunisia	1939	only	-	Nov	18	23:00s	0	-
@@ -968,8 +1003,7 @@ Rule	Tunisia	2005	only	-	May	 1	 0:00s	1
 Rule	Tunisia	2005	only	-	Sep	30	 1:00s	0	-
 Rule	Tunisia	2006	2008	-	Mar	lastSun	 2:00s	1:00	S
 Rule	Tunisia	2006	2008	-	Oct	lastSun	 2:00s	0	-
-Rule	Tunisia	2010	max	-	Mar	lastSun	 2:00s	1:00	S
-Rule	Tunisia	2010	max	-	Oct	lastSun	 2:00s	0	-
+
 # Shanks & Pottenger give 0:09:20 for Paris Mean Time; go with Howse's
 # more precise 0:09:21.
 # Shanks & Pottenger say the 1911 switch was on Mar 9; go with Howse's Mar 11.

Modified: vendor/tzdata/dist/asia
==============================================================================
--- vendor/tzdata/dist/asia	Mon Apr 19 20:53:37 2010	(r206864)
+++ vendor/tzdata/dist/asia	Mon Apr 19 20:54:00 2010	(r206865)
@@ -1,4 +1,4 @@
-# @(#)asia	8.58
+# @(#)asia	8.60
 # This file is in the public domain, so clarified as of
 # 2009-05-17 by Arthur David Olson.
 
@@ -566,6 +566,28 @@ Zone	Asia/Hong_Kong	7:36:36 -	LMT	1904 O
 # was still controlled by Japan.  This is hard to believe, but we don't
 # have any other information.
 
+# From smallufo (2010-04-03):
+# According to Taiwan's CWB,
+# 
+# http://www.cwb.gov.tw/V6/astronomy/cdata/summert.htm
+# 
+# Taipei has DST in 1979 between July 1st and Sep 30.
+
+# From Arthur David Olson (2010-04-07):
+# Here's Google's translation of the table at the bottom of the "summert.htm" page:
+# Decade 	                                                    Name                      Start and end date
+# Republic of China 34 years to 40 years (AD 1945-1951 years) Summer Time               May 1 to September 30 
+# 41 years of the Republic of China (AD 1952)                 Daylight Saving Time      March 1 to October 31 
+# Republic of China 42 years to 43 years (AD 1953-1954 years) Daylight Saving Time      April 1 to October 31 
+# In the 44 years to 45 years (AD 1955-1956 years)            Daylight Saving Time      April 1 to September 30 
+# Republic of China 46 years to 48 years (AD 1957-1959)       Summer Time               April 1 to September 30 
+# Republic of China 49 years to 50 years (AD 1960-1961)       Summer Time               June 1 to September 30 
+# Republic of China 51 years to 62 years (AD 1962-1973 years) Stop Summer Time 
+# Republic of China 63 years to 64 years (1974-1975 AD)       Daylight Saving Time      April 1 to September 30 
+# Republic of China 65 years to 67 years (1976-1978 AD)       Stop Daylight Saving Time 
+# Republic of China 68 years (AD 1979)                        Daylight Saving Time      July 1 to September 30 
+# Republic of China since 69 years (AD 1980)                  Stop Daylight Saving Time
+
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
 Rule	Taiwan	1945	1951	-	May	1	0:00	1:00	D
 Rule	Taiwan	1945	1951	-	Oct	1	0:00	0	S
@@ -576,8 +598,9 @@ Rule	Taiwan	1955	1961	-	Oct	1	0:00	0	S
 Rule	Taiwan	1960	1961	-	Jun	1	0:00	1:00	D
 Rule	Taiwan	1974	1975	-	Apr	1	0:00	1:00	D
 Rule	Taiwan	1974	1975	-	Oct	1	0:00	0	S
-Rule	Taiwan	1980	only	-	Jun	30	0:00	1:00	D
-Rule	Taiwan	1980	only	-	Sep	30	0:00	0	S
+Rule	Taiwan	1979	only	-	Jun	30	0:00	1:00	D
+Rule	Taiwan	1979	only	-	Sep	30	0:00	0	S
+
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone	Asia/Taipei	8:06:00 -	LMT	1896 # or Taibei or T'ai-pei
 			8:00	Taiwan	C%sT
@@ -1912,13 +1935,35 @@ Zone	Asia/Muscat	3:54:20 -	LMT	1920
 # [T]he German Consulate General in Karachi reported me today that Pakistan
 # will go back to standard time on 1st of November.
 
+# From Steffen Thorsen (2010-03-26):
+# Steffen Thorsen wrote:
+# > On Thursday (2010-03-25) it was announced that DST would start in
+# > Pakistan on 2010-04-01.
+# >
+# > Then today, the president said that they might have to revert the
+# > decision if it is not supported by the parliament. So at the time
+# > being, it seems unclear if DST will be actually observed or not - but
+# > April 1 could be a more likely date than April 15.
+# Now, it seems that the decision to not observe DST in final:
+#
+# "Govt Withdraws Plan To Advance Clocks"
+# 
+# http://www.apakistannews.com/govt-withdraws-plan-to-advance-clocks-172041
+# 
+#
+# "People laud PM's announcement to end DST"
+# 
+# http://www.app.com.pk/en_/index.php?option=com_content&task=view&id=99374&Itemid=2
+# 
+
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
 Rule Pakistan	2002	only	-	Apr	Sun>=2	0:01	1:00	S
 Rule Pakistan	2002	only	-	Oct	Sun>=2	0:01	0	-
 Rule Pakistan	2008	only	-	Jun	1	0:00	1:00	S
 Rule Pakistan	2008	only	-	Nov	1	0:00	0	-
-Rule Pakistan	2009	max	-	Apr	15	0:00	1:00	S
-Rule Pakistan	2009	max	-	Nov	1	0:00	0	-
+Rule Pakistan	2009	only	-	Apr	15	0:00	1:00	S
+Rule Pakistan	2009	only	-	Nov	1	0:00	0	-
+
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone	Asia/Karachi	4:28:12 -	LMT	1907
 			5:30	-	IST	1942 Sep

Modified: vendor/tzdata/dist/southamerica
==============================================================================
--- vendor/tzdata/dist/southamerica	Mon Apr 19 20:53:37 2010	(r206864)
+++ vendor/tzdata/dist/southamerica	Mon Apr 19 20:54:00 2010	(r206865)
@@ -1,5 +1,5 @@
 # 
-# @(#)southamerica	8.43
+# @(#)southamerica	8.44
 # This file is in the public domain, so clarified as of
 # 2009-05-17 by Arthur David Olson.
 
@@ -437,6 +437,27 @@ Rule	Arg	2008	only	-	Oct	Sun>=15	0:00	1:
 # of the country calls it "ART".
 # ...
 
+# From Alexander Krivenyshev (2010-04-09):
+# According to news reports from El Diario de la Republica Province San
+# Luis, Argentina (standard time UTC-04) will keep Daylight Saving Time
+# after April 11, 2010--will continue to have same time as rest of
+# Argentina (UTC-3) (no DST).
+#
+# Confirmaron la prórroga del huso horario de verano (Spanish)
+# 
+# http://www.eldiariodelarepublica.com/index.php?option=com_content&task=view&id=29383&Itemid=9
+# 
+# or (some English translation):
+# 
+# http://www.worldtimezone.com/dst_news/dst_news_argentina08.html
+# 
+
+# From Mariano Absatz (2010-04-12):
+# yes...I can confirm this...and given that San Luis keeps calling
+# UTC-03:00 "summer time", we should't just let San Luis go back to "Arg"
+# rules...San Luis is still using "Western ARgentina Time" and it got
+# stuck on Summer daylight savings time even though the summer is over.
+
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 #
 # Buenos Aires (BA), Capital Federal (CF),
@@ -570,8 +591,8 @@ Zone America/Argentina/Mendoza -4:35:16 
 #
 # San Luis (SL)
 
-Rule	SanLuis	2008	max	-	Mar	Sun>=8	0:00	0	-
-Rule	SanLuis	2007	max	-	Oct	Sun>=8	0:00	1:00	S
+Rule	SanLuis	2008	2009	-	Mar	Sun>=8	0:00	0	-
+Rule	SanLuis	2007	2009	-	Oct	Sun>=8	0:00	1:00	S
 
 Zone America/Argentina/San_Luis -4:25:24 - LMT	1894 Oct 31
 			-4:16:48 -	CMT	1920 May

From owner-svn-src-vendor@FreeBSD.ORG  Mon Apr 19 20:55:41 2010
Return-Path: 
Delivered-To: svn-src-vendor@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id EE9DB106564A;
	Mon, 19 Apr 2010 20:55:41 +0000 (UTC)
	(envelope-from edwin@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id B19898FC17;
	Mon, 19 Apr 2010 20:55:41 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o3JKtfC5013513;
	Mon, 19 Apr 2010 20:55:41 GMT (envelope-from edwin@svn.freebsd.org)
Received: (from edwin@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o3JKtf1v013512;
	Mon, 19 Apr 2010 20:55:41 GMT (envelope-from edwin@svn.freebsd.org)
Message-Id: <201004192055.o3JKtf1v013512@svn.freebsd.org>
From: Edwin Groothuis 
Date: Mon, 19 Apr 2010 20:55:41 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-vendor@freebsd.org
X-SVN-Group: vendor
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r206866 - vendor/tzdata/tzdata2010i
X-BeenThere: svn-src-vendor@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the vendor work area tree
	
List-Unsubscribe: , 
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
	
X-List-Received-Date: Mon, 19 Apr 2010 20:55:42 -0000

Author: edwin
Date: Mon Apr 19 20:55:41 2010
New Revision: 206866
URL: http://svn.freebsd.org/changeset/base/206866

Log:
  Tag of tzdata2010i

Added:
  vendor/tzdata/tzdata2010i/
     - copied from r206865, vendor/tzdata/dist/

From owner-svn-src-vendor@FreeBSD.ORG  Tue Apr 20 18:42:51 2010
Return-Path: 
Delivered-To: svn-src-vendor@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id D5C1F1065673;
	Tue, 20 Apr 2010 18:42:51 +0000 (UTC)
	(envelope-from delphij@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id C30AE8FC08;
	Tue, 20 Apr 2010 18:42:51 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o3KIgpoV011863;
	Tue, 20 Apr 2010 18:42:51 GMT (envelope-from delphij@svn.freebsd.org)
Received: (from delphij@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o3KIgpdH011844;
	Tue, 20 Apr 2010 18:42:51 GMT (envelope-from delphij@svn.freebsd.org)
Message-Id: <201004201842.o3KIgpdH011844@svn.freebsd.org>
From: Xin LI 
Date: Tue, 20 Apr 2010 18:42:51 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-vendor@freebsd.org
X-SVN-Group: vendor
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r206905 - vendor/libz/dist
X-BeenThere: svn-src-vendor@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the vendor work area tree
	
List-Unsubscribe: , 
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
	
X-List-Received-Date: Tue, 20 Apr 2010 18:42:52 -0000

Author: delphij
Date: Tue Apr 20 18:42:51 2010
New Revision: 206905
URL: http://svn.freebsd.org/changeset/base/206905

Log:
  Vendor import of zlib 1.2.5.

Modified:
  vendor/libz/dist/ChangeLog
  vendor/libz/dist/README
  vendor/libz/dist/crc32.c
  vendor/libz/dist/deflate.c
  vendor/libz/dist/deflate.h
  vendor/libz/dist/gzguts.h
  vendor/libz/dist/gzlib.c
  vendor/libz/dist/inffast.c
  vendor/libz/dist/inffast.h
  vendor/libz/dist/inftrees.c
  vendor/libz/dist/inftrees.h
  vendor/libz/dist/trees.c
  vendor/libz/dist/trees.h
  vendor/libz/dist/zconf.h
  vendor/libz/dist/zlib.3
  vendor/libz/dist/zlib.h
  vendor/libz/dist/zutil.c
  vendor/libz/dist/zutil.h

Modified: vendor/libz/dist/ChangeLog
==============================================================================
--- vendor/libz/dist/ChangeLog	Tue Apr 20 18:16:56 2010	(r206904)
+++ vendor/libz/dist/ChangeLog	Tue Apr 20 18:42:51 2010	(r206905)
@@ -1,6 +1,32 @@
 
                 ChangeLog file for zlib
 
+Changes in 1.2.5 (19 Apr 2010)
+- Disable visibility attribute in win32/Makefile.gcc [Bar-Lev]
+- Default to libdir as sharedlibdir in configure [Nieder]
+- Update copyright dates on modified source files
+- Update trees.c to be able to generate modified trees.h
+- Exit configure for MinGW, suggesting win32/Makefile.gcc
+
+Changes in 1.2.4.5 (18 Apr 2010)
+- Set sharedlibdir in configure [Torok]
+- Set LDFLAGS in Makefile.in [Bar-Lev]
+- Avoid mkdir objs race condition in Makefile.in [Bowler]
+- Add ZLIB_INTERNAL in front of internal inter-module functions and arrays
+- Define ZLIB_INTERNAL to hide internal functions and arrays for GNU C
+- Don't use hidden attribute when it is a warning generator (e.g. Solaris)
+
+Changes in 1.2.4.4 (18 Apr 2010)
+- Fix CROSS_PREFIX executable testing, CHOST extract, mingw* [Torok]
+- Undefine _LARGEFILE64_SOURCE in zconf.h if it is zero, but not if empty
+- Try to use bash or ksh regardless of functionality of /bin/sh
+- Fix configure incompatibility with NetBSD sh
+- Remove attempt to run under bash or ksh since have better NetBSD fix
+- Fix win32/Makefile.gcc for MinGW [Bar-Lev]
+- Add diagnostic messages when using CROSS_PREFIX in configure
+- Added --sharedlibdir option to configure [Weigelt]
+- Use hidden visibility attribute when available [Frysinger]
+
 Changes in 1.2.4.3 (10 Apr 2010)
 - Only use CROSS_PREFIX in configure for ar and ranlib if they exist
 - Use CROSS_PREFIX for nm [Bar-Lev]
@@ -151,7 +177,7 @@ Changes in 1.2.3.6 (17 Jan 2010)
 - Correct email address in configure for system options
 - Update make_vms.com and add make_vms.com to contrib/minizip [Zinser]
 - Update zlib.map [Brown]
-- Fix Makefile.in for Solaris 10 make of example64 and minizip64 [Tšršk]
+- Fix Makefile.in for Solaris 10 make of example64 and minizip64 [Torok]
 - Apply various fixes to CMakeLists.txt [Lowman]
 - Add checks on len in gzread() and gzwrite()
 - Add error message for no more room for gzungetc()

Modified: vendor/libz/dist/README
==============================================================================
--- vendor/libz/dist/README	Tue Apr 20 18:16:56 2010	(r206904)
+++ vendor/libz/dist/README	Tue Apr 20 18:42:51 2010	(r206905)
@@ -1,6 +1,6 @@
 ZLIB DATA COMPRESSION LIBRARY
 
-zlib 1.2.4.3 is a general purpose data compression library.  All the code is
+zlib 1.2.5 is a general purpose data compression library.  All the code is
 thread safe.  The data format used by the zlib library is described by RFCs
 (Request for Comments) 1950 to 1952 in the files
 http://www.ietf.org/rfc/rfc1950.txt (zlib format), rfc1951.txt (deflate format)
@@ -31,7 +31,7 @@ Mark Nelson  wrote an ar
 issue of Dr.  Dobb's Journal; a copy of the article is available at
 http://marknelson.us/1997/01/01/zlib-engine/ .
 
-The changes made in version 1.2.4.3 are documented in the file ChangeLog.
+The changes made in version 1.2.5 are documented in the file ChangeLog.
 
 Unsupported third party contributions are provided in directory contrib/ .
 

Modified: vendor/libz/dist/crc32.c
==============================================================================
--- vendor/libz/dist/crc32.c	Tue Apr 20 18:16:56 2010	(r206904)
+++ vendor/libz/dist/crc32.c	Tue Apr 20 18:42:51 2010	(r206905)
@@ -1,5 +1,5 @@
 /* crc32.c -- compute the CRC-32 of a data stream
- * Copyright (C) 1995-2006 Mark Adler
+ * Copyright (C) 1995-2006, 2010 Mark Adler
  * For conditions of distribution and use, see copyright notice in zlib.h
  *
  * Thanks to Rodney Brown  for his contribution of faster

Modified: vendor/libz/dist/deflate.c
==============================================================================
--- vendor/libz/dist/deflate.c	Tue Apr 20 18:16:56 2010	(r206904)
+++ vendor/libz/dist/deflate.c	Tue Apr 20 18:42:51 2010	(r206905)
@@ -52,7 +52,7 @@
 #include "deflate.h"
 
 const char deflate_copyright[] =
-   " deflate 1.2.4.3 Copyright 1995-2010 Jean-loup Gailly and Mark Adler ";
+   " deflate 1.2.5 Copyright 1995-2010 Jean-loup Gailly and Mark Adler ";
 /*
   If you use the zlib library in a product, an acknowledgment is welcome
   in the documentation of your product. If for some reason you cannot

Modified: vendor/libz/dist/deflate.h
==============================================================================
--- vendor/libz/dist/deflate.h	Tue Apr 20 18:16:56 2010	(r206904)
+++ vendor/libz/dist/deflate.h	Tue Apr 20 18:42:51 2010	(r206905)
@@ -1,5 +1,5 @@
 /* deflate.h -- internal compression state
- * Copyright (C) 1995-2009 Jean-loup Gailly
+ * Copyright (C) 1995-2010 Jean-loup Gailly
  * For conditions of distribution and use, see copyright notice in zlib.h
  */
 
@@ -290,13 +290,13 @@ typedef struct internal_state {
    memory checker errors from longest match routines */
 
         /* in trees.c */
-void _tr_init         OF((deflate_state *s));
-int  _tr_tally        OF((deflate_state *s, unsigned dist, unsigned lc));
-void _tr_flush_block  OF((deflate_state *s, charf *buf, ulg stored_len,
-                          int last));
-void _tr_align        OF((deflate_state *s));
-void _tr_stored_block OF((deflate_state *s, charf *buf, ulg stored_len,
-                          int last));
+void ZLIB_INTERNAL _tr_init OF((deflate_state *s));
+int ZLIB_INTERNAL _tr_tally OF((deflate_state *s, unsigned dist, unsigned lc));
+void ZLIB_INTERNAL _tr_flush_block OF((deflate_state *s, charf *buf,
+                        ulg stored_len, int last));
+void ZLIB_INTERNAL _tr_align OF((deflate_state *s));
+void ZLIB_INTERNAL _tr_stored_block OF((deflate_state *s, charf *buf,
+                        ulg stored_len, int last));
 
 #define d_code(dist) \
    ((dist) < 256 ? _dist_code[dist] : _dist_code[256+((dist)>>7)])
@@ -309,11 +309,11 @@ void _tr_stored_block OF((deflate_state 
 /* Inline versions of _tr_tally for speed: */
 
 #if defined(GEN_TREES_H) || !defined(STDC)
-  extern uch _length_code[];
-  extern uch _dist_code[];
+  extern uch ZLIB_INTERNAL _length_code[];
+  extern uch ZLIB_INTERNAL _dist_code[];
 #else
-  extern const uch _length_code[];
-  extern const uch _dist_code[];
+  extern const uch ZLIB_INTERNAL _length_code[];
+  extern const uch ZLIB_INTERNAL _dist_code[];
 #endif
 
 # define _tr_tally_lit(s, c, flush) \

Modified: vendor/libz/dist/gzguts.h
==============================================================================
--- vendor/libz/dist/gzguts.h	Tue Apr 20 18:16:56 2010	(r206904)
+++ vendor/libz/dist/gzguts.h	Tue Apr 20 18:42:51 2010	(r206905)
@@ -12,7 +12,11 @@
 #  endif
 #endif
 
-#define ZLIB_INTERNAL
+#if ((__GNUC__-0) * 10 + __GNUC_MINOR__-0 >= 33) && !defined(NO_VIZ)
+#  define ZLIB_INTERNAL __attribute__((visibility ("hidden")))
+#else
+#  define ZLIB_INTERNAL
+#endif
 
 #include 
 #include "zlib.h"
@@ -112,9 +116,9 @@ typedef struct {
 typedef gz_state FAR *gz_statep;
 
 /* shared functions */
-ZEXTERN void ZEXPORT gz_error OF((gz_statep, int, const char *));
+void ZLIB_INTERNAL gz_error OF((gz_statep, int, const char *));
 #if defined UNDER_CE
-ZEXTERN char ZEXPORT *gz_strwinerror OF((DWORD error));
+char ZLIB_INTERNAL *gz_strwinerror OF((DWORD error));
 #endif
 
 /* GT_OFF(x), where x is an unsigned value, is true if x > maximum z_off64_t
@@ -123,6 +127,6 @@ ZEXTERN char ZEXPORT *gz_strwinerror OF(
 #ifdef INT_MAX
 #  define GT_OFF(x) (sizeof(int) == sizeof(z_off64_t) && (x) > INT_MAX)
 #else
-ZEXTERN unsigned ZEXPORT gz_intmax OF((void));
+unsigned ZLIB_INTERNAL gz_intmax OF((void));
 #  define GT_OFF(x) (sizeof(int) == sizeof(z_off64_t) && (x) > gz_intmax())
 #endif

Modified: vendor/libz/dist/gzlib.c
==============================================================================
--- vendor/libz/dist/gzlib.c	Tue Apr 20 18:16:56 2010	(r206904)
+++ vendor/libz/dist/gzlib.c	Tue Apr 20 18:42:51 2010	(r206905)
@@ -26,7 +26,7 @@ local gzFile gz_open OF((const char *, i
 
    The gz_strwinerror function does not change the current setting of
    GetLastError. */
-char ZEXPORT *gz_strwinerror (error)
+char ZLIB_INTERNAL *gz_strwinerror (error)
      DWORD error;
 {
     static char buf[1024];
@@ -482,7 +482,7 @@ void ZEXPORT gzclearerr(file)
    memory).  Simply save the error message as a static string.  If there is an
    allocation failure constructing the error message, then convert the error to
    out of memory. */
-void ZEXPORT gz_error(state, err, msg)
+void ZLIB_INTERNAL gz_error(state, err, msg)
     gz_statep state;
     int err;
     const char *msg;
@@ -522,7 +522,7 @@ void ZEXPORT gz_error(state, err, msg)
    available) -- we need to do this to cover cases where 2's complement not
    used, since C standard permits 1's complement and sign-bit representations,
    otherwise we could just use ((unsigned)-1) >> 1 */
-unsigned ZEXPORT gz_intmax()
+unsigned ZLIB_INTERNAL gz_intmax()
 {
     unsigned p, q;
 

Modified: vendor/libz/dist/inffast.c
==============================================================================
--- vendor/libz/dist/inffast.c	Tue Apr 20 18:16:56 2010	(r206904)
+++ vendor/libz/dist/inffast.c	Tue Apr 20 18:42:51 2010	(r206905)
@@ -1,5 +1,5 @@
 /* inffast.c -- fast decoding
- * Copyright (C) 1995-2008 Mark Adler
+ * Copyright (C) 1995-2008, 2010 Mark Adler
  * For conditions of distribution and use, see copyright notice in zlib.h
  */
 
@@ -64,7 +64,7 @@
       requires strm->avail_out >= 258 for each loop to avoid checking for
       output space.
  */
-void inflate_fast(strm, start)
+void ZLIB_INTERNAL inflate_fast(strm, start)
 z_streamp strm;
 unsigned start;         /* inflate()'s starting value for strm->avail_out */
 {

Modified: vendor/libz/dist/inffast.h
==============================================================================
--- vendor/libz/dist/inffast.h	Tue Apr 20 18:16:56 2010	(r206904)
+++ vendor/libz/dist/inffast.h	Tue Apr 20 18:42:51 2010	(r206905)
@@ -1,5 +1,5 @@
 /* inffast.h -- header to use inffast.c
- * Copyright (C) 1995-2003 Mark Adler
+ * Copyright (C) 1995-2003, 2010 Mark Adler
  * For conditions of distribution and use, see copyright notice in zlib.h
  */
 
@@ -8,4 +8,4 @@
    subject to change. Applications should only use zlib.h.
  */
 
-void inflate_fast OF((z_streamp strm, unsigned start));
+void ZLIB_INTERNAL inflate_fast OF((z_streamp strm, unsigned start));

Modified: vendor/libz/dist/inftrees.c
==============================================================================
--- vendor/libz/dist/inftrees.c	Tue Apr 20 18:16:56 2010	(r206904)
+++ vendor/libz/dist/inftrees.c	Tue Apr 20 18:42:51 2010	(r206905)
@@ -9,7 +9,7 @@
 #define MAXBITS 15
 
 const char inflate_copyright[] =
-   " inflate 1.2.4.3 Copyright 1995-2010 Mark Adler ";
+   " inflate 1.2.5 Copyright 1995-2010 Mark Adler ";
 /*
   If you use the zlib library in a product, an acknowledgment is welcome
   in the documentation of your product. If for some reason you cannot
@@ -29,7 +29,7 @@ const char inflate_copyright[] =
    table index bits.  It will differ if the request is greater than the
    longest code or if it is less than the shortest code.
  */
-int inflate_table(type, lens, codes, table, bits, work)
+int ZLIB_INTERNAL inflate_table(type, lens, codes, table, bits, work)
 codetype type;
 unsigned short FAR *lens;
 unsigned codes;
@@ -62,7 +62,7 @@ unsigned short FAR *work;
         35, 43, 51, 59, 67, 83, 99, 115, 131, 163, 195, 227, 258, 0, 0};
     static const unsigned short lext[31] = { /* Length codes 257..285 extra */
         16, 16, 16, 16, 16, 16, 16, 16, 17, 17, 17, 17, 18, 18, 18, 18,
-        19, 19, 19, 19, 20, 20, 20, 20, 21, 21, 21, 21, 16, 195, 66};
+        19, 19, 19, 19, 20, 20, 20, 20, 21, 21, 21, 21, 16, 73, 195};
     static const unsigned short dbase[32] = { /* Distance codes 0..29 base */
         1, 2, 3, 4, 5, 7, 9, 13, 17, 25, 33, 49, 65, 97, 129, 193,
         257, 385, 513, 769, 1025, 1537, 2049, 3073, 4097, 6145,

Modified: vendor/libz/dist/inftrees.h
==============================================================================
--- vendor/libz/dist/inftrees.h	Tue Apr 20 18:16:56 2010	(r206904)
+++ vendor/libz/dist/inftrees.h	Tue Apr 20 18:42:51 2010	(r206905)
@@ -1,5 +1,5 @@
 /* inftrees.h -- header to use inftrees.c
- * Copyright (C) 1995-2005 Mark Adler
+ * Copyright (C) 1995-2005, 2010 Mark Adler
  * For conditions of distribution and use, see copyright notice in zlib.h
  */
 
@@ -57,6 +57,6 @@ typedef enum {
     DISTS
 } codetype;
 
-extern int inflate_table OF((codetype type, unsigned short FAR *lens,
+int ZLIB_INTERNAL inflate_table OF((codetype type, unsigned short FAR *lens,
                              unsigned codes, code FAR * FAR *table,
                              unsigned FAR *bits, unsigned short FAR *work));

Modified: vendor/libz/dist/trees.c
==============================================================================
--- vendor/libz/dist/trees.c	Tue Apr 20 18:16:56 2010	(r206904)
+++ vendor/libz/dist/trees.c	Tue Apr 20 18:42:51 2010	(r206905)
@@ -1,5 +1,5 @@
 /* trees.c -- output deflated data using Huffman coding
- * Copyright (C) 1995-2009 Jean-loup Gailly
+ * Copyright (C) 1995-2010 Jean-loup Gailly
  * detect_data_type() function provided freely by Cosmin Truta, 2006
  * For conditions of distribution and use, see copyright notice in zlib.h
  */
@@ -351,13 +351,14 @@ void gen_trees_header()
                 static_dtree[i].Len, SEPARATOR(i, D_CODES-1, 5));
     }
 
-    fprintf(header, "const uch _dist_code[DIST_CODE_LEN] = {\n");
+    fprintf(header, "const uch ZLIB_INTERNAL _dist_code[DIST_CODE_LEN] = {\n");
     for (i = 0; i < DIST_CODE_LEN; i++) {
         fprintf(header, "%2u%s", _dist_code[i],
                 SEPARATOR(i, DIST_CODE_LEN-1, 20));
     }
 
-    fprintf(header, "const uch _length_code[MAX_MATCH-MIN_MATCH+1]= {\n");
+    fprintf(header,
+        "const uch ZLIB_INTERNAL _length_code[MAX_MATCH-MIN_MATCH+1]= {\n");
     for (i = 0; i < MAX_MATCH-MIN_MATCH+1; i++) {
         fprintf(header, "%2u%s", _length_code[i],
                 SEPARATOR(i, MAX_MATCH-MIN_MATCH, 20));
@@ -382,7 +383,7 @@ void gen_trees_header()
 /* ===========================================================================
  * Initialize the tree data structures for a new zlib stream.
  */
-void _tr_init(s)
+void ZLIB_INTERNAL _tr_init(s)
     deflate_state *s;
 {
     tr_static_init();
@@ -867,7 +868,7 @@ local void send_all_trees(s, lcodes, dco
 /* ===========================================================================
  * Send a stored block
  */
-void _tr_stored_block(s, buf, stored_len, last)
+void ZLIB_INTERNAL _tr_stored_block(s, buf, stored_len, last)
     deflate_state *s;
     charf *buf;       /* input block */
     ulg stored_len;   /* length of input block */
@@ -892,7 +893,7 @@ void _tr_stored_block(s, buf, stored_len
  * To simplify the code, we assume the worst case of last real code encoded
  * on one bit only.
  */
-void _tr_align(s)
+void ZLIB_INTERNAL _tr_align(s)
     deflate_state *s;
 {
     send_bits(s, STATIC_TREES<<1, 3);
@@ -921,7 +922,7 @@ void _tr_align(s)
  * Determine the best encoding for the current block: dynamic trees, static
  * trees or store, and output the encoded block to the zip file.
  */
-void _tr_flush_block(s, buf, stored_len, last)
+void ZLIB_INTERNAL _tr_flush_block(s, buf, stored_len, last)
     deflate_state *s;
     charf *buf;       /* input block, or NULL if too old */
     ulg stored_len;   /* length of input block */
@@ -1022,7 +1023,7 @@ void _tr_flush_block(s, buf, stored_len,
  * Save the match info and tally the frequency counts. Return true if
  * the current block must be flushed.
  */
-int _tr_tally (s, dist, lc)
+int ZLIB_INTERNAL _tr_tally (s, dist, lc)
     deflate_state *s;
     unsigned dist;  /* distance of matched string */
     unsigned lc;    /* match length-MIN_MATCH or unmatched char (if dist==0) */

Modified: vendor/libz/dist/trees.h
==============================================================================
--- vendor/libz/dist/trees.h	Tue Apr 20 18:16:56 2010	(r206904)
+++ vendor/libz/dist/trees.h	Tue Apr 20 18:42:51 2010	(r206905)
@@ -70,7 +70,7 @@ local const ct_data static_dtree[D_CODES
 {{19},{ 5}}, {{11},{ 5}}, {{27},{ 5}}, {{ 7},{ 5}}, {{23},{ 5}}
 };
 
-const uch _dist_code[DIST_CODE_LEN] = {
+const uch ZLIB_INTERNAL _dist_code[DIST_CODE_LEN] = {
  0,  1,  2,  3,  4,  4,  5,  5,  6,  6,  6,  6,  7,  7,  7,  7,  8,  8,  8,  8,
  8,  8,  8,  8,  9,  9,  9,  9,  9,  9,  9,  9, 10, 10, 10, 10, 10, 10, 10, 10,
 10, 10, 10, 10, 10, 10, 10, 10, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11,
@@ -99,7 +99,7 @@ const uch _dist_code[DIST_CODE_LEN] = {
 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29
 };
 
-const uch _length_code[MAX_MATCH-MIN_MATCH+1]= {
+const uch ZLIB_INTERNAL _length_code[MAX_MATCH-MIN_MATCH+1]= {
  0,  1,  2,  3,  4,  5,  6,  7,  8,  8,  9,  9, 10, 10, 11, 11, 12, 12, 12, 12,
 13, 13, 13, 13, 14, 14, 14, 14, 15, 15, 15, 15, 16, 16, 16, 16, 16, 16, 16, 16,
 17, 17, 17, 17, 17, 17, 17, 17, 18, 18, 18, 18, 18, 18, 18, 18, 19, 19, 19, 19,

Modified: vendor/libz/dist/zconf.h
==============================================================================
--- vendor/libz/dist/zconf.h	Tue Apr 20 18:16:56 2010	(r206904)
+++ vendor/libz/dist/zconf.h	Tue Apr 20 18:42:51 2010	(r206905)
@@ -315,10 +315,6 @@
 #  endif
 #endif
 
-#ifdef HAVE_VISIBILITY_PRAGMA
-#  define ZEXTERN __attribute__((visibility ("default"))) extern
-#endif
-
 #ifndef ZEXTERN
 #  define ZEXTERN extern
 #endif
@@ -368,6 +364,16 @@ typedef uLong FAR uLongf;
 #  include     /* for off_t */
 #endif
 
+/* a little trick to accommodate both "#define _LARGEFILE64_SOURCE" and
+ * "#define _LARGEFILE64_SOURCE 1" as requesting 64-bit operations, (even
+ * though the former does not conform to the LFS document), but considering
+ * both "#undef _LARGEFILE64_SOURCE" and "#define _LARGEFILE64_SOURCE 0" as
+ * equivalently requesting no 64-bit operations
+ */
+#if -_LARGEFILE64_SOURCE - -1 == 1
+#  undef _LARGEFILE64_SOURCE
+#endif
+
 #if defined(Z_HAVE_UNISTD_H) || defined(_LARGEFILE64_SOURCE)
 #  include        /* for SEEK_* and off_t */
 #  ifdef VMS

Modified: vendor/libz/dist/zlib.3
==============================================================================
--- vendor/libz/dist/zlib.3	Tue Apr 20 18:16:56 2010	(r206904)
+++ vendor/libz/dist/zlib.3	Tue Apr 20 18:42:51 2010	(r206905)
@@ -1,4 +1,4 @@
-.TH ZLIB 3 "10 Apr 2010"
+.TH ZLIB 3 "19 Apr 2010"
 .SH NAME
 zlib \- compression/decompression library
 .SH SYNOPSIS
@@ -125,7 +125,7 @@ before asking for help.
 Send questions and/or comments to zlib@gzip.org,
 or (for the Windows DLL version) to Gilles Vollant (info@winimage.com).
 .SH AUTHORS
-Version 1.2.4.3
+Version 1.2.5
 Copyright (C) 1995-2010 Jean-loup Gailly (jloup@gzip.org)
 and Mark Adler (madler@alumni.caltech.edu).
 .LP

Modified: vendor/libz/dist/zlib.h
==============================================================================
--- vendor/libz/dist/zlib.h	Tue Apr 20 18:16:56 2010	(r206904)
+++ vendor/libz/dist/zlib.h	Tue Apr 20 18:42:51 2010	(r206905)
@@ -1,5 +1,5 @@
 /* zlib.h -- interface of the 'zlib' general purpose compression library
-  version 1.2.4.3, April 10th, 2010
+  version 1.2.5, April 19th, 2010
 
   Copyright (C) 1995-2010 Jean-loup Gailly and Mark Adler
 
@@ -37,12 +37,12 @@
 extern "C" {
 #endif
 
-#define ZLIB_VERSION "1.2.4.3"
-#define ZLIB_VERNUM 0x1243
+#define ZLIB_VERSION "1.2.5"
+#define ZLIB_VERNUM 0x1250
 #define ZLIB_VER_MAJOR 1
 #define ZLIB_VER_MINOR 2
-#define ZLIB_VER_REVISION 4
-#define ZLIB_VER_SUBREVISION 3
+#define ZLIB_VER_REVISION 5
+#define ZLIB_VER_SUBREVISION 0
 
 /*
     The 'zlib' compression library provides in-memory compression and

Modified: vendor/libz/dist/zutil.c
==============================================================================
--- vendor/libz/dist/zutil.c	Tue Apr 20 18:16:56 2010	(r206904)
+++ vendor/libz/dist/zutil.c	Tue Apr 20 18:42:51 2010	(r206905)
@@ -1,5 +1,5 @@
 /* zutil.c -- target dependent utility functions for the compression library
- * Copyright (C) 1995-2005 Jean-loup Gailly.
+ * Copyright (C) 1995-2005, 2010 Jean-loup Gailly.
  * For conditions of distribution and use, see copyright notice in zlib.h
  */
 
@@ -117,9 +117,9 @@ uLong ZEXPORT zlibCompileFlags()
 #  ifndef verbose
 #    define verbose 0
 #  endif
-int z_verbose = verbose;
+int ZLIB_INTERNAL z_verbose = verbose;
 
-void z_error (m)
+void ZLIB_INTERNAL z_error (m)
     char *m;
 {
     fprintf(stderr, "%s\n", m);
@@ -146,7 +146,7 @@ const char * ZEXPORT zError(err)
 
 #ifndef HAVE_MEMCPY
 
-void zmemcpy(dest, source, len)
+void ZLIB_INTERNAL zmemcpy(dest, source, len)
     Bytef* dest;
     const Bytef* source;
     uInt  len;
@@ -157,7 +157,7 @@ void zmemcpy(dest, source, len)
     } while (--len != 0);
 }
 
-int zmemcmp(s1, s2, len)
+int ZLIB_INTERNAL zmemcmp(s1, s2, len)
     const Bytef* s1;
     const Bytef* s2;
     uInt  len;
@@ -170,7 +170,7 @@ int zmemcmp(s1, s2, len)
     return 0;
 }
 
-void zmemzero(dest, len)
+void ZLIB_INTERNAL zmemzero(dest, len)
     Bytef* dest;
     uInt  len;
 {
@@ -213,7 +213,7 @@ local ptr_table table[MAX_PTR];
  * a protected system like OS/2. Use Microsoft C instead.
  */
 
-voidpf zcalloc (voidpf opaque, unsigned items, unsigned size)
+voidpf ZLIB_INTERNAL zcalloc (voidpf opaque, unsigned items, unsigned size)
 {
     voidpf buf = opaque; /* just to make some compilers happy */
     ulg bsize = (ulg)items*size;
@@ -237,7 +237,7 @@ voidpf zcalloc (voidpf opaque, unsigned 
     return buf;
 }
 
-void  zcfree (voidpf opaque, voidpf ptr)
+void ZLIB_INTERNAL zcfree (voidpf opaque, voidpf ptr)
 {
     int n;
     if (*(ush*)&ptr != 0) { /* object < 64K */
@@ -272,13 +272,13 @@ void  zcfree (voidpf opaque, voidpf ptr)
 #  define _hfree   hfree
 #endif
 
-voidpf zcalloc (voidpf opaque, uInt items, uInt size)
+voidpf ZLIB_INTERNAL zcalloc (voidpf opaque, uInt items, uInt size)
 {
     if (opaque) opaque = 0; /* to make compiler happy */
     return _halloc((long)items, size);
 }
 
-void  zcfree (voidpf opaque, voidpf ptr)
+void ZLIB_INTERNAL zcfree (voidpf opaque, voidpf ptr)
 {
     if (opaque) opaque = 0; /* to make compiler happy */
     _hfree(ptr);
@@ -297,7 +297,7 @@ extern voidp  calloc OF((uInt items, uIn
 extern void   free   OF((voidpf ptr));
 #endif
 
-voidpf zcalloc (opaque, items, size)
+voidpf ZLIB_INTERNAL zcalloc (opaque, items, size)
     voidpf opaque;
     unsigned items;
     unsigned size;
@@ -307,7 +307,7 @@ voidpf zcalloc (opaque, items, size)
                               (voidpf)calloc(items, size);
 }
 
-void  zcfree (opaque, ptr)
+void ZLIB_INTERNAL zcfree (opaque, ptr)
     voidpf opaque;
     voidpf ptr;
 {

Modified: vendor/libz/dist/zutil.h
==============================================================================
--- vendor/libz/dist/zutil.h	Tue Apr 20 18:16:56 2010	(r206904)
+++ vendor/libz/dist/zutil.h	Tue Apr 20 18:42:51 2010	(r206905)
@@ -13,7 +13,12 @@
 #ifndef ZUTIL_H
 #define ZUTIL_H
 
-#define ZLIB_INTERNAL
+#if ((__GNUC__-0) * 10 + __GNUC_MINOR__-0 >= 33) && !defined(NO_VIZ)
+#  define ZLIB_INTERNAL __attribute__((visibility ("hidden")))
+#else
+#  define ZLIB_INTERNAL
+#endif
+
 #include "zlib.h"
 
 #ifdef STDC
@@ -231,16 +236,16 @@ extern const char * const z_errmsg[10]; 
 #    define zmemzero(dest, len) memset(dest, 0, len)
 #  endif
 #else
-   extern void zmemcpy  OF((Bytef* dest, const Bytef* source, uInt len));
-   extern int  zmemcmp  OF((const Bytef* s1, const Bytef* s2, uInt len));
-   extern void zmemzero OF((Bytef* dest, uInt len));
+   void ZLIB_INTERNAL zmemcpy OF((Bytef* dest, const Bytef* source, uInt len));
+   int ZLIB_INTERNAL zmemcmp OF((const Bytef* s1, const Bytef* s2, uInt len));
+   void ZLIB_INTERNAL zmemzero OF((Bytef* dest, uInt len));
 #endif
 
 /* Diagnostic functions */
 #ifdef DEBUG
 #  include 
-   extern int z_verbose;
-   extern void z_error    OF((char *m));
+   extern int ZLIB_INTERNAL z_verbose;
+   extern void ZLIB_INTERNAL z_error OF((char *m));
 #  define Assert(cond,msg) {if(!(cond)) z_error(msg);}
 #  define Trace(x) {if (z_verbose>=0) fprintf x ;}
 #  define Tracev(x) {if (z_verbose>0) fprintf x ;}
@@ -257,8 +262,9 @@ extern const char * const z_errmsg[10]; 
 #endif
 
 
-voidpf zcalloc OF((voidpf opaque, unsigned items, unsigned size));
-void   zcfree  OF((voidpf opaque, voidpf ptr));
+voidpf ZLIB_INTERNAL zcalloc OF((voidpf opaque, unsigned items,
+                        unsigned size));
+void ZLIB_INTERNAL zcfree  OF((voidpf opaque, voidpf ptr));
 
 #define ZALLOC(strm, items, size) \
            (*((strm)->zalloc))((strm)->opaque, (items), (size))

From owner-svn-src-vendor@FreeBSD.ORG  Tue Apr 20 18:43:24 2010
Return-Path: 
Delivered-To: svn-src-vendor@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 33D401065674;
	Tue, 20 Apr 2010 18:43:24 +0000 (UTC)
	(envelope-from delphij@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 09C348FC12;
	Tue, 20 Apr 2010 18:43:24 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o3KIhNhK012036;
	Tue, 20 Apr 2010 18:43:23 GMT (envelope-from delphij@svn.freebsd.org)
Received: (from delphij@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o3KIhNBA012035;
	Tue, 20 Apr 2010 18:43:23 GMT (envelope-from delphij@svn.freebsd.org)
Message-Id: <201004201843.o3KIhNBA012035@svn.freebsd.org>
From: Xin LI 
Date: Tue, 20 Apr 2010 18:43:23 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-vendor@freebsd.org
X-SVN-Group: vendor
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r206906 - vendor/libz/1.2.5
X-BeenThere: svn-src-vendor@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the vendor work area tree
	
List-Unsubscribe: , 
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
	
X-List-Received-Date: Tue, 20 Apr 2010 18:43:24 -0000

Author: delphij
Date: Tue Apr 20 18:43:23 2010
New Revision: 206906
URL: http://svn.freebsd.org/changeset/base/206906

Log:
  Tag zlib 1.2.5.

Added:
  vendor/libz/1.2.5/
     - copied from r206905, vendor/libz/dist/

From owner-svn-src-vendor@FreeBSD.ORG  Tue Apr 20 20:47:59 2010
Return-Path: 
Delivered-To: svn-src-vendor@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 5777E106564A;
	Tue, 20 Apr 2010 20:47:59 +0000 (UTC)
	(envelope-from marius@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 439438FC1D;
	Tue, 20 Apr 2010 20:47:59 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o3KKlx0g039954;
	Tue, 20 Apr 2010 20:47:59 GMT (envelope-from marius@svn.freebsd.org)
Received: (from marius@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o3KKlxPG039942;
	Tue, 20 Apr 2010 20:47:59 GMT (envelope-from marius@svn.freebsd.org)
Message-Id: <201004202047.o3KKlxPG039942@svn.freebsd.org>
From: Marius Strobl 
Date: Tue, 20 Apr 2010 20:47:59 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-vendor@freebsd.org
X-SVN-Group: vendor
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r206917 - in vendor/testfloat: . processors testfloat
	testfloat/386-Win32-gcc testfloat/SPARC-Solaris-gcc
	testfloat/templates
X-BeenThere: svn-src-vendor@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the vendor work area tree
	
List-Unsubscribe: , 
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
	
X-List-Received-Date: Tue, 20 Apr 2010 20:47:59 -0000

Author: marius
Date: Tue Apr 20 20:47:58 2010
New Revision: 206917
URL: http://svn.freebsd.org/changeset/base/206917

Log:
  Initial import of TestFloat 2a.
  
  Obtained from:	http://www.jhauser.us/arithmetic/TestFloat.html

Added:
  vendor/testfloat/
  vendor/testfloat/processors/
  vendor/testfloat/processors/386-gcc.h   (contents, props changed)
  vendor/testfloat/processors/SPARC-gcc.h   (contents, props changed)
  vendor/testfloat/testfloat/
  vendor/testfloat/testfloat/386-Win32-gcc/
  vendor/testfloat/testfloat/386-Win32-gcc/Makefile   (contents, props changed)
  vendor/testfloat/testfloat/386-Win32-gcc/milieu.h   (contents, props changed)
  vendor/testfloat/testfloat/386-Win32-gcc/systflags.S   (contents, props changed)
  vendor/testfloat/testfloat/386-Win32-gcc/systfloat.S   (contents, props changed)
  vendor/testfloat/testfloat/386-Win32-gcc/systfloat.h   (contents, props changed)
  vendor/testfloat/testfloat/386-Win32-gcc/systmodes.S   (contents, props changed)
  vendor/testfloat/testfloat/README.txt   (contents, props changed)
  vendor/testfloat/testfloat/SPARC-Solaris-gcc/
  vendor/testfloat/testfloat/SPARC-Solaris-gcc/Makefile   (contents, props changed)
  vendor/testfloat/testfloat/SPARC-Solaris-gcc/milieu.h   (contents, props changed)
  vendor/testfloat/testfloat/SPARC-Solaris-gcc/systflags.c   (contents, props changed)
  vendor/testfloat/testfloat/SPARC-Solaris-gcc/systfloat.S   (contents, props changed)
  vendor/testfloat/testfloat/SPARC-Solaris-gcc/systfloat.h   (contents, props changed)
  vendor/testfloat/testfloat/SPARC-Solaris-gcc/systmodes.c   (contents, props changed)
  vendor/testfloat/testfloat/fail.c   (contents, props changed)
  vendor/testfloat/testfloat/fail.h   (contents, props changed)
  vendor/testfloat/testfloat/random.c   (contents, props changed)
  vendor/testfloat/testfloat/random.h   (contents, props changed)
  vendor/testfloat/testfloat/slowfloat-32.c   (contents, props changed)
  vendor/testfloat/testfloat/slowfloat-64.c   (contents, props changed)
  vendor/testfloat/testfloat/slowfloat.c   (contents, props changed)
  vendor/testfloat/testfloat/slowfloat.h   (contents, props changed)
  vendor/testfloat/testfloat/systemBugs.txt   (contents, props changed)
  vendor/testfloat/testfloat/systflags.h   (contents, props changed)
  vendor/testfloat/testfloat/systfloat.c   (contents, props changed)
  vendor/testfloat/testfloat/systfloat.h   (contents, props changed)
  vendor/testfloat/testfloat/systmodes.h   (contents, props changed)
  vendor/testfloat/testfloat/templates/
  vendor/testfloat/testfloat/templates/Makefile   (contents, props changed)
  vendor/testfloat/testfloat/templates/milieu.h   (contents, props changed)
  vendor/testfloat/testfloat/templates/systflags.c   (contents, props changed)
  vendor/testfloat/testfloat/templates/systmodes.c   (contents, props changed)
  vendor/testfloat/testfloat/testCases.c   (contents, props changed)
  vendor/testfloat/testfloat/testCases.h   (contents, props changed)
  vendor/testfloat/testfloat/testFunction.c   (contents, props changed)
  vendor/testfloat/testfloat/testFunction.h   (contents, props changed)
  vendor/testfloat/testfloat/testLoops.c   (contents, props changed)
  vendor/testfloat/testfloat/testLoops.h   (contents, props changed)
  vendor/testfloat/testfloat/testfloat-history.txt   (contents, props changed)
  vendor/testfloat/testfloat/testfloat-source.txt   (contents, props changed)
  vendor/testfloat/testfloat/testfloat.c   (contents, props changed)
  vendor/testfloat/testfloat/testfloat.txt   (contents, props changed)
  vendor/testfloat/testfloat/testsoftfloat.c   (contents, props changed)
  vendor/testfloat/testfloat/writeHex.c   (contents, props changed)
  vendor/testfloat/testfloat/writeHex.h   (contents, props changed)

Added: vendor/testfloat/processors/386-gcc.h
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ vendor/testfloat/processors/386-gcc.h	Tue Apr 20 20:47:58 2010	(r206917)
@@ -0,0 +1,80 @@
+
+/*
+-------------------------------------------------------------------------------
+One of the macros `BIGENDIAN' or `LITTLEENDIAN' must be defined.
+-------------------------------------------------------------------------------
+*/
+#define LITTLEENDIAN
+
+/*
+-------------------------------------------------------------------------------
+The macro `BITS64' can be defined to indicate that 64-bit integer types are
+supported by the compiler.
+-------------------------------------------------------------------------------
+*/
+#define BITS64
+
+/*
+-------------------------------------------------------------------------------
+Each of the following `typedef's defines the most convenient type that holds
+integers of at least as many bits as specified.  For example, `uint8' should
+be the most convenient type that can hold unsigned integers of as many as
+8 bits.  The `flag' type must be able to hold either a 0 or 1.  For most
+implementations of C, `flag', `uint8', and `int8' should all be `typedef'ed
+to the same as `int'.
+-------------------------------------------------------------------------------
+*/
+typedef char flag;
+typedef unsigned char uint8;
+typedef signed char int8;
+typedef int uint16;
+typedef int int16;
+typedef unsigned int uint32;
+typedef signed int int32;
+#ifdef BITS64
+typedef unsigned long long int uint64;
+typedef signed long long int int64;
+#endif
+
+/*
+-------------------------------------------------------------------------------
+Each of the following `typedef's defines a type that holds integers
+of _exactly_ the number of bits specified.  For instance, for most
+implementation of C, `bits16' and `sbits16' should be `typedef'ed to
+`unsigned short int' and `signed short int' (or `short int'), respectively.
+-------------------------------------------------------------------------------
+*/
+typedef unsigned char bits8;
+typedef signed char sbits8;
+typedef unsigned short int bits16;
+typedef signed short int sbits16;
+typedef unsigned int bits32;
+typedef signed int sbits32;
+#ifdef BITS64
+typedef unsigned long long int bits64;
+typedef signed long long int sbits64;
+#endif
+
+#ifdef BITS64
+/*
+-------------------------------------------------------------------------------
+The `LIT64' macro takes as its argument a textual integer literal and
+if necessary ``marks'' the literal as having a 64-bit integer type.
+For example, the GNU C Compiler (`gcc') requires that 64-bit literals be
+appended with the letters `LL' standing for `long long', which is `gcc's
+name for the 64-bit integer type.  Some compilers may allow `LIT64' to be
+defined as the identity macro:  `#define LIT64( a ) a'.
+-------------------------------------------------------------------------------
+*/
+#define LIT64( a ) a##LL
+#endif
+
+/*
+-------------------------------------------------------------------------------
+The macro `INLINE' can be used before functions that should be inlined.  If
+a compiler does not support explicit inlining, this macro should be defined
+to be `static'.
+-------------------------------------------------------------------------------
+*/
+#define INLINE extern inline
+

Added: vendor/testfloat/processors/SPARC-gcc.h
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ vendor/testfloat/processors/SPARC-gcc.h	Tue Apr 20 20:47:58 2010	(r206917)
@@ -0,0 +1,80 @@
+
+/*
+-------------------------------------------------------------------------------
+One of the macros `BIGENDIAN' or `LITTLEENDIAN' must be defined.
+-------------------------------------------------------------------------------
+*/
+#define BIGENDIAN
+
+/*
+-------------------------------------------------------------------------------
+The macro `BITS64' can be defined to indicate that 64-bit integer types are
+supported by the compiler.
+-------------------------------------------------------------------------------
+*/
+#define BITS64
+
+/*
+-------------------------------------------------------------------------------
+Each of the following `typedef's defines the most convenient type that holds
+integers of at least as many bits as specified.  For example, `uint8' should
+be the most convenient type that can hold unsigned integers of as many as
+8 bits.  The `flag' type must be able to hold either a 0 or 1.  For most
+implementations of C, `flag', `uint8', and `int8' should all be `typedef'ed
+to the same as `int'.
+-------------------------------------------------------------------------------
+*/
+typedef int flag;
+typedef int uint8;
+typedef int int8;
+typedef int uint16;
+typedef int int16;
+typedef unsigned int uint32;
+typedef signed int int32;
+#ifdef BITS64
+typedef unsigned long long int uint64;
+typedef signed long long int int64;
+#endif
+
+/*
+-------------------------------------------------------------------------------
+Each of the following `typedef's defines a type that holds integers
+of _exactly_ the number of bits specified.  For instance, for most
+implementation of C, `bits16' and `sbits16' should be `typedef'ed to
+`unsigned short int' and `signed short int' (or `short int'), respectively.
+-------------------------------------------------------------------------------
+*/
+typedef unsigned char bits8;
+typedef signed char sbits8;
+typedef unsigned short int bits16;
+typedef signed short int sbits16;
+typedef unsigned int bits32;
+typedef signed int sbits32;
+#ifdef BITS64
+typedef unsigned long long int bits64;
+typedef signed long long int sbits64;
+#endif
+
+#ifdef BITS64
+/*
+-------------------------------------------------------------------------------
+The `LIT64' macro takes as its argument a textual integer literal and
+if necessary ``marks'' the literal as having a 64-bit integer type.
+For example, the GNU C Compiler (`gcc') requires that 64-bit literals be
+appended with the letters `LL' standing for `long long', which is `gcc's
+name for the 64-bit integer type.  Some compilers may allow `LIT64' to be
+defined as the identity macro:  `#define LIT64( a ) a'.
+-------------------------------------------------------------------------------
+*/
+#define LIT64( a ) a##LL
+#endif
+
+/*
+-------------------------------------------------------------------------------
+The macro `INLINE' can be used before functions that should be inlined.  If
+a compiler does not support explicit inlining, this macro should be defined
+to be `static'.
+-------------------------------------------------------------------------------
+*/
+#define INLINE extern inline
+

Added: vendor/testfloat/testfloat/386-Win32-gcc/Makefile
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ vendor/testfloat/testfloat/386-Win32-gcc/Makefile	Tue Apr 20 20:47:58 2010	(r206917)
@@ -0,0 +1,64 @@
+
+PROCESSOR_H = ../../processors/386-gcc.h
+SOFTFLOAT_VERSION = bits64
+TARGET = 386-Win32-gcc
+SOFTFLOAT_DIR = ../../softfloat/$(SOFTFLOAT_VERSION)/$(TARGET)
+
+OBJ = .o
+EXE = .exe
+INCLUDES = -I. -I.. -I$(SOFTFLOAT_DIR)
+COMPILE_ASM = gcc -c -o $@
+COMPILE_C = gcc -c -o $@ $(INCLUDES) -I- -O2
+COMPILE_SLOWFLOAT_C = gcc -c -o $@ $(INCLUDES) -I- -O3
+LINK = gcc -o $@
+
+SOFTFLOAT_H = $(SOFTFLOAT_DIR)/softfloat.h
+SOFTFLOAT_OBJ = $(SOFTFLOAT_DIR)/softfloat$(OBJ)
+
+ALL: testsoftfloat$(EXE) testfloat$(EXE)
+
+milieu.h: $(PROCESSOR_H)
+	touch milieu.h
+
+fail$(OBJ): milieu.h ../fail.h
+	$(COMPILE_C) ../fail.c
+
+random$(OBJ): milieu.h ../random.h
+	$(COMPILE_C) ../random.c
+
+testCases$(OBJ): milieu.h ../fail.h ../random.h $(SOFTFLOAT_H) ../testCases.h ../testCases.c
+	$(COMPILE_C) ../testCases.c
+
+writeHex$(OBJ): milieu.h $(SOFTFLOAT_H) ../writeHex.h ../writeHex.c
+	$(COMPILE_C) ../writeHex.c
+
+testLoops$(OBJ): milieu.h $(SOFTFLOAT_H) ../testCases.h ../writeHex.h ../testLoops.h ../testLoops.c
+	$(COMPILE_C) ../testLoops.c
+
+slowfloat$(OBJ): milieu.h $(SOFTFLOAT_H) ../slowfloat.h ../slowfloat-32.c ../slowfloat-64.c ../slowfloat.c
+	$(COMPILE_SLOWFLOAT_C) ../slowfloat.c
+
+testsoftfloat$(OBJ): milieu.h ../fail.h $(SOFTFLOAT_H) ../testCases.h ../testLoops.h ../slowfloat.h ../testsoftfloat.c
+	$(COMPILE_C) ../testsoftfloat.c
+
+testsoftfloat$(EXE): fail$(OBJ) random$(OBJ) $(SOFTFLOAT_OBJ) testCases$(OBJ) writeHex$(OBJ) testLoops$(OBJ) slowfloat$(OBJ) testsoftfloat$(OBJ)
+	$(LINK) fail$(OBJ) random$(OBJ) $(SOFTFLOAT_OBJ) testCases$(OBJ) writeHex$(OBJ) testLoops$(OBJ) slowfloat$(OBJ) testsoftfloat$(OBJ)
+
+systmodes$(OBJ): systmodes.S
+	$(COMPILE_ASM) systmodes.S
+
+systflags$(OBJ): systflags.S
+	$(COMPILE_ASM) systflags.S
+
+systfloat$(OBJ): systfloat.S
+	$(COMPILE_ASM) systfloat.S
+
+testFunction$(OBJ): milieu.h $(SOFTFLOAT_H) ../testCases.h ../testLoops.h ../systmodes.h ../systflags.h systfloat.h ../testFunction.h ../testFunction.c
+	$(COMPILE_C) ../testFunction.c
+
+testfloat$(OBJ): milieu.h ../fail.h $(SOFTFLOAT_H) ../testCases.h ../testLoops.h ../systflags.h ../testFunction.h ../testfloat.c
+	$(COMPILE_C) ../testfloat.c
+
+testfloat$(EXE): fail$(OBJ) random$(OBJ) $(SOFTFLOAT_OBJ) testCases$(OBJ) writeHex$(OBJ) testLoops$(OBJ) systmodes$(OBJ) systflags$(OBJ) systfloat$(OBJ) testFunction$(OBJ) testfloat$(OBJ)
+	$(LINK) fail$(OBJ) random$(OBJ) $(SOFTFLOAT_OBJ) testCases$(OBJ) writeHex$(OBJ) testLoops$(OBJ) systmodes$(OBJ) systflags$(OBJ) systfloat$(OBJ) testFunction$(OBJ) testfloat$(OBJ)
+

Added: vendor/testfloat/testfloat/386-Win32-gcc/milieu.h
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ vendor/testfloat/testfloat/386-Win32-gcc/milieu.h	Tue Apr 20 20:47:58 2010	(r206917)
@@ -0,0 +1,51 @@
+
+/*
+===============================================================================
+
+This C header file is part of TestFloat, Release 2a, a package of programs
+for testing the correctness of floating-point arithmetic complying to the
+IEC/IEEE Standard for Floating-Point.
+
+Written by John R. Hauser.  More information is available through the Web
+page `http://HTTP.CS.Berkeley.EDU/~jhauser/arithmetic/TestFloat.html'.
+
+THIS SOFTWARE IS DISTRIBUTED AS IS, FOR FREE.  Although reasonable effort
+has been made to avoid it, THIS SOFTWARE MAY CONTAIN FAULTS THAT WILL AT
+TIMES RESULT IN INCORRECT BEHAVIOR.  USE OF THIS SOFTWARE IS RESTRICTED TO
+PERSONS AND ORGANIZATIONS WHO CAN AND WILL TAKE FULL RESPONSIBILITY FOR ANY
+AND ALL LOSSES, COSTS, OR OTHER PROBLEMS ARISING FROM ITS USE.
+
+Derivative works are acceptable, even for commercial purposes, so long as
+(1) they include prominent notice that the work is derivative, and (2) they
+include prominent notice akin to these four paragraphs for those parts of
+this code that are retained.
+
+===============================================================================
+*/
+
+/*
+-------------------------------------------------------------------------------
+Include common integer types and flags.
+-------------------------------------------------------------------------------
+*/
+#include "../../processors/386-gcc.h"
+
+/*
+-------------------------------------------------------------------------------
+If the `BITS64' macro is defined by the processor header file but the
+version of SoftFloat being tested is the 32-bit one (`bits32'), the `BITS64'
+macro must be undefined here.
+-------------------------------------------------------------------------------
+#undef BITS64
+*/
+
+/*
+-------------------------------------------------------------------------------
+Symbolic Boolean literals.
+-------------------------------------------------------------------------------
+*/
+enum {
+    FALSE = 0,
+    TRUE  = 1
+};
+

Added: vendor/testfloat/testfloat/386-Win32-gcc/systflags.S
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ vendor/testfloat/testfloat/386-Win32-gcc/systflags.S	Tue Apr 20 20:47:58 2010	(r206917)
@@ -0,0 +1,41 @@
+
+/*
+===============================================================================
+
+This GNU assembler source file is part of TestFloat, Release 2a, a package
+of programs for testing the correctness of floating-point arithmetic
+complying to the IEC/IEEE Standard for Floating-Point.
+
+Written by John R. Hauser.  More information is available through the Web
+page `http://HTTP.CS.Berkeley.EDU/~jhauser/arithmetic/TestFloat.html'.
+
+THIS SOFTWARE IS DISTRIBUTED AS IS, FOR FREE.  Although reasonable effort
+has been made to avoid it, THIS SOFTWARE MAY CONTAIN FAULTS THAT WILL AT
+TIMES RESULT IN INCORRECT BEHAVIOR.  USE OF THIS SOFTWARE IS RESTRICTED TO
+PERSONS AND ORGANIZATIONS WHO CAN AND WILL TAKE FULL RESPONSIBILITY FOR ANY
+AND ALL LOSSES, COSTS, OR OTHER PROBLEMS ARISING FROM ITS USE.
+
+Derivative works are acceptable, even for commercial purposes, so long as
+(1) they include prominent notice that the work is derivative, and (2) they
+include prominent notice akin to these four paragraphs for those parts of
+this code that are retained.
+
+===============================================================================
+*/
+
+	.text
+
+/*
+-------------------------------------------------------------------------------
+Clears the system's IEC/IEEE floating-point exception flags.  Returns the
+previous value of the flags.
+-------------------------------------------------------------------------------
+*/
+	.align 2
+.globl _syst_float_flags_clear
+_syst_float_flags_clear:
+	fnstsw %ax
+	fnclex
+	andl $61,%eax
+	ret
+

Added: vendor/testfloat/testfloat/386-Win32-gcc/systfloat.S
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ vendor/testfloat/testfloat/386-Win32-gcc/systfloat.S	Tue Apr 20 20:47:58 2010	(r206917)
@@ -0,0 +1,332 @@
+
+/*
+===============================================================================
+
+This GNU assembler source file is part of TestFloat, Release 2a, a package
+of programs for testing the correctness of floating-point arithmetic
+complying to the IEC/IEEE Standard for Floating-Point.
+
+Written by John R. Hauser.  More information is available through the Web
+page `http://HTTP.CS.Berkeley.EDU/~jhauser/arithmetic/TestFloat.html'.
+
+THIS SOFTWARE IS DISTRIBUTED AS IS, FOR FREE.  Although reasonable effort
+has been made to avoid it, THIS SOFTWARE MAY CONTAIN FAULTS THAT WILL AT
+TIMES RESULT IN INCORRECT BEHAVIOR.  USE OF THIS SOFTWARE IS RESTRICTED TO
+PERSONS AND ORGANIZATIONS WHO CAN AND WILL TAKE FULL RESPONSIBILITY FOR ANY
+AND ALL LOSSES, COSTS, OR OTHER PROBLEMS ARISING FROM ITS USE.
+
+Derivative works are acceptable, even for commercial purposes, so long as
+(1) they include prominent notice that the work is derivative, and (2) they
+include prominent notice akin to these four paragraphs for those parts of
+this code that are retained.
+
+===============================================================================
+*/
+
+	.text
+
+/*
+-------------------------------------------------------------------------------
+-------------------------------------------------------------------------------
+*/
+	.align 2
+.globl _syst_int32_to_floatx80
+_syst_int32_to_floatx80:
+	fildl 8(%esp)
+	movl 4(%esp),%eax
+	fstpt (%eax)
+	ret $4
+
+/*
+-------------------------------------------------------------------------------
+-------------------------------------------------------------------------------
+*/
+	.align 2
+.globl _syst_int64_to_floatx80
+_syst_int64_to_floatx80:
+	fildq 8(%esp)
+	movl 4(%esp),%eax
+	fstpt (%eax)
+	ret $4
+
+/*
+-------------------------------------------------------------------------------
+-------------------------------------------------------------------------------
+*/
+	.align 2
+.globl _syst_float32_to_floatx80
+_syst_float32_to_floatx80:
+	flds 8(%esp)
+	movl 4(%esp),%eax
+	fstpt (%eax)
+	ret $4
+
+/*
+-------------------------------------------------------------------------------
+-------------------------------------------------------------------------------
+*/
+	.align 2
+.globl _syst_float64_to_floatx80
+_syst_float64_to_floatx80:
+	fldl 8(%esp)
+	movl 4(%esp),%eax
+	fstpt (%eax)
+	ret $4
+
+/*
+-------------------------------------------------------------------------------
+-------------------------------------------------------------------------------
+*/
+	.align 2
+.globl _syst_floatx80_to_int32
+_syst_floatx80_to_int32:
+	fldt 4(%esp)
+	subl $4,%esp
+	fistpl (%esp)
+	movl (%esp),%eax
+	addl $4,%esp
+	ret
+
+/*
+-------------------------------------------------------------------------------
+-------------------------------------------------------------------------------
+*/
+	.align 2
+.globl _syst_floatx80_to_int64
+_syst_floatx80_to_int64:
+	fldt 4(%esp)
+	subl $8,%esp
+	fistpq (%esp)
+	movl (%esp),%eax
+	movl 4(%esp),%edx
+	addl $8,%esp
+	ret
+
+/*
+-------------------------------------------------------------------------------
+-------------------------------------------------------------------------------
+*/
+	.align 2
+.globl _syst_floatx80_to_float32
+_syst_floatx80_to_float32:
+	fldt 4(%esp)
+	subl $4,%esp
+	fstps (%esp)
+	movl (%esp),%eax
+	addl $4,%esp
+	ret
+
+/*
+-------------------------------------------------------------------------------
+-------------------------------------------------------------------------------
+*/
+	.align 2
+.globl _syst_floatx80_to_float64
+_syst_floatx80_to_float64:
+	fldt 4(%esp)
+	subl $8,%esp
+	fstpl (%esp)
+	movl 4(%esp),%edx
+	movl (%esp),%eax
+	addl $8,%esp
+	ret
+
+/*
+-------------------------------------------------------------------------------
+-------------------------------------------------------------------------------
+*/
+	.align 2
+.globl _syst_floatx80_round_to_int
+_syst_floatx80_round_to_int:
+	fldt 8(%esp)
+	frndint
+	movl 4(%esp),%eax
+	fstpt (%eax)
+	ret $4
+
+/*
+-------------------------------------------------------------------------------
+-------------------------------------------------------------------------------
+*/
+	.align 2
+.globl _syst_floatx80_add
+_syst_floatx80_add:
+	fldt 8(%esp)
+	fldt 20(%esp)
+	faddp
+	movl 4(%esp),%eax
+	fstpt (%eax)
+	ret $4
+
+/*
+-------------------------------------------------------------------------------
+-------------------------------------------------------------------------------
+*/
+	.align 2
+.globl _syst_floatx80_sub
+_syst_floatx80_sub:
+	fldt 8(%esp)
+	fldt 20(%esp)
+	fsubrp
+	movl 4(%esp),%eax
+	fstpt (%eax)
+	ret $4
+
+/*
+-------------------------------------------------------------------------------
+-------------------------------------------------------------------------------
+*/
+	.align 2
+.globl _syst_floatx80_mul
+_syst_floatx80_mul:
+	fldt 8(%esp)
+	fldt 20(%esp)
+	fmulp
+	movl 4(%esp),%eax
+	fstpt (%eax)
+	ret $4
+
+/*
+-------------------------------------------------------------------------------
+-------------------------------------------------------------------------------
+*/
+	.align 2
+.globl _syst_floatx80_div
+_syst_floatx80_div:
+	fldt 8(%esp)
+	fldt 20(%esp)
+	fdivrp
+	movl 4(%esp),%eax
+	fstpt (%eax)
+	ret $4
+
+/*
+-------------------------------------------------------------------------------
+-------------------------------------------------------------------------------
+*/
+	.align 2
+.globl _syst_floatx80_rem
+_syst_floatx80_rem:
+	fldt 20(%esp)
+	fldt 8(%esp)
+floatx80_rem_loop:
+	fprem1
+	fnstsw %ax
+	btw $10,%ax
+	jc floatx80_rem_loop
+	movl 4(%esp),%eax
+	fstpt (%eax)
+	fstp %st(0)
+	ret $4
+
+/*
+-------------------------------------------------------------------------------
+-------------------------------------------------------------------------------
+*/
+	.align 2
+.globl _syst_floatx80_sqrt
+_syst_floatx80_sqrt:
+	fldt 8(%esp)
+	fsqrt
+	movl 4(%esp),%eax
+	fstpt (%eax)
+	ret $4
+
+/*
+-------------------------------------------------------------------------------
+-------------------------------------------------------------------------------
+*/
+	.align 2
+.globl _syst_floatx80_eq
+_syst_floatx80_eq:
+	fldt 16(%esp)
+	fldt 4(%esp)
+	fucompp
+	fnstsw %ax
+	andw $17664,%ax
+	cmpw $16384,%ax
+	seteb %al
+	movzb %al,%eax
+	ret
+
+/*
+-------------------------------------------------------------------------------
+-------------------------------------------------------------------------------
+*/
+	.align 2
+.globl _syst_floatx80_le
+_syst_floatx80_le:
+	fldt 4(%esp)
+	fldt 16(%esp)
+	fcompp
+	fnstsw %ax
+	notl %eax
+	shrl $8,%eax
+	andl $1,%eax
+	ret
+
+/*
+-------------------------------------------------------------------------------
+-------------------------------------------------------------------------------
+*/
+	.align 2
+.globl _syst_floatx80_lt
+_syst_floatx80_lt:
+	fldt 4(%esp)
+	fldt 16(%esp)
+	fcompp
+	fnstsw %ax
+	andw $17664,%ax
+	setzb %al
+	movzb %al,%eax
+	ret
+
+/*
+-------------------------------------------------------------------------------
+-------------------------------------------------------------------------------
+*/
+	.align 2
+.globl _syst_floatx80_eq_signaling
+_syst_floatx80_eq_signaling:
+	fldt 16(%esp)
+	fldt 4(%esp)
+	fcompp
+	fnstsw %ax
+	andw $17664,%ax
+	cmpw $16384,%ax
+	seteb %al
+	movzb %al,%eax
+	ret
+
+/*
+-------------------------------------------------------------------------------
+-------------------------------------------------------------------------------
+*/
+	.align 2
+.globl _syst_floatx80_le_quiet
+_syst_floatx80_le_quiet:
+	fldt 4(%esp)
+	fldt 16(%esp)
+	fucompp
+	fnstsw %ax
+	notl %eax
+	shrl $8,%eax
+	andl $1,%eax
+	ret
+
+/*
+-------------------------------------------------------------------------------
+-------------------------------------------------------------------------------
+*/
+	.align 2
+.globl _syst_floatx80_lt_quiet
+_syst_floatx80_lt_quiet:
+	fldt 4(%esp)
+	fldt 16(%esp)
+	fucompp
+	fnstsw %ax
+	andw $17664,%ax
+	setzb %al
+	movzb %al,%eax
+	ret
+

Added: vendor/testfloat/testfloat/386-Win32-gcc/systfloat.h
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ vendor/testfloat/testfloat/386-Win32-gcc/systfloat.h	Tue Apr 20 20:47:58 2010	(r206917)
@@ -0,0 +1,181 @@
+
+/*
+===============================================================================
+
+This C header file is part of TestFloat, Release 2a, a package of programs
+for testing the correctness of floating-point arithmetic complying to the
+IEC/IEEE Standard for Floating-Point.
+
+Written by John R. Hauser.  More information is available through the Web
+page `http://HTTP.CS.Berkeley.EDU/~jhauser/arithmetic/TestFloat.html'.
+
+THIS SOFTWARE IS DISTRIBUTED AS IS, FOR FREE.  Although reasonable effort
+has been made to avoid it, THIS SOFTWARE MAY CONTAIN FAULTS THAT WILL AT
+TIMES RESULT IN INCORRECT BEHAVIOR.  USE OF THIS SOFTWARE IS RESTRICTED TO
+PERSONS AND ORGANIZATIONS WHO CAN AND WILL TAKE FULL RESPONSIBILITY FOR ANY
+AND ALL LOSSES, COSTS, OR OTHER PROBLEMS ARISING FROM ITS USE.
+
+Derivative works are acceptable, even for commercial purposes, so long as
+(1) they include prominent notice that the work is derivative, and (2) they
+include prominent notice akin to these four paragraphs for those parts of
+this code that are retained.
+
+===============================================================================
+*/
+
+/*
+-------------------------------------------------------------------------------
+The following macros are defined to indicate that the corresponding
+functions exist.
+-------------------------------------------------------------------------------
+*/
+#define SYST_INT32_TO_FLOATX80
+#define SYST_INT64_TO_FLOATX80
+#define SYST_FLOAT32_TO_FLOATX80
+#define SYST_FLOAT64_TO_FLOATX80
+#define SYST_FLOATX80_TO_INT32
+#define SYST_FLOATX80_TO_INT64
+#define SYST_FLOATX80_TO_FLOAT32
+#define SYST_FLOATX80_TO_FLOAT64
+#define SYST_FLOATX80_ROUND_TO_INT
+#define SYST_FLOATX80_ADD
+#define SYST_FLOATX80_SUB
+#define SYST_FLOATX80_MUL
+#define SYST_FLOATX80_DIV
+#define SYST_FLOATX80_REM
+#define SYST_FLOATX80_SQRT
+#define SYST_FLOATX80_EQ
+#define SYST_FLOATX80_LE
+#define SYST_FLOATX80_LT
+#define SYST_FLOATX80_EQ_SIGNALING
+#define SYST_FLOATX80_LE_QUIET
+#define SYST_FLOATX80_LT_QUIET
+
+/*
+-------------------------------------------------------------------------------
+System function declarations.  (Some of these functions may not exist.)
+-------------------------------------------------------------------------------
+*/
+float32 syst_int32_to_float32( int32 );
+float64 syst_int32_to_float64( int32 );
+#ifdef FLOATX80
+floatx80 syst_int32_to_floatx80( int32 );
+#endif
+#ifdef FLOAT128
+float128 syst_int32_to_float128( int32 );
+#endif
+#ifdef BITS64
+float32 syst_int64_to_float32( int64 );
+float64 syst_int64_to_float64( int64 );
+#ifdef FLOATX80
+floatx80 syst_int64_to_floatx80( int64 );
+#endif
+#ifdef FLOAT128
+float128 syst_int64_to_float128( int64 );
+#endif
+#endif
+int32 syst_float32_to_int32( float32 );
+int32 syst_float32_to_int32_round_to_zero( float32 );
+#ifdef BITS64
+int64 syst_float32_to_int64( float32 );
+int64 syst_float32_to_int64_round_to_zero( float32 );
+#endif
+float64 syst_float32_to_float64( float32 );
+#ifdef FLOATX80
+floatx80 syst_float32_to_floatx80( float32 );
+#endif
+#ifdef FLOAT128
+float128 syst_float32_to_float128( float32 );
+#endif
+float32 syst_float32_round_to_int( float32 );
+float32 syst_float32_add( float32, float32 );
+float32 syst_float32_sub( float32, float32 );
+float32 syst_float32_mul( float32, float32 );
+float32 syst_float32_div( float32, float32 );
+float32 syst_float32_rem( float32, float32 );
+float32 syst_float32_sqrt( float32 );
+flag syst_float32_eq( float32, float32 );
+flag syst_float32_le( float32, float32 );
+flag syst_float32_lt( float32, float32 );
+flag syst_float32_eq_signaling( float32, float32 );
+flag syst_float32_le_quiet( float32, float32 );
+flag syst_float32_lt_quiet( float32, float32 );
+int32 syst_float64_to_int32( float64 );
+int32 syst_float64_to_int32_round_to_zero( float64 );
+#ifdef BITS64
+int64 syst_float64_to_int64( float64 );
+int64 syst_float64_to_int64_round_to_zero( float64 );
+#endif
+float32 syst_float64_to_float32( float64 );
+#ifdef FLOATX80
+floatx80 syst_float64_to_floatx80( float64 );
+#endif
+#ifdef FLOAT128
+float128 syst_float64_to_float128( float64 );
+#endif
+float64 syst_float64_round_to_int( float64 );
+float64 syst_float64_add( float64, float64 );
+float64 syst_float64_sub( float64, float64 );
+float64 syst_float64_mul( float64, float64 );
+float64 syst_float64_div( float64, float64 );
+float64 syst_float64_rem( float64, float64 );
+float64 syst_float64_sqrt( float64 );
+flag syst_float64_eq( float64, float64 );
+flag syst_float64_le( float64, float64 );
+flag syst_float64_lt( float64, float64 );
+flag syst_float64_eq_signaling( float64, float64 );
+flag syst_float64_le_quiet( float64, float64 );
+flag syst_float64_lt_quiet( float64, float64 );
+#ifdef FLOATX80
+int32 syst_floatx80_to_int32( floatx80 );
+int32 syst_floatx80_to_int32_round_to_zero( floatx80 );
+#ifdef BITS64
+int64 syst_floatx80_to_int64( floatx80 );
+int64 syst_floatx80_to_int64_round_to_zero( floatx80 );
+#endif
+float32 syst_floatx80_to_float32( floatx80 );
+float64 syst_floatx80_to_float64( floatx80 );
+#ifdef FLOAT128
+float128 syst_floatx80_to_float128( floatx80 );
+#endif
+floatx80 syst_floatx80_round_to_int( floatx80 );
+floatx80 syst_floatx80_add( floatx80, floatx80 );
+floatx80 syst_floatx80_sub( floatx80, floatx80 );
+floatx80 syst_floatx80_mul( floatx80, floatx80 );
+floatx80 syst_floatx80_div( floatx80, floatx80 );
+floatx80 syst_floatx80_rem( floatx80, floatx80 );
+floatx80 syst_floatx80_sqrt( floatx80 );
+flag syst_floatx80_eq( floatx80, floatx80 );
+flag syst_floatx80_le( floatx80, floatx80 );
+flag syst_floatx80_lt( floatx80, floatx80 );
+flag syst_floatx80_eq_signaling( floatx80, floatx80 );
+flag syst_floatx80_le_quiet( floatx80, floatx80 );
+flag syst_floatx80_lt_quiet( floatx80, floatx80 );
+#endif
+#ifdef FLOAT128
+int32 syst_float128_to_int32( float128 );
+int32 syst_float128_to_int32_round_to_zero( float128 );
+#ifdef BITS64
+int64 syst_float128_to_int64( float128 );
+int64 syst_float128_to_int64_round_to_zero( float128 );
+#endif
+float32 syst_float128_to_float32( float128 );
+float64 syst_float128_to_float64( float128 );
+#ifdef FLOATX80
+floatx80 syst_float128_to_floatx80( float128 );
+#endif
+float128 syst_float128_round_to_int( float128 );
+float128 syst_float128_add( float128, float128 );
+float128 syst_float128_sub( float128, float128 );
+float128 syst_float128_mul( float128, float128 );
+float128 syst_float128_div( float128, float128 );
+float128 syst_float128_rem( float128, float128 );
+float128 syst_float128_sqrt( float128 );
+flag syst_float128_eq( float128, float128 );
+flag syst_float128_le( float128, float128 );
+flag syst_float128_lt( float128, float128 );
+flag syst_float128_eq_signaling( float128, float128 );
+flag syst_float128_le_quiet( float128, float128 );
+flag syst_float128_lt_quiet( float128, float128 );
+#endif
+

Added: vendor/testfloat/testfloat/386-Win32-gcc/systmodes.S
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ vendor/testfloat/testfloat/386-Win32-gcc/systmodes.S	Tue Apr 20 20:47:58 2010	(r206917)
@@ -0,0 +1,82 @@
+
+/*
+===============================================================================
+
+This GNU assembler source file is part of TestFloat, Release 2a, a package
+of programs for testing the correctness of floating-point arithmetic
+complying to the IEC/IEEE Standard for Floating-Point.
+
+Written by John R. Hauser.  More information is available through the Web
+page `http://HTTP.CS.Berkeley.EDU/~jhauser/arithmetic/TestFloat.html'.
+
+THIS SOFTWARE IS DISTRIBUTED AS IS, FOR FREE.  Although reasonable effort
+has been made to avoid it, THIS SOFTWARE MAY CONTAIN FAULTS THAT WILL AT
+TIMES RESULT IN INCORRECT BEHAVIOR.  USE OF THIS SOFTWARE IS RESTRICTED TO
+PERSONS AND ORGANIZATIONS WHO CAN AND WILL TAKE FULL RESPONSIBILITY FOR ANY
+AND ALL LOSSES, COSTS, OR OTHER PROBLEMS ARISING FROM ITS USE.
+
+Derivative works are acceptable, even for commercial purposes, so long as
+(1) they include prominent notice that the work is derivative, and (2) they
+include prominent notice akin to these four paragraphs for those parts of
+this code that are retained.
+
+===============================================================================
+*/
+
+	.text
+
+/*
+-------------------------------------------------------------------------------
+Sets the system's IEC/IEEE floating-point rounding mode.  Also disables all
+system exception traps.
+-------------------------------------------------------------------------------
+*/
+	.align 4
+	.global _syst_float_set_rounding_mode
+_syst_float_set_rounding_mode:
+	movb 4(%esp),%al
+	andb $3,%al
+	shlw $10,%ax
+	orw $63,%ax
+	subl $2,%esp
+	fnstcw 0(%esp)
+	andw $768,0(%esp)
+	orw %ax,0(%esp)
+	fldcw 0(%esp)
+	addl $2,%esp
+	ret
+
+/*
+-------------------------------------------------------------------------------
+Sets the rounding precision of subsequent extended double-precision
+operations.  The `precision' argument should be one of 0, 32, 64, or 80.
+If `precision' is 32, the rounding precision is set equivalent to single
+precision; else if `precision' is 64, the rounding precision is set
+equivalent to double precision; else the rounding precision is set to full
+extended double precision.
+-------------------------------------------------------------------------------
+*/
+	.align 4
+	.global _syst_float_set_rounding_precision
+_syst_float_set_rounding_precision:
+	movb 4(%esp),%al
+	movb $0,%ah
+	cmpb $32,%al
+	je setRoundingPrecision
+	movb $2,%ah
+	cmpb $64,%al
+	je setRoundingPrecision
+	movb $3,%ah
+	cmpb $80,%al
+	je setRoundingPrecision
+	movb $0,%ah
+setRoundingPrecision:
+	movb $0,%al
+	subl $2,%esp
+	fnstcw 0(%esp)
+	andw $64767,0(%esp)
+	orw %ax,0(%esp)
+	fldcw 0(%esp)
+	addl $2,%esp
+	ret
+

Added: vendor/testfloat/testfloat/README.txt
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ vendor/testfloat/testfloat/README.txt	Tue Apr 20 20:47:58 2010	(r206917)
@@ -0,0 +1,50 @@
+
+Package Overview for TestFloat Release 2a
+
+John R. Hauser
+1998 December 16
+
+
+TestFloat is a program for testing that a floating-point implementation
+conforms to the IEC/IEEE Standard for Binary Floating-Point Arithmetic.
+TestFloat is distributed in the form of C source code.  The TestFloat
+package actually provides two related programs:
+
+-- The `testfloat' program tests a system's floating-point for conformance
+   to the IEC/IEEE Standard.  This program uses the SoftFloat software
+   floating-point implementation as a basis for comparison.
+
+-- The `testsoftfloat' program tests SoftFloat itself for conformance to
+   the IEC/IEEE Standard.  These tests are performed by comparing against a
+   separate, slower software floating-point that is included in the TestFloat
+   package.
+
+TestFloat depends on SoftFloat, but SoftFloat is not included in the
+TestFloat package.  SoftFloat can be obtained through the Web page `http://
+HTTP.CS.Berkeley.EDU/~jhauser/arithmetic/SoftFloat.html'.
+
+TestFloat is documented in three text files:
+
+   testfloat.txt          Documentation for using the TestFloat programs
+                              (both `testfloat' and `testsoftfloat').
+   testfloat-source.txt   Documentation for porting and compiling TestFloat.
+   testfloat-history.txt  History of major changes to TestFloat.
+
+The following file is also provided:
+
+   systemBugs.txt         Information about processor bugs found using
+                              TestFloat.
+
+Other files in the package comprise the source code for TestFloat.
+
+Please be aware that some work is involved in porting this software to other
+targets.  It is not just a matter of getting `make' to complete without
+error messages.  I would have written the code that way if I could, but
+there are fundamental differences between systems that I can't make go away.
+You should not attempt to compile the TestFloat sources without first
+reading `testfloat-source.txt'.
+
+At the time of this writing, the most up-to-date information about
+TestFloat and the latest release can be found at the Web page `http://
+HTTP.CS.Berkeley.EDU/~jhauser/arithmetic/TestFloat.html'.
+

Added: vendor/testfloat/testfloat/SPARC-Solaris-gcc/Makefile
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ vendor/testfloat/testfloat/SPARC-Solaris-gcc/Makefile	Tue Apr 20 20:47:58 2010	(r206917)
@@ -0,0 +1,64 @@
+
+PROCESSOR_H = ../../processors/SPARC-gcc.h
+SOFTFLOAT_VERSION = bits64
+TARGET = SPARC-Solaris-gcc
+SOFTFLOAT_DIR = ../../softfloat/$(SOFTFLOAT_VERSION)/$(TARGET)
+
+OBJ = .o
+EXE =
+INCLUDES = -I. -I.. -I$(SOFTFLOAT_DIR)

*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***

From owner-svn-src-vendor@FreeBSD.ORG  Tue Apr 20 20:52:33 2010
Return-Path: 
Delivered-To: svn-src-vendor@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 6F198106566B;
	Tue, 20 Apr 2010 20:52:33 +0000 (UTC)
	(envelope-from marius@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 54E188FC12;
	Tue, 20 Apr 2010 20:52:33 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o3KKqX5X041027;
	Tue, 20 Apr 2010 20:52:33 GMT (envelope-from marius@svn.freebsd.org)
Received: (from marius@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o3KKqX82041026;
	Tue, 20 Apr 2010 20:52:33 GMT (envelope-from marius@svn.freebsd.org)
Message-Id: <201004202052.o3KKqX82041026@svn.freebsd.org>
From: Marius Strobl 
Date: Tue, 20 Apr 2010 20:52:33 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-vendor@freebsd.org
X-SVN-Group: vendor
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r206918 - in vendor/testfloat: processors testfloat
	testfloat/386-Win32-gcc testfloat/SPARC-Solaris-gcc
	testfloat/templates
X-BeenThere: svn-src-vendor@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the vendor work area tree
	
List-Unsubscribe: , 
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
	
X-List-Received-Date: Tue, 20 Apr 2010 20:52:33 -0000

Author: marius
Date: Tue Apr 20 20:52:33 2010
New Revision: 206918
URL: http://svn.freebsd.org/changeset/base/206918

Log:
  Remove the keywords property.

Modified:
Directory Properties:
  vendor/testfloat/processors/386-gcc.h   (props changed)
  vendor/testfloat/processors/SPARC-gcc.h   (props changed)
  vendor/testfloat/testfloat/386-Win32-gcc/Makefile   (props changed)
  vendor/testfloat/testfloat/386-Win32-gcc/milieu.h   (props changed)
  vendor/testfloat/testfloat/386-Win32-gcc/systflags.S   (props changed)
  vendor/testfloat/testfloat/386-Win32-gcc/systfloat.S   (props changed)
  vendor/testfloat/testfloat/386-Win32-gcc/systfloat.h   (props changed)
  vendor/testfloat/testfloat/386-Win32-gcc/systmodes.S   (props changed)
  vendor/testfloat/testfloat/README.txt   (props changed)
  vendor/testfloat/testfloat/SPARC-Solaris-gcc/Makefile   (props changed)
  vendor/testfloat/testfloat/SPARC-Solaris-gcc/milieu.h   (props changed)
  vendor/testfloat/testfloat/SPARC-Solaris-gcc/systflags.c   (props changed)
  vendor/testfloat/testfloat/SPARC-Solaris-gcc/systfloat.S   (props changed)
  vendor/testfloat/testfloat/SPARC-Solaris-gcc/systfloat.h   (props changed)
  vendor/testfloat/testfloat/SPARC-Solaris-gcc/systmodes.c   (props changed)
  vendor/testfloat/testfloat/fail.c   (props changed)
  vendor/testfloat/testfloat/fail.h   (props changed)
  vendor/testfloat/testfloat/random.c   (props changed)
  vendor/testfloat/testfloat/random.h   (props changed)
  vendor/testfloat/testfloat/slowfloat-32.c   (props changed)
  vendor/testfloat/testfloat/slowfloat-64.c   (props changed)
  vendor/testfloat/testfloat/slowfloat.c   (props changed)
  vendor/testfloat/testfloat/slowfloat.h   (props changed)
  vendor/testfloat/testfloat/systemBugs.txt   (props changed)
  vendor/testfloat/testfloat/systflags.h   (props changed)
  vendor/testfloat/testfloat/systfloat.c   (props changed)
  vendor/testfloat/testfloat/systfloat.h   (props changed)
  vendor/testfloat/testfloat/systmodes.h   (props changed)
  vendor/testfloat/testfloat/templates/Makefile   (props changed)
  vendor/testfloat/testfloat/templates/milieu.h   (props changed)
  vendor/testfloat/testfloat/templates/systflags.c   (props changed)
  vendor/testfloat/testfloat/templates/systmodes.c   (props changed)
  vendor/testfloat/testfloat/testCases.c   (props changed)
  vendor/testfloat/testfloat/testCases.h   (props changed)
  vendor/testfloat/testfloat/testFunction.c   (props changed)
  vendor/testfloat/testfloat/testFunction.h   (props changed)
  vendor/testfloat/testfloat/testLoops.c   (props changed)
  vendor/testfloat/testfloat/testLoops.h   (props changed)
  vendor/testfloat/testfloat/testfloat-history.txt   (props changed)
  vendor/testfloat/testfloat/testfloat-source.txt   (props changed)
  vendor/testfloat/testfloat/testfloat.c   (props changed)
  vendor/testfloat/testfloat/testfloat.txt   (props changed)
  vendor/testfloat/testfloat/testsoftfloat.c   (props changed)
  vendor/testfloat/testfloat/writeHex.c   (props changed)
  vendor/testfloat/testfloat/writeHex.h   (props changed)

From owner-svn-src-vendor@FreeBSD.ORG  Tue Apr 20 21:02:22 2010
Return-Path: 
Delivered-To: svn-src-vendor@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 80023106567F;
	Tue, 20 Apr 2010 21:02:22 +0000 (UTC)
	(envelope-from marius@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 541A58FC25;
	Tue, 20 Apr 2010 21:02:22 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o3KL2MUI043322;
	Tue, 20 Apr 2010 21:02:22 GMT (envelope-from marius@svn.freebsd.org)
Received: (from marius@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o3KL2Mh0043321;
	Tue, 20 Apr 2010 21:02:22 GMT (envelope-from marius@svn.freebsd.org)
Message-Id: <201004202102.o3KL2Mh0043321@svn.freebsd.org>
From: Marius Strobl 
Date: Tue, 20 Apr 2010 21:02:22 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-vendor@freebsd.org
X-SVN-Group: vendor
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r206920 - vendor/testfloat/dist
X-BeenThere: svn-src-vendor@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the vendor work area tree
	
List-Unsubscribe: , 
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
	
X-List-Received-Date: Tue, 20 Apr 2010 21:02:22 -0000

Author: marius
Date: Tue Apr 20 21:02:20 2010
New Revision: 206920
URL: http://svn.freebsd.org/changeset/base/206920

Log:
  Add a dist subdirectory.

Added:
  vendor/testfloat/dist/

From owner-svn-src-vendor@FreeBSD.ORG  Tue Apr 20 21:03:42 2010
Return-Path: 
Delivered-To: svn-src-vendor@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id D3E5E1065673;
	Tue, 20 Apr 2010 21:03:42 +0000 (UTC)
	(envelope-from marius@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id A98E28FC08;
	Tue, 20 Apr 2010 21:03:42 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o3KL3g7s043657;
	Tue, 20 Apr 2010 21:03:42 GMT (envelope-from marius@svn.freebsd.org)
Received: (from marius@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o3KL3gSG043656;
	Tue, 20 Apr 2010 21:03:42 GMT (envelope-from marius@svn.freebsd.org)
Message-Id: <201004202103.o3KL3gSG043656@svn.freebsd.org>
From: Marius Strobl 
Date: Tue, 20 Apr 2010 21:03:42 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-vendor@freebsd.org
X-SVN-Group: vendor
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r206921 - in vendor/testfloat: dist/processors
	dist/testfloat processors testfloat
X-BeenThere: svn-src-vendor@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the vendor work area tree
	
List-Unsubscribe: , 
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
	
X-List-Received-Date: Tue, 20 Apr 2010 21:03:42 -0000

Author: marius
Date: Tue Apr 20 21:03:42 2010
New Revision: 206921
URL: http://svn.freebsd.org/changeset/base/206921

Log:
  Move TestFloat 2a to the dist subdirectory.

Added:
  vendor/testfloat/dist/processors/
     - copied from r206920, vendor/testfloat/processors/
  vendor/testfloat/dist/testfloat/
     - copied from r206920, vendor/testfloat/testfloat/
Deleted:
  vendor/testfloat/processors/
  vendor/testfloat/testfloat/

From owner-svn-src-vendor@FreeBSD.ORG  Tue Apr 20 21:08:01 2010
Return-Path: 
Delivered-To: svn-src-vendor@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 83C5F106564A;
	Tue, 20 Apr 2010 21:08:01 +0000 (UTC)
	(envelope-from marius@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 5A4228FC08;
	Tue, 20 Apr 2010 21:08:01 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o3KL81Za044693;
	Tue, 20 Apr 2010 21:08:01 GMT (envelope-from marius@svn.freebsd.org)
Received: (from marius@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o3KL81Ge044678;
	Tue, 20 Apr 2010 21:08:01 GMT (envelope-from marius@svn.freebsd.org)
Message-Id: <201004202108.o3KL81Ge044678@svn.freebsd.org>
From: Marius Strobl 
Date: Tue, 20 Apr 2010 21:08:01 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-vendor@freebsd.org
X-SVN-Group: vendor
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r206923 - vendor/testfloat/2a
X-BeenThere: svn-src-vendor@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the vendor work area tree
	
List-Unsubscribe: , 
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
	
X-List-Received-Date: Tue, 20 Apr 2010 21:08:01 -0000

Author: marius
Date: Tue Apr 20 21:08:00 2010
New Revision: 206923
URL: http://svn.freebsd.org/changeset/base/206923

Log:
  Tag TestFloat 2a.

Added:
  vendor/testfloat/2a/
     - copied from r206922, vendor/testfloat/dist/

From owner-svn-src-vendor@FreeBSD.ORG  Wed Apr 21 17:53:11 2010
Return-Path: 
Delivered-To: svn-src-vendor@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 2EA00106566C;
	Wed, 21 Apr 2010 17:53:11 +0000 (UTC)
	(envelope-from delphij@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 186398FC1D;
	Wed, 21 Apr 2010 17:53:11 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o3LHrBiV024823;
	Wed, 21 Apr 2010 17:53:11 GMT (envelope-from delphij@svn.freebsd.org)
Received: (from delphij@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o3LHrB5j024817;
	Wed, 21 Apr 2010 17:53:11 GMT (envelope-from delphij@svn.freebsd.org)
Message-Id: <201004211753.o3LHrB5j024817@svn.freebsd.org>
From: Xin LI 
Date: Wed, 21 Apr 2010 17:53:11 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-vendor@freebsd.org
X-SVN-Group: vendor
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r207002 - in vendor/gnu-sort: 2.0.21 2.0.21/contrib
	2.0.21/lib 2.0.21/man 2.0.21/src 2.1 2.1/contrib 2.1/lib
	2.1/man 2.1/src 20040812 20040812/contrib 20040812/lib
	20040812/src 5.2.1 5....
X-BeenThere: svn-src-vendor@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the vendor work area tree
	
List-Unsubscribe: , 
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
	
X-List-Received-Date: Wed, 21 Apr 2010 17:53:11 -0000

Author: delphij
Date: Wed Apr 21 17:53:10 2010
New Revision: 207002
URL: http://svn.freebsd.org/changeset/base/207002

Log:
  Flattern tree.

Added:
  vendor/gnu-sort/2.0.21/ABOUT-NLS
     - copied unchanged from r207001, vendor/gnu-sort/2.0.21/contrib/gnu-sort/ABOUT-NLS
  vendor/gnu-sort/2.0.21/AUTHORS
     - copied unchanged from r207001, vendor/gnu-sort/2.0.21/contrib/gnu-sort/AUTHORS
  vendor/gnu-sort/2.0.21/COPYING
     - copied unchanged from r207001, vendor/gnu-sort/2.0.21/contrib/gnu-sort/COPYING
  vendor/gnu-sort/2.0.21/ChangeLog
     - copied unchanged from r207001, vendor/gnu-sort/2.0.21/contrib/gnu-sort/ChangeLog
  vendor/gnu-sort/2.0.21/INSTALL
     - copied unchanged from r207001, vendor/gnu-sort/2.0.21/contrib/gnu-sort/INSTALL
  vendor/gnu-sort/2.0.21/NEWS
     - copied unchanged from r207001, vendor/gnu-sort/2.0.21/contrib/gnu-sort/NEWS
  vendor/gnu-sort/2.0.21/README
     - copied unchanged from r207001, vendor/gnu-sort/2.0.21/contrib/gnu-sort/README
  vendor/gnu-sort/2.0.21/README-alpha
     - copied unchanged from r207001, vendor/gnu-sort/2.0.21/contrib/gnu-sort/README-alpha
  vendor/gnu-sort/2.0.21/THANKS
     - copied unchanged from r207001, vendor/gnu-sort/2.0.21/contrib/gnu-sort/THANKS
  vendor/gnu-sort/2.0.21/TODO
     - copied unchanged from r207001, vendor/gnu-sort/2.0.21/contrib/gnu-sort/TODO
  vendor/gnu-sort/2.0.21/lib/
     - copied from r207001, vendor/gnu-sort/2.0.21/contrib/gnu-sort/lib/
  vendor/gnu-sort/2.0.21/man/
     - copied from r207001, vendor/gnu-sort/2.0.21/contrib/gnu-sort/man/
  vendor/gnu-sort/2.0.21/src/
     - copied from r207001, vendor/gnu-sort/2.0.21/contrib/gnu-sort/src/
  vendor/gnu-sort/2.1/ABOUT-NLS
     - copied unchanged from r207001, vendor/gnu-sort/2.1/contrib/gnu-sort/ABOUT-NLS
  vendor/gnu-sort/2.1/AUTHORS
     - copied unchanged from r207001, vendor/gnu-sort/2.1/contrib/gnu-sort/AUTHORS
  vendor/gnu-sort/2.1/COPYING
     - copied unchanged from r207001, vendor/gnu-sort/2.1/contrib/gnu-sort/COPYING
  vendor/gnu-sort/2.1/ChangeLog
     - copied unchanged from r207001, vendor/gnu-sort/2.1/contrib/gnu-sort/ChangeLog
  vendor/gnu-sort/2.1/INSTALL
     - copied unchanged from r207001, vendor/gnu-sort/2.1/contrib/gnu-sort/INSTALL
  vendor/gnu-sort/2.1/NEWS
     - copied unchanged from r207001, vendor/gnu-sort/2.1/contrib/gnu-sort/NEWS
  vendor/gnu-sort/2.1/README
     - copied unchanged from r207001, vendor/gnu-sort/2.1/contrib/gnu-sort/README
  vendor/gnu-sort/2.1/THANKS
     - copied unchanged from r207001, vendor/gnu-sort/2.1/contrib/gnu-sort/THANKS
  vendor/gnu-sort/2.1/TODO
     - copied unchanged from r207001, vendor/gnu-sort/2.1/contrib/gnu-sort/TODO
  vendor/gnu-sort/2.1/lib/
     - copied from r207001, vendor/gnu-sort/2.1/contrib/gnu-sort/lib/
  vendor/gnu-sort/2.1/man/
     - copied from r207001, vendor/gnu-sort/2.1/contrib/gnu-sort/man/
  vendor/gnu-sort/2.1/src/
     - copied from r207001, vendor/gnu-sort/2.1/contrib/gnu-sort/src/
  vendor/gnu-sort/20040812/ABOUT-NLS
     - copied unchanged from r207001, vendor/gnu-sort/20040812/contrib/gnu-sort/ABOUT-NLS
  vendor/gnu-sort/20040812/AUTHORS
     - copied unchanged from r207001, vendor/gnu-sort/20040812/contrib/gnu-sort/AUTHORS
  vendor/gnu-sort/20040812/COPYING
     - copied unchanged from r207001, vendor/gnu-sort/20040812/contrib/gnu-sort/COPYING
  vendor/gnu-sort/20040812/ChangeLog
     - copied unchanged from r207001, vendor/gnu-sort/20040812/contrib/gnu-sort/ChangeLog
  vendor/gnu-sort/20040812/INSTALL
     - copied unchanged from r207001, vendor/gnu-sort/20040812/contrib/gnu-sort/INSTALL
  vendor/gnu-sort/20040812/NEWS
     - copied unchanged from r207001, vendor/gnu-sort/20040812/contrib/gnu-sort/NEWS
  vendor/gnu-sort/20040812/README
     - copied unchanged from r207001, vendor/gnu-sort/20040812/contrib/gnu-sort/README
  vendor/gnu-sort/20040812/THANKS
     - copied unchanged from r207001, vendor/gnu-sort/20040812/contrib/gnu-sort/THANKS
  vendor/gnu-sort/20040812/TODO
     - copied unchanged from r207001, vendor/gnu-sort/20040812/contrib/gnu-sort/TODO
  vendor/gnu-sort/20040812/lib/
     - copied from r207001, vendor/gnu-sort/20040812/contrib/gnu-sort/lib/
  vendor/gnu-sort/20040812/src/
     - copied from r207001, vendor/gnu-sort/20040812/contrib/gnu-sort/src/
  vendor/gnu-sort/5.2.1/ABOUT-NLS
     - copied unchanged from r207001, vendor/gnu-sort/5.2.1/contrib/gnu-sort/ABOUT-NLS
  vendor/gnu-sort/5.2.1/AUTHORS
     - copied unchanged from r207001, vendor/gnu-sort/5.2.1/contrib/gnu-sort/AUTHORS
  vendor/gnu-sort/5.2.1/COPYING
     - copied unchanged from r207001, vendor/gnu-sort/5.2.1/contrib/gnu-sort/COPYING
  vendor/gnu-sort/5.2.1/ChangeLog
     - copied unchanged from r207001, vendor/gnu-sort/5.2.1/contrib/gnu-sort/ChangeLog
  vendor/gnu-sort/5.2.1/INSTALL
     - copied unchanged from r207001, vendor/gnu-sort/5.2.1/contrib/gnu-sort/INSTALL
  vendor/gnu-sort/5.2.1/NEWS
     - copied unchanged from r207001, vendor/gnu-sort/5.2.1/contrib/gnu-sort/NEWS
  vendor/gnu-sort/5.2.1/README
     - copied unchanged from r207001, vendor/gnu-sort/5.2.1/contrib/gnu-sort/README
  vendor/gnu-sort/5.2.1/THANKS
     - copied unchanged from r207001, vendor/gnu-sort/5.2.1/contrib/gnu-sort/THANKS
  vendor/gnu-sort/5.2.1/THANKS-to-translators
     - copied unchanged from r207001, vendor/gnu-sort/5.2.1/contrib/gnu-sort/THANKS-to-translators
  vendor/gnu-sort/5.2.1/TODO
     - copied unchanged from r207001, vendor/gnu-sort/5.2.1/contrib/gnu-sort/TODO
  vendor/gnu-sort/5.2.1/lib/
     - copied from r207001, vendor/gnu-sort/5.2.1/contrib/gnu-sort/lib/
  vendor/gnu-sort/5.2.1/man/
     - copied from r207001, vendor/gnu-sort/5.2.1/contrib/gnu-sort/man/
  vendor/gnu-sort/5.2.1/src/
     - copied from r207001, vendor/gnu-sort/5.2.1/contrib/gnu-sort/src/
  vendor/gnu-sort/dist/ABOUT-NLS
     - copied unchanged from r207001, vendor/gnu-sort/dist/contrib/gnu-sort/ABOUT-NLS
  vendor/gnu-sort/dist/AUTHORS
     - copied unchanged from r207001, vendor/gnu-sort/dist/contrib/gnu-sort/AUTHORS
  vendor/gnu-sort/dist/COPYING
     - copied unchanged from r207001, vendor/gnu-sort/dist/contrib/gnu-sort/COPYING
  vendor/gnu-sort/dist/ChangeLog
     - copied unchanged from r207001, vendor/gnu-sort/dist/contrib/gnu-sort/ChangeLog
  vendor/gnu-sort/dist/INSTALL
     - copied unchanged from r207001, vendor/gnu-sort/dist/contrib/gnu-sort/INSTALL
  vendor/gnu-sort/dist/NEWS
     - copied unchanged from r207001, vendor/gnu-sort/dist/contrib/gnu-sort/NEWS
  vendor/gnu-sort/dist/README
     - copied unchanged from r207001, vendor/gnu-sort/dist/contrib/gnu-sort/README
  vendor/gnu-sort/dist/README-alpha
     - copied unchanged from r207001, vendor/gnu-sort/dist/contrib/gnu-sort/README-alpha
  vendor/gnu-sort/dist/THANKS
     - copied unchanged from r207001, vendor/gnu-sort/dist/contrib/gnu-sort/THANKS
  vendor/gnu-sort/dist/THANKS-to-translators
     - copied unchanged from r207001, vendor/gnu-sort/dist/contrib/gnu-sort/THANKS-to-translators
  vendor/gnu-sort/dist/TODO
     - copied unchanged from r207001, vendor/gnu-sort/dist/contrib/gnu-sort/TODO
  vendor/gnu-sort/dist/lib/
     - copied from r207001, vendor/gnu-sort/dist/contrib/gnu-sort/lib/
  vendor/gnu-sort/dist/man/
     - copied from r207001, vendor/gnu-sort/dist/contrib/gnu-sort/man/
  vendor/gnu-sort/dist/src/
     - copied from r207001, vendor/gnu-sort/dist/contrib/gnu-sort/src/
Deleted:
  vendor/gnu-sort/2.0.21/contrib/
  vendor/gnu-sort/2.1/contrib/
  vendor/gnu-sort/20040812/contrib/
  vendor/gnu-sort/5.2.1/contrib/
  vendor/gnu-sort/dist/contrib/

Copied: vendor/gnu-sort/2.0.21/ABOUT-NLS (from r207001, vendor/gnu-sort/2.0.21/contrib/gnu-sort/ABOUT-NLS)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ vendor/gnu-sort/2.0.21/ABOUT-NLS	Wed Apr 21 17:53:10 2010	(r207002, copy of r207001, vendor/gnu-sort/2.0.21/contrib/gnu-sort/ABOUT-NLS)
@@ -0,0 +1,393 @@
+Notes on the Free Translation Project
+*************************************
+
+   Free software is going international!  The Free Translation Project
+is a way to get maintainers of free software, translators, and users all
+together, so that will gradually become able to speak many languages.
+A few packages already provide translations for their messages.
+
+   If you found this `ABOUT-NLS' file inside a distribution, you may
+assume that the distributed package does use GNU `gettext' internally,
+itself available at your nearest GNU archive site.  But you do _not_
+need to install GNU `gettext' prior to configuring, installing or using
+this package with messages translated.
+
+   Installers will find here some useful hints.  These notes also
+explain how users should proceed for getting the programs to use the
+available translations.  They tell how people wanting to contribute and
+work at translations should contact the appropriate team.
+
+   When reporting bugs in the `intl/' directory or bugs which may be
+related to internationalization, you should tell about the version of
+`gettext' which is used.  The information can be found in the
+`intl/VERSION' file, in internationalized packages.
+
+Quick configuration advice
+==========================
+
+   If you want to exploit the full power of internationalization, you
+should configure it using
+
+     ./configure --with-included-gettext
+
+to force usage of internationalizing routines provided within this
+package, despite the existence of internationalizing capabilities in the
+operating system where this package is being installed.  So far, only
+the `gettext' implementation in the GNU C library version 2 provides as
+many features (such as locale alias, message inheritance, automatic
+charset conversion or plural form handling) as the implementation here.
+It is also not possible to offer this additional functionality on top
+of a `catgets' implementation.  Future versions of GNU `gettext' will
+very likely convey even more functionality.  So it might be a good idea
+to change to GNU `gettext' as soon as possible.
+
+   So you need _not_ provide this option if you are using GNU libc 2 or
+you have installed a recent copy of the GNU gettext package with the
+included `libintl'.
+
+INSTALL Matters
+===============
+
+   Some packages are "localizable" when properly installed; the
+programs they contain can be made to speak your own native language.
+Most such packages use GNU `gettext'.  Other packages have their own
+ways to internationalization, predating GNU `gettext'.
+
+   By default, this package will be installed to allow translation of
+messages.  It will automatically detect whether the system already
+provides the GNU `gettext' functions.  If not, the GNU `gettext' own
+library will be used.  This library is wholly contained within this
+package, usually in the `intl/' subdirectory, so prior installation of
+the GNU `gettext' package is _not_ required.  Installers may use
+special options at configuration time for changing the default
+behaviour.  The commands:
+
+     ./configure --with-included-gettext
+     ./configure --disable-nls
+
+will respectively bypass any pre-existing `gettext' to use the
+internationalizing routines provided within this package, or else,
+_totally_ disable translation of messages.
+
+   When you already have GNU `gettext' installed on your system and run
+configure without an option for your new package, `configure' will
+probably detect the previously built and installed `libintl.a' file and
+will decide to use this.  This might be not what is desirable.  You
+should use the more recent version of the GNU `gettext' library.  I.e.
+if the file `intl/VERSION' shows that the library which comes with this
+package is more recent, you should use
+
+     ./configure --with-included-gettext
+
+to prevent auto-detection.
+
+   The configuration process will not test for the `catgets' function
+and therefore it will not be used.  The reason is that even an
+emulation of `gettext' on top of `catgets' could not provide all the
+extensions of the GNU `gettext' library.
+
+   Internationalized packages have usually many `po/LL.po' files, where
+LL gives an ISO 639 two-letter code identifying the language.  Unless
+translations have been forbidden at `configure' time by using the
+`--disable-nls' switch, all available translations are installed
+together with the package.  However, the environment variable `LINGUAS'
+may be set, prior to configuration, to limit the installed set.
+`LINGUAS' should then contain a space separated list of two-letter
+codes, stating which languages are allowed.
+
+Using This Package
+==================
+
+   As a user, if your language has been installed for this package, you
+only have to set the `LANG' environment variable to the appropriate
+`LL_CC' combination.  Here `LL' is an ISO 639 two-letter language code,
+and `CC' is an ISO 3166 two-letter country code.  For example, let's
+suppose that you speak German and live in Germany.  At the shell
+prompt, merely execute `setenv LANG de_DE' (in `csh'),
+`export LANG; LANG=de_DE' (in `sh') or `export LANG=de_DE' (in `bash').
+This can be done from your `.login' or `.profile' file, once and for
+all.
+
+   You might think that the country code specification is redundant.
+But in fact, some languages have dialects in different countries.  For
+example, `de_AT' is used for Austria, and `pt_BR' for Brazil.  The
+country code serves to distinguish the dialects.
+
+   The locale naming convention of `LL_CC', with `LL' denoting the
+language and `CC' denoting the country, is the one use on systems based
+on GNU libc.  On other systems, some variations of this scheme are
+used, such as `LL' or `LL_CC.ENCODING'.  You can get the list of
+locales supported by your system for your country by running the command
+`locale -a | grep '^LL''.
+
+   Not all programs have translations for all languages.  By default, an
+English message is shown in place of a nonexistent translation.  If you
+understand other languages, you can set up a priority list of languages.
+This is done through a different environment variable, called
+`LANGUAGE'.  GNU `gettext' gives preference to `LANGUAGE' over `LANG'
+for the purpose of message handling, but you still need to have `LANG'
+set to the primary language; this is required by other parts of the
+system libraries.  For example, some Swedish users who would rather
+read translations in German than English for when Swedish is not
+available, set `LANGUAGE' to `sv:de' while leaving `LANG' to `sv_SE'.
+
+   In the `LANGUAGE' environment variable, but not in the `LANG'
+environment variable, `LL_CC' combinations can be abbreviated as `LL'
+to denote the language's main dialect.  For example, `de' is equivalent
+to `de_DE' (German as spoken in Germany), and `pt' to `pt_PT'
+(Portuguese as spoken in Portugal) in this context.
+
+Translating Teams
+=================
+
+   For the Free Translation Project to be a success, we need interested
+people who like their own language and write it well, and who are also
+able to synergize with other translators speaking the same language.
+Each translation team has its own mailing list.  The up-to-date list of
+teams can be found at the Free Translation Project's homepage,
+`http://www.iro.umontreal.ca/contrib/po/HTML/', in the "National teams"
+area.
+
+   If you'd like to volunteer to _work_ at translating messages, you
+should become a member of the translating team for your own language.
+The subscribing address is _not_ the same as the list itself, it has
+`-request' appended.  For example, speakers of Swedish can send a
+message to `sv-request@li.org', having this message body:
+
+     subscribe
+
+   Keep in mind that team members are expected to participate
+_actively_ in translations, or at solving translational difficulties,
+rather than merely lurking around.  If your team does not exist yet and
+you want to start one, or if you are unsure about what to do or how to
+get started, please write to `translation@iro.umontreal.ca' to reach the
+coordinator for all translator teams.
+
+   The English team is special.  It works at improving and uniformizing
+the terminology in use.  Proven linguistic skill are praised more than
+programming skill, here.
+
+Available Packages
+==================
+
+   Languages are not equally supported in all packages.  The following
+matrix shows the current state of internationalization, as of January
+2002.  The matrix shows, in regard of each package, for which languages
+PO files have been submitted to translation coordination, with a
+translation percentage of at least 50%.
+
+     Ready PO files    bg ca cs da de el en eo es et fi fr
+                     +-------------------------------------+
+     a2ps            |          [] []             []    [] |
+     bash            |             []       [] []       [] |
+     bfd             |                         []       [] |
+     binutils        |                         []       [] |
+     bison           |             []             []    [] |
+     clisp           |             []    []    []       [] |
+     cpio            |          [] []          []       [] |
+     diffutils       |       [] [] []       [] []       [] |
+     enscript        |             []                   [] |
+     error           |                         []       [] |
+     fetchmail       |       () [] []          []       () |
+     fileutils       |          [] []          [] []    [] |
+     findutils       |          [] []          [] []    [] |
+     flex            |          []             []       [] |
+     gas             |                                  [] |
+     gawk            |                         []       [] |
+     gcal            |    []                            [] |
+     gcc             |                         []       [] |
+     gettext         |    []    [] []          []       [] |
+     gnupg           |             [] []    [] [] []    [] |
+     gprof           |                         []       [] |
+     grep            |       []    []       [] [] []    [] |
+     hello           |          [] [] []    [] [] [] [] [] |
+     id-utils        |          [] []                   [] |
+     indent          |             []       []    []    [] |
+     jpilot          |       () [] []                   [] |
+     jwhois          |                         []       [] |
+     kbd             |                                  [] |
+     ld              |                         []       [] |
+     libc            |    [] [] [] [] []       []       [] |
+     lilypond        |          []                      [] |
+     lynx            |       [] [] []             []       |
+     m4              |       [] [] [] []                [] |
+     make            |          [] []          []       [] |
+     mysecretdiary   |             []                   [] |
+     nano            |    [] () [] []          []       [] |
+     nano_1_0        |    [] () [] []          []       [] |
+     opcodes         |          []             []       [] |
+     parted          |    []    [] []                   [] |
+     ptx             |          [] []          [] []    [] |
+     python          |                                     |
+     recode          |          [] [] []    [] []       [] |
+     sed             |       [] [] [] []    [] [] []    [] |
+     sh-utils        |    [] [] [] [] []       [] []    [] |
+     sharutils       |       [] [] [] []       []       [] |
+     sketch          |             ()          []       () |
+     soundtracker    |             []          []       [] |
+     sp              |                                     |
+     tar             |       [] [] []          [] []    [] |
+     texinfo         |       [] [] []       []          [] |
+     textutils       |          [] []          []       [] |
+     util-linux      |       [] []             []       [] |
+     wdiff           |          [] []          [] []    [] |
+     wget            |    [] [] [] [] []       [] []    [] |
+                     +-------------------------------------+
+                       bg ca cs da de el en eo es et fi fr
+                        0  8 12 31 36  9  1  9 37 15  1 49
+     
+                       gl he hr hu id it ja ko lv nb nl nn
+                     +-------------------------------------+
+     a2ps            |                ()    ()       []    |
+     bash            |                                     |
+     bfd             |                   []                |
+     binutils        |                   []                |
+     bison           |                   []                |
+     clisp           |                               []    |
+     cpio            | []                   []       []    |
+     diffutils       | [] []                               |
+     enscript        |                               []    |
+     error           |          []                         |
+     fetchmail       |                                     |
+     fileutils       |                [] []                |
+     findutils       | []          [] [] [] []       []    |
+     flex            |                      []             |
+     gas             |                                     |
+     gawk            |    []                               |
+     gcal            |                                     |
+     gcc             |                   []                |
+     gettext         |                      []             |
+     gnupg           | []             [] []                |
+     gprof           |                                     |
+     grep            | []             []                   |
+     hello           | []       []    [] [] [] [] [] [] [] |
+     id-utils        |                               []    |
+     indent          | []                []          []    |
+     jpilot          |                   ()          ()    |
+     jwhois          |                                     |
+     kbd             |                                     |
+     ld              |                                     |
+     libc            | []                [] []    []       |
+     lilypond        |                   []          []    |
+     lynx            |                   []          []    |
+     m4              | []          []    []          []    |
+     make            | []                [] []       []    |
+     mysecretdiary   |                                     |
+     nano            | []          [] [] ()          () [] |
+     nano_1_0        | []          [] [] ()          () [] |
+     opcodes         |                                     |
+     parted          | []                []             [] |
+     ptx             | []          []             [] []    |
+     python          |                                     |
+     recode          | [] []          []                   |
+     sed             | [] []       [] [] [] []       []    |
+     sh-utils        | []             [] []       [] []    |
+     sharutils       | []                []          []    |
+     sketch          |                ()                   |
+     soundtracker    | []                                  |
+     sp              |                                     |
+     tar             |                [] []       []       |
+     texinfo         |    [] []          []                |
+     textutils       |                      []    []       |
+     util-linux      |                () []                |
+     wdiff           |                                     |
+     wget            | [] []    []       []          []    |
+                     +-------------------------------------+
+                       gl he hr hu id it ja ko lv nb nl nn
+                       20  6  1  3  6 11 22  9  1  6 17  4
+     
+                       no pl pt pt_BR ru sk sl sv tr uk zh
+                     +-------------------------------------+
+     a2ps            | () () ()       []    [] [] ()       |  8
+     bash            |                                     |  4
+     bfd             |                         [] []       |  5
+     binutils        |                            []       |  4
+     bison           |                []       [] []       |  7
+     clisp           |                                     |  5
+     cpio            |    []     []   []       []          | 11
+     diffutils       |                []       [] []       | 11
+     enscript        |           []   []       []          |  6
+     error           |                   []       []       |  5
+     fetchmail       |    ()     ()                        |  3
+     fileutils       |                []    [] [] []       | 11
+     findutils       |    []     []   []    [] [] []       | 17
+     flex            |                []       []          |  6
+     gas             |                            []       |  2
+     gawk            |                         [] []       |  5
+     gcal            |                         []          |  3
+     gcc             |                            []       |  4
+     gettext         |                   [] [] [] []       | 10
+     gnupg           |    []                   [] []       | 12
+     gprof           |                         [] []       |  4
+     grep            |    []          []    [] [] []       | 13
+     hello           | [] []          [] []    [] [] []    | 24
+     id-utils        |                []       []          |  6
+     indent          |                [] []    [] []       | 11
+     jpilot          | ()                      ()          |  3
+     jwhois          |                ()       ()          |  2
+     kbd             |                         [] []       |  3
+     ld              |                         [] []       |  4
+     libc            | [] []     []      []    [] []       | 17
+     lilypond        |                         []          |  5
+     lynx            |           []   []       []          |  9
+     m4              |    []          []       []          | 12
+     make            |    []     []   []          []       | 12
+     mysecretdiary   |                         []          |  3
+     nano            | ()             []       []    []    | 12
+     nano_1_0        | ()             []       []    []    | 12
+     opcodes         |                         [] []       |  5
+     parted          |       []  []            []          | 10
+     ptx             | [] [] []       []       [] []       | 15
+     python          |                                     |  0
+     recode          |    []          []    [] []          | 13
+     sed             |           []   [] [] [] [] []       | 21
+     sh-utils        | [] []     []   [] [] [] [] []    [] | 22
+     sharutils       |                []       []          | 11
+     sketch          |                ()                   |  1
+     soundtracker    |                                     |  4
+     sp              |                                     |  0
+     tar             | [] []     []      [] [] [] []       | 16
+     texinfo         |                []       []          | 10
+     textutils       |                      []    []       |  8
+     util-linux      |           []            [] []       |  8
+     wdiff           |                [] []    [] []       |  9
+     wget            |                [] [] [] [] [] []    | 19
+                     +-------------------------------------+
+       35 teams        no pl pt pt_BR ru sk sl sv tr uk zh
+       54 domains       5 12  2  11   25 10 11 39 29  4  1  463
+
+   Some counters in the preceding matrix are higher than the number of
+visible blocks let us expect.  This is because a few extra PO files are
+used for implementing regional variants of languages, or language
+dialects.
+
+   For a PO file in the matrix above to be effective, the package to
+which it applies should also have been internationalized and
+distributed as such by its maintainer.  There might be an observable
+lag between the mere existence a PO file and its wide availability in a
+distribution.
+
+   If January 2002 seems to be old, you may fetch a more recent copy of
+this `ABOUT-NLS' file on most GNU archive sites.  The most up-to-date
+matrix with full percentage details can be found at
+`http://www.iro.umontreal.ca/contrib/po/HTML/matrix.html'.
+
+Using `gettext' in new packages
+===============================
+
+   If you are writing a freely available program and want to
+internationalize it you are welcome to use GNU `gettext' in your
+package.  Of course you have to respect the GNU Library General Public
+License which covers the use of the GNU `gettext' library.  This means
+in particular that even non-free programs can use `libintl' as a shared
+library, whereas only free software can use `libintl' as a static
+library or use modified versions of `libintl'.
+
+   Once the sources are changed appropriately and the setup can handle
+to use of `gettext' the only thing missing are the translations.  The
+Free Translation Project is also available for packages which are not
+developed inside the GNU project.  Therefore the information given above
+applies also for every other Free Software Project.  Contact
+`translation@iro.umontreal.ca' to make the `.pot' files available to
+the translation teams.
+

Copied: vendor/gnu-sort/2.0.21/AUTHORS (from r207001, vendor/gnu-sort/2.0.21/contrib/gnu-sort/AUTHORS)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ vendor/gnu-sort/2.0.21/AUTHORS	Wed Apr 21 17:53:10 2010	(r207002, copy of r207001, vendor/gnu-sort/2.0.21/contrib/gnu-sort/AUTHORS)
@@ -0,0 +1,10 @@
+Authors of parts of GNU textutils.
+
+The following contributions warranted legal paper exchanges with the
+Free Software Foundation.  Also see files ChangeLog and THANKS.
+
+GPTX    François Pinard         CANADA, 1949
+Assigns the program.
+
+GPTX    Odyssee Recherches Appliquees
+Disclaims work by François Pinard

Copied: vendor/gnu-sort/2.0.21/COPYING (from r207001, vendor/gnu-sort/2.0.21/contrib/gnu-sort/COPYING)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ vendor/gnu-sort/2.0.21/COPYING	Wed Apr 21 17:53:10 2010	(r207002, copy of r207001, vendor/gnu-sort/2.0.21/contrib/gnu-sort/COPYING)
@@ -0,0 +1,340 @@
+		    GNU GENERAL PUBLIC LICENSE
+		       Version 2, June 1991
+
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.
+     59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+			    Preamble
+
+  The licenses for most software are designed to take away your
+freedom to share and change it.  By contrast, the GNU General Public
+License is intended to guarantee your freedom to share and change free
+software--to make sure the software is free for all its users.  This
+General Public License applies to most of the Free Software
+Foundation's software and to any other program whose authors commit to
+using it.  (Some other Free Software Foundation software is covered by
+the GNU Library General Public License instead.)  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+this service if you wish), that you receive source code or can get it
+if you want it, that you can change the software or use pieces of it
+in new free programs; and that you know you can do these things.
+
+  To protect your rights, we need to make restrictions that forbid
+anyone to deny you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if you
+distribute copies of the software, or if you modify it.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must give the recipients all the rights that
+you have.  You must make sure that they, too, receive or can get the
+source code.  And you must show them these terms so they know their
+rights.
+
+  We protect your rights with two steps: (1) copyright the software, and
+(2) offer you this license which gives you legal permission to copy,
+distribute and/or modify the software.
+
+  Also, for each author's protection and ours, we want to make certain
+that everyone understands that there is no warranty for this free
+software.  If the software is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original, so
+that any problems introduced by others will not reflect on the original
+authors' reputations.
+
+  Finally, any free program is threatened constantly by software
+patents.  We wish to avoid the danger that redistributors of a free
+program will individually obtain patent licenses, in effect making the
+program proprietary.  To prevent this, we have made it clear that any
+patent must be licensed for everyone's free use or not licensed at all.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+		    GNU GENERAL PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+  0. This License applies to any program or other work which contains
+a notice placed by the copyright holder saying it may be distributed
+under the terms of this General Public License.  The "Program", below,
+refers to any such program or work, and a "work based on the Program"
+means either the Program or any derivative work under copyright law:
+that is to say, a work containing the Program or a portion of it,
+either verbatim or with modifications and/or translated into another
+language.  (Hereinafter, translation is included without limitation in
+the term "modification".)  Each licensee is addressed as "you".
+
+Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope.  The act of
+running the Program is not restricted, and the output from the Program
+is covered only if its contents constitute a work based on the
+Program (independent of having been made by running the Program).
+Whether that is true depends on what the Program does.
+
+  1. You may copy and distribute verbatim copies of the Program's
+source code as you receive it, in any medium, provided that you
+conspicuously and appropriately publish on each copy an appropriate
+copyright notice and disclaimer of warranty; keep intact all the
+notices that refer to this License and to the absence of any warranty;
+and give any other recipients of the Program a copy of this License
+along with the Program.
+
+You may charge a fee for the physical act of transferring a copy, and
+you may at your option offer warranty protection in exchange for a fee.
+
+  2. You may modify your copy or copies of the Program or any portion
+of it, thus forming a work based on the Program, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+    a) You must cause the modified files to carry prominent notices
+    stating that you changed the files and the date of any change.
+
+    b) You must cause any work that you distribute or publish, that in
+    whole or in part contains or is derived from the Program or any
+    part thereof, to be licensed as a whole at no charge to all third
+    parties under the terms of this License.
+
+    c) If the modified program normally reads commands interactively
+    when run, you must cause it, when started running for such
+    interactive use in the most ordinary way, to print or display an
+    announcement including an appropriate copyright notice and a
+    notice that there is no warranty (or else, saying that you provide
+    a warranty) and that users may redistribute the program under
+    these conditions, and telling the user how to view a copy of this
+    License.  (Exception: if the Program itself is interactive but
+    does not normally print such an announcement, your work based on
+    the Program is not required to print an announcement.)
+
+These requirements apply to the modified work as a whole.  If
+identifiable sections of that work are not derived from the Program,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works.  But when you
+distribute the same sections as part of a whole which is a work based
+on the Program, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Program.
+
+In addition, mere aggregation of another work not based on the Program
+with the Program (or with a work based on the Program) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+  3. You may copy and distribute the Program (or a work based on it,
+under Section 2) in object code or executable form under the terms of
+Sections 1 and 2 above provided that you also do one of the following:
+
+    a) Accompany it with the complete corresponding machine-readable
+    source code, which must be distributed under the terms of Sections
+    1 and 2 above on a medium customarily used for software interchange; or,
+
+    b) Accompany it with a written offer, valid for at least three
+    years, to give any third party, for a charge no more than your
+    cost of physically performing source distribution, a complete
+    machine-readable copy of the corresponding source code, to be
+    distributed under the terms of Sections 1 and 2 above on a medium
+    customarily used for software interchange; or,
+
+    c) Accompany it with the information you received as to the offer
+    to distribute corresponding source code.  (This alternative is
+    allowed only for noncommercial distribution and only if you
+    received the program in object code or executable form with such
+    an offer, in accord with Subsection b above.)
+
+The source code for a work means the preferred form of the work for
+making modifications to it.  For an executable work, complete source
+code means all the source code for all modules it contains, plus any
+associated interface definition files, plus the scripts used to
+control compilation and installation of the executable.  However, as a
+special exception, the source code distributed need not include
+anything that is normally distributed (in either source or binary
+form) with the major components (compiler, kernel, and so on) of the
+operating system on which the executable runs, unless that component
+itself accompanies the executable.
+
+If distribution of executable or object code is made by offering
+access to copy from a designated place, then offering equivalent
+access to copy the source code from the same place counts as
+distribution of the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+  4. You may not copy, modify, sublicense, or distribute the Program
+except as expressly provided under this License.  Any attempt
+otherwise to copy, modify, sublicense or distribute the Program is
+void, and will automatically terminate your rights under this License.
+However, parties who have received copies, or rights, from you under
+this License will not have their licenses terminated so long as such
+parties remain in full compliance.
+
+  5. You are not required to accept this License, since you have not
+signed it.  However, nothing else grants you permission to modify or
+distribute the Program or its derivative works.  These actions are
+prohibited by law if you do not accept this License.  Therefore, by
+modifying or distributing the Program (or any work based on the
+Program), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Program or works based on it.
+
+  6. Each time you redistribute the Program (or any work based on the
+Program), the recipient automatically receives a license from the
+original licensor to copy, distribute or modify the Program subject to
+these terms and conditions.  You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties to
+this License.
+
+  7. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Program at all.  For example, if a patent
+license would not permit royalty-free redistribution of the Program by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Program.
+
+If any portion of this section is held invalid or unenforceable under
+any particular circumstance, the balance of the section is intended to
+apply and the section as a whole is intended to apply in other
+circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system, which is
+implemented by public license practices.  Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+  8. If the distribution and/or use of the Program is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Program under this License
+may add an explicit geographical distribution limitation excluding
+those countries, so that distribution is permitted only in or among
+countries not thus excluded.  In such case, this License incorporates
+the limitation as if written in the body of this License.
+
+  9. The Free Software Foundation may publish revised and/or new versions
+of the General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+Each version is given a distinguishing version number.  If the Program
+specifies a version number of this License which applies to it and "any
+later version", you have the option of following the terms and conditions
+either of that version or of any later version published by the Free
+Software Foundation.  If the Program does not specify a version number of
+this License, you may choose any version ever published by the Free Software
+Foundation.
+
+  10. If you wish to incorporate parts of the Program into other free
+programs whose distribution conditions are different, write to the author
+to ask for permission.  For software which is copyrighted by the Free
+Software Foundation, write to the Free Software Foundation; we sometimes
+make exceptions for this.  Our decision will be guided by the two goals
+of preserving the free status of all derivatives of our free software and
+of promoting the sharing and reuse of software generally.
+
+			    NO WARRANTY
+
+  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
+FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
+OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
+PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
+OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
+TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
+PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
+REPAIR OR CORRECTION.
+
+  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
+REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
+INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
+OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
+TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
+YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
+PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGES.
+
+		     END OF TERMS AND CONDITIONS
+
+	    How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    
+    Copyright (C)   
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+
+
+Also add information on how to contact you by electronic and paper mail.
+
+If the program is interactive, make it output a short notice like this
+when it starts in an interactive mode:
+
+    Gnomovision version 69, Copyright (C) year  name of author
+    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, the commands you use may
+be called something other than `show w' and `show c'; they could even be
+mouse-clicks or menu items--whatever suits your program.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the program, if
+necessary.  Here is a sample; alter the names:
+
+  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
+  `Gnomovision' (which makes passes at compilers) written by James Hacker.
+
+  , 1 April 1989
+  Ty Coon, President of Vice
+
+This General Public License does not permit incorporating your program into
+proprietary programs.  If your program is a subroutine library, you may
+consider it more useful to permit linking proprietary applications with the
+library.  If this is what you want to do, use the GNU Library General
+Public License instead of this License.

Copied: vendor/gnu-sort/2.0.21/ChangeLog (from r207001, vendor/gnu-sort/2.0.21/contrib/gnu-sort/ChangeLog)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ vendor/gnu-sort/2.0.21/ChangeLog	Wed Apr 21 17:53:10 2010	(r207002, copy of r207001, vendor/gnu-sort/2.0.21/contrib/gnu-sort/ChangeLog)
@@ -0,0 +1,8574 @@
+2002-02-18  Jim Meyering  
+
+	* Version 2.0.21.
+
+	* tests/tail/Test.pm: For tests matching /^(obs|err-[134])/,
+	put _POSIX2_VERSION=199209 in the environment, so the tests succeed
+	even when the environment would have contained _POSIX2_VERSION=200112.
+	* tests/uniq/Test.pm (test_vector): Rename tests of obsolete usage
+	to have prefix of `obs'.  Adjust environment for those tests as above.
+
+	* tests/mk-script: When getting input via a pipe, apply the
+	environment settings to the command in question, not to `cat'.
+	No longer allow more than one element in the $Test::env or
+	$Test::env_default arrays.  No caller used that feature.
+
+2002-02-17  Jim Meyering  
+
+	* tests/head/Test.pm: Accept pre-POSIX 1003.1-2001 options.
+	* tests/pr/Test.pm: Likewise.
+	* tests/sort/Test.pm: Likewise.
+
+	* Makefile.cfg (wget_files): Reflect new location of these files.
+
+2002-02-16  Jim Meyering  
+
+	* ABOUT-NLS, intl/*: Update to Gettext 0.11.
+	* INSTALL: Update to Autoconf 2.52h.
+
+	* src/Makefile.am (datadir): Use `share' in place of @DATADIRNAME@,
+	per Gettext-0.11.
+	(LDADD): Use @LIBINTL@ instead of @INTLLIBS@, per Gettext-0.11.
+
+	* configure.ac (AC_CONFIG_AUX_DIR): New macro invocation.
+	(ALL_LINGUAS): Remove: now in po/LINGUAS as per Gettext 0.11.
+
+	* config: New subdirectory, containing the following files from .:
+	config.guess, config.sub, depcomp, missing, install-sh, mkinstalldirs.
+	Move the following files here from doc: texinfo.tex, mdate-sh.
+
+2002-02-15  Paul Eggert  
+
+	Add support for _POSIX2_VERSION, which lets you pick which POSIX
+	version you want the utilities to conform to.  Remove warnings about
+	failure to conform to a future POSIX version.
+
+	* NEWS, doc/coreutils.texi: Document _POSIX2_VERSION.
+	* doc/coreutils.texi (Standards Conformance): New section.
+
+	* src/expand.c: Include posixver.h.
+	(usage): Document only the intersection of the old and new behaviors,
+	to encourage portability.
+	* src/fold.c: Likewise.
+	* src/head.c: Likewise.
+	* src/od.c: Likewise.
+	* src/pr.c: Likewise.
+	* src/sort.c: Likewise.
+	* src/split.c: Likewise.
+	* src/uniq.c: Likewise.
+	* src/tail.c: Likewise.
+	* src/unexpand.c: Likewise.
+
+	* src/expand.c (shortopts): Remove; no longer needed.
+	* src/od.c (short_options): Likewise.
+	* src/pr.c (short_options): Likewise.
+	* src/sort.c (short_options): Likewise.
+	* src/split.c (shortopts): Likewise.
+	* src/uniq.c (shortopts): Likewise.
+	* src/unexpand.c (shortopts): Likewise.
+
+	* src/od.c (COMMON_SHORT_OPTIONS): New macro.
+	* src/pr.c (COMMON_SHORT_OPTIONS): Likewise.
+	* src/sort.c (COMMON_SHORT_OPTIONS): Likewise.
+
+	* src/expand.c (main): Revert to previous behavior, except report
+	an error and exit if the obsolete syntax is used and if conforming
+	to the new standard.
+	* src/fold.c (main): Likewise.
+	* src/head.c (main): Likewise.
+	* src/split.c (main): Likewise.
+	* src/uniq.c (main): Likewise.
+	* src/tail.c (main, parse_obsolescent_option): Likewise.
+	* src/unexpand.c (main): Likewise.
+
+	* src/od.c (STRINGS_OPTION, WIDTH_OPTION): Remove; no longer needed.
+	All uses changed back to the corresponding short options.
+	* src/pr.c (SEP_STRING_OPTION): Likewise.
+
+	* src/od.c (main): Parse options using POSIX 1003.1-2001 rules if
+	conforming to that standard.  Do not warn of obsolete options.
+	* src/pr.c (main): Likewise.
+	* src/sort.c (main): Likewise.
+
+	* src/system.h (_POSIX2_VERSION, POSIX2_VERSION): Remove definitions.
+	(OPTARG_POSIX, OBSOLETE_OPTION_WARNINGS): Likewise.
+
+2002-02-16  Jim Meyering  
+
+	* tests/misc/split-a: New test for change of 2002-02-05.
+	* tests/misc/Makefile.am (TESTS): Add split-a.
+
+2002-02-12  Jim Meyering  
+
+	* src/split.c (DEFAULT_SUFFIX_LENGTH): Define constant.
+	(suffix_length): Use it here.
+	(usage): Use it here.
+
+2002-02-05  Paul Eggert  
+
+	Change 'split' to conform to POSIX.  It now accepts an -a or
+	--suffix-length option, and refuses to generate more files
+	than there are suffixes.
+
+	* NEWS, doc/coreutils.texi: Document this.
+	* src/split.c: Include "dirname.h".
+	(outbase): Now a global var.
+	(outfile_end): Remove.
+	(suffix_length): New var.
+	(shortopts, longopts, main): Add -a or --suffix-length.
+	(next_file_name): Implement -a.  Do not extend the suffix length.
+	Check for file names that are too long.
+	(main): Move outfile initialization to next_file_name.
+
+	* src/split.c (shortopts): Remove -v (a typo).
+
+2002-02-11  Jim Meyering  
+
+	* tests/misc/head-pos: New file/test for the change of 2002-02-08.
+	* tests/misc/Makefile.am (TESTS): Add head-pos.
+
+	* src/tr.c (unquote): Make comment a little clearer.
+
+2002-02-08  Paul Eggert  
+
+	* src/head.c (head_lines): If we have read too much data, try
+	to seek back to the position we would have gotten to had we
+	been reading one byte at a time.  POSIX currently doesn't
+	require this, but it's easy to do and some software relies on it.
+
+2002-02-02  Jim Meyering  
+
+	* src/uniq.c (main): Prepend `warning: ' to the diagnostic, so it's
+	consistent with all of the other `... is obsolete...' diagnostics.
+
+2002-01-31  Paul Eggert  
+
+	Add more support for POSIX 1003.1-2001, which requires removal for
+	support of obsolete "-N" option syntax in expand, head, fold,
+	split, tail, unexpand, uniq, and which prohibits options with
+	optional arguments in od and pr.
+
+	* NEWS: Document this.
+	* doc/coreutils.texi: Likewise.
+	* src/expand.c (usage): Likewise.
+	* src/fold.c (usage): Likewise.
+	* src/head.c (usage): Likewise.
+	* src/od.c (usage): Likewise.
+	* src/pr.c (usage): Likewise.
+	* src/split.c (usage): Likewise.
+	* src/unexpand.c (usage): Likewise.
+	* src/uniq.c (usage): Likewise.
+
+	* NEWS: Improve doc for previous fix in this area.
+
+	* src/expand.c (shortopts): New constant.
+	* src/od.c (short_options): Likewise.
+	* src/pr.c (short_options): Likewise.
+	* src/sort.c (short_options): Likewise.
+	* src/split.c (shortopts): Likewise.
+	* src/unexpand.c (shortopts): Likewise.
+	* src/uniq.c (shortopts): Likewise.
+
+	* src/expand.c (main): Check for obsolete options.
+	* src/fold.c (main): Likewise.
+	* src/head.c (main): Likewise.
+	* src/od.c (main): Likewise.
+	* src/pr.c (main): Likewise.
+	* src/sort.c (main): Likewise.
+	* src/split.c (main): Likewise.
+	* src/tail.c (parse_obsolescent_option, main): Likewise.
+	* src/unexpand.c (main): Likewise.
+	* src/uniq.c (main): Likewise.
+
+	* src/head.c (header_mode_option): New constant.
+
+	* src/od.c: New enum for long options.
+
+	* src/pr.c (SEP_STRING_OPTION): New enum value.
+	(long_options): Use it.
+
+	* src/split.c (main): Use -1, not EOF, for getopt_long.
+
+	* src/system.h (OPTARG_POSIX, OBSOLETE_OPTION_WARNINGS): New macros.
+
+	* src/fold.c (main): Fix bug: -- -N was treated as -N --.
+
+2002-02-01  Jim Meyering  
+
+	* src/tail.c (start_lines): Handle the case in which bytes_read is zero.
+
+2002-01-28  Jim Meyering  
+
+	* Makefile.maint (ac-check): Remove, now that we no longer have
+	to duplicate that information.
+	(local-check): Remove ac-check.
+
+	* Makefile.am (AUTOMAKE_OPTIONS): Require automake-1.5d.
+
+	* configure.ac (AM_INIT_AUTOMAKE): Use zero-arg form of this macro.
+	(ALL_LINGUAS): Add the bokmċl dialect of Norwegian (nb).
+
+2002-01-27  Jim Meyering  
+
+	tail -n +2 would perform an extra read after encountering EOF
+	* src/tail.c (start_lines): Detect EOF, inform caller.
+	(tail_lines): Upon EOF in start_lines, return immediately.
+
+2002-01-22  Jim Meyering  
+
+	* Version 2.0.20.
+
+2002-01-22  Paul Eggert  
+
+	* src/od.c (skip): Remove redundant check for overflow.
+	fseeko's seek argument is already known to be in range,
+	since it is less than the file size.
+
+2002-01-22  Jim Meyering  
+
+	* po/POTFILES.in: Add lib/xmemcoll.c.
+
+2002-01-22  Paul Eggert  
+
+	* src/tac.c (save_stdin): Report proper errno value after
+	fwrite failures.  Do not bother to rewind the temp file, as
+	it'll be read backwards anyway.
+
+2002-01-22  Paul Eggert  
+
+	* src/ptx.c (swallow_file_in_memory): Work even if `open' returns 0.
+	Check for `close' error.
+
+2002-01-22  Paul Eggert  
+
+	Port to glibc 2.2.5, whose mmap stdio positions the underlying
+	file descriptor at a nonzero offset after an fopen.

*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***