Attachment #99801 for bug #138979

View | Details | Raw Unified | Return to bug 138979
Collapse All | Expand All





PORTNAME=	moreutils
PORTVERSION=	0.37
PORTREVISION=	1
CATEGORIES=	sysutils
MASTER_SITES=	${MASTER_SITE_DEBIAN_POOL}
DISTNAME=	${PORTNAME}_${PORTVERSION}

		bin/isutf8 \
		bin/lckdo \
		bin/mispipe \
		bin/parallel \
		bin/pee \
		bin/sponge \
		bin/ts \

		isutf8.1 \
		lckdo.1 \
		mispipe.1 \
		parallel.1 \
		pee.1 \
		sponge.1 \
		ts.1 \

Lines 2-11 Link Here

(-)./moreutils/files/patch-Makefile (-2 / +2 lines)
2	+++ Makefile 2009-06-20 07:59:27.000000000 -0700	2	+++ Makefile 2009-06-20 07:59:27.000000000 -0700
3	@@ -1,25 +1,25 @@	3	@@ -1,25 +1,25 @@
4	-BINS=isutf8 ifdata ifne pee sponge mispipe lckdo parallel	4	-BINS=isutf8 ifdata ifne pee sponge mispipe lckdo parallel
5	+BINS=isutf8 ifne pee sponge mispipe lckdo	5	+BINS=isutf8 ifne pee sponge mispipe lckdo parallel
6	PERLSCRIPTS=vidir vipe ts combine zrun	6	PERLSCRIPTS=vidir vipe ts combine zrun
7	-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	7	-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
8	+MANS=sponge.1 vidir.1 vipe.1 isutf8.1 ts.1 combine.1 ifne.1 pee.1 zrun.1 mispipe.1 lckdo.1	8	+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
9	CFLAGS=-O2 -g -Wall	9	CFLAGS=-O2 -g -Wall
10	INSTALL_BIN?=install -s	10	INSTALL_BIN?=install -s
11	-PREFIX=/usr	11	-PREFIX=/usr




--- 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;

Lines 14-20 Link Here

(-)./moreutils/pkg-descr (-1 / +2 lines)
14	- mispipe: pipe two commands, returning the exit status of the first	14	- mispipe: pipe two commands, returning the exit status of the first
15	- isutf8: check if a file or standard input is utf-8	15	- isutf8: check if a file or standard input is utf-8
16	- lckdo: execute a program with a lock held	16	- lckdo: execute a program with a lock held
		17	- parallel: run multiple jobs at once
17		18
18	The 'ifdata' and 'parallel' utilities are not included in this FreeBSD port.	19	The 'ifdata' utility is not included in this FreeBSD port.
19		20
20	WWW: http://kitenet.net/~joey/code/moreutils/	21	WWW: http://kitenet.net/~joey/code/moreutils/

Return to bug 138979

Lines 8-13 Link Here

(-)./moreutils/Makefile (+3 lines)
8		8
9	PORTNAME= moreutils	9	PORTNAME= moreutils
10	PORTVERSION= 0.37	10	PORTVERSION= 0.37
		11	PORTREVISION= 1
11	CATEGORIES= sysutils	12	CATEGORIES= sysutils
12	MASTER_SITES= ${MASTER_SITE_DEBIAN_POOL}	13	MASTER_SITES= ${MASTER_SITE_DEBIAN_POOL}
13	DISTNAME= ${PORTNAME}_${PORTVERSION}	14	DISTNAME= ${PORTNAME}_${PORTVERSION}
Lines 28-33 Link Here
28	bin/isutf8 \	29	bin/isutf8 \
29	bin/lckdo \	30	bin/lckdo \
30	bin/mispipe \	31	bin/mispipe \
		32	bin/parallel \
31	bin/pee \	33	bin/pee \
32	bin/sponge \	34	bin/sponge \
33	bin/ts \	35	bin/ts \
Lines 47-52 Link Here
47	isutf8.1 \	49	isutf8.1 \
48	lckdo.1 \	50	lckdo.1 \
49	mispipe.1 \	51	mispipe.1 \
		52	parallel.1 \
50	pee.1 \	53	pee.1 \
51	sponge.1 \	54	sponge.1 \
52	ts.1 \	55	ts.1 \

Line 0 Link Here

(-)./moreutils/files/patch-parallel.c (+28 lines)
	1	--- parallel.c.orig 2009-07-25 00:59:37.000000000 -0700
	2	+++ parallel.c 2009-09-19 15:41:07.000000000 -0700
	3	@@ -64,6 +64,7 @@
	4	return;
	5	}
	6
	7	+#ifdef HAVE_WAITID
	8	int wait_for_child(int options) {
	9	id_t id_ignored = 0;
	10	siginfo_t infop;
	11	@@ -76,6 +77,17 @@
	12	return infop.si_status;
	13	return 1;
	14	}
	15	+#else
	16	+int wait_for_child(int options) {
	17	+ int status;
	18	+
	19	+ if(waitpid(-1, &status, options) == -1)
	20	+ return -1; /* nothing to wait for */
	21	+ if(WIFEXITED(status))
	22	+ return WEXITSTATUS(status);
	23	+ return 1;
	24	+}
	25	+#endif
	26
	27	int main(int argc, char **argv) {
	28	int maxjobs = -1;