diff options
| author | Sunpoet Po-Chuan Hsieh <sunpoet@FreeBSD.org> | 2010-11-18 09:34:12 +0000 |
|---|---|---|
| committer | Sunpoet Po-Chuan Hsieh <sunpoet@FreeBSD.org> | 2010-11-18 09:34:12 +0000 |
| commit | 571e1b9ae13e175edeaee0bce048f4fa16449a1d (patch) | |
| tree | 72e755d36fd88852f8058dfdf862c3a5babdd3a9 /sysutils/moreutils/files | |
| parent | f07fc9d34eef94c84bac37ac221e22c26939b49e (diff) | |
Notes
Diffstat (limited to 'sysutils/moreutils/files')
| -rw-r--r-- | sysutils/moreutils/files/patch-Makefile | 15 | ||||
| -rw-r--r-- | sysutils/moreutils/files/patch-parallel.c | 10 |
2 files changed, 13 insertions, 12 deletions
diff --git a/sysutils/moreutils/files/patch-Makefile b/sysutils/moreutils/files/patch-Makefile index ae04c59a5631..695974329b22 100644 --- a/sysutils/moreutils/files/patch-Makefile +++ b/sysutils/moreutils/files/patch-Makefile @@ -1,10 +1,10 @@ ---- Makefile.orig 2009-07-02 12:00:44.000000000 -0700 -+++ Makefile 2010-02-09 22:13:14.000000000 -0800 -@@ -1,51 +1,34 @@ +--- ./Makefile.orig 2010-10-29 12:47:09.000000000 -0700 ++++ ./Makefile 2010-11-17 16:02:08.000000000 -0800 +@@ -1,51 +1,35 @@ -BINS=isutf8 ifdata ifne pee sponge mispipe lckdo parallel +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 + 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 +CFLAGS+= -Wall @@ -12,16 +12,17 @@ -PREFIX=/usr -DOCBOOK2XMAN=docbook2x-man ++ +.SUFFIXES: .1 .docbook + +DOCBOOK2XMAN= ${LOCALBASE}/bin/xsltproc ${LOCALBASE}/share/xsl/docbook/manpages/docbook.xsl all: $(BINS) $(MANS) - ++ +bins: ${BINS} + +mans: ${MANS} -+ + clean: rm -f $(BINS) $(MANS) diff --git a/sysutils/moreutils/files/patch-parallel.c b/sysutils/moreutils/files/patch-parallel.c index 55a1ae47e8de..5e096a506693 100644 --- a/sysutils/moreutils/files/patch-parallel.c +++ b/sysutils/moreutils/files/patch-parallel.c @@ -1,6 +1,6 @@ ---- 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 @@ +--- ./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; } @@ -8,8 +8,8 @@ int wait_for_child(int options) { id_t id_ignored = 0; siginfo_t infop; -@@ -88,6 +89,18 @@ - return infop.si_status; +@@ -101,6 +102,18 @@ + } return 1; } +#else |