use version-etc-fsf

2010-08-30  Paolo Bonzini  <bonzini@gnu.org>

	* Makefile.am (dist-hook): Remove COPYRIGHT_YEAR check.
	* autoboot.conf (gnulib_modules): Add version-etc-fsf.
	* configure.ac (COPYRIGHT_YEAR): Remove.  Change package name to
	"GNU sed".
	* doc/sed.1: Regenerate.
	* sed/sed.c (AUTHORS): New.
	(main): Use version_etc.

8 files changed, 90 insertions, 37 deletions

diff --git a/ChangeLog b/ChangeLog
index e2c2832..1683189 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2010-08-30  Paolo Bonzini  <bonzini@gnu.org>
+
+	* Makefile.am (dist-hook): Remove COPYRIGHT_YEAR check.
+	* autoboot.conf (gnulib_modules): Add version-etc-fsf.
+	* configure.ac (COPYRIGHT_YEAR): Remove.  Change package name to
+	"GNU sed".
+	* doc/sed.1: Regenerate.
+	* sed/sed.c (AUTHORS): New.
+	(main): Use version_etc.
+
 2010-08-30  Timothy Baker  <timothypaulbaker@gmail.com> (tiny change)
 
 	* doc/sed.texi (Regular expressions): Fix typo.
diff --git a/Makefile.am b/Makefile.am
index 03f4948..4736df9 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -21,8 +21,6 @@ DISTCHECK_CONFIGURE_FLAGS = XGETTEXT='$(SHELL) -c : dummy' $(EXTRA_DC_FLAGS)
 EXTRA_DC_FLAGS =
 
 dist-hook:
-	test $(COPYRIGHT_YEAR) = `date +%Y` || \
-	  { echo Copyright year not updated; exit 1; }
 	cmp bootstrap.sh $(srcdir)/bootstrap.sh > /dev/null 2>&1 || \
 	  cp -p bootstrap.sh $(srcdir)/bootstrap.sh
 	cp -p $(srcdir)/bootstrap.sh $(distdir)/bootstrap.sh
diff --git a/autoboot.conf b/autoboot.conf
index 0c34ce3..88f692e 100644
--- a/autoboot.conf
+++ b/autoboot.conf
@@ -21,7 +21,7 @@ gnulib_modules="
     acl alloca btowc extensions getline getopt gettext localcharset
     mbrlen mbrtowc memchr mbsinit mkostemp obstack pathmax rename
     selinux-h snprintf stdbool stat-macros strerror strverscmp ssize_t
-    unlocked-io vasnprintf verify wcrtomb wctob"
+    unlocked-io vasnprintf verify version-etc-fsf wcrtomb wctob"
 
 SKIP_PO=t
 checkout_only_file=
diff --git a/configure.ac b/configure.ac
index 83ff511..673e4f5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 dnl Process this file with -*- autoconf -*- to produce a configure script.
-AC_INIT(sed, 3.63, bonzini@gnu.org, ssed)
+AC_INIT([super-sed], 3.63, bonzini@gnu.org, ssed)
 AC_CONFIG_AUX_DIR(build-aux)
 AC_CONFIG_SRCDIR([sed/sed.c])
 AM_CONFIG_HEADER(config.h:config_h.in)
@@ -11,11 +11,6 @@ AC_DEFINE_UNQUOTED(SED_FEATURE_VERSION, "$SED_FEATURE_VERSION",
   [Define to the version of GNU sed whose features are supported by this sed.])
 AC_SUBST(SED_FEATURE_VERSION)
 
-COPYRIGHT_YEAR=2009
-AC_DEFINE_UNQUOTED(COPYRIGHT_YEAR, $COPYRIGHT_YEAR,
-  [Define to the copyright year printed by --version.])
-AC_SUBST(COPYRIGHT_YEAR)
-
 AC_PROG_CC
 gl_EARLY
 gl_INIT
diff --git a/doc/sed.1 b/doc/sed.1
index 49c267d..102f8d2 100644
--- a/doc/sed.1
+++ b/doc/sed.1
@@ -1,5 +1,5 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.28.
-.TH SED "1" "August 2010" "sed version 4.2.1" "User Commands"
+.TH SED "1" "August 2010" "sed (super-sed) 3.63" "User Commands"
 .SH NAME
 sed \- stream editor for filtering and transforming text
 .SH SYNOPSIS
@@ -52,6 +52,10 @@ disable all GNU extensions.
 .IP
 use extended regular expressions in the script.
 .HP
+\fB\-R\fR, \fB\-\-regexp\-perl\fR
+.IP
+use Perl 5's regular expressions syntax in the script.
+.HP
 \fB\-s\fR, \fB\-\-separate\fR
 .IP
 consider files as separate rather than as a single continuous
@@ -73,10 +77,8 @@ non-option argument is taken as the sed script to interpret.  All
 remaining arguments are names of input files; if no input files are
 specified, then the standard input is read.
 .PP
-GNU sed home page: <http://www.gnu.org/software/sed/>.
-General help using GNU software: <http://www.gnu.org/gethelp/>.
-E-mail bug reports to: <bug-gnu-utils@gnu.org>.
-Be sure to include the word ``sed'' somewhere in the ``Subject:'' field.
+E-mail bug reports to: <bonzini@gnu.org>.
+Be sure to include the word ``ssed'' somewhere in the ``Subject:'' field.
 .SH "COMMAND SYNOPSIS"
 This is just a brief synopsis of \*(sd commands to serve as
 a reminder to those who already know \*(sd;
@@ -367,17 +369,17 @@ E-mail bug reports to
 Be sure to include the word ``sed'' somewhere in the ``Subject:'' field.
 Also, please include the output of ``sed --version'' in the body
 of your report if at all possible.
+.SH AUTHOR
+Written by Jay Fenlason, Tom Lord, Ken Pizzini,
+and Paolo Bonzini.
+E-mail bug reports to: <bonzini@gnu.org>.
+Be sure to include the word ``ssed'' somewhere in the ``Subject:'' field.
 .SH COPYRIGHT
-Copyright \(co 2009 Free Software Foundation, Inc.
+Copyright \(co 2010 Free Software Foundation, Inc.
+License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>.
 .br
-This is free software; see the source for copying conditions.  There is NO
-warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE,
-to the extent permitted by law.
-.PP
-GNU sed home page: <http://www.gnu.org/software/sed/>.
-General help using GNU software: <http://www.gnu.org/gethelp/>.
-E-mail bug reports to: <bug-gnu-utils@gnu.org>.
-Be sure to include the word ``sed'' somewhere in the ``Subject:'' field.
+This is free software: you are free to change and redistribute it.
+There is NO WARRANTY, to the extent permitted by law.
 .SH "SEE ALSO"
 .BR awk (1),
 .BR ed (1),
diff --git a/lib/.gitignore b/lib/.gitignore
index 1f40f01..21000f0 100644
--- a/lib/.gitignore
+++ b/lib/.gitignore
@@ -10,6 +10,9 @@ basename.c
 btowc.c
 c-ctype.c
 c-ctype.h
+c-strcase.h
+c-strcasecmp.c
+c-strncasecmp.c
 canonicalize-lgpl.c
 config.charset
 copy-acl.c
@@ -38,6 +41,19 @@ getpagesize.c
 gettext.h
 gettimeofday.c
 gnulib.mk
+iconv.h
+iconv.in.h
+iconv_open-aix.gperf
+iconv_open-aix.h
+iconv_open-hpux.gperf
+iconv_open-hpux.h
+iconv_open-irix.gperf
+iconv_open-irix.h
+iconv_open-osf.gperf
+iconv_open-osf.h
+iconv_open-solaris.gperf
+iconv_open-solaris.h
+iconv_open.c
 intprops.h
 langinfo.h
 langinfo.in.h
@@ -48,10 +64,17 @@ malloc.c
 malloca.c
 malloca.h
 malloca.valgrind
+mbchar.c
+mbchar.h
+mbiter.h
 mbrlen.c
 mbrtowc.c
 mbsinit.c
+mbslen.c
+mbsstr.c
+mbuiter.h
 memchr.c
+memchr.valgrind
 memcmp.c
 memmove.c
 mkostemp.c
@@ -63,6 +86,8 @@ printf-args.c
 printf-args.h
 printf-parse.c
 printf-parse.h
+propername.c
+propername.h
 quote.c
 quote.h
 quotearg.c
@@ -91,6 +116,8 @@ size_max.h
 snprintf.c
 stat-macros.h
 stat.c
+stdarg.h
+stdarg.in.h
 stdbool.h
 stdbool.in.h
 stddef.h
@@ -102,13 +129,18 @@ stdio.h
 stdio.in.h
 stdlib.h
 stdlib.in.h
+str-kmp.h
 streq.h
 strerror.c
+striconv.c
+striconv.h
 string.h
 string.in.h
 stripslash.c
 strndup.c
 strnlen.c
+strnlen1.c
+strnlen1.h
 strverscmp.c
 sys
 sys_stat.h
@@ -119,21 +151,33 @@ tempname.c
 tempname.h
 time.h
 time.in.h
+trim.c
+trim.h
 unistd.h
 unistd.in.h
+unitypes.h
+unitypes.in.h
+uniwidth.h
+uniwidth.in.h
 unlocked-io.h
 vasnprintf.c
 vasnprintf.h
 verify.h
+version-etc-fsf.c
+version-etc.c
+version-etc.h
 wchar.h
 wchar.in.h
 wcrtomb.c
 wctob.c
 wctype.h
 wctype.in.h
+wcwidth.c
 xalloc-die.c
 xalloc.h
 xmalloc.c
 xsize.h
+xstriconv.c
+xstriconv.h
 xstrndup.c
 xstrndup.h
diff --git a/m4/.gitignore b/m4/.gitignore
index 05c953f..25957b4 100644
--- a/m4/.gitignore
+++ b/m4/.gitignore
@@ -14,8 +14,8 @@ errno_h.m4
 error.m4
 exitfail.m4
 extensions.m4
-float_h.m4
 fcntl-o.m4
+float_h.m4
 getdelim.m4
 getline.m4
 getopt.m4
@@ -29,6 +29,8 @@ gnulib-common.m4
 gnulib-comp.m4
 gnulib-tool.m4
 iconv.m4
+iconv_h.m4
+iconv_open.m4
 include_next.m4
 inline.m4
 intdiv0.m4
@@ -45,6 +47,7 @@ lcmessage.m4
 lib-ld.m4
 lib-link.m4
 lib-prefix.m4
+libunistring-base.m4
 localcharset.m4
 locale-fr.m4
 locale-ja.m4
@@ -55,9 +58,12 @@ longlong.m4
 lstat.m4
 malloc.m4
 malloca.m4
+mbchar.m4
+mbiter.m4
 mbrlen.m4
 mbrtowc.m4
 mbsinit.m4
+mbslen.m4
 mbstate_t.m4
 memchr.m4
 memcmp.m4
@@ -87,6 +93,7 @@ size_max.m4
 snprintf.m4
 ssize_t.m4
 stat.m4
+stdarg.m4
 stdbool.m4
 stddef_h.m4
 stdint.m4
@@ -108,6 +115,7 @@ ulonglong.m4
 unistd_h.m4
 unlocked-io.m4
 vasnprintf.m4
+version-etc.m4
 visibility.m4
 warn-on-use.m4
 wchar.m4
@@ -117,6 +125,7 @@ wcrtomb.m4
 wctob.m4
 wctype.m4
 wctype_h.m4
+wcwidth.m4
 wint_t.m4
 xalloc.m4
 xsize.m4
diff --git a/sed/sed.c b/sed/sed.c
index 723958d..f8b497e 100644
--- a/sed/sed.c
+++ b/sed/sed.c
@@ -56,6 +56,12 @@
 # define ATOI(x)	strtoul(x, NULL, 0)
 #endif
 
+#define AUTHORS \
+   _("Jay Fenlason"), \
+   _("Tom Lord"), \
+   _("Ken Pizzini"), \
+   _("Paolo Bonzini")
+
 char *program_name;
 
 int extended_regexp_flags = 0;
@@ -311,20 +317,9 @@ main(argc, argv)
 	  break;
 
 	case 'v':
-#ifdef REG_PERL
-	  fprintf(stdout, _("super-sed version %s\n"), VERSION);
-	  fprintf(stdout, _("based on GNU sed version %s\n\n"), SED_FEATURE_VERSION);
-#else
-	  fprintf(stdout, _("GNU sed version %s\n"), VERSION);
-#endif
-	  fprintf(stdout, _("Copyright (C) %d Free Software Foundation, Inc.\n\
-This is free software; see the source for copying conditions.  There is NO\n\
-warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE,\n\
-to the extent permitted by law.\n\
-"), COPYRIGHT_YEAR);
-	  fputc('\n', stdout);
+          version_etc(stdout, program_name, PACKAGE_NAME, VERSION,
+                      AUTHORS, (char *) NULL);
 	  contact(false);
-
 	  ck_fclose (NULL);
 	  exit (0);
 	case 'h':