- Update to 0.38

PR:		ports/143827
Submitted by:	Charlie Kester <corky1951@comcast.net> (maintainer)
This commit is contained in:
Pav Lucistnik
2010-02-12 09:23:58 +00:00
parent f43e33bcd6
commit acf3097b94
4 changed files with 16 additions and 16 deletions

View File

@@ -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}

View File

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

View File

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

View File

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