renamed fetish to coreutils in a few more places

[Paul Eggert]

I installed the following patch to remove fetish to coreutils in a few
more places.  The only nontrivial bit here is removing fetish.sf.net
from some URL lists; I assume that's obsolete now?

2005-04-18  Paul Eggert  <address@hidden>

        "fetish" -> "coreutils" in several places.
        * Makefile.cfg (ftp): Remove fetish.sf.net.
        * Makefile.maint (emit_upload_commands): Likewise.
        * src/Makefile.am (LDADD, $(PROGRAMS)): fetish -> coreutils.
        * tests/group-names (COREUTILS_GROUPS): Renamed from FETISH_GROUPS.
        * tests/chmod/setgid (FETISH_GROUP): Renamed from COREUTILS_GROUP.

        * lib/Makefile.am (noinst_LIBRARIES): fetish -> coreutils.
        (libcoreutils_a_SOURCES): Renamed from libfetish_a_SOURCES.
        All uses changed.
        (libcoreutils_a_LIBADD): Renamed from libfetish_a_LIBADD.
        All uses changed.
        (libcoreutils_a_DEPENDENCIES): Renamed from libfetish_a_DEPENDENCIES.
        All uses changed.
        * lib/chdir-long.c: fetish->coreutils in comment.
        * lib/t-chdir-long: fetish->coreutils in compilation command.

        * m4/clock_time.m4 (gl_CLOCK_TIME): Use gl_ rather than fetish_ for
        variable names.
        * m4/jm-macros.m4 (gl_MACROS): Use gl_ or coreutils_ rather than fetish_
        for prefixes.
        * m4/rmdir-errno.m4 (gl_FUNC_RMDIR_NOTEMPTY): Renamed from
        fetish_FUNC_RMDIR_NOTEMPTY.  All uses changed.  Use gl_ for
        variable prefixes.

Index: Makefile.cfg
===================================================================
RCS file: /fetish/cu/Makefile.cfg,v
retrieving revision 1.22
diff -p -u -r1.22 Makefile.cfg
--- Makefile.cfg        22 Mar 2005 16:17:50 -0000      1.22
+++ Makefile.cfg        18 Apr 2005 23:29:32 -0000
@@ -24,8 +24,7 @@ gnu_ftp_host-major = ftp.gnu.org
 gnu_rel_host = $(gnu_ftp_host-$(RELEASE_TYPE))
 
 url_dir_list = \
-  ftp://$(gnu_rel_host)/gnu/coreutils \
-  http://fetish.sf.net
+  ftp://$(gnu_rel_host)/gnu/coreutils
 
 # Files to update automatically.
 wget_files = \
Index: Makefile.maint
===================================================================
RCS file: /fetish/cu/Makefile.maint,v
retrieving revision 1.199
diff -p -u -r1.199 Makefile.maint
--- Makefile.maint      9 Apr 2005 07:24:49 -0000       1.199
+++ Makefile.maint      18 Apr 2005 23:29:33 -0000
@@ -555,7 +555,6 @@ emit_upload_commands:
        @echo =====================================
        @echo =====================================
        @echo "$(srcdir)/gnupload $(GNUPLOADFLAGS) \\"
-       @echo "    --to fetish.sf.net:fetish-ftp \\"
        @echo "    --to $(gnu_rel_host):coreutils \\"
        @echo "  $(rel-files)"
        @echo '# send the /tmp/announcement e-mail'
Index: lib/Makefile.am
===================================================================
RCS file: /fetish/cu/lib/Makefile.am,v
retrieving revision 1.218
diff -p -u -r1.218 Makefile.am
--- lib/Makefile.am     11 Apr 2005 20:03:40 -0000      1.218
+++ lib/Makefile.am     18 Apr 2005 23:29:33 -0000
@@ -17,7 +17,7 @@
 ## Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 ## 02111-1307, USA.
 
-noinst_LIBRARIES = libfetish.a
+noinst_LIBRARIES = libcoreutils.a
 
 noinst_PROGRAMS = t-fpending
 LDADD = $(noinst_LIBRARIES)
@@ -25,7 +25,7 @@ LDADD = $(noinst_LIBRARIES)
 AM_CPPFLAGS = -I.. -I$(srcdir)
 DEFS += -DLIBDIR=\"$(libdir)\"
 
-libfetish_a_SOURCES = \
+libcoreutils_a_SOURCES = \
   allocsa.c allocsa.h \
   dev-ino.h \
   diacrit.c diacrit.h \
@@ -53,16 +53,16 @@ libfetish_a_SOURCES = \
   xstrtoimax.c \
   xstrtoumax.c
 
-libfetish_a_SOURCES += \
+libcoreutils_a_SOURCES += \
   printf-args.h \
   printf-parse.h \
   vasprintf.h \
   vasnprintf.h
 
-libfetish_a_LIBADD = $(LIBOBJS) $(ALLOCA)
-libfetish_a_DEPENDENCIES = $(libfetish_a_LIBADD)
+libcoreutils_a_LIBADD = $(LIBOBJS) $(ALLOCA)
+libcoreutils_a_DEPENDENCIES = $(libcoreutils_a_LIBADD)
 
-lib_OBJECTS = $(libfetish_a_OBJECTS)
+lib_OBJECTS = $(libcoreutils_a_OBJECTS)
 
 
 BUILT_SOURCES = getdate.c
Index: lib/chdir-long.c
===================================================================
RCS file: /fetish/cu/lib/chdir-long.c,v
retrieving revision 1.5
diff -p -u -r1.5 chdir-long.c
--- lib/chdir-long.c    3 Feb 2005 21:33:02 -0000       1.5
+++ lib/chdir-long.c    18 Apr 2005 23:29:33 -0000
@@ -269,6 +269,6 @@ main (int argc, char *argv[])
 
 /*
 Local Variables:
-compile-command: "gcc -DTEST_CHDIR=1 -DHAVE_CONFIG_H -I.. -g -O -W -Wall 
chdir-long.c libfetish.a"
+compile-command: "gcc -DTEST_CHDIR=1 -DHAVE_CONFIG_H -I.. -g -O -W -Wall 
chdir-long.c libcoreutils.a"
 End:
 */
Index: lib/t-chdir-long
===================================================================
RCS file: /fetish/cu/lib/t-chdir-long,v
retrieving revision 1.4
diff -p -u -r1.4 t-chdir-long
--- lib/t-chdir-long    19 Jan 2005 12:52:15 -0000      1.4
+++ lib/t-chdir-long    18 Apr 2005 23:29:33 -0000
@@ -4,7 +4,8 @@
 # temporary directories are easier to remove.
 # FIXME: don't clobber a.out
 
-gcc -DTEST_CHDIR=1 -DHAVE_CONFIG_H -I.. -g -O -W -Wall chdir-long.c libfetish.a
+gcc -DTEST_CHDIR=1 -DHAVE_CONFIG_H -I.. -g -O -W -Wall \
+  chdir-long.c libcoreutils.a
 
 vg='valgrind --track-fds=yes --leak-check=yes --quiet --num-callers=9'
 vg="$vg --leak-resolution=high"
Index: m4/clock_time.m4
===================================================================
RCS file: /fetish/cu/m4/clock_time.m4,v
retrieving revision 1.5
diff -p -u -r1.5 clock_time.m4
--- m4/clock_time.m4    23 Jan 2005 09:07:57 -0000      1.5
+++ m4/clock_time.m4    18 Apr 2005 23:29:33 -0000
@@ -1,5 +1,5 @@
-# clock_time.m4 serial 5
-dnl Copyright (C) 2002, 2003, 2004 Free Software Foundation, Inc.
+# clock_time.m4 serial 6
+dnl Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
@@ -16,11 +16,11 @@ AC_DEFUN([gl_CLOCK_TIME],
   # Save and restore LIBS so e.g., -lrt, isn't added to it.  Otherwise, *all*
   # programs in the package would end up linked with that potentially-shared
   # library, inducing unnecessary run-time overhead.
-  fetish_saved_libs=$LIBS
+  gl_saved_libs=$LIBS
     AC_SEARCH_LIBS(clock_gettime, [rt posix4],
                    [test "$ac_cv_search_clock_gettime" = "none required" ||
                     LIB_CLOCK_GETTIME=$ac_cv_search_clock_gettime])
     AC_SUBST(LIB_CLOCK_GETTIME)
     AC_CHECK_FUNCS(clock_gettime clock_settime)
-  LIBS=$fetish_saved_libs
+  LIBS=$gl_saved_libs
 ])
Index: m4/jm-macros.m4
===================================================================
RCS file: /fetish/cu/m4/jm-macros.m4,v
retrieving revision 1.210
diff -p -u -r1.210 jm-macros.m4
--- m4/jm-macros.m4     9 Apr 2005 04:52:54 -0000       1.210
+++ m4/jm-macros.m4     18 Apr 2005 23:29:33 -0000
@@ -1,4 +1,4 @@
-#serial 83   -*- autoconf -*-
+#serial 84   -*- autoconf -*-
 
 dnl Misc type-related macros for coreutils.
 
@@ -52,7 +52,7 @@ AC_DEFUN([gl_MACROS],
   AC_REQUIRE([gl_FUNC_DIRFD])
   AC_REQUIRE([AC_FUNC_ACL])
   AC_REQUIRE([gl_FUNC_LCHOWN])
-  AC_REQUIRE([fetish_FUNC_RMDIR_NOTEMPTY])
+  AC_REQUIRE([gl_FUNC_RMDIR_NOTEMPTY])
   AC_REQUIRE([gl_FUNC_CHOWN])
   AC_REQUIRE([AC_FUNC_LSTAT_FOLLOWS_SLASHED_SYMLINK])
   AC_REQUIRE([AC_FUNC_STRERROR_R])
@@ -132,13 +132,13 @@ AC_DEFUN([gl_MACROS],
   AC_REQUIRE([GL_FUNC_READDIR])
 
   # for dd.c and shred.c
-  fetish_saved_libs=$LIBS
+  coreutils_saved_libs=$LIBS
     AC_SEARCH_LIBS([fdatasync], [rt posix4],
                   [test "$ac_cv_search_fdatasync" = "none required" ||
                    LIB_FDATASYNC=$ac_cv_search_fdatasync])
     AC_SUBST([LIB_FDATASYNC])
     AC_CHECK_FUNCS(fdatasync)
-  LIBS=$fetish_saved_libs
+  LIBS=$coreutils_saved_libs
 
   # See if linking `seq' requires -lm.
   # It does on nearly every system.  The single exception (so far) is
Index: m4/rmdir-errno.m4
===================================================================
RCS file: /fetish/cu/m4/rmdir-errno.m4,v
retrieving revision 1.4
diff -p -u -r1.4 rmdir-errno.m4
--- m4/rmdir-errno.m4   23 Jan 2005 09:07:57 -0000      1.4
+++ m4/rmdir-errno.m4   18 Apr 2005 23:29:33 -0000
@@ -1,6 +1,6 @@
-#serial 4
+#serial 5
 
-# Copyright (C) 2000, 2001, Free Software Foundation, Inc.
+# Copyright (C) 2000, 2001, 2005 Free Software Foundation, Inc.
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -10,10 +10,10 @@
 # ENOTEMPTY is mistakenly defined to be EEXIST.  To work around this, and
 # in general, to avoid depending on the use of any particular symbol, this
 # test runs a test to determine the actual numeric value.
-AC_DEFUN([fetish_FUNC_RMDIR_NOTEMPTY],
+AC_DEFUN([gl_FUNC_RMDIR_NOTEMPTY],
 [dnl
   AC_CACHE_CHECK([for rmdir-not-empty errno value],
-    fetish_cv_func_rmdir_errno_not_empty,
+    gl_cv_func_rmdir_errno_not_empty,
     [
       # Arrange for deletion of the temporary directory this test creates.
       ac_clean_files="$ac_clean_files confdir2"
@@ -35,14 +35,14 @@ extern int errno;
          exit (0);
        }
        ],
-      fetish_cv_func_rmdir_errno_not_empty=`cat confdir2/errno`,
-      fetish_cv_func_rmdir_errno_not_empty='configure error in rmdir-errno.m4',
-      fetish_cv_func_rmdir_errno_not_empty=ENOTEMPTY
+      gl_cv_func_rmdir_errno_not_empty=`cat confdir2/errno`,
+      gl_cv_func_rmdir_errno_not_empty='configure error in rmdir-errno.m4',
+      gl_cv_func_rmdir_errno_not_empty=ENOTEMPTY
       )
     ]
   )
 
   AC_DEFINE_UNQUOTED([RMDIR_ERRNO_NOT_EMPTY],
-    $fetish_cv_func_rmdir_errno_not_empty,
+    $gl_cv_func_rmdir_errno_not_empty,
     [the value to which errno is set when rmdir fails on a nonempty directory])
 ])
Index: src/Makefile.am
===================================================================
RCS file: /fetish/cu/src/Makefile.am,v
retrieving revision 1.54
diff -p -u -r1.54 Makefile.am
--- src/Makefile.am     28 Mar 2005 19:22:36 -0000      1.54
+++ src/Makefile.am     18 Apr 2005 23:29:33 -0000
@@ -26,11 +26,11 @@ CLEANFILES = $(SCRIPTS) su
 AM_CPPFLAGS = -I.. -I$(srcdir) -I$(top_srcdir)/lib -I../lib
 
 # Sometimes, the expansion of $(LIBINTL) includes -lc which may
-# include modules defining variables like `optind', so libfetish.a
+# include modules defining variables like `optind', so libcoreutils.a
 # must precede $(LIBINTL) in order to ensure we use GNU getopt.
-# But libfetish.a must also follow $(LIBINTL), since libintl uses
-# replacement functions defined in libfetish.a.
-LDADD = ../lib/libfetish.a $(LIBINTL) ../lib/libfetish.a
+# But libcoreutils.a must also follow $(LIBINTL), since libintl uses
+# replacement functions defined in libcoreutils.a.
+LDADD = ../lib/libcoreutils.a $(LIBINTL) ../lib/libcoreutils.a
 
 # for eaccess in lib/euidaccess.c.
 cp_LDADD = $(LDADD) $(LIB_EACCESS)
@@ -79,7 +79,7 @@ uptime_LDADD = $(LDADD) $(GETLOADAVG_LIB
 
 su_LDADD = $(LDADD) $(LIB_CRYPT)
 
-$(PROGRAMS): ../lib/libfetish.a
+$(PROGRAMS): ../lib/libcoreutils.a
 
 SUFFIXES = .sh
 
Index: tests/group-names
===================================================================
RCS file: /fetish/cu/tests/group-names,v
retrieving revision 1.4
diff -p -u -r1.4 group-names
--- tests/group-names   17 Jan 2005 22:40:57 -0000      1.4
+++ tests/group-names   18 Apr 2005 23:29:33 -0000
@@ -2,16 +2,17 @@
 # Set `groups' to a space-separated list of at least two groups of which
 # the user is a member.
 
-groups=${FETISH_GROUPS-`(id -G || /usr/xpg4/bin/id -G) 2>/dev/null`}
+groups=${COREUTILS_GROUPS-`(id -G || /usr/xpg4/bin/id -G) 2>/dev/null`}
 case "$groups" in
   *' '*) ;;
   *) cat <<EOF 1>&2
 $0: this test requires that you be a member of more than one group,
-but running \`id -nG' either failed or found just one.  If you really
-are a member of at least two group, then rerun this test with FETISH_GROUPS
-set in your environment to the space-separated list of names.  E.g.,
+but running \`id -G' either failed or found just one.  If you really
+are a member of at least two groups, then rerun this test with
+COREUTILS_GROUPS set in your environment to the space-separated list
+of group names or numbers.  E.g.,
 
-  env FETISH_GROUPS='users cdrom' make check
+  env COREUTILS_GROUPS='users cdrom' make check
 
 EOF
      (exit 77); exit 77
Index: tests/chmod/setgid
===================================================================
RCS file: /fetish/cu/tests/chmod/setgid,v
retrieving revision 1.6
diff -p -u -r1.6 setgid
--- tests/chmod/setgid  23 Jun 2004 15:07:04 -0000      1.6
+++ tests/chmod/setgid  18 Apr 2005 23:29:33 -0000
@@ -32,11 +32,11 @@ mkdir d || framework_failure=1
 
 chmod g+s d 2> /dev/null ||
   {
-    # This is required because on some systems (at least  NetBSD 1.4.2A),
+    # This is required because on some systems (at least NetBSD 1.4.2A),
     # it may happen that when you create a directory, its group isn't one
     # to which you belong.  When that happens, the above chmod fails.  So
     # here, upon failure, we try to set the group, then rerun the chmod 
command.
-    group=${FETISH_GROUP-`(id -ng || /usr/xpg4/bin/id -ng) 2>/dev/null`}
+    group=${COREUTILS_GROUP-`(id -ng || /usr/xpg4/bin/id -ng) 2>/dev/null`}
     if test "$group"; then
       chgrp "$group" d || framework_failure=1
       chmod g+s d || framework_failure=1