X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=config%2Fsrclist-update;h=9366024b84156889af9c8bd30bf9a79eb985449b;hb=659635d90ba86841af96fed82c1226ae32e9a2cc;hp=53e5b897fffca09f4a56b83e3592bfa25a778896;hpb=e7888895a8a395c42f08595d3eb37b3869742b4d;p=gnulib.git

diff --git a/config/srclist-update b/config/srclist-update
index 53e5b897f..9366024b8 100755
--- a/config/srclist-update
+++ b/config/srclist-update
@@ -1,12 +1,10 @@
 #!/bin/sh
-# $Id: srclist-update,v 1.12 2003-08-13 07:04:57 eggert Exp $
+# $Id: srclist-update,v 1.18 2005-06-04 11:44:47 karl Exp $
 #
 # Check for files in directory $1 being up to date, according to the
 # list on stdin.  Don't actually make any changes, just show the diffs.
 #
-# Source `dirname $0`/srclistvars.sh first, if it exists.
-
-# Copyright (C) 2002, 2003 Free Software Foundation, Inc.
+# Copyright (C) 2002, 2003, 2005 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
@@ -19,11 +17,10 @@
 # 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.
+# along with this program; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
-# Written by Karl Berry.
+# Originally written by Karl Berry.
 
 
 if test -n "$1"; then
@@ -36,33 +33,30 @@ verbose=false
 : ${TMPDIR=/tmp}
 dsttmp=$TMPDIR/srclist.dst
 
+# Source `dirname $0`/srclistvars.sh first, if it exists.
 mydir=`dirname $0`
 test -r $mydir/srclistvars.sh && . $mydir/srclistvars.sh
 
 
 # 
-# $1 is input, output to stdout with gpl.
-#
-fixlicense() \
-{
-    sed '
-
-  /^\([[:space:]]*#[[:space:]]*\)Th[ei][ s].* is free software/,/^[[:space:]]*#.*USA\./c\
-#	This program is free software; you can redistribute it and/or modify\
-#	it under the terms of the GNU General Public License as published by\
-#	the Free Software Foundation; either version 2, or (at your option)\
-#	any later version.\
+# sed command to fix the license to be GPL.
+fixlicense='
+  /^[[:space:]]*#[[:space:]]*Th[ei][ s].* is free software/,/^[[:space:]]*#.*USA\./c\
+#   This program is free software; you can redistribute it and/or modify\
+#   it under the terms of the GNU General Public License as published by\
+#   the Free Software Foundation; either version 2, 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.\
+#   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.
+#   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.
 
-  /Th[ei][ s].* is free software/,/USA\.  *\*\//c\
+  /Th[ei][ s].* is free software/,/\*\//c\
    This program is free software; you can redistribute it and/or modify\
    it under the terms of the GNU General Public License as published by\
    the Free Software Foundation; either version 2, or (at your option)\
@@ -75,36 +69,28 @@ fixlicense() \
 \
    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.  */
-' $1
-}
-
-
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
+'
 
 # sed command to remove lines containing $Id lines.
-# Quote the $Id so that CVS does not expand it in this script.
+# Quote the $ so that CVS does not expand it in this script.
 remove_id_lines='/[$]Id:.*[$]/d'
 
-# sed command to remove trailing blanks.
-# Do not use [[:space:]] in this pattern, as that would kill formfeeds.
-remove_trailing_blanks='s/[	 ][	 ]*$//'
-
 # $1 is input file, $2 is output.
 # Remove $Id lines, since they'll differ between source locations.
 # If $options contains "gpl", change the license to be the standard
 # GPL.  We use this for libc files, et al.
-# Also, normalize white space simple-mindedly.
 #
 fixfile() \
 {
+  sed_command="$remove_id_lines"
+
   case " $options " in
   *' gpl '*)
-    fixlicense $1;;
-  *)
-    cat $1;;
-  esac \
-  | unexpand \
-  | sed "$remove_id_lines; $remove_trailing_blanks" >$2
+    sed_command="$sed_command; $fixlicense";;
+  esac
+
+  sed "$sed_command" $1 >$2
 }