[packages/abook] up to 0.6.1

atler atler at pld-linux.org
Tue Dec 29 11:52:16 CET 2015


commit 38ed68e91e7c46318dc43573a3892fcc59cfa933
Author: Jan Palus <atler at pld-linux.org>
Date:   Tue Dec 29 11:48:58 2015 +0100

    up to 0.6.1
    
    - updated patches/removed obsolete ones
    - new patch for inlined field_id failing at link time

 abook-am.patch           |    13 -
 abook-ea5caf0.patch      | 62886 ---------------------------------------------
 abook-inline.patch       |    24 +
 abook-tinfo_link.patch   |     2 +-
 abook-vcard_import.patch |   325 -
 abook.spec               |    18 +-
 6 files changed, 31 insertions(+), 63237 deletions(-)
---
diff --git a/abook.spec b/abook.spec
index dfad9cc..ab1b777 100644
--- a/abook.spec
+++ b/abook.spec
@@ -1,18 +1,14 @@
-%define		subver	pre2
-#
 Summary:	Text-based addressbook program for mutt
 Summary(pl.UTF-8):	Tekstowa książka adresowa dla klienta pocztowego mutt
 Name:		abook
-Version:	0.6.0
-Release:	0.%{subver}.2
+Version:	0.6.1
+Release:	1
 License:	GPL v2+
 Group:		Applications/Mail
-Source0:	http://abook.sourceforge.net/devel/%{name}-%{version}%{subver}.tar.gz
-# Source0-md5:	1e4a7210b3507db7b3d47ee7a2457934
+Source0:	http://abook.sourceforge.net/devel/%{name}-%{version}.tar.gz
+# Source0-md5:	4bffd4c47ac41b688abd58f65bfe0bfb
 Patch0:		%{name}-tinfo_link.patch
-Patch1:		%{name}-vcard_import.patch
-Patch2:		%{name}-ea5caf0.patch
-Patch3:		%{name}-am.patch
+Patch1:		%{name}-inline.patch
 URL:		http://abook.sourceforge.net/
 BuildRequires:	autoconf >= 2.50
 BuildRequires:	automake
@@ -30,11 +26,9 @@ Abook to pracująca w trybie tekstowym książka adresowa zaprojektowana
 do użycia z programem pocztowym mutt.
 
 %prep
-%setup -q -n %{name}-%{version}%{subver}
+%setup -q
 %patch0 -p0
 %patch1 -p1
-%patch2 -p1
-%patch3 -p1
 
 %build
 %{__gettextize}
diff --git a/abook-am.patch b/abook-am.patch
deleted file mode 100644
index 96f2168..0000000
--- a/abook-am.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- abook-0.6.0pre2/configure.ac.orig	2013-03-14 19:05:29.494683245 +0100
-+++ abook-0.6.0pre2/configure.ac	2013-03-14 19:11:30.378009058 +0100
-@@ -44,10 +44,6 @@
- 
- AC_PROG_CC
- AC_SEARCH_LIBS([strerror],[cposix])
--AM_C_PROTOTYPES
--if test "x$U" != "x"; then
--	AC_MSG_ERROR(Compiler not ANSI compliant)
--fi
- AC_C_INLINE
- AC_PROG_INSTALL
- AC_HEADER_STDC
diff --git a/abook-ea5caf0.patch b/abook-ea5caf0.patch
deleted file mode 100644
index 92409d7..0000000
--- a/abook-ea5caf0.patch
+++ /dev/null
@@ -1,62886 +0,0 @@
-diff -urN BUILD/abook-0.6.0pre2/abook.1 abook/abook.1
---- BUILD/abook-0.6.0pre2/abook.1	2006-09-06 07:26:10.000000000 +0200
-+++ abook/abook.1	2013-03-13 15:07:45.000000000 +0100
-@@ -27,12 +27,14 @@
- \fB\-\-datafile\fP \fI<filename>\fR
- Use an alternative addressbook file (default is \fI$HOME/.abook/addressbook\fR).
- .TP
--\fB\-\-mutt\-query\fP \fI<string>\fR
-+\fB\-\-mutt\-query\fP \fI<string>\fR [ \fB\-\-outformat\fP \fI<outputformat>\fR ]
- Make a query for mutt (search the addressbook for \fI<string>\fR).
- .br
- The \fB\-\-datafile\fP option, as documented above, may be used
- .BI BEFORE
- this option to search a different addressbook file.
-+.br
-+Only a subset of the below \fI<outputformat>\fR are allowed: \fBmutt\fP (default), \fBvcard\fP and \fBcustom\fP
- .TP
- \fB\-\-convert\fP [ \fB\-\-informat\fP \fI<inputformat>\fR ] [ \fB\-\-infile\fP \fI<inputfile>\fR ] [ \fB\-\-outformat\fP \fI<outputformat>\fR ] [ \fB\-\-outfile\fP \fI<outputfile>\fR ]
- Converts \fI<inputfile>\fR in \fI<inputformat>\fR to \fI<outputfile>\fR in \fI<outputformat>\fR
-@@ -52,6 +54,8 @@
- - \fBcsv\fP comma separated values
- .br
- - \fBpalmcsv\fP Palm comma separated values
-+.br
-+- \fBvcard\fP VCard addressbook
- 
- .br
- The following \fIoutputformats\fR are supported:
-@@ -66,7 +70,7 @@
- .br
- - \fBpine\fP pine addressbook
- .br
--- \fBgcrd\fP GnomeCard (VCard) addressbook
-+- \fBvcard\fP VCard addressbook
- .br
- - \fBcsv\fP comma separated values
- .br
-@@ -81,6 +85,17 @@
- - \fBwl\fP Wanderlust address book
- .br
- - \fBbsdcal\fP BSD calendar
-+.br
-+- \fBcustom\fP Custom output format, see below
-+.TP
-+\fB\-\-outformatstr\fP \fI<string>\fR
-+Only used if \fB\-\-mutt\-query\fP \fIor\fR \fB\-\-convert\fP is specified \fIand\fR \fB\-\-outformat\fP=\fIcustom\fR. \fI<string>\fR is a format string allowing placeholders.
-+.br
-+A placeholder can be any of the standard fields names (see \fBabookrc\fP(5)) and must be encapsulated by curly brackets.
-+.br
-+The default value is "{nick} ({name}): {mobile}"
-+.br
-+If \fI<string>\fR starts with \fI!\fR only entries whose all fields from \fI<string>\fR are non-NULL are included.
- .TP
- \fB\-\-add-email\fP
- Read an e-mail message from stdin and add the sender to the addressbook.
-diff -urN BUILD/abook-0.6.0pre2/abook.c abook/abook.c
---- BUILD/abook-0.6.0pre2/abook.c	2006-09-04 21:24:12.000000000 +0200
-+++ abook/abook.c	2013-03-13 15:07:45.000000000 +0100
-@@ -1,5 +1,5 @@
- /*
-- * $Id: abook.c,v 1.60 2006/09/04 18:29:24 cduval Exp $
-+ * $Id$
-  *
-  * by JH <jheinonen at users.sourceforge.net>
-  *
-@@ -50,6 +50,12 @@
- char *datafile = NULL;
- static char *rcfile = NULL;
- 
-+// custom formatting
-+char custom_format[FORMAT_STRING_LEN] = "{nick} ({name}): {mobile}";
-+char *parsed_custom_format = NULL;
-+enum field_types *custom_format_fields = 0;
-+struct abook_output_item_filter selected_item_filter;
-+
- bool alternative_datafile = FALSE;
- bool alternative_rcfile = FALSE;
- 
-@@ -187,9 +193,11 @@
- main(int argc, char **argv)
- {
- #if defined(HAVE_SETLOCALE) && defined(HAVE_LOCALE_H)
--	setlocale(LC_ALL, "");
-+	setlocale(LC_MESSAGES, "");
-+	setlocale(LC_TIME, "");
-+	setlocale(LC_CTYPE, "");
-+	setlocale(LC_COLLATE, "");
- #endif
--
- 	bindtextdomain(PACKAGE, LOCALEDIR);
- 	textdomain(PACKAGE);
- 
-@@ -301,6 +309,7 @@
- 		*infile = "-",
- 		*outfile = "-";
- 	int c;
-+	selected_item_filter = select_output_item_filter("muttq");
- 
- 	for(;;) {
- 		int option_index = 0;
-@@ -311,6 +320,7 @@
- 			OPT_CONVERT,
- 			OPT_INFORMAT,
- 			OPT_OUTFORMAT,
-+			OPT_OUTFORMAT_STR,
- 			OPT_INFILE,
- 			OPT_OUTFILE,
- 			OPT_FORMATS
-@@ -325,6 +335,7 @@
- 			{ "convert", 0, 0, OPT_CONVERT },
- 			{ "informat", 1, 0, OPT_INFORMAT },
- 			{ "outformat", 1, 0, OPT_OUTFORMAT },
-+			{ "outformatstr", 1, 0, OPT_OUTFORMAT_STR },
- 			{ "infile", 1, 0, OPT_INFILE },
- 			{ "outfile", 1, 0, OPT_OUTFILE },
- 			{ "formats", 0, 0, OPT_FORMATS },
-@@ -366,7 +377,21 @@
- 				set_convert_var(informat);
- 				break;
- 			case OPT_OUTFORMAT:
--				set_convert_var(outformat);
-+				if(mode != MODE_CONVERT && mode != MODE_QUERY) {
-+				  fprintf(stderr,
-+					  _("please use option --outformat after --convert or --mutt-query option\n"));
-+				  exit(EXIT_FAILURE);
-+				}
-+				// ascii-name is stored, it's used to traverse
-+				// e_filters[] in MODE_CONVERT (see export_file())
-+				outformat = optarg;
-+				// but in case a query-compatible filter is requested
-+				// try to guess right now which one it is, from u_filters[]
-+				selected_item_filter = select_output_item_filter(outformat);
-+				break;
-+			case OPT_OUTFORMAT_STR:
-+				strncpy(custom_format, optarg, FORMAT_STRING_LEN);
-+				custom_format[FORMAT_STRING_LEN - 1] = 0;
- 				break;
- 			case OPT_INFILE:
- 				set_convert_var(infile);
-@@ -382,6 +407,23 @@
- 		}
- 	}
- 
-+	// if the output format requested does not allow filtered querying
-+	// (not in u_filter[]) and --convert has not been specified; bailout
-+	if(! selected_item_filter.func && mode != MODE_CONVERT) {
-+	  printf("output format %s not supported or incompatible with --mutt-query\n", outformat);
-+	  exit(EXIT_FAILURE);
-+	}
-+	if(! selected_item_filter.func)
-+		selected_item_filter = select_output_item_filter("muttq");
-+	else if (! strcmp(outformat, "custom")) {
-+		if(! *custom_format) {
-+			fprintf(stderr, _("Invalid custom format string\n"));
-+			exit(EXIT_FAILURE);
-+		}
-+		parsed_custom_format = (char *)malloc(FORMAT_STRING_LEN * sizeof(char*));
-+		custom_format_fields = (enum field_types *)malloc(FORMAT_STRING_MAX_FIELDS * sizeof(enum field_types *));
-+		parse_custom_format(custom_format, parsed_custom_format, custom_format_fields);
-+	}
- 	if(optind < argc) {
- 		fprintf(stderr, _("%s: unrecognized arguments on command line\n"),
- 				argv[0]);
-@@ -427,6 +469,8 @@
- 	puts	(_("					(default: text)"));
- 	puts	(_("	--outfile	<file>		destination file"));
- 	puts	(_("					(default: stdout)"));
-+	puts	(_("	--outformatstr	<str>   	format to use for \"custom\" --outformat"));
-+	puts	(_("					(default: \"{nick} ({name}): {mobile}\")"));
- 	puts	(_("	--formats			list available formats"));
- }
- 
-@@ -445,34 +489,12 @@
- }
- 
- static void
--muttq_print_item(FILE *file, int item)
--{
--	abook_list *emails, *e;
--	char *tmp = db_email_get(item);
--
--	emails = csv_to_abook_list(tmp);
--	free(tmp);
--
--	for(e = emails; e; e = e->next) {
--		fprintf(file, "%s\t%s\t%s\n", e->data, db_name_get(item),
--				!db_fget(item, NOTES) ?" " :db_fget(item, NOTES)
--				);
--		if(!opt_get_bool(BOOL_MUTT_RETURN_ALL_EMAILS))
--			break;
--	}
--	abook_list_free(&emails);
--}
--
--static void
- mutt_query(char *str)
- {
- 	init_mutt_query();
- 
- 	if( str == NULL || !strcasecmp(str, "all") ) {
--		struct db_enumerator e = init_db_enumerator(ENUM_ALL);
--		printf("All items\n");
--		db_enumerate_items(e)
--			muttq_print_item(stdout, e.item);
-+		export_file("muttq", "-");
- 	} else {
- 		int search_fields[] = {NAME, EMAIL, NICK, -1};
- 		int i;
-@@ -480,9 +502,14 @@
- 			printf("Not found\n");
- 			quit_mutt_query(EXIT_FAILURE);
- 		}
--		putchar('\n');
-+		// mutt expects a leading line containing
-+		// a message about the query.
-+		// Others output filter supporting query (vcard, custom)
-+		// don't needs this.
-+		if(!strcmp(selected_item_filter.filtname, "muttq"))
-+			putchar('\n');
- 		while(i >= 0) {
--			muttq_print_item(stdout, i);
-+			e_write_item(stdout, i, selected_item_filter.func);
- 			i = find_item(str, i + 1, search_fields);
- 		}
- 	}
-@@ -708,6 +735,7 @@
- 	check_abook_directory();
- 	init_opts();
- 	load_opts(rcfile);
-+	init_standard_fields();
- 	atexit(free_opts);
- 
- 	/*
-diff -urN BUILD/abook-0.6.0pre2/abook.h abook/abook.h
---- BUILD/abook-0.6.0pre2/abook.h	2005-10-26 01:27:24.000000000 +0200
-+++ abook/abook.h	2013-03-13 15:07:45.000000000 +0100
-@@ -50,6 +50,7 @@
- #define ISSPACE(c)	isspace((unsigned char)c)
- 
- #define SKIPWS(c)	while(*(c) && ISSPACE(*(c))) c++
-+#define SKIPNONWS(c)	while(*(c) && ! ISSPACE(*(c))) c++
- 
- #ifndef DEBUG
- #	define NDEBUG	1
-diff -urN BUILD/abook-0.6.0pre2/abookrc.5 abook/abookrc.5
---- BUILD/abook-0.6.0pre2/abookrc.5	2006-09-04 21:24:13.000000000 +0200
-+++ abook/abookrc.5	2013-03-13 15:07:45.000000000 +0100
-@@ -90,7 +90,7 @@
- \fI{name:22}\fP
- displays the \fIname\fP field with a maximal width of 22 characters.
- .TP
--\fI{phone:-13|workphone|mobile}\fP
-+\fI{phone:-12|workphone|mobile}\fP
- displays (right aligned within a width of 13 characters), either the \fIphone\fP, \fIworkphone\fP or \fImobile\fP field, whichever being the first to be non-empty.
- .RE
- .IP
-@@ -146,6 +146,84 @@
- \fBshow_cursor\fP=[true|false]
- Defines if the cursor is visible in main display. Default is false.
- 
-+.TP
-+\fBuse_mouse\fP=[true|false]
-+Defines if navigation via the mouse is activated. Default is false.
-+
-+.TP
-+\fBuse_colors\fP=[true|false]
-+Defines if the output of abook is colorized. Default is false.
-+
-+.TP
-+Color settings:
-+\fBcolor_header_fg\fP=color
-+Foreground color for header bar
-+
-+\fBcolor_header_bg\fP=color
-+Background color for header bar
-+
-+\fBcolor_footer_fg\fP=color
-+Foreground color for footer bar
-+
-+\fBcolor_footer_bg\fP=color
-+Background color for footer bar
-+
-+\fBcolor_list_even_fg\fP=color
-+Foreground color for normal list entries with even index in the list (starting
-+with index 0)
-+
-+\fBcolor_list_even_bg\fP=color
-+Background color for normal list entries with even index in the list (starting
-+with index 0)
-+
-+\fBcolor_list_odd_fg\fP=color
-+Foreground color for normal list entries with odd index in the list (starting
-+with index 0)
-+
-+\fBcolor_list_odd_bg\fP=color
-+Background color for normal list entries with odd index in the list (starting
-+with index 0)
-+
-+\fBcolor_list_header_fg\fP=color
-+Foreground color for the list header
-+
-+\fBcolor_list_header_bg\fP=color
-+Background color for the list header
-+
-+\fBcolor_list_highlight_fg\fP=color
-+Foreground color for highlighted list entries
-+
-+\fBcolor_list_highlight_bg\fP=color
-+Background color for highlighted list entries
-+
-+\fBcolor_tab_border_fg\fP=color
-+Foreground color for tab borders on details page
-+
-+\fBcolor_tab_border_bg\fP=color
-+Background color for tab borders on details page
-+
-+\fBcolor_tab_label_fg\fP=color
-+Foreground color for tab labes on details page
-+
-+\fBcolor_tab_label_bg\fP=color
-+Background color for tab labes on details page
-+
-+\fBcolor_field_name_fg\fP=color
-+Foreground color for field names on details page
-+
-+\fBcolor_field_name_bg\fP=color
-+Background color for field names on details page
-+
-+\fBcolor_field_value_fg\fP=color
-+Foreground color for field values on details page
-+
-+\fBcolor_field_value_bg\fP=color
-+Background color for field values on details page
-+
-+Where \fBcolor\fP can be: default, black, red, green, yellow, blue, magenta, cyan, white
-+
-+
-+
- .SH SAMPLE CONFIGURATION FILE
- 
- .nf
-diff -urN BUILD/abook-0.6.0pre2/abook_rl.c abook/abook_rl.c
---- BUILD/abook-0.6.0pre2/abook_rl.c	2005-09-23 17:42:11.000000000 +0200
-+++ abook/abook_rl.c	2013-03-13 15:07:45.000000000 +0100
-@@ -1,5 +1,5 @@
- /*
-- * $Id: abook_rl.c,v 1.16 2005/09/23 15:42:11 jheinonen Exp $
-+ * $Id$
-  *
-  * by JH <jheinonen at users.sourceforge.net>
-  *
-diff -urN BUILD/abook-0.6.0pre2/abook.spec abook/abook.spec
---- BUILD/abook-0.6.0pre2/abook.spec	2006-09-06 11:45:14.000000000 +0200
-+++ abook/abook.spec	1970-01-01 01:00:00.000000000 +0100
-@@ -1,47 +0,0 @@
--Summary:	Text-based addressbook program
--Name:		abook
--Version:	0.6.0pre2
--Release:	1
--License:	GPL
--Group:		Utilities
--Source:		http://prdownloads.sourceforge.net/abook/%{name}-%{version}.tar.gz
--URL:		http://abook.sourceforge.net/
--BuildPreReq:	ncurses-devel readline-devel gettext
--BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root
--
--%description
--Abook is a text-based addressbook program designed to
--use with mutt mail client.
--
--
--%prep
--%setup -q
--
--
--%build
--%configure
--make %{_smp_mflags}
--
--
--%install
--%makeinstall
--
--%find_lang %{name}
--
--
--%clean
--rm -rf -- "%{buildroot}"
--
--
--%files -f %{name}.lang
--%defattr(-,root,root)
--%doc AUTHORS BUGS COPYING ChangeLog FAQ NEWS README THANKS TODO sample.abookrc
--%{_bindir}/abook
--%{_mandir}/man1/abook.*
--%{_mandir}/man5/abookrc.*
--
--
--%changelog
--* Mon Mar 11 2002 Jaakko Heinonen <jheinonen at users.sourceforge.net>
--- rewrote the spec file originally written by
--  Gustavo Niemeyer <niemeyer at conectiva.com>
-diff -urN BUILD/abook-0.6.0pre2/ABOUT-NLS abook/ABOUT-NLS
---- BUILD/abook-0.6.0pre2/ABOUT-NLS	2005-09-17 12:10:23.000000000 +0200
-+++ abook/ABOUT-NLS	2013-03-13 15:07:45.000000000 +0100
-@@ -18,35 +18,7 @@
- available translations.  They tell how people wanting to contribute and
- work on translations can 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.
--
--1.1 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'.
--
--1.2 INSTALL Matters
-+1.1 INSTALL Matters
- ===================
- 
- Some packages are "localizable" when properly installed; the programs
-@@ -56,36 +28,19 @@
- 
-    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 included GNU
--`gettext' 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:
-+provides the GNU `gettext' functions.  Installers may use special
-+options at configuration time for changing the default behaviour.  The
-+command:
- 
--     ./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.
-+will _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 not be 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.
-+probably detect the previously built and installed `libintl' library
-+and will decide to use it.  If not, you may have to to use the
-+`--with-libintl-prefix' option to tell `configure' where to look for it.
- 
-    Internationalized packages usually have many `po/LL.po' files, where
- LL gives an ISO 639 two-letter code identifying the language.  Unless
-@@ -96,13 +51,16 @@
- `LINGUAS' should then contain a space separated list of two-letter
- codes, stating which languages are allowed.
- 
--1.3 Using This Package
-+1.2 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
-+`LL_CC' combination.  If you happen to have the `LC_ALL' or some other
-+`LC_xxx' environment variables set, you should unset them before
-+setting `LANG', otherwise the setting of `LANG' will not have the
-+desired effect.  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').
-@@ -118,8 +76,8 @@
- 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''.
-+locales supported by your system for your language 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
-@@ -145,7 +103,7 @@
- to `de_DE' (German as spoken in Germany), and `pt' to `pt_PT'
- (Portuguese as spoken in Portugal) in this context.
- 
--1.4 Translating Teams
-+1.3 Translating Teams
- =====================
- 
- For the Free Translation Project to be a success, we need interested
-@@ -153,8 +111,7 @@
- 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.
-+`http://translationproject.org/', in the "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.
-@@ -168,786 +125,1125 @@
- _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 at iro.umontreal.ca' to reach the
--coordinator for all translator teams.
-+get started, please write to `coordinator at translationproject.org' 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.
-+the terminology in use.  Proven linguistic skills are praised more than
-+programming skills, here.
- 
--1.5 Available Packages
-+1.4 Available Packages
- ======================
- 
- Languages are not equally supported in all packages.  The following
--matrix shows the current state of internationalization, as of April
--2005.  The matrix shows, in regard of each package, for which languages
-+matrix shows the current state of internationalization, as of June
-+2010.  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       af am ar az be bg bs ca cs cy da de el en en_GB
-+     Ready PO files       af am an ar as ast az be be at latin bg bn_IN bs ca
-+                        +--------------------------------------------------+
-+     a2ps               |                       []                      [] |
-+     aegis              |                                                  |
-+     ant-phone          |                                                  |
-+     anubis             |                                                  |
-+     aspell             |                []                             [] |
-+     bash               |                                                  |
-+     bfd                |                                                  |
-+     bibshelf           |                []                                |
-+     binutils           |                                                  |
-+     bison              |                                                  |
-+     bison-runtime      |                []                                |
-+     bluez-pin          | []             []                                |
-+     bombono-dvd        |                                                  |
-+     buzztard           |                                                  |
-+     cflow              |                                                  |
-+     clisp              |                                                  |
-+     coreutils          |                                   []          [] |
-+     cpio               |                                                  |
-+     cppi               |                                                  |
-+     cpplib             |                                               [] |
-+     cryptsetup         |                                                  |
-+     dfarc              |                                                  |
-+     dialog             |                             []                [] |
-+     dico               |                                                  |
-+     diffutils          |                                               [] |
-+     dink               |                                                  |
-+     doodle             |                                                  |
-+     e2fsprogs          |                                               [] |
-+     enscript           |                                               [] |
-+     exif               |                                                  |
-+     fetchmail          |                                               [] |
-+     findutils          |                                   []             |
-+     flex               |                                               [] |
-+     freedink           |                                                  |
-+     gas                |                                                  |
-+     gawk               |                []                             [] |
-+     gcal               |                                               [] |
-+     gcc                |                                                  |
-+     gettext-examples   | []             []                 []          [] |
-+     gettext-runtime    |                                   []          [] |
-+     gettext-tools      |                                   []          [] |
-+     gip                |                                   []             |
-+     gjay               |                                                  |
-+     gliv               |                                   []             |
-+     glunarclock        |                []                 []             |
-+     gnubiff            |                                                  |
-+     gnucash            |                                               [] |
-+     gnuedu             |                                                  |
-+     gnulib             |                                                  |
-+     gnunet             |                                                  |
-+     gnunet-gtk         |                                                  |
-+     gnutls             |                                                  |
-+     gold               |                                                  |
-+     gpe-aerial         |                                                  |
-+     gpe-beam           |                                                  |
-+     gpe-bluetooth      |                                                  |
-+     gpe-calendar       |                                                  |
-+     gpe-clock          |                []                                |
-+     gpe-conf           |                                                  |
-+     gpe-contacts       |                                                  |
-+     gpe-edit           |                                                  |
-+     gpe-filemanager    |                                                  |
-+     gpe-go             |                                                  |
-+     gpe-login          |                                                  |
-+     gpe-ownerinfo      |                []                                |
-+     gpe-package        |                                                  |
-+     gpe-sketchbook     |                                                  |
-+     gpe-su             |                []                                |
-+     gpe-taskmanager    |                []                                |
-+     gpe-timesheet      |                []                                |
-+     gpe-today          |                []                                |
-+     gpe-todo           |                                                  |
-+     gphoto2            |                                                  |
-+     gprof              |                                   []             |
-+     gpsdrive           |                                                  |
-+     gramadoir          |                                                  |
-+     grep               |                                                  |
-+     grub               |                []                             [] |
-+     gsasl              |                                                  |
-+     gss                |                                                  |
-+     gst-plugins-bad    |                                   []             |
-+     gst-plugins-base   |                                   []             |
-+     gst-plugins-good   |                                   []             |
-+     gst-plugins-ugly   |                                   []             |
-+     gstreamer          | []                                []          [] |
-+     gtick              |                                                  |
-+     gtkam              |                       []                         |
-+     gtkorphan          |                                   []             |
-+     gtkspell           | []             []     []                         |
-+     gutenprint         |                                                  |
-+     hello              |                                   []             |
-+     help2man           |                                                  |
-+     hylafax            |                                                  |
-+     idutils            |                                                  |
-+     indent             |                                   []          [] |
-+     iso_15924          |                                                  |
-+     iso_3166           | []          []        []          []  []   [] [] |
-+     iso_3166_2         |                                                  |
-+     iso_4217           |                                                  |
-+     iso_639            |             [] []     []              []         |
-+     iso_639_3          |                                                  |
-+     jwhois             |                                                  |
-+     kbd                |                                                  |
-+     keytouch           |                                               [] |
-+     keytouch-editor    |                                                  |
-+     keytouch-keyboa... |                                               [] |
-+     klavaro            |          []                                      |
-+     latrine            |                                                  |
-+     ld                 |                                   []             |
-+     leafpad            |                                   []          [] |
-+     libc               |                                   []          [] |
-+     libexif            |                       ()                         |
-+     libextractor       |                                                  |
-+     libgnutls          |                                                  |
-+     libgpewidget       |                                                  |
-+     libgpg-error       |                                                  |
-+     libgphoto2         |                                                  |
-+     libgphoto2_port    |                                                  |
-+     libgsasl           |                                                  |
-+     libiconv           |                                   []             |
-+     libidn             |                                                  |
-+     lifelines          |                                                  |
-+     liferea            |                             []                [] |
-+     lilypond           |                                                  |
-+     linkdr             |          []                                      |
-+     lordsawar          |                                                  |
-+     lprng              |                                                  |
-+     lynx               |                                               [] |
-+     m4                 |                                                  |
-+     mailfromd          |                                                  |
-+     mailutils          |                                                  |
-+     make               |                                                  |
-+     man-db             |                                                  |
-+     man-db-manpages    |                                                  |
-+     minicom            |                                                  |
-+     mkisofs            |                                                  |
-+     myserver           |                                                  |
-+     nano               |                                   []          [] |
-+     opcodes            |                                                  |
-+     parted             |                                                  |
-+     pies               |                                                  |
-+     popt               |                                                  |
-+     psmisc             |                                                  |
-+     pspp               |                                               [] |
-+     pwdutils           |                                                  |
-+     radius             |                                               [] |
-+     recode             |                       []                      [] |
-+     rosegarden         |                                                  |
-+     rpm                |                                                  |
-+     rush               |                                                  |
-+     sarg               |                                                  |
-+     screem             |                                                  |
-+     scrollkeeper       |                    [] []                      [] |
-+     sed                |                []                             [] |
-+     sharutils          |                                   []          [] |
-+     shishi             |                                                  |
-+     skencil            |                                                  |
-+     solfege            |                                                  |
-+     solfege-manual     |                                                  |
-+     soundtracker       |                                                  |
-+     sp                 |                                                  |
-+     sysstat            |                                                  |
-+     tar                |                                   []             |
-+     texinfo            |                                                  |
-+     tin                |                                                  |
-+     unicode-han-tra... |                                                  |
-+     unicode-transla... |                                                  |
-+     util-linux-ng      |                                               [] |
-+     vice               |                                                  |
-+     vmm                |                                                  |
-+     vorbis-tools       |                                                  |
-+     wastesedge         |                                                  |
-+     wdiff              |                                                  |
-+     wget               |                       []                      [] |
-+     wyslij-po          |                                                  |
-+     xchat              |                []     []          []          [] |
-+     xdg-user-dirs      | []    []    [] []     []    []    []  []      [] |
-+     xkeyboard-config   |                                   []          [] |
-+                        +--------------------------------------------------+
-+                          af am an ar as ast az be be at latin bg bn_IN bs ca
-+                           6  0  1  2  3 19   1 10     3    28   3    1 38
-+
-+                          crh cs da  de  el en en_GB en_ZA eo es et eu fa
-                         +-------------------------------------------------+
--     GNUnet             |                                                 |
--     a2ps               |             []                [] [] []     []   |
--     aegis              |                                  ()             |
--     ant-phone          |                                  ()             |
--     anubis             |                                  []             |
--     ap-utils           |                                                 |
--     aspell             |                         []    [] []        []   |
--     bash               |                      []          []             |
--     batchelor          |                                  []             |
--     bfd                |                                                 |
--     bibshelf           |                                  []             |
--     binutils           |                               []                |
--     bison              |                               [] []             |
--     bluez-pin          | []                      []       [] []          |
--     clisp              |                                  []    []       |
--     console-tools      |                         []       []             |
--     coreutils          |                []    []       [] []             |
-+     a2ps               |     [] []  []  []     []            [] []       |
-+     aegis              |        []  []                       []          |
-+     ant-phone          |        []  ()                                   |
-+     anubis             |        []  []                                   |
-+     aspell             |     [] []  []         []            []          |
-+     bash               |     []                           [] []          |
-+     bfd                |                                     []          |
-+     bibshelf           |        []  []                       []          |
-+     binutils           |                                     []          |
-+     bison              |            []  []                               |
-+     bison-runtime      |        []  []  []                      []       |
-+     bluez-pin          |     [] []  []  []                [] []          |
-+     bombono-dvd        |        []                                       |
-+     buzztard           |     [] []  []                                   |
-+     cflow              |        []  []                                   |
-+     clisp              |        []  []     []                []          |
-+     coreutils          |     [] []  []                          []       |
-      cpio               |                                                 |
--     cpplib             |                      []       [] []             |
--     darkstat           |                []             () []             |
--     dialog             |                      [] [] [] [] [] []          |
--     diffutils          |                      [] []    [] [] []          |
--     doodle             |                                  []             |
--     e2fsprogs          |                         []       []             |
--     enscript           |                      []       [] []        []   |
--     error              |                      []       [] []        []   |
--     fetchmail          |                      [] ()    [] [] []          |
--     fileutils          |                               [] []             |
--     findutils          |                      []       []    []          |
--     flex               |                      []       [] []             |
--     fslint             |                                  []             |
--     gas                |                                                 |
--     gawk               |                      []       [] []             |
--     gbiff              |                                  []             |
--     gcal               |                      []                         |
--     gcc                |                                  []             |
--     gettext-examples   | []                   []          [] []          |
--     gettext-runtime    |             []       []       [] []             |
--     gettext-tools      |                      []          []             |
--     gimp-print         |                         []    [] []        []   |
--     gip                |                                                 |
--     gliv               |                                  []             |
--     glunarclock        |                                                 |
--     gmult              | []                               []             |
--     gnubiff            |                                  ()             |
--     gnucash            |                         []       () ()     []   |
--     gnucash-glossary   |                               [] ()             |
--     gpe-aerial         |                         []       []             |
--     gpe-beam           |                         []       []             |
--     gpe-calendar       |                         []       []             |
--     gpe-clock          |                         []       []             |
--     gpe-conf           |                         []       []             |
--     gpe-contacts       |                                                 |
--     gpe-edit           |                         []                      |
--     gpe-go             |                         []                      |
--     gpe-login          |                         []       []             |
--     gpe-ownerinfo      |                         []       []             |
--     gpe-sketchbook     |                         []       []             |
--     gpe-su             |                         []       []             |
--     gpe-taskmanager    |                         []       []             |
--     gpe-timesheet      |                         []                      |
--     gpe-today          |                         []       []             |
--     gpe-todo           |                         []       []             |
--     gphoto2            |                         []    [] []        []   |
--     gprof              |                               [] []             |
--     gpsdrive           |                                  ()    ()       |
--     gramadoir          | []                               []             |
--     grep               | []          [] []    []          [] []          |
--     gretl              |                                                 |
--     gsasl              |                                  []             |
-+     cppi               |                                                 |
-+     cpplib             |        []  []                       []          |
-+     cryptsetup         |            []                                   |
-+     dfarc              |        []  []                       []          |
-+     dialog             |        []  []                    [] []    []    |
-+     dico               |                                                 |
-+     diffutils          |     [] []  []  []                [] []          |
-+     dink               |        []  []                       []          |
-+     doodle             |            []                                   |
-+     e2fsprogs          |     []     []                       []          |
-+     enscript           |        []  []         []                        |
-+     exif               |     () []  []                                   |
-+     fetchmail          |     [] []  ()  []     []            []          |
-+     findutils          |     [] []  []                                   |
-+     flex               |            []                       []          |
-+     freedink           |        []  []                       []          |
-+     gas                |                                     []          |
-+     gawk               |        []  []                       []          |
-+     gcal               |                                     []          |
-+     gcc                |            []                       []          |
-+     gettext-examples   |            []  []                [] []          |
-+     gettext-runtime    |        []  []                    [] []          |
-+     gettext-tools      |            []                       []    []    |
-+     gip                |        []  []                       []    []    |
-+     gjay               |            []                                   |
-+     gliv               |     [] []  []                                   |
-+     glunarclock        |        []  []                                   |
-+     gnubiff            |            ()                                   |
-+     gnucash            |     []     ()  ()     ()            ()          |
-+     gnuedu             |        []                           []          |
-+     gnulib             |            []                       []          |
-+     gnunet             |                                                 |
-+     gnunet-gtk         |        []                                       |
-+     gnutls             |     []     []                                   |
-+     gold               |                                     []          |
-+     gpe-aerial         |     [] []  []                       []          |
-+     gpe-beam           |     [] []  []                       []          |
-+     gpe-bluetooth      |        []  []                                   |
-+     gpe-calendar       |        []                                       |
-+     gpe-clock          |     [] []  []                       []          |
-+     gpe-conf           |     [] []  []                                   |
-+     gpe-contacts       |        []  []                       []          |
-+     gpe-edit           |        []  []                                   |
-+     gpe-filemanager    |        []  []                       []          |
-+     gpe-go             |     [] []  []                       []          |
-+     gpe-login          |        []  []                                   |
-+     gpe-ownerinfo      |     [] []  []                       []          |
-+     gpe-package        |        []  []                       []          |
-+     gpe-sketchbook     |     [] []  []                       []          |
-+     gpe-su             |     [] []  []                       []          |
-+     gpe-taskmanager    |     [] []  []                       []          |
-+     gpe-timesheet      |     [] []  []                       []          |
-+     gpe-today          |     [] []  []                       []          |
-+     gpe-todo           |        []  []                       []          |
-+     gphoto2            |     [] []  ()         []            []    []    |
-+     gprof              |        []  []                       []          |
-+     gpsdrive           |        []                           [] []       |
-+     gramadoir          |        []  []                    []             |
-+     grep               |     []                                          |
-+     grub               |        []  []                                   |
-+     gsasl              |            []                                   |
-      gss                |                                                 |
--     gst-plugins        | []       []          [] []       []        []   |
--     gstreamer          | []                   [] []       []        []   |
--     gtick              | []                               ()             |
--     gtkspell           |             []                   [] []          |
--     hello              |                      []       [] [] []          |
--     id-utils           |                               [] []             |
--     impost             |                                                 |
--     indent             |                      []          []             |
--     iso_3166           |                                                 |
--     iso_3166_1         |                      [] []    [] [] []          |
--     iso_3166_2         |                                                 |
--     iso_3166_3         |                                  []             |
--     iso_4217           |                                                 |
--     iso_639            |                                                 |
--     jpilot             |                         []                      |
--     jtag               |                                                 |
--     jwhois             |                                                 |
--     kbd                |                         []    [] [] []          |
--     latrine            |                                  ()             |
--     ld                 |                               []                |
--     libc               |                      [] []    [] [] []          |
-+     gst-plugins-bad    |     [] []  []                       []    []    |
-+     gst-plugins-base   |     [] []  []                       []    []    |
-+     gst-plugins-good   |     [] []  []  []                   []    []    |
-+     gst-plugins-ugly   |     [] []  []  []                   []    []    |
-+     gstreamer          |     [] []  []                       []    []    |
-+     gtick              |        []  ()                    []             |
-+     gtkam              |     [] []  ()                    [] []          |
-+     gtkorphan          |     [] []  []                    []             |
-+     gtkspell           |     [] []  []  []                [] []    []    |
-+     gutenprint         |        []  []         []                        |
-+     hello              |        []  []                    [] []          |
-+     help2man           |            []                                   |
-+     hylafax            |            []                       []          |
-+     idutils            |        []  []                                   |
-+     indent             |     [] []  []                    [] [] [] []    |
-+     iso_15924          |        []      ()                [] []          |
-+     iso_3166           | []  [] []  []  ()                [] [] [] ()    |
-+     iso_3166_2         |                ()                               |
-+     iso_4217           |     [] []  []  ()                   [] []       |
-+     iso_639            | []  [] []  []  ()                [] []          |
-+     iso_639_3          | []                                              |
-+     jwhois             |                                     []          |
-+     kbd                |     [] []  []  []                   []          |
-+     keytouch           |        []  []                                   |
-+     keytouch-editor    |        []  []                                   |
-+     keytouch-keyboa... |        []                                       |
-+     klavaro            |     [] []  []                    []             |
-+     latrine            |        []  ()                                   |
-+     ld                 |        []                           []          |
-+     leafpad            |     [] []  []  []                   []    []    |
-+     libc               |     [] []  []                       []          |
-+     libexif            |        []  []         ()                        |
-      libextractor       |                                                 |
--     libgpewidget       |                         []    [] []             |
-+     libgnutls          |     []                                          |
-+     libgpewidget       |        []  []                                   |
-+     libgpg-error       |     []     []                                   |
-+     libgphoto2         |        []  ()                                   |
-+     libgphoto2_port    |        []  ()                             []    |
-      libgsasl           |                                                 |
--     libiconv           | []                   []       [] [] []          |
--     libidn             |                                                 |
--     lifelines          |                               [] ()             |
--     lilypond           |                                  []             |
--     lingoteach         |                                                 |
--     lynx               |                      [] []    [] []             |
--     m4                 |                         []    [] [] []          |
--     mailutils          |                      []                         |
--     make               |                               [] []             |
--     man-db             |                      [] ()    [] []             |
--     minicom            |                         []       []             |
--     mysecretdiary      |                               [] []             |
--     nano               |                      [] ()       []             |
--     nano_1_0           |                      [] ()    [] []             |
--     opcodes            |                                  []             |
--     parted             |                      [] []    [] []             |
--     psmisc             |                                                 |
--     ptx                |                      []       [] []             |
--     pwdutils           |                                                 |
--     python             |                                                 |
--     radius             |                      []                         |
--     recode             |             []       []       [] [] []          |
--     rpm                |                         []    []                |
-+     libiconv           |     [] []  []                    []    []       |
-+     libidn             |     []     []                    []             |
-+     lifelines          |        []  ()                                   |
-+     liferea            |     []     []  []                   []    []    |
-+     lilypond           |     []     []                       []          |
-+     linkdr             |        []  []                       []          |
-+     lordsawar          |        []                                       |
-+     lprng              |                                                 |
-+     lynx               |     [] []  []                          []       |
-+     m4                 |     [] []  []  []                               |
-+     mailfromd          |                                                 |
-+     mailutils          |                                     []          |
-+     make               |        []  []                       []          |
-+     man-db             |                                                 |
-+     man-db-manpages    |                                                 |
-+     minicom            |     [] []  []                       []          |
-+     mkisofs            |                                                 |
-+     myserver           |                                                 |
-+     nano               |            []                       []    []    |
-+     opcodes            |            []                       []          |
-+     parted             |     []     []                                   |
-+     pies               |                                                 |
-+     popt               |     [] []  []                    [] []          |
-+     psmisc             |     []     []                             []    |
-+     pspp               |                                     []          |
-+     pwdutils           |        []                                       |
-+     radius             |                                     []          |
-+     recode             |     [] []  []  []                [] []          |
-+     rosegarden         |     ()     ()                       ()          |
-+     rpm                |        []  []                       []          |
-+     rush               |                                                 |
-+     sarg               |                                                 |
-      screem             |                                                 |
--     scrollkeeper       |          [] []       [] [] [] [] []        []   |
--     sed                |                      []          []             |
--     sh-utils           |                               [] []             |
--     shared-mime-info   |                         [] []                   |
--     sharutils          |                      [] []    [] [] []          |
--     silky              |                                                 |
--     skencil            |                               [] ()             |
--     sketch             |                               [] ()             |
--     solfege            |                                  []             |
--     soundtracker       |                               [] []             |
--     sp                 |                                  []             |
--     stardict           |                         []                      |
--     tar                |                                                 |
--     texinfo            |                               [] []             |
--     textutils          |                      []       [] []             |
--     tin                |                                  ()        ()   |
--     tp-robot           |                                  []             |
--     tuxpaint           | []                   [] []    [] [] []     []   |
-+     scrollkeeper       |     [] []  []         []            []          |
-+     sed                |     []     []  []                [] [] []       |
-+     sharutils          |        []  []                       [] []       |
-+     shishi             |                                                 |
-+     skencil            |        []  ()                       []          |
-+     solfege            |            []                    []    []       |
-+     solfege-manual     |                                  []    []       |
-+     soundtracker       |        []  []                       []          |
-+     sp                 |            []                                   |
-+     sysstat            |        []  []                             []    |
-+     tar                |     []     []                          [] []    |
-+     texinfo            |            []                    [] []          |
-+     tin                |            []                          []       |
-      unicode-han-tra... |                                                 |
-      unicode-transla... |                                                 |
--     util-linux         |                      [] []    [] []             |
--     vorbis-tools       |             []          []    []           []   |
--     wastesedge         |                                  ()             |
--     wdiff              |                      []       [] []        []   |
--     wget               |                []    []       [] [] []     []   |
--     xchat              |                      []          [] []     []   |
--     xkeyboard-config   |                                                 |
--     xpad               |                                                 |
-+     util-linux-ng      |     [] []  []                       []          |
-+     vice               |        ()  ()                                   |
-+     vmm                |            []                                   |
-+     vorbis-tools       |     []                           []             |
-+     wastesedge         |        []                                       |
-+     wdiff              |            []                       []          |
-+     wget               |     []     []                          []       |
-+     wyslij-po          |                                                 |
-+     xchat              |     []     []  []                   [] []       |
-+     xdg-user-dirs      | []  [] []  []  []                [] [] [] []    |
-+     xkeyboard-config   | []  [] []  []                    [] []          |
-                         +-------------------------------------------------+
--                          af am ar az be bg bs ca cs cy da de el en en_GB
--                          10  0  0  2  7  4  0 41 43  3 52 90 20  1  15
-+                          crh cs da  de  el en en_GB en_ZA eo es et eu fa
-+                           5  64 105 117 18  1   8     0   28 89 18 19  0
- 
--                          eo es et eu fa fi fr  ga gl he hr hu id is it
--                        +-----------------------------------------------+
--     GNUnet             |                                               |
--     a2ps               |       []       [] []                       () |
--     aegis              |                                               |
--     ant-phone          |                   []                          |
--     anubis             |                   []                          |
--     ap-utils           |                   []                          |
--     aspell             |                   []  []                      |
--     bash               | [] []             []              []          |
--     batchelor          |                   []  []                      |
--     bfd                |    []                                         |
--     bibshelf           |    []                 []                   [] |
--     binutils           |    []             []                          |
--     bison              |    [] []          []  []             []    [] |
--     bluez-pin          | []             [] []  []          [] []       |
--     clisp              |    []             []                          |
--     console-tools      |                                               |
--     coreutils          |    [] []       [] []  []                      |
--     cpio               |    []             []                          |
--     cpplib             |    []             []                          |
--     darkstat           |    []             ()  []          [] []       |
--     dialog             |    [] [] []    [] []  []          []       [] |
--     diffutils          | [] []          [] []  [] [] []    [] []    [] |
--     doodle             |                       []                   [] |
--     e2fsprogs          |    []             []                       [] |
--     enscript           |                   []           []             |
--     error              |    []          [] []  []          []          |
--     fetchmail          |    []                                         |
--     fileutils          |    [] []          []  []          []       [] |
--     findutils          |    [] []          []  []                   [] |
--     flex               |    []             []  []                      |
--     fslint             |                   []                          |
--     gas                |    []             []                          |
--     gawk               |    []             []  []    []                |
--     gbiff              |                   []                          |
--     gcal               |    []             []                          |
--     gcc                |    []                                         |
--     gettext-examples   |    []             []  []                   [] |
--     gettext-runtime    |    []          [] []  []             []    [] |
--     gettext-tools      |    []             []                       [] |
--     gimp-print         |    []             []                          |
--     gip                |    []    []       []                          |
--     gliv               |                   ()                          |
--     glunarclock        |                []     []          []          |
--     gmult              |          []       []                       [] |
--     gnubiff            |                   ()                       () |
--     gnucash            |    []                             ()       [] |
--     gnucash-glossary   |    []                                      [] |
--     gpe-aerial         |    []             []                          |
--     gpe-beam           |    []             []                          |
--     gpe-calendar       |    []             []              [] []       |
--     gpe-clock          |    []          [] []                          |
--     gpe-conf           |                   []                          |
--     gpe-contacts       |                   []                          |
--     gpe-edit           |                   []                 []       |
--     gpe-go             |    []             []                          |
--     gpe-login          |    []             []              []          |
--     gpe-ownerinfo      |    []          [] []              [] []       |
--     gpe-sketchbook     |    []             []                          |
--     gpe-su             |    []          [] []                          |
--     gpe-taskmanager    |    []          [] []                          |
--     gpe-timesheet      |    []             []  []             []       |
--     gpe-today          |    []          [] []  []                      |
--     gpe-todo           |    []             []                 []       |
--     gphoto2            |    []          [] []              []       [] |
--     gprof              |    []             []                 []       |
--     gpsdrive           |    ()             ()              []       () |
--     gramadoir          |                   []  []                      |
--     grep               |    [] [] []    [] []  [] [] [] [] [] []    [] |
--     gretl              |    []             []                       [] |
--     gsasl              |          []       []  []                      |
--     gss                |                   []                          |
--     gst-plugins        |                   []              []       [] |
--     gstreamer          |                                            [] |
--     gtick              |          []    [] []  []                   [] |
--     gtkspell           | [] []    []       []  []                   [] |
--     hello              | [] [] [] [] [] [] []  [] [] [] [] [] []    [] |
--     id-utils           |                   []              [] []    [] |
--     impost             |                   []  []                      |
--     indent             | [] [] [] []    [] []  [] []       [] []    [] |
--     iso_3166           | []             [] []                          |
--     iso_3166_1         |    []    []    [] []  []          [] []       |
--     iso_3166_2         |                   []                          |
--     iso_3166_3         |                   []                          |
--     iso_4217           |       []       []        []                   |
--     iso_639            | []          [] [] []                          |
--     jpilot             |    []             []                          |
--     jtag               |                   []                          |
--     jwhois             |    []             []              [] []    [] |
--     kbd                |    []             []                          |
--     latrine            |                   []  []                   [] |
--     ld                 |    []             []                          |
--     libc               |    []          [] []     []       []          |
--     libextractor       |                                               |
--     libgpewidget       |    []             []  []          [] []       |
--     libgsasl           |                   []  []                      |
--     libiconv           | [] [] []       [] []  [] []    [] [] []    [] |
--     libidn             |                   []                       [] |
--     lifelines          |                   ()                          |
--     lilypond           |                   []                          |
--     lingoteach         |                   []                 []    [] |
--     lynx               |       []                          []       [] |
--     m4                 |                   []  [] []          []       |
--     mailutils          |    []             []                          |
--     make               |    []          [] []  [] [] [] []             |
--     man-db             |    ()                                         |
--     minicom            |    []          [] []              []          |
--     mysecretdiary      |    []             []                 []       |
--     nano               |    []    []    () []                       [] |
--     nano_1_0           |    []             []     []          []    [] |
--     opcodes            |    []             []                          |
--     parted             |    []             []     []                [] |
--     psmisc             |          []                                [] |
--     ptx                | [] [] []       [] []  [] []       [] []       |
--     pwdutils           |                                               |
--     python             |                                               |
--     radius             |    []             []                          |
--     recode             | [] []             []     [] []    [] []    [] |
--     rpm                |                   []                          |
--     screem             |                                               |
--     scrollkeeper       |    []          []                 []          |
--     sed                |    [] []          []  []          []          |
--     sh-utils           |    [] []       [] []  []          []       [] |
--     shared-mime-info   | [] []    []    [] []              []          |
--     sharutils          |    [] []       [] []     []       []       [] |
--     silky              |                   []                          |
--     skencil            |    []             []                          |
--     sketch             |    []             []                          |
--     solfege            |                                            [] |
--     soundtracker       |    []             []                       [] |
--     sp                 |                   []                          |
--     stardict           |                                   []          |
--     tar                |    [] []          []  []                   [] |
--     texinfo            | []                []        []                |
--     textutils          |    []             []  [] []       []          |
--     tin                |       []          ()                          |
--     tp-robot           |                   []              []          |
--     tuxpaint           |    []          [] []  []    []    [] [] [] [] |
--     unicode-han-tra... |                                               |
--     unicode-transla... |                   []  []                      |
--     util-linux         |    [] []       [] []              []       [] |
--     vorbis-tools       |    []             []                          |
--     wastesedge         |                   ()                          |
--     wdiff              |    [] []          []  [] []       [] []    [] |
--     wget               |    [] [] []    [] []  [] []    [] []       [] |
--     xchat              |    []    []    [] []                       [] |
--     xkeyboard-config   |                                               |
--     xpad               |    []                 []          []          |
--                        +-----------------------------------------------+
--                          eo es et eu fa fi fr  ga gl he hr hu id is it
--                          13 85 21 15  2 35 115 45 17  8  6 40 27  1 45
-+                          fi  fr  ga gl gu he hi hr hu hy id  is it ja ka kn
-+                        +----------------------------------------------------+
-+     a2ps               | []  []                          []        []       |
-+     aegis              |     []                                 []          |
-+     ant-phone          |     []                                 []          |
-+     anubis             | []  []                          []     []          |
-+     aspell             |     []  []                      []     []          |
-+     bash               | []  []                          []        []       |
-+     bfd                | []  []                          []                 |
-+     bibshelf           | []  []  []                      []     []          |
-+     binutils           | []  []                          []                 |
-+     bison              | []  []  []                      []                 |
-+     bison-runtime      | []  []  []                      []     [] []       |
-+     bluez-pin          | []  []  []                [] [] []  []    []       |
-+     bombono-dvd        | []                                                 |
-+     buzztard           |                                 []                 |
-+     cflow              | []      []                      []                 |
-+     clisp              |     []                                             |
-+     coreutils          |     []  []                []    []     []          |
-+     cpio               | []  []  []                      []                 |
-+     cppi               | []  []                                             |
-+     cpplib             | []  []                          []                 |
-+     cryptsetup         |     []                          []     []          |
-+     dfarc              | []  []                                 []          |
-+     dialog             |     []  [] []                   []  [] [] []       |
-+     dico               |                                                    |
-+     diffutils          | []  []  [] []    []       []    []     [] []       |
-+     dink               |     []                                             |
-+     doodle             |         []                             []          |
-+     e2fsprogs          |     []                          []                 |
-+     enscript           |     []  []             []       []                 |
-+     exif               | []  []                          []  [] [] []       |
-+     fetchmail          |     []                          []     [] []       |
-+     findutils          | []  []  []                []    []     []          |
-+     flex               | []  []  []                                         |
-+     freedink           | []  []                          []                 |
-+     gas                |     []                          []                 |
-+     gawk               |     []  []       []             []     () []       |
-+     gcal               |     []                                             |
-+     gcc                |                                 []                 |
-+     gettext-examples   | []  []  []                []    []     [] []       |
-+     gettext-runtime    | []  []  []                      []     [] []       |
-+     gettext-tools      |     []                          []     [] []       |
-+     gip                | []  []  [] []                   []        []       |
-+     gjay               | []                                                 |
-+     gliv               | []  ()                                             |
-+     glunarclock        | []      []                []    []                 |
-+     gnubiff            |     ()                          []     ()          |
-+     gnucash            | ()  ()           ()       ()           () []       |
-+     gnuedu             |     []                                 []          |
-+     gnulib             | []  []  []                []           [] []       |
-+     gnunet             |                                                    |
-+     gnunet-gtk         |     []                                             |
-+     gnutls             |     []                                 []          |
-+     gold               | []                              []                 |
-+     gpe-aerial         | []  []                          []                 |
-+     gpe-beam           | []  []                          []        []       |
-+     gpe-bluetooth      | []                              []     [] []       |
-+     gpe-calendar       | []                                        []       |
-+     gpe-clock          | []  []                    []    []        []       |
-+     gpe-conf           | []  []                          []        []       |
-+     gpe-contacts       | []  []                          []        []       |
-+     gpe-edit           | []                              []        []       |
-+     gpe-filemanager    | []                        []    []        []       |
-+     gpe-go             | []  []                    []    []        []       |
-+     gpe-login          | []                              []        []       |
-+     gpe-ownerinfo      | []  []                    []    []        []       |
-+     gpe-package        | []                              []        []       |
-+     gpe-sketchbook     | []  []                          []        []       |
-+     gpe-su             | []  []     []             []    []        []       |
-+     gpe-taskmanager    | []  []                    []    []        []       |
-+     gpe-timesheet      | []  []  []                      []        []       |
-+     gpe-today          | []  []  [] []             []    []        []       |
-+     gpe-todo           | []                              []        []       |
-+     gphoto2            | []  []                    []    []     [] []       |
-+     gprof              | []  []  []                      []                 |
-+     gpsdrive           |            []                   []     []          |
-+     gramadoir          |     []  []                      []                 |
-+     grep               | []                                     []          |
-+     grub               | []                        []    []     []          |
-+     gsasl              | []  []  []                      []     []          |
-+     gss                | []  []  []                      []     []          |
-+     gst-plugins-bad    | []  []                    []    []     [] []       |
-+     gst-plugins-base   | []  []                    []    []     [] []       |
-+     gst-plugins-good   | []  []                    []    []     [] []       |
-+     gst-plugins-ugly   | []  []                    []    []     [] []       |
-+     gstreamer          | []  []                    []    []     []          |
-+     gtick              | []  []  []                      []     []          |
-+     gtkam              |     []                    []    []     [] []       |
-+     gtkorphan          |     []                          []     []          |
-+     gtkspell           | []  []  [] []             [] [] []     [] []       |
-+     gutenprint         | []  []                    []           []          |
-+     hello              | []      []                      []                 |
-+     help2man           | []  []                                             |
-+     hylafax            |                                 []                 |
-+     idutils            | []  []  []                []    []     []          |
-+     indent             | []  []  [] []             []    []     [] []       |
-+     iso_15924          | []  ()                          []     []          |
-+     iso_3166           | []  ()  [] [] [] [] [] [] []    []     [] []       |
-+     iso_3166_2         |     ()                    []    []     []          |
-+     iso_4217           | []  ()                    []    []     [] []       |
-+     iso_639            | []  ()  []    []          []    []     [] []    [] |
-+     iso_639_3          |     ()                                 []       [] |
-+     jwhois             | []  []                    []    []     []          |
-+     kbd                |     []                          []                 |
-+     keytouch           | []  []  []                []    []     []          |
-+     keytouch-editor    | []      []                []    []     []          |
-+     keytouch-keyboa... | []      []                []    []     []          |
-+     klavaro            |            []             []                       |
-+     latrine            | []                              []     []          |
-+     ld                 | []  []  []                      []                 |
-+     leafpad            | []  []  []       []       []    []     [] ()       |
-+     libc               | []  []     []                   []        []       |
-+     libexif            |                                        []          |
-+     libextractor       |                                                    |
-+     libgnutls          |     []                                 []          |
-+     libgpewidget       | []      []                      []        []       |
-+     libgpg-error       |     []                                 []          |
-+     libgphoto2         |     []                                 [] []       |
-+     libgphoto2_port    |     []                                 [] []       |
-+     libgsasl           | []  []  []                      []     []          |
-+     libiconv           | []  []  []                      []     [] []       |
-+     libidn             | []  []                          []     []          |
-+     lifelines          |     ()                                             |
-+     liferea            |     []                    []           [] []       |
-+     lilypond           | []  []                                             |
-+     linkdr             | []               []    [] []           []          |
-+     lordsawar          |                                                    |
-+     lprng              |                                 []                 |
-+     lynx               |     []                    []    []     [] []       |
-+     m4                 | []  []  [] []                   []        []       |
-+     mailfromd          |                                                    |
-+     mailutils          |     []                          []                 |
-+     make               | []  []  [] []    []    []       []     [] []       |
-+     man-db             |                                 []     []          |
-+     man-db-manpages    |                                 []                 |
-+     minicom            | []  []                    []    []        []       |
-+     mkisofs            | []  []                          []     []          |
-+     myserver           |                                                    |
-+     nano               | []  []  [] []             []           []          |
-+     opcodes            | []  []  []                      []                 |
-+     parted             |     []                          []     [] []       |
-+     pies               |                                                    |
-+     popt               | []  []  [] []             []    []  [] [] []       |
-+     psmisc             | []  []                          []                 |
-+     pspp               |                                                    |
-+     pwdutils           |     []                          []                 |
-+     radius             |     []                          []                 |
-+     recode             | []  []  [] []    []       []    []     []          |
-+     rosegarden         | ()  ()                          ()     () ()       |
-+     rpm                |                                 []        []       |
-+     rush               |                                                    |
-+     sarg               |     []                                             |
-+     screem             |                                        [] []       |
-+     scrollkeeper       | []                        []    []     []          |
-+     sed                | []  []  [] []             []    []     [] []       |
-+     sharutils          | []  []  []                []    []     [] []       |
-+     shishi             |     []                                             |
-+     skencil            |     []                                             |
-+     solfege            | []  []     []                          []          |
-+     solfege-manual     |     []     []                                      |
-+     soundtracker       |     []                                 []          |
-+     sp                 |     []                                    ()       |
-+     sysstat            | []  []                          []     [] []       |
-+     tar                | []  []  []                []    []     [] []       |
-+     texinfo            |     []                          []     [] []       |
-+     tin                |     []                                             |
-+     unicode-han-tra... |                                                    |
-+     unicode-transla... |     []  []                                         |
-+     util-linux-ng      | []  []                    []    []     [] []       |
-+     vice               |     ()                    ()           ()          |
-+     vmm                |     []                                             |
-+     vorbis-tools       |                                 []                 |
-+     wastesedge         |     ()                                 ()          |
-+     wdiff              | []                                                 |
-+     wget               | []  []  []             [] []    []     [] []       |
-+     wyslij-po          | []  []                          []                 |
-+     xchat              | []  []        []    []    []    []     [] []    [] |
-+     xdg-user-dirs      | []  []  [] [] [] [] []    []    []  [] [] []    [] |
-+     xkeyboard-config   | []  []                    []    []     []          |
-+                        +----------------------------------------------------+
-+                          fi  fr  ga gl gu he hi hr hu hy id  is it ja ka kn
-+                          105 121 53 20  4  8  3  5 53  2 120  5 84 67  0  4
- 
--                          ja ko ku lg lt lv mk mn ms mt nb nl nn no nso
-+                          ko ku ky lg lt lv mk ml mn mr ms mt nb nds ne
-                         +-----------------------------------------------+
--     GNUnet             |                                               |
--     a2ps               |    ()                   []       []    ()     |
--     aegis              |                                  ()           |
--     ant-phone          |                                  []           |
--     anubis             |                         []    [] []           |
--     ap-utils           |                                               |
--     aspell             |                      []          []           |
--     bash               |                                  []           |
--     batchelor          |                                  []           |
-+     a2ps               |                               []              |
-+     aegis              |                                               |
-+     ant-phone          |                                               |
-+     anubis             |                               []    []        |
-+     aspell             |                         []                    |
-+     bash               |                                               |
-      bfd                |                                               |
--     bibshelf           |                                               |
-+     bibshelf           |                []             []              |
-      binutils           |                                               |
--     bison              |                         []    [] []           |
--     bluez-pin          |                                  []           |
--     clisp              |                                  []           |
--     console-tools      |                                               |
--     coreutils          | []                               []           |
-+     bison              |                               []              |
-+     bison-runtime      |       []    [] []             []    []        |
-+     bluez-pin          |    [] []    [] []             []              |
-+     bombono-dvd        |                                               |
-+     buzztard           |                                               |
-+     cflow              |                                               |
-+     clisp              |                                               |
-+     coreutils          |          []                                   |
-      cpio               |                                               |
-+     cppi               |                                               |
-      cpplib             |                                               |
--     darkstat           |                         []       []           |
--     dialog             |                                  []           |
--     diffutils          | []                      []       []           |
-+     cryptsetup         |                                               |
-+     dfarc              |                   []                          |
-+     dialog             |    []       [] []             []    []        |
-+     dico               |                                               |
-+     diffutils          |                []             []              |
-+     dink               |                                               |
-      doodle             |                                               |
-      e2fsprogs          |                                               |
--     enscript           |                                  []           |
--     error              |                                  []           |
--     fetchmail          | []                               []           |
--     fileutils          | []       []                                   |
--     findutils          |                                  []           |
--     flex               |    []                            []           |
--     fslint             |                                  []           |
-+     enscript           |                                               |
-+     exif               |                []                             |
-+     fetchmail          |                                               |
-+     findutils          |                                               |
-+     flex               |                                               |
-+     freedink           |                                     []        |
-      gas                |                                               |
--     gawk               | []                               []           |
--     gbiff              |                                  []           |
-+     gawk               |                                               |
-      gcal               |                                               |
-      gcc                |                                               |
--     gettext-examples   | []                               []           |
--     gettext-runtime    | [] []                            []           |
--     gettext-tools      | [] []                                         |
--     gimp-print         | []                               []           |
--     gip                |                                  []           |
--     gliv               |                                  []           |
--     glunarclock        |                         []       []           |
--     gmult              | []                                            |
-+     gettext-examples   |       []       []             [] []           |
-+     gettext-runtime    | []                                            |
-+     gettext-tools      | []                                            |
-+     gip                |                []             []              |
-+     gjay               |                                               |
-+     gliv               |                                               |
-+     glunarclock        |                []                             |
-      gnubiff            |                                               |
--     gnucash            | ()                            () []           |
--     gnucash-glossary   |                                  []           |
--     gpe-aerial         |                                  []           |
--     gpe-beam           |                                  []           |
--     gpe-calendar       |                                  []           |
--     gpe-clock          |                                  []           |
--     gpe-conf           |                                  []           |
--     gpe-contacts       |                                               |
--     gpe-edit           |                                  []           |
--     gpe-go             |                                  []           |
--     gpe-login          |                                  []           |
--     gpe-ownerinfo      |                                  []           |
--     gpe-sketchbook     |                                  []           |
--     gpe-su             |                                  []           |
--     gpe-taskmanager    |       []                         []           |
--     gpe-timesheet      |                                  []           |
--     gpe-today          |                                  []           |
--     gpe-todo           |                                  []           |
--     gphoto2            | []                               []           |
--     gprof              |                                               |
--     gpsdrive           | ()                               ()    ()     |
--     gramadoir          |                                  ()           |
--     grep               | []                            [] []           |
--     gretl              |                                               |
--     gsasl              |                                  []           |
-+     gnucash            | ()          ()                      ()     () |
-+     gnuedu             |                                               |
-+     gnulib             |                                               |
-+     gnunet             |                                               |
-+     gnunet-gtk         |                                               |
-+     gnutls             |                               []              |
-+     gold               |                                               |
-+     gpe-aerial         |                []                             |
-+     gpe-beam           |                []                             |
-+     gpe-bluetooth      |                []                []           |
-+     gpe-calendar       |                []                             |
-+     gpe-clock          | []    []       []             [] []           |
-+     gpe-conf           | []             []                             |
-+     gpe-contacts       | []             []                             |
-+     gpe-edit           |                []                             |
-+     gpe-filemanager    | []             []                             |
-+     gpe-go             | []             []                []           |
-+     gpe-login          |                []                             |
-+     gpe-ownerinfo      |                []             []              |
-+     gpe-package        | []             []                             |
-+     gpe-sketchbook     | []             []                             |
-+     gpe-su             | []    []       []             [] [] []        |
-+     gpe-taskmanager    | [] [] []       []             [] []           |
-+     gpe-timesheet      |                []             []              |
-+     gpe-today          |       []       []             [] []           |
-+     gpe-todo           |                []                   []        |
-+     gphoto2            |                                               |
-+     gprof              |                               []              |
-+     gpsdrive           |                                               |
-+     gramadoir          |                                               |
-+     grep               |                                               |
-+     grub               |                                               |
-+     gsasl              |                                               |
-      gss                |                                               |
--     gst-plugins        |                                  []           |
--     gstreamer          |                                  []           |
--     gtick              |                                  []           |
--     gtkspell           |                      []          []           |
--     hello              | [] []          []       []    [] [] [] []     |
--     id-utils           |                                  []           |
--     impost             |                                               |
--     indent             | []                               []           |
--     iso_3166           |                                  []           |
--     iso_3166_1         |                                  []    []     |
--     iso_3166_2         |                                  []           |
--     iso_3166_3         |                                  []           |
--     iso_4217           | []                   []          []           |
--     iso_639            | []                               [] []        |
--     jpilot             | ()                               ()    ()     |
--     jtag               |                                               |
--     jwhois             |                                  []           |
--     kbd                |                                  []           |
--     latrine            |                                  []           |
-+     gst-plugins-bad    |             [] []                [] []        |
-+     gst-plugins-base   |             [] []                             |
-+     gst-plugins-good   |                []                []           |
-+     gst-plugins-ugly   |             [] []             [] [] []        |
-+     gstreamer          |                                               |
-+     gtick              |                                               |
-+     gtkam              |                                     []        |
-+     gtkorphan          |                []                      []     |
-+     gtkspell           |       []    [] []       []    []    [] []     |
-+     gutenprint         |                                               |
-+     hello              | []             []             []              |
-+     help2man           |                                               |
-+     hylafax            |                                               |
-+     idutils            |                                               |
-+     indent             |                                               |
-+     iso_15924          |             [] []                             |
-+     iso_3166           | [] []       () [] [] []    []       []        |
-+     iso_3166_2         |                                               |
-+     iso_4217           |             []                      []        |
-+     iso_639            |                      []    []                 |
-+     iso_639_3          |                            []                 |
-+     jwhois             |                []                             |
-+     kbd                |                                               |
-+     keytouch           |                []                             |
-+     keytouch-editor    |                []                             |
-+     keytouch-keyboa... |                []                             |
-+     klavaro            |                                     []        |
-+     latrine            |                []                             |
-      ld                 |                                               |
--     libc               | [] []                         [] []    []     |
-+     leafpad            | []          [] []                             |
-+     libc               | []                                            |
-+     libexif            |                                               |
-      libextractor       |                                               |
--     libgpewidget       |                                  []           |
--     libgsasl           |                                  []           |
--     libiconv           |                                  []           |
-+     libgnutls          |                               []              |
-+     libgpewidget       |                []             []              |
-+     libgpg-error       |                                               |
-+     libgphoto2         |                                               |
-+     libgphoto2_port    |                                               |
-+     libgsasl           |                                               |
-+     libiconv           |                                               |
-      libidn             |                                               |
--     lifelines          |                                  []           |
--     lilypond           |                                  []           |
--     lingoteach         |                                  []           |
--     lynx               | []                               []           |
--     m4                 | []                               []           |
-+     lifelines          |                                               |
-+     liferea            |                                               |
-+     lilypond           |                                               |
-+     linkdr             |                                               |
-+     lordsawar          |                                               |
-+     lprng              |                                               |
-+     lynx               |                                               |
-+     m4                 |                                               |
-+     mailfromd          |                                               |
-      mailutils          |                                               |
--     make               | [] []                            []           |
--     man-db             | ()                                            |
--     minicom            | []                                            |
--     mysecretdiary      |                                  []           |
--     nano               |                         []    []              |
--     nano_1_0           |                         []    []    []        |
--     opcodes            |                                  []           |
--     parted             | []                                  []        |
--     psmisc             |                               [] []           |
--     ptx                |                               [] []    []     |
-+     make               | []                                            |
-+     man-db             |                                               |
-+     man-db-manpages    |                                               |
-+     minicom            |                                     []        |
-+     mkisofs            |                                               |
-+     myserver           |                                               |
-+     nano               |                               []    []        |
-+     opcodes            |                                               |
-+     parted             |                                               |
-+     pies               |                                               |
-+     popt               | []             []                   []        |
-+     psmisc             |                                               |
-+     pspp               |                                               |
-      pwdutils           |                                               |
--     python             |                                               |
-      radius             |                                               |
--     recode             |                                  []           |
--     rpm                | [] []                                         |
--     screem             | []                                            |
--     scrollkeeper       |                               [] [] []        |
--     sed                | []                               []           |
--     sh-utils           | []                            []              |
--     shared-mime-info   |    []                         [] [] []        |
--     sharutils          | []                               []           |
--     silky              |                                  []           |
-+     recode             |                                               |
-+     rosegarden         |                                               |
-+     rpm                |                                               |
-+     rush               |                                               |
-+     sarg               |                                               |
-+     screem             |                                               |
-+     scrollkeeper       |                                     []     [] |
-+     sed                |                                               |
-+     sharutils          |                                               |
-+     shishi             |                                               |
-      skencil            |                                               |
--     sketch             |                                               |
--     solfege            |                                  []    []     |
-+     solfege            |                                     []        |
-+     solfege-manual     |                                               |
-      soundtracker       |                                               |
--     sp                 | ()                                            |
--     stardict           |                   []             []           |
--     tar                | []                               []           |
--     texinfo            | []                            [] []           |
--     textutils          | [] []                         []              |
-+     sp                 |                                               |
-+     sysstat            |                []                             |
-+     tar                |       []                                      |
-+     texinfo            |                                     []        |
-      tin                |                                               |
--     tp-robot           |                                  []           |
--     tuxpaint           | [] []       []          []       [] []        |
-      unicode-han-tra... |                                               |
-      unicode-transla... |                                               |
--     util-linux         | []                               []           |
--     vorbis-tools       |                                  []           |
--     wastesedge         |                                  []           |
--     wdiff              |                         []    []              |
--     wget               | []                               []           |
--     xchat              |    []          [] []             []           |
--     xkeyboard-config   |                                  []           |
--     xpad               |                                  []           |
-+     util-linux-ng      |                                               |
-+     vice               |                                               |
-+     vmm                |                                               |
-+     vorbis-tools       |                                               |
-+     wastesedge         |                                               |
-+     wdiff              |                                               |
-+     wget               |             []                                |
-+     wyslij-po          |                                               |
-+     xchat              | []             [] []                          |
-+     xdg-user-dirs      | [] []       [] [] []       []       [] []     |
-+     xkeyboard-config   | []    []    []                                |
-                         +-----------------------------------------------+
--                          ja ko ku lg lt lv mk mn ms mt nb nl nn no nso
--                          33 11  1  1  1  2  2  3 11  0 15 96  7  5  0
--
--                          or pa pl pt pt_BR rm ro ru rw sk sl sq sr sv ta
--                        +-------------------------------------------------+
--     GNUnet             |                                                 |
--     a2ps               |       ()     []      [] []       []    [] []    |
--     aegis              |                      () ()                      |
--     ant-phone          |                      []                         |
--     anubis             |       []             [] []                      |
--     ap-utils           |       ()                                        |
--     aspell             |                      [] []                      |
--     bash               |              []      [] []                      |
--     batchelor          |                      []                         |
--     bfd                |                                                 |
--     bibshelf           |                                                 |
--     binutils           |                         []                []    |
--     bison              |       []     []      [] []                []    |
--     bluez-pin          |       []     []   [] [] []    []       [] []    |
--     clisp              |                         []                      |
--     console-tools      |                         []                      |
--     coreutils          |       []                []       []       []    |
--     cpio               |       []                                  []    |
--     cpplib             |                                                 |
--     darkstat           |       []     []      []       []       [] []    |
--     dialog             |       [] []  []   [] [] [] []                   |
--     diffutils          |       []     []      [] []             [] []    |
--     doodle             |                                     []          |
--     e2fsprogs          |       []                                  []    |
--     enscript           |              []      [] []                []    |
--     error              |              []      []       []                |
--     fetchmail          |       []     ()         []    []    []          |
--     fileutils          |       []             [] []       []       []    |
--     findutils          |       [] []          []       []       [] []    |
--     flex               |       []     []      [] []                []    |
--     fslint             |              []      []                []       |
--     gas                |                                                 |
--     gawk               |       []     []      []                   []    |
--     gbiff              |                      []                         |
--     gcal               |                                           []    |
--     gcc                |                                                 |
--     gettext-examples   |       []             [] []    []       [] []    |
--     gettext-runtime    |       []             [] []    [] []    [] []    |
--     gettext-tools      |       []             [] []    [] []    [] []    |
--     gimp-print         |                               []          []    |
--     gip                |                   []          []       []       |
--     gliv               |              []      []       []                |
--     glunarclock        |              []      [] []    []       [] []    |
--     gmult              |              []   [] []                []       |
--     gnubiff            |                      ()                   []    |
--     gnucash            |       () []             []    []          []    |
--     gnucash-glossary   |          []                   []          []    |
--     gpe-aerial         |          []  []      [] []             [] []    |
--     gpe-beam           |          []  []      [] []             [] []    |
--     gpe-calendar       |          []  []      [] []    []       [] []    |
--     gpe-clock          |          []  []      [] []    []       [] []    |
--     gpe-conf           |          []  []      [] []    []          []    |
--     gpe-contacts       |                      [] []                []    |
--     gpe-edit           |          []  []      [] []    []       [] []    |
--     gpe-go             |              []      [] []             [] []    |
--     gpe-login          |          []  []      [] []    []       [] []    |
--     gpe-ownerinfo      |          []  []      [] []    []       [] []    |
--     gpe-sketchbook     |          []  []      [] []    []       [] []    |
--     gpe-su             |          []  []      [] []    []       [] []    |
--     gpe-taskmanager    |          []  []      [] []    []       [] []    |
--     gpe-timesheet      |          []  []      [] []    []       [] []    |
--     gpe-today          |          []  []      [] []    []       [] []    |
--     gpe-todo           |          []  []      [] []    []       [] []    |
--     gphoto2            |                      []       []       [] []    |
--     gprof              |              []      []                   []    |
--     gpsdrive           |                      []                         |
--     gramadoir          |                               []                |
--     grep               |       [] []  []      [] []       []    []       |
--     gretl              |       []                                        |
--     gsasl              |       []             []             [] [] []    |
--     gss                |       []             []                   []    |
--     gst-plugins        | []                                  [] [] []    |
--     gstreamer          |                         []          [] [] []    |
--     gtick              |                      [] []                []    |
--     gtkspell           |              []   [] [] []    []       []       |
--     hello              |       []     []      [] []    []       [] []    |
--     id-utils           |              []      [] []                []    |
--     impost             |                                                 |
--     indent             |              []      [] []    []       [] []    |
--     iso_3166           |          []                []       [] [] []    |
--     iso_3166_1         |                               [] [] [] []       |
--     iso_3166_2         |                                                 |
--     iso_3166_3         |                      []    []          []       |
--     iso_4217           |                            []          []       |
--     iso_639            |                            []          [] []    |
--     jpilot             |                                                 |
--     jtag               |                               []                |
--     jwhois             |       []     []      [] ()                ()    |
--     kbd                |       []             []                   []    |
--     latrine            |                      []                   []    |
--     ld                 |                                           []    |
--     libc               |       []     []         []    []          []    |
--     libextractor       |                      []                         |
--     libgpewidget       |          []  []      []       []       [] []    |
--     libgsasl           |       []             []                []       |
--     libiconv           |       []     []   [] [] []    [] [] [] [] []    |
--     libidn             |       []                                  ()    |
--     lifelines          |       []                                  []    |
--     lilypond           |                                           []    |
--     lingoteach         |              []                                 |
--     lynx               |              []         []                []    |
--     m4                 |       []     []      [] []                []    |
--     mailutils          |       []             [] []                      |
--     make               |       []     []         []                []    |
--     man-db             |                      []                   []    |
--     minicom            |       []     []      [] []                      |
--     mysecretdiary      |              []      [] []                []    |
--     nano               |              []      []                   []    |
--     nano_1_0           |       []             [] []                []    |
--     opcodes            |                      []                   []    |
--     parted             |       [] []  []                           []    |
--     psmisc             |       []             []                         |
--     ptx                |       [] []  []      [] []                []    |
--     pwdutils           |       []                                        |
--     python             |                                                 |
--     radius             |       []                []                      |
--     recode             |       []     []      [] []       []       []    |
--     rpm                |       [] []             []                []    |
--     screem             |                                                 |
--     scrollkeeper       |       []             [] []    []    [] [] []    |
--     sed                |       [] []  []      [] []    []       [] []    |
--     sh-utils           |                         []       []    []       |
--     shared-mime-info   |          []  []                     [] [] []    |
--     sharutils          |                         []             [] []    |
--     silky              |                               []                |
--     skencil            |          []  []                           []    |
--     sketch             |          []  []                           []    |
--     solfege            |                                                 |
--     soundtracker       |                               []          []    |
--     sp                 |                                                 |
--     stardict           |                         []    []                |
--     tar                |       []             [] []                []    |
--     texinfo            |       []             [] []                []    |
--     textutils          |                         []       []       []    |
--     tin                |                                                 |
--     tp-robot           |                         []                      |
--     tuxpaint           |       [] []  []      []       []    [] [] []    |
--     unicode-han-tra... |                                                 |
--     unicode-transla... |                                                 |
--     util-linux         |              []         []                []    |
--     vorbis-tools       |                      [] []                      |
--     wastesedge         |                                                 |
--     wdiff              |       []     []      [] []    []          []    |
--     wget               |       [] []  []      [] []    [] []    [] []    |
--     xchat              |                         []    [] [] [] [] []    |
--     xkeyboard-config   |                                                 |
--     xpad               |                                                 |
--                        +-------------------------------------------------+
--                          or pa pl pt pt_BR rm ro ru rw sk sl sq sr sv ta
--                           1  0 48 30  58    6 79 71  5 45 13 12 50 86  0
-+                          ko ku ky lg lt lv mk ml mn mr ms mt nb nds ne
-+                          20  5 10  1 13 48  4  2  2  4 24 10 20  3   1
- 
--                          tg th tk tr uk ven vi wa xh zh_CN zh_TW zu
--                        +--------------------------------------------+
--     GNUnet             |                                            |  0
--     a2ps               |          [] []     []                      | 19
--     aegis              |                                            |  0
--     ant-phone          |          []                                |  4
--     anubis             |          []                                |  9
--     ap-utils           |             ()                             |  1
--     aspell             |             []     [] []                   | 13
--     bash               |                                            | 10
--     batchelor          |          []        []                      |  7
--     bfd                |                                            |  1
--     bibshelf           |                    []                      |  5
--     binutils           |          []                                |  6
--     bison              |          []                                | 17
--     bluez-pin          |          [] []     [] []     []            | 24
--     clisp              |                                            |  7
--     console-tools      |          []                                |  4
--     coreutils          |          []                                | 16
--     cpio               |          []        []                      |  6
--     cpplib             |          []        []                      |  7
--     darkstat           |                    []        ()    ()      | 15
--     dialog             |          [] []     []                      | 25
--     diffutils          |          []        []        []    []      | 28
--     doodle             |                    []                      |  5
--     e2fsprogs          |          []                                |  8
--     enscript           |          []                                | 12
--     error              |          []        []              []      | 16
--     fetchmail          |          []                                | 12
--     fileutils          |          []                  []    []      | 18
--     findutils          |          []        []                      | 17
--     flex               |          []        []                      | 15
--     fslint             |                    []                      |  7
--     gas                |          []                                |  3
--     gawk               |          []                                | 14
--     gbiff              |                                            |  4
--     gcal               |          []                                |  5
--     gcc                |          []                                |  3
--     gettext-examples   |          [] []     []        []            | 20
--     gettext-runtime    |          [] []     []        []    []      | 25
--     gettext-tools      |          [] []               []            | 17
--     gimp-print         |             []                             | 11
--     gip                |                    []                      |  8
--     gliv               |          []                                |  6
--     glunarclock        |                    [] []                   | 13
--     gmult              |          []        []        []            | 13
--     gnubiff            |                    []                      |  3
--     gnucash            |          ()                        []      | 10
--     gnucash-glossary   |                                    []      |  8
--     gpe-aerial         |                    []        []            | 13
--     gpe-beam           |                    []        []            | 13
--     gpe-calendar       |                    [] []     []    []      | 18
--     gpe-clock          |          []        [] []     []            | 17
--     gpe-conf           |                    []        []            | 12
--     gpe-contacts       |                    []        []            |  6
--     gpe-edit           |          []        [] []           []      | 15
--     gpe-go             |          []        []                      | 11
--     gpe-login          |          []        [] []     []    []      | 18
--     gpe-ownerinfo      |          []        []        []    []      | 19
--     gpe-sketchbook     |          []        []                      | 14
--     gpe-su             |          []        []        []            | 16
--     gpe-taskmanager    |          []        []        []            | 17
--     gpe-timesheet      |          []        []        []    []      | 17
--     gpe-today          |          []        [] []     []    []      | 19
--     gpe-todo           |                    [] []           []      | 16
--     gphoto2            |             []               []            | 17
--     gprof              |          []        []                      | 10
--     gpsdrive           |                                            |  2
--     gramadoir          |                    []                      |  6
--     grep               |          [] []     []              []      | 32
--     gretl              |                                            |  4
--     gsasl              |                    []        []            | 12
--     gss                |                    []                      |  5
--     gst-plugins        |             []     []                      | 16
--     gstreamer          |          [] []     []                      | 14
--     gtick              |                    []                      | 11
--     gtkspell           |                    [] []     []            | 20
--     hello              |          [] []     []        []            | 37
--     id-utils           |          []        []                      | 13
--     impost             |                    []                      |  3
--     indent             |          []        []        []            | 24
--     iso_3166           |       [] []        []                      | 12
--     iso_3166_1         |          []           []                   | 20
--     iso_3166_2         |                                            |  2
--     iso_3166_3         |                       []     []            |  8
--     iso_4217           |          []        []                      | 10
--     iso_639            |                    [] []                   | 12
--     jpilot             |          [] []               []            |  6
--     jtag               |                                            |  2
--     jwhois             |          []        []              []      | 12
--     kbd                |          []        []                      | 12
--     latrine            |          []        []                      |  8
--     ld                 |          []                                |  5
--     libc               |          []                  []            | 22
--     libextractor       |                                            |  1
--     libgpewidget       |                    [] []                   | 17
--     libgsasl           |                    []                      |  7
--     libiconv           |          [] []     [] []     []            | 32
--     libidn             |                    []        []            |  5
--     lifelines          |                                            |  4
--     lilypond           |          []                                |  5
--     lingoteach         |                                            |  5
--     lynx               |          [] []                             | 14
--     m4                 |                    []        []            | 17
--     mailutils          |             []                             |  7
--     make               |          []                  []            | 18
--     man-db             |                                            |  5
--     minicom            |                                            | 11
--     mysecretdiary      |          []        []                      | 12
--     nano               |                                            | 11
--     nano_1_0           |          [] []                             | 17
--     opcodes            |          []                                |  7
--     parted             |          [] []               []            | 17
--     psmisc             |                    []                      |  7
--     ptx                |          []                  []            | 23
--     pwdutils           |                                            |  1
--     python             |                                            |  0
--     radius             |             []                             |  6
--     recode             |          []        []                      | 22
--     rpm                |          [] []                             | 11
--     screem             |                                            |  1
--     scrollkeeper       |          [] []                             | 23
--     sed                |          []        []                      | 19
--     sh-utils           |          []                                | 15
--     shared-mime-info   |             []               []            | 19
--     sharutils          |          []        []              []      | 20
--     silky              |                                            |  3
--     skencil            |                                            |  6
--     sketch             |                                            |  6
--     solfege            |                                            |  4
--     soundtracker       |          []                                |  8
--     sp                 |          []                                |  3
--     stardict           |             []     []        []    []      | 10
--     tar                |          [] []                             | 13
--     texinfo            |          []                  []            | 14
--     textutils          |          []                  []    []      | 17
--     tin                |                                            |  1
--     tp-robot           |                              []    []      |  7
--     tuxpaint           |          []        [] []     []            | 34
--     unicode-han-tra... |                                            |  0
--     unicode-transla... |                                            |  2
--     util-linux         |          [] []                             | 17
--     vorbis-tools       |             []                             | 10
--     wastesedge         |                                            |  1
--     wdiff              |          []        []                      | 22
--     wget               |          [] []               []    []      | 31
--     xchat              |             []     []        []            | 22
--     xkeyboard-config   |                                            |  1
--     xpad               |                    []                      |  5
--                        +--------------------------------------------+
--       72 teams           tg th tk tr uk ven vi wa xh zh_CN zh_TW zu
--      147 domains          0  0  1 78 29  0  71 16  0  41    20    0  1711
-+                          nl  nn or pa pl  ps pt pt_BR ro ru rw sk sl sq sr
-+                        +---------------------------------------------------+
-+     a2ps               | []           []     []  []   [] []       []    [] |
-+     aegis              | []                      []      []                |
-+     ant-phone          |                         []   []                   |
-+     anubis             | []           []                 []                |
-+     aspell             | []                           [] []    [] []       |
-+     bash               | []                                    []          |
-+     bfd                |                                 []                |
-+     bibshelf           | []  []                                            |
-+     binutils           |                                 []    []          |
-+     bison              | []           []                 []                |
-+     bison-runtime      | []           []     []  []   [] []       []       |
-+     bluez-pin          | []           []         []   [] []    [] []    [] |
-+     bombono-dvd        |     []                          ()                |
-+     buzztard           | []  []                                            |
-+     cflow              |              []                                   |
-+     clisp              | []                              []                |
-+     coreutils          | []           []     []  []      []       []       |
-+     cpio               | []           []                 []                |
-+     cppi               |              []                                   |
-+     cpplib             | []                                                |
-+     cryptsetup         | []                                                |
-+     dfarc              |              []                                   |
-+     dialog             | []           []         []      []                |
-+     dico               |              []                                   |
-+     diffutils          | []           []         []   [] []             [] |
-+     dink               | ()                                                |
-+     doodle             | []                                          []    |
-+     e2fsprogs          | []           []                                   |
-+     enscript           | []                      []   [] []       []       |
-+     exif               | []           []              [] ()    []          |
-+     fetchmail          | []           []                 []          []    |
-+     findutils          | []           []     []          []       []       |
-+     flex               | []           []         []   [] []                |
-+     freedink           | []           []                                   |
-+     gas                |                                                   |
-+     gawk               | []           []         []   []                   |
-+     gcal               |                                                   |
-+     gcc                |                                                [] |
-+     gettext-examples   | []           []     []       [] []    [] []    [] |
-+     gettext-runtime    | []  []       []     []       [] []    [] []    [] |
-+     gettext-tools      |              []              [] []    [] []    [] |
-+     gip                | []           []                 []    []       [] |
-+     gjay               |                                                   |
-+     gliv               | []           []         []   [] []    []          |
-+     glunarclock        | []                      []   []       []       [] |
-+     gnubiff            | []                           ()                   |
-+     gnucash            | []           ()         ()      ()                |
-+     gnuedu             | []                                                |
-+     gnulib             | []           []                 []       []       |
-+     gnunet             |                                                   |
-+     gnunet-gtk         |                                                   |
-+     gnutls             | []           []                                   |
-+     gold               |                                                   |
-+     gpe-aerial         | []                  []  []   [] []       []    [] |
-+     gpe-beam           | []                  []  []   [] []       []    [] |
-+     gpe-bluetooth      | []                      []                        |
-+     gpe-calendar       |                         []      []       []    [] |
-+     gpe-clock          | []                  []  []   [] []    [] []    [] |
-+     gpe-conf           | []                  []  []   [] []    [] []       |
-+     gpe-contacts       |                         []   [] []       []    [] |
-+     gpe-edit           | []           []                          []       |
-+     gpe-filemanager    | []                              []       []       |
-+     gpe-go             | []           []         []   [] []    [] []    [] |
-+     gpe-login          | []                      []                        |
-+     gpe-ownerinfo      | []                  []  []   [] []    [] []    [] |
-+     gpe-package        | []                                       []       |
-+     gpe-sketchbook     | []                  []  []   [] []       []    [] |
-+     gpe-su             | []                  []  []   [] []    [] []    [] |
-+     gpe-taskmanager    | []                  []  []   [] []    [] []    [] |
-+     gpe-timesheet      | []                  []  []   [] []    [] []    [] |
-+     gpe-today          | []                  []  []   [] []    [] []    [] |
-+     gpe-todo           | []                      []      []       []    [] |
-+     gphoto2            | []        [] []         []   [] []    []       [] |
-+     gprof              | []                      []   []                   |
-+     gpsdrive           | []                              []                |
-+     gramadoir          | []                                    []          |
-+     grep               | []           []                 []    []          |
-+     grub               | []           []                 []                |
-+     gsasl              | []           []                       []       [] |
-+     gss                |              []              []       []          |
-+     gst-plugins-bad    | []           []         []      []    []    []    |
-+     gst-plugins-base   | []           []         []      []    []          |
-+     gst-plugins-good   | []           []         []      []    []          |
-+     gst-plugins-ugly   | []           []         []      []    [] []       |
-+     gstreamer          | []           []         []      []    []          |
-+     gtick              | []                              []    []          |
-+     gtkam              | []        [] []         []      []    []          |
-+     gtkorphan          | []                                                |
-+     gtkspell           | []           []     []  []   [] []    [] [] [] [] |
-+     gutenprint         | []                              []                |
-+     hello              | []           []                       [] []       |
-+     help2man           |              []                 []                |
-+     hylafax            | []                                                |
-+     idutils            | []           []         []   [] []                |
-+     indent             | []           []         []   [] []    []       [] |
-+     iso_15924          | []           []                 []       []       |
-+     iso_3166           | []  [] [] [] []     ()  []   [] [] [] [] [] [] [] |
-+     iso_3166_2         | []           []                          []       |
-+     iso_4217           | []  []       []     []          [] []    []    [] |
-+     iso_639            | []     [] [] []                 [] [] [] []    [] |
-+     iso_639_3          |        [] []                                      |
-+     jwhois             | []           []         []   []                   |
-+     kbd                | []           []              []                   |
-+     keytouch           | []           []                       []          |
-+     keytouch-editor    | []           []                       []          |
-+     keytouch-keyboa... | []           []                       []          |
-+     klavaro            | []                      []                        |
-+     latrine            |              []                 []                |
-+     ld                 |                                                   |
-+     leafpad            | []  []       []     []  []      []    [] []    [] |
-+     libc               | []           []                 []    []          |
-+     libexif            | []           []         ()            []          |
-+     libextractor       |                                                   |
-+     libgnutls          | []           []                                   |
-+     libgpewidget       | []           []                          []       |
-+     libgpg-error       |              []              []                   |
-+     libgphoto2         | []           []                                   |
-+     libgphoto2_port    | []           []         []      []    []          |
-+     libgsasl           | []           []              []       []       [] |
-+     libiconv           | []           []                       [] []    [] |
-+     libidn             | []           []                                   |
-+     lifelines          | []           []                                   |
-+     liferea            | []           []     []  []   [] ()    ()    []    |
-+     lilypond           | []                                                |
-+     linkdr             | []                  []          []                |
-+     lordsawar          |                                                   |
-+     lprng              |              []                                   |
-+     lynx               | []                      []      []                |
-+     m4                 | []           []         []   [] []                |
-+     mailfromd          |              []                                   |
-+     mailutils          |              []                                   |
-+     make               | []           []         []      []                |
-+     man-db             | []           []                 []                |
-+     man-db-manpages    | []           []                 []                |
-+     minicom            |              []         []   [] []                |
-+     mkisofs            | []           []                 []                |
-+     myserver           |                                                   |
-+     nano               | []           []         []      []                |
-+     opcodes            | []                           []                   |
-+     parted             | []           []                 []    []          |
-+     pies               |              []                                   |
-+     popt               | []           []     []          []                |
-+     psmisc             | []           []                 []                |
-+     pspp               | []                      []                        |
-+     pwdutils           |              []                                   |
-+     radius             | []           []                 []                |
-+     recode             | []           []     []  []   [] []    [] []       |
-+     rosegarden         |              ()                 ()                |
-+     rpm                | []           []     []                            |
-+     rush               | []           []                                   |
-+     sarg               |                                                   |
-+     screem             |                                                   |
-+     scrollkeeper       | []  []       []              [] []    []    [] [] |
-+     sed                | []           []     []  []   [] []    [] []    [] |
-+     sharutils          | []           []                 []             [] |
-+     shishi             |              []                                   |
-+     skencil            |                     []  []                        |
-+     solfege            | []           []         []      []                |
-+     solfege-manual     | []           []         []                        |
-+     soundtracker       |                                       []          |
-+     sp                 |                                                   |
-+     sysstat            | []           []         []      []                |
-+     tar                | []           []                 []       []       |
-+     texinfo            | []           []              [] []                |
-+     tin                |                                 []                |
-+     unicode-han-tra... |                                                   |
-+     unicode-transla... |                                                   |
-+     util-linux-ng      | []           []         []      []       []       |
-+     vice               | []                                                |
-+     vmm                | []                                                |
-+     vorbis-tools       | []           []                                   |
-+     wastesedge         | []                                                |
-+     wdiff              | []           []                                   |
-+     wget               | []           []     []  []      []    [] []       |
-+     wyslij-po          | []  []       []                                   |
-+     xchat              | []        [] []     []          []    [] [] [] [] |
-+     xdg-user-dirs      | []  [] [] [] []  [] []  []   [] []    [] [] [] [] |
-+     xkeyboard-config   | []           []                 []                |
-+                        +---------------------------------------------------+
-+                          nl  nn or pa pl  ps pt pt_BR ro ru rw sk sl sq sr
-+                          135 10  4  7 105  1 29  62   47 91  3 54 46  9 37
-+
-+                          sv  sw ta te tg th tr uk vi  wa zh_CN zh_HK zh_TW
-+                        +---------------------------------------------------+
-+     a2ps               | []              [] [] [] []                       | 27
-+     aegis              |                          []                       |  9
-+     ant-phone          | []                 []    []      []               |  9
-+     anubis             | []                 [] [] []                       | 15
-+     aspell             |                       [] []  []                   | 20
-+     bash               | []                    [] []                       | 12
-+     bfd                |                          []                       |  6
-+     bibshelf           | []                       []      []               | 16
-+     binutils           |                       [] []                       |  8
-+     bison              | []                       []                       | 12
-+     bison-runtime      | []              []    [] []      []          []   | 29
-+     bluez-pin          | []              [] [] [] []  []  []          []   | 37
-+     bombono-dvd        |                          []                       |  4
-+     buzztard           |                          []                       |  7
-+     cflow              |                       [] []      []               |  9
-+     clisp              |                                                   | 10
-+     coreutils          | []                    [] []      []               | 22
-+     cpio               | []                 [] [] []      []          []   | 13
-+     cppi               |                       [] []                       |  5
-+     cpplib             | []                 [] [] []      []          []   | 14
-+     cryptsetup         | []                       []                       |  7
-+     dfarc              |                          []                       |  9
-+     dialog             | []  []          []       []  []  []          []   | 30
-+     dico               |                       []                          |  2
-+     diffutils          | []                 [] [] []      []          []   | 30
-+     dink               |                                                   |  4
-+     doodle             | []                       []                       |  7
-+     e2fsprogs          | []                 []    []                       | 11
-+     enscript           | []                 [] [] []                       | 17
-+     exif               | []                       []      []               | 16
-+     fetchmail          |                    []    []      []               | 17
-+     findutils          | []                 [] [] []      []               | 20
-+     flex               | []                 []    []                  []   | 15
-+     freedink           |                          []                       | 10
-+     gas                |                    []                             |  4
-+     gawk               | []                 []    []      []               | 18
-+     gcal               | []                 []                             |  5
-+     gcc                | []                 []            []               |  7
-+     gettext-examples   | []                 [] [] []      []    []    []   | 34
-+     gettext-runtime    | []                 [] [] []      []    []    []   | 29
-+     gettext-tools      | []                 [] [] []      []          []   | 22
-+     gip                | []                       []      []          []   | 22
-+     gjay               |                          []                       |  3
-+     gliv               | []                 []    []                       | 14
-+     glunarclock        | []                       []  []  []          []   | 19
-+     gnubiff            | []                       []                       |  4
-+     gnucash            |                    () [] ()      []          ()   | 10
-+     gnuedu             |                          []                  []   |  7
-+     gnulib             | []                    [] []      []               | 16
-+     gnunet             |                          []                       |  1
-+     gnunet-gtk         | []                 []    []                       |  5
-+     gnutls             | []                       []      []               | 10
-+     gold               |                          []                       |  4
-+     gpe-aerial         | []                       []      []               | 18
-+     gpe-beam           | []                       []      []               | 19
-+     gpe-bluetooth      | []                       []      []               | 13
-+     gpe-calendar       | []                       []  []  []               | 12
-+     gpe-clock          | []                 []    []  []  []               | 28
-+     gpe-conf           | []                       []  []  []               | 20
-+     gpe-contacts       | []                       []      []               | 17
-+     gpe-edit           | []                       []      []               | 12
-+     gpe-filemanager    | []                       []  []  []               | 16
-+     gpe-go             | []                 []    []  []  []               | 25
-+     gpe-login          | []                       []      []               | 11
-+     gpe-ownerinfo      | []                 []    []      []          []   | 25
-+     gpe-package        | []                       []      []               | 13
-+     gpe-sketchbook     | []                       []      []               | 20
-+     gpe-su             | []                 []    []  []  []               | 30
-+     gpe-taskmanager    | []                 []    []  []  []               | 29
-+     gpe-timesheet      | []                 []    []      []          []   | 25
-+     gpe-today          | []                 []    []  []  []          []   | 30
-+     gpe-todo           | []                       []  []  []               | 17
-+     gphoto2            | []                    [] []      []          []   | 24
-+     gprof              | []                 []    []                       | 15
-+     gpsdrive           | []                       []      []               | 11
-+     gramadoir          | []                       []      []               | 11
-+     grep               |                 []       []      []               | 10
-+     grub               | []                       []      []               | 14
-+     gsasl              | []                       []      []          []   | 14
-+     gss                | []                       []      []               | 11
-+     gst-plugins-bad    | []                 []    []      []               | 26
-+     gst-plugins-base   | []                 [] [] []      []               | 24
-+     gst-plugins-good   | []                 []    []      []               | 24
-+     gst-plugins-ugly   | []                 [] [] []      []               | 29
-+     gstreamer          | []                    [] []      []               | 22
-+     gtick              |                       [] []      []               | 13
-+     gtkam              | []                       []      []               | 20
-+     gtkorphan          | []                       []      []               | 14
-+     gtkspell           | []              [] [] [] []  []  []    []    []   | 45
-+     gutenprint         | []                                                | 10
-+     hello              | []              [] []    []      []          []   | 21
-+     help2man           | []                       []                       |  7
-+     hylafax            |                          []                       |  5
-+     idutils            | []                 []    []      []               | 17
-+     indent             | []                 [] [] []      []          []   | 30
-+     iso_15924          |                 ()    [] ()      []          []   | 16
-+     iso_3166           | []        []    () [] [] ()  []  []    []    ()   | 53
-+     iso_3166_2         |                 ()    [] ()      []               |  9
-+     iso_4217           | []              () [] [] ()      []    []         | 26
-+     iso_639            | []     [] []    ()    [] ()  []  []    []    []   | 38
-+     iso_639_3          |        []                ()                       |  8
-+     jwhois             | []                 []    []      []          []   | 16
-+     kbd                | []                 [] [] []      []               | 15
-+     keytouch           | []                       []      []               | 16
-+     keytouch-editor    | []                       []      []               | 14
-+     keytouch-keyboa... | []                       []      []               | 14
-+     klavaro            |                          []                       | 11
-+     latrine            |                    []    []      []               | 10
-+     ld                 | []                 []    []                  []   | 11
-+     leafpad            | []                 [] [] []      []          []   | 33
-+     libc               | []                 []    []      []          []   | 21
-+     libexif            |                          []      ()               |  7
-+     libextractor       |                          []                       |  1
-+     libgnutls          | []                       []      []               |  9
-+     libgpewidget       | []                       []      []               | 14
-+     libgpg-error       | []                       []      []               |  9
-+     libgphoto2         |                       [] []                       |  8
-+     libgphoto2_port    | []                    [] []                  []   | 14
-+     libgsasl           | []                       []      []               | 13
-+     libiconv           | []                       []  []  []               | 21
-+     libidn             | ()                       []      []               | 11
-+     lifelines          | []                                                |  4
-+     liferea            | []                 []            []               | 21
-+     lilypond           |                          []                       |  7
-+     linkdr             | []                 []    []      []          []   | 17
-+     lordsawar          |                                                   |  1
-+     lprng              |                          []                       |  3
-+     lynx               | []                 [] [] []                       | 17
-+     m4                 | []                       []      []          []   | 19
-+     mailfromd          |                       [] []                       |  3
-+     mailutils          |                          []                       |  5
-+     make               | []                 []    []      []               | 21
-+     man-db             | []                       []      []               |  8
-+     man-db-manpages    |                                                   |  4
-+     minicom            | []                       []                       | 16
-+     mkisofs            |                          []      []               |  9
-+     myserver           |                                                   |  0
-+     nano               | []                       []      []          []   | 21
-+     opcodes            | []                 []    []                       | 11
-+     parted             | []                 [] [] []                  []   | 15
-+     pies               |                       [] []                       |  3
-+     popt               | []              [] []    []      []          []   | 27
-+     psmisc             | []                       []                       | 11
-+     pspp               |                                                   |  4
-+     pwdutils           | []                       []                       |  6
-+     radius             |                       [] []                       |  9
-+     recode             | []                 []    []      []               | 28
-+     rosegarden         | ()                                                |  0
-+     rpm                | []                       []                  []   | 11
-+     rush               |                       [] []                       |  4
-+     sarg               |                                                   |  1
-+     screem             |                          []                       |  3
-+     scrollkeeper       | []                 [] [] []                  []   | 27
-+     sed                | []                 []    []      []          []   | 30
-+     sharutils          | []                 []    []      []          []   | 22
-+     shishi             |                          []                       |  3
-+     skencil            | []                       []                       |  7
-+     solfege            | []                 []    []      []               | 16
-+     solfege-manual     |                    []                             |  8
-+     soundtracker       | []                 []    []                       |  9
-+     sp                 |                    []                             |  3
-+     sysstat            |                          []      []               | 15
-+     tar                | []                 [] [] []      []          []   | 23
-+     texinfo            | []                 [] [] []      []               | 17
-+     tin                |                                                   |  4
-+     unicode-han-tra... |                                                   |  0
-+     unicode-transla... |                                                   |  2
-+     util-linux-ng      | []                 [] [] []                       | 20
-+     vice               | ()                 ()                             |  1
-+     vmm                |                          []                       |  4
-+     vorbis-tools       |                          []                       |  6
-+     wastesedge         |                                                   |  2
-+     wdiff              | []                       []                       |  7
-+     wget               | []                 []    []      []          []   | 26
-+     wyslij-po          |                       [] []                       |  8
-+     xchat              | []              []    [] []      []          []   | 36
-+     xdg-user-dirs      | []     [] []    [] [] [] []      []    []    []   | 63
-+     xkeyboard-config   | []                    [] []                       | 22
-+                        +---------------------------------------------------+
-+       85 teams           sv  sw ta te tg th tr uk vi  wa zh_CN zh_HK zh_TW
-+      178 domains         119  1  3  3  0 10 65 51 155 17  98     7    41    2618
- 
-    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
-@@ -960,12 +1256,12 @@
- lag between the mere existence a PO file and its wide availability in a
- distribution.
- 
--   If April 2005 seems to be old, you may fetch a more recent copy of
-+   If June 2010 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'.
-+`http://translationproject.org/extra/matrix.html'.
- 
--1.6 Using `gettext' in new packages
-+1.5 Using `gettext' in new packages
- ===================================
- 
- If you are writing a freely available program and want to
-@@ -981,6 +1277,6 @@
- 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 at iro.umontreal.ca' to make the `.pot' files available to
--the translation teams.
-+`coordinator at translationproject.org' to make the `.pot' files available
-+to the translation teams.
- 
- AC_DEFUN([AC_LIB_READLINE], [
-diff -urN BUILD/abook-0.6.0pre2/aclocal.m4 abook/aclocal.m4
---- BUILD/abook-0.6.0pre2/aclocal.m4	2006-09-05 10:19:33.000000000 +0200
-+++ abook/aclocal.m4	2013-03-13 15:07:45.000000000 +0100
-@@ -1,7 +1,8 @@
--# generated automatically by aclocal 1.9.3 -*- Autoconf -*-
-+# generated automatically by aclocal 1.11.6 -*- Autoconf -*-
- 
--# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004
--# Free Software Foundation, Inc.
-+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-+# 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation,
-+# Inc.
- # This file is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -11,55 +12,62 @@
- # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- # PARTICULAR PURPOSE.
- 
--#                                                        -*- Autoconf -*-
--# Copyright (C) 2002, 2003  Free Software Foundation, Inc.
--# Generated from amversion.in; do not edit by hand.
--
--# 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, or (at your option)
--# any later version.
-+m4_ifndef([AC_AUTOCONF_VERSION],
-+  [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
-+m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.69],,
-+[m4_warning([this file was generated for autoconf 2.69.
-+You have another version of autoconf.  It may work, but is not guaranteed to.
-+If you have problems, you may need to regenerate the build system entirely.
-+To do so, use the procedure documented by the package, typically `autoreconf'.])])
- 
--# 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
-+# Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008, 2011 Free Software
-+# Foundation, Inc.
-+#
-+# This file is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
-+
-+# serial 1
- 
- # AM_AUTOMAKE_VERSION(VERSION)
- # ----------------------------
- # Automake X.Y traces this macro to ensure aclocal.m4 has been
- # generated from the m4 files accompanying Automake X.Y.
--AC_DEFUN([AM_AUTOMAKE_VERSION], [am__api_version="1.9"])
-+# (This private macro should not be called outside this file.)
-+AC_DEFUN([AM_AUTOMAKE_VERSION],
-+[am__api_version='1.11'
-+dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
-+dnl require some minimum version.  Point them to the right macro.
-+m4_if([$1], [1.11.6], [],
-+      [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
-+])
-+
-+# _AM_AUTOCONF_VERSION(VERSION)
-+# -----------------------------
-+# aclocal traces this macro to find the Autoconf version.
-+# This is a private macro too.  Using m4_define simplifies
-+# the logic in aclocal, which can simply ignore this definition.
-+m4_define([_AM_AUTOCONF_VERSION], [])
- 
- # AM_SET_CURRENT_AUTOMAKE_VERSION
- # -------------------------------
--# Call AM_AUTOMAKE_VERSION so it can be traced.
--# This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
-+# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
-+# This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
- AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
--	 [AM_AUTOMAKE_VERSION([1.9.3])])
--
--# AM_AUX_DIR_EXPAND
-+[AM_AUTOMAKE_VERSION([1.11.6])dnl
-+m4_ifndef([AC_AUTOCONF_VERSION],
-+  [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
-+_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
- 
--# Copyright (C) 2001, 2003 Free Software Foundation, Inc.
-+# AM_AUX_DIR_EXPAND                                         -*- Autoconf -*-
- 
--# 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, or (at your option)
--# any later version.
-+# Copyright (C) 2001, 2003, 2005, 2011 Free Software Foundation, Inc.
-+#
-+# This file is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
- 
--# 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.
-+# serial 1
- 
- # For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets
- # $ac_aux_dir to `$srcdir/foo'.  In other projects, it is set to
-@@ -106,26 +114,16 @@
- am_aux_dir=`cd $ac_aux_dir && pwd`
- ])
- 
--# AM_CONDITIONAL                                              -*- Autoconf -*-
--
--# Copyright (C) 1997, 2000, 2001, 2003, 2004 Free Software Foundation, Inc.
-+# AM_CONDITIONAL                                            -*- Autoconf -*-
- 
--# 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, 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.
-+# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005, 2006, 2008
-+# Free Software Foundation, Inc.
-+#
-+# This file is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
- 
--# serial 6
-+# serial 9
- 
- # AM_CONDITIONAL(NAME, SHELL-CONDITION)
- # -------------------------------------
-@@ -134,8 +132,11 @@
- [AC_PREREQ(2.52)dnl
-  ifelse([$1], [TRUE],  [AC_FATAL([$0: invalid condition: $1])],
- 	[$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl
--AC_SUBST([$1_TRUE])
--AC_SUBST([$1_FALSE])
-+AC_SUBST([$1_TRUE])dnl
-+AC_SUBST([$1_FALSE])dnl
-+_AM_SUBST_NOTMAKE([$1_TRUE])dnl
-+_AM_SUBST_NOTMAKE([$1_FALSE])dnl
-+m4_define([_AM_COND_VALUE_$1], [$2])dnl
- if $2; then
-   $1_TRUE=
-   $1_FALSE='#'
-@@ -149,26 +150,14 @@
- Usually this means the macro was only invoked conditionally.]])
- fi])])
- 
--# serial 7						-*- Autoconf -*-
--
--# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004
--# Free Software Foundation, Inc.
--
--# 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, 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.
-+# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2009,
-+# 2010, 2011 Free Software Foundation, Inc.
-+#
-+# This file is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
- 
-+# serial 12
- 
- # There are a few dirty hacks below to avoid letting `AC_PROG_CC' be
- # written in clear, in which case automake, when reading aclocal.m4,
-@@ -177,7 +166,6 @@
- # CC etc. in the Makefile, will ask for an AC_PROG_CC use...
- 
- 
--
- # _AM_DEPENDENCIES(NAME)
- # ----------------------
- # See how the compiler implements dependency checking.
-@@ -197,6 +185,7 @@
- ifelse([$1], CC,   [depcc="$CC"   am_compiler_list=],
-        [$1], CXX,  [depcc="$CXX"  am_compiler_list=],
-        [$1], OBJC, [depcc="$OBJC" am_compiler_list='gcc3 gcc'],
-+       [$1], UPC,  [depcc="$UPC"  am_compiler_list=],
-        [$1], GCJ,  [depcc="$GCJ"  am_compiler_list='gcc3 gcc'],
-                    [depcc="$$1"   am_compiler_list=])
- 
-@@ -208,6 +197,7 @@
-   # instance it was reported that on HP-UX the gcc test will end up
-   # making a dummy file named `D' -- because `-MD' means `put the output
-   # in D'.
-+  rm -rf conftest.dir
-   mkdir conftest.dir
-   # Copy depcomp to subdir because otherwise we won't find it if we're
-   # using a relative directory.
-@@ -225,6 +215,16 @@
-   if test "$am_compiler_list" = ""; then
-      am_compiler_list=`sed -n ['s/^#*\([a-zA-Z0-9]*\))$/\1/p'] < ./depcomp`
-   fi
-+  am__universal=false
-+  m4_case([$1], [CC],
-+    [case " $depcc " in #(
-+     *\ -arch\ *\ -arch\ *) am__universal=true ;;
-+     esac],
-+    [CXX],
-+    [case " $depcc " in #(
-+     *\ -arch\ *\ -arch\ *) am__universal=true ;;
-+     esac])
-+
-   for depmode in $am_compiler_list; do
-     # Setup a source with many dependencies, because some compilers
-     # like to wrap large dependency lists on column 80 (with \), and
-@@ -242,7 +242,17 @@
-     done
-     echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
- 
-+    # We check with `-c' and `-o' for the sake of the "dashmstdout"
-+    # mode.  It turns out that the SunPro C++ compiler does not properly
-+    # handle `-M -o', and we need to detect this.  Also, some Intel
-+    # versions had trouble with output in subdirs
-+    am__obj=sub/conftest.${OBJEXT-o}
-+    am__minus_obj="-o $am__obj"
-     case $depmode in
-+    gcc)
-+      # This depmode causes a compiler race in universal mode.
-+      test "$am__universal" = false || continue
-+      ;;
-     nosideeffect)
-       # after this tag, mechanisms are not by side-effect, so they'll
-       # only be used when explicitly requested
-@@ -252,18 +262,23 @@
- 	break
-       fi
-       ;;
-+    msvc7 | msvc7msys | msvisualcpp | msvcmsys)
-+      # This compiler won't grok `-c -o', but also, the minuso test has
-+      # not run yet.  These depmodes are late enough in the game, and
-+      # so weak that their functioning should not be impacted.
-+      am__obj=conftest.${OBJEXT-o}
-+      am__minus_obj=
-+      ;;
-     none) break ;;
-     esac
--    # We check with `-c' and `-o' for the sake of the "dashmstdout"
--    # mode.  It turns out that the SunPro C++ compiler does not properly
--    # handle `-M -o', and we need to detect this.
-     if depmode=$depmode \
--       source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \
-+       source=sub/conftest.c object=$am__obj \
-        depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
--       $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \
-+       $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \
-          >/dev/null 2>conftest.err &&
-+       grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
-        grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
--       grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
-+       grep $am__obj sub/conftest.Po > /dev/null 2>&1 &&
-        ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
-       # icc doesn't choke on unknown options, it will just issue warnings
-       # or remarks (even with -Werror).  So we grep stderr for any message
-@@ -312,74 +327,79 @@
- if test "x$enable_dependency_tracking" != xno; then
-   am_depcomp="$ac_aux_dir/depcomp"
-   AMDEPBACKSLASH='\'
-+  am__nodep='_no'
- fi
- AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno])
--AC_SUBST([AMDEPBACKSLASH])
-+AC_SUBST([AMDEPBACKSLASH])dnl
-+_AM_SUBST_NOTMAKE([AMDEPBACKSLASH])dnl
-+AC_SUBST([am__nodep])dnl
-+_AM_SUBST_NOTMAKE([am__nodep])dnl
- ])
- 
--# Generate code to set up dependency tracking.   -*- Autoconf -*-
--
--# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004
--#   Free Software Foundation, Inc.
--
--# 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, or (at your option)
--# any later version.
-+# Generate code to set up dependency tracking.              -*- Autoconf -*-
- 
--# 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.
-+# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2008
-+# Free Software Foundation, Inc.
-+#
-+# This file is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
- 
--#serial 2
-+#serial 5
- 
- # _AM_OUTPUT_DEPENDENCY_COMMANDS
- # ------------------------------
- AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
--[for mf in $CONFIG_FILES; do
--  # Strip MF so we end up with the name of the file.
--  mf=`echo "$mf" | sed -e 's/:.*$//'`
--  # Check whether this is an Automake generated Makefile or not.
--  # We used to match only the files named `Makefile.in', but
--  # some people rename them; so instead we look at the file content.
--  # Grep'ing the first line is not enough: some people post-process
--  # each Makefile.in and add a new line on top of each file to say so.
--  # So let's grep whole file.
--  if grep '^#.*generated by automake' $mf > /dev/null 2>&1; then
--    dirpart=`AS_DIRNAME("$mf")`
--  else
--    continue
--  fi
--  # Extract the definition of DEPDIR, am__include, and am__quote
--  # from the Makefile without running `make'.
--  DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
--  test -z "$DEPDIR" && continue
--  am__include=`sed -n 's/^am__include = //p' < "$mf"`
--  test -z "am__include" && continue
--  am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
--  # When using ansi2knr, U may be empty or an underscore; expand it
--  U=`sed -n 's/^U = //p' < "$mf"`
--  # Find all dependency output files, they are included files with
--  # $(DEPDIR) in their names.  We invoke sed twice because it is the
--  # simplest approach to changing $(DEPDIR) to its actual value in the
--  # expansion.
--  for file in `sed -n "
--    s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
--       sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
--    # Make sure the directory exists.
--    test -f "$dirpart/$file" && continue
--    fdir=`AS_DIRNAME(["$file"])`
--    AS_MKDIR_P([$dirpart/$fdir])
--    # echo "creating $dirpart/$file"
--    echo '# dummy' > "$dirpart/$file"
-+[{
-+  # Autoconf 2.62 quotes --file arguments for eval, but not when files
-+  # are listed without --file.  Let's play safe and only enable the eval
-+  # if we detect the quoting.
-+  case $CONFIG_FILES in
-+  *\'*) eval set x "$CONFIG_FILES" ;;
-+  *)   set x $CONFIG_FILES ;;
-+  esac
-+  shift
-+  for mf
-+  do
-+    # Strip MF so we end up with the name of the file.
-+    mf=`echo "$mf" | sed -e 's/:.*$//'`
-+    # Check whether this is an Automake generated Makefile or not.
-+    # We used to match only the files named `Makefile.in', but
-+    # some people rename them; so instead we look at the file content.
-+    # Grep'ing the first line is not enough: some people post-process
-+    # each Makefile.in and add a new line on top of each file to say so.
-+    # Grep'ing the whole file is not good either: AIX grep has a line
-+    # limit of 2048, but all sed's we know have understand at least 4000.
-+    if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then
-+      dirpart=`AS_DIRNAME("$mf")`
-+    else
-+      continue
-+    fi
-+    # Extract the definition of DEPDIR, am__include, and am__quote
-+    # from the Makefile without running `make'.
-+    DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
-+    test -z "$DEPDIR" && continue
-+    am__include=`sed -n 's/^am__include = //p' < "$mf"`
-+    test -z "am__include" && continue
-+    am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
-+    # When using ansi2knr, U may be empty or an underscore; expand it
-+    U=`sed -n 's/^U = //p' < "$mf"`
-+    # Find all dependency output files, they are included files with
-+    # $(DEPDIR) in their names.  We invoke sed twice because it is the
-+    # simplest approach to changing $(DEPDIR) to its actual value in the
-+    # expansion.
-+    for file in `sed -n "
-+      s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
-+	 sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
-+      # Make sure the directory exists.
-+      test -f "$dirpart/$file" && continue
-+      fdir=`AS_DIRNAME(["$file"])`
-+      AS_MKDIR_P([$dirpart/$fdir])
-+      # echo "creating $dirpart/$file"
-+      echo '# dummy' > "$dirpart/$file"
-+    done
-   done
--done
-+}
- ])# _AM_OUTPUT_DEPENDENCY_COMMANDS
- 
- 
-@@ -396,55 +416,20 @@
-      [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"])
- ])
- 
--# Like AC_CONFIG_HEADER, but automatically create stamp file. -*- Autoconf -*-
-+# Do all the work for Automake.                             -*- Autoconf -*-
- 
--# Copyright (C) 1996, 1997, 2000, 2001, 2003 Free Software Foundation, Inc.
--
--# 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, 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.
--
--# serial 7
--
--# AM_CONFIG_HEADER is obsolete.  It has been replaced by AC_CONFIG_HEADERS.
--AU_DEFUN([AM_CONFIG_HEADER], [AC_CONFIG_HEADERS($@)])
-+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-+# 2005, 2006, 2008, 2009 Free Software Foundation, Inc.
-+#
-+# This file is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
- 
--# Do all the work for Automake.                            -*- Autoconf -*-
-+# serial 16
- 
--# This macro actually does too much some checks are only needed if
-+# This macro actually does too much.  Some checks are only needed if
- # your package does certain things.  But this isn't really a big deal.
- 
--# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004
--# Free Software Foundation, Inc.
--
--# 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, 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.
--
--# serial 11
--
- # AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE])
- # AM_INIT_AUTOMAKE([OPTIONS])
- # -----------------------------------------------
-@@ -457,16 +442,20 @@
- # arguments mandatory, and then we can depend on a new Autoconf
- # release and drop the old call support.
- AC_DEFUN([AM_INIT_AUTOMAKE],
--[AC_PREREQ([2.58])dnl
-+[AC_PREREQ([2.62])dnl
- dnl Autoconf wants to disallow AM_ names.  We explicitly allow
- dnl the ones we care about.
- m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl
- AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl
- AC_REQUIRE([AC_PROG_INSTALL])dnl
--# test to see if srcdir already configured
--if test "`cd $srcdir && pwd`" != "`pwd`" &&
--   test -f $srcdir/config.status; then
--  AC_MSG_ERROR([source directory already configured; run "make distclean" there first])
-+if test "`cd $srcdir && pwd`" != "`pwd`"; then
-+  # Use -I$(srcdir) only when $(srcdir) != ., so that make's output
-+  # is not polluted with repeated "-I."
-+  AC_SUBST([am__isrc], [' -I$(srcdir)'])_AM_SUBST_NOTMAKE([am__isrc])dnl
-+  # test to see if srcdir already configured
-+  if test -f $srcdir/config.status; then
-+    AC_MSG_ERROR([source directory already configured; run "make distclean" there first])
-+  fi
- fi
- 
- # test whether we have cygpath
-@@ -486,6 +475,9 @@
-  AC_SUBST([PACKAGE], [$1])dnl
-  AC_SUBST([VERSION], [$2])],
- [_AM_SET_OPTIONS([$1])dnl
-+dnl Diagnose old-style AC_INIT with new-style AM_AUTOMAKE_INIT.
-+m4_if(m4_ifdef([AC_PACKAGE_NAME], 1)m4_ifdef([AC_PACKAGE_VERSION], 1), 11,,
-+  [m4_fatal([AC_INIT should be called with package and version arguments])])dnl
-  AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl
-  AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl
- 
-@@ -501,8 +493,8 @@
- AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version})
- AM_MISSING_PROG(AUTOHEADER, autoheader)
- AM_MISSING_PROG(MAKEINFO, makeinfo)
--AM_PROG_INSTALL_SH
--AM_PROG_INSTALL_STRIP
-+AC_REQUIRE([AM_PROG_INSTALL_SH])dnl
-+AC_REQUIRE([AM_PROG_INSTALL_STRIP])dnl
- AC_REQUIRE([AM_PROG_MKDIR_P])dnl
- # We need awk for the "check" target.  The system "awk" is bad on
- # some platforms.
-@@ -510,19 +502,36 @@
- AC_REQUIRE([AC_PROG_MAKE_SET])dnl
- AC_REQUIRE([AM_SET_LEADING_DOT])dnl
- _AM_IF_OPTION([tar-ustar], [_AM_PROG_TAR([ustar])],
--              [_AM_IF_OPTION([tar-pax], [_AM_PROG_TAR([pax])],
--	      		     [_AM_PROG_TAR([v7])])])
-+	      [_AM_IF_OPTION([tar-pax], [_AM_PROG_TAR([pax])],
-+			     [_AM_PROG_TAR([v7])])])
- _AM_IF_OPTION([no-dependencies],,
- [AC_PROVIDE_IFELSE([AC_PROG_CC],
--                  [_AM_DEPENDENCIES(CC)],
--                  [define([AC_PROG_CC],
--                          defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl
-+		  [_AM_DEPENDENCIES(CC)],
-+		  [define([AC_PROG_CC],
-+			  defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl
- AC_PROVIDE_IFELSE([AC_PROG_CXX],
--                  [_AM_DEPENDENCIES(CXX)],
--                  [define([AC_PROG_CXX],
--                          defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl
--])
--])
-+		  [_AM_DEPENDENCIES(CXX)],
-+		  [define([AC_PROG_CXX],
-+			  defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl
-+AC_PROVIDE_IFELSE([AC_PROG_OBJC],
-+		  [_AM_DEPENDENCIES(OBJC)],
-+		  [define([AC_PROG_OBJC],
-+			  defn([AC_PROG_OBJC])[_AM_DEPENDENCIES(OBJC)])])dnl
-+])
-+_AM_IF_OPTION([silent-rules], [AC_REQUIRE([AM_SILENT_RULES])])dnl
-+dnl The `parallel-tests' driver may need to know about EXEEXT, so add the
-+dnl `am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen.  This macro
-+dnl is hooked onto _AC_COMPILER_EXEEXT early, see below.
-+AC_CONFIG_COMMANDS_PRE(dnl
-+[m4_provide_if([_AM_COMPILER_EXEEXT],
-+  [AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])])])dnl
-+])
-+
-+dnl Hook into `_AC_COMPILER_EXEEXT' early to learn its expansion.  Do not
-+dnl add the conditional right here, as _AC_COMPILER_EXEEXT may be further
-+dnl mangled by Autoconf and run in a shell conditional statement.
-+m4_define([_AC_COMPILER_EXEEXT],
-+m4_defn([_AC_COMPILER_EXEEXT])[m4_provide([_AM_COMPILER_EXEEXT])])
- 
- 
- # When config.status generates a header, we must update the stamp-h file.
-@@ -534,62 +543,49 @@
- # our stamp files there.
- AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK],
- [# Compute $1's index in $config_headers.
-+_am_arg=$1
- _am_stamp_count=1
- for _am_header in $config_headers :; do
-   case $_am_header in
--    $1 | $1:* )
-+    $_am_arg | $_am_arg:* )
-       break ;;
-     * )
-       _am_stamp_count=`expr $_am_stamp_count + 1` ;;
-   esac
- done
--echo "timestamp for $1" >`AS_DIRNAME([$1])`/stamp-h[]$_am_stamp_count])
-+echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count])
-+
-+# Copyright (C) 2001, 2003, 2005, 2008, 2011 Free Software Foundation,
-+# Inc.
-+#
-+# This file is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
-+
-+# serial 1
- 
- # AM_PROG_INSTALL_SH
- # ------------------
- # Define $install_sh.
--
--# Copyright (C) 2001, 2003 Free Software Foundation, Inc.
--
--# 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, 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.
--
- AC_DEFUN([AM_PROG_INSTALL_SH],
- [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
--install_sh=${install_sh-"$am_aux_dir/install-sh"}
-+if test x"${install_sh}" != xset; then
-+  case $am_aux_dir in
-+  *\ * | *\	*)
-+    install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;;
-+  *)
-+    install_sh="\${SHELL} $am_aux_dir/install-sh"
-+  esac
-+fi
- AC_SUBST(install_sh)])
- 
--#                                                          -*- Autoconf -*-
--# Copyright (C) 2003  Free Software Foundation, Inc.
--
--# 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, 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.
-+# Copyright (C) 2003, 2005  Free Software Foundation, Inc.
-+#
-+# This file is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
- 
--# serial 1
-+# serial 2
- 
- # Check whether the underlying file-system supports filenames
- # with a leading dot.  For instance MS-DOS doesn't.
-@@ -604,26 +600,15 @@
- rmdir .tst 2>/dev/null
- AC_SUBST([am__leading_dot])])
- 
--# Check to see how 'make' treats includes.	-*- Autoconf -*-
--
--# Copyright (C) 2001, 2002, 2003 Free Software Foundation, Inc.
-+# Check to see how 'make' treats includes.	            -*- Autoconf -*-
- 
--# 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, 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.
-+# Copyright (C) 2001, 2002, 2003, 2005, 2009  Free Software Foundation, Inc.
-+#
-+# This file is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
- 
--# serial 2
-+# serial 4
- 
- # AM_MAKE_INCLUDE()
- # -----------------
-@@ -632,7 +617,7 @@
- [am_make=${MAKE-make}
- cat > confinc << 'END'
- am__doit:
--	@echo done
-+	@echo this is the am__doit target
- .PHONY: am__doit
- END
- # If we don't find an include directive, just comment out the code.
-@@ -642,24 +627,24 @@
- _am_result=none
- # First try GNU make style include.
- echo "include confinc" > confmf
--# We grep out `Entering directory' and `Leaving directory'
--# messages which can occur if `w' ends up in MAKEFLAGS.
--# In particular we don't look at `^make:' because GNU make might
--# be invoked under some other name (usually "gmake"), in which
--# case it prints its new name instead of `make'.
--if test "`$am_make -s -f confmf 2> /dev/null | grep -v 'ing directory'`" = "done"; then
--   am__include=include
--   am__quote=
--   _am_result=GNU
--fi
-+# Ignore all kinds of additional output from `make'.
-+case `$am_make -s -f confmf 2> /dev/null` in #(
-+*the\ am__doit\ target*)
-+  am__include=include
-+  am__quote=
-+  _am_result=GNU
-+  ;;
-+esac
- # Now try BSD make style include.
- if test "$am__include" = "#"; then
-    echo '.include "confinc"' > confmf
--   if test "`$am_make -s -f confmf 2> /dev/null`" = "done"; then
--      am__include=.include
--      am__quote="\""
--      _am_result=BSD
--   fi
-+   case `$am_make -s -f confmf 2> /dev/null` in #(
-+   *the\ am__doit\ target*)
-+     am__include=.include
-+     am__quote="\""
-+     _am_result=BSD
-+     ;;
-+   esac
- fi
- AC_SUBST([am__include])
- AC_SUBST([am__quote])
-@@ -667,27 +652,16 @@
- rm -f confinc confmf
- ])
- 
--#  -*- Autoconf -*-
-+# Fake the existence of programs that GNU maintainers use.  -*- Autoconf -*-
- 
-+# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2004, 2005, 2008
-+# Free Software Foundation, Inc.
-+#
-+# This file is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
- 
--# Copyright (C) 1997, 1999, 2000, 2001, 2003 Free Software Foundation, Inc.
--
--# 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, 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.
--
--# serial 3
-+# serial 6
- 
- # AM_MISSING_PROG(NAME, PROGRAM)
- # ------------------------------
-@@ -703,7 +677,15 @@
- # If it does, set am_missing_run to use it, otherwise, to nothing.
- AC_DEFUN([AM_MISSING_HAS_RUN],
- [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
--test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing"
-+AC_REQUIRE_AUX_FILE([missing])dnl
-+if test x"${MISSING+set}" != xset; then
-+  case $am_aux_dir in
-+  *\ * | *\	*)
-+    MISSING="\${SHELL} \"$am_aux_dir/missing\"" ;;
-+  *)
-+    MISSING="\${SHELL} $am_aux_dir/missing" ;;
-+  esac
-+fi
- # Use eval to expand $SHELL
- if eval "$MISSING --run true"; then
-   am_missing_run="$MISSING --run "
-@@ -713,100 +695,45 @@
- fi
- ])
- 
--# AM_PROG_MKDIR_P
--# ---------------
--# Check whether `mkdir -p' is supported, fallback to mkinstalldirs otherwise.
--
--# Copyright (C) 2003, 2004 Free Software Foundation, Inc.
-+# Copyright (C) 2003, 2004, 2005, 2006, 2011 Free Software Foundation,
-+# Inc.
-+#
-+# This file is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
- 
--# 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, or (at your option)
--# any later version.
-+# serial 1
- 
--# 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.
--
--# Automake 1.8 used `mkdir -m 0755 -p --' to ensure that directories
--# created by `make install' are always world readable, even if the
--# installer happens to have an overly restrictive umask (e.g. 077).
--# This was a mistake.  There are at least two reasons why we must not
--# use `-m 0755':
--#   - it causes special bits like SGID to be ignored,
--#   - it may be too restrictive (some setups expect 775 directories).
--#
--# Do not use -m 0755 and let people choose whatever they expect by
--# setting umask.
--#
--# We cannot accept any implementation of `mkdir' that recognizes `-p'.
--# Some implementations (such as Solaris 8's) are not thread-safe: if a
--# parallel make tries to run `mkdir -p a/b' and `mkdir -p a/c'
--# concurrently, both version can detect that a/ is missing, but only
--# one can create it and the other will error out.  Consequently we
--# restrict ourselves to GNU make (using the --version option ensures
--# this.)
-+# AM_PROG_MKDIR_P
-+# ---------------
-+# Check for `mkdir -p'.
- AC_DEFUN([AM_PROG_MKDIR_P],
--[if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then
--  # We used to keeping the `.' as first argument, in order to
--  # allow $(mkdir_p) to be used without argument.  As in
--  #   $(mkdir_p) $(somedir)
--  # where $(somedir) is conditionally defined.  However this is wrong
--  # for two reasons:
--  #  1. if the package is installed by a user who cannot write `.'
--  #     make install will fail,
--  #  2. the above comment should most certainly read
--  #     $(mkdir_p) $(DESTDIR)$(somedir)
--  #     so it does not work when $(somedir) is undefined and
--  #     $(DESTDIR) is not.
--  #  To support the latter case, we have to write
--  #     test -z "$(somedir)" || $(mkdir_p) $(DESTDIR)$(somedir),
--  #  so the `.' trick is pointless.
--  mkdir_p='mkdir -p --'
--else
--  # On NextStep and OpenStep, the `mkdir' command does not
--  # recognize any option.  It will interpret all options as
--  # directories to create, and then abort because `.' already
--  # exists.
--  for d in ./-p ./--version;
--  do
--    test -d $d && rmdir $d
--  done
--  # $(mkinstalldirs) is defined by Automake if mkinstalldirs exists.
--  if test -f "$ac_aux_dir/mkinstalldirs"; then
--    mkdir_p='$(mkinstalldirs)'
--  else
--    mkdir_p='$(install_sh) -d'
--  fi
--fi
--AC_SUBST([mkdir_p])])
--
--# Helper functions for option handling.                    -*- Autoconf -*-
--
--# Copyright (C) 2001, 2002, 2003  Free Software Foundation, Inc.
-+[AC_PREREQ([2.60])dnl
-+AC_REQUIRE([AC_PROG_MKDIR_P])dnl
-+dnl Automake 1.8 to 1.9.6 used to define mkdir_p.  We now use MKDIR_P,
-+dnl while keeping a definition of mkdir_p for backward compatibility.
-+dnl @MKDIR_P@ is magic: AC_OUTPUT adjusts its value for each Makefile.
-+dnl However we cannot define mkdir_p as $(MKDIR_P) for the sake of
-+dnl Makefile.ins that do not define MKDIR_P, so we do our own
-+dnl adjustment using top_builddir (which is defined more often than
-+dnl MKDIR_P).
-+AC_SUBST([mkdir_p], ["$MKDIR_P"])dnl
-+case $mkdir_p in
-+  [[\\/$]]* | ?:[[\\/]]*) ;;
-+  */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;;
-+esac
-+])
- 
--# 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, or (at your option)
--# any later version.
-+# Helper functions for option handling.                     -*- Autoconf -*-
- 
--# 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.
-+# Copyright (C) 2001, 2002, 2003, 2005, 2008, 2010 Free Software
-+# Foundation, Inc.
-+#
-+# This file is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
- 
--# serial 2
-+# serial 5
- 
- # _AM_MANGLE_OPTION(NAME)
- # -----------------------
-@@ -814,16 +741,16 @@
- [[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])])
- 
- # _AM_SET_OPTION(NAME)
--# ------------------------------
-+# --------------------
- # Set option NAME.  Presently that only means defining a flag for this option.
- AC_DEFUN([_AM_SET_OPTION],
- [m4_define(_AM_MANGLE_OPTION([$1]), 1)])
- 
- # _AM_SET_OPTIONS(OPTIONS)
--# ----------------------------------
-+# ------------------------
- # OPTIONS is a space-separated list of Automake options.
- AC_DEFUN([_AM_SET_OPTIONS],
--[AC_FOREACH([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])])
-+[m4_foreach_w([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])])
- 
- # _AM_IF_OPTION(OPTION, IF-SET, [IF-NOT-SET])
- # -------------------------------------------
-@@ -831,29 +758,19 @@
- AC_DEFUN([_AM_IF_OPTION],
- [m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])
- 
--
--# Copyright (C) 1996, 1997, 1998, 2000, 2001, 2002, 2003
-+# Copyright (C) 1996, 1997, 1998, 2000, 2001, 2002, 2003, 2005, 2006
- # Free Software Foundation, Inc.
-+#
-+# This file is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
- 
--# 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, 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.
--
--# serial 3
-+# serial 5
- 
- AC_DEFUN([AM_C_PROTOTYPES],
- [AC_REQUIRE([AC_C_PROTOTYPES])
-+AC_DIAGNOSE([obsolete],
-+            [$0: automatic de-ANSI-fication support is deprecated])
- if test "$ac_cv_prog_cc_stdc" != no; then
-   U= ANSI2KNR=
- else
-@@ -861,35 +778,24 @@
- fi
- # Ensure some checks needed by ansi2knr itself.
- AC_REQUIRE([AC_HEADER_STDC])
--AC_CHECK_HEADERS(string.h)
--AC_SUBST(U)dnl
--AC_SUBST(ANSI2KNR)dnl
-+AC_CHECK_HEADERS([string.h])
-+AC_SUBST([U])dnl
-+AC_SUBST([ANSI2KNR])dnl
-+_AM_SUBST_NOTMAKE([ANSI2KNR])dnl
- ])
- 
- AU_DEFUN([fp_C_PROTOTYPES], [AM_C_PROTOTYPES])
- 
--#
--# Check to make sure that the build environment is sane.
--#
--
--# Copyright (C) 1996, 1997, 2000, 2001, 2003 Free Software Foundation, Inc.
-+# Check to make sure that the build environment is sane.    -*- Autoconf -*-
- 
--# 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, 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.
-+# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005, 2008
-+# Free Software Foundation, Inc.
-+#
-+# This file is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
- 
--# serial 3
-+# serial 5
- 
- # AM_SANITY_CHECK
- # ---------------
-@@ -898,16 +804,29 @@
- # Just in case
- sleep 1
- echo timestamp > conftest.file
-+# Reject unsafe characters in $srcdir or the absolute working directory
-+# name.  Accept space and tab only in the latter.
-+am_lf='
-+'
-+case `pwd` in
-+  *[[\\\"\#\$\&\'\`$am_lf]]*)
-+    AC_MSG_ERROR([unsafe absolute working directory name]);;
-+esac
-+case $srcdir in
-+  *[[\\\"\#\$\&\'\`$am_lf\ \	]]*)
-+    AC_MSG_ERROR([unsafe srcdir value: `$srcdir']);;
-+esac
-+
- # Do `set' in a subshell so we don't clobber the current shell's
- # arguments.  Must try -L first in case configure is actually a
- # symlink; some systems play weird games with the mod time of symlinks
- # (eg FreeBSD returns the mod time of the symlink's containing
- # directory).
- if (
--   set X `ls -Lt $srcdir/configure conftest.file 2> /dev/null`
-+   set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`
-    if test "$[*]" = "X"; then
-       # -L didn't work.
--      set X `ls -t $srcdir/configure conftest.file`
-+      set X `ls -t "$srcdir/configure" conftest.file`
-    fi
-    rm -f conftest.file
-    if test "$[*]" != "X $srcdir/configure conftest.file" \
-@@ -932,25 +851,16 @@
- fi
- AC_MSG_RESULT(yes)])
- 
--# AM_PROG_INSTALL_STRIP
--
--# Copyright (C) 2001, 2003 Free Software Foundation, Inc.
--
--# 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, or (at your option)
--# any later version.
-+# Copyright (C) 2001, 2003, 2005, 2011 Free Software Foundation, Inc.
-+#
-+# This file is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
- 
--# 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.
-+# serial 1
- 
-+# AM_PROG_INSTALL_STRIP
-+# ---------------------
- # One issue with vendor `install' (even GNU) is that you can't
- # specify the program used to strip binaries.  This is especially
- # annoying in cross-compiling environments, where the build's strip
-@@ -968,30 +878,37 @@
- if test "$cross_compiling" != no; then
-   AC_CHECK_TOOL([STRIP], [strip], :)
- fi
--INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s"
-+INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
- AC_SUBST([INSTALL_STRIP_PROGRAM])])
- 
--# Check how to create a tarball.                            -*- Autoconf -*-
-+# Copyright (C) 2006, 2008, 2010 Free Software Foundation, Inc.
-+#
-+# This file is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
- 
--# Copyright (C) 2004  Free Software Foundation, Inc.
-+# serial 3
- 
--# 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, or (at your option)
--# any later version.
-+# _AM_SUBST_NOTMAKE(VARIABLE)
-+# ---------------------------
-+# Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in.
-+# This macro is traced by Automake.
-+AC_DEFUN([_AM_SUBST_NOTMAKE])
-+
-+# AM_SUBST_NOTMAKE(VARIABLE)
-+# --------------------------
-+# Public sister of _AM_SUBST_NOTMAKE.
-+AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)])
- 
--# 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.
-+# Check how to create a tarball.                            -*- Autoconf -*-
- 
--# serial 1
-+# Copyright (C) 2004, 2005, 2012 Free Software Foundation, Inc.
-+#
-+# This file is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
- 
-+# serial 2
- 
- # _AM_PROG_TAR(FORMAT)
- # --------------------
-@@ -1007,10 +924,11 @@
- # a tarball read from stdin.
- #     $(am__untar) < result.tar
- AC_DEFUN([_AM_PROG_TAR],
--[# Always define AMTAR for backward compatibility.
--AM_MISSING_PROG([AMTAR], [tar])
-+[# Always define AMTAR for backward compatibility.  Yes, it's still used
-+# in the wild :-(  We should find a proper way to deprecate it ...
-+AC_SUBST([AMTAR], ['$${TAR-tar}'])
- m4_if([$1], [v7],
--     [am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'],
-+     [am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'],
-      [m4_case([$1], [ustar],, [pax],,
-               [m4_fatal([Unknown tar format])])
- AC_MSG_CHECKING([how to create a $1 tar archive])
-@@ -1079,32 +997,13 @@
- AC_SUBST([am__untar])
- ]) # _AM_PROG_TAR
- 
--m4_include([m4/codeset.m4])
- m4_include([m4/gettext.m4])
--m4_include([m4/glibc2.m4])
--m4_include([m4/glibc21.m4])
- m4_include([m4/iconv.m4])
--m4_include([m4/intdiv0.m4])
--m4_include([m4/intmax.m4])
--m4_include([m4/inttypes-pri.m4])
--m4_include([m4/inttypes.m4])
--m4_include([m4/inttypes_h.m4])
--m4_include([m4/lcmessage.m4])
-+m4_include([m4/intlmacosx.m4])
- m4_include([m4/lib-ld.m4])
- m4_include([m4/lib-link.m4])
- m4_include([m4/lib-prefix.m4])
--m4_include([m4/longdouble.m4])
--m4_include([m4/longlong.m4])
- m4_include([m4/nls.m4])
- m4_include([m4/po.m4])
--m4_include([m4/printf-posix.m4])
- m4_include([m4/progtest.m4])
--m4_include([m4/signed.m4])
--m4_include([m4/size_max.m4])
--m4_include([m4/stdint_h.m4])
--m4_include([m4/uintmax_t.m4])
--m4_include([m4/ulonglong.m4])
--m4_include([m4/wchar_t.m4])
--m4_include([m4/wint_t.m4])
--m4_include([m4/xsize.m4])
- m4_include([acinclude.m4])
-diff -urN BUILD/abook-0.6.0pre2/AUTHORS abook/AUTHORS
---- BUILD/abook-0.6.0pre2/AUTHORS	2006-08-30 12:32:15.000000000 +0200
-+++ abook/AUTHORS	2013-03-13 15:07:45.000000000 +0100
-@@ -26,3 +26,21 @@
-  - palmcsv export filter
-  - fixes
- 
-+Michael Krolikowski	<mkroli at yahoo.de>
-+ - built-in vcard import filter
-+
-+Raphaël Droz	     	<raphael.droz+floss at gmail.com>
-+ - custom output format
-+ - reworked ldif input/output
-+ - vcard import filter through libvformat
-+ - fixes
-+
-+Thorsten Wißmann	<edu at thorsten-wissmann.de>
-+ - color support
-+ - mouse support
-+
-+Fabio Zanini		<fabio.zanini at fastmail.fm>
-+ - merge entries
-+ - duplicated entries removal
-+ - mutt "groups"
-+ - fixes
-diff -urN BUILD/abook-0.6.0pre2/ChangeLog abook/ChangeLog
---- BUILD/abook-0.6.0pre2/ChangeLog	2006-09-06 15:22:53.000000000 +0200
-+++ abook/ChangeLog	2013-03-13 15:07:45.000000000 +0100
-@@ -1,11 +1,24 @@
-+git
-+ - custom output format (Raphaël Droz)
-+ - remove duplicates (Fabio Zanini)
-+ - merge entries (Fabio Zanini)
-+ - mutt groups support (Fabio Zanini)
-+ - vcard initial input filter (Michael Krolikowski)
-+ - vcard parser improvements (Fabio Zanini, Raphaël Droz)
-+ - color support (Thorsten Wißmann)
-+ - mouse support (Thorsten Wißmann)
-+ - extra-fields deletion bugfix (Jorrit Tijben)
-+ - additinal keybinding (Hagen Fuchs)
-+ - autotools update (Fabio Zanini)
-+ - case-sensitive ldif fields parsing (Christian Brabandt)
-+ - ldif standard input support (Raphaël Droz)
-+ - ldif extensible field management rewritting (Raphaël Droz)
-+
- 0.6.0
-  - configurable views (Cedric Duval)
-  - new field types, lists and improved custom field support (Cedric Duval)
-  - index_format option (Cedric Duval)
-  - Italian translation (Claudio Stazzone)
-- - BSD calendar export filter (Guillem Jover)
-- - translation updates
-- - bugfixes
- 
- 0.5.6
-  - translation fixes
-diff -urN BUILD/abook-0.6.0pre2/color.h abook/color.h
---- BUILD/abook-0.6.0pre2/color.h	1970-01-01 01:00:00.000000000 +0100
-+++ abook/color.h	2013-03-13 15:07:45.000000000 +0100
-@@ -0,0 +1,21 @@
-+
-+#ifndef __ABOOK_COLORS_H_
-+#define __ABOOK_COLORS_H_
-+
-+#define COLOR_DEFAULT -1
-+
-+enum {
-+	CP_HEADER = 1,
-+	CP_FOOTER,
-+	CP_LIST_EVEN,
-+	CP_LIST_ODD,
-+	CP_LIST_HEADER,
-+	CP_LIST_HIGHLIGHT,
-+	CP_TAB_BORDER,
-+	CP_TAB_LABEL,
-+	CP_FIELD_NAME,
-+	CP_FIELD_VALUE,
-+};
-+
-+#endif
-+
-diff -urN BUILD/abook-0.6.0pre2/config.guess abook/config.guess
---- BUILD/abook-0.6.0pre2/config.guess	2006-08-04 22:18:23.000000000 +0200
-+++ abook/config.guess	2013-03-13 15:07:45.000000000 +0100
-@@ -1,9 +1,10 @@
- #! /bin/sh
- # Attempt to guess a canonical system name.
- #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
--#   2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
-+#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
-+#   2011, 2012 Free Software Foundation, Inc.
- 
--timestamp='2006-02-23'
-+timestamp='2012-09-25'
- 
- # This file is free software; you can redistribute it and/or modify it
- # under the terms of the GNU General Public License as published by
-@@ -16,9 +17,7 @@
- # 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., 51 Franklin Street - Fifth Floor, Boston, MA
--# 02110-1301, USA.
-+# along with this program; if not, see <http://www.gnu.org/licenses/>.
- #
- # As a special exception to the GNU General Public License, if you
- # distribute this file as part of a program that contains a
-@@ -26,16 +25,16 @@
- # the same distribution terms that you use for the rest of that program.
- 
- 
--# Originally written by Per Bothner <per at bothner.com>.
--# Please send patches to <config-patches at gnu.org>.  Submit a context
--# diff and a properly formatted ChangeLog entry.
-+# Originally written by Per Bothner.  Please send patches (context
-+# diff format) to <config-patches at gnu.org> and include a ChangeLog
-+# entry.
- #
- # This script attempts to guess a canonical system name similar to
- # config.sub.  If it succeeds, it prints the system name on stdout, and
- # exits with 0.  Otherwise, it exits with 1.
- #
--# The plan is that this can be called by configure scripts if you
--# don't specify an explicit build system type.
-+# You can get the latest version of this script from:
-+# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
- 
- me=`echo "$0" | sed -e 's,.*/,,'`
- 
-@@ -55,7 +54,8 @@
- GNU config.guess ($timestamp)
- 
- Originally written by Per Bothner.
--Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
-+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
-+2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012
- Free Software Foundation, Inc.
- 
- This is free software; see the source for copying conditions.  There is NO
-@@ -138,12 +138,35 @@
- UNAME_SYSTEM=`(uname -s) 2>/dev/null`  || UNAME_SYSTEM=unknown
- UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
- 
-+case "${UNAME_SYSTEM}" in
-+Linux|GNU/*)
-+	eval $set_cc_for_build
-+	cat <<-EOF > $dummy.c
-+	#include <features.h>
-+	#ifdef __UCLIBC__
-+	# ifdef __UCLIBC_CONFIG_VERSION__
-+	LIBC=uclibc __UCLIBC_CONFIG_VERSION__
-+	# else
-+	LIBC=uclibc
-+	# endif
-+	#else
-+	# ifdef __dietlibc__
-+	LIBC=dietlibc
-+	# else
-+	LIBC=gnu
-+	# endif
-+	#endif
-+	EOF
-+	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'`
-+	;;
-+esac
-+
- # Note: order is significant - the case branches are not exclusive.
- 
- case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
-     *:NetBSD:*:*)
- 	# NetBSD (nbsd) targets should (where applicable) match one or
--	# more of the tupples: *-*-netbsdelf*, *-*-netbsdaout*,
-+	# more of the tuples: *-*-netbsdelf*, *-*-netbsdaout*,
- 	# *-*-netbsdecoff* and *-*-netbsd*.  For targets that recently
- 	# switched to ELF, *-*-netbsd* would select the old
- 	# object file format.  This provides both forward
-@@ -160,6 +183,7 @@
- 	    arm*) machine=arm-unknown ;;
- 	    sh3el) machine=shl-unknown ;;
- 	    sh3eb) machine=sh-unknown ;;
-+	    sh5el) machine=sh5le-unknown ;;
- 	    *) machine=${UNAME_MACHINE_ARCH}-unknown ;;
- 	esac
- 	# The Operating System including object format, if it has switched
-@@ -168,7 +192,7 @@
- 	    arm*|i386|m68k|ns32k|sh3*|sparc|vax)
- 		eval $set_cc_for_build
- 		if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \
--			| grep __ELF__ >/dev/null
-+			| grep -q __ELF__
- 		then
- 		    # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout).
- 		    # Return netbsd for either.  FIX?
-@@ -178,7 +202,7 @@
- 		fi
- 		;;
- 	    *)
--	        os=netbsd
-+		os=netbsd
- 		;;
- 	esac
- 	# The OS release
-@@ -199,6 +223,10 @@
- 	# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
- 	echo "${machine}-${os}${release}"
- 	exit ;;
-+    *:Bitrig:*:*)
-+	UNAME_MACHINE_ARCH=`arch | sed 's/Bitrig.//'`
-+	echo ${UNAME_MACHINE_ARCH}-unknown-bitrig${UNAME_RELEASE}
-+	exit ;;
-     *:OpenBSD:*:*)
- 	UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'`
- 	echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE}
-@@ -210,7 +238,7 @@
- 	echo ${UNAME_MACHINE}-unknown-solidbsd${UNAME_RELEASE}
- 	exit ;;
-     macppc:MirBSD:*:*)
--	echo powerppc-unknown-mirbsd${UNAME_RELEASE}
-+	echo powerpc-unknown-mirbsd${UNAME_RELEASE}
- 	exit ;;
-     *:MirBSD:*:*)
- 	echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE}
-@@ -221,7 +249,7 @@
- 		UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'`
- 		;;
- 	*5.*)
--	        UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'`
-+		UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'`
- 		;;
- 	esac
- 	# According to Compaq, /usr/sbin/psrinfo has been available on
-@@ -267,7 +295,10 @@
- 	# A Xn.n version is an unreleased experimental baselevel.
- 	# 1.2 uses "1.2" for uname -r.
- 	echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
--	exit ;;
-+	# Reset EXIT trap before exiting to avoid spurious non-zero exit code.
-+	exitcode=$?
-+	trap '' 0
-+	exit $exitcode ;;
-     Alpha\ *:Windows_NT*:*)
- 	# How do we know it's Interix rather than the generic POSIX subsystem?
- 	# Should we change UNAME_MACHINE based on the output of uname instead
-@@ -293,12 +324,12 @@
- 	echo s390-ibm-zvmoe
- 	exit ;;
-     *:OS400:*:*)
--        echo powerpc-ibm-os400
-+	echo powerpc-ibm-os400
- 	exit ;;
-     arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
- 	echo arm-acorn-riscix${UNAME_RELEASE}
- 	exit ;;
--    arm:riscos:*:*|arm:RISCOS:*:*)
-+    arm*:riscos:*:*|arm*:RISCOS:*:*)
- 	echo arm-unknown-riscos
- 	exit ;;
-     SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*)
-@@ -322,14 +353,33 @@
- 	case `/usr/bin/uname -p` in
- 	    sparc) echo sparc-icl-nx7; exit ;;
<Skipped 59355 lines>
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/abook.git/commitdiff/38ed68e91e7c46318dc43573a3892fcc59cfa933



More information about the pld-cvs-commit mailing list