mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-04-26 09:32:14 +02:00
Code Issues Packages Projects Releases Wiki Activity

man-db: replace the outdated man implementation

Browse Source 
Until now oe-core has been using a well obsolete implementation of man.

Man-db on the other hand is used by all modern Linux distros, is actively
maintained, has a standard build system, and does not require 30 patches
to build.

(From OE-Core rev: 69e549a841a1681f927667f5017a1cd669ac9914)

Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Alexander Kanavin
2018-02-12 13:05:18 +02:00
committed by Richard Purdie
parent c2f4f93da2
commit d9046f8fd8
34 changed files with 42 additions and 1346 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
meta/recipes-extended/man-db/man-db_2.8.1.bb Normal file
View File

@@ -0,0 +1,42 @@
SUMMARY = "An implementation of the standard Unix documentation system accessed using the man command"
HOMEPAGE = "http://man-db.nongnu.org/"
LICENSE = "LGPLv2.1 & GPLv2"
LIC_FILES_CHKSUM = "file://docs/COPYING.LIB;md5=a6f89e2100d9b6cdffcea4f398e37343 \
file://docs/COPYING;md5=eb723b61539feef013de476e68b5c50a"
SRC_URI = "${SAVANNAH_NONGNU_MIRROR}/man-db/man-db-${PV}.tar.xz"
SRC_URI[md5sum] = "51842978e06686286421f9498d1009b7"
SRC_URI[sha256sum] = "a6aec641ca3d9942b054cc0e9c3f05cb46a3a992bc0006795755e2fed1357f3e"
DEPENDS = "libpipeline gdbm groff-native"
# | /usr/src/debug/man-db/2.8.0-r0/man-db-2.8.0/src/whatis.c:939: undefined reference to `_nl_msg_cat_cntr'
USE_NLS_libc-musl = "no"
inherit gettext pkgconfig autotools
EXTRA_OECONF = "--with-pager=less --disable-cache-owner"
do_install_append_libc-musl() {
rm -f ${D}${libdir}/charset.alias
}
FILES_${PN} += "${prefix}/lib/tmpfiles.d"
FILES_${PN}-dev += "${libdir}/man-db/libman.so ${libdir}/${BPN}/libmandb.so"
RRECOMMENDS_${PN} += "less"
RPROVIDES_${PN} += " man"
def compress_pkg(d):
if bb.utils.contains("INHERIT", "compress_doc", True, False, d):
compress = d.getVar("DOC_COMPRESS")
if compress == "gz":
return "gzip"
elif compress == "bz2":
return "bzip2"
elif compress == "xz":
return "xz"
return ""
RDEPENDS_${PN} += "${@compress_pkg(d)}"

32
meta/recipes-extended/man/man/configure_sed.patch
View File

@@ -1,32 +0,0 @@
man: replace ',' with '#'
Sometimes, the parameters of CC/BUILD_CC contains the ',', which
cause the sed command failed, so replace the ',' with '#'
Upstream-Status: Pending
Signed-off-by: Yue Tao <Yue.Tao@windriver.com>
Signed-off-by: Wenzong Fan <wenzong.fan@windriver.com>
---
configure | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/configure b/configure
index 9f62cf9..9a565ae 100755
--- a/configure
+++ b/configure
@@ -1321,9 +1321,9 @@ do
echo "Creating $infile from $infile.in"
sed -e '
s,@version@,$version,
-s,@CC@,$CC,
+s#@CC@#$CC#
s,@EXEEXT@,$EXEEXT,
-s,@BUILD_CC@,$BUILD_CC,
+s#@BUILD_CC@#$BUILD_CC#
s,@INSTALL@,$INSTALL,
s,@DEFS@,$DEFS,
s,@LIBS@,$LIBS,
--
1.9.1

16
meta/recipes-extended/man/man/man-1.5g-nonrootbuild.patch
View File

@@ -1,16 +0,0 @@
Upstream-Status: Pending
Signed-off-by: Scott Garman <scott.a.garman@intel.com>
diff -u -r man-1.5g.old/configure man-1.5g/configure
--- man-1.5g.old/configure Wed Apr 7 04:16:05 1999
+++ man-1.5g/configure Mon May 15 15:22:44 2000
@@ -791,7 +791,7 @@
read mode
if test "$mode" != ""; then man_mode=$mode; fi
fi
- man_install_flags="-m $man_mode -o $man_user -g $man_group"
+ man_install_flags=""
fi
# What sections do we anticipate?

14
meta/recipes-extended/man/man/man-1.5h1-gencat.patch
View File

@@ -1,14 +0,0 @@
Upstream-Status: Pending
Signed-off-by: Scott Garman <scott.a.garman@intel.com>
--- gencat/genlib.c 2006-08-02 20:11:44.000000000 +0200
+++ gencat/genlib.c.oden 2008-12-21 19:18:50.000000000 +0100
@@ -47,6 +47,7 @@ up-to-date. Many thanks.
01/14/91 4 nazgul Off by one on number specified entries
*/
+#undef _GNU_SOURCE
#include <stdio.h>
#include <stdlib.h>
#ifdef SYSV

17
meta/recipes-extended/man/man/man-1.5h1-make.patch
View File

@@ -1,17 +0,0 @@
Upstream-Status: Pending
Signed-off-by: Scott Garman <scott.a.garman@intel.com>
--- man-1.5g/man/Makefile.in.mike Fri Apr 9 13:35:54 1999
+++ man-1.5g/man/Makefile.in Fri Apr 9 13:36:45 1999
@@ -1,8 +1,8 @@
# only executed from a subdir
MAN1 = man whatis apropos
-MAN5 = man.conf
+MAN5 = man.config
MAN8 = makewhatis
-ALL = man.1 whatis.1 apropos.1 man.conf.5
+ALL = man.1 whatis.1 apropos.1 man.config.5
MAYBE8 = makewhatis
.SUFFIXES: .man .1 .5 .8

19
meta/recipes-extended/man/man/man-1.5i2-initial.patch
View File

@@ -1,19 +0,0 @@
Upstream-Status: Pending
Signed-off-by: Scott Garman <scott.a.garman@intel.com>
--- man-1.5i2/src/makewhatis.sh.initial Tue Jul 3 15:38:39 2001
+++ man-1.5i2/src/makewhatis.sh Tue Jul 3 15:39:39 2001
@@ -81,8 +81,10 @@
continue;;
-s) setsections=1
continue;;
- -u) findarg="-newer /var/cache/man/whatis"
- update=1
+ -u) if [ -e /var/cache/man/whatis ]; then
+ findarg="-newer /var/cache/man/whatis"
+ update=1
+ fi
continue;;
-v) verbose=1
continue;;

15
meta/recipes-extended/man/man/man-1.5i2-newline.patch
View File

@@ -1,15 +0,0 @@
Upstream-Status: Pending
Signed-off-by: Scott Garman <scott.a.garman@intel.com>
--- src/man.c 2008-12-21 19:17:31.000000000 +0100
+++ src/man.c.oden 2008-12-21 19:17:38.000000000 +0100
@@ -391,7 +391,7 @@ again:
beg++;
end = beg;
- while (*end != ' ' && *end != '\t' && *end != '\n' && *end != '\0')
+ while (*end != ' ' && *end != '\t' && *end != '\n' && *end != '\0' && (end-buf)<BUFSIZE)
end++; /* note that buf is NUL-terminated */
*end = '\0';

16
meta/recipes-extended/man/man/man-1.5i2-overflow.patch
View File

@@ -1,16 +0,0 @@
Upstream-Status: Pending
Signed-off-by: Scott Garman <scott.a.garman@intel.com>
--- man-1.5i2/src/man.c.overflow Mon Jun 25 00:01:45 2001
+++ man-1.5i2/src/man.c Mon Jun 25 00:01:45 2001
@@ -381,6 +381,9 @@
strcat(name, "/");
strcat(name, beg);
}
+ /* If this is too long, bad things have already happened. *
+ * we should quit IMMEDIATELY. */
+ if(strlen(name)>sizeof(ultname)) _exit(1);
goto again;
}

16
meta/recipes-extended/man/man/man-1.5j-i18n.patch
View File

@@ -1,16 +0,0 @@
Upstream-Status: Pending
Signed-off-by: Scott Garman <scott.a.garman@intel.com>
--- man-1.5j/msgs/inst.sh.i18n Wed Apr 25 10:40:50 2001
+++ man-1.5j/msgs/inst.sh Wed Apr 25 10:41:17 2001
@@ -27,8 +27,7 @@
for j in $M; do
if [ -f $j ]; then
i=`echo $j | sed -e 's/mess.//; s/.cat//'`
- dest=`echo $locdir | sed -e "s/%N/man/; s/%L/$i/"`
- dest=${PREFIX}$dest
+ dest=${PREFIX}/`echo $locdir | sed -e "s/%N/man/; s/%L/$i/"`
echo "mkdir -p `dirname $dest`"
mkdir -p `dirname $dest`;
echo "install -c -m 644 $j $dest"

16
meta/recipes-extended/man/man/man-1.5j-nocache.patch
View File

@@ -1,16 +0,0 @@
Upstream-Status: Pending
Signed-off-by: Scott Garman <scott.a.garman@intel.com>
--- man-1.5j/src/man.conf.in.nocache Thu Nov 22 15:07:12 2001
+++ man-1.5j/src/man.conf.in Thu Nov 22 15:07:12 2001
@@ -81,6 +81,9 @@
#
#NOCACHE
#
+# NOCACHE keeps man from creating cache pages
+NOCACHE
+#
# Useful paths - note that COL should not be defined when
# NROFF is defined as "groff -Tascii" or "groff -Tlatin1";
# not only is it superfluous, but it actually damages the output.

61
meta/recipes-extended/man/man/man-1.5j-utf8.patch
View File

@@ -1,61 +0,0 @@
Upstream-Status: Pending
Signed-off-by: Scott Garman <scott.a.garman@intel.com>
--- man-1.5j/configure.utf8 Thu Nov 22 15:02:35 2001
+++ man-1.5j/configure Thu Nov 22 15:03:15 2001
@@ -408,9 +408,9 @@
Fgawk=/bin/gawk
Fawk=/bin/gawk
Fmawk=missing
- troff=""
- nroff=""
- jnroff=""
+ troff=/usr/bin/troff
+ nroff=/usr/bin/nroff
+ jnroff=/usr/bin/nroff
eqn=""
neqn=""
jneqn=""
@@ -453,6 +453,8 @@
done
done
Fgroff=/usr/bin/groff
+ Fnroff=/usr/bin/nroff
+ Fjnroff=/usr/bin/nroff
Fgeqn=/usr/bin/geqn
Fgtbl=/usr/bin/gtbl
Fcol=/usr/bin/col
@@ -485,25 +487,25 @@
then
if test $Fnroff = "missing"
then
- nroff="nroff -Tlatin1 -mandoc"
+ nroff="nroff -Tutf8 -mandoc"
else
- nroff="$Fnroff -Tlatin1 -mandoc"
+ nroff="$Fnroff -Tutf8 -mandoc"
fi
troff="troff -mandoc"
echo "Warning: could not find groff"
else
if test $Fnroff = "missing"
then
- nroff="$Fgroff -Tlatin1 -mandoc"
+ nroff="$Fgroff -Tutf8 -mandoc"
else
- nroff="$Fnroff -Tlatin1 -mandoc"
+ nroff="$Fnroff -Tutf8 -mandoc"
fi
troff="$Fgroff -Tps -mandoc"
- jnroff="$Fgroff -Tnippon -mandocj"
+ jnroff="$Fjnroff -Tutf8 -mandocj"
fi
eqn="$Fgeqn -Tps"
- neqn="$Fgeqn -Tlatin1"
- jneqn="$Fgeqn -Tnippon"
+ neqn="$Fgeqn -Tutf8"
+ jneqn="$Fgeqn -Tutf8"
tbl="$Fgtbl"
col="$Fcol"
vgrind="$Fvgrind"

15
meta/recipes-extended/man/man/man-1.5k-confpath.patch
View File

@@ -1,15 +0,0 @@
Upstream-Status: Pending
Signed-off-by: Scott Garman <scott.a.garman@intel.com>
--- configure 2006-05-01 19:56:14.000000000 +0200
+++ configure.oden 2008-12-21 19:16:50.000000000 +0100
@@ -198,7 +198,7 @@
confdir="${confprefix}/share/misc"
fi
fi
-conffilename="man.conf"
+conffilename="man.config"
if test "$RANDOM" = "$RANDOM"; then
# Plain old Bourne shell.

18
meta/recipes-extended/man/man/man-1.5k-nonascii.patch
View File

@@ -1,18 +0,0 @@
Upstream-Status: Pending
Signed-off-by: Scott Garman <scott.a.garman@intel.com>
--- ./src/apropos.sh.nonascii 2001-11-23 00:30:42.000000000 +0100
+++ ./src/apropos.sh 2002-08-13 15:44:53.000000000 +0200
@@ -18,9 +18,9 @@
# When man pages in your favorite locale look to grep like binary files
# (and you use GNU grep) you may want to add the 'a' option to *grepopt1.
-aproposgrepopt1='i'
+aproposgrepopt1='ia'
aproposgrepopt2=''
-whatisgrepopt1='iw'
+whatisgrepopt1='iwa'
whatisgrepopt2='^'
grepopt1=$%apropos_or_whatis%grepopt1
grepopt2=$%apropos_or_whatis%grepopt2

24
meta/recipes-extended/man/man/man-1.5k-sofix.patch
View File

@@ -1,24 +0,0 @@
Upstream-Status: Pending
Signed-off-by: Scott Garman <scott.a.garman@intel.com>
--- man-1.5j/src/man.c.sofix Thu Nov 22 14:51:44 2001
+++ man-1.5j/src/man.c Thu Nov 22 14:52:44 2001
@@ -300,7 +300,7 @@
if (strlen(name0) >= sizeof(ultname))
return name0;
- strcpy(ultname, name0);
+ strncpy(ultname, name0, BUFSIZE-32);
name = ultname;
again:
@@ -332,7 +332,7 @@
* .so files - we could glob for all possible extensions,
* for now: only try .gz
*/
- else if (fp == NULL && get_expander(".gz") &&
+ if (fp == NULL && get_expander(".gz") &&
strlen(name)+strlen(".gz") < BUFSIZE) {
strcat(name, ".gz");
fp = fopen (name, "r");

15
meta/recipes-extended/man/man/man-1.5m2-bug11621.patch
View File

@@ -1,15 +0,0 @@
Upstream-Status: Pending
Signed-off-by: Scott Garman <scott.a.garman@intel.com>
--- ./configure.ad 2003-12-11 19:17:10.000000000 +0100
+++ ./configure 2003-12-11 19:17:27.000000000 +0100
@@ -26,7 +26,7 @@
# (Indeed, -r may cause the terminal to get into funny states.
# Very inconvenient. For viewing pages in strange locales, set LC_*.)
#
-DEFAULTLESSOPT="-is"
+DEFAULTLESSOPT="-isr"
#
# Note that not creating any cat directories (/var/cache/man or so)
# and not making man suid or sgid is recommended.

52
meta/recipes-extended/man/man/man-1.5m2-buildroot.patch
View File

@@ -1,52 +0,0 @@
Upstream-Status: Pending
Signed-off-by: Scott Garman <scott.a.garman@intel.com>
--- ./configure.less 2003-12-11 19:18:15.000000000 +0100
+++ ./configure 2003-12-11 19:20:03.000000000 +0100
@@ -401,18 +401,13 @@
if test "$ans" = "false"
then
- for i in more less cmp cat awk gawk mawk
- do
- eval F$i="missing"
- for j in $DEFPATH
- do
- if test -f $j/$i
- then
- eval F$i=$j/$i
- break
- fi
- done
- done
+ Fmore=/bin/more
+ Fless=/usr/bin/less
+ Fcmp=/usr/bin/cmp
+ Fcat=/bin/cat
+ Fgawk=/bin/gawk
+ Fawk=/bin/gawk
+ Fmawk=missing
troff=""
nroff=""
jnroff=""
@@ -457,6 +452,19 @@
fi
done
done
+ Fgroff=/usr/bin/groff
+ Fgeqn=/usr/bin/geqn
+ Fgtbl=/usr/bin/gtbl
+ Fcol=/usr/bin/col
+ Fgrefer=/usr/bin/grefer
+ Fgpic=/usr/bin/gpic
+ Fmore=/bin/more
+ Fless=/usr/bin/less
+ Fcmp=/usr/bin/cmp
+ Fcat=/bin/cat
+ Fgawk=/bin/gawk
+
+
for i in eqn tbl refer pic
do
if test `eval echo \\$Fg$i` = "missing"

15
meta/recipes-extended/man/man/man-1.5m2-no-color-for-printing.patch
View File

@@ -1,15 +0,0 @@
Upstream-Status: Pending
Signed-off-by: Scott Garman <scott.a.garman@intel.com>
--- man-1.5m2/configure.color 2006-09-16 18:27:37.000000000 +0200
+++ man-1.5m2/configure 2006-09-16 18:28:44.000000000 +0200
@@ -539,6 +539,8 @@
troff="$troff -c"
nroff="$nroff -c"
jnroff="$jnroff -c"
+else
+ troff="$troff -c"
fi
if [ x$default = x ]; then

30
meta/recipes-extended/man/man/man-1.5m2-sigpipe.patch
View File

@@ -1,30 +0,0 @@
Upstream-Status: Pending
Signed-off-by: Scott Garman <scott.a.garman@intel.com>
--- man-1.5m2/src/util.c_sigpipe 2006-12-09 13:43:21.000000000 +0100
+++ man-1.5m2/src/util.c 2006-12-09 13:53:13.000000000 +0100
@@ -116,11 +116,14 @@
static int
system1 (const char *command) {
void (*prev_handler)(int) = signal (SIGINT,catch_int);
+ signal (SIGPIPE,SIG_IGN);
int ret = system(command);
/* child terminated with signal? */
if (WIFSIGNALED(ret) &&
- (WTERMSIG(ret) == SIGINT || WTERMSIG(ret) == SIGQUIT))
+ (WTERMSIG(ret) == SIGINT ||
+ WTERMSIG(ret) == SIGPIPE ||
+ WTERMSIG(ret) == SIGQUIT))
exit(1);
/* or we caught an interrupt? */
@@ -128,6 +131,7 @@
exit(1);
signal(SIGINT,prev_handler);
+ signal(SIGPIPE,SIG_DFL);
return ret;
}

145
meta/recipes-extended/man/man/man-1.6e-i18n_whatis.patch
View File

@@ -1,145 +0,0 @@
Upstream-Status: Pending
Signed-off-by: Scott Garman <scott.a.garman@intel.com>
diff -Naur man-1.6e.orig/src/apropos.sh man-1.6e/src/apropos.sh
--- man-1.6e.orig/src/apropos.sh 2007-05-18 13:49:31.000000000 -0300
+++ man-1.6e/src/apropos.sh 2007-05-18 14:24:33.000000000 -0300
@@ -60,16 +60,56 @@
esac
done
+# list of languages to look for
+LANG_LIST=`echo $LANGUAGE:$LC_ALL:$LC_MESSAGES:$LANG | tr ':' ' '`
+DIR_LIST=""
+for d in /var/cache/man $manpath /usr/lib
+do
+ for l in $LANG_LIST
+ do
+ if [ -d $d/$l ]
+ then
+ # check that the path is not already in the list
+ if ! echo "$DIR_LIST" | grep " $d/$l\b" > /dev/null
+ then
+ DIR_LIST="$DIR_LIST $d/$l"
+ fi
+ fi
+ done
+ DIR_LIST="$DIR_LIST $d"
+ # check that the path is not already in the list
+ if ! echo "$DIR_LIST" | grep " $d\b" > /dev/null
+ then
+ DIR_LIST="$DIR_LIST $d/$l"
+ fi
+done
+
while [ "$1" != "" ]
do
found=0
- for d in /var/cache/man $manpath /usr/lib
+ # in order not to display lines in more than one language for
+ # a same man page; we check that a given man page name
+ # hasn't already been displayed
+ BAZ=""
+ for d in $DIR_LIST
do
if [ -f $d/whatis ]
then
- if grep -"$grepopt1" "$grepopt2""$1" $d/whatis
+ if FOO=`grep -"$grepopt1" "$grepopt2""$1" $d/whatis`
then
- found=1
+ # the LC_ALL=C is needed in case the text is
+ # in a different encoding than the locale
+ BAR=`echo -e "$FOO" | LC_ALL=C sed 's/ - .*$//' | tr ' []' '_' | sort -u`
+ for i in $BAR
+ do
+ if ! echo "$BAZ" | grep "$i" > /dev/null
+ then
+ BAZ="$BAZ $i"
+ i="^`echo $i | sed 's:_\+:\\\(\[_ \]\\\|\\\[\\\|\\\]\\\)\\\+:g'`"
+ echo -e "$FOO" | grep "$i"
+ found=1
+ fi
+ done
# Some people are satisfied with a single occurrence
# But it is better to give all
# break
diff -Naur man-1.6e.orig/src/makewhatis.sh man-1.6e/src/makewhatis.sh
--- man-1.6e.orig/src/makewhatis.sh 2007-05-18 13:49:31.000000000 -0300
+++ man-1.6e/src/makewhatis.sh 2007-05-18 13:50:07.000000000 -0300
@@ -41,12 +41,32 @@
program=`basename $0`
+# this allows to define language specific values fro NAME, DESCRIPTION
+# if not defined, using those default values
+if [ -z "$MAN_NAME" ]
+then
+ MAN_NAME="ИМЕ|NOM|JMÉNO|NAVN|ΟΝΟΜΑ|NOMBRE|NIME|IZENA|NIMI|IME|\
+NÉV|NOME|名前|이름|NAAM|NAZWA|NUME|ИМЯ|MENO|НАЗВА|名称|名稱"
+fi
+if [ -z "$MAN_DESCRIPTION" ]
+then
+ MAN_DESCRIPTION="ОПИСАНИЕ|DESCRIPCIÓ|POPIS|BESKRIVELSE|BESCHREIBUNG|\
+ΠΕΡΙΓΡΑΦΗ|DESCRIPCIÓN|KIRJELDUS|AZALPENA|KUVAUS|OPIS|LEÍRÁS|DESCRIZIONE|\
+説明|설명|BESCHRIJVING|DESCRIÇÃO|DESCRIERE|ОПИС|描述"
+fi
+# make them into awk regexp
+MAN_NAME="^(${MAN_NAME})";
+MAN_DESCRIPTION="^(${MAN_DESCRIPTION})";
+
# In case both /usr/man and /usr/share/man exist, the former is local
# and should be first.
# It is a bug to add /var/cache/man to DEFCATPATH.
dm=
for d in /usr/share/man /usr/man /usr/X11R6/man /usr/local/man
do
+ if [ -n "$LANG" -a -d "$d/$LANG" ]; then
+ if [ x$dm = x ]; then dm="$d/$LANG"; else dm=$dm:"$d/$LANG"; fi
+ fi
if [ -d $d ]; then
if [ x$dm = x ]; then dm=$d; else dm=$dm:$d; fi
fi
@@ -55,6 +75,9 @@
dc=
for d in /var/cache/man /usr/share/man/preformat /usr/man/preformat /usr/share/man /usr/man
do
+ if [ -n "$LANG" -a -d "$d/$LANG" ]; then
+ if [ x$dc = x ]; then dm="$d/$LANG"; else dm=$dc:"$d/$LANG"; fi
+ fi
if [ -d $d ]; then
if [ x$dc = x ]; then dc=$d; else dc=$dc:$d; fi
fi
@@ -194,7 +217,7 @@
section=$i
curdir=$mandir/${pages}$i
export section verbose curdir
- find $mandir/${pages}$i/. -name '*' $findarg0 $findarg -print | $AWK '
+ find $mandir/${pages}$i/. -name '*' $findarg0 $findarg -print | LC_ALL=C $AWK -v MAN_NAME="$MAN_NAME" -v MAN_DESCRIPTION="$MAN_DESCRIPTION" '
function readline() {
if (use_zcat || use_bzcat) {
@@ -261,13 +284,7 @@
gsub(/.\b/, "");
if (($1 ~ /^\.[Ss][Hh]/ &&
($2 ~ /[Nn][Aa][Mm][Ee]/ ||
- $2 ~ /^JM<4A>NO/ || $2 ~ /^NAVN/ || $2 ~ /^NUME/ ||
- $2 ~ /^BEZEICHNUNG/ || $2 ~ /^NOMBRE/ ||
- $2 ~ /^NIMI/ || $2 ~ /^NOM/ || $2 ~ /^IME/ ||
- $2 ~ /^N[<5B>E]V/ || $2 ~ /^NAMA/ || $2 ~ /^̾<><CCBE>/ ||
- $2 ~ /^̾<><CCBE>/ || $2 ~ /^<5E≯<EFBFBD>/ || $2 ~ /^NAZWA/ ||
- $2 ~ /^<5E><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>/ || $2 ~ /^<5E><><EFBFBD><EFBFBD>/ || $2 ~ /^<5E>W<EFBFBD><57>/ ||
- $2 ~ /^NOME/ || $2 ~ /^NAAM/ || $2 ~ /^<5E><><EFBFBD>/)) ||
+ $2 ~ MAN_NAME )) ||
(pages == "cat" && $1 ~ /^NAME/)) {
if (!insh) {
insh = 1;
@@ -278,6 +295,7 @@
if ($1 ~ /^\.[Ss][HhYS]/ ||
(pages == "cat" &&
($1 ~ /^S[yYeE]/ || $1 ~ /^DESCRIPTION/ ||
+ $1 ~ MAN_DESCRIPTION ||
$1 ~ /^COMMAND/ || $1 ~ /^OVERVIEW/ ||
$1 ~ /^STRUCTURES/ || $1 ~ /^INTRODUCTION/ ||
$0 ~ /^[^ ]/))) {

31
meta/recipes-extended/man/man/man-1.6e-mandirs.patch
View File

@@ -1,31 +0,0 @@
Upstream-Status: Pending
Signed-off-by: Scott Garman <scott.a.garman@intel.com>
--- man-1.6e.orig/src/man.conf.in 2005-08-20 20:26:06.000000000 -0300
+++ man-1.6e/src/man.conf.in 2007-05-18 10:30:29.000000000 -0300
@@ -36,11 +36,12 @@
#
# Every automatically generated MANPATH includes these fields
#
-MANPATH /usr/man
MANPATH /usr/share/man
+MANPATH /usr/X11R6/man
MANPATH /usr/local/man
MANPATH /usr/local/share/man
-MANPATH /usr/X11R6/man
+MANPATH /usr/kerberos/man
+MANPATH /usr/man
#
# Uncomment if you want to include one of these by default
#
@@ -67,6 +68,9 @@
MANPATH_MAP /usr/X11R6/bin /usr/X11R6/man
MANPATH_MAP /usr/bin/X11 /usr/X11R6/man
MANPATH_MAP /usr/bin/mh /usr/share/man
+MANPATH_MAP /usr/kerberos/bin /usr/kerberos/man
+MANPATH_MAP /usr/kerberos/sbin /usr/kerberos/man
+
#
# NOAUTOPATH keeps man from automatically adding directories that look like
# manual page directories to the path.

15
meta/recipes-extended/man/man/man-1.6e-new_sections.patch
View File

@@ -1,15 +0,0 @@
Upstream-Status: Pending
Signed-off-by: Scott Garman <scott.a.garman@intel.com>
--- man-1.6e.orig/configure 2006-05-01 14:56:14.000000000 -0300
+++ man-1.6e/configure 2007-05-18 14:35:43.000000000 -0300
@@ -960,7 +960,7 @@
# What sections do we anticipate?
-tmpsections="1 1p 8 2 3 3p 4 5 6 7 9 0p tcl n l p o"
+tmpsections="1 1p 8 2 3 3p 3pm 4 5 6 7 9 0p tcl n l p o"
if [ x$default = x ]; then
echo ""

33
meta/recipes-extended/man/man/man-1.6e-ro_usr.patch
View File

@@ -1,33 +0,0 @@
Upstream-Status: Pending
Signed-off-by: Scott Garman <scott.a.garman@intel.com>
Index: man-1.6f/src/makewhatis.sh
===================================================================
--- man-1.6f.orig/src/makewhatis.sh 2010-12-29 13:42:34.000000000 -0800
+++ man-1.6f/src/makewhatis.sh 2010-12-29 13:42:35.667428347 -0800
@@ -124,7 +124,7 @@
continue;;
-s) setsections=1
continue;;
- -u) findarg="-ctime 0"
+ -u) findarg="-newer /var/cache/man/whatis"
update=1
continue;;
-v) verbose=1
@@ -165,14 +165,7 @@
# 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
- for pages in man cat
- do
- eval path="\$$pages"path
- for mandir in $path
- do
- cp /dev/null $mandir/whatis
- done
- done
+ cp /dev/null /var/cache/man/whatis
fi
for pages in man cat

62
meta/recipes-extended/man/man/man-1.6e-security.patch
View File

@@ -1,62 +0,0 @@
Upstream-Status: Pending
Signed-off-by: Scott Garman <scott.a.garman@intel.com>
diff -Naur man-1.6e.orig/src/makewhatis.sh man-1.6e/src/makewhatis.sh
--- man-1.6e.orig/src/makewhatis.sh 2006-07-19 01:58:08.000000000 -0300
+++ man-1.6e/src/makewhatis.sh 2007-05-18 10:18:31.000000000 -0300
@@ -45,7 +45,7 @@
# and should be first.
# It is a bug to add /var/cache/man to DEFCATPATH.
dm=
-for d in /usr/man /usr/share/man /usr/X11R6/man /usr/local/man
+for d in /usr/share/man /usr/man /usr/X11R6/man /usr/local/man
do
if [ -d $d ]; then
if [ x$dm = x ]; then dm=$d; else dm=$dm:$d; fi
@@ -53,7 +53,7 @@
done
DEFMANPATH=$dm
dc=
-for d in /usr/man/preformat /usr/man /usr/share/man/preformat /usr/share/man
+for d in /var/cache/man /usr/share/man/preformat /usr/man/preformat /usr/share/man /usr/man
do
if [ -d $d ]; then
if [ x$dc = x ]; then dc=$d; else dc=$dc:$d; fi
@@ -76,12 +76,12 @@
# We try here to be careful (and avoid preconstructed symlinks)
# in case makewhatis is run as root, by creating a subdirectory of /tmp.
-TMPFILEDIR=/tmp/whatis.tmp.dir.$$
-rm -rf $TMPFILEDIR
-if ! mkdir -m 0700 $TMPFILEDIR; then
- echo Could not create $TMPFILEDIR
- exit 1;
+TMPFILEDIR=`mktemp -d /tmp/makewhatisXXXXXX`
+if [ $? -ne 0 ]; then
+ echo "$0: Can't create temp file, exiting..."
+ exit 1
fi
+chmod 0700 $TMPFILEDIR
TMPFILE=$TMPFILEDIR/w
# make sure TMPFILEDIR is deleted if program is killed or terminates
diff -Naur man-1.6e.orig/src/man.c man-1.6e/src/man.c
--- man-1.6e.orig/src/man.c 2006-05-01 17:34:22.000000000 -0300
+++ man-1.6e/src/man.c 2007-05-18 10:11:33.000000000 -0300
@@ -1234,7 +1234,6 @@
#endif
-#if 0
{
/* There are no known cases of buffer overflow caused by
excessively long environment variables. In case you find one,
@@ -1257,7 +1256,6 @@
MAN_ICONV_PATH, MAN_ICONV_OPT, MAN_ICONV_INPUT_CHARSET,
MAN_ICONV_OUTPUT_CHARSET, NLSPATH, PATH */
}
-#endif
#ifndef __FreeBSD__

160
meta/recipes-extended/man/man/man-1.6e-use_i18n_vars_in_a_std_way.patch
View File

@@ -1,160 +0,0 @@
Upstream-Status: Pending
Signed-off-by: Scott Garman <scott.a.garman@intel.com>
diff -Naur man-1.6e.orig/catopen/catopen.c man-1.6e/catopen/catopen.c
--- man-1.6e.orig/catopen/catopen.c 2005-08-20 20:26:06.000000000 -0300
+++ man-1.6e/catopen/catopen.c 2007-05-18 11:31:05.000000000 -0300
@@ -9,22 +9,63 @@
extern char *index (const char *, int); /* not always in <string.h> */
extern char *my_malloc(int); /* in util.c */
+/* if the program has sgid/suid privileges then getenv doesn't return
+ * NLSPATH; so we set here a good default value.
+ */
#ifndef DEFAULT_NLSPATH
# if __GLIBC__ >= 2
-# define DEFAULT_NLSPATH "/usr/share/locale/%L/%N"
+# define DEFAULT_NLSPATH "/usr/share/locale/%L/%N:/usr/share/locale/%l_%t/%N:/usr/share/locale/%l/%N"
# else
# define DEFAULT_NLSPATH "/usr/lib/locale/%N/%L"
# endif
#endif
-static nl_catd my_catopenpath(char *name, char *path);
+static nl_catd my_catopenpath(char *name, char *path, char *lang);
static /* this source included in gripes.c */
nl_catd
my_catopen(char *name, int oflag) {
- nl_catd fd;
+ nl_catd fd = (nl_catd) -1;
+
+ /* using first the my_catopenpath, which looks with LANGUAGE
+ * and only if it fails ressort to catopen, it gives better i18n
+ */
+ {
+ char *nlspath, *lang, *s;
- fd = catopen(name, oflag);
+ /*
+ * "If NLSPATH does not exist in the environment, or if a
+ * message catalog cannot be opened in any of the paths specified
+ * by NLSPATH, then an implementation defined default path is used"
+ */
+ nlspath = getenv("NLSPATH");
+ if (!nlspath)
+ nlspath = DEFAULT_NLSPATH;
+
+ lang = getenv("LANGUAGE");
+ if (!lang)
+ lang = getenv("LC_ALL");
+ if (!lang)
+ lang = getenv("LC_MESSAGES");
+ if (!lang)
+ lang = getenv("LANG");
+ if (!lang)
+ lang = "";
+
+ while(*lang && (fd == (nl_catd) -1)) {
+ s = index(lang, ':');
+ if (s) *s = 0;
+ fd = my_catopenpath(name, nlspath, lang);
+ if (s) lang=s+1;
+ else lang = "";
+ }
+ if (fd == (nl_catd) -1)
+ fd = my_catopenpath(name, nlspath, "en");
+ }
+
+ /* still not found, use the system catopen */
+ if (fd == (nl_catd) -1)
+ fd = catopen(name, oflag);
if (fd == (nl_catd) -1 && oflag) {
oflag = 0;
@@ -32,8 +73,6 @@
}
if (fd == (nl_catd) -1) {
- char *nlspath;
-
/* The libc catopen fails - let us see if we can do better */
/* The quotes below are from X/Open, XPG 1987, Vol. 3. */
@@ -58,17 +97,6 @@
#endif
}
- /*
- * "If NLSPATH does not exist in the environment, or if a
- * message catalog cannot be opened in any of the paths specified
- * by NLSPATH, then an implementation defined default path is used"
- */
-
- nlspath = getenv("NLSPATH");
- if (nlspath)
- fd = my_catopenpath(name, nlspath);
- if (fd == (nl_catd) -1)
- fd = my_catopenpath(name, DEFAULT_NLSPATH);
}
return fd;
}
@@ -90,15 +118,13 @@
*
*/
static nl_catd
-my_catopenpath(char *name, char *nlspath) {
- int fd;
+my_catopenpath(char *name, char *nlspath, char *lang) {
nl_catd cfd = (nl_catd) -1;
- char *path0, *path, *s, *file, *lang, *lang_l, *lang_t, *lang_c;
+ char *path0, *path, *s, *file, *lang_l, *lang_t, *lang_c;
int langsz, namesz, sz, lang_l_sz, lang_t_sz, lang_c_sz;
namesz = strlen(name);
- lang = getenv("LANG");
if (!lang)
lang = "";
langsz = strlen(lang);
@@ -194,14 +220,9 @@
path = s+1;
} else
path = 0;
- fd = open(file, O_RDONLY);
- if (fd != -1) {
- /* we found the right catalog - but we don't know the
- type of nl_catd, so close it again and ask libc */
- close(fd);
- cfd = catopen(file, 0);
- break;
- }
+ cfd = catopen(file, 0);
+ if (cfd != (nl_catd) -1)
+ break;
}
free(path0);
diff -Naur man-1.6e.orig/src/manpath.c man-1.6e/src/manpath.c
--- man-1.6e.orig/src/manpath.c 2006-08-03 18:18:33.000000000 -0300
+++ man-1.6e/src/manpath.c 2007-05-18 11:02:48.000000000 -0300
@@ -282,13 +282,14 @@
/* We cannot use "lang = setlocale(LC_MESSAGES, NULL)" or so:
the return value of setlocale is an opaque string. */
/* POSIX prescribes the order: LC_ALL, LC_MESSAGES, LANG */
- if((lang = getenv("LC_ALL")) != NULL)
+ /* LANGUAGE is GNU/Linux and overrules all */
+ if((lang = getenv("LANGUAGE")) != NULL)
split2(dir, lang, add_to_mandirlist_x, perrs);
- if((lang = getenv("LC_MESSAGES")) != NULL)
+ else if((lang = getenv("LC_ALL")) != NULL)
split2(dir, lang, add_to_mandirlist_x, perrs);
- if((lang = getenv("LANG")) != NULL)
+ else if((lang = getenv("LC_MESSAGES")) != NULL)
split2(dir, lang, add_to_mandirlist_x, perrs);
- if((lang = getenv("LANGUAGE")) != NULL)
+ else if((lang = getenv("LANG")) != NULL)
split2(dir, lang, add_to_mandirlist_x, perrs);
add_to_mandirlist_x(dir, 0, perrs);
}

59
meta/recipes-extended/man/man/man-1.6e-whatis2.patch
View File

@@ -1,59 +0,0 @@
Upstream-Status: Pending
Signed-off-by: Scott Garman <scott.a.garman@intel.com>
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
@@ -447,7 +447,6 @@
chmod 644 ${mandir1}/whatis
rm $TMPFILE
- fi
done
done

105
meta/recipes-extended/man/man/man-1.6g-compile-warnings.patch
View File

@@ -1,105 +0,0 @@
Fix a build error when building man.config.5 (a remnant of a long
ago previous patch). Optimized the manpages Makefile for parallel
builds. Also, fix compile warnings in a couple other files.
Upstream-Status: Pending
Signed-off-by: Bill Randle <william.c.randle@intel.com>
--- man-1.6g/man/Makefile.in.orig 2016-03-28 17:31:08.723949180 -0700
+++ man-1.6g/man/Makefile.in 2016-03-28 17:46:12.866910386 -0700
@@ -5,6 +5,13 @@
ALL = man.1 whatis.1 apropos.1 man.config.5
MAYBE8 = makewhatis
+SUBDIRS := $(shell echo @languages@)
+
+.PHONY: subdirs $(SUBDIRS)
+
+man.config.man: man.conf.man
+ @cp $< $@
+
.SUFFIXES: .man .1 .5 .8
.man.1:
@@ -19,11 +26,11 @@
INSTALL = @INSTALL@ -c -m 644
# Where to put the manual pages.
-mandir = $(DESTDIR)$(PREFIX)@mandir@$(SLANG)
+mandir := $(DESTDIR)$(PREFIX)@mandir@$(SLANG)
all: $(ALL)
for i in $(MAYBE8); \
- do if test -f $$i.man; then make -f ../Makefile $$i.8; fi; done
+ do if test -f $$i.man; then $(MAKE) -f ../Makefile $$i.8; fi; done
install: $(ALL)
mkdir -p $(mandir)/man1 $(mandir)/man5 $(mandir)/man8
@@ -38,24 +45,27 @@
rm -f core *.in *.@man1ext@ *.@man5ext@ *.@man8ext@ *~
spotless:
+ rm -f man.config.man
subdirs:
- @for i in @languages@; do if test -d $$i; then echo; \
- echo "==== Making the `cat $$i.txt` man pages. ===="; \
- cd $$i; make -f ../Makefile; cd ..; \
- else echo "==== No $$i man pages found. ===="; fi; done
+subdirs: $(SUBDIRS)
+$(SUBDIRS):
+ if test -d $@; then echo; \
+ echo "==== Making the `cat $@.txt` man pages. ===="; \
+ $(MAKE) -C $@ -f ../Makefile all; \
+ else echo "==== No $@ man pages found. ===="; fi
installsubdirs:
@for i in @languages@; do if test -d $$i; then echo; \
echo "==== Installing the `cat $$i.txt` man pages. ===="; \
cd $$i; SLANG=/$$i; if test $$SLANG = /en; then SLANG= ; fi; \
- export SLANG; make -f ../Makefile install; cd ..; \
+ export SLANG; $(MAKE) -f ../Makefile install; cd ..; \
else echo "==== No $$i man pages found. ===="; fi; done
cleansubdirs:
- @for i in ??; do cd $$i; make -f ../Makefile clean; cd ..; done
+ @for i in ??; do $(MAKE) -C $$i -f ../Makefile clean; done
rm -f core *~
spotlesssubdirs:
- for i in ??; do cd $$i; make -f ../Makefile spotless; cd ..; done
+ for i in ??; do $(MAKE) -C $$i -f ../Makefile spotless; done
rm -f Makefile
--- man-1.6g/src/gripes.c.orig 2006-11-21 11:53:44.000000000 -0800
+++ man-1.6g/src/gripes.c 2016-03-30 16:32:31.601103487 -0700
@@ -7,8 +7,6 @@
extern char *msg[];
-static char *mantexts = "man"; /* e.g. /usr/lib/locale/%L/man.cat */
-
#ifdef NONLS
static char *
@@ -30,6 +28,8 @@
#include <nl_types.h>
#include "../catopen/catopen.c"
+static char *mantexts = "man"; /* e.g. /usr/lib/locale/%L/man.cat */
+
nl_catd catfd = (nl_catd) -1;
int cat_is_open = 0;
--- man-1.6g/src/manfile.c.orig 2005-08-20 16:26:06.000000000 -0700
+++ man-1.6g/src/manfile.c 2016-03-29 09:10:21.527841285 -0700
@@ -299,7 +299,7 @@
const char *((*tocat)(const char *man_filename, const char *ext,
int flags))) {
char **sl;
- struct manpage *res;
+ struct manpage *res = 0;
standards = (flags & (FHS | FSSTND | DO_HP | DO_IRIX));
to_cat_filename = tocat;

68
meta/recipes-extended/man/man/man-1.6g-configure.patch
View File

@@ -1,68 +0,0 @@
Use BUILD_CC and target include files for configuration tests.
If cross-compiling, force pathnames for helper programs, since
autodiscovery by the configure script will not work.
Upstream-Status: Pending
Signed-off-by: Bill Randle <william.c.randle at intel.com>
--- man-1.6g/configure.orig 2016-03-28 17:46:12.734910976 -0700
+++ man-1.6g/configure 2016-03-30 21:47:45.110572908 -0700
@@ -216,7 +216,8 @@
INCLUDEDIR=${INCLUDEDIR-/usr/include}
rm -f conftest conftest.c
-compile="$CC $DEFS conftest.c -o conftest $LIBS >/dev/null 2>&1"
+# since we are interested in target feature support, use that sysroot
+compile="$BUILD_CC -isystem/${PKG_CONFIG_SYSROOT_DIR}/usr/include $DEFS conftest.c -o conftest $LIBS >/dev/null 2>&1"
# Check for various header files.
@@ -455,19 +456,23 @@
fi
done
done
- Fgroff=/usr/bin/groff
- Fnroff=/usr/bin/nroff
- Fjnroff=/usr/bin/nroff
- Fgeqn=/usr/bin/geqn
- Fgtbl=/usr/bin/gtbl
- Fcol=/usr/bin/col
- Fgrefer=/usr/bin/grefer
- Fgpic=/usr/bin/gpic
- Fmore=/bin/more
- Fless=/usr/bin/less
- Fcmp=/usr/bin/cmp
- Fcat=/bin/cat
- Fgawk=/bin/gawk
+ if [ $BUILD_CC != $CC ]; then
+ # cross compiling => target fs not available, so force defaults
+ Fgroff=/usr/bin/groff
+ Fnroff=/usr/bin/nroff
+ Fjnroff=/usr/bin/nroff
+ Fgeqn=/usr/bin/eqn
+ Fgneqn=/usr/bin/neqn
+ Fgtbl=/usr/bin/tbl
+ Fcol=/usr/bin/col
+ Fgrefer=/usr/bin/refer
+ Fgpic=/usr/bin/pic
+ Fmore=/bin/more
+ Fless=/usr/bin/less
+ Fcmp=/usr/bin/cmp
+ Fcat=/bin/cat
+ Fgawk=/usr/bin/gawk
+ fi
for i in eqn tbl refer pic
@@ -507,8 +512,8 @@
jnroff="$Fjnroff -Tutf8 -mandocj"
fi
eqn="$Fgeqn -Tps"
- neqn="$Fgeqn -Tutf8"
- jneqn="$Fgeqn -Tutf8"
+ neqn="$Fgneqn -Tutf8"
+ jneqn="$Fgneqn -Tutf8"
tbl="$Fgtbl"
col="$Fcol"
vgrind="$Fvgrind"

30
meta/recipes-extended/man/man/man-1.6g-parallel.patch
View File

@@ -1,30 +0,0 @@
The Makefile for man has a rule to create two generated targets with
a program run from the shell. Because the rule was run twice, with
parallel make, the generated files were being overwritten at the same
time they were being compiled. This patch forces the rule to be run
only once.
Upstream-Status: Pending
Signed-off-by: Bill Randle <william.c.randle at intel.com>
--- man-1.6g/src/Makefile.in.orig 2010-12-31 12:28:46.000000000 -0800
+++ man-1.6g/src/Makefile.in 2016-03-28 09:09:16.845458798 -0700
@@ -43,8 +43,10 @@
makemsg:
$(BUILD_CC) -o makemsg makemsg.c
-msg.c gripedefs.h: ../msgs/mess.en makemsg
+msg.c gripedefs.h: genfiles-stamp
+genfiles-stamp: ../msgs/mess.en makemsg
./makemsg ../msgs/mess.en gripedefs.h msg.c
+ touch genfiles-stamp
# glob.c does not have prototypes
glob.o: glob.c ndir.h
@@ -117,4 +119,4 @@
spotless: clean
rm -f Makefile config.status paths.h version.h man.conf
- rm -f gripedefs.h msg.c mess.*.cat
+ rm -f gripedefs.h msg.c mess.*.cat genfiles-stamp

20
meta/recipes-extended/man/man/man-1.6g-whatis3.patch
View File

@@ -1,20 +0,0 @@
Do not use absolute path for awk while getting the path of awk
when running makewhatis.
This can avoid errors if path of awk changes.
Upstream-Status: Submitted [man-1.6g]
Signed-off-by: Jian Liu <jian.liu@windriver.com>
diff -Nur man-1.6g.orig/src/makewhatis.sh man-1.6g/src/makewhatis.sh
--- man-1.6g.orig/src/makewhatis.sh 2015-02-25 16:13:12.657611419 +0800
+++ man-1.6g/src/makewhatis.sh 2015-02-25 16:14:49.334694815 +0800
@@ -67,7 +67,7 @@
# but that leads to problems and bugs.
# AWK=/usr/bin/gawk
-AWK=@awk@
+AWK=`which awk`
# Find a place for our temporary files. If security is not a concern, use
# TMPFILE=/tmp/whatis$$; TMPFILEDIR=none

BIN
meta/recipes-extended/man/man/man.1.gz
View File

Binary file not shown.

BIN
meta/recipes-extended/man/man/man.7.gz
View File

Binary file not shown.

141
meta/recipes-extended/man/man/man.conf
View File

@@ -1,141 +0,0 @@
#
# Generated automatically from man.conf.in by the
# configure script.
#
# man.conf from man-1.5p
#
# For more information about this file, see the man pages man(1)
# and man.conf(5).
#
# This file is read by man to configure the default manpath (also used
# when MANPATH contains an empty substring), to find out where the cat
# pages corresponding to given man pages should be stored,
# and to map each PATH element to a manpath element.
# It may also record the pathname of the man binary. [This is unused.]
# The format is:
#
# MANBIN pathname
# MANPATH manpath_element [corresponding_catdir]
# MANPATH_MAP path_element manpath_element
#
# If no catdir is given, it is assumed to be equal to the mandir
# (so that this dir has both man1 etc. and cat1 etc. subdirs).
# This is the traditional Unix setup.
# Certain versions of the FSSTND recommend putting formatted versions
# of /usr/.../man/manx/page.x into /var/catman/.../catx/page.x.
# The keyword FSSTND will cause this behaviour.
# Certain versions of the FHS recommend putting formatted versions of
# /usr/.../share/man/[locale/]manx/page.x into
# /var/cache/man/.../[locale/]catx/page.x.
# The keyword FHS will cause this behaviour (and overrides FSSTND).
# Explicitly given catdirs override.
#
# FSSTND
FHS
#
# This file is also read by man in order to find how to call nroff, less, etc.,
# and to determine the correspondence between extensions and decompressors.
#
# MANBIN /usr/local/bin/man
#
# Every automatically generated MANPATH includes these fields
#
MANPATH /usr/man
MANPATH /usr/share/man
MANPATH /usr/local/man
MANPATH /usr/local/share/man
MANPATH /usr/X11R6/man
#
# Uncomment if you want to include one of these by default
#
# MANPATH /opt/*/man
# MANPATH /usr/lib/*/man
# MANPATH /usr/share/*/man
# MANPATH /usr/kerberos/man
#
# Set up PATH to MANPATH mapping
#
# If people ask for "man foo" and have "/dir/bin/foo" in their PATH
# and the docs are found in "/dir/man", then no mapping is required.
#
# The below mappings are superfluous when the right hand side is
# in the mandatory manpath already, but will keep man from statting
# lots of other nearby files and directories.
#
MANPATH_MAP /bin /usr/share/man
MANPATH_MAP /sbin /usr/share/man
MANPATH_MAP /usr/bin /usr/share/man
MANPATH_MAP /usr/sbin /usr/share/man
MANPATH_MAP /usr/local/bin /usr/local/share/man
MANPATH_MAP /usr/local/sbin /usr/local/share/man
MANPATH_MAP /usr/X11R6/bin /usr/X11R6/man
MANPATH_MAP /usr/bin/X11 /usr/X11R6/man
MANPATH_MAP /usr/bin/mh /usr/share/man
#
# NOAUTOPATH keeps man from automatically adding directories that look like
# manual page directories to the path.
#
#NOAUTOPATH
#
# NOCACHE keeps man from creating cache pages ("cat pages")
# (generally one enables/disable cat page creation by creating/deleting
# the directory they would live in - man never does mkdir)
#
#NOCACHE
#
# Useful paths - note that COL should not be defined when
# NROFF is defined as "groff -Tascii" or "groff -Tlatin1";
# not only is it superfluous, but it actually damages the output.
# For use with utf-8, NROFF should be "nroff -mandoc" without -T option.
# (Maybe - but today I need -Tlatin1 to prevent double conversion to utf8.)
#
# If you have a new troff (version 1.18.1?) and its colored output
# causes problems, add the -c option to TROFF, NROFF, JNROFF.
#
TROFF /usr/bin/groff -Tps -mandoc
NROFF /usr/bin/nroff -Tlatin1 -mandoc
JNROFF /usr/bin/groff -Tnippon -mandocj
EQN /usr/bin/eqn -Tps
NEQN /usr/bin/eqn -Tlatin1
JNEQN /usr/bin/eqn -Tnippon
TBL /usr/bin/tbl
# COL /usr/bin/col
REFER /usr/bin/refer
PIC /usr/bin/pic
VGRIND
GRAP
PAGER /usr/bin/less -isR
CAT /bin/cat
#
# The command "man -a xyzzy" will show all man pages for xyzzy.
# When CMP is defined man will try to avoid showing the same
# text twice. (But compressed pages compare unequal.)
#
CMP /usr/bin/cmp -s
#
# Compress cat pages
#
COMPRESS /bin/bzip2
COMPRESS_EXT .bz2
#
# Default manual sections (and order) to search if -S is not specified
# and the MANSECT environment variable is not set.
#
MANSECT 1:1p:8:2:3:3p:4:5:6:7:9:0p:tcl:n:l:p:o
#
# Default options to use when man is invoked without options
# This is mainly for the benefit of those that think -a should be the default
# Note that some systems have /usr/man/allman, causing pages to be shown twice.
#
#MANDEFOPTIONS -a
#
# Decompress with given decompressor when input file has given extension
# The command given must act as a filter.
#
.gz /bin/gunzip -c
.bz2 /usr/bin/bunzip2 -c
.xz /usr/bin/unxz -c
.z
.Z /bin/zcat
.F
.Y

BIN
meta/recipes-extended/man/man/manpath.5.gz
View File

Binary file not shown.

86
meta/recipes-extended/man/man_1.6g.bb
View File

@@ -1,86 +0,0 @@
SUMMARY = "Online documentation tools"
DESCRIPTION = "A set of documentation tools: man, apropos and whatis"
SECTION = "console/utils"
HOMEPAGE = "http://primates.ximian.com/~flucifredi/man"
LICENSE = "GPLv2"
LIC_FILES_CHKSUM = "file://COPYING;md5=8ca43cbc842c2336e835926c2166c28b"
PR = "r1"
DEPENDS = "groff less"
def compress_pkg(d):
if "compress_doc" in (d.getVar("INHERIT") or "").split():
compress = d.getVar("DOC_COMPRESS")
if compress == "gz":
return "gzip"
elif compress == "bz2":
return "bzip2"
elif compress == "xz":
return "xz"
return ""
RDEPENDS_${PN} += "${@compress_pkg(d)}"
SRC_URI = "http://pkgs.fedoraproject.org/lookaside/pkgs/man2html/${BP}.tar.gz/ba154d5796928b841c9c69f0ae376660/${BP}.tar.gz \
file://man-1.5k-confpath.patch;striplevel=0 \
file://man-1.5h1-make.patch \
file://man-1.5k-nonascii.patch \
file://man-1.6e-security.patch \
file://man-1.6e-mandirs.patch \
file://man-1.5m2-bug11621.patch \
file://man-1.5k-sofix.patch \
file://man-1.5m2-buildroot.patch \
file://man-1.6e-ro_usr.patch \
file://man-1.5i2-newline.patch;striplevel=0 \
file://man-1.5j-utf8.patch \
file://man-1.5i2-overflow.patch \
file://man-1.5j-nocache.patch \
file://man-1.5i2-initial.patch \
file://man-1.5h1-gencat.patch;striplevel=0 \
file://man-1.5g-nonrootbuild.patch \
file://man-1.5j-i18n.patch \
file://man-1.6e-whatis2.patch \
file://man-1.6e-use_i18n_vars_in_a_std_way.patch \
file://man-1.5m2-no-color-for-printing.patch \
file://man-1.5m2-sigpipe.patch \
file://man-1.6e-i18n_whatis.patch \
file://man-1.6e-new_sections.patch \
file://man.1.gz;unpack=false \
file://man.7.gz;unpack=false \
file://man.conf \
file://manpath.5.gz;unpack=false \
file://man-1.6g-whatis3.patch \
file://configure_sed.patch \
file://man-1.6g-parallel.patch \
file://man-1.6g-compile-warnings.patch \
file://man-1.6g-configure.patch \
"
SRC_URI[md5sum] = "ba154d5796928b841c9c69f0ae376660"
SRC_URI[sha256sum] = "ccdcb8c3f4e0080923d7e818f0e4a202db26c46415eaef361387c20995b8959f"
CFLAGS += "-DSYSV"
do_configure () {
${S}/configure -default -confdir /etc +sgid +fhs +lang all
}
do_install() {
oe_runmake install DESTDIR=${D}
}
do_install_append(){
mkdir -p ${D}${sysconfdir}
mkdir -p ${D}${datadir}/man/man5
mkdir -p ${D}${datadir}/man/man7
cp ${WORKDIR}/man.conf ${D}${sysconfdir}/man.config
cp ${WORKDIR}/man.1.gz ${D}${datadir}/man/man1/
cp ${WORKDIR}/man.7.gz ${D}${datadir}/man/man7/
cp ${WORKDIR}/manpath.5.gz ${D}${datadir}/man/man5/
}
RDEPENDS_${PN} = "less groff"
FILES_${PN} += "${datadir}/locale ${sysconfdir}/man.config"