From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1PZEWq-0006Ne-Lq for garchives@archives.gentoo.org; Sun, 02 Jan 2011 03:22:45 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 64AF4E045E; Sun, 2 Jan 2011 03:22:38 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 0FE22E045E for ; Sun, 2 Jan 2011 03:22:37 +0000 (UTC) Received: from flycatcher.gentoo.org (flycatcher.gentoo.org [81.93.255.6]) (using TLSv1 with cipher ADH-CAMELLIA256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 3B2181B4015 for ; Sun, 2 Jan 2011 03:22:37 +0000 (UTC) Received: by flycatcher.gentoo.org (Postfix, from userid 559) id D8A2420054; Sun, 2 Jan 2011 03:22:35 +0000 (UTC) From: "Mike Frysinger (vapier)" To: gentoo-commits@lists.gentoo.org Reply-To: gentoo-dev@lists.gentoo.org, vapier@gentoo.org Subject: [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 X-VCS-Repository: gentoo-x86 X-VCS-Files: man-1.6g-compress.patch man-1.6g-xz.patch man-1.6g-fbsd.patch X-VCS-Directories: sys-apps/man/files X-VCS-Committer: vapier X-VCS-Committer-Name: Mike Frysinger Content-Type: text/plain; charset=utf8 Message-Id: <20110102032235.D8A2420054@flycatcher.gentoo.org> Date: Sun, 2 Jan 2011 03:22:35 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: f91804bb-4da6-4d25-bea0-d285638cd00c X-Archives-Hash: 9876a2304f7e6ee24e36e1e0791e82ff 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. =20 (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=3D1.1&view=3Dmarkup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/man/files= /man-1.6g-compress.patch?rev=3D1.1&content-type=3Dtext/plain Index: man-1.6g-compress.patch =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D allow selection of default cache compressor http://bugs.gentoo.org/205147 --- configure +++ configure @@ -1012,6 +1012,10 @@ done done =20 + if [ x$COMPRESS !=3D x ]; then + compress=3D$COMPRESS + fi + if [ x$default =3D 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=3D1.1&view=3Dmarkup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/man/files= /man-1.6g-xz.patch?rev=3D1.1&content-type=3Dtext/plain Index: man-1.6g-xz.patch =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D 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 | $AW= K ' =20 function readline() { - if (use_zcat || use_bzcat || use_lzcat) { + if (use_zcat || use_bzcat || use_lzcat || use_xzcat) { result =3D (pipe_cmd | getline); if (result < 0) { print "Pipe error: " pipe_cmd " " ERRNO > "/dev/stderr"; @@ -245,7 +245,7 @@ } =20 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 =3D match(filename,"\\.bz2"); if(!use_bzcat) use_lzcat =3D match(filename,"\\.lzma"); - if (use_zcat || use_bzcat || use_lzcat ) { + if(!use_lzcat) + use_xzcat =3D match(filename,"\\.xz"); + if (use_zcat || use_bzcat || use_lzcat || use_xzcat) { filename_no_gz =3D substr(filename, 0, RSTART - 1); } else { filename_no_gz =3D filename; @@ -279,13 +281,15 @@ actual_section =3D section; } sub(/\..*/, "", progname); - if (use_zcat || use_bzcat || use_lzcat) { + if (use_zcat || use_bzcat || use_lzcat || use_xzcat) { if (use_zcat) { pipe_cmd =3D "zcat \"" filename "\""; } else if (use_bzcat) { pipe_cmd =3D "bzcat \"" filename "\""; - } else { + } else if (use_lzcat) { pipe_cmd =3D "lzcat \"" filename "\""; + } else { + pipe_cmd =3D "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=3D1.1&view=3Dmarkup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/man/files= /man-1.6g-fbsd.patch?rev=3D1.1&content-type=3Dtext/plain Index: man-1.6g-fbsd.patch =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D 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 #endif =20 -#if !defined(__linux__) && !defined(__CYGWIN__) +#if !defined(__linux__) && !defined(__CYGWIN__) && !defined(__FreeBSD__) #include static int bcopy(src, dst, length) char *src, *dst;