svn commit: r320227 - in head/ports-mgmt/tinderbox: . files

[Matthias Andree]

Author: mandree
Date: Fri Jun  7 22:17:33 2013
New Revision: 320227
URL: http://svnweb.freebsd.org/changeset/ports/320227

Log:
  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@

Added:
  head/ports-mgmt/tinderbox/files/fail-reasons-patch
     - copied unchanged from r320221, head/ports-mgmt/tinderbox/files/patch-fail-reasons
Deleted:
  head/ports-mgmt/tinderbox/files/patch-fail-reasons
Modified:
  head/ports-mgmt/tinderbox/Makefile

Modified: head/ports-mgmt/tinderbox/Makefile
==============================================================================
--- head/ports-mgmt/tinderbox/Makefile	Fri Jun  7 21:40:10 2013	(r320226)
+++ head/ports-mgmt/tinderbox/Makefile	Fri Jun  7 22:17:33 2013	(r320227)
@@ -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/
 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/' \

Copied: head/ports-mgmt/tinderbox/files/fail-reasons-patch (from r320221, head/ports-mgmt/tinderbox/files/patch-fail-reasons)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/ports-mgmt/tinderbox/files/fail-reasons-patch	Fri Jun  7 22:17:33 2013	(r320227, copy of r320221, head/ports-mgmt/tinderbox/files/patch-fail-reasons)
@@ -0,0 +1,12 @@
+# http://www.freebsd.org/cgi/query-pr.cgi?pr=ports/177491 by Anonymous
+--- webui/templates/default/latest_buildports.tpl.orig
++++ webui/templates/default/latest_buildports.tpl
+@@ -50,7 +50,7 @@
+ 				<?php $reason=$row['port_last_fail_reason']?>
+ 				<td class="<?php if(!empty($port_fail_reasons[$reason]['type']))echo "fail_reason_".$port_fail_reasons[$reason]['type']?>">
+ 				<?php $href=isset($port_fail_reasons[$reason]['link']) ? "index.php?action=display_failure_reasons&failure_reason_tag=$reason#$reason" : "#"?>
+-				<a href="<?php echo $href?>" class="<?php if(!empty($port_fail_reasons[$reason]['type']))echo "fail_reason_".$port_fail_reasons[$reason]['type']?>" title="<?php if(!empty($port_fail_reasons[$reason]['descr']))echo $port_fail_reasons[$reason]['descr']?>"><?php $reason?></a>
++				<a href="<?php echo $href?>" class="<?php if(!empty($port_fail_reasons[$reason]['type']))echo "fail_reason_".$port_fail_reasons[$reason]['type']?>" title="<?php if(!empty($port_fail_reasons[$reason]['descr']))echo $port_fail_reasons[$reason]['descr']?>"><?php echo $reason?></a>
+ 				</td>
+ 				<td>
+ 					<?php if($row['port_link_logfile']){?>