ports/152971: [MAINTAINER] sysutils/moreutils: remove parallel utility from suite

Thu Dec 9 22:40:11 UTC 2010

>Number:         152971
>Category:       ports
>Synopsis:       [MAINTAINER] sysutils/moreutils: remove parallel utility from 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:   Thu Dec 09 22:40:10 UTC 2010
>Closed-Date:
>Last-Modified:
>Originator:     Charlie Kester
>Release:        FreeBSD 8.2-PRERELEASE i386
>Organization:
>Environment:
System: FreeBSD atom.local 8.2-PRERELEASE FreeBSD 8.2-PRERELEASE #0: Fri Dec 3 20:10:55 PST 2010 root at atom.local:/usr/obj/usr/src/sys/ATOM i386


>Description:
To resolve the CONFLICT with sysutils/parallel, 
remove the 'parallel' utility from moreutils and create a separate port for it.

That way, users can install the remainder of the moreutils suite without
conflicting with sysutils/parallel.
 
>How-To-Repeat:
	
>Fix:
--------------
Files added: 
None
Files deleted: 
files/parallel.1
files/patch-parallel.c
--------------

--- moreutils-0.43_1.diff begins here ---
diff -ruN /usr/ports/sysutils/moreutils/Makefile ./moreutils/Makefile
--- /usr/ports/sysutils/moreutils/Makefile	2010-11-18 01:34:11.000000000 -0800
+++ ./moreutils/Makefile	2010-12-09 13:22:34.000000000 -0800
@@ -8,6 +8,7 @@
 
 PORTNAME=	moreutils
 PORTVERSION=	0.43
+PORTREVISION=	1
 CATEGORIES=	sysutils
 MASTER_SITES=	${MASTER_SITE_DEBIAN_POOL}
 DISTNAME=	${PORTNAME}_${PORTVERSION}
@@ -15,8 +16,6 @@
 MAINTAINER=	corky1951 at comcast.net
 COMMENT=	Additional Unix utilities
 
-CONFLICTS=	parallel-[0-9]*
-
 RUN_DEPENDS=	${SITE_PERL}/IPC/Run.pm:${PORTSDIR}/devel/p5-IPC-Run
 
 USE_PERL5=	yes
@@ -27,7 +26,6 @@
 		bin/isutf8 \
 		bin/lckdo \
 		bin/mispipe \
-		bin/parallel \
 		bin/pee \
 		bin/sponge \
 		bin/ts \
@@ -39,14 +37,12 @@
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
-.if !defined(NO_INSTALL_MANPAGES)
 MAN1=		chronic.1 \
 		combine.1 \
 		ifne.1 \
 		isutf8.1 \
 		lckdo.1 \
 		mispipe.1 \
-		parallel.1 \
 		pee.1 \
 		sponge.1 \
 		ts.1 \
@@ -61,7 +57,6 @@
 		isutf8.1 \
 		lckdo.1 \
 		mispipe.1 \
-		parallel.1 \
 		pee.1 \
 		sponge.1
 
@@ -70,6 +65,5 @@
 
 post-install:
 	cd ${WRKSRC} && ${INSTALL_MAN} ${MAN1} ${MANPREFIX}/man/man1/
-.endif
 
 .include <bsd.port.mk>
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-Makefile ./moreutils/files/patch-Makefile
--- /usr/ports/sysutils/moreutils/files/patch-Makefile	2010-11-18 01:34:12.000000000 -0800
+++ ./moreutils/files/patch-Makefile	2010-12-09 12:38:37.000000000 -0800
@@ -1,12 +1,12 @@
 --- ./Makefile.orig	2010-10-29 12:47:09.000000000 -0700
-+++ ./Makefile	2010-11-17 16:02:08.000000000 -0800
++++ ./Makefile	2010-12-09 12:38:17.000000000 -0800
 @@ -1,51 +1,35 @@
 -BINS=isutf8 ifdata ifne pee sponge mispipe lckdo parallel
-+BINS=isutf8 ifne pee sponge mispipe lckdo parallel
++BINS=isutf8 ifne pee sponge mispipe lckdo
  PERLSCRIPTS=vidir vipe ts combine zrun chronic
 -MANS=sponge.1 vidir.1 vipe.1 isutf8.1 ts.1 combine.1 ifdata.1 ifne.1 pee.1 zrun.1 chronic.1 mispipe.1 lckdo.1 parallel.1
 -CFLAGS=-O2 -g -Wall
-+MANS=sponge.1 isutf8.1 ifne.1 pee.1 mispipe.1 lckdo.1 parallel.1
++MANS=sponge.1 isutf8.1 ifne.1 pee.1 mispipe.1 lckdo.1
 +CFLAGS+= -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	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/pkg-descr ./moreutils/pkg-descr
--- /usr/ports/sysutils/moreutils/pkg-descr	2010-11-18 01:34:11.000000000 -0800
+++ ./moreutils/pkg-descr	2010-12-09 13:24:58.000000000 -0800
@@ -8,7 +8,6 @@
 - isutf8: check if a file or standard input is utf-8
 - lckdo: execute a program with a lock held
 - mispipe: pipe two commands, returning the exit status of the first
-- parallel: run multiple jobs at once
 - pee: tee standard input to pipes
 - sponge: soak up standard input and write to a file
 - ts: timestamp standard input
@@ -16,6 +15,9 @@
 - vipe: insert a text editor into a pipe
 - zrun: automatically uncompress arguments to command
 
+To avoid possible conflicts, the 'parallel' utility is provided by
+a seperate port.
+
 The Linux-specific 'ifdata' utility is not included in this FreeBSD port.
 
 WWW: http://kitenet.net/~joey/code/moreutils/
--- moreutils-0.43_1.diff ends here ---


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

