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

[b.f.]

On 6/6/13, Matthias Andree <mandree at freebsd.org> wrote:
> Author: mandree
> Date: Thu Jun  6 22:25:11 2013
> New Revision: 320140
> URL: http://svnweb.freebsd.org/changeset/ports/320140
>
> Log:
>   Fix display of port fail reasons on the latest_buildports page with
>   default template (not visible in paefchen template).
>
>   PR:		177491
>   Submitted by:	Anonymous <r4721 at tormail.org>
>   Approved by:	itetcu (maintainer timeout, 68 days)
>
> Added:
>   head/ports-mgmt/tinderbox/files/patch-fail-reasons   (contents, props
> changed)
> Modified:
>   head/ports-mgmt/tinderbox/Makefile
>
> Modified: head/ports-mgmt/tinderbox/Makefile
> ==============================================================================
> --- head/ports-mgmt/tinderbox/Makefile	Thu Jun  6 22:24:37 2013	(r320139)
> +++ head/ports-mgmt/tinderbox/Makefile	Thu Jun  6 22:25:11 2013	(r320140)
> @@ -3,6 +3,7 @@
>
>  PORTNAME=	tinderbox
>  PORTVERSION=	4.0.0
> +PORTREVISION=	1
>  CATEGORIES=	ports-mgmt
>  MASTER_SITES=	http://tinderbox.marcuscom.com/ \
>  		http://T32.TecNik93.com/FreeBSD/ports/${PORTNAME}/sources/
>
> Added: 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/patch-fail-reasons	Thu Jun  6 22:25:11
> 2013	(r320140)
> @@ -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']){?>
>

This breaks the build when the webui isn't built -- please fix --
suggested patch attached. (If we are going to remove the webui
subdirectory we can simply avoid extracting it in the first place ...
)

b.
-------------- next part --------------
Index: Makefile
===================================================================
--- Makefile	(revision 320149)
+++ Makefile	(working copy)
@@ -46,10 +46,12 @@
 .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+=	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/' \
Index: files/fail-reasons-patch
===================================================================
--- files/fail-reasons-patch	(revision 0)
+++ files/fail-reasons-patch	(working copy)
@@ -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']){?>

Property changes on: files/fail-reasons-patch
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: files/patch-fail-reasons
===================================================================
--- files/patch-fail-reasons	(revision 320149)
+++ files/patch-fail-reasons	(working copy)
@@ -1,12 +0,0 @@
-# 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']){?>