aboutsummaryrefslogtreecommitdiff
path: root/ports-mgmt
diff options
context:
space:
mode:
authorBryan Drewery <bdrewery@FreeBSD.org>2014-01-13 16:13:19 +0000
committerBryan Drewery <bdrewery@FreeBSD.org>2014-01-13 16:13:19 +0000
commit1dff3848df6abcc34c567a134a75144afc63bb68 (patch)
treeb38b3123d3c58767ae0d6ef4a0ac19aed20cccaa /ports-mgmt
parent67dec4e6bceaf446b32284693b79fa46358a8b2d (diff)
downloadports-1dff3848df6abcc34c567a134a75144afc63bb68.tar.gz
ports-1dff3848df6abcc34c567a134a75144afc63bb68.zip
Patch no longer needed
Notes
Notes: svn path=/head/; revision=339604
Diffstat (limited to 'ports-mgmt')
-rw-r--r--ports-mgmt/poudriere-devel/Makefile2
-rw-r--r--ports-mgmt/poudriere-devel/files/patch-src__share__poudriere__common.sh25
2 files changed, 1 insertions, 26 deletions
diff --git a/ports-mgmt/poudriere-devel/Makefile b/ports-mgmt/poudriere-devel/Makefile
index 577f9aac254d..732e2f1f6a30 100644
--- a/ports-mgmt/poudriere-devel/Makefile
+++ b/ports-mgmt/poudriere-devel/Makefile
@@ -2,7 +2,7 @@
PORTNAME= poudriere
PORTVERSION= 3.0.99.20140113
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= ports-mgmt
MASTER_SITES= http://fossil.etoilebsd.net/poudriere/tarball/ \
LOCAL/bdrewery/${PORTNAME}/
diff --git a/ports-mgmt/poudriere-devel/files/patch-src__share__poudriere__common.sh b/ports-mgmt/poudriere-devel/files/patch-src__share__poudriere__common.sh
deleted file mode 100644
index 18e574f84663..000000000000
--- a/ports-mgmt/poudriere-devel/files/patch-src__share__poudriere__common.sh
+++ /dev/null
@@ -1,25 +0,0 @@
---- ./src/share/poudriere/common.sh.orig 2013-12-30 15:33:59.000000000 -0600
-+++ ./src/share/poudriere/common.sh 2013-12-30 20:19:11.627128632 -0600
-@@ -2996,6 +2996,7 @@
-
- parallel_run() {
- local cmd="$1"
-+ local ret=0
- shift 1
-
- if [ ${NBPARALLEL} -eq ${PARALLEL_JOBS} ]; then
-@@ -3008,11 +3009,13 @@
- _SHOULD_REAP=$((_SHOULD_REAP + 1))
- if [ ${_SHOULD_REAP} -eq 16 ]; then
- _SHOULD_REAP=0
-- _reap_children || return $?
-+ _reap_children || ret=$?
- fi
-
- PARALLEL_CHILD=1 parallel_exec $cmd "$@" &
- PARALLEL_PIDS="${PARALLEL_PIDS} $! "
-+
-+ return ${ret}
- }
-
- find_all_pool_references() {