Index: head/sysutils/xe/Makefile =================================================================== --- head/sysutils/xe/Makefile (revision 439948) +++ head/sysutils/xe/Makefile (revision 439949) @@ -1,26 +1,29 @@ # Created by: Tobias Kortkamp # $FreeBSD$ PORTNAME= xe -PORTVERSION= 0.6.1 +PORTVERSION= 0.7.0 DISTVERSIONPREFIX= v CATEGORIES= sysutils MAINTAINER= tobik@FreeBSD.org COMMENT= Simple xargs and apply replacement LICENSE= CC0-1.0 +TEST_DEPENDS= prove:lang/perl5.24 + USE_GITHUB= yes GH_ACCOUNT= chneukirchen 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 439948) +++ head/sysutils/xe/distinfo (revision 439949) @@ -1,3 +1,3 @@ -TIMESTAMP = 1469327893 -SHA256 (chneukirchen-xe-v0.6.1_GH0.tar.gz) = 36036d0e9464233d3113af187c473491298ed1168976330d7dd615b8f0521b96 -SIZE (chneukirchen-xe-v0.6.1_GH0.tar.gz) = 6889 +TIMESTAMP = 1492163693 +SHA256 (chneukirchen-xe-v0.7.0_GH0.tar.gz) = 32af920a2d27ed0bb8bcb69339fcc805110888e872c92a372d3888df52b300f8 +SIZE (chneukirchen-xe-v0.7.0_GH0.tar.gz) = 7047 Index: head/sysutils/xe/files/patch-tests =================================================================== --- head/sysutils/xe/files/patch-tests (nonexistent) +++ head/sysutils/xe/files/patch-tests (revision 439949) @@ -0,0 +1,49 @@ +Fix tests + +- -A% with no arguments fails now with the additional checks in 0.7.0 +- 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-04-13 15:28:38 UTC ++++ tests +@@ -1,5 +1,5 @@ + #!/bin/sh +-printf '1..42\n' ++printf '1..41\n' + + set -e + +@@ -127,9 +127,6 @@ check_output 'using -A%' '$XE -A% echo - + -- 3 + EOF + +-check_output 'using -A% with no arguments' '$XE -A% echo' </dev/null || echo $?' </dev/null || echo $?' < #include +#include #include #include #include -@@ -100,7 +101,7 @@ mywait() +@@ -99,7 +100,7 @@ mywait() } else if (WEXITSTATUS(status) > 125) { exit(WEXITSTATUS(status)); } - } else if (WIFSIGNALED(status)) { + } else if (WIFSIGNALED(status) && !(fflag && WTERMSIG(status) == SIGPIPE)) { fprintf(stderr, "xe: pid %d terminated by signal %d\n", pid, WTERMSIG(status)); exit(125); -@@ -353,6 +354,7 @@ main(int argc, char *argv[], char *envp[ +@@ -358,6 +359,7 @@ main(int argc, char *argv[], char *envp[ pusharg("/bin/sh"); pusharg("-c"); pusharg(sflag); + pusharg("--"); pusharg("-"); } else if (optind >= cmdend) { pusharg("printf");