head	1.1;
branch	1.1.1;
access;
symbols
	netbsd-11-0-RC7:1.1.1.1
	netbsd-11-0-RC6:1.1.1.1
	netbsd-11-0-RC5:1.1.1.1
	netbsd-11-0-RC4:1.1.1.1
	netbsd-11-0-RC3:1.1.1.1
	netbsd-11-0-RC2:1.1.1.1
	netbsd-11-0-RC1:1.1.1.1
	perseant-exfatfs-base-20250801:1.1.1.1
	netbsd-11:1.1.1.1.0.62
	netbsd-11-base:1.1.1.1
	netbsd-10-1-RELEASE:1.1.1.1
	perseant-exfatfs-base-20240630:1.1.1.1
	perseant-exfatfs:1.1.1.1.0.60
	perseant-exfatfs-base:1.1.1.1
	netbsd-8-3-RELEASE:1.1.1.1
	netbsd-9-4-RELEASE:1.1.1.1
	netbsd-10-0-RELEASE:1.1.1.1
	netbsd-10-0-RC6:1.1.1.1
	netbsd-10-0-RC5:1.1.1.1
	netbsd-10-0-RC4:1.1.1.1
	netbsd-10-0-RC3:1.1.1.1
	netbsd-10-0-RC2:1.1.1.1
	netbsd-10-0-RC1:1.1.1.1
	netbsd-10:1.1.1.1.0.58
	netbsd-10-base:1.1.1.1
	netbsd-9-3-RELEASE:1.1.1.1
	cjep_sun2x-base1:1.1.1.1
	cjep_sun2x:1.1.1.1.0.56
	cjep_sun2x-base:1.1.1.1
	cjep_staticlib_x-base1:1.1.1.1
	netbsd-9-2-RELEASE:1.1.1.1
	cjep_staticlib_x:1.1.1.1.0.54
	cjep_staticlib_x-base:1.1.1.1
	netbsd-9-1-RELEASE:1.1.1.1
	phil-wifi-20200421:1.1.1.1
	phil-wifi-20200411:1.1.1.1
	is-mlppp:1.1.1.1.0.52
	is-mlppp-base:1.1.1.1
	phil-wifi-20200406:1.1.1.1
	netbsd-8-2-RELEASE:1.1.1.1
	netbsd-9-0-RELEASE:1.1.1.1
	netbsd-9-0-RC2:1.1.1.1
	netbsd-9-0-RC1:1.1.1.1
	phil-wifi-20191119:1.1.1.1
	netbsd-9:1.1.1.1.0.50
	netbsd-9-base:1.1.1.1
	phil-wifi-20190609:1.1.1.1
	netbsd-8-1-RELEASE:1.1.1.1
	netbsd-8-1-RC1:1.1.1.1
	pgoyette-compat-merge-20190127:1.1.1.1
	pgoyette-compat-20190127:1.1.1.1
	pgoyette-compat-20190118:1.1.1.1
	pgoyette-compat-1226:1.1.1.1
	pgoyette-compat-1126:1.1.1.1
	pgoyette-compat-1020:1.1.1.1
	pgoyette-compat-0930:1.1.1.1
	pgoyette-compat-0906:1.1.1.1
	netbsd-7-2-RELEASE:1.1.1.1
	pgoyette-compat-0728:1.1.1.1
	netbsd-8-0-RELEASE:1.1.1.1
	phil-wifi:1.1.1.1.0.48
	phil-wifi-base:1.1.1.1
	pgoyette-compat-0625:1.1.1.1
	netbsd-8-0-RC2:1.1.1.1
	pgoyette-compat-0521:1.1.1.1
	pgoyette-compat-0502:1.1.1.1
	pgoyette-compat-0422:1.1.1.1
	netbsd-8-0-RC1:1.1.1.1
	pgoyette-compat-0415:1.1.1.1
	pgoyette-compat-0407:1.1.1.1
	pgoyette-compat-0330:1.1.1.1
	pgoyette-compat-0322:1.1.1.1
	pgoyette-compat-0315:1.1.1.1
	netbsd-7-1-2-RELEASE:1.1.1.1
	pgoyette-compat:1.1.1.1.0.46
	pgoyette-compat-base:1.1.1.1
	netbsd-7-1-1-RELEASE:1.1.1.1
	matt-nb8-mediatek:1.1.1.1.0.44
	matt-nb8-mediatek-base:1.1.1.1
	perseant-stdc-iso10646:1.1.1.1.0.42
	perseant-stdc-iso10646-base:1.1.1.1
	netbsd-8:1.1.1.1.0.40
	netbsd-8-base:1.1.1.1
	prg-localcount2-base3:1.1.1.1
	prg-localcount2-base2:1.1.1.1
	prg-localcount2-base1:1.1.1.1
	prg-localcount2:1.1.1.1.0.38
	prg-localcount2-base:1.1.1.1
	pgoyette-localcount-20170426:1.1.1.1
	bouyer-socketcan-base1:1.1.1.1
	pgoyette-localcount-20170320:1.1.1.1
	netbsd-7-1:1.1.1.1.0.36
	netbsd-7-1-RELEASE:1.1.1.1
	netbsd-7-1-RC2:1.1.1.1
	netbsd-7-nhusb-base-20170116:1.1.1.1
	bouyer-socketcan:1.1.1.1.0.34
	bouyer-socketcan-base:1.1.1.1
	pgoyette-localcount-20170107:1.1.1.1
	netbsd-7-1-RC1:1.1.1.1
	pgoyette-localcount-20161104:1.1.1.1
	netbsd-7-0-2-RELEASE:1.1.1.1
	localcount-20160914:1.1.1.1
	netbsd-7-nhusb:1.1.1.1.0.32
	netbsd-7-nhusb-base:1.1.1.1
	pgoyette-localcount-20160806:1.1.1.1
	pgoyette-localcount-20160726:1.1.1.1
	pgoyette-localcount:1.1.1.1.0.30
	pgoyette-localcount-base:1.1.1.1
	netbsd-7-0-1-RELEASE:1.1.1.1
	netbsd-7-0:1.1.1.1.0.28
	netbsd-7-0-RELEASE:1.1.1.1
	netbsd-7-0-RC3:1.1.1.1
	netbsd-7-0-RC2:1.1.1.1
	netbsd-7-0-RC1:1.1.1.1
	netbsd-6-0-6-RELEASE:1.1.1.1
	netbsd-6-1-5-RELEASE:1.1.1.1
	netbsd-7:1.1.1.1.0.26
	netbsd-7-base:1.1.1.1
	yamt-pagecache-base9:1.1.1.1
	yamt-pagecache-tag8:1.1.1.1
	netbsd-6-1-4-RELEASE:1.1.1.1
	netbsd-6-0-5-RELEASE:1.1.1.1
	tls-earlyentropy:1.1.1.1.0.24
	tls-earlyentropy-base:1.1.1.1
	riastradh-xf86-video-intel-2-7-1-pre-2-21-15:1.1.1.1
	riastradh-drm2-base3:1.1.1.1
	netbsd-6-1-3-RELEASE:1.1.1.1
	netbsd-6-0-4-RELEASE:1.1.1.1
	netbsd-6-1-2-RELEASE:1.1.1.1
	netbsd-6-0-3-RELEASE:1.1.1.1
	netbsd-6-1-1-RELEASE:1.1.1.1
	riastradh-drm2-base2:1.1.1.1
	riastradh-drm2-base1:1.1.1.1
	riastradh-drm2:1.1.1.1.0.18
	riastradh-drm2-base:1.1.1.1
	netbsd-6-1:1.1.1.1.0.22
	netbsd-6-0-2-RELEASE:1.1.1.1
	netbsd-6-1-RELEASE:1.1.1.1
	netbsd-6-1-RC4:1.1.1.1
	netbsd-6-1-RC3:1.1.1.1
	agc-symver:1.1.1.1.0.20
	agc-symver-base:1.1.1.1
	netbsd-6-1-RC2:1.1.1.1
	netbsd-6-1-RC1:1.1.1.1
	yamt-pagecache-base8:1.1.1.1
	netbsd-6-0-1-RELEASE:1.1.1.1
	yamt-pagecache-base7:1.1.1.1
	matt-nb6-plus-nbase:1.1.1.1
	yamt-pagecache-base6:1.1.1.1
	netbsd-6-0:1.1.1.1.0.16
	netbsd-6-0-RELEASE:1.1.1.1
	netbsd-6-0-RC2:1.1.1.1
	tls-maxphys:1.1.1.1.0.14
	tls-maxphys-base:1.1.1.1
	matt-nb6-plus:1.1.1.1.0.12
	matt-nb6-plus-base:1.1.1.1
	netbsd-6-0-RC1:1.1.1.1
	yamt-pagecache-base5:1.1.1.1
	yamt-pagecache-base4:1.1.1.1
	netbsd-6:1.1.1.1.0.10
	netbsd-6-base:1.1.1.1
	yamt-pagecache-base3:1.1.1.1
	yamt-pagecache-base2:1.1.1.1
	yamt-pagecache:1.1.1.1.0.8
	yamt-pagecache-base:1.1.1.1
	cherry-xenmp:1.1.1.1.0.6
	cherry-xenmp-base:1.1.1.1
	bouyer-quota2-nbase:1.1.1.1
	bouyer-quota2:1.1.1.1.0.4
	bouyer-quota2-base:1.1.1.1
	matt-mips64-premerge-20101231:1.1.1.1
	matt-premerge-20091211:1.1.1.1
	jym-xensuspend-base:1.1.1.1
	jym-xensuspend:1.1.1.1.0.2
	jym-xensuspend-nbase:1.1.1.1
	CVS1_12_13:1.1.1.1
	NONGNU:1.1.1;
locks; strict;
comment	@# @;


1.1
date	2009.04.07.22.10.23;	author christos;	state Exp;
branches
	1.1.1.1;
next	;

1.1.1.1
date	2009.04.07.22.10.23;	author christos;	state Exp;
branches
	1.1.1.1.2.1;
next	;

1.1.1.1.2.1
date	2009.04.07.22.10.23;	author jym;	state dead;
branches;
next	1.1.1.1.2.2;

1.1.1.1.2.2
date	2009.05.13.18.53.15;	author jym;	state Exp;
branches;
next	;


desc
@@


1.1
log
@Initial revision
@
text
@#! /bin/sh
# Update the local files from GNULIB.  Currently assumes that the current
# GNULIB sources are in a directory parallel with this one.
#
# 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.
#
# 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.

if test -f maint-aux/gnulib-modules; then :; else
  >&2 echo \
"This script expects to be run from the top level of the CVS source tree."
  exit 2
fi

if test -f maint-aux/gnulib-modules; then :; else
  >&2 echo \
"Failed to find the modules list (\`maint-aux/gnulib-modules')."
  exit 2
fi

# Where to find the GNULIB sources.
: ${GNULIB="../gnulib"}
GNULIB_TOOL=$GNULIB/gnulib-tool

# Which modules to update.
MODULES=`cat maint-aux/gnulib-modules`

# Are the GNULIB sources really where we expect them?
if test -r $GNULIB && test -d $GNULIB \
   && test -r $GNULIB_TOOL && test -f $GNULIB_TOOL; then :; else
  echo GNULIB sources not found. >&2
  exit 1
fi

trap \
'status=$?
# Restore lib/Makefile.am.
if test -f lib/Makefile.am.save; then
  mv lib/Makefile.am.save lib/Makefile.am
fi
# Restore m4/error.m4.
if test -f m4/error.m4.save; then
  mv m4/error.m4.save m4/error.m4
fi
exit $status' EXIT
	
# Prevent lib/Makefile.am from being overwritten.
mv lib/Makefile.am lib/Makefile.am.save
# Prevent m4/error.m4 from being overwritten unless necessary.
mv m4/error.m4 m4/error.m4.save

# Run the update.
if $GNULIB_TOOL --import $MODULES >/dev/null; then :; else
  exit $?
fi

# Correct this file for our purposes, but try to avoid munging timestamps
# unless necessary.
sed '/AC_FUNC_ERROR_AT_LINE/d' <m4/error.m4 >tmp
if cmp tmp m4/error.m4.save >/dev/null 2>&1; then
  mv m4/error.m4.save m4/error.m4
  rm tmp
else
  mv tmp m4/error.m4
  rm m4/error.m4.save
fi

# Extract the names of the files we imported.
$GNULIB_TOOL --extract-filelist $MODULES |sort |uniq |sed '/^$/d' \
	>maint-aux/gnulib-filelist.new

# Warn the user if the filelist has changed.
if cmp maint-aux/gnulib-filelist.txt maint-aux/gnulib-filelist.new >/dev/null
then
  # Avoid munging timestamps when nothing's changed.
  rm maint-aux/gnulib-filelist.new
else
  cat >&2 <<\EOF
********************************************************************
The file list has changed.  You may need to add or remove files from
CVS.  Use `cvs diff maint-aux/gnulib-filelist.txt' to view changes.
********************************************************************
EOF
  # Save the file list for next time.
  mv maint-aux/gnulib-filelist.new maint-aux/gnulib-filelist.txt
fi


# Warn the user if changes have been made to the Makefile.am.
if cmp lib/Makefile.am lib/Makefile.gnulib >/dev/null; then
  # Avoid munging timestamps when nothing's changed.
  rm lib/Makefile.am
else
  cat >&2 <<\EOF
********************************************************************
Makefile.am needs updating. Use `cvs diff lib/Makefile.gnulib' to
view changes.
********************************************************************
EOF
  # Save the generated lib/Makefile.am for next time.
  mv lib/Makefile.am lib/Makefile.gnulib
fi
@


1.1.1.1
log
@from ftp.gnu.org
@
text
@@


1.1.1.1.2.1
log
@file gnulib-update was added on branch jym-xensuspend on 2009-05-13 18:53:15 +0000
@
text
@d1 112
@


1.1.1.1.2.2
log
@Sync with HEAD.

Second commit. See http://mail-index.netbsd.org/source-changes/2009/05/13/msg221222.html
@
text
@a0 112
#! /bin/sh
# Update the local files from GNULIB.  Currently assumes that the current
# GNULIB sources are in a directory parallel with this one.
#
# 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.
#
# 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.

if test -f maint-aux/gnulib-modules; then :; else
  >&2 echo \
"This script expects to be run from the top level of the CVS source tree."
  exit 2
fi

if test -f maint-aux/gnulib-modules; then :; else
  >&2 echo \
"Failed to find the modules list (\`maint-aux/gnulib-modules')."
  exit 2
fi

# Where to find the GNULIB sources.
: ${GNULIB="../gnulib"}
GNULIB_TOOL=$GNULIB/gnulib-tool

# Which modules to update.
MODULES=`cat maint-aux/gnulib-modules`

# Are the GNULIB sources really where we expect them?
if test -r $GNULIB && test -d $GNULIB \
   && test -r $GNULIB_TOOL && test -f $GNULIB_TOOL; then :; else
  echo GNULIB sources not found. >&2
  exit 1
fi

trap \
'status=$?
# Restore lib/Makefile.am.
if test -f lib/Makefile.am.save; then
  mv lib/Makefile.am.save lib/Makefile.am
fi
# Restore m4/error.m4.
if test -f m4/error.m4.save; then
  mv m4/error.m4.save m4/error.m4
fi
exit $status' EXIT
	
# Prevent lib/Makefile.am from being overwritten.
mv lib/Makefile.am lib/Makefile.am.save
# Prevent m4/error.m4 from being overwritten unless necessary.
mv m4/error.m4 m4/error.m4.save

# Run the update.
if $GNULIB_TOOL --import $MODULES >/dev/null; then :; else
  exit $?
fi

# Correct this file for our purposes, but try to avoid munging timestamps
# unless necessary.
sed '/AC_FUNC_ERROR_AT_LINE/d' <m4/error.m4 >tmp
if cmp tmp m4/error.m4.save >/dev/null 2>&1; then
  mv m4/error.m4.save m4/error.m4
  rm tmp
else
  mv tmp m4/error.m4
  rm m4/error.m4.save
fi

# Extract the names of the files we imported.
$GNULIB_TOOL --extract-filelist $MODULES |sort |uniq |sed '/^$/d' \
	>maint-aux/gnulib-filelist.new

# Warn the user if the filelist has changed.
if cmp maint-aux/gnulib-filelist.txt maint-aux/gnulib-filelist.new >/dev/null
then
  # Avoid munging timestamps when nothing's changed.
  rm maint-aux/gnulib-filelist.new
else
  cat >&2 <<\EOF
********************************************************************
The file list has changed.  You may need to add or remove files from
CVS.  Use `cvs diff maint-aux/gnulib-filelist.txt' to view changes.
********************************************************************
EOF
  # Save the file list for next time.
  mv maint-aux/gnulib-filelist.new maint-aux/gnulib-filelist.txt
fi


# Warn the user if changes have been made to the Makefile.am.
if cmp lib/Makefile.am lib/Makefile.gnulib >/dev/null; then
  # Avoid munging timestamps when nothing's changed.
  rm lib/Makefile.am
else
  cat >&2 <<\EOF
********************************************************************
Makefile.am needs updating. Use `cvs diff lib/Makefile.gnulib' to
view changes.
********************************************************************
EOF
  # Save the generated lib/Makefile.am for next time.
  mv lib/Makefile.am lib/Makefile.gnulib
fi
@