* [gentoo-commits] gentoo-x86 commit in sys-apps/man/files: man-1.6g-compress.patch man-1.6g-xz.patch man-1.6g-fbsd.patch
@ 2011-01-02 3:22 99% Mike Frysinger (vapier)
0 siblings, 0 replies; 1+ results
From: Mike Frysinger (vapier) @ 2011-01-02 3:22 UTC (permalink / raw
To: gentoo-commits
vapier 11/01/02 03:22:35
Added: man-1.6g-compress.patch man-1.6g-xz.patch
man-1.6g-fbsd.patch
Log:
Version bump.
(Portage version: 2.2.0_alpha10/cvs/Linux x86_64)
Revision Changes Path
1.1 sys-apps/man/files/man-1.6g-compress.patch
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/man/files/man-1.6g-compress.patch?rev=1.1&view=markup
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
Index: man-1.6g-compress.patch
===================================================================
allow selection of default cache compressor
http://bugs.gentoo.org/205147
--- configure
+++ configure
@@ -1012,6 +1012,10 @@
done
done
+ if [ x$COMPRESS != x ]; then
+ compress=$COMPRESS
+ fi
+
if [ x$default = x ]; then
echo ""
echo "What program should be used to compress the formatted pages?"
1.1 sys-apps/man/files/man-1.6g-xz.patch
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/man/files/man-1.6g-xz.patch?rev=1.1&view=markup
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
Index: man-1.6g-xz.patch
===================================================================
add support for xz
http://bugs.gentoo.org/302380
--- a/src/makewhatis.sh
+++ b/src/makewhatis.sh
@@ -230,7 +230,7 @@
find $mandir/${pages}$i/. -name '*' $findarg0 $findarg -print | $AWK '
function readline() {
- if (use_zcat || use_bzcat || use_lzcat) {
+ if (use_zcat || use_bzcat || use_lzcat || use_xzcat) {
result = (pipe_cmd | getline);
if (result < 0) {
print "Pipe error: " pipe_cmd " " ERRNO > "/dev/stderr";
@@ -245,7 +245,7 @@
}
function closeline() {
- if (use_zcat || use_bzcat || use_lzcat) {
+ if (use_zcat || use_bzcat || use_lzcat || use_xzcat) {
return close(pipe_cmd);
} else {
return close(filename);
@@ -266,7 +266,9 @@
use_bzcat = match(filename,"\\.bz2");
if(!use_bzcat)
use_lzcat = match(filename,"\\.lzma");
- if (use_zcat || use_bzcat || use_lzcat ) {
+ if(!use_lzcat)
+ use_xzcat = match(filename,"\\.xz");
+ if (use_zcat || use_bzcat || use_lzcat || use_xzcat) {
filename_no_gz = substr(filename, 0, RSTART - 1);
} else {
filename_no_gz = filename;
@@ -279,13 +281,15 @@
actual_section = section;
}
sub(/\..*/, "", progname);
- if (use_zcat || use_bzcat || use_lzcat) {
+ if (use_zcat || use_bzcat || use_lzcat || use_xzcat) {
if (use_zcat) {
pipe_cmd = "zcat \"" filename "\"";
} else if (use_bzcat) {
pipe_cmd = "bzcat \"" filename "\"";
- } else {
+ } else if (use_lzcat) {
pipe_cmd = "lzcat \"" filename "\"";
+ } else {
+ pipe_cmd = "xzcat \"" filename "\"";
}
# try to avoid suspicious stuff
if (filename ~ /[;&|`$(]/) {
1.1 sys-apps/man/files/man-1.6g-fbsd.patch
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/man/files/man-1.6g-fbsd.patch?rev=1.1&view=markup
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
Index: man-1.6g-fbsd.patch
===================================================================
Fixes compilation in FreeBSD
http://bugs.gentoo.org/138123
--- man-1.6g/gencat/genlib.c
+++ man-1.6g/gencat/genlib.c
@@ -54,7 +54,7 @@
#include <unistd.h>
#endif
-#if !defined(__linux__) && !defined(__CYGWIN__)
+#if !defined(__linux__) && !defined(__CYGWIN__) && !defined(__FreeBSD__)
#include <memory.h>
static int bcopy(src, dst, length)
char *src, *dst;
^ permalink raw reply [relevance 99%]
Results 1-1 of 1 | reverse | options above
-- pct% links below jump to the message on this page, permalinks otherwise --
2011-01-02 3:22 99% [gentoo-commits] gentoo-x86 commit in sys-apps/man/files: man-1.6g-compress.patch man-1.6g-xz.patch man-1.6g-fbsd.patch Mike Frysinger (vapier)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox