From b438e86d9de9869f7357984b763dd3b55b7b3e31 Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Thu, 17 Mar 2005 17:21:21 +0000 Subject: [PATCH] Removed version number from directory name. git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@11873 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- src/apps/bin/{grep-2.5 => grep}/ABOUT-NLS | 0 src/apps/bin/{grep-2.5 => grep}/AUTHORS | 0 src/apps/bin/{grep-2.5 => grep}/COPYING | 0 src/apps/bin/{grep-2.5 => grep}/ChangeLog | 0 src/apps/bin/{grep-2.5 => grep}/INSTALL | 0 src/apps/bin/{grep-2.5 => grep}/Jamfile | 0 src/apps/bin/{grep-2.5 => grep}/Makefile.am | 0 src/apps/bin/{grep-2.5 => grep}/Makefile.cvs | 0 src/apps/bin/{grep-2.5 => grep}/Makefile.in | 0 src/apps/bin/{grep-2.5 => grep}/NEWS | 0 src/apps/bin/{grep-2.5 => grep}/README | 0 src/apps/bin/{grep-2.5 => grep}/README-alpha | 0 src/apps/bin/{grep-2.5 => grep}/README.DOS | 0 src/apps/bin/{grep-2.5 => grep}/THANKS | 0 src/apps/bin/{grep-2.5 => grep}/TODO | 0 src/apps/bin/{grep-2.5 => grep}/aclocal.m4 | 0 src/apps/bin/{grep-2.5 => grep}/autogen.sh | 0 src/apps/bin/{grep-2.5 => grep}/config.guess | 0 src/apps/bin/{grep-2.5 => grep}/config.h | 0 src/apps/bin/{grep-2.5 => grep}/config.hin | 0 src/apps/bin/{grep-2.5 => grep}/config.sub | 0 src/apps/bin/{grep-2.5 => grep}/configure | 0 src/apps/bin/{grep-2.5 => grep}/configure.in | 0 src/apps/bin/{grep-2.5 => grep}/depcomp | 0 src/apps/bin/{grep-2.5 => grep}/doc/Makefile.am | 0 src/apps/bin/{grep-2.5 => grep}/doc/Makefile.in | 0 src/apps/bin/{grep-2.5 => grep}/doc/egrep.man | 0 src/apps/bin/{grep-2.5 => grep}/doc/fgrep.man | 0 src/apps/bin/{grep-2.5 => grep}/doc/grep.1 | 0 src/apps/bin/{grep-2.5 => grep}/doc/grep.info | 0 src/apps/bin/{grep-2.5 => grep}/doc/grep.texi | 0 src/apps/bin/{grep-2.5 => grep}/doc/mdate-sh | 0 src/apps/bin/{grep-2.5 => grep}/doc/stamp-vti | 0 src/apps/bin/{grep-2.5 => grep}/doc/texinfo.tex | 0 src/apps/bin/{grep-2.5 => grep}/doc/version.texi | 0 src/apps/bin/{grep-2.5 => grep}/grep.spec | 0 src/apps/bin/{grep-2.5 => grep}/install-sh | 0 src/apps/bin/{grep-2.5 => grep}/intl/ChangeLog | 0 src/apps/bin/{grep-2.5 => grep}/intl/Makefile.in | 0 src/apps/bin/{grep-2.5 => grep}/intl/VERSION | 0 src/apps/bin/{grep-2.5 => grep}/intl/bindtextdom.c | 0 src/apps/bin/{grep-2.5 => grep}/intl/config.charset | 0 src/apps/bin/{grep-2.5 => grep}/intl/dcgettext.c | 0 src/apps/bin/{grep-2.5 => grep}/intl/dcigettext.c | 0 src/apps/bin/{grep-2.5 => grep}/intl/dcngettext.c | 0 src/apps/bin/{grep-2.5 => grep}/intl/dgettext.c | 0 src/apps/bin/{grep-2.5 => grep}/intl/dngettext.c | 0 src/apps/bin/{grep-2.5 => grep}/intl/eval-plural.h | 0 src/apps/bin/{grep-2.5 => grep}/intl/explodename.c | 0 src/apps/bin/{grep-2.5 => grep}/intl/finddomain.c | 0 src/apps/bin/{grep-2.5 => grep}/intl/gettext.c | 0 src/apps/bin/{grep-2.5 => grep}/intl/gettextP.h | 0 src/apps/bin/{grep-2.5 => grep}/intl/gmo.h | 0 src/apps/bin/{grep-2.5 => grep}/intl/hash-string.h | 0 src/apps/bin/{grep-2.5 => grep}/intl/intl-compat.c | 0 src/apps/bin/{grep-2.5 => grep}/intl/l10nflist.c | 0 src/apps/bin/{grep-2.5 => grep}/intl/libgnuintl.h | 0 src/apps/bin/{grep-2.5 => grep}/intl/libintl.glibc | 0 src/apps/bin/{grep-2.5 => grep}/intl/loadinfo.h | 0 src/apps/bin/{grep-2.5 => grep}/intl/loadmsgcat.c | 0 src/apps/bin/{grep-2.5 => grep}/intl/localcharset.c | 0 src/apps/bin/{grep-2.5 => grep}/intl/locale.alias | 0 src/apps/bin/{grep-2.5 => grep}/intl/localealias.c | 0 src/apps/bin/{grep-2.5 => grep}/intl/localename.c | 0 src/apps/bin/{grep-2.5 => grep}/intl/ngettext.c | 0 src/apps/bin/{grep-2.5 => grep}/intl/os2compat.c | 0 src/apps/bin/{grep-2.5 => grep}/intl/os2compat.h | 0 src/apps/bin/{grep-2.5 => grep}/intl/osdep.c | 0 src/apps/bin/{grep-2.5 => grep}/intl/plural-exp.c | 0 src/apps/bin/{grep-2.5 => grep}/intl/plural-exp.h | 0 src/apps/bin/{grep-2.5 => grep}/intl/plural.c | 0 src/apps/bin/{grep-2.5 => grep}/intl/plural.y | 0 src/apps/bin/{grep-2.5 => grep}/intl/ref-add.sin | 0 src/apps/bin/{grep-2.5 => grep}/intl/ref-del.sin | 0 src/apps/bin/{grep-2.5 => grep}/intl/textdomain.c | 0 src/apps/bin/{grep-2.5 => grep}/lib/Jamfile | 0 src/apps/bin/{grep-2.5 => grep}/lib/Makefile.am | 0 src/apps/bin/{grep-2.5 => grep}/lib/Makefile.in | 0 src/apps/bin/{grep-2.5 => grep}/lib/alloca.c | 0 src/apps/bin/{grep-2.5 => grep}/lib/atexit.c | 0 src/apps/bin/{grep-2.5 => grep}/lib/closeout.c | 0 src/apps/bin/{grep-2.5 => grep}/lib/closeout.h | 0 src/apps/bin/{grep-2.5 => grep}/lib/error.c | 0 src/apps/bin/{grep-2.5 => grep}/lib/error.h | 0 src/apps/bin/{grep-2.5 => grep}/lib/exclude.c | 0 src/apps/bin/{grep-2.5 => grep}/lib/exclude.h | 0 src/apps/bin/{grep-2.5 => grep}/lib/fnmatch.c | 0 src/apps/bin/{grep-2.5 => grep}/lib/fnmatch.h | 0 src/apps/bin/{grep-2.5 => grep}/lib/getopt.c | 0 src/apps/bin/{grep-2.5 => grep}/lib/getopt.h | 0 src/apps/bin/{grep-2.5 => grep}/lib/getopt1.c | 0 src/apps/bin/{grep-2.5 => grep}/lib/hard-locale.c | 0 src/apps/bin/{grep-2.5 => grep}/lib/hard-locale.h | 0 src/apps/bin/{grep-2.5 => grep}/lib/isdir.c | 0 src/apps/bin/{grep-2.5 => grep}/lib/malloc.c | 0 src/apps/bin/{grep-2.5 => grep}/lib/memchr.c | 0 src/apps/bin/{grep-2.5 => grep}/lib/obstack.c | 0 src/apps/bin/{grep-2.5 => grep}/lib/obstack.h | 0 src/apps/bin/{grep-2.5 => grep}/lib/quotearg.c | 0 src/apps/bin/{grep-2.5 => grep}/lib/quotearg.h | 0 src/apps/bin/{grep-2.5 => grep}/lib/realloc.c | 0 src/apps/bin/{grep-2.5 => grep}/lib/regex.c | 0 src/apps/bin/{grep-2.5 => grep}/lib/regex.h | 0 src/apps/bin/{grep-2.5 => grep}/lib/savedir.c | 0 src/apps/bin/{grep-2.5 => grep}/lib/savedir.h | 0 src/apps/bin/{grep-2.5 => grep}/lib/stpcpy.c | 0 src/apps/bin/{grep-2.5 => grep}/lib/strtol.c | 0 src/apps/bin/{grep-2.5 => grep}/lib/strtoul.c | 0 src/apps/bin/{grep-2.5 => grep}/lib/strtoull.c | 0 src/apps/bin/{grep-2.5 => grep}/lib/strtoumax.c | 0 src/apps/bin/{grep-2.5 => grep}/lib/xalloc.h | 0 src/apps/bin/{grep-2.5 => grep}/lib/xmalloc.c | 0 src/apps/bin/{grep-2.5 => grep}/lib/xstrtol.c | 0 src/apps/bin/{grep-2.5 => grep}/lib/xstrtol.h | 0 src/apps/bin/{grep-2.5 => grep}/lib/xstrtoumax.c | 0 src/apps/bin/{grep-2.5 => grep}/missing | 0 src/apps/bin/{grep-2.5 => grep}/mkinstalldirs | 0 src/apps/bin/{grep-2.5 => grep}/po/ChangeLog | 0 src/apps/bin/{grep-2.5 => grep}/po/Makefile | 0 src/apps/bin/{grep-2.5 => grep}/po/Makefile.in | 0 src/apps/bin/{grep-2.5 => grep}/po/Makefile.in.in | 0 src/apps/bin/{grep-2.5 => grep}/po/POTFILES | 0 src/apps/bin/{grep-2.5 => grep}/po/POTFILES.in | 0 src/apps/bin/{grep-2.5 => grep}/po/bg.po | 0 src/apps/bin/{grep-2.5 => grep}/po/ca.po | 0 src/apps/bin/{grep-2.5 => grep}/po/cat-id-tbl.c | 0 src/apps/bin/{grep-2.5 => grep}/po/cs.po | 0 src/apps/bin/{grep-2.5 => grep}/po/da.po | 0 src/apps/bin/{grep-2.5 => grep}/po/de.po | 0 src/apps/bin/{grep-2.5 => grep}/po/el.po | 0 src/apps/bin/{grep-2.5 => grep}/po/eo.po | 0 src/apps/bin/{grep-2.5 => grep}/po/es.po | 0 src/apps/bin/{grep-2.5 => grep}/po/et.po | 0 src/apps/bin/{grep-2.5 => grep}/po/fr.po | 0 src/apps/bin/{grep-2.5 => grep}/po/gl.po | 0 src/apps/bin/{grep-2.5 => grep}/po/grep.pot | 0 src/apps/bin/{grep-2.5 => grep}/po/hr.po | 0 src/apps/bin/{grep-2.5 => grep}/po/id.po | 0 src/apps/bin/{grep-2.5 => grep}/po/it.po | 0 src/apps/bin/{grep-2.5 => grep}/po/ja.po | 0 src/apps/bin/{grep-2.5 => grep}/po/ko.po | 0 src/apps/bin/{grep-2.5 => grep}/po/nb.po | 0 src/apps/bin/{grep-2.5 => grep}/po/nl.po | 0 src/apps/bin/{grep-2.5 => grep}/po/no.po | 0 src/apps/bin/{grep-2.5 => grep}/po/pl.po | 0 src/apps/bin/{grep-2.5 => grep}/po/pt_BR.po | 0 src/apps/bin/{grep-2.5 => grep}/po/ru.po | 0 src/apps/bin/{grep-2.5 => grep}/po/sl.po | 0 src/apps/bin/{grep-2.5 => grep}/po/stamp-cat-id | 0 src/apps/bin/{grep-2.5 => grep}/po/sv.po | 0 src/apps/bin/{grep-2.5 => grep}/po/tr.po | 0 src/apps/bin/{grep-2.5 => grep}/src/Jamfile | 0 src/apps/bin/{grep-2.5 => grep}/src/Makefile | 0 src/apps/bin/{grep-2.5 => grep}/src/Makefile.am | 0 src/apps/bin/{grep-2.5 => grep}/src/Makefile.in | 0 src/apps/bin/{grep-2.5 => grep}/src/ansi2knr.1 | 0 src/apps/bin/{grep-2.5 => grep}/src/ansi2knr.c | 0 src/apps/bin/{grep-2.5 => grep}/src/dfa.c | 0 src/apps/bin/{grep-2.5 => grep}/src/dfa.h | 0 src/apps/bin/{grep-2.5 => grep}/src/dosbuf.c | 0 src/apps/bin/{grep-2.5 => grep}/src/egrep | 0 src/apps/bin/{grep-2.5 => grep}/src/fgrep | 0 src/apps/bin/{grep-2.5 => grep}/src/getpagesize.h | 0 src/apps/bin/{grep-2.5 => grep}/src/grep.c | 0 src/apps/bin/{grep-2.5 => grep}/src/grep.h | 0 src/apps/bin/{grep-2.5 => grep}/src/grep.rdef | 0 src/apps/bin/{grep-2.5 => grep}/src/grepmat.c | 0 src/apps/bin/{grep-2.5 => grep}/src/kwset.c | 0 src/apps/bin/{grep-2.5 => grep}/src/kwset.h | 0 src/apps/bin/{grep-2.5 => grep}/src/search.c | 0 src/apps/bin/{grep-2.5 => grep}/src/system.h | 0 src/apps/bin/{grep-2.5 => grep}/src/vms_fab.c | 0 src/apps/bin/{grep-2.5 => grep}/src/vms_fab.h | 0 src/apps/bin/{grep-2.5 => grep}/stamp-h.in | 0 src/apps/bin/{grep-2.5 => grep}/tests/Makefile | 0 src/apps/bin/{grep-2.5 => grep}/tests/Makefile.am | 0 src/apps/bin/{grep-2.5 => grep}/tests/Makefile.in | 0 src/apps/bin/{grep-2.5 => grep}/tests/backref.sh | 0 src/apps/bin/{grep-2.5 => grep}/tests/bre.awk | 0 src/apps/bin/{grep-2.5 => grep}/tests/bre.sh | 0 src/apps/bin/{grep-2.5 => grep}/tests/bre.tests | 0 src/apps/bin/{grep-2.5 => grep}/tests/empty.sh | 0 src/apps/bin/{grep-2.5 => grep}/tests/ere.awk | 0 src/apps/bin/{grep-2.5 => grep}/tests/ere.sh | 0 src/apps/bin/{grep-2.5 => grep}/tests/ere.tests | 0 src/apps/bin/{grep-2.5 => grep}/tests/file.sh | 0 src/apps/bin/{grep-2.5 => grep}/tests/formatbre.awk | 0 src/apps/bin/{grep-2.5 => grep}/tests/formatere.awk | 0 src/apps/bin/{grep-2.5 => grep}/tests/khadafy.lines | 0 src/apps/bin/{grep-2.5 => grep}/tests/khadafy.regexp | 0 src/apps/bin/{grep-2.5 => grep}/tests/khadafy.sh | 0 src/apps/bin/{grep-2.5 => grep}/tests/options.sh | 0 src/apps/bin/{grep-2.5 => grep}/tests/spencer1.awk | 0 src/apps/bin/{grep-2.5 => grep}/tests/spencer1.sh | 0 src/apps/bin/{grep-2.5 => grep}/tests/spencer1.tests | 0 src/apps/bin/{grep-2.5 => grep}/tests/spencer2.sh | 0 src/apps/bin/{grep-2.5 => grep}/tests/spencer2.tests | 0 src/apps/bin/{grep-2.5 => grep}/tests/status.sh | 0 src/apps/bin/{grep-2.5 => grep}/tests/tests | 0 src/apps/bin/{grep-2.5 => grep}/tests/warning.sh | 0 200 files changed, 0 insertions(+), 0 deletions(-) rename src/apps/bin/{grep-2.5 => grep}/ABOUT-NLS (100%) rename src/apps/bin/{grep-2.5 => grep}/AUTHORS (100%) rename src/apps/bin/{grep-2.5 => grep}/COPYING (100%) rename src/apps/bin/{grep-2.5 => grep}/ChangeLog (100%) rename src/apps/bin/{grep-2.5 => grep}/INSTALL (100%) rename src/apps/bin/{grep-2.5 => grep}/Jamfile (100%) rename src/apps/bin/{grep-2.5 => grep}/Makefile.am (100%) rename src/apps/bin/{grep-2.5 => grep}/Makefile.cvs (100%) rename src/apps/bin/{grep-2.5 => grep}/Makefile.in (100%) rename src/apps/bin/{grep-2.5 => grep}/NEWS (100%) rename src/apps/bin/{grep-2.5 => grep}/README (100%) rename src/apps/bin/{grep-2.5 => grep}/README-alpha (100%) rename src/apps/bin/{grep-2.5 => grep}/README.DOS (100%) rename src/apps/bin/{grep-2.5 => grep}/THANKS (100%) rename src/apps/bin/{grep-2.5 => grep}/TODO (100%) rename src/apps/bin/{grep-2.5 => grep}/aclocal.m4 (100%) rename src/apps/bin/{grep-2.5 => grep}/autogen.sh (100%) rename src/apps/bin/{grep-2.5 => grep}/config.guess (100%) rename src/apps/bin/{grep-2.5 => grep}/config.h (100%) rename src/apps/bin/{grep-2.5 => grep}/config.hin (100%) rename src/apps/bin/{grep-2.5 => grep}/config.sub (100%) rename src/apps/bin/{grep-2.5 => grep}/configure (100%) rename src/apps/bin/{grep-2.5 => grep}/configure.in (100%) rename src/apps/bin/{grep-2.5 => grep}/depcomp (100%) rename src/apps/bin/{grep-2.5 => grep}/doc/Makefile.am (100%) rename src/apps/bin/{grep-2.5 => grep}/doc/Makefile.in (100%) rename src/apps/bin/{grep-2.5 => grep}/doc/egrep.man (100%) rename src/apps/bin/{grep-2.5 => grep}/doc/fgrep.man (100%) rename src/apps/bin/{grep-2.5 => grep}/doc/grep.1 (100%) rename src/apps/bin/{grep-2.5 => grep}/doc/grep.info (100%) rename src/apps/bin/{grep-2.5 => grep}/doc/grep.texi (100%) rename src/apps/bin/{grep-2.5 => grep}/doc/mdate-sh (100%) rename src/apps/bin/{grep-2.5 => grep}/doc/stamp-vti (100%) rename src/apps/bin/{grep-2.5 => grep}/doc/texinfo.tex (100%) rename src/apps/bin/{grep-2.5 => grep}/doc/version.texi (100%) rename src/apps/bin/{grep-2.5 => grep}/grep.spec (100%) rename src/apps/bin/{grep-2.5 => grep}/install-sh (100%) rename src/apps/bin/{grep-2.5 => grep}/intl/ChangeLog (100%) rename src/apps/bin/{grep-2.5 => grep}/intl/Makefile.in (100%) rename src/apps/bin/{grep-2.5 => grep}/intl/VERSION (100%) rename src/apps/bin/{grep-2.5 => grep}/intl/bindtextdom.c (100%) rename src/apps/bin/{grep-2.5 => grep}/intl/config.charset (100%) rename src/apps/bin/{grep-2.5 => grep}/intl/dcgettext.c (100%) rename src/apps/bin/{grep-2.5 => grep}/intl/dcigettext.c (100%) rename src/apps/bin/{grep-2.5 => grep}/intl/dcngettext.c (100%) rename src/apps/bin/{grep-2.5 => grep}/intl/dgettext.c (100%) rename src/apps/bin/{grep-2.5 => grep}/intl/dngettext.c (100%) rename src/apps/bin/{grep-2.5 => grep}/intl/eval-plural.h (100%) rename src/apps/bin/{grep-2.5 => grep}/intl/explodename.c (100%) rename src/apps/bin/{grep-2.5 => grep}/intl/finddomain.c (100%) rename src/apps/bin/{grep-2.5 => grep}/intl/gettext.c (100%) rename src/apps/bin/{grep-2.5 => grep}/intl/gettextP.h (100%) rename src/apps/bin/{grep-2.5 => grep}/intl/gmo.h (100%) rename src/apps/bin/{grep-2.5 => grep}/intl/hash-string.h (100%) rename src/apps/bin/{grep-2.5 => grep}/intl/intl-compat.c (100%) rename src/apps/bin/{grep-2.5 => grep}/intl/l10nflist.c (100%) rename src/apps/bin/{grep-2.5 => grep}/intl/libgnuintl.h (100%) rename src/apps/bin/{grep-2.5 => grep}/intl/libintl.glibc (100%) rename src/apps/bin/{grep-2.5 => grep}/intl/loadinfo.h (100%) rename src/apps/bin/{grep-2.5 => grep}/intl/loadmsgcat.c (100%) rename src/apps/bin/{grep-2.5 => grep}/intl/localcharset.c (100%) rename src/apps/bin/{grep-2.5 => grep}/intl/locale.alias (100%) rename src/apps/bin/{grep-2.5 => grep}/intl/localealias.c (100%) rename src/apps/bin/{grep-2.5 => grep}/intl/localename.c (100%) rename src/apps/bin/{grep-2.5 => grep}/intl/ngettext.c (100%) rename src/apps/bin/{grep-2.5 => grep}/intl/os2compat.c (100%) rename src/apps/bin/{grep-2.5 => grep}/intl/os2compat.h (100%) rename src/apps/bin/{grep-2.5 => grep}/intl/osdep.c (100%) rename src/apps/bin/{grep-2.5 => grep}/intl/plural-exp.c (100%) rename src/apps/bin/{grep-2.5 => grep}/intl/plural-exp.h (100%) rename src/apps/bin/{grep-2.5 => grep}/intl/plural.c (100%) rename src/apps/bin/{grep-2.5 => grep}/intl/plural.y (100%) rename src/apps/bin/{grep-2.5 => grep}/intl/ref-add.sin (100%) rename src/apps/bin/{grep-2.5 => grep}/intl/ref-del.sin (100%) rename src/apps/bin/{grep-2.5 => grep}/intl/textdomain.c (100%) rename src/apps/bin/{grep-2.5 => grep}/lib/Jamfile (100%) rename src/apps/bin/{grep-2.5 => grep}/lib/Makefile.am (100%) rename src/apps/bin/{grep-2.5 => grep}/lib/Makefile.in (100%) rename src/apps/bin/{grep-2.5 => grep}/lib/alloca.c (100%) rename src/apps/bin/{grep-2.5 => grep}/lib/atexit.c (100%) rename src/apps/bin/{grep-2.5 => grep}/lib/closeout.c (100%) rename src/apps/bin/{grep-2.5 => grep}/lib/closeout.h (100%) rename src/apps/bin/{grep-2.5 => grep}/lib/error.c (100%) rename src/apps/bin/{grep-2.5 => grep}/lib/error.h (100%) rename src/apps/bin/{grep-2.5 => grep}/lib/exclude.c (100%) rename src/apps/bin/{grep-2.5 => grep}/lib/exclude.h (100%) rename src/apps/bin/{grep-2.5 => grep}/lib/fnmatch.c (100%) rename src/apps/bin/{grep-2.5 => grep}/lib/fnmatch.h (100%) rename src/apps/bin/{grep-2.5 => grep}/lib/getopt.c (100%) rename src/apps/bin/{grep-2.5 => grep}/lib/getopt.h (100%) rename src/apps/bin/{grep-2.5 => grep}/lib/getopt1.c (100%) rename src/apps/bin/{grep-2.5 => grep}/lib/hard-locale.c (100%) rename src/apps/bin/{grep-2.5 => grep}/lib/hard-locale.h (100%) rename src/apps/bin/{grep-2.5 => grep}/lib/isdir.c (100%) rename src/apps/bin/{grep-2.5 => grep}/lib/malloc.c (100%) rename src/apps/bin/{grep-2.5 => grep}/lib/memchr.c (100%) rename src/apps/bin/{grep-2.5 => grep}/lib/obstack.c (100%) rename src/apps/bin/{grep-2.5 => grep}/lib/obstack.h (100%) rename src/apps/bin/{grep-2.5 => grep}/lib/quotearg.c (100%) rename src/apps/bin/{grep-2.5 => grep}/lib/quotearg.h (100%) rename src/apps/bin/{grep-2.5 => grep}/lib/realloc.c (100%) rename src/apps/bin/{grep-2.5 => grep}/lib/regex.c (100%) rename src/apps/bin/{grep-2.5 => grep}/lib/regex.h (100%) rename src/apps/bin/{grep-2.5 => grep}/lib/savedir.c (100%) rename src/apps/bin/{grep-2.5 => grep}/lib/savedir.h (100%) rename src/apps/bin/{grep-2.5 => grep}/lib/stpcpy.c (100%) rename src/apps/bin/{grep-2.5 => grep}/lib/strtol.c (100%) rename src/apps/bin/{grep-2.5 => grep}/lib/strtoul.c (100%) rename src/apps/bin/{grep-2.5 => grep}/lib/strtoull.c (100%) rename src/apps/bin/{grep-2.5 => grep}/lib/strtoumax.c (100%) rename src/apps/bin/{grep-2.5 => grep}/lib/xalloc.h (100%) rename src/apps/bin/{grep-2.5 => grep}/lib/xmalloc.c (100%) rename src/apps/bin/{grep-2.5 => grep}/lib/xstrtol.c (100%) rename src/apps/bin/{grep-2.5 => grep}/lib/xstrtol.h (100%) rename src/apps/bin/{grep-2.5 => grep}/lib/xstrtoumax.c (100%) rename src/apps/bin/{grep-2.5 => grep}/missing (100%) rename src/apps/bin/{grep-2.5 => grep}/mkinstalldirs (100%) rename src/apps/bin/{grep-2.5 => grep}/po/ChangeLog (100%) rename src/apps/bin/{grep-2.5 => grep}/po/Makefile (100%) rename src/apps/bin/{grep-2.5 => grep}/po/Makefile.in (100%) rename src/apps/bin/{grep-2.5 => grep}/po/Makefile.in.in (100%) rename src/apps/bin/{grep-2.5 => grep}/po/POTFILES (100%) rename src/apps/bin/{grep-2.5 => grep}/po/POTFILES.in (100%) rename src/apps/bin/{grep-2.5 => grep}/po/bg.po (100%) rename src/apps/bin/{grep-2.5 => grep}/po/ca.po (100%) rename src/apps/bin/{grep-2.5 => grep}/po/cat-id-tbl.c (100%) rename src/apps/bin/{grep-2.5 => grep}/po/cs.po (100%) rename src/apps/bin/{grep-2.5 => grep}/po/da.po (100%) rename src/apps/bin/{grep-2.5 => grep}/po/de.po (100%) rename src/apps/bin/{grep-2.5 => grep}/po/el.po (100%) rename src/apps/bin/{grep-2.5 => grep}/po/eo.po (100%) rename src/apps/bin/{grep-2.5 => grep}/po/es.po (100%) rename src/apps/bin/{grep-2.5 => grep}/po/et.po (100%) rename src/apps/bin/{grep-2.5 => grep}/po/fr.po (100%) rename src/apps/bin/{grep-2.5 => grep}/po/gl.po (100%) rename src/apps/bin/{grep-2.5 => grep}/po/grep.pot (100%) rename src/apps/bin/{grep-2.5 => grep}/po/hr.po (100%) rename src/apps/bin/{grep-2.5 => grep}/po/id.po (100%) rename src/apps/bin/{grep-2.5 => grep}/po/it.po (100%) rename src/apps/bin/{grep-2.5 => grep}/po/ja.po (100%) rename src/apps/bin/{grep-2.5 => grep}/po/ko.po (100%) rename src/apps/bin/{grep-2.5 => grep}/po/nb.po (100%) rename src/apps/bin/{grep-2.5 => grep}/po/nl.po (100%) rename src/apps/bin/{grep-2.5 => grep}/po/no.po (100%) rename src/apps/bin/{grep-2.5 => grep}/po/pl.po (100%) rename src/apps/bin/{grep-2.5 => grep}/po/pt_BR.po (100%) rename src/apps/bin/{grep-2.5 => grep}/po/ru.po (100%) rename src/apps/bin/{grep-2.5 => grep}/po/sl.po (100%) rename src/apps/bin/{grep-2.5 => grep}/po/stamp-cat-id (100%) rename src/apps/bin/{grep-2.5 => grep}/po/sv.po (100%) rename src/apps/bin/{grep-2.5 => grep}/po/tr.po (100%) rename src/apps/bin/{grep-2.5 => grep}/src/Jamfile (100%) rename src/apps/bin/{grep-2.5 => grep}/src/Makefile (100%) rename src/apps/bin/{grep-2.5 => grep}/src/Makefile.am (100%) rename src/apps/bin/{grep-2.5 => grep}/src/Makefile.in (100%) rename src/apps/bin/{grep-2.5 => grep}/src/ansi2knr.1 (100%) rename src/apps/bin/{grep-2.5 => grep}/src/ansi2knr.c (100%) rename src/apps/bin/{grep-2.5 => grep}/src/dfa.c (100%) rename src/apps/bin/{grep-2.5 => grep}/src/dfa.h (100%) rename src/apps/bin/{grep-2.5 => grep}/src/dosbuf.c (100%) rename src/apps/bin/{grep-2.5 => grep}/src/egrep (100%) rename src/apps/bin/{grep-2.5 => grep}/src/fgrep (100%) rename src/apps/bin/{grep-2.5 => grep}/src/getpagesize.h (100%) rename src/apps/bin/{grep-2.5 => grep}/src/grep.c (100%) rename src/apps/bin/{grep-2.5 => grep}/src/grep.h (100%) rename src/apps/bin/{grep-2.5 => grep}/src/grep.rdef (100%) rename src/apps/bin/{grep-2.5 => grep}/src/grepmat.c (100%) rename src/apps/bin/{grep-2.5 => grep}/src/kwset.c (100%) rename src/apps/bin/{grep-2.5 => grep}/src/kwset.h (100%) rename src/apps/bin/{grep-2.5 => grep}/src/search.c (100%) rename src/apps/bin/{grep-2.5 => grep}/src/system.h (100%) rename src/apps/bin/{grep-2.5 => grep}/src/vms_fab.c (100%) rename src/apps/bin/{grep-2.5 => grep}/src/vms_fab.h (100%) rename src/apps/bin/{grep-2.5 => grep}/stamp-h.in (100%) rename src/apps/bin/{grep-2.5 => grep}/tests/Makefile (100%) rename src/apps/bin/{grep-2.5 => grep}/tests/Makefile.am (100%) rename src/apps/bin/{grep-2.5 => grep}/tests/Makefile.in (100%) rename src/apps/bin/{grep-2.5 => grep}/tests/backref.sh (100%) rename src/apps/bin/{grep-2.5 => grep}/tests/bre.awk (100%) rename src/apps/bin/{grep-2.5 => grep}/tests/bre.sh (100%) rename src/apps/bin/{grep-2.5 => grep}/tests/bre.tests (100%) rename src/apps/bin/{grep-2.5 => grep}/tests/empty.sh (100%) rename src/apps/bin/{grep-2.5 => grep}/tests/ere.awk (100%) rename src/apps/bin/{grep-2.5 => grep}/tests/ere.sh (100%) rename src/apps/bin/{grep-2.5 => grep}/tests/ere.tests (100%) rename src/apps/bin/{grep-2.5 => grep}/tests/file.sh (100%) rename src/apps/bin/{grep-2.5 => grep}/tests/formatbre.awk (100%) rename src/apps/bin/{grep-2.5 => grep}/tests/formatere.awk (100%) rename src/apps/bin/{grep-2.5 => grep}/tests/khadafy.lines (100%) rename src/apps/bin/{grep-2.5 => grep}/tests/khadafy.regexp (100%) rename src/apps/bin/{grep-2.5 => grep}/tests/khadafy.sh (100%) rename src/apps/bin/{grep-2.5 => grep}/tests/options.sh (100%) rename src/apps/bin/{grep-2.5 => grep}/tests/spencer1.awk (100%) rename src/apps/bin/{grep-2.5 => grep}/tests/spencer1.sh (100%) rename src/apps/bin/{grep-2.5 => grep}/tests/spencer1.tests (100%) rename src/apps/bin/{grep-2.5 => grep}/tests/spencer2.sh (100%) rename src/apps/bin/{grep-2.5 => grep}/tests/spencer2.tests (100%) rename src/apps/bin/{grep-2.5 => grep}/tests/status.sh (100%) rename src/apps/bin/{grep-2.5 => grep}/tests/tests (100%) rename src/apps/bin/{grep-2.5 => grep}/tests/warning.sh (100%) diff --git a/src/apps/bin/grep-2.5/ABOUT-NLS b/src/apps/bin/grep/ABOUT-NLS similarity index 100% rename from src/apps/bin/grep-2.5/ABOUT-NLS rename to src/apps/bin/grep/ABOUT-NLS diff --git a/src/apps/bin/grep-2.5/AUTHORS b/src/apps/bin/grep/AUTHORS similarity index 100% rename from src/apps/bin/grep-2.5/AUTHORS rename to src/apps/bin/grep/AUTHORS diff --git a/src/apps/bin/grep-2.5/COPYING b/src/apps/bin/grep/COPYING similarity index 100% rename from src/apps/bin/grep-2.5/COPYING rename to src/apps/bin/grep/COPYING diff --git a/src/apps/bin/grep-2.5/ChangeLog b/src/apps/bin/grep/ChangeLog similarity index 100% rename from src/apps/bin/grep-2.5/ChangeLog rename to src/apps/bin/grep/ChangeLog diff --git a/src/apps/bin/grep-2.5/INSTALL b/src/apps/bin/grep/INSTALL similarity index 100% rename from src/apps/bin/grep-2.5/INSTALL rename to src/apps/bin/grep/INSTALL diff --git a/src/apps/bin/grep-2.5/Jamfile b/src/apps/bin/grep/Jamfile similarity index 100% rename from src/apps/bin/grep-2.5/Jamfile rename to src/apps/bin/grep/Jamfile diff --git a/src/apps/bin/grep-2.5/Makefile.am b/src/apps/bin/grep/Makefile.am similarity index 100% rename from src/apps/bin/grep-2.5/Makefile.am rename to src/apps/bin/grep/Makefile.am diff --git a/src/apps/bin/grep-2.5/Makefile.cvs b/src/apps/bin/grep/Makefile.cvs similarity index 100% rename from src/apps/bin/grep-2.5/Makefile.cvs rename to src/apps/bin/grep/Makefile.cvs diff --git a/src/apps/bin/grep-2.5/Makefile.in b/src/apps/bin/grep/Makefile.in similarity index 100% rename from src/apps/bin/grep-2.5/Makefile.in rename to src/apps/bin/grep/Makefile.in diff --git a/src/apps/bin/grep-2.5/NEWS b/src/apps/bin/grep/NEWS similarity index 100% rename from src/apps/bin/grep-2.5/NEWS rename to src/apps/bin/grep/NEWS diff --git a/src/apps/bin/grep-2.5/README b/src/apps/bin/grep/README similarity index 100% rename from src/apps/bin/grep-2.5/README rename to src/apps/bin/grep/README diff --git a/src/apps/bin/grep-2.5/README-alpha b/src/apps/bin/grep/README-alpha similarity index 100% rename from src/apps/bin/grep-2.5/README-alpha rename to src/apps/bin/grep/README-alpha diff --git a/src/apps/bin/grep-2.5/README.DOS b/src/apps/bin/grep/README.DOS similarity index 100% rename from src/apps/bin/grep-2.5/README.DOS rename to src/apps/bin/grep/README.DOS diff --git a/src/apps/bin/grep-2.5/THANKS b/src/apps/bin/grep/THANKS similarity index 100% rename from src/apps/bin/grep-2.5/THANKS rename to src/apps/bin/grep/THANKS diff --git a/src/apps/bin/grep-2.5/TODO b/src/apps/bin/grep/TODO similarity index 100% rename from src/apps/bin/grep-2.5/TODO rename to src/apps/bin/grep/TODO diff --git a/src/apps/bin/grep-2.5/aclocal.m4 b/src/apps/bin/grep/aclocal.m4 similarity index 100% rename from src/apps/bin/grep-2.5/aclocal.m4 rename to src/apps/bin/grep/aclocal.m4 diff --git a/src/apps/bin/grep-2.5/autogen.sh b/src/apps/bin/grep/autogen.sh similarity index 100% rename from src/apps/bin/grep-2.5/autogen.sh rename to src/apps/bin/grep/autogen.sh diff --git a/src/apps/bin/grep-2.5/config.guess b/src/apps/bin/grep/config.guess similarity index 100% rename from src/apps/bin/grep-2.5/config.guess rename to src/apps/bin/grep/config.guess diff --git a/src/apps/bin/grep-2.5/config.h b/src/apps/bin/grep/config.h similarity index 100% rename from src/apps/bin/grep-2.5/config.h rename to src/apps/bin/grep/config.h diff --git a/src/apps/bin/grep-2.5/config.hin b/src/apps/bin/grep/config.hin similarity index 100% rename from src/apps/bin/grep-2.5/config.hin rename to src/apps/bin/grep/config.hin diff --git a/src/apps/bin/grep-2.5/config.sub b/src/apps/bin/grep/config.sub similarity index 100% rename from src/apps/bin/grep-2.5/config.sub rename to src/apps/bin/grep/config.sub diff --git a/src/apps/bin/grep-2.5/configure b/src/apps/bin/grep/configure similarity index 100% rename from src/apps/bin/grep-2.5/configure rename to src/apps/bin/grep/configure diff --git a/src/apps/bin/grep-2.5/configure.in b/src/apps/bin/grep/configure.in similarity index 100% rename from src/apps/bin/grep-2.5/configure.in rename to src/apps/bin/grep/configure.in diff --git a/src/apps/bin/grep-2.5/depcomp b/src/apps/bin/grep/depcomp similarity index 100% rename from src/apps/bin/grep-2.5/depcomp rename to src/apps/bin/grep/depcomp diff --git a/src/apps/bin/grep-2.5/doc/Makefile.am b/src/apps/bin/grep/doc/Makefile.am similarity index 100% rename from src/apps/bin/grep-2.5/doc/Makefile.am rename to src/apps/bin/grep/doc/Makefile.am diff --git a/src/apps/bin/grep-2.5/doc/Makefile.in b/src/apps/bin/grep/doc/Makefile.in similarity index 100% rename from src/apps/bin/grep-2.5/doc/Makefile.in rename to src/apps/bin/grep/doc/Makefile.in diff --git a/src/apps/bin/grep-2.5/doc/egrep.man b/src/apps/bin/grep/doc/egrep.man similarity index 100% rename from src/apps/bin/grep-2.5/doc/egrep.man rename to src/apps/bin/grep/doc/egrep.man diff --git a/src/apps/bin/grep-2.5/doc/fgrep.man b/src/apps/bin/grep/doc/fgrep.man similarity index 100% rename from src/apps/bin/grep-2.5/doc/fgrep.man rename to src/apps/bin/grep/doc/fgrep.man diff --git a/src/apps/bin/grep-2.5/doc/grep.1 b/src/apps/bin/grep/doc/grep.1 similarity index 100% rename from src/apps/bin/grep-2.5/doc/grep.1 rename to src/apps/bin/grep/doc/grep.1 diff --git a/src/apps/bin/grep-2.5/doc/grep.info b/src/apps/bin/grep/doc/grep.info similarity index 100% rename from src/apps/bin/grep-2.5/doc/grep.info rename to src/apps/bin/grep/doc/grep.info diff --git a/src/apps/bin/grep-2.5/doc/grep.texi b/src/apps/bin/grep/doc/grep.texi similarity index 100% rename from src/apps/bin/grep-2.5/doc/grep.texi rename to src/apps/bin/grep/doc/grep.texi diff --git a/src/apps/bin/grep-2.5/doc/mdate-sh b/src/apps/bin/grep/doc/mdate-sh similarity index 100% rename from src/apps/bin/grep-2.5/doc/mdate-sh rename to src/apps/bin/grep/doc/mdate-sh diff --git a/src/apps/bin/grep-2.5/doc/stamp-vti b/src/apps/bin/grep/doc/stamp-vti similarity index 100% rename from src/apps/bin/grep-2.5/doc/stamp-vti rename to src/apps/bin/grep/doc/stamp-vti diff --git a/src/apps/bin/grep-2.5/doc/texinfo.tex b/src/apps/bin/grep/doc/texinfo.tex similarity index 100% rename from src/apps/bin/grep-2.5/doc/texinfo.tex rename to src/apps/bin/grep/doc/texinfo.tex diff --git a/src/apps/bin/grep-2.5/doc/version.texi b/src/apps/bin/grep/doc/version.texi similarity index 100% rename from src/apps/bin/grep-2.5/doc/version.texi rename to src/apps/bin/grep/doc/version.texi diff --git a/src/apps/bin/grep-2.5/grep.spec b/src/apps/bin/grep/grep.spec similarity index 100% rename from src/apps/bin/grep-2.5/grep.spec rename to src/apps/bin/grep/grep.spec diff --git a/src/apps/bin/grep-2.5/install-sh b/src/apps/bin/grep/install-sh similarity index 100% rename from src/apps/bin/grep-2.5/install-sh rename to src/apps/bin/grep/install-sh diff --git a/src/apps/bin/grep-2.5/intl/ChangeLog b/src/apps/bin/grep/intl/ChangeLog similarity index 100% rename from src/apps/bin/grep-2.5/intl/ChangeLog rename to src/apps/bin/grep/intl/ChangeLog diff --git a/src/apps/bin/grep-2.5/intl/Makefile.in b/src/apps/bin/grep/intl/Makefile.in similarity index 100% rename from src/apps/bin/grep-2.5/intl/Makefile.in rename to src/apps/bin/grep/intl/Makefile.in diff --git a/src/apps/bin/grep-2.5/intl/VERSION b/src/apps/bin/grep/intl/VERSION similarity index 100% rename from src/apps/bin/grep-2.5/intl/VERSION rename to src/apps/bin/grep/intl/VERSION diff --git a/src/apps/bin/grep-2.5/intl/bindtextdom.c b/src/apps/bin/grep/intl/bindtextdom.c similarity index 100% rename from src/apps/bin/grep-2.5/intl/bindtextdom.c rename to src/apps/bin/grep/intl/bindtextdom.c diff --git a/src/apps/bin/grep-2.5/intl/config.charset b/src/apps/bin/grep/intl/config.charset similarity index 100% rename from src/apps/bin/grep-2.5/intl/config.charset rename to src/apps/bin/grep/intl/config.charset diff --git a/src/apps/bin/grep-2.5/intl/dcgettext.c b/src/apps/bin/grep/intl/dcgettext.c similarity index 100% rename from src/apps/bin/grep-2.5/intl/dcgettext.c rename to src/apps/bin/grep/intl/dcgettext.c diff --git a/src/apps/bin/grep-2.5/intl/dcigettext.c b/src/apps/bin/grep/intl/dcigettext.c similarity index 100% rename from src/apps/bin/grep-2.5/intl/dcigettext.c rename to src/apps/bin/grep/intl/dcigettext.c diff --git a/src/apps/bin/grep-2.5/intl/dcngettext.c b/src/apps/bin/grep/intl/dcngettext.c similarity index 100% rename from src/apps/bin/grep-2.5/intl/dcngettext.c rename to src/apps/bin/grep/intl/dcngettext.c diff --git a/src/apps/bin/grep-2.5/intl/dgettext.c b/src/apps/bin/grep/intl/dgettext.c similarity index 100% rename from src/apps/bin/grep-2.5/intl/dgettext.c rename to src/apps/bin/grep/intl/dgettext.c diff --git a/src/apps/bin/grep-2.5/intl/dngettext.c b/src/apps/bin/grep/intl/dngettext.c similarity index 100% rename from src/apps/bin/grep-2.5/intl/dngettext.c rename to src/apps/bin/grep/intl/dngettext.c diff --git a/src/apps/bin/grep-2.5/intl/eval-plural.h b/src/apps/bin/grep/intl/eval-plural.h similarity index 100% rename from src/apps/bin/grep-2.5/intl/eval-plural.h rename to src/apps/bin/grep/intl/eval-plural.h diff --git a/src/apps/bin/grep-2.5/intl/explodename.c b/src/apps/bin/grep/intl/explodename.c similarity index 100% rename from src/apps/bin/grep-2.5/intl/explodename.c rename to src/apps/bin/grep/intl/explodename.c diff --git a/src/apps/bin/grep-2.5/intl/finddomain.c b/src/apps/bin/grep/intl/finddomain.c similarity index 100% rename from src/apps/bin/grep-2.5/intl/finddomain.c rename to src/apps/bin/grep/intl/finddomain.c diff --git a/src/apps/bin/grep-2.5/intl/gettext.c b/src/apps/bin/grep/intl/gettext.c similarity index 100% rename from src/apps/bin/grep-2.5/intl/gettext.c rename to src/apps/bin/grep/intl/gettext.c diff --git a/src/apps/bin/grep-2.5/intl/gettextP.h b/src/apps/bin/grep/intl/gettextP.h similarity index 100% rename from src/apps/bin/grep-2.5/intl/gettextP.h rename to src/apps/bin/grep/intl/gettextP.h diff --git a/src/apps/bin/grep-2.5/intl/gmo.h b/src/apps/bin/grep/intl/gmo.h similarity index 100% rename from src/apps/bin/grep-2.5/intl/gmo.h rename to src/apps/bin/grep/intl/gmo.h diff --git a/src/apps/bin/grep-2.5/intl/hash-string.h b/src/apps/bin/grep/intl/hash-string.h similarity index 100% rename from src/apps/bin/grep-2.5/intl/hash-string.h rename to src/apps/bin/grep/intl/hash-string.h diff --git a/src/apps/bin/grep-2.5/intl/intl-compat.c b/src/apps/bin/grep/intl/intl-compat.c similarity index 100% rename from src/apps/bin/grep-2.5/intl/intl-compat.c rename to src/apps/bin/grep/intl/intl-compat.c diff --git a/src/apps/bin/grep-2.5/intl/l10nflist.c b/src/apps/bin/grep/intl/l10nflist.c similarity index 100% rename from src/apps/bin/grep-2.5/intl/l10nflist.c rename to src/apps/bin/grep/intl/l10nflist.c diff --git a/src/apps/bin/grep-2.5/intl/libgnuintl.h b/src/apps/bin/grep/intl/libgnuintl.h similarity index 100% rename from src/apps/bin/grep-2.5/intl/libgnuintl.h rename to src/apps/bin/grep/intl/libgnuintl.h diff --git a/src/apps/bin/grep-2.5/intl/libintl.glibc b/src/apps/bin/grep/intl/libintl.glibc similarity index 100% rename from src/apps/bin/grep-2.5/intl/libintl.glibc rename to src/apps/bin/grep/intl/libintl.glibc diff --git a/src/apps/bin/grep-2.5/intl/loadinfo.h b/src/apps/bin/grep/intl/loadinfo.h similarity index 100% rename from src/apps/bin/grep-2.5/intl/loadinfo.h rename to src/apps/bin/grep/intl/loadinfo.h diff --git a/src/apps/bin/grep-2.5/intl/loadmsgcat.c b/src/apps/bin/grep/intl/loadmsgcat.c similarity index 100% rename from src/apps/bin/grep-2.5/intl/loadmsgcat.c rename to src/apps/bin/grep/intl/loadmsgcat.c diff --git a/src/apps/bin/grep-2.5/intl/localcharset.c b/src/apps/bin/grep/intl/localcharset.c similarity index 100% rename from src/apps/bin/grep-2.5/intl/localcharset.c rename to src/apps/bin/grep/intl/localcharset.c diff --git a/src/apps/bin/grep-2.5/intl/locale.alias b/src/apps/bin/grep/intl/locale.alias similarity index 100% rename from src/apps/bin/grep-2.5/intl/locale.alias rename to src/apps/bin/grep/intl/locale.alias diff --git a/src/apps/bin/grep-2.5/intl/localealias.c b/src/apps/bin/grep/intl/localealias.c similarity index 100% rename from src/apps/bin/grep-2.5/intl/localealias.c rename to src/apps/bin/grep/intl/localealias.c diff --git a/src/apps/bin/grep-2.5/intl/localename.c b/src/apps/bin/grep/intl/localename.c similarity index 100% rename from src/apps/bin/grep-2.5/intl/localename.c rename to src/apps/bin/grep/intl/localename.c diff --git a/src/apps/bin/grep-2.5/intl/ngettext.c b/src/apps/bin/grep/intl/ngettext.c similarity index 100% rename from src/apps/bin/grep-2.5/intl/ngettext.c rename to src/apps/bin/grep/intl/ngettext.c diff --git a/src/apps/bin/grep-2.5/intl/os2compat.c b/src/apps/bin/grep/intl/os2compat.c similarity index 100% rename from src/apps/bin/grep-2.5/intl/os2compat.c rename to src/apps/bin/grep/intl/os2compat.c diff --git a/src/apps/bin/grep-2.5/intl/os2compat.h b/src/apps/bin/grep/intl/os2compat.h similarity index 100% rename from src/apps/bin/grep-2.5/intl/os2compat.h rename to src/apps/bin/grep/intl/os2compat.h diff --git a/src/apps/bin/grep-2.5/intl/osdep.c b/src/apps/bin/grep/intl/osdep.c similarity index 100% rename from src/apps/bin/grep-2.5/intl/osdep.c rename to src/apps/bin/grep/intl/osdep.c diff --git a/src/apps/bin/grep-2.5/intl/plural-exp.c b/src/apps/bin/grep/intl/plural-exp.c similarity index 100% rename from src/apps/bin/grep-2.5/intl/plural-exp.c rename to src/apps/bin/grep/intl/plural-exp.c diff --git a/src/apps/bin/grep-2.5/intl/plural-exp.h b/src/apps/bin/grep/intl/plural-exp.h similarity index 100% rename from src/apps/bin/grep-2.5/intl/plural-exp.h rename to src/apps/bin/grep/intl/plural-exp.h diff --git a/src/apps/bin/grep-2.5/intl/plural.c b/src/apps/bin/grep/intl/plural.c similarity index 100% rename from src/apps/bin/grep-2.5/intl/plural.c rename to src/apps/bin/grep/intl/plural.c diff --git a/src/apps/bin/grep-2.5/intl/plural.y b/src/apps/bin/grep/intl/plural.y similarity index 100% rename from src/apps/bin/grep-2.5/intl/plural.y rename to src/apps/bin/grep/intl/plural.y diff --git a/src/apps/bin/grep-2.5/intl/ref-add.sin b/src/apps/bin/grep/intl/ref-add.sin similarity index 100% rename from src/apps/bin/grep-2.5/intl/ref-add.sin rename to src/apps/bin/grep/intl/ref-add.sin diff --git a/src/apps/bin/grep-2.5/intl/ref-del.sin b/src/apps/bin/grep/intl/ref-del.sin similarity index 100% rename from src/apps/bin/grep-2.5/intl/ref-del.sin rename to src/apps/bin/grep/intl/ref-del.sin diff --git a/src/apps/bin/grep-2.5/intl/textdomain.c b/src/apps/bin/grep/intl/textdomain.c similarity index 100% rename from src/apps/bin/grep-2.5/intl/textdomain.c rename to src/apps/bin/grep/intl/textdomain.c diff --git a/src/apps/bin/grep-2.5/lib/Jamfile b/src/apps/bin/grep/lib/Jamfile similarity index 100% rename from src/apps/bin/grep-2.5/lib/Jamfile rename to src/apps/bin/grep/lib/Jamfile diff --git a/src/apps/bin/grep-2.5/lib/Makefile.am b/src/apps/bin/grep/lib/Makefile.am similarity index 100% rename from src/apps/bin/grep-2.5/lib/Makefile.am rename to src/apps/bin/grep/lib/Makefile.am diff --git a/src/apps/bin/grep-2.5/lib/Makefile.in b/src/apps/bin/grep/lib/Makefile.in similarity index 100% rename from src/apps/bin/grep-2.5/lib/Makefile.in rename to src/apps/bin/grep/lib/Makefile.in diff --git a/src/apps/bin/grep-2.5/lib/alloca.c b/src/apps/bin/grep/lib/alloca.c similarity index 100% rename from src/apps/bin/grep-2.5/lib/alloca.c rename to src/apps/bin/grep/lib/alloca.c diff --git a/src/apps/bin/grep-2.5/lib/atexit.c b/src/apps/bin/grep/lib/atexit.c similarity index 100% rename from src/apps/bin/grep-2.5/lib/atexit.c rename to src/apps/bin/grep/lib/atexit.c diff --git a/src/apps/bin/grep-2.5/lib/closeout.c b/src/apps/bin/grep/lib/closeout.c similarity index 100% rename from src/apps/bin/grep-2.5/lib/closeout.c rename to src/apps/bin/grep/lib/closeout.c diff --git a/src/apps/bin/grep-2.5/lib/closeout.h b/src/apps/bin/grep/lib/closeout.h similarity index 100% rename from src/apps/bin/grep-2.5/lib/closeout.h rename to src/apps/bin/grep/lib/closeout.h diff --git a/src/apps/bin/grep-2.5/lib/error.c b/src/apps/bin/grep/lib/error.c similarity index 100% rename from src/apps/bin/grep-2.5/lib/error.c rename to src/apps/bin/grep/lib/error.c diff --git a/src/apps/bin/grep-2.5/lib/error.h b/src/apps/bin/grep/lib/error.h similarity index 100% rename from src/apps/bin/grep-2.5/lib/error.h rename to src/apps/bin/grep/lib/error.h diff --git a/src/apps/bin/grep-2.5/lib/exclude.c b/src/apps/bin/grep/lib/exclude.c similarity index 100% rename from src/apps/bin/grep-2.5/lib/exclude.c rename to src/apps/bin/grep/lib/exclude.c diff --git a/src/apps/bin/grep-2.5/lib/exclude.h b/src/apps/bin/grep/lib/exclude.h similarity index 100% rename from src/apps/bin/grep-2.5/lib/exclude.h rename to src/apps/bin/grep/lib/exclude.h diff --git a/src/apps/bin/grep-2.5/lib/fnmatch.c b/src/apps/bin/grep/lib/fnmatch.c similarity index 100% rename from src/apps/bin/grep-2.5/lib/fnmatch.c rename to src/apps/bin/grep/lib/fnmatch.c diff --git a/src/apps/bin/grep-2.5/lib/fnmatch.h b/src/apps/bin/grep/lib/fnmatch.h similarity index 100% rename from src/apps/bin/grep-2.5/lib/fnmatch.h rename to src/apps/bin/grep/lib/fnmatch.h diff --git a/src/apps/bin/grep-2.5/lib/getopt.c b/src/apps/bin/grep/lib/getopt.c similarity index 100% rename from src/apps/bin/grep-2.5/lib/getopt.c rename to src/apps/bin/grep/lib/getopt.c diff --git a/src/apps/bin/grep-2.5/lib/getopt.h b/src/apps/bin/grep/lib/getopt.h similarity index 100% rename from src/apps/bin/grep-2.5/lib/getopt.h rename to src/apps/bin/grep/lib/getopt.h diff --git a/src/apps/bin/grep-2.5/lib/getopt1.c b/src/apps/bin/grep/lib/getopt1.c similarity index 100% rename from src/apps/bin/grep-2.5/lib/getopt1.c rename to src/apps/bin/grep/lib/getopt1.c diff --git a/src/apps/bin/grep-2.5/lib/hard-locale.c b/src/apps/bin/grep/lib/hard-locale.c similarity index 100% rename from src/apps/bin/grep-2.5/lib/hard-locale.c rename to src/apps/bin/grep/lib/hard-locale.c diff --git a/src/apps/bin/grep-2.5/lib/hard-locale.h b/src/apps/bin/grep/lib/hard-locale.h similarity index 100% rename from src/apps/bin/grep-2.5/lib/hard-locale.h rename to src/apps/bin/grep/lib/hard-locale.h diff --git a/src/apps/bin/grep-2.5/lib/isdir.c b/src/apps/bin/grep/lib/isdir.c similarity index 100% rename from src/apps/bin/grep-2.5/lib/isdir.c rename to src/apps/bin/grep/lib/isdir.c diff --git a/src/apps/bin/grep-2.5/lib/malloc.c b/src/apps/bin/grep/lib/malloc.c similarity index 100% rename from src/apps/bin/grep-2.5/lib/malloc.c rename to src/apps/bin/grep/lib/malloc.c diff --git a/src/apps/bin/grep-2.5/lib/memchr.c b/src/apps/bin/grep/lib/memchr.c similarity index 100% rename from src/apps/bin/grep-2.5/lib/memchr.c rename to src/apps/bin/grep/lib/memchr.c diff --git a/src/apps/bin/grep-2.5/lib/obstack.c b/src/apps/bin/grep/lib/obstack.c similarity index 100% rename from src/apps/bin/grep-2.5/lib/obstack.c rename to src/apps/bin/grep/lib/obstack.c diff --git a/src/apps/bin/grep-2.5/lib/obstack.h b/src/apps/bin/grep/lib/obstack.h similarity index 100% rename from src/apps/bin/grep-2.5/lib/obstack.h rename to src/apps/bin/grep/lib/obstack.h diff --git a/src/apps/bin/grep-2.5/lib/quotearg.c b/src/apps/bin/grep/lib/quotearg.c similarity index 100% rename from src/apps/bin/grep-2.5/lib/quotearg.c rename to src/apps/bin/grep/lib/quotearg.c diff --git a/src/apps/bin/grep-2.5/lib/quotearg.h b/src/apps/bin/grep/lib/quotearg.h similarity index 100% rename from src/apps/bin/grep-2.5/lib/quotearg.h rename to src/apps/bin/grep/lib/quotearg.h diff --git a/src/apps/bin/grep-2.5/lib/realloc.c b/src/apps/bin/grep/lib/realloc.c similarity index 100% rename from src/apps/bin/grep-2.5/lib/realloc.c rename to src/apps/bin/grep/lib/realloc.c diff --git a/src/apps/bin/grep-2.5/lib/regex.c b/src/apps/bin/grep/lib/regex.c similarity index 100% rename from src/apps/bin/grep-2.5/lib/regex.c rename to src/apps/bin/grep/lib/regex.c diff --git a/src/apps/bin/grep-2.5/lib/regex.h b/src/apps/bin/grep/lib/regex.h similarity index 100% rename from src/apps/bin/grep-2.5/lib/regex.h rename to src/apps/bin/grep/lib/regex.h diff --git a/src/apps/bin/grep-2.5/lib/savedir.c b/src/apps/bin/grep/lib/savedir.c similarity index 100% rename from src/apps/bin/grep-2.5/lib/savedir.c rename to src/apps/bin/grep/lib/savedir.c diff --git a/src/apps/bin/grep-2.5/lib/savedir.h b/src/apps/bin/grep/lib/savedir.h similarity index 100% rename from src/apps/bin/grep-2.5/lib/savedir.h rename to src/apps/bin/grep/lib/savedir.h diff --git a/src/apps/bin/grep-2.5/lib/stpcpy.c b/src/apps/bin/grep/lib/stpcpy.c similarity index 100% rename from src/apps/bin/grep-2.5/lib/stpcpy.c rename to src/apps/bin/grep/lib/stpcpy.c diff --git a/src/apps/bin/grep-2.5/lib/strtol.c b/src/apps/bin/grep/lib/strtol.c similarity index 100% rename from src/apps/bin/grep-2.5/lib/strtol.c rename to src/apps/bin/grep/lib/strtol.c diff --git a/src/apps/bin/grep-2.5/lib/strtoul.c b/src/apps/bin/grep/lib/strtoul.c similarity index 100% rename from src/apps/bin/grep-2.5/lib/strtoul.c rename to src/apps/bin/grep/lib/strtoul.c diff --git a/src/apps/bin/grep-2.5/lib/strtoull.c b/src/apps/bin/grep/lib/strtoull.c similarity index 100% rename from src/apps/bin/grep-2.5/lib/strtoull.c rename to src/apps/bin/grep/lib/strtoull.c diff --git a/src/apps/bin/grep-2.5/lib/strtoumax.c b/src/apps/bin/grep/lib/strtoumax.c similarity index 100% rename from src/apps/bin/grep-2.5/lib/strtoumax.c rename to src/apps/bin/grep/lib/strtoumax.c diff --git a/src/apps/bin/grep-2.5/lib/xalloc.h b/src/apps/bin/grep/lib/xalloc.h similarity index 100% rename from src/apps/bin/grep-2.5/lib/xalloc.h rename to src/apps/bin/grep/lib/xalloc.h diff --git a/src/apps/bin/grep-2.5/lib/xmalloc.c b/src/apps/bin/grep/lib/xmalloc.c similarity index 100% rename from src/apps/bin/grep-2.5/lib/xmalloc.c rename to src/apps/bin/grep/lib/xmalloc.c diff --git a/src/apps/bin/grep-2.5/lib/xstrtol.c b/src/apps/bin/grep/lib/xstrtol.c similarity index 100% rename from src/apps/bin/grep-2.5/lib/xstrtol.c rename to src/apps/bin/grep/lib/xstrtol.c diff --git a/src/apps/bin/grep-2.5/lib/xstrtol.h b/src/apps/bin/grep/lib/xstrtol.h similarity index 100% rename from src/apps/bin/grep-2.5/lib/xstrtol.h rename to src/apps/bin/grep/lib/xstrtol.h diff --git a/src/apps/bin/grep-2.5/lib/xstrtoumax.c b/src/apps/bin/grep/lib/xstrtoumax.c similarity index 100% rename from src/apps/bin/grep-2.5/lib/xstrtoumax.c rename to src/apps/bin/grep/lib/xstrtoumax.c diff --git a/src/apps/bin/grep-2.5/missing b/src/apps/bin/grep/missing similarity index 100% rename from src/apps/bin/grep-2.5/missing rename to src/apps/bin/grep/missing diff --git a/src/apps/bin/grep-2.5/mkinstalldirs b/src/apps/bin/grep/mkinstalldirs similarity index 100% rename from src/apps/bin/grep-2.5/mkinstalldirs rename to src/apps/bin/grep/mkinstalldirs diff --git a/src/apps/bin/grep-2.5/po/ChangeLog b/src/apps/bin/grep/po/ChangeLog similarity index 100% rename from src/apps/bin/grep-2.5/po/ChangeLog rename to src/apps/bin/grep/po/ChangeLog diff --git a/src/apps/bin/grep-2.5/po/Makefile b/src/apps/bin/grep/po/Makefile similarity index 100% rename from src/apps/bin/grep-2.5/po/Makefile rename to src/apps/bin/grep/po/Makefile diff --git a/src/apps/bin/grep-2.5/po/Makefile.in b/src/apps/bin/grep/po/Makefile.in similarity index 100% rename from src/apps/bin/grep-2.5/po/Makefile.in rename to src/apps/bin/grep/po/Makefile.in diff --git a/src/apps/bin/grep-2.5/po/Makefile.in.in b/src/apps/bin/grep/po/Makefile.in.in similarity index 100% rename from src/apps/bin/grep-2.5/po/Makefile.in.in rename to src/apps/bin/grep/po/Makefile.in.in diff --git a/src/apps/bin/grep-2.5/po/POTFILES b/src/apps/bin/grep/po/POTFILES similarity index 100% rename from src/apps/bin/grep-2.5/po/POTFILES rename to src/apps/bin/grep/po/POTFILES diff --git a/src/apps/bin/grep-2.5/po/POTFILES.in b/src/apps/bin/grep/po/POTFILES.in similarity index 100% rename from src/apps/bin/grep-2.5/po/POTFILES.in rename to src/apps/bin/grep/po/POTFILES.in diff --git a/src/apps/bin/grep-2.5/po/bg.po b/src/apps/bin/grep/po/bg.po similarity index 100% rename from src/apps/bin/grep-2.5/po/bg.po rename to src/apps/bin/grep/po/bg.po diff --git a/src/apps/bin/grep-2.5/po/ca.po b/src/apps/bin/grep/po/ca.po similarity index 100% rename from src/apps/bin/grep-2.5/po/ca.po rename to src/apps/bin/grep/po/ca.po diff --git a/src/apps/bin/grep-2.5/po/cat-id-tbl.c b/src/apps/bin/grep/po/cat-id-tbl.c similarity index 100% rename from src/apps/bin/grep-2.5/po/cat-id-tbl.c rename to src/apps/bin/grep/po/cat-id-tbl.c diff --git a/src/apps/bin/grep-2.5/po/cs.po b/src/apps/bin/grep/po/cs.po similarity index 100% rename from src/apps/bin/grep-2.5/po/cs.po rename to src/apps/bin/grep/po/cs.po diff --git a/src/apps/bin/grep-2.5/po/da.po b/src/apps/bin/grep/po/da.po similarity index 100% rename from src/apps/bin/grep-2.5/po/da.po rename to src/apps/bin/grep/po/da.po diff --git a/src/apps/bin/grep-2.5/po/de.po b/src/apps/bin/grep/po/de.po similarity index 100% rename from src/apps/bin/grep-2.5/po/de.po rename to src/apps/bin/grep/po/de.po diff --git a/src/apps/bin/grep-2.5/po/el.po b/src/apps/bin/grep/po/el.po similarity index 100% rename from src/apps/bin/grep-2.5/po/el.po rename to src/apps/bin/grep/po/el.po diff --git a/src/apps/bin/grep-2.5/po/eo.po b/src/apps/bin/grep/po/eo.po similarity index 100% rename from src/apps/bin/grep-2.5/po/eo.po rename to src/apps/bin/grep/po/eo.po diff --git a/src/apps/bin/grep-2.5/po/es.po b/src/apps/bin/grep/po/es.po similarity index 100% rename from src/apps/bin/grep-2.5/po/es.po rename to src/apps/bin/grep/po/es.po diff --git a/src/apps/bin/grep-2.5/po/et.po b/src/apps/bin/grep/po/et.po similarity index 100% rename from src/apps/bin/grep-2.5/po/et.po rename to src/apps/bin/grep/po/et.po diff --git a/src/apps/bin/grep-2.5/po/fr.po b/src/apps/bin/grep/po/fr.po similarity index 100% rename from src/apps/bin/grep-2.5/po/fr.po rename to src/apps/bin/grep/po/fr.po diff --git a/src/apps/bin/grep-2.5/po/gl.po b/src/apps/bin/grep/po/gl.po similarity index 100% rename from src/apps/bin/grep-2.5/po/gl.po rename to src/apps/bin/grep/po/gl.po diff --git a/src/apps/bin/grep-2.5/po/grep.pot b/src/apps/bin/grep/po/grep.pot similarity index 100% rename from src/apps/bin/grep-2.5/po/grep.pot rename to src/apps/bin/grep/po/grep.pot diff --git a/src/apps/bin/grep-2.5/po/hr.po b/src/apps/bin/grep/po/hr.po similarity index 100% rename from src/apps/bin/grep-2.5/po/hr.po rename to src/apps/bin/grep/po/hr.po diff --git a/src/apps/bin/grep-2.5/po/id.po b/src/apps/bin/grep/po/id.po similarity index 100% rename from src/apps/bin/grep-2.5/po/id.po rename to src/apps/bin/grep/po/id.po diff --git a/src/apps/bin/grep-2.5/po/it.po b/src/apps/bin/grep/po/it.po similarity index 100% rename from src/apps/bin/grep-2.5/po/it.po rename to src/apps/bin/grep/po/it.po diff --git a/src/apps/bin/grep-2.5/po/ja.po b/src/apps/bin/grep/po/ja.po similarity index 100% rename from src/apps/bin/grep-2.5/po/ja.po rename to src/apps/bin/grep/po/ja.po diff --git a/src/apps/bin/grep-2.5/po/ko.po b/src/apps/bin/grep/po/ko.po similarity index 100% rename from src/apps/bin/grep-2.5/po/ko.po rename to src/apps/bin/grep/po/ko.po diff --git a/src/apps/bin/grep-2.5/po/nb.po b/src/apps/bin/grep/po/nb.po similarity index 100% rename from src/apps/bin/grep-2.5/po/nb.po rename to src/apps/bin/grep/po/nb.po diff --git a/src/apps/bin/grep-2.5/po/nl.po b/src/apps/bin/grep/po/nl.po similarity index 100% rename from src/apps/bin/grep-2.5/po/nl.po rename to src/apps/bin/grep/po/nl.po diff --git a/src/apps/bin/grep-2.5/po/no.po b/src/apps/bin/grep/po/no.po similarity index 100% rename from src/apps/bin/grep-2.5/po/no.po rename to src/apps/bin/grep/po/no.po diff --git a/src/apps/bin/grep-2.5/po/pl.po b/src/apps/bin/grep/po/pl.po similarity index 100% rename from src/apps/bin/grep-2.5/po/pl.po rename to src/apps/bin/grep/po/pl.po diff --git a/src/apps/bin/grep-2.5/po/pt_BR.po b/src/apps/bin/grep/po/pt_BR.po similarity index 100% rename from src/apps/bin/grep-2.5/po/pt_BR.po rename to src/apps/bin/grep/po/pt_BR.po diff --git a/src/apps/bin/grep-2.5/po/ru.po b/src/apps/bin/grep/po/ru.po similarity index 100% rename from src/apps/bin/grep-2.5/po/ru.po rename to src/apps/bin/grep/po/ru.po diff --git a/src/apps/bin/grep-2.5/po/sl.po b/src/apps/bin/grep/po/sl.po similarity index 100% rename from src/apps/bin/grep-2.5/po/sl.po rename to src/apps/bin/grep/po/sl.po diff --git a/src/apps/bin/grep-2.5/po/stamp-cat-id b/src/apps/bin/grep/po/stamp-cat-id similarity index 100% rename from src/apps/bin/grep-2.5/po/stamp-cat-id rename to src/apps/bin/grep/po/stamp-cat-id diff --git a/src/apps/bin/grep-2.5/po/sv.po b/src/apps/bin/grep/po/sv.po similarity index 100% rename from src/apps/bin/grep-2.5/po/sv.po rename to src/apps/bin/grep/po/sv.po diff --git a/src/apps/bin/grep-2.5/po/tr.po b/src/apps/bin/grep/po/tr.po similarity index 100% rename from src/apps/bin/grep-2.5/po/tr.po rename to src/apps/bin/grep/po/tr.po diff --git a/src/apps/bin/grep-2.5/src/Jamfile b/src/apps/bin/grep/src/Jamfile similarity index 100% rename from src/apps/bin/grep-2.5/src/Jamfile rename to src/apps/bin/grep/src/Jamfile diff --git a/src/apps/bin/grep-2.5/src/Makefile b/src/apps/bin/grep/src/Makefile similarity index 100% rename from src/apps/bin/grep-2.5/src/Makefile rename to src/apps/bin/grep/src/Makefile diff --git a/src/apps/bin/grep-2.5/src/Makefile.am b/src/apps/bin/grep/src/Makefile.am similarity index 100% rename from src/apps/bin/grep-2.5/src/Makefile.am rename to src/apps/bin/grep/src/Makefile.am diff --git a/src/apps/bin/grep-2.5/src/Makefile.in b/src/apps/bin/grep/src/Makefile.in similarity index 100% rename from src/apps/bin/grep-2.5/src/Makefile.in rename to src/apps/bin/grep/src/Makefile.in diff --git a/src/apps/bin/grep-2.5/src/ansi2knr.1 b/src/apps/bin/grep/src/ansi2knr.1 similarity index 100% rename from src/apps/bin/grep-2.5/src/ansi2knr.1 rename to src/apps/bin/grep/src/ansi2knr.1 diff --git a/src/apps/bin/grep-2.5/src/ansi2knr.c b/src/apps/bin/grep/src/ansi2knr.c similarity index 100% rename from src/apps/bin/grep-2.5/src/ansi2knr.c rename to src/apps/bin/grep/src/ansi2knr.c diff --git a/src/apps/bin/grep-2.5/src/dfa.c b/src/apps/bin/grep/src/dfa.c similarity index 100% rename from src/apps/bin/grep-2.5/src/dfa.c rename to src/apps/bin/grep/src/dfa.c diff --git a/src/apps/bin/grep-2.5/src/dfa.h b/src/apps/bin/grep/src/dfa.h similarity index 100% rename from src/apps/bin/grep-2.5/src/dfa.h rename to src/apps/bin/grep/src/dfa.h diff --git a/src/apps/bin/grep-2.5/src/dosbuf.c b/src/apps/bin/grep/src/dosbuf.c similarity index 100% rename from src/apps/bin/grep-2.5/src/dosbuf.c rename to src/apps/bin/grep/src/dosbuf.c diff --git a/src/apps/bin/grep-2.5/src/egrep b/src/apps/bin/grep/src/egrep similarity index 100% rename from src/apps/bin/grep-2.5/src/egrep rename to src/apps/bin/grep/src/egrep diff --git a/src/apps/bin/grep-2.5/src/fgrep b/src/apps/bin/grep/src/fgrep similarity index 100% rename from src/apps/bin/grep-2.5/src/fgrep rename to src/apps/bin/grep/src/fgrep diff --git a/src/apps/bin/grep-2.5/src/getpagesize.h b/src/apps/bin/grep/src/getpagesize.h similarity index 100% rename from src/apps/bin/grep-2.5/src/getpagesize.h rename to src/apps/bin/grep/src/getpagesize.h diff --git a/src/apps/bin/grep-2.5/src/grep.c b/src/apps/bin/grep/src/grep.c similarity index 100% rename from src/apps/bin/grep-2.5/src/grep.c rename to src/apps/bin/grep/src/grep.c diff --git a/src/apps/bin/grep-2.5/src/grep.h b/src/apps/bin/grep/src/grep.h similarity index 100% rename from src/apps/bin/grep-2.5/src/grep.h rename to src/apps/bin/grep/src/grep.h diff --git a/src/apps/bin/grep-2.5/src/grep.rdef b/src/apps/bin/grep/src/grep.rdef similarity index 100% rename from src/apps/bin/grep-2.5/src/grep.rdef rename to src/apps/bin/grep/src/grep.rdef diff --git a/src/apps/bin/grep-2.5/src/grepmat.c b/src/apps/bin/grep/src/grepmat.c similarity index 100% rename from src/apps/bin/grep-2.5/src/grepmat.c rename to src/apps/bin/grep/src/grepmat.c diff --git a/src/apps/bin/grep-2.5/src/kwset.c b/src/apps/bin/grep/src/kwset.c similarity index 100% rename from src/apps/bin/grep-2.5/src/kwset.c rename to src/apps/bin/grep/src/kwset.c diff --git a/src/apps/bin/grep-2.5/src/kwset.h b/src/apps/bin/grep/src/kwset.h similarity index 100% rename from src/apps/bin/grep-2.5/src/kwset.h rename to src/apps/bin/grep/src/kwset.h diff --git a/src/apps/bin/grep-2.5/src/search.c b/src/apps/bin/grep/src/search.c similarity index 100% rename from src/apps/bin/grep-2.5/src/search.c rename to src/apps/bin/grep/src/search.c diff --git a/src/apps/bin/grep-2.5/src/system.h b/src/apps/bin/grep/src/system.h similarity index 100% rename from src/apps/bin/grep-2.5/src/system.h rename to src/apps/bin/grep/src/system.h diff --git a/src/apps/bin/grep-2.5/src/vms_fab.c b/src/apps/bin/grep/src/vms_fab.c similarity index 100% rename from src/apps/bin/grep-2.5/src/vms_fab.c rename to src/apps/bin/grep/src/vms_fab.c diff --git a/src/apps/bin/grep-2.5/src/vms_fab.h b/src/apps/bin/grep/src/vms_fab.h similarity index 100% rename from src/apps/bin/grep-2.5/src/vms_fab.h rename to src/apps/bin/grep/src/vms_fab.h diff --git a/src/apps/bin/grep-2.5/stamp-h.in b/src/apps/bin/grep/stamp-h.in similarity index 100% rename from src/apps/bin/grep-2.5/stamp-h.in rename to src/apps/bin/grep/stamp-h.in diff --git a/src/apps/bin/grep-2.5/tests/Makefile b/src/apps/bin/grep/tests/Makefile similarity index 100% rename from src/apps/bin/grep-2.5/tests/Makefile rename to src/apps/bin/grep/tests/Makefile diff --git a/src/apps/bin/grep-2.5/tests/Makefile.am b/src/apps/bin/grep/tests/Makefile.am similarity index 100% rename from src/apps/bin/grep-2.5/tests/Makefile.am rename to src/apps/bin/grep/tests/Makefile.am diff --git a/src/apps/bin/grep-2.5/tests/Makefile.in b/src/apps/bin/grep/tests/Makefile.in similarity index 100% rename from src/apps/bin/grep-2.5/tests/Makefile.in rename to src/apps/bin/grep/tests/Makefile.in diff --git a/src/apps/bin/grep-2.5/tests/backref.sh b/src/apps/bin/grep/tests/backref.sh similarity index 100% rename from src/apps/bin/grep-2.5/tests/backref.sh rename to src/apps/bin/grep/tests/backref.sh diff --git a/src/apps/bin/grep-2.5/tests/bre.awk b/src/apps/bin/grep/tests/bre.awk similarity index 100% rename from src/apps/bin/grep-2.5/tests/bre.awk rename to src/apps/bin/grep/tests/bre.awk diff --git a/src/apps/bin/grep-2.5/tests/bre.sh b/src/apps/bin/grep/tests/bre.sh similarity index 100% rename from src/apps/bin/grep-2.5/tests/bre.sh rename to src/apps/bin/grep/tests/bre.sh diff --git a/src/apps/bin/grep-2.5/tests/bre.tests b/src/apps/bin/grep/tests/bre.tests similarity index 100% rename from src/apps/bin/grep-2.5/tests/bre.tests rename to src/apps/bin/grep/tests/bre.tests diff --git a/src/apps/bin/grep-2.5/tests/empty.sh b/src/apps/bin/grep/tests/empty.sh similarity index 100% rename from src/apps/bin/grep-2.5/tests/empty.sh rename to src/apps/bin/grep/tests/empty.sh diff --git a/src/apps/bin/grep-2.5/tests/ere.awk b/src/apps/bin/grep/tests/ere.awk similarity index 100% rename from src/apps/bin/grep-2.5/tests/ere.awk rename to src/apps/bin/grep/tests/ere.awk diff --git a/src/apps/bin/grep-2.5/tests/ere.sh b/src/apps/bin/grep/tests/ere.sh similarity index 100% rename from src/apps/bin/grep-2.5/tests/ere.sh rename to src/apps/bin/grep/tests/ere.sh diff --git a/src/apps/bin/grep-2.5/tests/ere.tests b/src/apps/bin/grep/tests/ere.tests similarity index 100% rename from src/apps/bin/grep-2.5/tests/ere.tests rename to src/apps/bin/grep/tests/ere.tests diff --git a/src/apps/bin/grep-2.5/tests/file.sh b/src/apps/bin/grep/tests/file.sh similarity index 100% rename from src/apps/bin/grep-2.5/tests/file.sh rename to src/apps/bin/grep/tests/file.sh diff --git a/src/apps/bin/grep-2.5/tests/formatbre.awk b/src/apps/bin/grep/tests/formatbre.awk similarity index 100% rename from src/apps/bin/grep-2.5/tests/formatbre.awk rename to src/apps/bin/grep/tests/formatbre.awk diff --git a/src/apps/bin/grep-2.5/tests/formatere.awk b/src/apps/bin/grep/tests/formatere.awk similarity index 100% rename from src/apps/bin/grep-2.5/tests/formatere.awk rename to src/apps/bin/grep/tests/formatere.awk diff --git a/src/apps/bin/grep-2.5/tests/khadafy.lines b/src/apps/bin/grep/tests/khadafy.lines similarity index 100% rename from src/apps/bin/grep-2.5/tests/khadafy.lines rename to src/apps/bin/grep/tests/khadafy.lines diff --git a/src/apps/bin/grep-2.5/tests/khadafy.regexp b/src/apps/bin/grep/tests/khadafy.regexp similarity index 100% rename from src/apps/bin/grep-2.5/tests/khadafy.regexp rename to src/apps/bin/grep/tests/khadafy.regexp diff --git a/src/apps/bin/grep-2.5/tests/khadafy.sh b/src/apps/bin/grep/tests/khadafy.sh similarity index 100% rename from src/apps/bin/grep-2.5/tests/khadafy.sh rename to src/apps/bin/grep/tests/khadafy.sh diff --git a/src/apps/bin/grep-2.5/tests/options.sh b/src/apps/bin/grep/tests/options.sh similarity index 100% rename from src/apps/bin/grep-2.5/tests/options.sh rename to src/apps/bin/grep/tests/options.sh diff --git a/src/apps/bin/grep-2.5/tests/spencer1.awk b/src/apps/bin/grep/tests/spencer1.awk similarity index 100% rename from src/apps/bin/grep-2.5/tests/spencer1.awk rename to src/apps/bin/grep/tests/spencer1.awk diff --git a/src/apps/bin/grep-2.5/tests/spencer1.sh b/src/apps/bin/grep/tests/spencer1.sh similarity index 100% rename from src/apps/bin/grep-2.5/tests/spencer1.sh rename to src/apps/bin/grep/tests/spencer1.sh diff --git a/src/apps/bin/grep-2.5/tests/spencer1.tests b/src/apps/bin/grep/tests/spencer1.tests similarity index 100% rename from src/apps/bin/grep-2.5/tests/spencer1.tests rename to src/apps/bin/grep/tests/spencer1.tests diff --git a/src/apps/bin/grep-2.5/tests/spencer2.sh b/src/apps/bin/grep/tests/spencer2.sh similarity index 100% rename from src/apps/bin/grep-2.5/tests/spencer2.sh rename to src/apps/bin/grep/tests/spencer2.sh diff --git a/src/apps/bin/grep-2.5/tests/spencer2.tests b/src/apps/bin/grep/tests/spencer2.tests similarity index 100% rename from src/apps/bin/grep-2.5/tests/spencer2.tests rename to src/apps/bin/grep/tests/spencer2.tests diff --git a/src/apps/bin/grep-2.5/tests/status.sh b/src/apps/bin/grep/tests/status.sh similarity index 100% rename from src/apps/bin/grep-2.5/tests/status.sh rename to src/apps/bin/grep/tests/status.sh diff --git a/src/apps/bin/grep-2.5/tests/tests b/src/apps/bin/grep/tests/tests similarity index 100% rename from src/apps/bin/grep-2.5/tests/tests rename to src/apps/bin/grep/tests/tests diff --git a/src/apps/bin/grep-2.5/tests/warning.sh b/src/apps/bin/grep/tests/warning.sh similarity index 100% rename from src/apps/bin/grep-2.5/tests/warning.sh rename to src/apps/bin/grep/tests/warning.sh