| 1 |
vapier 11/01/02 03:22:35 |
| 2 |
|
| 3 |
Added: man-1.6g-compress.patch man-1.6g-xz.patch |
| 4 |
man-1.6g-fbsd.patch |
| 5 |
Log: |
| 6 |
Version bump. |
| 7 |
|
| 8 |
(Portage version: 2.2.0_alpha10/cvs/Linux x86_64) |
| 9 |
|
| 10 |
Revision Changes Path |
| 11 |
1.1 sys-apps/man/files/man-1.6g-compress.patch |
| 12 |
|
| 13 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/man/files/man-1.6g-compress.patch?rev=1.1&view=markup |
| 14 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/man/files/man-1.6g-compress.patch?rev=1.1&content-type=text/plain |
| 15 |
|
| 16 |
Index: man-1.6g-compress.patch |
| 17 |
=================================================================== |
| 18 |
allow selection of default cache compressor |
| 19 |
|
| 20 |
http://bugs.gentoo.org/205147 |
| 21 |
|
| 22 |
--- configure |
| 23 |
+++ configure |
| 24 |
@@ -1012,6 +1012,10 @@ |
| 25 |
done |
| 26 |
done |
| 27 |
|
| 28 |
+ if [ x$COMPRESS != x ]; then |
| 29 |
+ compress=$COMPRESS |
| 30 |
+ fi |
| 31 |
+ |
| 32 |
if [ x$default = x ]; then |
| 33 |
echo "" |
| 34 |
echo "What program should be used to compress the formatted pages?" |
| 35 |
|
| 36 |
|
| 37 |
|
| 38 |
1.1 sys-apps/man/files/man-1.6g-xz.patch |
| 39 |
|
| 40 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/man/files/man-1.6g-xz.patch?rev=1.1&view=markup |
| 41 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/man/files/man-1.6g-xz.patch?rev=1.1&content-type=text/plain |
| 42 |
|
| 43 |
Index: man-1.6g-xz.patch |
| 44 |
=================================================================== |
| 45 |
add support for xz |
| 46 |
|
| 47 |
http://bugs.gentoo.org/302380 |
| 48 |
|
| 49 |
--- a/src/makewhatis.sh |
| 50 |
+++ b/src/makewhatis.sh |
| 51 |
@@ -230,7 +230,7 @@ |
| 52 |
find $mandir/${pages}$i/. -name '*' $findarg0 $findarg -print | $AWK ' |
| 53 |
|
| 54 |
function readline() { |
| 55 |
- if (use_zcat || use_bzcat || use_lzcat) { |
| 56 |
+ if (use_zcat || use_bzcat || use_lzcat || use_xzcat) { |
| 57 |
result = (pipe_cmd | getline); |
| 58 |
if (result < 0) { |
| 59 |
print "Pipe error: " pipe_cmd " " ERRNO > "/dev/stderr"; |
| 60 |
@@ -245,7 +245,7 @@ |
| 61 |
} |
| 62 |
|
| 63 |
function closeline() { |
| 64 |
- if (use_zcat || use_bzcat || use_lzcat) { |
| 65 |
+ if (use_zcat || use_bzcat || use_lzcat || use_xzcat) { |
| 66 |
return close(pipe_cmd); |
| 67 |
} else { |
| 68 |
return close(filename); |
| 69 |
@@ -266,7 +266,9 @@ |
| 70 |
use_bzcat = match(filename,"\\.bz2"); |
| 71 |
if(!use_bzcat) |
| 72 |
use_lzcat = match(filename,"\\.lzma"); |
| 73 |
- if (use_zcat || use_bzcat || use_lzcat ) { |
| 74 |
+ if(!use_lzcat) |
| 75 |
+ use_xzcat = match(filename,"\\.xz"); |
| 76 |
+ if (use_zcat || use_bzcat || use_lzcat || use_xzcat) { |
| 77 |
filename_no_gz = substr(filename, 0, RSTART - 1); |
| 78 |
} else { |
| 79 |
filename_no_gz = filename; |
| 80 |
@@ -279,13 +281,15 @@ |
| 81 |
actual_section = section; |
| 82 |
} |
| 83 |
sub(/\..*/, "", progname); |
| 84 |
- if (use_zcat || use_bzcat || use_lzcat) { |
| 85 |
+ if (use_zcat || use_bzcat || use_lzcat || use_xzcat) { |
| 86 |
if (use_zcat) { |
| 87 |
pipe_cmd = "zcat \"" filename "\""; |
| 88 |
} else if (use_bzcat) { |
| 89 |
pipe_cmd = "bzcat \"" filename "\""; |
| 90 |
- } else { |
| 91 |
+ } else if (use_lzcat) { |
| 92 |
pipe_cmd = "lzcat \"" filename "\""; |
| 93 |
+ } else { |
| 94 |
+ pipe_cmd = "xzcat \"" filename "\""; |
| 95 |
} |
| 96 |
# try to avoid suspicious stuff |
| 97 |
if (filename ~ /[;&|`$(]/) { |
| 98 |
|
| 99 |
|
| 100 |
|
| 101 |
1.1 sys-apps/man/files/man-1.6g-fbsd.patch |
| 102 |
|
| 103 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/man/files/man-1.6g-fbsd.patch?rev=1.1&view=markup |
| 104 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/man/files/man-1.6g-fbsd.patch?rev=1.1&content-type=text/plain |
| 105 |
|
| 106 |
Index: man-1.6g-fbsd.patch |
| 107 |
=================================================================== |
| 108 |
Fixes compilation in FreeBSD |
| 109 |
|
| 110 |
http://bugs.gentoo.org/138123 |
| 111 |
|
| 112 |
--- man-1.6g/gencat/genlib.c |
| 113 |
+++ man-1.6g/gencat/genlib.c |
| 114 |
@@ -54,7 +54,7 @@ |
| 115 |
#include <unistd.h> |
| 116 |
#endif |
| 117 |
|
| 118 |
-#if !defined(__linux__) && !defined(__CYGWIN__) |
| 119 |
+#if !defined(__linux__) && !defined(__CYGWIN__) && !defined(__FreeBSD__) |
| 120 |
#include <memory.h> |
| 121 |
static int bcopy(src, dst, length) |
| 122 |
char *src, *dst; |
Archives