Index: head/ports-mgmt/tinderbox/Makefile
===================================================================
--- head/ports-mgmt/tinderbox/Makefile	(revision 320226)
+++ head/ports-mgmt/tinderbox/Makefile	(revision 320227)
@@ -1,127 +1,124 @@
 # Created by: Edwin Groothuis <edwin@mavetju.org>
 # $FreeBSD$
 
 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/
 DIST_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	itetcu@FreeBSD.org
 COMMENT=	Port build tinderbox system
 
 CONFLICTS=	tinderbox-devel-[0-9]*
 
 OPTIONS_MULTI=		DB
 OPTIONS_MULTI_DB=	PGSQL MYSQL SQLITE
 
 OPTIONS_RADIO=		WEB
 OPTIONS_RADIO_WEB=	APACHE HIAWATHA LIGHTTPD NGINX
 
 OPTIONS_DEFINE=		CHECK_ROOT EMAILS LSOF LOG_COMPRESS
 
 CHECK_ROOT_DESC=	Check if ./tc is run by uid 0
 EMAILS_DESC=		Support for build failure/completion emails
 LSOF_DESC=		For killMountProcesses() when using nullfs
 LOG_COMPRESS_DESC=	Support bzip'ing the logs
 HIAWATHA_DESC=		Hiawatha server
 NGINX_DESC=		Nginx server
 
 OPTIONS_DEFAULT=	MYSQL APACHE CHECK_ROOT EMAILS LSOF \
 			LOG_COMPRESS
 
 NO_BUILD=	yes
 WANT_PERL=	yes
 SUB_FILES=	pkg-message
 
 MAN1=		tc-configCcache.1 tc-configDistfile.1 tc-configGet.1 \
 		tc-configJail.1 tc-configTinderd.1 tc-init.1
 
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MAPACHE} || ${PORT_OPTIONS:MHIAWATHA} || ${PORT_OPTIONS:MLIGHTTPD} || ${PORT_OPTIONS:MNGINX}
 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
 
 .if ${PORT_OPTIONS:MPGSQL}
 USE_PGSQL=	yes
 .if defined(WEBUI)
 USE_PHP+=	pgsql pdo_pgsql
 .endif
 RUN_DEPENDS+=	p5-DBD-Pg>=0:${PORTSDIR}/databases/p5-DBD-Pg
 .endif
 
 .if ${PORT_OPTIONS:MMYSQL}
 .if defined(WEBUI)
 USE_PHP+=	mysql pdo_mysql
 .endif
 USE_MYSQL=	yes
 RUN_DEPENDS+=	p5-DBD-mysql>=0:${PORTSDIR}/databases/p5-DBD-mysql
 .endif
 
 .if ${PORT_OPTIONS:MSQLITE}
 .if defined(WEBUI)
 USE_PHP+=	sqlite3 pdo_sqlite
 .endif
 RUN_DEPENDS+=	p5-DBD-SQLite>=0:${PORTSDIR}/databases/p5-DBD-SQLite
 .endif
 
 .if ${PORT_OPTIONS:MAPACHE}
 USE_APACHE_RUN=	22+
 .elif ${PORT_OPTIONS:MLIGHTTPD}
 RUN_DEPENDS+=	lighttpd:${PORTSDIR}/www/lighttpd
 .elif ${PORT_OPTIONS:MHIAWATHA}
 RUN_DEPENDS+=	hiawatha:${PORTSDIR}/www/hiawatha
 .elif ${PORT_OPTIONS:MNGINX}
 RUN_DEPENDS+=	nginx:${PORTSDIR}/www/nginx
 .endif
 
 .if ${PORT_OPTIONS:MEMAILS}
 RUN_DEPENDS+=	p5-Net>=0:${PORTSDIR}/net/p5-Net
 .endif
 
 .if ${PORT_OPTIONS:MLSOF}
 RUN_DEPENDS+=	lsof:${PORTSDIR}/sysutils/lsof
 .endif
 
 .if ${PORT_OPTIONS:MLOG_COMPRESS}
 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/' \
 		${WRKSRC}/tc
 .endif
 	@cd ${WRKSRC} && ${FIND} -E . -regex '.*(orig|bak)' -exec ${RM} {} \;
 
 do-install:
 	@${MKDIR} ${PREFIX}/tinderbox/scripts
 	@${ECHO_CMD} "Installing man pages ..."
 	cd ${WRKSRC}/man/man1 && ${INSTALL_MAN} ${MAN1} ${MAN1PREFIX}/man/man1 && \
 		cd ${WRKSRC} && ${RM} -r ${WRKSRC}/man
 	@${ECHO_CMD} "Installing rc script ..."
 	${INSTALL_SCRIPT} ${WRKSRC}/etc/rc.d/tinderd ${PREFIX}/etc/rc.d/${PORTNAME}
 	@${ECHO_CMD} "Installing tinderbox ..."
 	${CP} -R ${WRKSRC}/* ${PREFIX}/tinderbox/scripts
 	@${ECHO_CMD} "All Done"
 
 post-install:
 	@${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.mk>
Index: head/ports-mgmt/tinderbox/files/patch-fail-reasons
===================================================================
--- head/ports-mgmt/tinderbox/files/patch-fail-reasons	(revision 320226)
+++ head/ports-mgmt/tinderbox/files/patch-fail-reasons	(nonexistent)
@@ -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&amp;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: head/ports-mgmt/tinderbox/files/patch-fail-reasons
___________________________________________________________________
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: head/ports-mgmt/tinderbox/files/fail-reasons-patch
===================================================================
--- head/ports-mgmt/tinderbox/files/fail-reasons-patch	(nonexistent)
+++ head/ports-mgmt/tinderbox/files/fail-reasons-patch	(revision 320227)
@@ -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&amp;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: head/ports-mgmt/tinderbox/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