From 614d4242b6bc9309a58cff679f0f047717127df7 Mon Sep 17 00:00:00 2001 From: miwi Date: Sun, 27 Mar 2011 10:12:46 +0000 Subject: - Update to 0.44 PR: 155685 Submitted by: Charlie Kester (maintainer) --- sysutils/moreutils/Makefile | 3 +- sysutils/moreutils/distinfo | 4 +- sysutils/moreutils/files/isutf8.1 | 3 + sysutils/moreutils/files/lckdo.1 | 2 + sysutils/moreutils/files/mispipe.1 | 6 +- sysutils/moreutils/files/parallel.1 | 105 ------------------------------ sysutils/moreutils/files/patch-parallel.c | 29 --------- sysutils/moreutils/files/pee.1 | 5 +- sysutils/moreutils/files/sponge.1 | 11 +++- 9 files changed, 27 insertions(+), 141 deletions(-) delete mode 100644 sysutils/moreutils/files/parallel.1 delete mode 100644 sysutils/moreutils/files/patch-parallel.c (limited to 'sysutils') diff --git a/sysutils/moreutils/Makefile b/sysutils/moreutils/Makefile index 75d3daa355ec..0b49dd6a3956 100644 --- a/sysutils/moreutils/Makefile +++ b/sysutils/moreutils/Makefile @@ -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 --git a/sysutils/moreutils/distinfo b/sysutils/moreutils/distinfo index 7ffe946af31b..b39d6b70b2b2 100644 --- a/sysutils/moreutils/distinfo +++ b/sysutils/moreutils/distinfo @@ -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 --git a/sysutils/moreutils/files/isutf8.1 b/sysutils/moreutils/files/isutf8.1 index 14444ebce069..71ac6e484022 100644 --- a/sysutils/moreutils/files/isutf8.1 +++ b/sysutils/moreutils/files/isutf8.1 @@ -37,5 +37,8 @@ status. 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 --git a/sysutils/moreutils/files/lckdo.1 b/sysutils/moreutils/files/lckdo.1 index dd3bcf3ae4e7..e3804b278477 100644 --- a/sysutils/moreutils/files/lckdo.1 +++ b/sysutils/moreutils/files/lckdo.1 @@ -64,3 +64,5 @@ of the program invoked by \fBlckdo\fR. If the lock 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 --git a/sysutils/moreutils/files/mispipe.1 b/sysutils/moreutils/files/mispipe.1 index 9dffea94178e..89e43d1c4300 100644 --- a/sysutils/moreutils/files/mispipe.1 +++ b/sysutils/moreutils/files/mispipe.1 @@ -22,7 +22,9 @@ mispipe \- pipe two commands, returning the exit status of the first .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 @@ first. 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 --git a/sysutils/moreutils/files/parallel.1 b/sysutils/moreutils/files/parallel.1 deleted file mode 100644 index a206a8b0640d..000000000000 --- a/sysutils/moreutils/files/parallel.1 +++ /dev/null @@ -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 --git a/sysutils/moreutils/files/patch-parallel.c b/sysutils/moreutils/files/patch-parallel.c deleted file mode 100644 index 5e096a506693..000000000000 --- a/sysutils/moreutils/files/patch-parallel.c +++ /dev/null @@ -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 --git a/sysutils/moreutils/files/pee.1 b/sysutils/moreutils/files/pee.1 index ce3dfacc4d61..e6f889f250f9 100644 --- a/sysutils/moreutils/files/pee.1 +++ b/sysutils/moreutils/files/pee.1 @@ -27,6 +27,9 @@ stdout. .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 --git a/sysutils/moreutils/files/sponge.1 b/sysutils/moreutils/files/sponge.1 index b3222752313b..2690b763b8f4 100644 --- a/sysutils/moreutils/files/sponge.1 +++ b/sysutils/moreutils/files/sponge.1 @@ -24,7 +24,16 @@ writes it out to the specified file. Unlike a shell 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 -- cgit