Update to 3.1.2 with the following fixes and minor changes:

* Don't cleanup WRKDIR until after the postPortBuild Hook has run.
* Fix resetBuild in a nullfs environment.
* Fix a regression in the version path.
* Correct a tinderd typo which masked a diagnostic message.
* Show last 30 ports per page in "Current and Latest Builds" page.
(webui)
* When sorting by "Last Build Attempt" in list build page sort
descending -- latest built first. (webui)

The main contributor and tester of this release was Ion-Mihai Tetcu.

(Remove local patches incorporated upstream)

10 files changed, 8 insertions, 104 deletions

diff --git a/ports-mgmt/tinderbox-devel/Makefile b/ports-mgmt/tinderbox-devel/Makefile
index 8f07fb1ecd24..c7a263d9ebb9 100644
--- a/ports-mgmt/tinderbox-devel/Makefile
+++ b/ports-mgmt/tinderbox-devel/Makefile
@@ -5,9 +5,7 @@
 # $FreeBSD$
 
 PORTNAME=	tinderbox
-#DISTVERSION=	${PORTVERSION}-${PORTREVISION}
-PORTVERSION=	3.1.1
-PORTREVISION=	1
+PORTVERSION=	3.1.2
 CATEGORIES=	ports-mgmt
 MASTER_SITES=	http://tinderbox.marcuscom.com/:SOURCES \
 		http://T32.TecNik93.com/FreeBSD/ports/${PORTNAME}/sources/:SOURCES,FAVICON
@@ -19,8 +17,6 @@ EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 MAINTAINER=	itetcu@FreeBSD.org
 COMMENT=	Port build tinderbox system
 
-BROKEN=		To many little annoying bugs, wait for 3.1.2
-
 OPTIONS=	PGSQL "With pgsql" Off \
 		MYSQL "With mysql" On \
 		CSUP  "Use csup for updates" On \
@@ -47,8 +43,6 @@ RUN_DEPENDS+=	${LOCALBASE}/share/pear/DB.php:${PORTSDIR}/databases/pear-DB
 WANT_PHP_WEB=	yes
 USE_PHP=	session
 PLIST_SUB+=	WEBUI=""
-EXTRA_PATCHES+=	${FILESDIR}/extra-patch-webui__module__moduleBuildPorts.php \
-		${FILESDIR}/extra-patch-webui__core__TinderboxDS.php
 .else
 PLIST_SUB+=	WEBUI="@comment "
 .endif
@@ -98,11 +92,7 @@ post-extract:
 .else
 post-extract:
 	@${CP} ${_DISTDIR}/favicon.ico ${WRKSRC}/webui
-post-patch:
-	@${RM} ${WRKSRC}/webui/core/TinderboxDS.php.orig
-	@${RM} ${WRKSRC}/webui/module/moduleBuildPorts.php.orig
 .endif
-	@${RM} ${WRKSRC}/lib/tc_command.sh.orig
 
 do-install:
 	@${MKDIR} ${PREFIX}/tinderbox/scripts
diff --git a/ports-mgmt/tinderbox-devel/distinfo b/ports-mgmt/tinderbox-devel/distinfo
index 62e415cfd8a0..bb920fa2a1c2 100644
--- a/ports-mgmt/tinderbox-devel/distinfo
+++ b/ports-mgmt/tinderbox-devel/distinfo
@@ -1,6 +1,6 @@
-MD5 (tinderbox/tinderbox-3.1.1.tar.gz) = 05fd88070ed603e5ffa10d1d652be886
-SHA256 (tinderbox/tinderbox-3.1.1.tar.gz) = bafffa963ebabf17e52a67fd498925ac39168dfb961aaed0c3e2ed6f8423f950
-SIZE (tinderbox/tinderbox-3.1.1.tar.gz) = 118201
+MD5 (tinderbox/tinderbox-3.1.2.tar.gz) = d0c4c0765af7d84c5171969821bf9e4e
+SHA256 (tinderbox/tinderbox-3.1.2.tar.gz) = 77d23b7e457ee5c22ba76f45f068704d683ea16037fc8d06f3bf0494515ceb38
+SIZE (tinderbox/tinderbox-3.1.2.tar.gz) = 118318
 MD5 (tinderbox/favicon.ico) = 1d2e9e267ca81f0ef5bc7b9c391aaced
 SHA256 (tinderbox/favicon.ico) = 842f1e23dcfcee24d4d7578381256256cda994347751fb332b6eb2182eae216e
 SIZE (tinderbox/favicon.ico) = 4710
diff --git a/ports-mgmt/tinderbox-devel/files/extra-patch-webui__core__TinderboxDS.php b/ports-mgmt/tinderbox-devel/files/extra-patch-webui__core__TinderboxDS.php
deleted file mode 100644
index 829a9c7847a5..000000000000
--- a/ports-mgmt/tinderbox-devel/files/extra-patch-webui__core__TinderboxDS.php
+++ /dev/null
@@ -1,13 +0,0 @@
---- ./webui/core/TinderboxDS.php.orig	2008-11-12 17:35:47.000000000 +0200
-+++ ./webui/core/TinderboxDS.php	2008-11-12 17:36:48.000000000 +0200
-@@ -378,6 +378,10 @@
- 	    if ($sortby == "") $sortby = "port_directory";
- 	    if ($sortby == "port_directory") $sortbytable = "p";
- 	    if ($sortby == "port_maintainer") $sortbytable = "p";
-+	    if ($sortby == "last_built") {
-+		$sortbytable = "bp";
-+		$sortby = "last_built desc";
-+	    }
-             $query = "SELECT p.*,
-                              bp.last_built,
-                              bp.last_status,
diff --git a/ports-mgmt/tinderbox-devel/files/extra-patch-webui__module__moduleBuildPorts.php b/ports-mgmt/tinderbox-devel/files/extra-patch-webui__module__moduleBuildPorts.php
deleted file mode 100644
index b852f64427e9..000000000000
--- a/ports-mgmt/tinderbox-devel/files/extra-patch-webui__module__moduleBuildPorts.php
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./webui/module/moduleBuildPorts.php.orig	2008-11-12 17:38:36.000000000 +0200
-+++ ./webui/module/moduleBuildPorts.php	2008-11-12 17:38:01.000000000 +0200
-@@ -168,7 +168,7 @@
- 			$build_id = false;
- 		}
- 
--		$ports = $this->TinderboxDS->getLatestPorts( $build_id, 20 );
-+		$ports = $this->TinderboxDS->getLatestPorts( $build_id, 30 );
- 
- 		if( is_array( $ports ) && count( $ports ) > 0 ) {
- 			$this->template_assign( 'data', $this->modulePorts->get_list_data( $build_name, $ports ) );
diff --git a/ports-mgmt/tinderbox-devel/files/patch-lib__tc_command.sh b/ports-mgmt/tinderbox-devel/files/patch-lib__tc_command.sh
deleted file mode 100644
index 429ea0547497..000000000000
--- a/ports-mgmt/tinderbox-devel/files/patch-lib__tc_command.sh
+++ /dev/null
@@ -1,14 +0,0 @@
---- ./lib/tc_command.sh.orig	2008-11-12 22:31:40.000000000 +0200
-+++ ./lib/tc_command.sh	2008-11-12 22:32:00.000000000 +0200
-@@ -288,9 +288,9 @@
- #---------------------------------------------------------------------------
- 
- Upgrade () {
--    VERSION="3.0"
-+    VERSION="3.1"
-     TINDERBOX_URL="http://tinderbox.marcuscom.com/"
--    DB_MIGRATION_PATH="${VERSION}"
-+    DB_MIGRATION_PATH="3.0 ${VERSION}"
- 
-     bkup_file=""
- 
diff --git a/ports-mgmt/tinderbox/Makefile b/ports-mgmt/tinderbox/Makefile
index 8f07fb1ecd24..c7a263d9ebb9 100644
--- a/ports-mgmt/tinderbox/Makefile
+++ b/ports-mgmt/tinderbox/Makefile
@@ -5,9 +5,7 @@
 # $FreeBSD$
 
 PORTNAME=	tinderbox
-#DISTVERSION=	${PORTVERSION}-${PORTREVISION}
-PORTVERSION=	3.1.1
-PORTREVISION=	1
+PORTVERSION=	3.1.2
 CATEGORIES=	ports-mgmt
 MASTER_SITES=	http://tinderbox.marcuscom.com/:SOURCES \
 		http://T32.TecNik93.com/FreeBSD/ports/${PORTNAME}/sources/:SOURCES,FAVICON
@@ -19,8 +17,6 @@ EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 MAINTAINER=	itetcu@FreeBSD.org
 COMMENT=	Port build tinderbox system
 
-BROKEN=		To many little annoying bugs, wait for 3.1.2
-
 OPTIONS=	PGSQL "With pgsql" Off \
 		MYSQL "With mysql" On \
 		CSUP  "Use csup for updates" On \
@@ -47,8 +43,6 @@ RUN_DEPENDS+=	${LOCALBASE}/share/pear/DB.php:${PORTSDIR}/databases/pear-DB
 WANT_PHP_WEB=	yes
 USE_PHP=	session
 PLIST_SUB+=	WEBUI=""
-EXTRA_PATCHES+=	${FILESDIR}/extra-patch-webui__module__moduleBuildPorts.php \
-		${FILESDIR}/extra-patch-webui__core__TinderboxDS.php
 .else
 PLIST_SUB+=	WEBUI="@comment "
 .endif
@@ -98,11 +92,7 @@ post-extract:
 .else
 post-extract:
 	@${CP} ${_DISTDIR}/favicon.ico ${WRKSRC}/webui
-post-patch:
-	@${RM} ${WRKSRC}/webui/core/TinderboxDS.php.orig
-	@${RM} ${WRKSRC}/webui/module/moduleBuildPorts.php.orig
 .endif
-	@${RM} ${WRKSRC}/lib/tc_command.sh.orig
 
 do-install:
 	@${MKDIR} ${PREFIX}/tinderbox/scripts
diff --git a/ports-mgmt/tinderbox/distinfo b/ports-mgmt/tinderbox/distinfo
index 62e415cfd8a0..bb920fa2a1c2 100644
--- a/ports-mgmt/tinderbox/distinfo
+++ b/ports-mgmt/tinderbox/distinfo
@@ -1,6 +1,6 @@
-MD5 (tinderbox/tinderbox-3.1.1.tar.gz) = 05fd88070ed603e5ffa10d1d652be886
-SHA256 (tinderbox/tinderbox-3.1.1.tar.gz) = bafffa963ebabf17e52a67fd498925ac39168dfb961aaed0c3e2ed6f8423f950
-SIZE (tinderbox/tinderbox-3.1.1.tar.gz) = 118201
+MD5 (tinderbox/tinderbox-3.1.2.tar.gz) = d0c4c0765af7d84c5171969821bf9e4e
+SHA256 (tinderbox/tinderbox-3.1.2.tar.gz) = 77d23b7e457ee5c22ba76f45f068704d683ea16037fc8d06f3bf0494515ceb38
+SIZE (tinderbox/tinderbox-3.1.2.tar.gz) = 118318
 MD5 (tinderbox/favicon.ico) = 1d2e9e267ca81f0ef5bc7b9c391aaced
 SHA256 (tinderbox/favicon.ico) = 842f1e23dcfcee24d4d7578381256256cda994347751fb332b6eb2182eae216e
 SIZE (tinderbox/favicon.ico) = 4710
diff --git a/ports-mgmt/tinderbox/files/extra-patch-webui__core__TinderboxDS.php b/ports-mgmt/tinderbox/files/extra-patch-webui__core__TinderboxDS.php
deleted file mode 100644
index 829a9c7847a5..000000000000
--- a/ports-mgmt/tinderbox/files/extra-patch-webui__core__TinderboxDS.php
+++ /dev/null
@@ -1,13 +0,0 @@
---- ./webui/core/TinderboxDS.php.orig	2008-11-12 17:35:47.000000000 +0200
-+++ ./webui/core/TinderboxDS.php	2008-11-12 17:36:48.000000000 +0200
-@@ -378,6 +378,10 @@
- 	    if ($sortby == "") $sortby = "port_directory";
- 	    if ($sortby == "port_directory") $sortbytable = "p";
- 	    if ($sortby == "port_maintainer") $sortbytable = "p";
-+	    if ($sortby == "last_built") {
-+		$sortbytable = "bp";
-+		$sortby = "last_built desc";
-+	    }
-             $query = "SELECT p.*,
-                              bp.last_built,
-                              bp.last_status,
diff --git a/ports-mgmt/tinderbox/files/extra-patch-webui__module__moduleBuildPorts.php b/ports-mgmt/tinderbox/files/extra-patch-webui__module__moduleBuildPorts.php
deleted file mode 100644
index b852f64427e9..000000000000
--- a/ports-mgmt/tinderbox/files/extra-patch-webui__module__moduleBuildPorts.php
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./webui/module/moduleBuildPorts.php.orig	2008-11-12 17:38:36.000000000 +0200
-+++ ./webui/module/moduleBuildPorts.php	2008-11-12 17:38:01.000000000 +0200
-@@ -168,7 +168,7 @@
- 			$build_id = false;
- 		}
- 
--		$ports = $this->TinderboxDS->getLatestPorts( $build_id, 20 );
-+		$ports = $this->TinderboxDS->getLatestPorts( $build_id, 30 );
- 
- 		if( is_array( $ports ) && count( $ports ) > 0 ) {
- 			$this->template_assign( 'data', $this->modulePorts->get_list_data( $build_name, $ports ) );
diff --git a/ports-mgmt/tinderbox/files/patch-lib__tc_command.sh b/ports-mgmt/tinderbox/files/patch-lib__tc_command.sh
deleted file mode 100644
index 429ea0547497..000000000000
--- a/ports-mgmt/tinderbox/files/patch-lib__tc_command.sh
+++ /dev/null
@@ -1,14 +0,0 @@
---- ./lib/tc_command.sh.orig	2008-11-12 22:31:40.000000000 +0200
-+++ ./lib/tc_command.sh	2008-11-12 22:32:00.000000000 +0200
-@@ -288,9 +288,9 @@
- #---------------------------------------------------------------------------
- 
- Upgrade () {
--    VERSION="3.0"
-+    VERSION="3.1"
-     TINDERBOX_URL="http://tinderbox.marcuscom.com/"
--    DB_MIGRATION_PATH="${VERSION}"
-+    DB_MIGRATION_PATH="3.0 ${VERSION}"
- 
-     bkup_file=""
-