urls for license notices

git-svn-id: svn://tug.org/texlive/trunk@7842 c570f23f-e606-0410-a88d-b1316a301751

54 files changed, 316 insertions, 394 deletions

diff --git a/Build/source/texk/kpathsea/ChangeLog b/Build/source/texk/kpathsea/ChangeLog
index 86126102dcc..c195c3fbfd9 100644
--- a/Build/source/texk/kpathsea/ChangeLog
+++ b/Build/source/texk/kpathsea/ChangeLog
@@ -1,3 +1,8 @@
+2008-05-04  Karl Berry  <karl@tug.org>
+
+	* finish changing license notices to use FSF url instead of
+	physical address, other minor consistency changes.
+
 2008-05-01  Karl Berry  <karl@tug.org>
 
 	* tex-file.c (ALT_SOURCES_SUFFIXES): new macro (.dtx, .ins).
diff --git a/Build/source/texk/kpathsea/absolute.c b/Build/source/texk/kpathsea/absolute.c
index 1a51a433cf9..b25ecc919d4 100644
--- a/Build/source/texk/kpathsea/absolute.c
+++ b/Build/source/texk/kpathsea/absolute.c
@@ -1,4 +1,4 @@
-/* absolute.c: Test if a filename is absolute or explicitly relative.
+/* absolute.c: test if a filename is absolute or explicitly relative.
 
    Copyright 1993, 1994, 1995, 2008 Karl Berry.
    Copyright 1997, 2002, 2005 Olaf Weber.
diff --git a/Build/source/texk/kpathsea/absolute.h b/Build/source/texk/kpathsea/absolute.h
index 6ead3e6fc62..54a44778d78 100644
--- a/Build/source/texk/kpathsea/absolute.h
+++ b/Build/source/texk/kpathsea/absolute.h
@@ -1,4 +1,4 @@
-/* absolute.h: Declare absolute filename predicate.
+/* absolute.h: declare absolute filename predicate.
 
    Copyright 1993, 1994, 2008 Karl Berry.
    Copyright 1999, 2005 Olaf Weber.
diff --git a/Build/source/texk/kpathsea/c-ctype.h b/Build/source/texk/kpathsea/c-ctype.h
index bd6ec7e8fa8..793f617be84 100644
--- a/Build/source/texk/kpathsea/c-ctype.h
+++ b/Build/source/texk/kpathsea/c-ctype.h
@@ -1,7 +1,7 @@
 /* c-ctype.h: ASCII-safe versions of the <ctype.h> macros.
 
-   Copyright 1992, 1994, 2008 Karl Berry
-   Copyright 1998, 2000, 2005 Olaf Weber
+   Copyright 1992, 1994, 2008 Karl Berry.
+   Copyright 1998, 2000, 2005 Olaf Weber.
 
    This library is free software; you can redistribute it and/or
    modify it under the terms of the GNU Lesser General Public
diff --git a/Build/source/texk/kpathsea/c-dir.h b/Build/source/texk/kpathsea/c-dir.h
index c9efab45533..ae177faf31e 100644
--- a/Build/source/texk/kpathsea/c-dir.h
+++ b/Build/source/texk/kpathsea/c-dir.h
@@ -1,7 +1,7 @@
 /* c-dir.h: directory headers.
 
    Copyright 1992, 1993, 1994, 2008 Karl Berry.
-   Copyright 1998, 2005 Olaf Weber
+   Copyright 1998, 2005 Olaf Weber.
 
    This library is free software; you can redistribute it and/or
    modify it under the terms of the GNU Lesser General Public
diff --git a/Build/source/texk/kpathsea/c-errno.h b/Build/source/texk/kpathsea/c-errno.h
index 01d01c69983..27380ec39a1 100644
--- a/Build/source/texk/kpathsea/c-errno.h
+++ b/Build/source/texk/kpathsea/c-errno.h
@@ -1,7 +1,7 @@
 /* c-errno.h: <errno.h> and the errno variable.
 
    Copyright 1992, 2008 Karl Berry.
-   Copyright 2005 Olaf Weber
+   Copyright 2005 Olaf Weber.
 
    This library is free software; you can redistribute it and/or
    modify it under the terms of the GNU Lesser General Public
diff --git a/Build/source/texk/kpathsea/c-std.h b/Build/source/texk/kpathsea/c-std.h
index 5faa3cf3676..980c115901f 100644
--- a/Build/source/texk/kpathsea/c-std.h
+++ b/Build/source/texk/kpathsea/c-std.h
@@ -1,7 +1,7 @@
 /* c-std.h: the first header files.
 
    Copyright 1992, 1993, 1994, 1995, 1996, 1997, 2008 Karl Berry.
-   Copyright 1999, 2005 Olaf Weber
+   Copyright 1999, 2005 Olaf Weber.
 
    This library is free software; you can redistribute it and/or
    modify it under the terms of the GNU Lesser General Public
diff --git a/Build/source/texk/kpathsea/c-vararg.h b/Build/source/texk/kpathsea/c-vararg.h
index 9205ec43610..c704795193b 100644
--- a/Build/source/texk/kpathsea/c-vararg.h
+++ b/Build/source/texk/kpathsea/c-vararg.h
@@ -1,4 +1,4 @@
-/* c-vararg.h: Top layer for stdarg and varargs.
+/* c-vararg.h: top layer for stdarg and varargs.
 
    Copyright 1993, 2008 Karl Berry.
    Copyright 1998, 2005 Olaf Weber.
diff --git a/Build/source/texk/kpathsea/concatn.c b/Build/source/texk/kpathsea/concatn.c
index b4d1b8bd0b0..216eedfdf7d 100644
--- a/Build/source/texk/kpathsea/concatn.c
+++ b/Build/source/texk/kpathsea/concatn.c
@@ -1,4 +1,4 @@
-/* concatn.c: Concatenate an arbitrary number of strings.
+/* concatn.c: concatenate an arbitrary number of strings.
 
    Copyright 1999, 2005 Olaf Weber.
    Copyright 1993, 1995, 2008 Karl Berry.
diff --git a/Build/source/texk/kpathsea/debug.c b/Build/source/texk/kpathsea/debug.c
index 18de9642a2e..a8a178f6839 100644
--- a/Build/source/texk/kpathsea/debug.c
+++ b/Build/source/texk/kpathsea/debug.c
@@ -1,4 +1,4 @@
-/* debug.c: Help the user discover what's going on.
+/* debug.c: help the user discover what's going on.
 
    Copyright 1993, 1994, 2008 Karl Berry.
 
diff --git a/Build/source/texk/kpathsea/debug.h b/Build/source/texk/kpathsea/debug.h
index 058c98f36f6..89299d1d0ff 100644
--- a/Build/source/texk/kpathsea/debug.h
+++ b/Build/source/texk/kpathsea/debug.h
@@ -1,4 +1,4 @@
-/* debug.h: Runtime tracing.
+/* debug.h: runtime tracing.
 
    Copyright 1993, 1994, 1995, 1996, 2008 Karl Berry.
    Copyright 1999, 2005 Olaf Weber.
diff --git a/Build/source/texk/kpathsea/default.h b/Build/source/texk/kpathsea/default.h
index 24ea9aff3c8..90e9fa6d4ac 100644
--- a/Build/source/texk/kpathsea/default.h
+++ b/Build/source/texk/kpathsea/default.h
@@ -1,4 +1,4 @@
-/* default.h: Declare default path expander.
+/* default.h: declare default path expander.
 
    Copyright 1993, 1994, 2008 Karl Berry.
 
diff --git a/Build/source/texk/kpathsea/dir.c b/Build/source/texk/kpathsea/dir.c
index a55f142c711..4ad1c46ce8f 100644
--- a/Build/source/texk/kpathsea/dir.c
+++ b/Build/source/texk/kpathsea/dir.c
@@ -1,7 +1,7 @@
 /* dir.c: directory operations.
 
    Copyright 1992, 1993, 1994, 1995, 2008 Karl Berry.
-   Copyright 2000, 2002, 2005 Olaf Weber
+   Copyright 2000, 2002, 2005 Olaf Weber.
 
    This library is free software; you can redistribute it and/or
    modify it under the terms of the GNU Lesser General Public
diff --git a/Build/source/texk/kpathsea/elt-dirs.c b/Build/source/texk/kpathsea/elt-dirs.c
index 853a4f1c054..0243b305ae8 100644
--- a/Build/source/texk/kpathsea/elt-dirs.c
+++ b/Build/source/texk/kpathsea/elt-dirs.c
@@ -1,4 +1,4 @@
-/* elt-dirs.c: Translate a path element to its corresponding director{y,ies}.
+/* elt-dirs.C: Translate a path element to its corresponding director{y,ies}.
 
    Copyright 1993, 1994, 1995, 1996, 1997, 2008 Karl Berry.
    Copyright 1997, 1998, 1999, 2000, 2005 Olaf Weber.
diff --git a/Build/source/texk/kpathsea/kdefault.c b/Build/source/texk/kpathsea/kdefault.c
index 2dff72778a1..b5fa764a4ea 100644
--- a/Build/source/texk/kpathsea/kdefault.c
+++ b/Build/source/texk/kpathsea/kdefault.c
@@ -1,4 +1,4 @@
-/* kdefault.c: Expand extra colons.
+/* kdefault.c: expand extra colons.
    (This is not named default.c because then the OSF/1 make tries to
    make a program `default' from it, since we have a target `default';
    and OSF/1 make doesn't understand .PHONY.)
diff --git a/Build/source/texk/kpathsea/kpsewhich.c b/Build/source/texk/kpathsea/kpsewhich.c
index 8965dfcd972..7e5005270c0 100644
--- a/Build/source/texk/kpathsea/kpsewhich.c
+++ b/Build/source/texk/kpathsea/kpsewhich.c
@@ -1,7 +1,7 @@
 /* kpsewhich -- standalone path lookup and variable expansion for Kpathsea.
    Ideas from Thomas Esser, Pierre MacKay, and many others.
 
-   Copyright (C) 1995-2008 Karl Berry & Olaf Weber.
+   Copyright 1995-2008 Karl Berry & Olaf Weber.
 
    This library is free software; you can redistribute it and/or
    modify it under the terms of the GNU Lesser General Public
diff --git a/Build/source/texk/kpathsea/path-elt.c b/Build/source/texk/kpathsea/path-elt.c
index 388a6d264cf..ff022966d4f 100644
--- a/Build/source/texk/kpathsea/path-elt.c
+++ b/Build/source/texk/kpathsea/path-elt.c
@@ -1,4 +1,4 @@
-/* path-elt.c: Return the stuff between colons.
+/* path-elt.c: return the stuff between colons.
 
    Copyright 1993, 1996 2008 Karl Berry.
    Copyright 1997, 2001, 2005 Olaf Weber.
diff --git a/Build/source/texk/kpathsea/readable.h b/Build/source/texk/kpathsea/readable.h
index 0c17f76e7f0..2276babe3ea 100644
--- a/Build/source/texk/kpathsea/readable.h
+++ b/Build/source/texk/kpathsea/readable.h
@@ -1,4 +1,4 @@
-/* readable.h: Is a file readable?
+/* readable.h: is a file readable?
 
    Copyright 1993, 2008 Karl Berry.
    Copyright 1999, 2005 Olaf Weber.
diff --git a/Build/source/texk/kpathsea/str-list.h b/Build/source/texk/kpathsea/str-list.h
index ba00c42c77e..c57e95512a6 100644
--- a/Build/source/texk/kpathsea/str-list.h
+++ b/Build/source/texk/kpathsea/str-list.h
@@ -1,4 +1,4 @@
-/* str-list.h: Declarations for string lists.
+/* str-list.h: declarations for string lists.
 
    Copyright 1993, 1994, 2007, 2008 Karl Berry.
    Copyright 1999, 2005 Olaf Weber.
diff --git a/Build/source/texk/kpathsea/str-llist.c b/Build/source/texk/kpathsea/str-llist.c
index 85b99815c79..3221a739b2d 100644
--- a/Build/source/texk/kpathsea/str-llist.c
+++ b/Build/source/texk/kpathsea/str-llist.c
@@ -1,6 +1,6 @@
-/* str-llist.c: Implementation of a linked list of strings.
+/* str-llist.c: implementation of a linked list of strings.
 
-   Copyright (C) 1993, 2008 Karl Berry.
+   Copyright 1993, 2008 Karl Berry.
 
    This library is free software; you can redistribute it and/or
    modify it under the terms of the GNU Lesser General Public
diff --git a/Build/source/texk/kpathsea/str-llist.h b/Build/source/texk/kpathsea/str-llist.h
index 4e0f88073e1..8aeee2e4aec 100644
--- a/Build/source/texk/kpathsea/str-llist.h
+++ b/Build/source/texk/kpathsea/str-llist.h
@@ -1,4 +1,4 @@
-/* str-llist.h: A linked list of strings,
+/* str-llist.h: a linked list of strings,
 
    It's pretty sad that both this and str-list exist; the reason is
    that C cannot express iterators very well, and I don't want to change
diff --git a/Build/source/texk/kpathsea/strstr.c b/Build/source/texk/kpathsea/strstr.c
index 18dca9266a0..bbd453b762a 100644
--- a/Build/source/texk/kpathsea/strstr.c
+++ b/Build/source/texk/kpathsea/strstr.c
@@ -1,7 +1,7 @@
 /* strstr.c - search for a substring in string.
 
    Copyright 2008 Karl Berry.
-   Copyright (C) 1994, 1995 Free Software Foundation, Inc.
+   Copyright 1994, 1995 Free Software Foundation, Inc.
    This file was part of the GNU C Library.
    Modified for kpathsea by Karl Berry.
 
diff --git a/Build/source/texk/kpathsea/tex-file.h b/Build/source/texk/kpathsea/tex-file.h
index d368fcc43fb..06ae0e1a9ff 100644
--- a/Build/source/texk/kpathsea/tex-file.h
+++ b/Build/source/texk/kpathsea/tex-file.h
@@ -1,6 +1,6 @@
 /* tex-file.h: find files in a particular format.
 
-   Copyright 1993, 1994, 1995, 1996, 2007 Karl Berry.
+   Copyright 1993, 1994, 1995, 1996, 2007, 2008 Karl Berry.
    Copyright 1998-2005 Olaf Weber.
 
    This library is free software; you can redistribute it and/or
@@ -13,11 +13,8 @@
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
    Lesser General Public License for more details.
 
-   You should have received a copy of the GNU Lesser General Public
-   License along with this library; if not, write to the Free Software
-   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-
-*/
+   You should have received a copy of the GNU Lesser General Public License
+   along with this library; if not, see <http://www.gnu.org/licenses/>.  */
 
 #ifndef KPATHSEA_TEX_FILE_H
 #define KPATHSEA_TEX_FILE_H
diff --git a/Build/source/texk/kpathsea/tex-glyph.c b/Build/source/texk/kpathsea/tex-glyph.c
index d45b699911d..e3a833abdba 100644
--- a/Build/source/texk/kpathsea/tex-glyph.c
+++ b/Build/source/texk/kpathsea/tex-glyph.c
@@ -1,23 +1,20 @@
-/* tex-glyph.c: Search for GF/PK files.
+/* tex-glyph.c: search for GF/PK files.
 
-    Copyright 1997, 98, 99, 2005 Olaf Weber.
-    Copyright 1993, 94, 95, 96 Karl Berry.
+   Copyright 1993, 1994, 1995, 1996, 2008 Karl Berry.
+   Copyright 1997, 1998, 1999, 2005 Olaf Weber.
 
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Lesser General Public
-    License as published by the Free Software Foundation; either
-    version 2.1 of the License, or (at your option) any later version.
+   This library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
 
-    This library 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
-    Lesser General Public License for more details.
+   This library 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
+   Lesser General Public License for more details.
 
-    You should have received a copy of the GNU Lesser General Public
-    License along with this library; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-
-*/
+   You should have received a copy of the GNU Lesser General Public License
+   along with this library; if not, see <http://www.gnu.org/licenses/>.  */
 
 #include <kpathsea/config.h>
 
diff --git a/Build/source/texk/kpathsea/tex-glyph.h b/Build/source/texk/kpathsea/tex-glyph.h
index 9dc42ee1bc6..c573ae0c302 100644
--- a/Build/source/texk/kpathsea/tex-glyph.h
+++ b/Build/source/texk/kpathsea/tex-glyph.h
@@ -1,7 +1,7 @@
 /* tex-glyph.h: look for a TeX glyph font (GF or PK).
 
+   Copyright 1993, 2008 Karl Berry.
    Copyright 1999, 2005 Olaf Weber.
-   Copyright 1993 Karl Berry.
 
    This library is free software; you can redistribute it and/or
    modify it under the terms of the GNU Lesser General Public
@@ -13,11 +13,8 @@
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
    Lesser General Public License for more details.
 
-   You should have received a copy of the GNU Lesser General Public
-   License along with this library; if not, write to the Free Software
-   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-
-*/
+   You should have received a copy of the GNU Lesser General Public License
+   along with this library; if not, see <http://www.gnu.org/licenses/>.  */
 
 #ifndef KPATHSEA_TEX_GLYPH_H
 #define KPATHSEA_TEX_GLYPH_H
diff --git a/Build/source/texk/kpathsea/tex-hush.c b/Build/source/texk/kpathsea/tex-hush.c
index c037f957f4d..2713ea0ec83 100644
--- a/Build/source/texk/kpathsea/tex-hush.c
+++ b/Build/source/texk/kpathsea/tex-hush.c
@@ -1,23 +1,20 @@
-/* tex-hush.c: are we suppressing warnings?
+/* tex-hush.c: suppressing warnings?
 
-    Copyright 1998, 2000, 2005 Olaf Weber.
-    Copyright 1996 Karl Berry.
+   Copyright 1996, 2008 Karl Berry.
+   Copyright 1998, 2000, 2005 Olaf Weber.
 
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Lesser General Public
-    License as published by the Free Software Foundation; either
-    version 2.1 of the License, or (at your option) any later version.
+   This library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
 
-    This library 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
-    Lesser General Public License for more details.
+   This library 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
+   Lesser General Public License for more details.
 
-    You should have received a copy of the GNU Lesser General Public
-    License along with this library; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-
-*/
+   You should have received a copy of the GNU Lesser General Public License
+   along with this library; if not, see <http://www.gnu.org/licenses/>.  */
 
 #include <kpathsea/config.h>
 
diff --git a/Build/source/texk/kpathsea/tex-hush.h b/Build/source/texk/kpathsea/tex-hush.h
index d7277f97992..ba68a0b106d 100644
--- a/Build/source/texk/kpathsea/tex-hush.h
+++ b/Build/source/texk/kpathsea/tex-hush.h
@@ -1,6 +1,6 @@
 /* tex-hush.h: suppressing warnings?
 
-   Copyright 1996 Karl Berry.
+   Copyright 1996, 2008 Karl Berry.
 
    This library is free software; you can redistribute it and/or
    modify it under the terms of the GNU Lesser General Public
@@ -12,11 +12,8 @@
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
    Lesser General Public License for more details.
 
-   You should have received a copy of the GNU Lesser General Public
-   License along with this library; if not, write to the Free Software
-   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-
-*/
+   You should have received a copy of the GNU Lesser General Public License
+   along with this library; if not, see <http://www.gnu.org/licenses/>.  */
 
 #ifndef KPATHSEA_TEX_HUSH_H
 #define KPATHSEA_TEX_HUSH_H
diff --git a/Build/source/texk/kpathsea/tex-make.c b/Build/source/texk/kpathsea/tex-make.c
index ee5720bad5c..bde28b9dfff 100644
--- a/Build/source/texk/kpathsea/tex-make.c
+++ b/Build/source/texk/kpathsea/tex-make.c
@@ -1,23 +1,20 @@
-/* tex-make.c: Run external programs to make TeX-related files.
+/* tex-make.c: run external programs to make TeX-related files.
 
-    Copyright 1997, 98, 2001-05 Olaf Weber.
-    Copyright 1993, 94, 95, 96, 97 Karl Berry.
+   Copyright 1993, 1994, 1995, 1996, 1997, 2008 Karl Berry.
+   Copyright 1997, 1998, 2001-05 Olaf Weber.
 
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Lesser General Public
-    License as published by the Free Software Foundation; either
-    version 2.1 of the License, or (at your option) any later version.
+   This library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
 
-    This library 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
-    Lesser General Public License for more details.
+   This library 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
+   Lesser General Public License for more details.
 
-    You should have received a copy of the GNU Lesser General Public
-    License along with this library; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-
-*/
+   You should have received a copy of the GNU Lesser General Public License
+   along with this library; if not, see <http://www.gnu.org/licenses/>.  */
 
 #include <kpathsea/config.h>
 
diff --git a/Build/source/texk/kpathsea/tex-make.h b/Build/source/texk/kpathsea/tex-make.h
index 81767248e30..33de4f226db 100644
--- a/Build/source/texk/kpathsea/tex-make.h
+++ b/Build/source/texk/kpathsea/tex-make.h
@@ -1,7 +1,7 @@
 /* tex-make.h: declarations for executing external scripts.
 
+   Copyright 1993, 1994, 2008 Karl Berry.
    Copyright 1999, 2005 Olaf Weber.
-   Copyright 1993, 94   Karl Berry.
 
    This library is free software; you can redistribute it and/or
    modify it under the terms of the GNU Lesser General Public
@@ -13,11 +13,8 @@
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
    Lesser General Public License for more details.
 
-   You should have received a copy of the GNU Lesser General Public
-   License along with this library; if not, write to the Free Software
-   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-
-*/
+   You should have received a copy of the GNU Lesser General Public License
+   along with this library; if not, see <http://www.gnu.org/licenses/>.  */
 
 #ifndef KPATHSEA_TEX_MAKE_H
 #define KPATHSEA_TEX_MAKE_H
diff --git a/Build/source/texk/kpathsea/tilde.c b/Build/source/texk/kpathsea/tilde.c
index 7d01533d4fc..85d4e61cdbd 100644
--- a/Build/source/texk/kpathsea/tilde.c
+++ b/Build/source/texk/kpathsea/tilde.c
@@ -1,4 +1,4 @@
-/* tilde.c: Expand user's home directories.
+/* tilde.c: expand user's home directories.
 
     Copyright 1997, 1998, 2005, Olaf Weber.
     Copyright 1993, 1995, 1996, 1997, 2008 Karl Berry.
diff --git a/Build/source/texk/kpathsea/tilde.h b/Build/source/texk/kpathsea/tilde.h
index 138a151a0ce..25ff260a933 100644
--- a/Build/source/texk/kpathsea/tilde.h
+++ b/Build/source/texk/kpathsea/tilde.h
@@ -1,4 +1,4 @@
-/* tilde.h: Declare tilde expander.
+/* tilde.h: declare tilde expander.
 
    Copyright 1993, 2008 Karl Berry.
 
diff --git a/Build/source/texk/kpathsea/truncate.c b/Build/source/texk/kpathsea/truncate.c
index 2e764864c1c..9ff92b4f86f 100644
--- a/Build/source/texk/kpathsea/truncate.c
+++ b/Build/source/texk/kpathsea/truncate.c
@@ -1,22 +1,19 @@
 /* truncate.c: truncate too-long components in a filename.
 
-    Copyright 1993, 95 Karl Berry.
+   Copyright 1993, 1995, 2008 Karl Berry.
 
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Lesser General Public
-    License as published by the Free Software Foundation; either
-    version 2.1 of the License, or (at your option) any later version.
+   This library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
 
-    This library 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
-    Lesser General Public License for more details.
+   This library 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
+   Lesser General Public License for more details.
 
-    You should have received a copy of the GNU Lesser General Public
-    License along with this library; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-
-*/
+   You should have received a copy of the GNU Lesser General Public License
+   along with this library; if not, see <http://www.gnu.org/licenses/>.  */
 
 #include <kpathsea/config.h>
 
diff --git a/Build/source/texk/kpathsea/truncate.h b/Build/source/texk/kpathsea/truncate.h
index 7af9ae858ce..966e2319287 100644
--- a/Build/source/texk/kpathsea/truncate.h
+++ b/Build/source/texk/kpathsea/truncate.h
@@ -1,6 +1,6 @@
 /* truncate.h: truncate too-long components in a filename.
 
-   Copyright 1993 Karl Berry.
+   Copyright 1993, 2008 Karl Berry.
 
    This library is free software; you can redistribute it and/or
    modify it under the terms of the GNU Lesser General Public
@@ -12,11 +12,8 @@
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
    Lesser General Public License for more details.
 
-   You should have received a copy of the GNU Lesser General Public
-   License along with this library; if not, write to the Free Software
-   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-
-*/
+   You should have received a copy of the GNU Lesser General Public License
+   along with this library; if not, see <http://www.gnu.org/licenses/>.  */
 
 #ifndef KPATHSEA_TRUNCATE_H
 #define KPATHSEA_TRUNCATE_H
diff --git a/Build/source/texk/kpathsea/types.h b/Build/source/texk/kpathsea/types.h
index 09c020f9412..0de42972e89 100644
--- a/Build/source/texk/kpathsea/types.h
+++ b/Build/source/texk/kpathsea/types.h
@@ -1,6 +1,6 @@
-/* types.h: general types.
+/* types.h: general types for kpathsea.
 
-   Copyright (C) 1993, 1995, 96, 2005 Karl Berry.
+   Copyright 1993, 1995, 1996, 2005, 2008 Karl Berry.
 
    This library is free software; you can redistribute it and/or
    modify it under the terms of the GNU Lesser General Public
@@ -12,11 +12,8 @@
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
    Lesser General Public License for more details.
 
-   You should have received a copy of the GNU Lesser General Public
-   License along with this library; if not, write to the Free Software
-   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-
-*/
+   You should have received a copy of the GNU Lesser General Public License
+   along with this library; if not, see <http://www.gnu.org/licenses/>.  */
 
 #ifndef KPATHSEA_TYPES_H
 #define KPATHSEA_TYPES_H
diff --git a/Build/source/texk/kpathsea/uppercasify.c b/Build/source/texk/kpathsea/uppercasify.c
index 77445da5fe3..218b246ec24 100644
--- a/Build/source/texk/kpathsea/uppercasify.c
+++ b/Build/source/texk/kpathsea/uppercasify.c
@@ -1,22 +1,19 @@
 /* uppercasify.c: change all lowercase letters to uppercase.
 
-    Copyright 1993 Karl Berry.
+   Copyright 1993, 2008 Karl Berry.
 
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Lesser General Public
-    License as published by the Free Software Foundation; either
-    version 2.1 of the License, or (at your option) any later version.
+   This library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
 
-    This library 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
-    Lesser General Public License for more details.
+   This library 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
+   Lesser General Public License for more details.
 
-    You should have received a copy of the GNU Lesser General Public
-    License along with this library; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-
-*/
+   You should have received a copy of the GNU Lesser General Public License
+   along with this library; if not, see <http://www.gnu.org/licenses/>.  */
 
 #include <kpathsea/config.h>
 
diff --git a/Build/source/texk/kpathsea/variable.h b/Build/source/texk/kpathsea/variable.h
index f16df71abbc..4c92e0e00f2 100644
--- a/Build/source/texk/kpathsea/variable.h
+++ b/Build/source/texk/kpathsea/variable.h
@@ -1,6 +1,6 @@
-/* variable.h: Declare variable expander.
+/* variable.h: declare variable expander.
 
-   Copyright (C) 1993, 1995, 2008 Karl Berry.
+   Copyright 1993, 1995, 2008 Karl Berry.
 
    This library is free software; you can redistribute it and/or
    modify it under the terms of the GNU Lesser General Public
diff --git a/Build/source/texk/kpathsea/version.c b/Build/source/texk/kpathsea/version.c
index df54fd9f669..aaafcbe8d21 100644
--- a/Build/source/texk/kpathsea/version.c
+++ b/Build/source/texk/kpathsea/version.c
@@ -1,23 +1,20 @@
 /*  version.c: version number for libkpathsea.
 
-    Copyright 1997, 99, 2005 Olaf Weber.
-    Copyright 1993, 96       Karl Berry.
+    Copyright 1993, 1996, 2008 Karl Berry.
+    Copyright 1997, 1999, 2005 Olaf Weber.
   
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Lesser General Public
-    License as published by the Free Software Foundation; either
-    version 2.1 of the License, or (at your option) any later version.
-
-    This library 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
-    Lesser General Public License for more details.
-
-    You should have received a copy of the GNU Lesser General Public
-    License along with this library; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-
-*/
+   This library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
+
+   This library 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
+   Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public License
+   along with this library; if not, see <http://www.gnu.org/licenses/>.  */
 
 #include "c-auto.h"
 #include <kpathsea/c-proto.h>
diff --git a/Build/source/texk/kpathsea/xbasename.c b/Build/source/texk/kpathsea/xbasename.c
index 748865e0777..f4e060c0f03 100644
--- a/Build/source/texk/kpathsea/xbasename.c
+++ b/Build/source/texk/kpathsea/xbasename.c
@@ -1,23 +1,20 @@
-/* basename.c: return the last element in a path.
+/* xbasename.c: return the last element in a path.
 
-    Copyright 2005             Olaf Weber.
-    Copyright 1992, 94, 95, 96 Karl Berry.
+   Copyright 1992, 1994, 1995, 1996, 2008 Karl Berry.
+   Copyright 2005 Olaf Weber.
 
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Lesser General Public
-    License as published by the Free Software Foundation; either
-    version 2.1 of the License, or (at your option) any later version.
+   This library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
 
-    This library 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
-    Lesser General Public License for more details.
+   This library 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
+   Lesser General Public License for more details.
 
-    You should have received a copy of the GNU Lesser General Public
-    License along with this library; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-
-*/
+   You should have received a copy of the GNU Lesser General Public License
+   along with this library; if not, see <http://www.gnu.org/licenses/>.  */
 
 /* Have to include this first to get c-auto.h.  */
 #include <kpathsea/config.h>
diff --git a/Build/source/texk/kpathsea/xcalloc.c b/Build/source/texk/kpathsea/xcalloc.c
index f5ae20fdd2d..1973b9d934a 100644
--- a/Build/source/texk/kpathsea/xcalloc.c
+++ b/Build/source/texk/kpathsea/xcalloc.c
@@ -1,23 +1,20 @@
 /* xcalloc.c: calloc with error checking.
 
-    Copyright 2005     Olaf Weber
-    Copyright 1992, 93 Karl Berry.
+   Copyright 1992, 1993, 2008 Karl Berry.
+   Copyright 2005 Olaf Weber.
 
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Lesser General Public
-    License as published by the Free Software Foundation; either
-    version 2.1 of the License, or (at your option) any later version.
+   This library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
 
-    This library 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
-    Lesser General Public License for more details.
+   This library 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
+   Lesser General Public License for more details.
 
-    You should have received a copy of the GNU Lesser General Public
-    License along with this library; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-
-*/
+   You should have received a copy of the GNU Lesser General Public License
+   along with this library; if not, see <http://www.gnu.org/licenses/>.  */
 
 #include <kpathsea/config.h>
 
diff --git a/Build/source/texk/kpathsea/xdirname.c b/Build/source/texk/kpathsea/xdirname.c
index 4a9e0a9808d..e687048b5a3 100644
--- a/Build/source/texk/kpathsea/xdirname.c
+++ b/Build/source/texk/kpathsea/xdirname.c
@@ -1,22 +1,20 @@
 /* xdirname.c: return the directory part of a path.
 
-    Copyright 2005 Olaf Weber.
-    Copyright 1999 Karl Berry.
+   Copyright 1999, 2008 Karl Berry.
+   Copyright 2005 Olaf Weber.
 
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Lesser General Public
-    License as published by the Free Software Foundation; either
-    version 2.1 of the License, or (at your option) any later version.
+   This library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
 
-    This library 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
-    Lesser General Public License for more details.
+   This library 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
+   Lesser General Public License for more details.
 
-    You should have received a copy of the GNU Lesser General Public
-    License along with this library; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-*/
+   You should have received a copy of the GNU Lesser General Public License
+   along with this library; if not, see <http://www.gnu.org/licenses/>.  */
 
 /* Return directory for NAME.  This is "." if NAME contains no directory
    separators (should never happen for selfdir), else whatever precedes
diff --git a/Build/source/texk/kpathsea/xfopen.c b/Build/source/texk/kpathsea/xfopen.c
index 14c8cbc17b3..804dda0282f 100644
--- a/Build/source/texk/kpathsea/xfopen.c
+++ b/Build/source/texk/kpathsea/xfopen.c
@@ -1,23 +1,20 @@
 /* xfopen.c: fopen and fclose with error checking.
 
-    Copyright 2005         Olaf Weber
-    Copyright 1992, 93, 95 Karl Berry.
+   Copyright 1992, 1993, 1995, 2008 Karl Berry.
+   Copyright 2005 Olaf Weber.
 
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Lesser General Public
-    License as published by the Free Software Foundation; either
-    version 2.1 of the License, or (at your option) any later version.
+   This library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
 
-    This library 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
-    Lesser General Public License for more details.
+   This library 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
+   Lesser General Public License for more details.
 
-    You should have received a copy of the GNU Lesser General Public
-    License along with this library; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-
-*/
+   You should have received a copy of the GNU Lesser General Public License
+   along with this library; if not, see <http://www.gnu.org/licenses/>.  */
 
 #include <kpathsea/config.h>
 
diff --git a/Build/source/texk/kpathsea/xfseek.c b/Build/source/texk/kpathsea/xfseek.c
index 22ba8978c4a..ee6ccd7c9d2 100644
--- a/Build/source/texk/kpathsea/xfseek.c
+++ b/Build/source/texk/kpathsea/xfseek.c
@@ -1,30 +1,27 @@
 /* xfseek.c: fseek with error checking.
 
-    Copyright 2005     Olaf Weber
-    Copyright 1992, 95 Karl Berry
+   Copyright 1992, 1995, 2008 Karl Berry.
+   Copyright 2005 Olaf Weber.
 
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Lesser General Public
-    License as published by the Free Software Foundation; either
-    version 2.1 of the License, or (at your option) any later version.
+   This library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
 
-    This library 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
-    Lesser General Public License for more details.
+   This library 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
+   Lesser General Public License for more details.
 
-    You should have received a copy of the GNU Lesser General Public
-    License along with this library; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-
-*/
+   You should have received a copy of the GNU Lesser General Public License
+   along with this library; if not, see <http://www.gnu.org/licenses/>.  */
 
 #include <kpathsea/config.h>
 
-
 void
 xfseek P4C(FILE *, f,  long, offset,  int, wherefrom,  string, filename)
 {
-    if (fseek(f, offset, wherefrom) < 0)
-        FATAL_PERROR(filename);
+  if (fseek (f, offset, wherefrom) < 0) {
+    FATAL_PERROR (filename);
+  }
 }
diff --git a/Build/source/texk/kpathsea/xfseeko.c b/Build/source/texk/kpathsea/xfseeko.c
index 60569c77363..ecc3d60240a 100644
--- a/Build/source/texk/kpathsea/xfseeko.c
+++ b/Build/source/texk/kpathsea/xfseeko.c
@@ -1,30 +1,26 @@
 /* xfseeko.c: fseeko with error checking.
 
-    Copyright 2005     Olaf Weber
-    Copyright 1992, 95 Karl Berry
+   Copyright 2008 Karl Berry.
 
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Lesser General Public
-    License as published by the Free Software Foundation; either
-    version 2.1 of the License, or (at your option) any later version.
+   This library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
 
-    This library 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
-    Lesser General Public License for more details.
+   This library 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
+   Lesser General Public License for more details.
 
-    You should have received a copy of the GNU Lesser General Public
-    License along with this library; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-
-*/
+   You should have received a copy of the GNU Lesser General Public License
+   along with this library; if not, see <http://www.gnu.org/licenses/>.  */
 
 #include <kpathsea/config.h>
 
-
 void
 xfseeko P4C(FILE *, f,  off_t, offset,  int, wherefrom,  string, filename)
 {
-    if (fseeko(f, offset, wherefrom) < 0)
-        FATAL_PERROR(filename);
+  if (fseeko (f, offset, wherefrom) < 0) {
+    FATAL_PERROR (filename);
+  }
 }
diff --git a/Build/source/texk/kpathsea/xftell.c b/Build/source/texk/kpathsea/xftell.c
index ba1e00d369b..4679907ed5f 100644
--- a/Build/source/texk/kpathsea/xftell.c
+++ b/Build/source/texk/kpathsea/xftell.c
@@ -1,22 +1,20 @@
 /* xftell.c: ftell with error checking.
 
-    Copyright 2005         Olaf Weber
-    Copyright 1992, 93, 95 Karl Berry
+   Copyright 1992, 1993, 1995, 2008 Karl Berry.
+   Copyright 2005 Olaf Weber.
 
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Lesser General Public
-    License as published by the Free Software Foundation; either
-    version 2.1 of the License, or (at your option) any later version.
+   This library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
 
-    This library 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
-    Lesser General Public License for more details.
+   This library 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
+   Lesser General Public License for more details.
 
-    You should have received a copy of the GNU Lesser General Public
-    License along with this library; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-*/
+   You should have received a copy of the GNU Lesser General Public License
+   along with this library; if not, see <http://www.gnu.org/licenses/>.  */
 
 #include <kpathsea/config.h>
 
diff --git a/Build/source/texk/kpathsea/xftello.c b/Build/source/texk/kpathsea/xftello.c
index 5a0009ab8eb..4e6aec21dcb 100644
--- a/Build/source/texk/kpathsea/xftello.c
+++ b/Build/source/texk/kpathsea/xftello.c
@@ -1,22 +1,20 @@
 /* xftello.c: ftello with error checking.
 
-    Copyright 2005         Olaf Weber
-    Copyright 1992, 93, 95 Karl Berry
+   Copyright 1992, 1993, 1995, 2008 Karl Berry.
+   Copyright 2005 Olaf Weber.
 
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Lesser General Public
-    License as published by the Free Software Foundation; either
-    version 2.1 of the License, or (at your option) any later version.
+   This library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
 
-    This library 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
-    Lesser General Public License for more details.
+   This library 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
+   Lesser General Public License for more details.
 
-    You should have received a copy of the GNU Lesser General Public
-    License along with this library; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-*/
+   You should have received a copy of the GNU Lesser General Public License
+   along with this library; if not, see <http://www.gnu.org/licenses/>.  */
 
 #include <kpathsea/config.h>
 
diff --git a/Build/source/texk/kpathsea/xgetcwd.c b/Build/source/texk/kpathsea/xgetcwd.c
index 8c97c6a8bd8..2a512a6da68 100644
--- a/Build/source/texk/kpathsea/xgetcwd.c
+++ b/Build/source/texk/kpathsea/xgetcwd.c
@@ -1,8 +1,7 @@
-/* xgetcwd.c: a from-scratch version of getwd.  Ideas from the tcsh 5.20
-   source, apparently uncopyrighted.
+/* xgetcwd.c: a from-scratch version of getwd.  Ideas from tcsh 5.20 source.
 
-   Copyright 2005         Olaf Weber.
-   Copyright 1992, 94, 96 Karl Berry.
+   Copyright 1992, 1994, 1996, 2008 Karl Berry.
+   Copyright 2005 Olaf Weber.
 
    This library is free software; you can redistribute it and/or
    modify it under the terms of the GNU Lesser General Public
@@ -14,10 +13,8 @@
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
    Lesser General Public License for more details.
 
-   You should have received a copy of the GNU Lesser General Public
-   License along with this library; if not, write to the Free Software
-   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-*/
+   You should have received a copy of the GNU Lesser General Public License
+   along with this library; if not, see <http://www.gnu.org/licenses/>.  */
 
 #include <kpathsea/config.h>
 
diff --git a/Build/source/texk/kpathsea/xmalloc.c b/Build/source/texk/kpathsea/xmalloc.c
index 33057a63913..32dd8a71fd4 100644
--- a/Build/source/texk/kpathsea/xmalloc.c
+++ b/Build/source/texk/kpathsea/xmalloc.c
@@ -1,23 +1,20 @@
 /* xmalloc.c: malloc with error checking.
 
-    Copyright 2005     Olaf Weber
-    Copyright 1992, 93 Karl Berry.
+   Copyright 1992, 1993, 2008 Karl Berry.
+   Copyright 2005 Olaf Weber.
 
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Lesser General Public
-    License as published by the Free Software Foundation; either
-    version 2.1 of the License, or (at your option) any later version.
+   This library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
 
-    This library 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
-    Lesser General Public License for more details.
+   This library 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
+   Lesser General Public License for more details.
 
-    You should have received a copy of the GNU Lesser General Public
-    License along with this library; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-
-*/
+   You should have received a copy of the GNU Lesser General Public License
+   along with this library; if not, see <http://www.gnu.org/licenses/>.  */
 
 #include <kpathsea/config.h>
 
diff --git a/Build/source/texk/kpathsea/xopendir.c b/Build/source/texk/kpathsea/xopendir.c
index e755b463dc3..d1e7f103789 100644
--- a/Build/source/texk/kpathsea/xopendir.c
+++ b/Build/source/texk/kpathsea/xopendir.c
@@ -1,23 +1,20 @@
 /* xopendir.c: opendir and closedir with error checking.
 
-    Copyright 2005 Olaf Weber.
-    Copyright 1992, 93, 94, 95, 96 Karl Berry.
+   Copyright 1992, 1993, 1994, 1995, 1996, 2008 Karl Berry.
+   Copyright 2005 Olaf Weber.
 
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Lesser General Public
-    License as published by the Free Software Foundation; either
-    version 2.1 of the License, or (at your option) any later version.
+   This library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
 
-    This library 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
-    Lesser General Public License for more details.
+   This library 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
+   Lesser General Public License for more details.
 
-    You should have received a copy of the GNU Lesser General Public
-    License along with this library; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-
-*/
+   You should have received a copy of the GNU Lesser General Public License
+   along with this library; if not, see <http://www.gnu.org/licenses/>.  */
 
 #include <kpathsea/config.h>
 #include <kpathsea/xopendir.h>
diff --git a/Build/source/texk/kpathsea/xopendir.h b/Build/source/texk/kpathsea/xopendir.h
index 1ef91c6ce80..67b3443fa3c 100644
--- a/Build/source/texk/kpathsea/xopendir.h
+++ b/Build/source/texk/kpathsea/xopendir.h
@@ -1,6 +1,6 @@
-/* xopendir.h: Checked directory operations.
+/* xopendir.h: declare checked directory operations.
 
-   Copyright (C) 1994, 96 Karl Berry.
+   Copyright 1994, 1996, 2008 Karl Berry.
 
    This library is free software; you can redistribute it and/or
    modify it under the terms of the GNU Lesser General Public
@@ -12,11 +12,8 @@
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
    Lesser General Public License for more details.
 
-   You should have received a copy of the GNU Lesser General Public
-   License along with this library; if not, write to the Free Software
-   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-
-*/
+   You should have received a copy of the GNU Lesser General Public License
+   along with this library; if not, see <http://www.gnu.org/licenses/>.  */
 
 #if !defined (KPATHSEA_XOPENDIR_H) && !defined (WIN32)
 #define KPATHSEA_XOPENDIR_H
diff --git a/Build/source/texk/kpathsea/xputenv.c b/Build/source/texk/kpathsea/xputenv.c
index 722a219ca8f..52aa0f44fbf 100644
--- a/Build/source/texk/kpathsea/xputenv.c
+++ b/Build/source/texk/kpathsea/xputenv.c
@@ -1,23 +1,21 @@
 /* xputenv.c: set an environment variable without return. */
 
-/*
- *  Copyright 2003-05 Olaf Weber.
- *  Copyright 1993-98 Karl Berry.
- *
- *  This library is free software; you can redistribute it and/or
- *  modify it under the terms of the GNU Lesser General Public
- *  License as published by the Free Software Foundation; either
- *  version 2.1 of the License, or (at your option) any later version.
- *
- *  This library 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
- *  Lesser General Public License for more details.
- *
- *  You should have received a copy of the GNU Lesser General Public
- *  License along with this library; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307  USA
- */
+/* Copyright 1993-98, 2008 Karl Berry.
+   Copyright 2003-05 Olaf Weber.
+
+   This library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
+
+   This library 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
+   Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public License
+   along with this library; if not, see <http://www.gnu.org/licenses/>.  */
+
 
 #include <kpathsea/config.h>
 
diff --git a/Build/source/texk/kpathsea/xrealloc.c b/Build/source/texk/kpathsea/xrealloc.c
index 81a0cab8136..7840bc3fc17 100644
--- a/Build/source/texk/kpathsea/xrealloc.c
+++ b/Build/source/texk/kpathsea/xrealloc.c
@@ -1,22 +1,20 @@
 /* xrealloc.c: realloc with error checking.
 
-    Copyright 2005 Olaf Weber
-    Copyright 1992, 93 Karl Berry.
+   Copyright 1992, 1993, 2008 Karl Berry.
+   Copyright 2005 Olaf Weber.
 
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Lesser General Public
-    License as published by the Free Software Foundation; either
-    version 2.1 of the License, or (at your option) any later version.
+   This library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
 
-    This library 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
-    Lesser General Public License for more details.
+   This library 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
+   Lesser General Public License for more details.
 
-    You should have received a copy of the GNU Lesser General Public
-    License along with this library; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-*/
+   You should have received a copy of the GNU Lesser General Public License
+   along with this library; if not, see <http://www.gnu.org/licenses/>.  */
 
 #include <kpathsea/config.h>
 
diff --git a/Build/source/texk/kpathsea/xstat.c b/Build/source/texk/kpathsea/xstat.c
index b495480db3e..678e2fe411e 100644
--- a/Build/source/texk/kpathsea/xstat.c
+++ b/Build/source/texk/kpathsea/xstat.c
@@ -1,23 +1,20 @@
 /* xstat.c: stat and (maybe) lstat with error checking.
 
-    Copyright 2005 Olaf Weber.
-    Copyright 1992, 93 Karl Berry.
+   Copyright 1992, 1993, 2008 Karl Berry.
+   Copyright 2005 Olaf Weber.
 
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Lesser General Public
-    License as published by the Free Software Foundation; either
-    version 2.1 of the License, or (at your option) any later version.
+   This library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
 
-    This library 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
-    Lesser General Public License for more details.
+   This library 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
+   Lesser General Public License for more details.
 
-    You should have received a copy of the GNU Lesser General Public
-    License along with this library; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-
-*/
+   You should have received a copy of the GNU Lesser General Public License
+   along with this library; if not, see <http://www.gnu.org/licenses/>.  */
 
 #include <kpathsea/config.h>
 
diff --git a/Build/source/texk/kpathsea/xstat.h b/Build/source/texk/kpathsea/xstat.h
index c1ddec3bea9..fcebb4f0e14 100644
--- a/Build/source/texk/kpathsea/xstat.h
+++ b/Build/source/texk/kpathsea/xstat.h
@@ -1,6 +1,6 @@
 /* xstat.h: stat with error checking.
 
-   Copyright 1992, 93, 94 Karl Berry.
+   Copyright 1992, 1993, 1994, 2008 Karl Berry.
 
    This library is free software; you can redistribute it and/or
    modify it under the terms of the GNU Lesser General Public
@@ -12,11 +12,8 @@
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
    Lesser General Public License for more details.
 
-   You should have received a copy of the GNU Lesser General Public
-   License along with this library; if not, write to the Free Software
-   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-
-*/
+   You should have received a copy of the GNU Lesser General Public License
+   along with this library; if not, see <http://www.gnu.org/licenses/>.  */
 
 #ifndef KPATHSEA_XSTAT_H
 #define KPATHSEA_XSTAT_H
diff --git a/Build/source/texk/kpathsea/xstrdup.c b/Build/source/texk/kpathsea/xstrdup.c
index ef870dfbf16..6afe72f5efa 100644
--- a/Build/source/texk/kpathsea/xstrdup.c
+++ b/Build/source/texk/kpathsea/xstrdup.c
@@ -1,23 +1,20 @@
 /* xstrdup.c: strdup with error checking.
 
-    Copyright 2005 Olaf Weber.
-    Copyright 1992, 93 Karl Berry.
+   Copyright 1992, 1993, 2008 Karl Berry.
+   Copyright 2005 Olaf Weber.
 
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Lesser General Public
-    License as published by the Free Software Foundation; either
-    version 2.1 of the License, or (at your option) any later version.
+   This library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
 
-    This library 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
-    Lesser General Public License for more details.
+   This library 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
+   Lesser General Public License for more details.
 
-    You should have received a copy of the GNU Lesser General Public
-    License along with this library; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-
-*/
+   You should have received a copy of the GNU Lesser General Public License
+   along with this library; if not, see <http://www.gnu.org/licenses/>.  */
 
 #include <kpathsea/config.h>