Index: head/sysutils/xe/Makefile =================================================================== --- head/sysutils/xe/Makefile (revision 453281) +++ head/sysutils/xe/Makefile (revision 453282) @@ -1,30 +1,30 @@ # Created by: Tobias Kortkamp # $FreeBSD$ PORTNAME= xe -PORTVERSION= 0.9 DISTVERSIONPREFIX= v +DISTVERSION= 0.10 CATEGORIES= sysutils MAINTAINER= tobik@FreeBSD.org COMMENT= Simple xargs and apply replacement LICENSE= CC0-1.0 USE_GITHUB= yes GH_ACCOUNT= chneukirchen USES= perl5 USE_PERL5= test MAKE_ARGS= CFLAGS="${CFLAGS}" \ MANDIR="${PREFIX}/man" TEST_TARGET= check PLIST_FILES= bin/xe \ man/man1/xe.1.gz post-install: @${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/xe .include Index: head/sysutils/xe/distinfo =================================================================== --- head/sysutils/xe/distinfo (revision 453281) +++ head/sysutils/xe/distinfo (revision 453282) @@ -1,3 +1,3 @@ -TIMESTAMP = 1500981663 -SHA256 (chneukirchen-xe-v0.9_GH0.tar.gz) = 0e72bafd0d5c30953ef7a5dca710296aec621a60fb62c0aaf7ee2af5e68c2ac2 -SIZE (chneukirchen-xe-v0.9_GH0.tar.gz) = 8444 +TIMESTAMP = 1509539322 +SHA256 (chneukirchen-xe-v0.10_GH0.tar.gz) = 8993cea06b2c664195df2a6124d0386d1bce7c27eb6ecbf968866bfd05cb9d7a +SIZE (chneukirchen-xe-v0.10_GH0.tar.gz) = 12052 Index: head/sysutils/xe/files/patch-xe.c =================================================================== --- head/sysutils/xe/files/patch-xe.c (revision 453281) +++ head/sysutils/xe/files/patch-xe.c (nonexistent) @@ -1,27 +0,0 @@ ---- xe.c.orig 2017-07-17 14:20:26 UTC -+++ xe.c -@@ -13,6 +13,7 @@ - - #include - #include -+#include - #include - #include - #include -@@ -114,7 +115,7 @@ my_child: - } else if (WEXITSTATUS(status) > 125) { - exit(WEXITSTATUS(status)); - } -- } else if (WIFSIGNALED(status)) { -+ } else if (WIFSIGNALED(status) && !(fflag && WTERMSIG(status) == SIGPIPE)) { - fprintf(stderr, "xe: job %ld [pid %ld] terminated by signal %d\n", - children[i].iter, (long)pid, WTERMSIG(status)); - exit(125); -@@ -472,6 +473,7 @@ main(int argc, char *argv[], char *envp[]) - pusharg("/bin/sh"); - pusharg("-c"); - pusharg(sflag); -+ pusharg("--"); - pusharg("-"); - } else if (optind >= cmdend) { - pusharg("printf"); Property changes on: head/sysutils/xe/files/patch-xe.c ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -on \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/sysutils/xe/files/patch-tests =================================================================== --- head/sysutils/xe/files/patch-tests (revision 453281) +++ head/sysutils/xe/files/patch-tests (revision 453282) @@ -1,40 +1,31 @@ Fix tests - Trying to exec /dev/null/calc.exe on FreeBSD will fail with ENOENT (xe exit 127) but on Linux fails with ENODIR (xe exit 126) - The argscap check returns 8186 + 8186 + 1339 = 17711 on FreeBSD, which should be fine. ---- tests.orig 2017-07-17 14:20:26 UTC +--- tests.orig 2017-10-30 15:43:40 UTC +++ tests -@@ -194,7 +194,7 @@ check_output 'using -LL' '{ echo 1; sleep 1; echo 2; s +@@ -220,7 +220,7 @@ check_output 'exit code when process was killed' 'nech EOF - check_output 'using -vvL' '{ echo 1; sleep 1; echo 2; sleep 1; echo 3; } | xe -j2 -vvL -s "printf \$1; sleep 1; echo \$1" | wc -l' </dev/null || echo $?' </dev/null || echo $?' </dev/null | tr "\0" "\012" | xe -N0 -s "echo \$#"' </dev/null | tr "\0" "\012" | xe -N0 -s "echo \$#" | awk "{sum+=\$0}END{print sum}"' <