aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ports-mgmt/tinderbox/Makefile7
-rw-r--r--ports-mgmt/tinderbox/files/fail-reasons-patch (renamed from ports-mgmt/tinderbox/files/patch-fail-reasons)0
2 files changed, 2 insertions, 5 deletions
diff --git a/ports-mgmt/tinderbox/Makefile b/ports-mgmt/tinderbox/Makefile
index 4e0fd944be3b..f037e6de16de 100644
--- a/ports-mgmt/tinderbox/Makefile
+++ b/ports-mgmt/tinderbox/Makefile
@@ -46,10 +46,12 @@ WEBUI= yes
.endif
.if defined(WEBUI)
+EXTRA_PATCHES+= ${PATCHDIR}/fail-reasons-patch
WANT_PHP_WEB= yes
USE_PHP= session
PLIST_SUB+= WEBUI=""
.else
+EXTRACT_BEFORE_ARGS= --exclude webui -xf
PLIST_SUB+= WEBUI="@comment "
.endif
@@ -98,11 +100,6 @@ RUN_DEPENDS+= lsof:${PORTSDIR}/sysutils/lsof
RUN_DEPENDS+= p5-Compress-Bzip2>=0:${PORTSDIR}/archivers/p5-Compress-Bzip2
.endif
-.if ! defined(WEBUI)
-post-extract:
- @${RM} -R ${WRKSRC}/webui
-.endif
-
post-patch:
.if ! ${PORT_OPTIONS:MCHECK_ROOT}
${REINPLACE_CMD} -e 's/^if \[ `id -u` != 0 \]; then/if false; then/' \
diff --git a/ports-mgmt/tinderbox/files/patch-fail-reasons b/ports-mgmt/tinderbox/files/fail-reasons-patch
index ee29c839a6b6..ee29c839a6b6 100644
--- a/ports-mgmt/tinderbox/files/patch-fail-reasons
+++ b/ports-mgmt/tinderbox/files/fail-reasons-patch