Attachment 114056 Details for Bug 155685 – moreutils-0.44.diff

[patch] moreutils-0.44.diff

moreutils-0.44.diff (text/plain), 7.39 KB, created by Charlie Kester on 2011-03-19 02:10:03 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Charlie Kester

Created: 2011-03-19 02:10:03 UTC

Size: 7.39 KB

patch

obsolete

>diff -ruN /usr/ports/sysutils/moreutils/Makefile ./moreutils/Makefile
>--- /usr/ports/sysutils/moreutils/Makefile	2010-12-16 08:31:11.000000000 -0800
>+++ ./moreutils/Makefile	2011-03-11 11:56:06.000000000 -0800
>@@ -7,8 +7,7 @@
> #
> 
> PORTNAME=	moreutils
>-PORTVERSION=	0.43
>-PORTREVISION=	1
>+PORTVERSION=	0.44
> CATEGORIES=	sysutils
> MASTER_SITES=	${MASTER_SITE_DEBIAN_POOL}
> DISTNAME=	${PORTNAME}_${PORTVERSION}
>diff -ruN /usr/ports/sysutils/moreutils/distinfo ./moreutils/distinfo
>--- /usr/ports/sysutils/moreutils/distinfo	2010-11-18 01:34:11.000000000 -0800
>+++ ./moreutils/distinfo	2011-03-11 11:56:16.000000000 -0800
>@@ -1,2 +1,2 @@
>-SHA256 (moreutils_0.43.tar.gz) = 09e31e4f308bb1e8f9ab4f7d57f9e3c8246e3e3824015534af59763114a85c7d
>-SIZE (moreutils_0.43.tar.gz) = 44233
>+SHA256 (moreutils_0.44.tar.gz) = 53ec2a967b4ab39cd29e5f9116b6f7b75eefdb97e768fe7b1b04fb688d236604
>+SIZE (moreutils_0.44.tar.gz) = 44685
>diff -ruN /usr/ports/sysutils/moreutils/files/isutf8.1 ./moreutils/files/isutf8.1
>--- /usr/ports/sysutils/moreutils/files/isutf8.1	2010-03-13 04:41:14.000000000 -0800
>+++ ./moreutils/files/isutf8.1	2011-03-11 12:13:10.000000000 -0800
>@@ -37,5 +37,8 @@
> If the file is valid UTF-8, the exit status is zero.
> If the file is not valid UTF-8, or there is some
> error, the exit status is non-zero.
>+.SH AUTHOR
>+Lars Wirzenius
>+
> .SH "SEE ALSO"
> \fButf8\fR(7)
>diff -ruN /usr/ports/sysutils/moreutils/files/lckdo.1 ./moreutils/files/lckdo.1
>--- /usr/ports/sysutils/moreutils/files/lckdo.1	2010-03-13 04:41:14.000000000 -0800
>+++ ./moreutils/files/lckdo.1	2011-03-11 12:14:47.000000000 -0800
>@@ -64,3 +64,5 @@
> couldn't be acquired, EX_TEMPFAIL is returned. If there was a problem
> opening/creating or locking the lock file, EX_CANTCREAT or EX_OSERR
> will be returned.
>+.SH AUTHOR
>+Michael Tokarev
>diff -ruN /usr/ports/sysutils/moreutils/files/mispipe.1 ./moreutils/files/mispipe.1
>--- /usr/ports/sysutils/moreutils/files/mispipe.1	2010-03-13 04:41:14.000000000 -0800
>+++ ./moreutils/files/mispipe.1	2011-03-11 12:13:10.000000000 -0800
>@@ -22,7 +22,9 @@
> .SH DESCRIPTION
> \fBmispipe\fR pipes two commands
> together like the shell does, but unlike piping in the
>-shell, the exit status of the first command is returned.
>+shell, which returns the exit status of the last command;
>+when using mispipe, the exit status of the first command
>+is returned.
> .PP
> Note that some shells, notably \fBbash\fR,
> do offer a pipefail option, however, that option does not
>@@ -33,3 +35,5 @@
> The exit status of the first command. If the process
> terminated abnormally (due to a signal), 128 will be added
> to its exit status.
>+.SH AUTHOR
>+Nathanael Nerode
>diff -ruN /usr/ports/sysutils/moreutils/files/parallel.1 ./moreutils/files/parallel.1
>--- /usr/ports/sysutils/moreutils/files/parallel.1	2010-03-13 04:41:14.000000000 -0800
>+++ ./moreutils/files/parallel.1	1969-12-31 16:00:00.000000000 -0800
>@@ -1,105 +0,0 @@
>-.\" -*- coding: us-ascii -*-
>-.if \n(.g .ds T< \\FC
>-.if \n(.g .ds T> \\F[\n[.fam]]
>-.de URL
>-\\$2 \(la\\$1\(ra\\$3
>-..
>-.if \n(.g .mso www.tmac
>-.TH parallel 1 2009-07-02 "" ""
>-.SH NAME
>-parallel \- run programs in parallel
>-.SH SYNOPSIS
>-'nh
>-.fi
>-.ad l
>-\fBparallel\fR \kx
>-.if (\nx>(\n(.l/2)) .nr x (\n(.l/5)
>-'in \n(.iu+\nxu
>-[options] [command] \fB--\fR [argument ...]
>-'in \n(.iu-\nxu
>-.ad b
>-'hy
>-'nh
>-.fi
>-.ad l
>-\fBparallel\fR \kx
>-.if (\nx>(\n(.l/2)) .nr x (\n(.l/5)
>-'in \n(.iu+\nxu
>-[options] \fB--\fR [command ...]
>-'in \n(.iu-\nxu
>-.ad b
>-'hy
>-.SH DESCRIPTION
>-\fBparallel\fR runs the specified command,
>-passing it a single one of the specified arguments. This is
>-repeated for each argument. Jobs may be run in
>-parallel. The default is to run one job per CPU.
>-.PP
>-If no command is specified before the --,
>-the commands after it are instead run in parallel.
>-.SH OPTIONS
>-.TP 
>-\*(T<\fB\-j maxjobs\fR\*(T>
>-Use to limit the number of jobs
>-that are run at the same time.
>-.TP 
>-\*(T<\fB\-l maxload\fR\*(T>
>-Avoid starting new jobs when
>-the system's load average is not below
>-the specified limit.
>-.TP 
>-\*(T<\fB\-i\fR\*(T>
>-Normally the command is passed the
>-argument at the end of its command line. With
>-this option, the first instance of "{}" in
>-the command is replaced with the argument.
>-.TP 
>-\*(T<\fB\-n\fR\*(T>
>-Number of arguments to pass to a
>-command at a time. Default is 1.
>-Incompatible with -i
>-.SH EXAMPLE
>-'nh
>-.fi
>-.ad l
>-\fBparallel sh -c "echo hi; sleep 2; echo bye" -- 1 2 3\fR \kx
>-.if (\nx>(\n(.l/2)) .nr x (\n(.l/5)
>-'in \n(.iu+\nxu
>-'in \n(.iu-\nxu
>-.ad b
>-'hy
>-.PP
>-This runs three subshells that each print a message, delay,
>-and print another message. If your system has multiple
>-CPUs, parallel will run some of the jobs in parallel,
>-which should be clear from the order the messages are
>-output.
>-.PP
>-'nh
>-.fi
>-.ad l
>-\fBparallel -j 3 ufraw -o processed -- *.NEF\fR \kx
>-.if (\nx>(\n(.l/2)) .nr x (\n(.l/5)
>-'in \n(.iu+\nxu
>-'in \n(.iu-\nxu
>-.ad b
>-'hy
>-.PP
>-This runs three ufraw processes at the same time until
>-all of the NEF files have been processed.
>-.PP
>-'nh
>-.fi
>-.ad l
>-\fBparallel -j 3 -- ls df "echo hi"\fR \kx
>-.if (\nx>(\n(.l/2)) .nr x (\n(.l/5)
>-'in \n(.iu+\nxu
>-'in \n(.iu-\nxu
>-.ad b
>-'hy
>-.PP
>-This runs three independent commands in parallel.
>-.SH "EXIT STATUS"
>-Its exit status is the combination of the exit statuses of each
>-command ran, ORed together. (Thus, if any one command
>-exits nonzero, \fBparallel\fR as a whole will exit nonzero.)
>diff -ruN /usr/ports/sysutils/moreutils/files/patch-parallel.c ./moreutils/files/patch-parallel.c
>--- /usr/ports/sysutils/moreutils/files/patch-parallel.c	2010-11-18 01:34:12.000000000 -0800
>+++ ./moreutils/files/patch-parallel.c	1969-12-31 16:00:00.000000000 -0800
>@@ -1,29 +0,0 @@
>---- ./parallel.c.orig	2010-07-06 12:06:47.000000000 -0700
>-+++ ./parallel.c	2010-11-17 15:49:57.000000000 -0800
>-@@ -87,6 +87,7 @@
>- 	return;
>- }
>- 
>-+#ifdef HAVE_WAITID
>- int wait_for_child(int options) {
>- 	id_t id_ignored = 0;
>- 	siginfo_t infop;
>-@@ -101,6 +102,18 @@
>- 	}
>- 	return 1;
>- }
>-+#else
>-+int wait_for_child(int options) {
>-+   int status;
>-+
>-+   if(waitpid(-1, &status, options) == -1)
>-+       return -1; /* nothing to wait for */
>-+   if(WIFEXITED(status))
>-+           return WEXITSTATUS(status);
>-+   return 1;
>-+}
>-+#endif
>-+
>- 
>- int main(int argc, char **argv) {
>- 	int maxjobs = -1;
>diff -ruN /usr/ports/sysutils/moreutils/files/pee.1 ./moreutils/files/pee.1
>--- /usr/ports/sysutils/moreutils/files/pee.1	2010-03-13 04:41:14.000000000 -0800
>+++ ./moreutils/files/pee.1	2011-03-11 12:13:10.000000000 -0800
>@@ -27,6 +27,9 @@
> .PP
> Note that while this is similar to
> \fBtee\fR, a copy of the input is not sent
>-to stdout, like tee does.
>+to stdout, like tee does. If that is desired, use 
>+\fBpee cat ...\fR
> .SH "SEE ALSO"
> \fBtee\fR(1)
>+.SH AUTHOR
>+Miek Gieben
>diff -ruN /usr/ports/sysutils/moreutils/files/sponge.1 ./moreutils/files/sponge.1
>--- /usr/ports/sysutils/moreutils/files/sponge.1	2010-03-13 04:41:14.000000000 -0800
>+++ ./moreutils/files/sponge.1	2011-03-11 12:13:10.000000000 -0800
>@@ -24,7 +24,16 @@
> redirect, sponge soaks up all its input before
> opening the output file. This allows constricting
> pipelines that read from and write to
>-the same file. 
>+the same file.
>+.PP
>+It also creates the output file
>+atomically by renaming a temp file into place,
>+and preserves the permissions of the output file
>+if it already exists.
>+If the output file is a special file or symlink,
>+the data will be written to it.
> .PP
> If no output file is specified, sponge outputs to
> stdout.
>+.SH AUTHOR
>+Colin Watson and Tollef Fog Heen

Actions: View | Diff

Attachments on bug 155685: 114056