summaryrefslogtreecommitdiffstats
path: root/meta/recipes-extended/man/man-1.6e/man-1.6e-lzma+xz-support.patch
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-extended/man/man-1.6e/man-1.6e-lzma+xz-support.patch')
-rw-r--r--meta/recipes-extended/man/man-1.6e/man-1.6e-lzma+xz-support.patch142
1 files changed, 0 insertions, 142 deletions
diff --git a/meta/recipes-extended/man/man-1.6e/man-1.6e-lzma+xz-support.patch b/meta/recipes-extended/man/man-1.6e/man-1.6e-lzma+xz-support.patch
deleted file mode 100644
index 9aa5260b71..0000000000
--- a/meta/recipes-extended/man/man-1.6e/man-1.6e-lzma+xz-support.patch
+++ /dev/null
@@ -1,142 +0,0 @@
1diff -Naurp man-1.6e/configure man-1.6e.oden/configure
2--- man-1.6e/configure 2008-12-21 19:20:51.000000000 +0100
3+++ man-1.6e.oden/configure 2008-12-21 19:20:32.000000000 +0100
4@@ -1027,7 +1027,7 @@ then
5 then
6 DO_COMPRESSION=true
7 compress=
8- for i in bzip2 gzip bzip tzip pack compress freeze yabba
9+ for i in xz lzma bzip2 gzip bzip tzip pack compress freeze yabba
10 do
11 eval F$i=missing
12 for j in $DEFPATH
13@@ -1080,6 +1080,8 @@ then
14 fi
15
16 case $compress in
17+ *xz*) ext=".xz" ;;
18+ *lzma*) ext=".lzma" ;;
19 *bzip2*) ext=".bz2" ;;
20 *gzip*) ext=".gz" ;;
21 *bzip*) ext=".bz" ;;
22@@ -1122,7 +1124,7 @@ then
23 fi
24
25 # unconditionally handle uncompression
26-UNCOMPRESSORS="gunzip bzip2 pcat zcat fcat unyabba"
27+UNCOMPRESSORS="unxz unlzma gunzip bzip2 pcat zcat fcat unyabba"
28 for i in $UNCOMPRESSORS
29 do
30 eval F$i=missing
31@@ -1143,6 +1146,14 @@ bzip2=missing
32 if [ $Fbzip2 != missing ]; then
33 bzip2="$Fbzip2 -c -d"
34 fi
35+unxz=missing
36+if [ $Funxz != missing ]; then
37+ unxz="$Funxz -c -d"
38+fi
39+unlzma=missing
40+if [ $Funlzma != missing ]; then
41+ unlzma="$Funlzma -c -d"
42+fi
43 pcat="$Fpcat"
44 zcat="$Fzcat"
45 fcat="$Ffcat"
46@@ -1171,6 +1181,12 @@ if [ x$default = x ]; then
47 bzip2)
48 echo "Command to use for .bz2 files (standard bzip2)"
49 echo $n "[`eval echo \\$$filter`] $c" ;;
50+ xz)
51+ echo "Command to use for .xz files (standard xz)"
52+ echo $n "[`eval echo \\$$filter`] $c" ;;
53+ lzma)
54+ echo "Command to use for .lzma files (standard lzma)"
55+ echo $n "[`eval echo \\$$filter`] $c" ;;
56 pcat)
57 echo "Command to use for .z files (pack/unpack)"
58 echo $n "[`eval echo \\$$filter`] $c" ;;
59@@ -1232,6 +1248,8 @@ fi
60 case $compress_ext in
61 .gz) decompress=$gunzip ;;
62 .bz2) decompress=$bzip2 ;;
63+ .xz) decompress=$unlzma ;;
64+ .lzma) decompress=$unlzma ;;
65 .z) decompress=$pcat ;;
66 .Z) decompress=$zcat ;;
67 .F) decompress=$fcat ;;
68@@ -1319,6 +1337,8 @@ s,@pcat@,$pcat,
69 s,@zcat@,$zcat,
70 s,@gunzip@,$gunzip,
71 s,@bzip2@,$bzip2,
72+s,@unlzma@,$unlzma,
73+s,@unxz@,$unxz,
74 s,@unyabba@,$unyabba,
75 s,@compress@,$compress,
76 s,@compress_ext@,$compress_ext,
77diff -Naurp man-1.6e/src/makewhatis.sh man-1.6e.oden/src/makewhatis.sh
78--- man-1.6e/src/makewhatis.sh 2008-12-21 19:20:51.000000000 +0100
79+++ man-1.6e.oden/src/makewhatis.sh 2008-12-21 19:20:32.000000000 +0100
80@@ -220,7 +220,7 @@ do
81 find $mandir/${pages}$i/. -name '*' $findarg0 $findarg -print | LC_ALL=C $AWK -v MAN_NAME="$MAN_NAME" -v MAN_DESCRIPTION="$MAN_DESCRIPTION" '
82
83 function readline() {
84- if (use_zcat || use_bzcat) {
85+ if (use_zcat || use_bzcat || use_lzcat || use_xzcat) {
86 result = (pipe_cmd | getline);
87 if (result < 0) {
88 print "Pipe error: " pipe_cmd " " ERRNO > "/dev/stderr";
89@@ -235,7 +235,7 @@ do
90 }
91
92 function closeline() {
93- if (use_zcat || use_bzcat) {
94+ if (use_zcat || use_bzcat || use_lzcat || use_xzcat) {
95 return close(pipe_cmd);
96 } else {
97 return close(filename);
98@@ -254,7 +254,11 @@ do
99 match(filename,"\\.z$") || match(filename,"\\.gz$");
100 if (!use_zcat)
101 use_bzcat = match(filename,"\\.bz2");
102- if (use_zcat || use_bzcat) {
103+ if(!use_bzcat)
104+ use_lzcat = match(filename,"\\.lzma");
105+ if(!use_lzcat)
106+ use_xzcat = match(filename,"\\.xz");
107+ if (use_zcat || use_bzcat || use_lzcat || use_xz_cat) {
108 filename_no_gz = substr(filename, 0, RSTART - 1);
109 } else {
110 filename_no_gz = filename;
111@@ -267,12 +271,16 @@ do
112 actual_section = section;
113 }
114 sub(/\..*/, "", progname);
115- if (use_zcat || use_bzcat) {
116+ if (use_zcat || use_bzcat || use_lzcat || use_xz_cat) {
117 if (use_zcat) {
118 pipe_cmd = "zcat \"" filename "\"";
119- } else {
120+ } else if (use_bzcat) {
121 pipe_cmd = "bzcat \"" filename "\"";
122- }
123+ } else if (use_lzcat) {
124+ pipe_cmd = "lzcat \"" filename "\"";
125+ } else {
126+ pipe_cmd = "xzcat \"" filename "\"";
127+ }
128 # try to avoid suspicious stuff
129 if (filename ~ /[;&|`$(]/) {
130 print "ignored strange file name " filename " in " curdir > "/dev/stderr";
131diff -Naurp man-1.6e/src/man.conf.in man-1.6e.oden/src/man.conf.in
132--- man-1.6e/src/man.conf.in 2008-12-21 19:20:51.000000000 +0100
133+++ man-1.6e.oden/src/man.conf.in 2008-12-21 19:20:32.000000000 +0100
134@@ -139,6 +139,8 @@ MANSECT @sections@
135 #
136 .gz @gunzip@
137 .bz2 @bzip2@
138+.lzma @unlzma@
139+.xz @unxz@
140 .z @pcat@
141 .Z @zcat@
142 .F @fcat@