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

gnu/dist/grep/src/grep.c

@@ -1015,6 +1015,9 @@ main (argc, argv)
   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 @@ warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"))
       usage (2);
 
   if (! matcher)
+#ifdef __NetBSD__
+    matcher = __progname;
+#else
     matcher = default_matcher;
+#endif
 
   if (!setmatcher (matcher) && !setmatcher ("default"))
     abort ();

gnu/usr.bin/grep/Makefile

@@ -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 @@ FILESNAME_${F}=	grep.mo
 
 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 

gnu/usr.bin/grep/Makefile.inc

@@ -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

gnu/usr.bin/grep/common/Makefile

@@ -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

gnu/usr.bin/grep/common/libintl.h

@@ -1,3 +0,0 @@
-/*	$NetBSD: libintl.h,v 1.1 1999/02/11 17:26:23 tv Exp $	*/
-
-#include <libgettext.h>

gnu/usr.bin/grep/egrep/Makefile

@@ -1,8 +0,0 @@
-#	$NetBSD: Makefile,v 1.2 1999/02/13 02:54:26 lukem Exp $
-
-PROG=	egrep
-SRCS=	egrepmat.c
-
-MKMAN=	no
-
-.include <bsd.prog.mk>

gnu/usr.bin/grep/fgrep/Makefile

@@ -1,8 +0,0 @@
-#	$NetBSD: Makefile,v 1.2 1999/02/13 02:54:26 lukem Exp $
-
-PROG=	fgrep
-SRCS=	fgrepmat.c
-
-MKMAN=	no
-
-.include <bsd.prog.mk>

gnu/usr.bin/grep/grep/Makefile

@@ -1,9 +0,0 @@
-#	$NetBSD: Makefile,v 1.1 1999/02/09 13:19:16 simonb Exp $
-
-PROG=	grep
-SRCS=	grepmat.c
-
-MLINKS=	grep.1 egrep.1 \
-	grep.1 fgrep.1
-
-.include <bsd.prog.mk>

gnu/usr.bin/grep/libintl.h

@@ -0,0 +1,3 @@
+/*	$NetBSD: libintl.h,v 1.1 1999/04/06 16:54:55 mrg Exp $	*/
+
+#include <libgettext.h>