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 | poky-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 @@ | |||
1 | Index: man-1.6f/src/makewhatis.sh | ||
2 | =================================================================== | ||
3 | --- man-1.6f.orig/src/makewhatis.sh 2010-12-29 13:51:45.000000000 -0800 | ||
4 | +++ man-1.6f/src/makewhatis.sh 2010-12-29 13:59:35.399799412 -0800 | ||
5 | @@ -164,10 +164,15 @@ | ||
6 | fi | ||
7 | catpath=`echo ${catpath} | tr : ' '` | ||
8 | |||
9 | +#WHATIS_DIR=$DESTDIR/var/cache/man/`echo $here|sed -e 's!.*/man/!!g'` | ||
10 | +WHATIS_DIR=$DESTDIR/var/cache/man/$LANG | ||
11 | +[[ -d $WHATIS_DIR ]] || mkdir -p $WHATIS_DIR/ | ||
12 | + | ||
13 | # first truncate all the whatis files that will be created new, | ||
14 | # then only update - we might visit the same directory twice | ||
15 | if [ x$update = x ]; then | ||
16 | - cp /dev/null /var/cache/man/whatis | ||
17 | + mkdir -p $WHATIS_DIR/ | ||
18 | + /bin/echo -n > $WHATIS_DIR/whatis | ||
19 | fi | ||
20 | |||
21 | for pages in man cat | ||
22 | @@ -180,13 +185,7 @@ | ||
23 | echo "about to enter $mandir" > /dev/stderr | ||
24 | fi | ||
25 | |||
26 | - # kludge for Slackware's /usr/man/preformat | ||
27 | - if [ $mandir = /usr/man/preformat ] | ||
28 | - then | ||
29 | - mandir1=/usr/man | ||
30 | - else | ||
31 | - mandir1=$mandir | ||
32 | - fi | ||
33 | + mandir1=$WHATIS_DIR | ||
34 | |||
35 | # if $mandir is on a readonly partition, and the whatis file | ||
36 | # is not a symlink, then let's skip trying to update it | ||
37 | @@ -207,11 +206,6 @@ | ||
38 | fi | ||
39 | fi | ||
40 | |||
41 | - if [ -s ${mandir}/whatis -a $pages = man -a x$update = x ]; then | ||
42 | - if [ x$verbose != x ]; then | ||
43 | - echo skipping $mandir - we did it already > /dev/stderr | ||
44 | - fi | ||
45 | - else | ||
46 | here=`pwd` | ||
47 | cd $mandir | ||
48 | for i in $sections | ||