X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=config%2Fsrclist-update;h=a77e0e03029197a4003c87a52368f4bc49654148;hb=575e5c29872d9eef1940036f78c7ee202df905ff;hp=302ef438a607795a7a2f6c697b0c58f4b47086d3;hpb=cbe703a10b786dd2fd595d65e668ece801a4e767;p=gnulib.git

diff --git a/config/srclist-update b/config/srclist-update
index 302ef438a..a77e0e030 100755
--- a/config/srclist-update
+++ b/config/srclist-update
@@ -1,11 +1,13 @@
 #!/bin/sh
-# $Id: srclist-update,v 1.11 2003-08-13 06:48:58 eggert Exp $
+# $Id: srclist-update,v 1.15 2004-06-22 18:28:25 eggert 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.
+#
 # 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)
@@ -39,28 +41,24 @@ 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, 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)\
@@ -74,35 +72,27 @@ 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
-}
-
-
+'
 
 # sed command to remove lines containing $Id lines.
 # Quote the $Id 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
 }