head 1.2; access; symbols OPENPKG_E1_MP_HEAD:1.1 OPENPKG_E1_MP:1.1 OPENPKG_E1_MP_2_STABLE:1.1 OPENPKG_E1_FP:1.1 OPENPKG_2_STABLE_MP:1.1 OPENPKG_2_STABLE_20061018:1.1 OPENPKG_2_STABLE_20060622:1.1 OPENPKG_2_STABLE:1.1.0.8 OPENPKG_2_STABLE_BP:1.1 OPENPKG_2_5_RELEASE:1.1 OPENPKG_2_5_SOLID:1.1.0.6 OPENPKG_2_5_SOLID_BP:1.1 OPENPKG_2_4_RELEASE:1.1 OPENPKG_2_4_SOLID:1.1.0.4 OPENPKG_2_4_SOLID_BP:1.1 OPENPKG_CW_FP:1.1 OPENPKG_2_3_SOLID:1.1.0.2; locks; strict; comment @# @; 1.2 date 2007.08.03.05.33.59; author cs; state dead; branches; next 1.1; commitid saFLldiq3dG1Agss; 1.1 date 2005.02.28.16.02.13; author rse; state Exp; branches 1.1.2.1; next ; 1.1.2.1 date 2005.02.28.16.03.16; author rse; state Exp; branches; next ; desc @@ 1.2 log @upgrading package: grep 2.5.1a -> 2.5.3 @ text @Index: src/Makefile.in --- src/Makefile.in.orig 2002-03-26 17:09:36 +0100 +++ src/Makefile.in 2005-02-28 17:00:46 +0100 @@@@ -379,12 +379,12 @@@@ egrep: echo '#!/bin/sh' >$@@ - echo 'exec grep -E $${1+"$$@@"}' >>$@@ + echo "exec $(bindir)/grep -E "'$${1+"$$@@"}' >>$@@ chmod a+x $@@ fgrep: echo '#!/bin/sh' >$@@ - echo 'exec grep -F $${1+"$$@@"}' >>$@@ + echo "exec $(bindir)/grep -F "'$${1+"$$@@"}' >>$@@ chmod a+x $@@ # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. Index: src/dfa.c --- src/dfa.c.orig 2001-09-26 18:57:55 +0200 +++ src/dfa.c 2005-02-28 17:00:46 +0100 @@@@ -44,7 +44,7 @@@@ # include #endif -#if defined HAVE_WCTYPE_H && defined HAVE_WCHAR_H && defined HAVE_MBRTOWC +#if defined HAVE_WCTYPE_H && defined HAVE_WCTYPE && defined HAVE_WCHAR_H && defined HAVE_MBRTOWC /* We can handle multibyte string. */ # define MBS_SUPPORT #endif Index: src/search.c --- src/search.c.orig 2001-04-19 05:42:14 +0200 +++ src/search.c 2005-02-28 17:00:46 +0100 @@@@ -22,7 +22,7 @@@@ # include #endif #include -#if defined HAVE_WCTYPE_H && defined HAVE_WCHAR_H && defined HAVE_MBRTOWC +#if defined HAVE_WCTYPE_H && defined HAVE_WCTYPE && defined HAVE_WCHAR_H && defined HAVE_MBRTOWC /* We can handle multibyte string. */ # define MBS_SUPPORT # include @ 1.1 log @move subst into patch; fix fgrep and egrep by hard-coding path to grep @ text @@ 1.1.2.1 log @MFC: fix paths to grep in fgrep/egrep @ text @@