[src/trunk]: src/gnu/usr.bin/grep Build structure update for grep-2.5.

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

details:   https://anonhg.NetBSD.org/src/rev/6582676ac0c5
branches:  trunk
changeset: 542341:6582676ac0c5
user:      wiz <wiz%NetBSD.org@localhost>
date:      Sun Jan 26 23:53:44 2003 +0000

description:
Build structure update for grep-2.5.

diffstat:

 gnu/usr.bin/grep/Makefile             |   46 +----
 gnu/usr.bin/grep/Makefile.inc         |   18 +
 gnu/usr.bin/grep/config.h             |  208 --------------------
 gnu/usr.bin/grep/grep/Makefile        |   33 +++
 gnu/usr.bin/grep/include/config.h     |  341 ++++++++++++++++++++++++++++++++++
 gnu/usr.bin/grep/include/version.texi |    4 +
 gnu/usr.bin/grep/lib/Makefile         |   21 ++
 7 files changed, 420 insertions(+), 251 deletions(-)

diffs (truncated from 701 to 300 lines):

diff -r 16ec61728ebc -r 6582676ac0c5 gnu/usr.bin/grep/Makefile
--- a/gnu/usr.bin/grep/Makefile Sun Jan 26 23:50:50 2003 +0000
+++ b/gnu/usr.bin/grep/Makefile Sun Jan 26 23:53:44 2003 +0000
@@ -1,45 +1,5 @@
-#      $NetBSD: Makefile,v 1.22 2002/09/19 03:09:37 lukem Exp $
-
-.include <bsd.own.mk>
-
-PROG=          grep
-SRCS+=         grep.c dfa.c kwset.c obstack.c savedir.c getopt.c getopt1.c \
-               search.c stpcpy.c regex.c grepmat.c
-MAN=           grep.1
-
-DIST=          ${NETBSDSRCDIR}/gnu/dist
-
-CPPFLAGS+=     -DHAVE_CONFIG_H
-CLEANFILES+=    ${PROG}.1 ${PROG}.info ${PROG}.cat1
+#      $NetBSD: Makefile,v 1.23 2003/01/26 23:53:44 wiz Exp $
 
-LDADD+=                -lintl
-DPADD+=                ${LIBINTL}
-CPPFLAGS+=     -I${DIST}/grep/src -I${.CURDIR}
-CPPFLAGS+=     -DENABLE_NLS -DHAVE_LIBINTL_H=1 \
-               -DGNULOCALEDIR=\"/usr/share/locale\" \
-               -DLOCALE_ALIAS_PATH=\"/usr/share/locale:.\" \
-               -DLOCALEDIR=\"/usr/share/locale\"
-# libintl-less build should use this instead of the above lines
-#CPPFLAGS+=    -I${DIST}/grep/src -I${.CURDIR}
+SUBDIR=        lib .WAIT grep
 
-.if ${MKNLS} != "no"
-.for F in de.gmo el.gmo es.gmo fr.gmo ko.gmo nl.gmo no.gmo pl.gmo pt_BR.gmo \
-       ru.gmo sl.gmo sv.gmo
-FILES+=                ${F}
-FILESDIR_${F}= /usr/share/locale/${F:.gmo=}/LC_MESSAGES
-FILESNAME_${F}=        grep.mo
-.endfor
-.endif
-
-TEXINFO=       grep.texi
-INFOFLAGS=     -I${NETBSDSRCDIR}/gnu/dist/grep/doc
-
-MLINKS=        grep.1 egrep.1 \
-       grep.1 fgrep.1
-LINKS= ${BINDIR}/grep ${BINDIR}/egrep \
-       ${BINDIR}/grep ${BINDIR}/fgrep
-
-.include <bsd.info.mk>
-.include <bsd.prog.mk>
-
-.PATH: ${DIST}/grep/doc ${DIST}/grep/intl ${DIST}/grep/po ${DIST}/grep/src 
+.include <bsd.subdir.mk>
diff -r 16ec61728ebc -r 6582676ac0c5 gnu/usr.bin/grep/Makefile.inc
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/gnu/usr.bin/grep/Makefile.inc     Sun Jan 26 23:53:44 2003 +0000
@@ -0,0 +1,18 @@
+#      $NetBSD: Makefile.inc,v 1.4 2003/01/26 23:53:44 wiz Exp $
+
+.include <bsd.own.mk>
+
+WARNS= 0
+
+IDIST= ${NETBSDSRCDIR}/gnu/dist/grep
+
+CPPFLAGS+=     -DLOCALEDIR=\"/usr/share/locale\" -DHAVE_CONFIG_H \
+               -I${.CURDIR}/../include -I${IDIST}/lib
+
+DOBJDIR!=      cd $(.CURDIR)/../lib && ${PRINTOBJDIR}
+
+LIBGREPUTILS=  ${DOBJDIR}/libgreputils.a
+
+.if exists(${.CURDIR}/../../Makefile.inc)
+.include "${.CURDIR}/../../Makefile.inc"
+.endif
diff -r 16ec61728ebc -r 6582676ac0c5 gnu/usr.bin/grep/config.h
--- a/gnu/usr.bin/grep/config.h Sun Jan 26 23:50:50 2003 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,208 +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.4"
-
-/* Define to `int' if <sys/types.h> doesn't define.  */
-/* #undef ssize_t */
-
-/* Hack for Visual C++ suggested by irox. */
-/* #undef alloca */
-
-/* #undef HAVE_STPCPY */
-
-/* #undef ENABLE_NLS */
-
-/* #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 memmove function.  */
-#define HAVE_MEMMOVE 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 wctype function.  */
-/* #undef HAVE_WCTYPE */
-
-/* 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 */
-
-/* Define if you have the i library (-li).  */
-/* #undef HAVE_LIBI */
-
-/* Number of bits in a file offset, on hosts where this is settable. */
-/* #undef _FILE_OFFSET_BITS */
-
-/* Define to make fseeko etc. visible, on some hosts. */
-/* #undef _LARGEFILE_SOURCE */
-
-/* Define for large files, on AIX-style hosts. */
-/* #undef _LARGE_FILES */
-
-/* Define if compiler has function prototypes */
-#define PROTOTYPES 1
-
diff -r 16ec61728ebc -r 6582676ac0c5 gnu/usr.bin/grep/grep/Makefile
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/gnu/usr.bin/grep/grep/Makefile    Sun Jan 26 23:53:44 2003 +0000
@@ -0,0 +1,33 @@
+#      $NetBSD: Makefile,v 1.3 2003/01/26 23:53:45 wiz Exp $
+
+.include "${.CURDIR}/../Makefile.inc"
+
+DIST=          ${IDIST}/src
+.PATH:         ${DIST} ${IDIST}/doc ${IDIST}/man ${IDIST}/po
+
+PROG=          grep
+SRCS=          grep.c dfa.c kwset.c search.c grepmat.c
+