diff options
author | Saul Wold <sgw@linux.intel.com> | 2010-12-29 22:32:25 -0800 |
---|---|---|
committer | Richard Purdie <rpurdie@linux.intel.com> | 2010-12-30 12:06:52 +0000 |
commit | 8494db74786307d44169bee4f21dc0efa1643f70 (patch) | |
tree | e98730fc6ed3c971fb5bfd6e8e96b5ef035ddc93 /meta/recipes-extended/man/man-1.6f/man-1.6e-whatis2.patch | |
parent | c0e6d3ea6a819d5f776d861a8336b18cfab5f316 (diff) | |
download | openembedded-core-contrib-8494db74786307d44169bee4f21dc0efa1643f70.tar.gz |
man: updated to 1.6f, fixed patches
Rebased patches for 1.6f:
- lzma - modified for xz support
- ro_usr & whatis2 fixed up
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Diffstat (limited to 'meta/recipes-extended/man/man-1.6f/man-1.6e-whatis2.patch')
-rw-r--r-- | meta/recipes-extended/man/man-1.6f/man-1.6e-whatis2.patch | 48 |
1 files changed, 48 insertions, 0 deletions
diff --git a/meta/recipes-extended/man/man-1.6f/man-1.6e-whatis2.patch b/meta/recipes-extended/man/man-1.6f/man-1.6e-whatis2.patch new file mode 100644 index 0000000000..1a10be3611 --- /dev/null +++ b/meta/recipes-extended/man/man-1.6f/man-1.6e-whatis2.patch @@ -0,0 +1,48 @@ +Index: man-1.6f/src/makewhatis.sh +=================================================================== +--- man-1.6f.orig/src/makewhatis.sh 2010-12-29 13:51:45.000000000 -0800 ++++ man-1.6f/src/makewhatis.sh 2010-12-29 13:59:35.399799412 -0800 +@@ -164,10 +164,15 @@ + fi + catpath=`echo ${catpath} | tr : ' '` + ++#WHATIS_DIR=$DESTDIR/var/cache/man/`echo $here|sed -e 's!.*/man/!!g'` ++WHATIS_DIR=$DESTDIR/var/cache/man/$LANG ++[[ -d $WHATIS_DIR ]] || mkdir -p $WHATIS_DIR/ ++ + # first truncate all the whatis files that will be created new, + # then only update - we might visit the same directory twice + if [ x$update = x ]; then +- cp /dev/null /var/cache/man/whatis ++ mkdir -p $WHATIS_DIR/ ++ /bin/echo -n > $WHATIS_DIR/whatis + fi + + for pages in man cat +@@ -180,13 +185,7 @@ + echo "about to enter $mandir" > /dev/stderr + fi + +- # kludge for Slackware's /usr/man/preformat +- if [ $mandir = /usr/man/preformat ] +- then +- mandir1=/usr/man +- else +- mandir1=$mandir +- fi ++ mandir1=$WHATIS_DIR + + # if $mandir is on a readonly partition, and the whatis file + # is not a symlink, then let's skip trying to update it +@@ -207,11 +206,6 @@ + fi + fi + +- if [ -s ${mandir}/whatis -a $pages = man -a x$update = x ]; then +- if [ x$verbose != x ]; then +- echo skipping $mandir - we did it already > /dev/stderr +- fi +- else + here=`pwd` + cd $mandir + for i in $sections |