- Add parallel utility to suite

PR:		138979
Submitted by:	Charlie Kester <corky1951@comcast.net> (maintainer)
Feature safe:	yes

4 files changed, 35 insertions, 3 deletions

diff --git a/sysutils/moreutils/Makefile b/sysutils/moreutils/Makefile
index 17129109b313..8fb530bffa3f 100644
--- a/sysutils/moreutils/Makefile
+++ b/sysutils/moreutils/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	moreutils
 PORTVERSION=	0.37
+PORTREVISION=	1
 CATEGORIES=	sysutils
 MASTER_SITES=	${MASTER_SITE_DEBIAN_POOL}
 DISTNAME=	${PORTNAME}_${PORTVERSION}
@@ -28,6 +29,7 @@ PLIST_FILES=	bin/combine \
 		bin/isutf8 \
 		bin/lckdo \
 		bin/mispipe \
+		bin/parallel \
 		bin/pee \
 		bin/sponge \
 		bin/ts \
@@ -47,6 +49,7 @@ MAN1=		combine.1 \
 		isutf8.1 \
 		lckdo.1 \
 		mispipe.1 \
+		parallel.1 \
 		pee.1 \
 		sponge.1 \
 		ts.1 \
diff --git a/sysutils/moreutils/files/patch-Makefile b/sysutils/moreutils/files/patch-Makefile
index 2b3bb13f0f2f..49ed321a08ac 100644
--- a/sysutils/moreutils/files/patch-Makefile
+++ b/sysutils/moreutils/files/patch-Makefile
@@ -2,10 +2,10 @@
 +++ Makefile	2009-06-20 07:59:27.000000000 -0700
 @@ -1,25 +1,25 @@
 -BINS=isutf8 ifdata ifne pee sponge mispipe lckdo parallel
-+BINS=isutf8 ifne pee sponge mispipe lckdo
++BINS=isutf8 ifne pee sponge mispipe lckdo parallel
  PERLSCRIPTS=vidir vipe ts combine zrun
 -MANS=sponge.1 vidir.1 vipe.1 isutf8.1 ts.1 combine.1 ifdata.1 ifne.1 pee.1 zrun.1 mispipe.1 lckdo.1 parallel.1
-+MANS=sponge.1 vidir.1 vipe.1 isutf8.1 ts.1 combine.1 ifne.1 pee.1 zrun.1 mispipe.1 lckdo.1
++MANS=sponge.1 vidir.1 vipe.1 isutf8.1 ts.1 combine.1 ifne.1 pee.1 zrun.1 mispipe.1 lckdo.1 parallel.1
  CFLAGS=-O2 -g -Wall
  INSTALL_BIN?=install -s
 -PREFIX=/usr
diff --git a/sysutils/moreutils/files/patch-parallel.c b/sysutils/moreutils/files/patch-parallel.c
new file mode 100644
index 000000000000..11c8af17d209
--- /dev/null
+++ b/sysutils/moreutils/files/patch-parallel.c
@@ -0,0 +1,28 @@
+--- parallel.c.orig	2009-07-25 00:59:37.000000000 -0700
++++ parallel.c	2009-09-19 15:41:07.000000000 -0700
+@@ -64,6 +64,7 @@
+ 	return;
+ }
+ 
++#ifdef HAVE_WAITID
+ int wait_for_child(int options) {
+ 	id_t id_ignored = 0;
+ 	siginfo_t infop;
+@@ -76,6 +77,17 @@
+ 		return infop.si_status;
+ 	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/pkg-descr b/sysutils/moreutils/pkg-descr
index eb089532f045..558719dfa4df 100644
--- a/sysutils/moreutils/pkg-descr
+++ b/sysutils/moreutils/pkg-descr
@@ -14,7 +14,8 @@ So far, it includes the following utilities:
  - mispipe: pipe two commands, returning the exit status of the first
  - isutf8: check if a file or standard input is utf-8
  - lckdo: execute a program with a lock held
+ - parallel: run multiple jobs at once
 
-The 'ifdata' and 'parallel' utilities are not included in this FreeBSD port. 
+The 'ifdata' utility is not included in this FreeBSD port. 
 
 WWW: http://kitenet.net/~joey/code/moreutils/