Attachment 103803 Details for Bug 143827 – moreutils-0.38.diff

[patch] moreutils-0.38.diff

moreutils-0.38.diff (text/plain), 2.75 KB, created by Charlie Kester on 2010-02-12 01:20:00 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Charlie Kester

Created: 2010-02-12 01:20:00 UTC

Size: 2.75 KB

patch

obsolete

>diff -ruN /usr/ports/sysutils/moreutils/Makefile ./moreutils/Makefile
>--- /usr/ports/sysutils/moreutils/Makefile	2009-11-20 14:34:35.000000000 -0800
>+++ ./moreutils/Makefile	2010-02-11 15:17:46.000000000 -0800
>@@ -7,8 +7,7 @@
> #
> 
> PORTNAME=	moreutils
>-PORTVERSION=	0.37
>-PORTREVISION=	2
>+PORTVERSION=	0.38
> CATEGORIES=	sysutils
> MASTER_SITES=	${MASTER_SITE_DEBIAN_POOL}
> DISTNAME=	${PORTNAME}_${PORTVERSION}
>diff -ruN /usr/ports/sysutils/moreutils/distinfo ./moreutils/distinfo
>--- /usr/ports/sysutils/moreutils/distinfo	2009-09-10 10:12:43.000000000 -0700
>+++ ./moreutils/distinfo	2010-02-11 15:17:46.000000000 -0800
>@@ -1,3 +1,3 @@
>-MD5 (moreutils_0.37.tar.gz) = 0efb69ef1e913ea4dabc74bfe0e68372
>-SHA256 (moreutils_0.37.tar.gz) = 21b5dcf61c1cdf2b479613e5fd4c4652780ba2be872c9631d4493fa74f30eb50
>-SIZE (moreutils_0.37.tar.gz) = 39445
>+MD5 (moreutils_0.38.tar.gz) = 34f29dc728ead3cae50411e7d158a493
>+SHA256 (moreutils_0.38.tar.gz) = 26223e8ac1fe9906dcc0e2e4395d510146001fe285e9f786e80daab8acb237c3
>+SIZE (moreutils_0.38.tar.gz) = 40426
>diff -ruN /usr/ports/sysutils/moreutils/files/patch-Makefile ./moreutils/files/patch-Makefile
>--- /usr/ports/sysutils/moreutils/files/patch-Makefile	2009-11-20 14:34:36.000000000 -0800
>+++ ./moreutils/files/patch-Makefile	2010-02-11 15:18:02.000000000 -0800
>@@ -1,5 +1,5 @@
> --- Makefile.orig	2009-07-02 12:00:44.000000000 -0700
>-+++ Makefile	2009-11-07 12:51:25.000000000 -0800
>++++ Makefile	2010-02-09 22:13:14.000000000 -0800
> @@ -1,51 +1,34 @@
> -BINS=isutf8 ifdata ifne pee sponge mispipe lckdo parallel
> +BINS=isutf8 ifne pee sponge mispipe lckdo parallel
>diff -ruN /usr/ports/sysutils/moreutils/files/patch-parallel.c ./moreutils/files/patch-parallel.c
>--- /usr/ports/sysutils/moreutils/files/patch-parallel.c	2009-09-20 11:54:27.000000000 -0700
>+++ ./moreutils/files/patch-parallel.c	2010-02-11 15:18:02.000000000 -0800
>@@ -1,6 +1,6 @@
>---- 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 @@
>+--- parallel.c.orig	2010-02-09 12:39:08.000000000 -0800
>++++ parallel.c	2010-02-09 22:27:25.000000000 -0800
>+@@ -76,6 +76,7 @@
>  	return;
>  }
>  
>@@ -8,21 +8,22 @@
>  int wait_for_child(int options) {
>  	id_t id_ignored = 0;
>  	siginfo_t infop;
>-@@ -76,6 +77,17 @@
>+@@ -88,6 +89,18 @@
>  		return infop.si_status;
>  	return 1;
>  }
> +#else
> +int wait_for_child(int options) {
>-+	int status;
>++   int status;
> +
>-+	if(waitpid(-1, &status, options) == -1)
>-+		return -1; /* nothing to wait for */
>-+	if(WIFEXITED(status))
>-+			return WEXITSTATUS(status);
>-+	return 1;
>++   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;

Actions: View | Diff

Attachments on bug 143827: 103803