[src/trunk]: src/gnu grep is no longer build as 3 programs, etc., and back to...

[mrg <mrg%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/f9bbb35c78bd
branches:  trunk
changeset: 471637:f9bbb35c78bd
user:      mrg <mrg%NetBSD.org@localhost>
date:      Tue Apr 06 16:54:55 1999 +0000

description:
grep is no longer build as 3 programs, etc., and back to how it was before the latest update.  we are not GNU.

diffstat:

 gnu/dist/grep/src/grep.c          |    7 +
 gnu/usr.bin/grep/Makefile         |   30 ++++-
 gnu/usr.bin/grep/Makefile.inc     |   17 ---
 gnu/usr.bin/grep/common/Makefile  |   19 ---
 gnu/usr.bin/grep/common/config.h  |  186 --------------------------------------
 gnu/usr.bin/grep/common/libintl.h |    3 -
 gnu/usr.bin/grep/config.h         |  186 ++++++++++++++++++++++++++++++++++++++
 gnu/usr.bin/grep/egrep/Makefile   |    8 -
 gnu/usr.bin/grep/fgrep/Makefile   |    8 -
 gnu/usr.bin/grep/grep/Makefile    |    9 -
 gnu/usr.bin/grep/libintl.h        |    3 +
 11 files changed, 220 insertions(+), 256 deletions(-)

diffs (truncated from 544 to 300 lines):

diff -r be8e2d94eded -r f9bbb35c78bd gnu/dist/grep/src/grep.c
--- a/gnu/dist/grep/src/grep.c  Tue Apr 06 16:28:42 1999 +0000
+++ b/gnu/dist/grep/src/grep.c  Tue Apr 06 16:54:55 1999 +0000
@@ -1015,6 +1015,9 @@
   FILE *fp;
   extern char *optarg;
   extern int optind;
+#ifdef __NetBSD__
+  extern char *__progname;
+#endif
 
   initialize_main (&argc, &argv);
   prog = argv[0];
@@ -1287,7 +1290,11 @@
       usage (2);
 
   if (! matcher)
+#ifdef __NetBSD__
+    matcher = __progname;
+#else
     matcher = default_matcher;
+#endif
 
   if (!setmatcher (matcher) && !setmatcher ("default"))
     abort ();
diff -r be8e2d94eded -r f9bbb35c78bd gnu/usr.bin/grep/Makefile
--- a/gnu/usr.bin/grep/Makefile Tue Apr 06 16:28:42 1999 +0000
+++ b/gnu/usr.bin/grep/Makefile Tue Apr 06 16:54:55 1999 +0000
@@ -1,8 +1,20 @@
-#      $NetBSD: Makefile,v 1.10 1999/02/11 17:26:22 tv Exp $
+#      $NetBSD: Makefile,v 1.11 1999/04/06 16:54:55 mrg Exp $
 
-SUBDIR=                common egrep fgrep grep
+PROG=          grep
+SRCS=          bindtextdom.c dcgettext.c dgettext.c gettext.c finddomain.c \
+               loadmsgcat.c localealias.c textdomain.c l10nflist.c \
+               explodename.c intl-compat.c
+SRCS+=         grep.c dfa.c kwset.c obstack.c savedir.c getopt.c getopt1.c \
+               search.c stpcpy.c regex.c
+MAN=           grep.1
 
-all-egrep all-fgrep all-grep: all-common
+DIST=          ${.CURDIR}/../../dist
+
+CPPFLAGS+=     -I${DIST}/grep/src -I${DIST}/grep/intl -I${.CURDIR} \
+               -DHAVE_CONFIG_H \
+               -DGNULOCALEDIR=\"/usr/share/locale\" \
+               -DLOCALE_ALIAS_PATH=\"/usr/share/locale:.\" \
+               -DLOCALEDIR=\"/usr/share/locale\"
 
 .for F in de.gmo el.gmo es.gmo fr.gmo ko.gmo nl.gmo no.gmo pl.gmo ru.gmo \
        sl.gmo sv.gmo
@@ -13,7 +25,13 @@
 
 TEXINFO=       grep.texi
 INFOFLAGS=     -I${.CURDIR}/../../dist/grep/doc
-.PATH: ${.CURDIR}/../../dist/grep/doc ${.CURDIR}/../../dist/grep/po
+
 
-.include <bsd.info.mk>
-.include <bsd.subdir.mk>
+MLINKS=        grep.1 egrep.1 \
+       grep.1 fgrep.1
+LINKS= ${BINDIR}/grep ${BINDIR}/egrep \
+       ${BINDIR}/grep ${BINDIR}/fgrep
+
+.include <bsd.prog.mk>
+
+.PATH: ${DIST}/grep/doc ${DIST}/grep/intl ${DIST}/grep/po ${DIST}/grep/src 
diff -r be8e2d94eded -r f9bbb35c78bd gnu/usr.bin/grep/Makefile.inc
--- a/gnu/usr.bin/grep/Makefile.inc     Tue Apr 06 16:28:42 1999 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,17 +0,0 @@
-#      $NetBSD: Makefile.inc,v 1.2 1999/02/11 17:26:22 tv Exp $
-
-DIST=          ${.CURDIR}/../../../dist
-.PATH: ${DIST}/grep/src ${DIST}/grep/doc
-
-.if !make(print-objdir)
-LIBCOMMONDIR!= cd ${.CURDIR}/../common && ${MAKE} -s print-objdir
-.endif
-
-CPPFLAGS+=     -I${.CURDIR}/../common -I${DIST}/grep/intl -DHAVE_CONFIG_H \
-               -DLOCALEDIR=\"/usr/share/locale\"
-DPADD+=                ${LIBCOMMONDIR}/libcommon.a
-LDADD+=                -L${LIBCOMMONDIR} -lcommon
-
-.if exists(${.CURDIR}/../../Makefile.inc)
-.include "${.CURDIR}/../../Makefile.inc"
-.endif
diff -r be8e2d94eded -r f9bbb35c78bd gnu/usr.bin/grep/common/Makefile
--- a/gnu/usr.bin/grep/common/Makefile  Tue Apr 06 16:28:42 1999 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,19 +0,0 @@
-#      $NetBSD: Makefile,v 1.3 1999/02/13 02:54:25 lukem Exp $
-
-LIB=           common
-SRCS=          bindtextdom.c dcgettext.c dgettext.c gettext.c finddomain.c \
-               loadmsgcat.c localealias.c textdomain.c l10nflist.c \
-               explodename.c intl-compat.c
-SRCS+=         grep.c dfa.c kwset.c obstack.c savedir.c getopt.c getopt1.c \
-               search.c stpcpy.c regex.c
-CPPFLAGS+=     -DGNULOCALEDIR=\"/usr/share/locale\" \
-               -DLOCALE_ALIAS_PATH=\"/usr/share/locale:.\"
-
-MKLINT=                no
-MKPIC=         no
-MKPROFILE=     no
-MKLINKLIB=     no
-
-.include <bsd.lib.mk>
-
-.PATH: ${DIST}/grep/intl
diff -r be8e2d94eded -r f9bbb35c78bd gnu/usr.bin/grep/common/config.h
--- a/gnu/usr.bin/grep/common/config.h  Tue Apr 06 16:28:42 1999 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,186 +0,0 @@
-/* config.h.  Generated automatically by configure.  */
-/* config.hin.  Generated automatically from configure.in by autoheader.  */
-
-/* Define if using alloca.c.  */
-/* #undef C_ALLOCA */
-
-/* Define if the closedir function returns void instead of int.  */
-/* #undef CLOSEDIR_VOID */
-
-/* Define to empty if the keyword does not work.  */
-/* #undef const */
-
-/* Define to one of _getb67, GETB67, getb67 for Cray-2 and Cray-YMP systems.
-   This function is required for alloca.c support on those systems.  */
-/* #undef CRAY_STACKSEG_END */
-
-/* Define if you have alloca, as a function or macro.  */
-#define HAVE_ALLOCA 1
-
-/* Define if you have <alloca.h> and it should be used (not on Ultrix).  */
-/* #undef HAVE_ALLOCA_H */
-
-/* Define if you have a working `mmap' system call.  */
-#define HAVE_MMAP 1
-
-/* Define as __inline if that's what the C compiler calls it.  */
-/* #undef inline */
-
-/* Define to `long' if <sys/types.h> doesn't define.  */
-/* #undef off_t */
-
-/* Define to `unsigned' if <sys/types.h> doesn't define.  */
-/* #undef size_t */
-
-/* If using the C implementation of alloca, define if you know the
-   direction of stack growth for your system; otherwise it will be
-   automatically deduced at run-time.
- STACK_DIRECTION > 0 => grows toward higher addresses
- STACK_DIRECTION < 0 => grows toward lower addresses
- STACK_DIRECTION = 0 => direction of growth unknown
- */
-/* #undef STACK_DIRECTION */
-
-/* Define if the `S_IS*' macros in <sys/stat.h> do not work properly.  */
-/* #undef STAT_MACROS_BROKEN */
-
-/* Define if you have the ANSI C header files.  */
-#define STDC_HEADERS 1
-
-/* Define to use grep's error-checking malloc in the kwset routines.  */
-#define GREP 1
-
-/* Package name. */
-#define PACKAGE "grep"
-
-/* Version number. */
-#define VERSION "2.2f"
-
-/* Hack for Visual C++ suggested by irox. */
-/* #undef alloca */
-
-/* #undef HAVE_STPCPY */
-
-#define ENABLE_NLS 1
-
-/* #undef HAVE_CATGETS */
-
-/* #undef HAVE_GETTEXT */
-
-#define HAVE_LC_MESSAGES 1
-
-/*
- * DOS specific
- */
-/* #undef HAVE_DOS_FILE_NAMES */
-
-/* Define if you have the __argz_count function.  */
-/* #undef HAVE___ARGZ_COUNT */
-
-/* Define if you have the __argz_next function.  */
-/* #undef HAVE___ARGZ_NEXT */
-
-/* Define if you have the __argz_stringify function.  */
-/* #undef HAVE___ARGZ_STRINGIFY */
-
-/* Define if you have the btowc function.  */
-/* #undef HAVE_BTOWC */
-
-/* Define if you have the dcgettext function.  */
-/* #undef HAVE_DCGETTEXT */
-
-/* Define if you have the getcwd function.  */
-#define HAVE_GETCWD 1
-
-/* Define if you have the getpagesize function.  */
-#define HAVE_GETPAGESIZE 1
-
-/* Define if you have the isascii function.  */
-#define HAVE_ISASCII 1
-
-/* Define if you have the memchr function.  */
-#define HAVE_MEMCHR 1
-
-/* Define if you have the munmap function.  */
-#define HAVE_MUNMAP 1
-
-/* Define if you have the putenv function.  */
-#define HAVE_PUTENV 1
-
-/* Define if you have the setenv function.  */
-#define HAVE_SETENV 1
-
-/* Define if you have the setlocale function.  */
-#define HAVE_SETLOCALE 1
-
-/* Define if you have the setmode function.  */
-#define HAVE_SETMODE 1
-
-/* Define if you have the stpcpy function.  */
-/* #undef HAVE_STPCPY */
-
-/* Define if you have the strcasecmp function.  */
-#define HAVE_STRCASECMP 1
-
-/* Define if you have the strchr function.  */
-#define HAVE_STRCHR 1
-
-/* Define if you have the strdup function.  */
-#define HAVE_STRDUP 1
-
-/* Define if you have the strerror function.  */
-#define HAVE_STRERROR 1
-
-/* Define if you have the <argz.h> header file.  */
-/* #undef HAVE_ARGZ_H */
-
-/* Define if you have the <dirent.h> header file.  */
-#define HAVE_DIRENT_H 1
-
-/* Define if you have the <libintl.h> header file.  */
-/* #undef HAVE_LIBINTL_H */
-
-/* Define if you have the <limits.h> header file.  */
-#define HAVE_LIMITS_H 1
-
-/* Define if you have the <locale.h> header file.  */
-#define HAVE_LOCALE_H 1
-
-/* Define if you have the <malloc.h> header file.  */
-#define HAVE_MALLOC_H 1
-
-/* Define if you have the <memory.h> header file.  */
-#define HAVE_MEMORY_H 1
-
-/* Define if you have the <ndir.h> header file.  */
-/* #undef HAVE_NDIR_H */
-
-/* Define if you have the <nl_types.h> header file.  */
-#define HAVE_NL_TYPES_H 1
-
-/* Define if you have the <stdlib.h> header file.  */
-#define HAVE_STDLIB_H 1
-
-/* Define if you have the <string.h> header file.  */
-#define HAVE_STRING_H 1
-
-/* Define if you have the <sys/dir.h> header file.  */
-/* #undef HAVE_SYS_DIR_H */
-
-/* Define if you have the <sys/ndir.h> header file.  */
-/* #undef HAVE_SYS_NDIR_H */
-
-/* Define if you have the <sys/param.h> header file.  */
-#define HAVE_SYS_PARAM_H 1
-
-/* Define if you have the <unistd.h> header file.  */
-#define HAVE_UNISTD_H 1
-
-/* Define if you have the <wchar.h> header file.  */
-/* #undef HAVE_WCHAR_H */
-
-/* Define if you have the <wctype.h> header file.  */
-/* #undef HAVE_WCTYPE_H */