X-Git-Url: https://git.brokenzipper.com/gitweb?a=blobdiff_plain;f=bootstrap;h=5aa460ab926955d53117a13b8c656fff976b1c75;hb=9766528b07318d3d7d35f504e9ded5a990c2ed24;hp=2afc661991aae58d9921a9f14c5810db73cf4716;hpb=8c119485a9fe85331eb1a265b1cbd9434e7bc813;p=chaz%2Ftar

diff --git a/bootstrap b/bootstrap
index 2afc661..5aa460a 100755
--- a/bootstrap
+++ b/bootstrap
@@ -2,7 +2,7 @@
 
 # Bootstrap 'tar' from CVS.
 
-# Copyright (C) 2003, 2004, 2005 Free Software Foundation, Inc.
+# Copyright (C) 2003, 2004, 2005, 2006 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
@@ -59,7 +59,7 @@ and the result is prepended to the command line options.
 Running without arguments will suffice in most cases. It is equivalent
 to
 
-    ./bootstrap --cvs-auth=ext --cvs-user=anoncvs
+    ./bootstrap --cvs-auth=pserver
 
 EOF
 }
@@ -71,7 +71,13 @@ update_po() {
     *)     POFILE=${1}.po;;
     esac
     echo "$0: getting translation for $1..."
-    wget -r --cache=off $TP_URL/$POFILE
+    (cd po;
+     wget -r --cache=off -O $POFILE $TP_URL/$POFILE || exit
+     LANG=`expr $POFILE : '\(.*\)\.po'`
+     if ! grep -q $LANG LINGUAS; then
+	mv LINGUAS LINGUAS.$$
+	(echo $LANG; cat LINGUAS.$$) | sort > LINGUAS
+     fi)
   else
     echo "$0: getting translations into po..."
     (cd po &&
@@ -150,10 +156,8 @@ checkout() {
     trap exit 1 2 13 15
     trap 'rm -fr $1; exit 1' 0
 
-    case "${CVS_AUTH--}" in
-    -)       build_cvs_prefix ext anoncvs
-             ;;
-    pserver) build_cvs_prefix $CVS_AUTH ${CVS_USER:-anoncvs}
+    case "${CVS_AUTH-pserver}" in
+    pserver) build_cvs_prefix pserver ${CVS_USER:-anonymous}
              ;;
     gserver|server)
 	     build_cvs_prefix $CVS_AUTH ${CVS_USER--}
@@ -163,10 +167,7 @@ checkout() {
     *)       echo "$0: Unknown CVS access method" >&2
 	     exit 1;;
     esac
-    if [ "${CVS_AUTH--}" = "pserver" ]; then
-      cvs -d ${CVS_PREFIX}subversions.gnu.org:/cvsroot/$1 login || exit
-    fi
-    cvs -q -d ${CVS_PREFIX}subversions.gnu.org:/cvsroot/$1 co $1 || exit
+    cvs -q -d ${CVS_PREFIX}cvs.sv.gnu.org:/cvsroot/$1 co $1 || exit
 
     trap - 0
   fi
@@ -203,11 +204,11 @@ copy_files() {
     esac
     dst=`echo $file | sed 's^.*/^^'`
     if [ $# -eq 3 ]; then
-      case $dst in  
+      case $dst in
       ${3}*) ;;
       *) dst=${3}$dst;;
       esac
-    fi	 
+    fi
     echo "$0: Copying file $1/$file to $2/$dst"
     cp -p $1/$file $2/$dst
   done
@@ -300,7 +301,7 @@ echo "$0: Creating m4/gnulib.m4"
  echo "])") > ./m4/gnulib.m4
 
 echo "$0: Creating lib/Makefile.am"
-(echo "# This file is generated automatically from lib/Makefile.am. Do not edit!"
+(echo "# This file is generated automatically. Do not edit!"
  cat lib/Makefile.tmpl
 
  for gnulib_module in $gnulib_modules; do