diff options
| author | Matthias Andree <mandree@FreeBSD.org> | 2013-06-07 22:17:33 +0000 |
|---|---|---|
| committer | Matthias Andree <mandree@FreeBSD.org> | 2013-06-07 22:17:33 +0000 |
| commit | 4a7771c8700b56c6c5bc9ce7a596ca3d445227cc (patch) | |
| tree | f2dbf6491445badbc7d50480933561e10bb41957 /ports-mgmt/tinderbox | |
| parent | f07cb26ad409b46a264721ca8ed531d63dfe72a5 (diff) | |
| download | ports-4a7771c8700b56c6c5bc9ce7a596ca3d445227cc.tar.gz ports-4a7771c8700b56c6c5bc9ce7a596ca3d445227cc.zip | |
Fix regression from commit r320140: broke build unless web option was selected.
While here, avoid extraction of non-installed webui stuff unless needed.
Submitted by: bf@
Notes
Notes:
svn path=/head/; revision=320227
Diffstat (limited to 'ports-mgmt/tinderbox')
| -rw-r--r-- | ports-mgmt/tinderbox/Makefile | 7 | ||||
| -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 |