no fsf physical address

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

24 files changed, 140 insertions, 196 deletions

diff --git a/Build/source/texk/kpathsea/ChangeLog b/Build/source/texk/kpathsea/ChangeLog
index 3327de1eeb5..1a95fffbe41 100644
--- a/Build/source/texk/kpathsea/ChangeLog
+++ b/Build/source/texk/kpathsea/ChangeLog
@@ -1,6 +1,6 @@
 2008-01-21  Karl Berry  <karl@tug.org>
 
-	* db.c through magstep.c: replace FSF physical address with url.
+	* db.c through tex-file.c: replace FSF physical address with url.
 
 2008-01-18  Karl Berry  <karl@tug.org>
 
diff --git a/Build/source/texk/kpathsea/magstep.h b/Build/source/texk/kpathsea/magstep.h
index 78672d8a25f..3170819f5c2 100644
--- a/Build/source/texk/kpathsea/magstep.h
+++ b/Build/source/texk/kpathsea/magstep.h
@@ -1,7 +1,7 @@
 /* magstep.h: declaration for magstep fixing.
 
+   Copyright 1994, 2008 Karl Berry.
    Copyright 1999, 2005 Olaf Weber.
-   Copyright 1994 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_MAGSTEP_H
 #define KPATHSEA_MAGSTEP_H
diff --git a/Build/source/texk/kpathsea/make-suffix.c b/Build/source/texk/kpathsea/make-suffix.c
index 4bb25dab375..51a4bdf1715 100644
--- a/Build/source/texk/kpathsea/make-suffix.c
+++ b/Build/source/texk/kpathsea/make-suffix.c
@@ -1,7 +1,7 @@
 /* make-suffix.c: unconditionally add a filename suffix.
 
-   Copyright 2001, 05 Olaf Weber.
-   Copyright 1992, 93, 95 Karl Berry.
+   Copyright 1992, 1993, 1995, 2008 Karl Berry.
+   Copyright 2001, 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
@@ -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/>.  */
 
 #include <kpathsea/config.h>
 #include <kpathsea/c-pathch.h>
diff --git a/Build/source/texk/kpathsea/mktex.cnf b/Build/source/texk/kpathsea/mktex.cnf
index 385955b97d8..2699d232483 100644
--- a/Build/source/texk/kpathsea/mktex.cnf
+++ b/Build/source/texk/kpathsea/mktex.cnf
@@ -1,3 +1,5 @@
+# Public domain.
+# 
 # The mktex.cnf file, if it exists, can be used to tailor a setup to
 # local conditions.  If you use the mktex scripts, this file can contain
 # generic bourne shell code.  However, the C emulations of the scripts
diff --git a/Build/source/texk/kpathsea/path-elt.c b/Build/source/texk/kpathsea/path-elt.c
index ab2944f3ebd..388a6d264cf 100644
--- a/Build/source/texk/kpathsea/path-elt.c
+++ b/Build/source/texk/kpathsea/path-elt.c
@@ -1,7 +1,7 @@
 /* path-elt.c: Return the stuff between colons.
 
+   Copyright 1993, 1996 2008 Karl Berry.
    Copyright 1997, 2001, 2005 Olaf Weber.
-   Copyright 1993, 96 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/>.  */
 
 #include <kpathsea/config.h>
 
diff --git a/Build/source/texk/kpathsea/pathsearch.h b/Build/source/texk/kpathsea/pathsearch.h
index 9478c2a53cc..c7971826999 100644
--- a/Build/source/texk/kpathsea/pathsearch.h
+++ b/Build/source/texk/kpathsea/pathsearch.h
@@ -1,6 +1,6 @@
 /* pathsearch.h: mostly-generic path searching.
 
-   Copyright 1993, 1994, 1996, 1997, 2007 Karl Berry.
+   Copyright 1993, 1994, 1996, 1997, 2007, 2008 Karl Berry.
    Copyright 1999-2005 Olaf Weber.
 
    This library is free software; you can redistribute it and/or
diff --git a/Build/source/texk/kpathsea/proginit.c b/Build/source/texk/kpathsea/proginit.c
index 8cb9c70506d..2c4b89d124b 100644
--- a/Build/source/texk/kpathsea/proginit.c
+++ b/Build/source/texk/kpathsea/proginit.c
@@ -1,7 +1,7 @@
 /* proginit.c: useful initializations for DVI drivers.
 
+   Copyright 1994, 1995, 1996, 2008 Karl Berry.
    Copyright 1997, 2005 Olaf Weber.
-   Copyright 1994, 95, 96 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/>.  */
 
 #include <kpathsea/config.h>
 #include <kpathsea/c-pathch.h>
diff --git a/Build/source/texk/kpathsea/proginit.h b/Build/source/texk/kpathsea/proginit.h
index ae73485bad2..8cf66affc6d 100644
--- a/Build/source/texk/kpathsea/proginit.h
+++ b/Build/source/texk/kpathsea/proginit.h
@@ -1,7 +1,7 @@
 /* proginit.h: declarations for DVI driver initializations.
 
+   Copyright 1994, 1995, 1996, 2008 Karl Berry.
    Copyright 1999, 2005 Olaf Weber.
-   Copyright 1994, 95, 96 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_PROGINIT_H
 #define KPATHSEA_PROGINIT_H
diff --git a/Build/source/texk/kpathsea/progname.c b/Build/source/texk/kpathsea/progname.c
index 0c40a5e11e7..32e8f01c307 100644
--- a/Build/source/texk/kpathsea/progname.c
+++ b/Build/source/texk/kpathsea/progname.c
@@ -1,7 +1,7 @@
 /* progname.c: the executable name we were invoked as; general initialization.
 
+   Copyright 1994, 1996, 1997, 2008 Karl Berry.
    Copyright 1998-2005 Olaf Weber.
-   Copyright 1994, 96, 97 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/>.  */
 
 #include <kpathsea/config.h>
 #include <kpathsea/absolute.h>
diff --git a/Build/source/texk/kpathsea/progname.h b/Build/source/texk/kpathsea/progname.h
index c7480e7c6eb..d46bc56e435 100644
--- a/Build/source/texk/kpathsea/progname.h
+++ b/Build/source/texk/kpathsea/progname.h
@@ -1,7 +1,7 @@
 /* progname.h: Declarations for argv[0] equivalents.
 
+   Copyright 1994, 1996, 2008 Karl Berry.
    Copyright 1999, 2005 Olaf Weber.
-   Copyright 1994, 96 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_PROGNAME_H
 #define KPATHSEA_PROGNAME_H
diff --git a/Build/source/texk/kpathsea/readable.c b/Build/source/texk/kpathsea/readable.c
index 1f8d941f5f0..e25d2aa9d01 100644
--- a/Build/source/texk/kpathsea/readable.c
+++ b/Build/source/texk/kpathsea/readable.c
@@ -1,7 +1,7 @@
 /* readable.c: check if a filename is a readable non-directory file.
 
-   Copyright 1998, 99, 2000, 01, 05 Olaf Weber.
-   Copyright 1993, 95, 96 Karl Berry.
+   Copyright 1993, 1995, 1996, 2008 Karl Berry.
+   Copyright 1998, 1999, 2000, 2001, 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
@@ -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/>.  */
 
 #include <kpathsea/config.h>
 #include <kpathsea/c-stat.h>
diff --git a/Build/source/texk/kpathsea/readable.h b/Build/source/texk/kpathsea/readable.h
index ce2d953f47f..0c17f76e7f0 100644
--- a/Build/source/texk/kpathsea/readable.h
+++ b/Build/source/texk/kpathsea/readable.h
@@ -1,7 +1,7 @@
 /* readable.h: Is a file readable?
 
+   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_READABLE_H
 #define KPATHSEA_READABLE_H
diff --git a/Build/source/texk/kpathsea/readlink.c b/Build/source/texk/kpathsea/readlink.c
index 2c88c9cc2ab..18a88ec201d 100644
--- a/Build/source/texk/kpathsea/readlink.c
+++ b/Build/source/texk/kpathsea/readlink.c
@@ -1,5 +1,6 @@
 /* readlink -- obtain contents of symlink.
 
+   Copyright 2008 Karl Berry.
    Copyright 1998, 1999, 2001, 2005 Olaf Weber.
 
    This program is free software; you can redistribute it and/or modify
@@ -12,11 +13,8 @@
    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., 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 <stdio.h>
 #include <kpathsea/config.h>
diff --git a/Build/source/texk/kpathsea/recorder.h b/Build/source/texk/kpathsea/recorder.h
index 1631b1b5904..7d1ee4e9bc1 100644
--- a/Build/source/texk/kpathsea/recorder.h
+++ b/Build/source/texk/kpathsea/recorder.h
@@ -1,6 +1,6 @@
 /* recorder.h: filename recorder callback.
 
-   Copyright 2007 Karl Berry.
+   Copyright 2007, 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,10 +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_RECORDER_H
 #define KPATHSEA_RECORDER_H
diff --git a/Build/source/texk/kpathsea/rm-suffix.c b/Build/source/texk/kpathsea/rm-suffix.c
index 88739119fc1..b21878cbf94 100644
--- a/Build/source/texk/kpathsea/rm-suffix.c
+++ b/Build/source/texk/kpathsea/rm-suffix.c
@@ -1,23 +1,21 @@
 /* rm-suffix.c: remove any suffix.
 
-    Copyright (C) 1992, 93, 95 Free Software Foundation, Inc.
-    Modified for kpathsea by 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., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-
-*/
+   Copyright 2008 Karl Berry.
+   Copyright 1992, 1993, 1995 Free Software Foundation, Inc.
+   Modified for kpathsea by 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, see <http://www.gnu.org/licenses/>.  */
 
 #include <kpathsea/config.h>
 
diff --git a/Build/source/texk/kpathsea/str-list.c b/Build/source/texk/kpathsea/str-list.c
index 8b4ab314dfe..8bbfa6ae02d 100644
--- a/Build/source/texk/kpathsea/str-list.c
+++ b/Build/source/texk/kpathsea/str-list.c
@@ -1,7 +1,7 @@
 /* str-list.c: define routines for string lists.
 
-    Copyright 2001, 2005 Olaf Weber
-    Copyright 1993 Karl Berry.
+    Copyright 1993, 2008 Karl Berry.
+    Copyright 2001, 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
@@ -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/>.  */
 
 #include <kpathsea/config.h>
 
diff --git a/Build/source/texk/kpathsea/str-list.h b/Build/source/texk/kpathsea/str-list.h
index 1a80047a7bc..ba00c42c77e 100644
--- a/Build/source/texk/kpathsea/str-list.h
+++ b/Build/source/texk/kpathsea/str-list.h
@@ -1,6 +1,6 @@
 /* str-list.h: Declarations for string lists.
 
-   Copyright 1993, 1994, 2007 Karl Berry.
+   Copyright 1993, 1994, 2007, 2008 Karl Berry.
    Copyright 1999, 2005 Olaf Weber.
 
    This library is free software; you can redistribute it and/or
diff --git a/Build/source/texk/kpathsea/str-llist.c b/Build/source/texk/kpathsea/str-llist.c
index 4006852f9b9..85b99815c79 100644
--- a/Build/source/texk/kpathsea/str-llist.c
+++ b/Build/source/texk/kpathsea/str-llist.c
@@ -1,22 +1,19 @@
 /* str-llist.c: Implementation of a linked list of strings.
 
-    Copyright (C) 1993 Karl Berry.
+   Copyright (C) 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/str-llist.h b/Build/source/texk/kpathsea/str-llist.h
index 2d823d1795c..4e0f88073e1 100644
--- a/Build/source/texk/kpathsea/str-llist.h
+++ b/Build/source/texk/kpathsea/str-llist.h
@@ -1,10 +1,10 @@
 /* str-llist.h: A linked list of strings,
 
-   It's pretty disgusting that both this and str-list exist; the reason is
+   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
-   all the for loops right now.
+   all the for loops.
 
-   Copyright 1993, 94 Karl Berry.
+   Copyright 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
@@ -16,11 +16,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 STR_LLIST_H
 #define STR_LLIST_H
diff --git a/Build/source/texk/kpathsea/strcasecmp.c b/Build/source/texk/kpathsea/strcasecmp.c
index 23c1638d9e6..9bab6319cd1 100644
--- a/Build/source/texk/kpathsea/strcasecmp.c
+++ b/Build/source/texk/kpathsea/strcasecmp.c
@@ -1,24 +1,22 @@
 /* strcasecmp.c - case-insensitive strcmp
 
-    Copyright (C) 1991, 1992, 1995 Free Software Foundation, Inc.
-    This file was part of the GNU C Library. Modified by kb@mail.tug.org to
-    avoid glibc-isms.
-
-    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
-
-*/
+   Copyright 2008 Karl Berry.
+   Copyright 1991, 1992, 1995 Free Software Foundation, Inc.
+   This file was part of the GNU C Library.
+   Modified by Karl Berry for kpathsea.
+
+   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/>.  */
 
 #ifdef HAVE_CONFIG_H
 #include <config.h>
diff --git a/Build/source/texk/kpathsea/strstr.c b/Build/source/texk/kpathsea/strstr.c
index 5080a9e1e63..18dca9266a0 100644
--- a/Build/source/texk/kpathsea/strstr.c
+++ b/Build/source/texk/kpathsea/strstr.c
@@ -1,23 +1,22 @@
 /* strstr.c - search for a substring in string.
 
-    Copyright (C) 1994, 95 Free Software Foundation, Inc.
-    This file was part of the GNU C Library. Modified by kb@mail.tug.org.
-
-    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
-
-*/
+   Copyright 2008 Karl Berry.
+   Copyright (C) 1994, 1995 Free Software Foundation, Inc.
+   This file was part of the GNU C Library.
+   Modified for kpathsea by 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, see <http://www.gnu.org/licenses/>.  */
 
 /*
  * My personal strstr() implementation that beats most other algorithms.
diff --git a/Build/source/texk/kpathsea/strtol.c b/Build/source/texk/kpathsea/strtol.c
index add9cb46885..9c74eec9a57 100644
--- a/Build/source/texk/kpathsea/strtol.c
+++ b/Build/source/texk/kpathsea/strtol.c
@@ -1,27 +1,21 @@
-/*  strtol.c - convert a string to an unsigned long int.
+/* strtol.c - convert a string to an unsigned long int.
 
-    Copyright 1997  Karl Berry.
-    Copyright 1991, 1992, 1994, 1995 Free Software Foundation, Inc.
+   Copyright 1997, 2008 Karl Berry.
+   Copyright 1991, 1992, 1994, 1995 Free Software Foundation, Inc.
+   Modified by Karl Berry for kpathsea.
 
-    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
-
-*/
-
-/*  The original code in this file came from the GNU C Library,
-    with modifications to fit libkpathsea.
- */
+   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/>.  */
 
 #ifdef HAVE_CONFIG_H
 # include <config.h>
diff --git a/Build/source/texk/kpathsea/systypes.h b/Build/source/texk/kpathsea/systypes.h
index c1af9402f8e..e6f920c1f44 100644
--- a/Build/source/texk/kpathsea/systypes.h
+++ b/Build/source/texk/kpathsea/systypes.h
@@ -1,8 +1,7 @@
 /* c-systypes.h: include <sys/types.h>.  It's too bad we need this file,
-   but some systems don't protect <sys/types.h> from multiple
-   inclusions, and I'm not willing to put up with that.
+   but some systems don't protect <sys/types.h> from multiple inclusions.
 
-   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
@@ -14,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 C_SYSTYPES_H
 #define C_SYSTYPES_H
diff --git a/Build/source/texk/kpathsea/tex-file.c b/Build/source/texk/kpathsea/tex-file.c
index db8079a5af6..af1b297b9fe 100644
--- a/Build/source/texk/kpathsea/tex-file.c
+++ b/Build/source/texk/kpathsea/tex-file.c
@@ -1,23 +1,20 @@
 /* tex-file.c: high-level file searching by format.
 
-    Copyright 1993, 1994, 1995, 1996, 1997, 2007 Karl Berry.
-    Copyright 1998-2005 Olaf Weber.
+   Copyright 1993, 1994, 1995, 1996, 1997, 2007, 2008 Karl Berry.
+   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
-    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>