diff options
| author | mandree <mandree@FreeBSD.org> | 2013-06-08 06:17:33 +0800 |
|---|---|---|
| committer | mandree <mandree@FreeBSD.org> | 2013-06-08 06:17:33 +0800 |
| commit | 4f910b051eb09c7cb339634eab6241372e1c6d35 (patch) | |
| tree | f2dbf6491445badbc7d50480933561e10bb41957 /ports-mgmt/tinderbox/Makefile | |
| parent | 7449340abb3c112b9e1efc66bb12e406f31a15c1 (diff) | |
| download | freebsd-ports-gnome-4f910b051eb09c7cb339634eab6241372e1c6d35.tar.gz freebsd-ports-gnome-4f910b051eb09c7cb339634eab6241372e1c6d35.tar.zst freebsd-ports-gnome-4f910b051eb09c7cb339634eab6241372e1c6d35.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@
Diffstat (limited to 'ports-mgmt/tinderbox/Makefile')
| -rw-r--r-- | ports-mgmt/tinderbox/Makefile | 7 |
1 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/' \ |