Import an other round of changes from marcuscom cvs and bump PORTREVISION:

- Bump build_name from 72 characters to 255 characters.
- Sync latest port fail reasons and patterns with pointyhat.
- Switch to cvsup17 as default csup server
- Fix a problem where port directories where not canonicalized, and could end
up looking like dir/../otherdir.
- Save some screen space by reducing space between top menu and content in
queue view in webui.

Note that if upgrading you have to apply the canges to your database by hand.

10 files changed, 257 insertions, 17 deletions

diff --git a/ports-mgmt/tinderbox-devel/Makefile b/ports-mgmt/tinderbox-devel/Makefile
index a7cb3ab80bdc..1396de2b6dea 100644
--- a/ports-mgmt/tinderbox-devel/Makefile
+++ b/ports-mgmt/tinderbox-devel/Makefile
@@ -6,7 +6,7 @@
 
 PORTNAME=	tinderbox
 PORTVERSION=	3.2
-PORTREVISION=	2	# 2009-03-27
+PORTREVISION=	3	# 2009-04-11
 CATEGORIES=	ports-mgmt
 MASTER_SITES=	http://tinderbox.marcuscom.com/ \
 		http://T32.TecNik93.com/FreeBSD/ports/${PORTNAME}/sources/
@@ -34,7 +34,7 @@ SUB_FILES=	pkg-message
 MAN1=		tc-configCcache.1 tc-configDistfile.1 tc-configGet.1 \
 		tc-configJail.1 tc-configTinderd.1 tc-init.1
 
-#PATCH_STRIP=	-p2
+PATCH_STRIP=	-p2
 
 .include <bsd.port.pre.mk>
 
diff --git a/ports-mgmt/tinderbox-devel/files/patch-lib__tc_command.pl b/ports-mgmt/tinderbox-devel/files/patch-lib__tc_command.pl
index edf7235b4dab..d94a58dc7b01 100644
--- a/ports-mgmt/tinderbox-devel/files/patch-lib__tc_command.pl
+++ b/ports-mgmt/tinderbox-devel/files/patch-lib__tc_command.pl
@@ -1,17 +1,25 @@
 Index: portstools/tinderbox/lib/tc_command.pl
-diff -u portstools/tinderbox/lib/tc_command.pl:1.150.2.12 portstools/tinderbox/lib/tc_command.pl:1.150.2.13
---- ./lib/tc_command.pl:1.150.2.12	Wed Feb 11 03:50:34 2009
-+++ ./lib/tc_command.pl	Fri Mar 27 00:16:27 2009
+diff -u portstools/tinderbox/lib/tc_command.pl:1.150.2.12 portstools/tinderbox/lib/tc_command.pl:1.150.2.14
+--- portstools/tinderbox/lib/tc_command.pl:1.150.2.12	Wed Feb 11 03:50:34 2009
++++ portstools/tinderbox/lib/tc_command.pl	Sat Mar 28 13:28:23 2009
 @@ -24,7 +24,7 @@
  # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  # SUCH DAMAGE.
  #
 -# $MCom: portstools/tinderbox/lib/tc_command.pl,v 1.150.2.12 2009/02/11 08:50:34 beat Exp $
-+# $MCom: portstools/tinderbox/lib/tc_command.pl,v 1.150.2.13 2009/03/27 04:16:27 marcus Exp $
++# $MCom: portstools/tinderbox/lib/tc_command.pl,v 1.150.2.14 2009/03/28 17:28:23 marcus Exp $
  #
  
  my $pb;
-@@ -3090,7 +3090,7 @@
+@@ -46,6 +46,7 @@
+ use Tinderbox::MakeCache;
+ use Getopt::Std;
+ use Text::Wrap;
++use Cwd 'abs_path';
+ use vars qw(
+     %COMMANDS
+     $TINDERBOX_HOST
+@@ -3090,7 +3091,7 @@
                          }
  
                          $rc =
@@ -20,3 +28,14 @@ diff -u portstools/tinderbox/lib/tc_command.pl:1.150.2.12 portstools/tinderbox/l
                                  $ds->getPortLastBuiltStatus($port, $src));
                          if (!$rc) {
                                  warn
+@@ -3217,6 +3218,10 @@
+         my $portdir = $ENV{'PORTSDIR'} . "/" . $port;
+         return if (!-d $portdir);
+ 
++        # Canonicalize the port directory.
++        $port = abs_path($portdir);
++        $port =~ s|$ENV{'PORTSDIR'}/||;
++
+         if (defined($deps)) {
+                 my @list;
+                 push @list, $cache->BuildDependsList($port);
diff --git a/ports-mgmt/tinderbox-devel/files/patch-lib__tc_command.sh b/ports-mgmt/tinderbox-devel/files/patch-lib__tc_command.sh
index 3eeba7921a0f..12fe22163c99 100644
--- a/ports-mgmt/tinderbox-devel/files/patch-lib__tc_command.sh
+++ b/ports-mgmt/tinderbox-devel/files/patch-lib__tc_command.sh
@@ -1,16 +1,20 @@
 Index: portstools/tinderbox/lib/tc_command.sh
-diff -u portstools/tinderbox/lib/tc_command.sh:1.101.2.14 portstools/tinderbox/lib/tc_command.sh:1.101.2.15
---- ./lib/tc_command.sh:1.101.2.14	Sun Feb 15 12:22:28 2009
-+++ ./lib/tc_command.sh	Fri Mar 27 23:52:57 2009
-@@ -24,7 +24,7 @@
+diff -u portstools/tinderbox/lib/tc_command.sh:1.101.2.14 portstools/tinderbox/lib/tc_command.sh:1.101.2.16
+--- portstools/tinderbox/lib/tc_command.sh:1.101.2.14	Sun Feb 15 12:22:28 2009
++++ portstools/tinderbox/lib/tc_command.sh	Sat Mar 28 13:24:33 2009
+@@ -24,10 +24,10 @@
  # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  # SUCH DAMAGE.
  #
 -# $MCom: portstools/tinderbox/lib/tc_command.sh,v 1.101.2.14 2009/02/15 17:22:28 marcus Exp $
-+# $MCom: portstools/tinderbox/lib/tc_command.sh,v 1.101.2.15 2009/03/28 03:52:57 marcus Exp $
++# $MCom: portstools/tinderbox/lib/tc_command.sh,v 1.101.2.16 2009/03/28 17:24:33 marcus Exp $
  #
  
- export _defaultUpdateHost="cvsup12.FreeBSD.org"
+-export _defaultUpdateHost="cvsup12.FreeBSD.org"
++export _defaultUpdateHost="cvsup17.FreeBSD.org"
+ export _defaultUpdateType="CSUP"
+ 
+ #---------------------------------------------------------------------------
 @@ -247,8 +247,9 @@
      do_load=0
      db_driver=$(getDbDriver)
diff --git a/ports-mgmt/tinderbox-devel/files/patch-lib__tinderlib.sh b/ports-mgmt/tinderbox-devel/files/patch-lib__tinderlib.sh
index 79fe31d8541a..bbf8eba43f32 100644
--- a/ports-mgmt/tinderbox-devel/files/patch-lib__tinderlib.sh
+++ b/ports-mgmt/tinderbox-devel/files/patch-lib__tinderlib.sh
@@ -1,5 +1,7 @@
---- ./lib/tinderlib.sh.orig	2009-02-24 21:36:38.000000000 +0200
-+++ ./lib/tinderlib.sh	2009-03-25 06:14:12.238205132 +0200
+Index: portstools/tinderbox/lib/tinderlib.sh
+diff -u portstools/tinderbox/lib/tinderlib.sh:1.55.2.4 portstools/tinderbox/lib/tinderlib.sh:1.55.2.5
+--- portstools/tinderbox/lib/tinderlib.sh:1.55.2.4	Mon Nov 10 02:03:02 2008
++++ portstools/tinderbox/lib/tinderlib.sh	Sat Mar 14 19:57:13 2009
 @@ -23,7 +23,7 @@
  # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  # SUCH DAMAGE.
diff --git a/ports-mgmt/tinderbox-devel/files/patch-sql__schema.mysql.pre b/ports-mgmt/tinderbox-devel/files/patch-sql__schema.mysql.pre
new file mode 100644
index 000000000000..ffe55a218960
--- /dev/null
+++ b/ports-mgmt/tinderbox-devel/files/patch-sql__schema.mysql.pre
@@ -0,0 +1,13 @@
+Index: portstools/tinderbox/sql/schema.mysql.pre
+diff -u portstools/tinderbox/sql/schema.mysql.pre:1.68.2.2 portstools/tinderbox/sql/schema.mysql.pre:1.68.2.3
+--- portstools/tinderbox/sql/schema.mysql.pre:1.68.2.2	Sun Dec 21 12:27:29 2008
++++ portstools/tinderbox/sql/schema.mysql.pre	Fri Mar 27 00:06:27 2009
+@@ -37,7 +37,7 @@
+ DROP TABLE IF EXISTS builds;
+ CREATE TABLE builds (
+ 	build_id SERIAL PRIMARY KEY,
+-	build_name VARCHAR(32) UNIQUE NOT NULL,
++	build_name VARCHAR(255) UNIQUE NOT NULL,
+ 	jail_id INTEGER REFERENCES jails(jail_id) ON UPDATE CASCADE ON DELETE RESTRICT,
+ 	ports_tree_id INTEGER REFERENCES ports_trees(ports_tree_id) ON UPDATE CASCADE ON DELETE RESTRICT,
+ 	build_description TEXT,
diff --git a/ports-mgmt/tinderbox-devel/files/patch-sql__schema.pgsql.pre b/ports-mgmt/tinderbox-devel/files/patch-sql__schema.pgsql.pre
new file mode 100644
index 000000000000..b95e73b75c56
--- /dev/null
+++ b/ports-mgmt/tinderbox-devel/files/patch-sql__schema.pgsql.pre
@@ -0,0 +1,13 @@
+Index: portstools/tinderbox/sql/schema.pgsql.pre
+diff -u portstools/tinderbox/sql/schema.pgsql.pre:1.45.2.3 portstools/tinderbox/sql/schema.pgsql.pre:1.45.2.4
+--- portstools/tinderbox/sql/schema.pgsql.pre:1.45.2.3	Sun Dec 21 12:27:29 2008
++++ portstools/tinderbox/sql/schema.pgsql.pre	Fri Mar 27 00:06:27 2009
+@@ -34,7 +34,7 @@
+ -- DROP TABLE builds CASCADE;
+ CREATE TABLE builds (
+ 	build_id SERIAL PRIMARY KEY,
+-	build_name VARCHAR(32) UNIQUE NOT NULL,
++	build_name VARCHAR(255) UNIQUE NOT NULL,
+ 	jail_id INTEGER REFERENCES jails(jail_id) ON UPDATE CASCADE ON DELETE RESTRICT,
+ 	ports_tree_id INTEGER REFERENCES ports_trees(ports_tree_id) ON UPDATE CASCADE ON DELETE RESTRICT,
+ 	build_description TEXT,
diff --git a/ports-mgmt/tinderbox-devel/files/patch-sql__values.pfp b/ports-mgmt/tinderbox-devel/files/patch-sql__values.pfp
new file mode 100644
index 000000000000..97d6f74f0f9d
--- /dev/null
+++ b/ports-mgmt/tinderbox-devel/files/patch-sql__values.pfp
@@ -0,0 +1,76 @@
+Index: portstools/tinderbox/sql/values.pfp
+diff -u /dev/null portstools/tinderbox/sql/values.pfp:1.3.2.1
+--- /dev/null	Sun Apr 12 03:14:53 2009
++++ portstools/tinderbox/sql/values.pfp	Sat Mar 28 15:10:24 2009
+@@ -0,0 +1,71 @@
++/*
++ Port failure patterns.  Port error logs are searched for matches to these
++ patterns in an attempt to put a simple reason behind why a port failed
++ to build correctly.  Order is important here.  The order number field
++ is the first field, and there should be a difference of 100 between
++ patterns.  Changes here require a micro version bump to __DSVERSION__.
++*/
++
++INSERT INTO port_fail_patterns VALUES (0, '.*', '__parent__', 0);
++INSERT INTO port_fail_patterns VALUES (100, '(Error: mtree file ./etc/mtree/BSD.local.dist. is missing|error in pkg_delete|filesystem was touched prior to .make install|list of extra files and directories|list of files present before this port was installed|list of filesystem changes from before and after)', 'mtree', 0);
++INSERT INTO port_fail_patterns VALUES (200, 'Configuration .* not supported', 'arch', 0);
++INSERT INTO port_fail_patterns VALUES (300, '(configure: error:|Script.*configure.*failed unexpectedly|script.*failed: here are the contents of)', '__parent__', 0);
++INSERT INTO port_fail_patterns VALUES (400, 'configure: error: cpu .* not supported', 'arch', 300);
++INSERT INTO port_fail_patterns VALUES (500, 'configure: error: [Pp]erl (5.* required|version too old)', 'perl', 300);
++INSERT INTO port_fail_patterns VALUES (600, '.*', 'configure_error', 300);
++INSERT INTO port_fail_patterns VALUES (700, 'Couldn.t fetch it - please try', 'fetch', 0);
++INSERT INTO port_fail_patterns VALUES (800, 'Error: shared library ".*" does not exist', 'LIB_DEPENDS', 0);
++INSERT INTO port_fail_patterns VALUES (900, '\\.(c|cc|cxx|cpp|h|y)[1-9:]+ .+\\.h: No such file', '__parent__', 0);
++INSERT INTO port_fail_patterns VALUES (1000, '(X11/.*|Xosdefs)\\.h: No such file', '__parent__', 900);
++INSERT INTO port_fail_patterns VALUES (1100, 'XFree86-.*\\.tgz', 'missing_header', 1000);
++INSERT INTO port_fail_patterns VALUES (1200, '.*', 'USE_XLIB', 1000);
++INSERT INTO port_fail_patterns VALUES (1300, '.*', 'missing_header', 900);
++INSERT INTO port_fail_patterns VALUES (1400, '(nested function.*declared but never defined|warning: nested extern declaration)', 'nested_declaration', 0);
++INSERT INTO port_fail_patterns VALUES (1500, '(parse error|too (many|few) arguments to|argument.*doesn.*prototype|incompatible type for argument|conflicting types for|undeclared \\(first use (in |)this function\\)|incorrect number of parameters|has incomplete type and cannot be initialized|error: storage size.* isn.t known)', 'compiler_error', 0);
++INSERT INTO port_fail_patterns VALUES (1600, '(ANSI C.. forbids|is a contravariance violation|changed for new ANSI .for. scoping|[0-9]: passing .* changes signedness|lacks a cast|redeclared as different kind of symbol|invalid type .* for default argument to|wrong type argument to unary exclamation mark|duplicate explicit instantiation of|incompatible types in assignment|assuming . on overloaded member function|call of overloaded .* is ambiguous|declaration of C function .* conflicts with|initialization of non-const reference type|using typedef-name .* after|[0-9]: size of array .* is too large|fixed or forbidden register .* for class|assignment of read-only variable|error: label at end of compound statement|error:.*(has no|is not a) member|error:.*is (private|protected)|error: uninitialized member|error: unrecognized command line option)', 'new_compiler_error', 0);
++INSERT INTO port_fail_patterns VALUES (1700, '(syntax error before|friend declaration|no matching function for call to|.main. must return .int.|invalid conversion from|cannot be used as a macro name as it is an operator in C\\+\\+|is not a member of type|after previous specification in|no class template named|because worst conversion for the former|better than worst conversion|no match for.*operator|no match for call to|undeclared in namespace|is used as a type. but is not|error: array bound forbidden|error: class definition|error: expected constructor|error: there are no arguments|error:.*cast.*loses precision|ISO C\\+\\+ does not support|error: invalid pure specifier)', 'bad_C++_code', 0);
++INSERT INTO port_fail_patterns VALUES (1800, 'error: (array type has incomplete element type|extra qualification .* on member|invalid cast from type .* to type|invalid lvalue in (assignment|decrement|increment|unary)|invalid storage class for function|static declaration of.*follows non-static declaration|two or more data types in declaration specifiers|.* was not declared in this scope)', 'gcc4_error', 0);
++INSERT INTO port_fail_patterns VALUES (1900, '(/usr/libexec/elf/ld: cannot find|undefined reference to|cannot open -l.*: No such file)', 'linker_error', 0);
++INSERT INTO port_fail_patterns VALUES (2000, 'install: .*: No such file', 'install_error', 0);
++INSERT INTO port_fail_patterns VALUES (2100, '(conflicts with installed package|is already installed - perhaps an older version|You may wish to ..make deinstall.. and install this port again)', 'depend_object', 0);
++INSERT INTO port_fail_patterns VALUES (2200, 'core dumped', 'coredump', 0);
++INSERT INTO port_fail_patterns VALUES (2300, '(.s: Assembler messages:|Cannot (determine .* target|find the byte order) for this architecture|^cc1: bad value.*for -mcpu.*switch|could not read symbols: File in wrong format|[Ee]rror: [Uu]nknown opcode|error.*Unsupported architecture|ENDIAN must be defined 0 or 1|failed to merge target-specific data|(file not recognized|failed to set dynamic section sizes): File format not recognized|impossible register constraint|inconsistent operand constraints in an .asm|Invalid configuration.*unknown.*machine.*unknown not recognized|invalid lvalue in asm statement|is only for.*. and you are running|not a valid 64 bit base/index expression|relocation R_X86_64_32.*can not be used when making a shared object|relocation truncated to fit: |shminit failed: Function not implemented|The target cpu. .*. is not currently supported.|This architecture seems to be neither big endian nor little endian|unknown register name|Unable to correct byte order|Unsupported platform. sorry|won.t run on this architecture)', 'arch', 0);
++INSERT INTO port_fail_patterns VALUES (2400, 'autoconf([0-9\\-\\.]*): (not found|No such file or directory)', 'autoconf', 0);
++INSERT INTO port_fail_patterns VALUES (2500, 'autoheader: not found', 'autoheader', 0);
++INSERT INTO port_fail_patterns VALUES (2600, 'automake(.*): not found', 'automake', 0);
++INSERT INTO port_fail_patterns VALUES (2700, 'Checksum mismatch', 'checksum', 0);
++INSERT INTO port_fail_patterns VALUES (2800, 'chown:.*[Ii]nvalid argument', 'chown', 0);
++INSERT INTO port_fail_patterns VALUES (2900, 'Shared object \\"libc.so.6\\" not found, required by', 'compat6x', 0);
++INSERT INTO port_fail_patterns VALUES (3000, 'error in dependency .*, exiting', 'depend_package', 0);
++INSERT INTO port_fail_patterns VALUES (3100, 'pkg_(add|create):.*(can.t find enough temporary space|projected size of .* exceeds available free space)', 'disk_full', 0);
++INSERT INTO port_fail_patterns VALUES (3200, '((Can.t|unable to) open display|Cannot open /dev/tty for read|RuntimeError: cannot open display|You must run this program under the X-Window System)', 'DISPLAY', 0);
++INSERT INTO port_fail_patterns VALUES (3300, '(No checksum recorded for|(Maybe|Either) .* is out of date. or)', 'distinfo_update', 0);
++INSERT INTO port_fail_patterns VALUES (3400, 'Member name contains .\\.\\./', 'fetch', 0);
++INSERT INTO port_fail_patterns VALUES (3500, '(pnohang: killing make checksum|fetch: transfer timed out)', 'fetch_timeout', 0);
++INSERT INTO port_fail_patterns VALUES (3600, '(f77: not found|f77:No such file or directory|Unable to find a fortran compiler)', 'f77', 0);
++INSERT INTO port_fail_patterns VALUES (3700, 'See <URL:http://gcc.gnu.org/bugs.html> for instructions.', 'gcc_bug', 0);
++INSERT INTO port_fail_patterns VALUES (3800, '(Run-time system build failed for some reason|tar: Error opening archive: Failed to open.*No such file or directory)', 'install_error', 0);
++INSERT INTO port_fail_patterns VALUES (3900, '(cc: .*libintl.*: No such file or directory|cc: ndbm\\.so: No such file or directory|error: The X11 shared library could not be loaded|libtool: link: cannot find the library|relocation against dynamic symbol|Shared object.*not found. required by)', 'linker_error', 0);
++INSERT INTO port_fail_patterns VALUES (4000, 'Could not create Makefile', 'makefile', 0);
++INSERT INTO port_fail_patterns VALUES (4100, 'make.*(cannot open [Mm]akefile|don.t know how to make|fatal errors encountered|No rule to make target|built-in)(?!\\s*regression-test.continuing)', 'makefile', 0);
++INSERT INTO port_fail_patterns VALUES (4200, '/usr/.*/man/.*: No such file or directory', 'manpage', 0);
++INSERT INTO port_fail_patterns VALUES (4300, 'out of .* hunks .*--saving rejects to', 'patch', 0);
++INSERT INTO port_fail_patterns VALUES (4400, '(/usr/local/bin/(perl|perl5.6.1):.*(not found|No such file or directory)|cp:.*site_perl: No such file or directory|perl(.*): Perl is not installed. try .pkg_add -r perl|Perl .* required--this is only version)', 'perl', 0);
++INSERT INTO port_fail_patterns VALUES (4500, 'BEGIN failed--compilation aborted at ..Makefile.PL line', 'perl', 0);
++INSERT INTO port_fail_patterns VALUES (4600, '(Abort trap|Bus error|Signal 1[01])', 'process_failed', 0);
++INSERT INTO port_fail_patterns VALUES (4700, 'python: not found', 'python', 0);
++INSERT INTO port_fail_patterns VALUES (4800, '(USER   PID  PPID  PGID.*JOBC STAT  TT       TIME COMMAND|pnohang: killing make package)', 'runaway_process', 0);
++INSERT INTO port_fail_patterns VALUES (4900, 'Segmentation fault', 'segfault', 0);
++INSERT INTO port_fail_patterns VALUES (5000, 'initializer element is not constant', 'stdio', 0);
++INSERT INTO port_fail_patterns VALUES (5100, 'structure has no member named', 'struct_changes', 0);
++INSERT INTO port_fail_patterns VALUES (5200, 'shminit failed: Permission denied', 'sysvipc', 0);
++INSERT INTO port_fail_patterns VALUES (5300, '(/usr/bin/ld: cannot find -l(pthread|XThrStub)|cannot find -lc_r|checking for.*lc_r\\.\\.\\. no|Error: pthreads are required to build this package|Please install/update your POSIX threads (pthreads) library|requires.*thread support|: The -pthread option is deprecated)', 'threads', 0);
++INSERT INTO port_fail_patterns VALUES (5400, '<varargs.h> is obsolete with this version of GCC', 'varargs', 0);
++INSERT INTO port_fail_patterns VALUES (5500, '[Rr]ead-[Oo]nly [Ff]ile [Ss]ystem', 'WRKDIR', 0);
++INSERT INTO port_fail_patterns VALUES (5600, 'cc1.*warnings being treated as errors', 'compiler_error', 0);
++INSERT INTO port_fail_patterns VALUES (5700, 'pkg_create: make_dist: tar command failed with code', 'PLIST', 0);
++INSERT INTO port_fail_patterns VALUES (5800, 'Cannot stat: ', 'configure_error', 0);
++INSERT INTO port_fail_patterns VALUES (5900, '/usr/bin/ld: cannot find -l', 'linker_error', 0);
++INSERT INTO port_fail_patterns VALUES (6000, 'cd: can.t cd to', 'NFS', 0);
++INSERT INTO port_fail_patterns VALUES (6100, 'tar: Error exit delayed from previous errors', 'install_error', 0);
++INSERT INTO port_fail_patterns VALUES (2147483647, '.*', '???', 0);
diff --git a/ports-mgmt/tinderbox-devel/files/patch-sql__values.pfr b/ports-mgmt/tinderbox-devel/files/patch-sql__values.pfr
new file mode 100644
index 000000000000..7aef16154c77
--- /dev/null
+++ b/ports-mgmt/tinderbox-devel/files/patch-sql__values.pfr
@@ -0,0 +1,9 @@
+Index: portstools/tinderbox/sql/values.pfr
+diff -u portstools/tinderbox/sql/values.pfr:1.1 portstools/tinderbox/sql/values.pfr:1.1.2.1
+--- portstools/tinderbox/sql/values.pfr:1.1	Thu Jul 24 19:52:33 2008
++++ portstools/tinderbox/sql/values.pfr	Sat Mar 28 15:10:24 2009
+@@ -55,3 +55,4 @@
+ INSERT INTO port_fail_reasons VALUES ('???', 'The automated script cannot even guess what is wrong with your port. Either the script is really stupid (more likely), or your port has ventured into unknown lands (congratulations!).', 'COMMON');
+ INSERT INTO port_fail_reasons VALUES ('hook', 'A pre-condition hook failed to execute successfully', 'RARE');
+ INSERT INTO port_fail_reasons VALUES ('f77', 'The Fortran 77 compiler is no longer installed in the base OS.  This port requires USE_FORTRAN.', 'COMMON');
++INSERT INTO port_fail_reasons VALUES ('nested_declaration', 'A function is used before its prototype is defined; or a function is inlined incorrectly.', 'RARE');
diff --git a/ports-mgmt/tinderbox-devel/files/patch-webui__core__TinderboxDS.php b/ports-mgmt/tinderbox-devel/files/patch-webui__core__TinderboxDS.php
index 5add81055d46..df99fabba214 100644
--- a/ports-mgmt/tinderbox-devel/files/patch-webui__core__TinderboxDS.php
+++ b/ports-mgmt/tinderbox-devel/files/patch-webui__core__TinderboxDS.php
@@ -1,5 +1,7 @@
---- ./webui/core/TinderboxDS.php.orig	2009-02-24 21:36:38.000000000 +0200
-+++ ./webui/core/TinderboxDS.php	2009-03-25 06:14:12.244205304 +0200
+Index: portstools/tinderbox/webui/core/TinderboxDS.php
+diff -u portstools/tinderbox/webui/core/TinderboxDS.php:1.36.2.6 portstools/tinderbox/webui/core/TinderboxDS.php:1.36.2.7
+--- portstools/tinderbox/webui/core/TinderboxDS.php:1.36.2.6	Sun Feb  1 14:43:27 2009
++++ portstools/tinderbox/webui/core/TinderboxDS.php	Fri Mar 13 03:57:24 2009
 @@ -24,7 +24,7 @@
  # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  # SUCH DAMAGE.
diff --git a/ports-mgmt/tinderbox-devel/files/patch-webui__templates__paefchen__list_tinderd_queue.tpl b/ports-mgmt/tinderbox-devel/files/patch-webui__templates__paefchen__list_tinderd_queue.tpl
new file mode 100644
index 000000000000..1dbd064f6126
--- /dev/null
+++ b/ports-mgmt/tinderbox-devel/files/patch-webui__templates__paefchen__list_tinderd_queue.tpl
@@ -0,0 +1,102 @@
+Index: portstools/tinderbox/webui/templates/paefchen/list_tinderd_queue.tpl
+diff -u portstools/tinderbox/webui/templates/paefchen/list_tinderd_queue.tpl:1.6 portstools/tinderbox/webui/templates/paefchen/list_tinderd_queue.tpl:1.7
+--- portstools/tinderbox/webui/templates/paefchen/list_tinderd_queue.tpl:1.6	Wed Feb 11 03:39:26 2009
++++ portstools/tinderbox/webui/templates/paefchen/list_tinderd_queue.tpl	Sun Apr  5 17:35:38 2009
+@@ -4,12 +4,13 @@
+ ?>
+ <!-- $Paefchen: FreeBSD/tinderbox/webui/templates/paefchen/list_tinderd_queue.tpl,v 1.1 2008/01/05 12:25:17 as Exp $ //-->
+ <div class="subcontent">
+-	<form method="get" action="index.php">
+-	<input type="hidden" name="action" value="list_tinderd_queue" />
+ 	<table>
+ 		<tr>
+ 			<th>Build</th>
+ 			<td>
++				<form method="get" action="index.php">
++				<fieldset>
++				<input type="hidden" name="action" value="list_tinderd_queue" />
+ 				<select name="filter_build_id">
+ 					<option></option>
+ <?php foreach($all_builds as $build) {?>
+@@ -17,11 +18,30 @@
+ <?php }?>
+ 				</select>
+ 				<input type="submit" name="display" value="display" /> 
++				</fieldset>
++				</form>
++			</td>
++			<td style="background-color: #FFFFFF; width: 20px">&nbsp;</td>
++				<td>
++				<form method="post" action="index.php">
++				<fieldset>
++					<input type="hidden" name="action" value="delete_tinderd_queue" />
++					<input type="hidden" name="filter_build_id" value="<?php echo $build_id?>" />
++					<input type="submit" name="delete_tinderd_queue" value="delete all built" />
++				</fieldset>
++				</form>
++				</td>
++				<td style="background-color: #FFFFFF; width: 20px">&nbsp;</td>
++				<td>
++				<form method="post" action="index.php">
++				<fieldset>
++					<input type="hidden" name="action" value="delete_tinderd_queue" />
++					<input type="submit" name="delete_tinderd_queue" value="delete all" />
++				</fieldset>
++				</form>
+ 			</td>
+ 		</tr>
+ 	</table>
+-	</form>
+-</div>
+ 
+ <?php if($errors){?>
+ 	<p style="color:#FF0000">
+@@ -30,15 +50,9 @@
+ 	<?php }?>
+ 	</p>
+ <?php }?>
+-<p>
+-	<form method="post" action="index.php">
+-		<input type="hidden" name="action" value="delete_tinderd_queue" />
+-		<input type="hidden" name="filter_build_id" value="<?php echo $build_id?>" />
+-		<input type="submit" name="delete_tinderd_queue" value="delete all built" />
+-		<input type="submit" name="delete_tinderd_queue" value="delete all" />
+-	</form>
+-</p>
+-<br />
++
++</div>
++
+ <table>
+ 	<tr>
+ 		<th>Build</th>
+@@ -52,6 +66,7 @@
+ 		<th>&nbsp;</th>
+ 	</tr>
+ 	<form method="post" action="index.php">
++	<fieldset>
+ 	<input type="hidden" name="action" value="add_tinderd_queue" />
+ 	<input type="hidden" name="entry_id" value="<?php echo $row['entry_id']?>" />
+ 	<input type="hidden" name="filter_build_id" value="<?php echo $build_id?>" />
+@@ -78,11 +93,13 @@
+ 		</td>
+ 		<td colspan="3"><input type="submit" name="add_tinderd_queue" value="add" /></td>
+ 	</tr>
++	</fieldset>
+ 	</form>
+ <?php if(!$no_list){?>
+ 
+ 		<?php foreach($entries as $row) {?>
+ 			<form method="post" action="index.php">
++			<fieldset>
+ 			<input type="hidden" name="action" value="change_tinderd_queue" />
+ 			<input type="hidden" name="entry_id" value="<?php echo $row['entry_id']?>" />
+ 			<input type="hidden" name="filter_build_id" value="<?php echo $build_id?>" />
+@@ -135,6 +152,7 @@
+ 					<?php }?>
+ 				</td>
+ 			</tr>
++			</fieldset>
+ 			</form>
+ 		<?php }?>
+ <?php }?>