ports/138979: [MAINTAINER PATCH] sysutils/moreutils: add parallel utility to suite

[Charlie Kester]

>Number:         138979
>Category:       ports
>Synopsis:       [MAINTAINER PATCH] sysutils/moreutils: add parallel utility to suite
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Sun Sep 20 02:30:01 UTC 2009
>Closed-Date:
>Last-Modified:
>Originator:     Charlie Kester <corky1951 at comcast.net>
>Release:        FreeBSD 7.2-RELEASE-p3 i386
>Organization:
>Environment:
System: FreeBSD bigbox.local 7.2-RELEASE-p3 FreeBSD 7.2-RELEASE-p3 #0: Wed Aug 19 06:50:21 PDT 2009 root at bigbox.local:/usr/obj/usr/src/sys/BIGBOX i386

>Description:
	Patch the parallel utility to use waitpid instead of waitid, 
	and add it to the suite of tools installed by this port.
>How-To-Repeat:
>Fix:

--- moreutils-0.37_1.diff begins here ---
diff -ruN /usr/ports/sysutils/moreutils/Makefile ./moreutils/Makefile
--- /usr/ports/sysutils/moreutils/Makefile	2009-09-10 10:12:43.000000000 -0700
+++ ./moreutils/Makefile	2009-09-19 19:15:06.000000000 -0700
@@ -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 @@
 		bin/isutf8 \
 		bin/lckdo \
 		bin/mispipe \
+		bin/parallel \
 		bin/pee \
 		bin/sponge \
 		bin/ts \
@@ -47,6 +49,7 @@
 		isutf8.1 \
 		lckdo.1 \
 		mispipe.1 \
+		parallel.1 \
 		pee.1 \
 		sponge.1 \
 		ts.1 \
diff -ruN /usr/ports/sysutils/moreutils/files/patch-Makefile ./moreutils/files/patch-Makefile
--- /usr/ports/sysutils/moreutils/files/patch-Makefile	2009-07-11 07:47:01.000000000 -0700
+++ ./moreutils/files/patch-Makefile	2009-09-19 15:57:41.000000000 -0700
@@ -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 -ruN /usr/ports/sysutils/moreutils/files/patch-parallel.c ./moreutils/files/patch-parallel.c
--- /usr/ports/sysutils/moreutils/files/patch-parallel.c	1969-12-31 16:00:00.000000000 -0800
+++ ./moreutils/files/patch-parallel.c	2009-09-19 15:57:41.000000000 -0700
@@ -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 -ruN /usr/ports/sysutils/moreutils/pkg-descr ./moreutils/pkg-descr
--- /usr/ports/sysutils/moreutils/pkg-descr	2009-07-11 07:47:00.000000000 -0700
+++ ./moreutils/pkg-descr	2009-09-19 19:08:15.000000000 -0700
@@ -14,7 +14,8 @@
  - 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/
--- moreutils-0.37_1.diff ends here ---


>Release-Note:
>Audit-Trail:
>Unformatted: