Update to 2.4.3.

If all goes well, this will be the last 2.x release before a 3.0 major release.

The 2.4.3 release is primarily aimed at fixing bugs, but a few small features
have been added:
* Treat the -u argument to sendBuildCompletionMail as a username rather than an
arbitrary database ID.  Also, do better error checking in case a user has not
been defined in the datastore.
* Add -b <build name> support to the listBuildPortsQueue command.
* Add a new tc command, getPortLastBuiltStatus to get a port's last status.
* Properly quote the UPDATE_CMD argument in the *PortsTreeUpdate hooks.
* Add a new tbkill.sh tool to terminate a running tinderbuild.
* Add a new tinderbuild option, -norebuild, which will prevent tinderbuild from
forcing a rebuild of any packages specified on the command line.
* Add the build platform and release level to the logs.
* Add support for listing total ports per Build in the www-exp frontend.
* Some other minor bugs have been fixed.

Plus 3 local (port) patches:
* in "Current and Latest Builds" (?action=latest_buildports) increase the number
of ports displayed  from 20 to 30
* in ports built for a build view (?action=list_buildports&build=something)
when sorting is done by Last Build Attempt sort descending (latest build first).
* in build logs, add: [1]
 - building for: (ie: "6.3-STABLE amd64")
 - Makefile ident: (ie: "$FreeBSD: ports/ports-mgmt/tinderbox/Makefile,v 1.41 2008/05/19 20:00:16 itetcu Exp $")
 - prefixes: (ie: "LOCALBASE=usr/local X11BASE=usr/local")
 - NO* env vars: (ie: "NOPORTDOCS=yes NOPORTEXAMPLES=yes NOPORTDATA=yes")

This release would not have been possible without the contributions of
Alexander Loginov, miwi, Chess Griffin, itetcu, Dmitriy Kirhlarov,
Robert Gogolok, and ade.

- Fix a few typos in pkg-message. [2]

PR:		ports/123957 [2]
Submited by:	Wen heping <wenheping@gmail.com> [2],
		idea from miwi@'s patch for HEAD [1]

14 files changed, 136 insertions, 22 deletions

diff --git a/ports-mgmt/tinderbox-devel/Makefile b/ports-mgmt/tinderbox-devel/Makefile
index 68e91d2a9f2d..17e4c2403956 100644
--- a/ports-mgmt/tinderbox-devel/Makefile
+++ b/ports-mgmt/tinderbox-devel/Makefile
@@ -5,9 +5,8 @@
 # $FreeBSD$
 
 PORTNAME=	tinderbox
-DISTVERSION=	${PORTVERSION}-${PORTREVISION}
-PORTVERSION=	2.4.2
-PORTREVISION=	2	# cvs snapshot from 2008-05-19 14:00
+#DISTVERSION=	${PORTVERSION}-${PORTREVISION}
+PORTVERSION=	2.4.3
 CATEGORIES=	ports-mgmt
 MASTER_SITES=	http://T32.TecNik93.com/FreeBSD/ports/${PORTNAME}/sources/
 DIST_SUBDIR=	tinderbox
@@ -121,6 +120,9 @@ post-patch:
 		${WRKSRC}/lib/setup-mysql.sh
 	@${RM} ${WRKSRC}/lib/setup-mysql.sh.bak
 .endif
+	@${RM} ${WRKSRC}/buildscript.orig
+	@${RM} ${WRKSRC}/www-exp/core/TinderboxDS.php.orig
+	@${RM} ${WRKSRC}/www-exp/module/moduleBuildPorts.php.orig
 
 do-install:
 	${MKDIR} ${PREFIX}/tinderbox/scripts
diff --git a/ports-mgmt/tinderbox-devel/distinfo b/ports-mgmt/tinderbox-devel/distinfo
index b1fdceea3117..b8c91d68c393 100644
--- a/ports-mgmt/tinderbox-devel/distinfo
+++ b/ports-mgmt/tinderbox-devel/distinfo
@@ -1,6 +1,6 @@
-MD5 (tinderbox/tinderbox-2.4.2-2.tar.gz) = 2d3125d1305eb06a7aaff345430dbaf6
-SHA256 (tinderbox/tinderbox-2.4.2-2.tar.gz) = 288b1cbab0b253b05ccff785605ececcf8eb2a6a5e83b0ccd4783a5b2b360358
-SIZE (tinderbox/tinderbox-2.4.2-2.tar.gz) = 140732
+MD5 (tinderbox/tinderbox-2.4.3.tar.gz) = 88f97d526b4d42dedaf5cc8c2adaab0c
+SHA256 (tinderbox/tinderbox-2.4.3.tar.gz) = 2a540b50342813dd4cf82791028878db6dba2c40af4cb7118f239f7a2286a72c
+SIZE (tinderbox/tinderbox-2.4.3.tar.gz) = 131585
 MD5 (tinderbox/favicon.ico) = 1d2e9e267ca81f0ef5bc7b9c391aaced
 SHA256 (tinderbox/favicon.ico) = 842f1e23dcfcee24d4d7578381256256cda994347751fb332b6eb2182eae216e
 SIZE (tinderbox/favicon.ico) = 4710
diff --git a/ports-mgmt/tinderbox-devel/files/patch-buildscript b/ports-mgmt/tinderbox-devel/files/patch-buildscript
new file mode 100644
index 000000000000..870b7c56e3fe
--- /dev/null
+++ b/ports-mgmt/tinderbox-devel/files/patch-buildscript
@@ -0,0 +1,27 @@
+--- ./buildscript.orig	2008-06-03 15:17:08.000000000 +0300
++++ ./buildscript	2008-06-03 15:20:37.000000000 +0300
+@@ -103,6 +103,12 @@
+ 
+ L=$(echo ${LOCALBASE} | sed 's,^/,,')
+ X=$(echo ${X11BASE} | sed 's,^/,,')
++ 
++NOD=$(echo ${NOPORTDOCS} | sed 's,^/,,')
++NOE=$(echo ${NOPORTEXAMPLES} | sed 's,^/,,')
++NPD=$(echo ${NOPORTDATA} | sed 's,^/,,')
++Z=`ident ${dir}/Makefile | grep 'FreeBSD:' | sed 's/^[ \t]*//'`
++
+ 
+ if [ $phase = 1 ]; then
+ 
+@@ -110,6 +116,11 @@
+   echo "maintained by: $(make maintainer)"
+   echo "building for:  $(uname -rm)"
+   echo "port directory: ${dir}"
++
++  echo "Makefile ident: ${Z}"
++  echo "prefixes: LOCALBASE=${L} X11BASE=${X}"
++  echo "NO* env vars: NOPORTDOCS=${NOD} NOPORTEXAMPLES=${NOE} NOPORTDATA=${NPD}"
++
+   echo "build started at $(date)"
+ 
+   echo "FETCH_DEPENDS=${FD}"
diff --git a/ports-mgmt/tinderbox-devel/files/patch-www-exp__core__TinderboxDS.php b/ports-mgmt/tinderbox-devel/files/patch-www-exp__core__TinderboxDS.php
new file mode 100644
index 000000000000..38799701d61f
--- /dev/null
+++ b/ports-mgmt/tinderbox-devel/files/patch-www-exp__core__TinderboxDS.php
@@ -0,0 +1,14 @@
+--- ./www-exp/core/TinderboxDS.php.orig	2008-06-02 07:11:02.000000000 +0300
++++ ./www-exp/core/TinderboxDS.php	2008-06-03 15:38:24.000000000 +0300
+@@ -372,6 +372,11 @@
+             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/patch-www-exp__module__moduleBuildPorts.php b/ports-mgmt/tinderbox-devel/files/patch-www-exp__module__moduleBuildPorts.php
new file mode 100644
index 000000000000..8b4d57e33f66
--- /dev/null
+++ b/ports-mgmt/tinderbox-devel/files/patch-www-exp__module__moduleBuildPorts.php
@@ -0,0 +1,11 @@
+--- ./www-exp/module/moduleBuildPorts.php.orig	2008-06-03 15:53:53.000000000 +0300
++++ ./www-exp/module/moduleBuildPorts.php	2008-06-03 15:54:42.000000000 +0300
+@@ -145,7 +145,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/pkg-message.in b/ports-mgmt/tinderbox-devel/files/pkg-message.in
index 18ae33f0698c..17a5f86b8428 100644
--- a/ports-mgmt/tinderbox-devel/files/pkg-message.in
+++ b/ports-mgmt/tinderbox-devel/files/pkg-message.in
@@ -58,14 +58,14 @@ The following walkthrough is the tinderbox environment setup:
   - Comment out the lines after "for www", and uncomment the lines "for www-exp".
 
 - Edit the file %%PREFIX%%/tinderbox/scripts/www-exp/inc_ds.php
-  (copy from inc_ds.php-dist)
+  (copy from inc_ds.php.dist)
 
   - $DB_HOST should be localhost
   - $DB_DRIVER should be pgsql
   - $DB_USER should be tinderbox
 
 - Edit the file %%PREFIX%%/tinderbox/scripts/www-exp/inc_tinderbox.php
-  (copy from inc_tinderbox.php-dist)
+  (copy from inc_tinderbox.php.dist)
 
   - $rootdir should be %%PREFIX%%/tinderbox
   - $wwwrooturi should be /tb
@@ -75,9 +75,11 @@ The following walkthrough is the tinderbox environment setup:
 The following walkthrough is the initial tinderbox population setup
 and should be executed in %%PREFIX%%/tinderbox/scripts.
 
+- ./tc init
+
 - Create a jail. A jail is a chrooted version of the FreeBSD operating
-  system, for example 6.0-RELEASE or 5.4-RELEASE:
-  ./create Jail -j 5.4 -d "FreeBSD 5.4-RELEASE" -t RELENG_5_4_0_RELEASE -u CVSUP
+  system, for example 7-STABLE or 7.0-RELEASE:
+  ./create Jail -j 7 -d "FreeBSD 7.0-RELEASE" -t RELENG_7_0_0_RELEASE -u CVSUP
   You can have multiple jails on a single machine.
   This takes a while.
 
@@ -86,7 +88,7 @@ and should be executed in %%PREFIX%%/tinderbox/scripts.
   This takes a while.
 
 - And then link the two together in a build:
-  ./create Build -b 5.4-FreeBSD -j 5.4 -p FreeBSD -d "5.4-RELEASE with FreeBSD ports tree"
+  ./create Build -b 7.0-FreeBSD -j 7 -p FreeBSD -d "7.0-RELEASE with FreeBSD ports tree"
 
 The following walkthrough is the webserver setup:
 
diff --git a/ports-mgmt/tinderbox-devel/pkg-plist b/ports-mgmt/tinderbox-devel/pkg-plist
index ed0ce52154f7..3d251a972abf 100644
--- a/ports-mgmt/tinderbox-devel/pkg-plist
+++ b/ports-mgmt/tinderbox-devel/pkg-plist
@@ -37,6 +37,7 @@ tinderbox/scripts/pnohang.c
 tinderbox/scripts/portbuild
 tinderbox/scripts/rawenv.dist
 tinderbox/scripts/setup.sh
+tinderbox/scripts/tbkill.sh
 tinderbox/scripts/tc
 tinderbox/scripts/tinderbox-mysql.schema
 tinderbox/scripts/tinderbox-pgsql.schema
diff --git a/ports-mgmt/tinderbox/Makefile b/ports-mgmt/tinderbox/Makefile
index 68e91d2a9f2d..17e4c2403956 100644
--- a/ports-mgmt/tinderbox/Makefile
+++ b/ports-mgmt/tinderbox/Makefile
@@ -5,9 +5,8 @@
 # $FreeBSD$
 
 PORTNAME=	tinderbox
-DISTVERSION=	${PORTVERSION}-${PORTREVISION}
-PORTVERSION=	2.4.2
-PORTREVISION=	2	# cvs snapshot from 2008-05-19 14:00
+#DISTVERSION=	${PORTVERSION}-${PORTREVISION}
+PORTVERSION=	2.4.3
 CATEGORIES=	ports-mgmt
 MASTER_SITES=	http://T32.TecNik93.com/FreeBSD/ports/${PORTNAME}/sources/
 DIST_SUBDIR=	tinderbox
@@ -121,6 +120,9 @@ post-patch:
 		${WRKSRC}/lib/setup-mysql.sh
 	@${RM} ${WRKSRC}/lib/setup-mysql.sh.bak
 .endif
+	@${RM} ${WRKSRC}/buildscript.orig
+	@${RM} ${WRKSRC}/www-exp/core/TinderboxDS.php.orig
+	@${RM} ${WRKSRC}/www-exp/module/moduleBuildPorts.php.orig
 
 do-install:
 	${MKDIR} ${PREFIX}/tinderbox/scripts
diff --git a/ports-mgmt/tinderbox/distinfo b/ports-mgmt/tinderbox/distinfo
index b1fdceea3117..b8c91d68c393 100644
--- a/ports-mgmt/tinderbox/distinfo
+++ b/ports-mgmt/tinderbox/distinfo
@@ -1,6 +1,6 @@
-MD5 (tinderbox/tinderbox-2.4.2-2.tar.gz) = 2d3125d1305eb06a7aaff345430dbaf6
-SHA256 (tinderbox/tinderbox-2.4.2-2.tar.gz) = 288b1cbab0b253b05ccff785605ececcf8eb2a6a5e83b0ccd4783a5b2b360358
-SIZE (tinderbox/tinderbox-2.4.2-2.tar.gz) = 140732
+MD5 (tinderbox/tinderbox-2.4.3.tar.gz) = 88f97d526b4d42dedaf5cc8c2adaab0c
+SHA256 (tinderbox/tinderbox-2.4.3.tar.gz) = 2a540b50342813dd4cf82791028878db6dba2c40af4cb7118f239f7a2286a72c
+SIZE (tinderbox/tinderbox-2.4.3.tar.gz) = 131585
 MD5 (tinderbox/favicon.ico) = 1d2e9e267ca81f0ef5bc7b9c391aaced
 SHA256 (tinderbox/favicon.ico) = 842f1e23dcfcee24d4d7578381256256cda994347751fb332b6eb2182eae216e
 SIZE (tinderbox/favicon.ico) = 4710
diff --git a/ports-mgmt/tinderbox/files/patch-buildscript b/ports-mgmt/tinderbox/files/patch-buildscript
new file mode 100644
index 000000000000..870b7c56e3fe
--- /dev/null
+++ b/ports-mgmt/tinderbox/files/patch-buildscript
@@ -0,0 +1,27 @@
+--- ./buildscript.orig	2008-06-03 15:17:08.000000000 +0300
++++ ./buildscript	2008-06-03 15:20:37.000000000 +0300
+@@ -103,6 +103,12 @@
+ 
+ L=$(echo ${LOCALBASE} | sed 's,^/,,')
+ X=$(echo ${X11BASE} | sed 's,^/,,')
++ 
++NOD=$(echo ${NOPORTDOCS} | sed 's,^/,,')
++NOE=$(echo ${NOPORTEXAMPLES} | sed 's,^/,,')
++NPD=$(echo ${NOPORTDATA} | sed 's,^/,,')
++Z=`ident ${dir}/Makefile | grep 'FreeBSD:' | sed 's/^[ \t]*//'`
++
+ 
+ if [ $phase = 1 ]; then
+ 
+@@ -110,6 +116,11 @@
+   echo "maintained by: $(make maintainer)"
+   echo "building for:  $(uname -rm)"
+   echo "port directory: ${dir}"
++
++  echo "Makefile ident: ${Z}"
++  echo "prefixes: LOCALBASE=${L} X11BASE=${X}"
++  echo "NO* env vars: NOPORTDOCS=${NOD} NOPORTEXAMPLES=${NOE} NOPORTDATA=${NPD}"
++
+   echo "build started at $(date)"
+ 
+   echo "FETCH_DEPENDS=${FD}"
diff --git a/ports-mgmt/tinderbox/files/patch-www-exp__core__TinderboxDS.php b/ports-mgmt/tinderbox/files/patch-www-exp__core__TinderboxDS.php
new file mode 100644
index 000000000000..38799701d61f
--- /dev/null
+++ b/ports-mgmt/tinderbox/files/patch-www-exp__core__TinderboxDS.php
@@ -0,0 +1,14 @@
+--- ./www-exp/core/TinderboxDS.php.orig	2008-06-02 07:11:02.000000000 +0300
++++ ./www-exp/core/TinderboxDS.php	2008-06-03 15:38:24.000000000 +0300
+@@ -372,6 +372,11 @@
+             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/patch-www-exp__module__moduleBuildPorts.php b/ports-mgmt/tinderbox/files/patch-www-exp__module__moduleBuildPorts.php
new file mode 100644
index 000000000000..8b4d57e33f66
--- /dev/null
+++ b/ports-mgmt/tinderbox/files/patch-www-exp__module__moduleBuildPorts.php
@@ -0,0 +1,11 @@
+--- ./www-exp/module/moduleBuildPorts.php.orig	2008-06-03 15:53:53.000000000 +0300
++++ ./www-exp/module/moduleBuildPorts.php	2008-06-03 15:54:42.000000000 +0300
+@@ -145,7 +145,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/pkg-message.in b/ports-mgmt/tinderbox/files/pkg-message.in
index 18ae33f0698c..17a5f86b8428 100644
--- a/ports-mgmt/tinderbox/files/pkg-message.in
+++ b/ports-mgmt/tinderbox/files/pkg-message.in
@@ -58,14 +58,14 @@ The following walkthrough is the tinderbox environment setup:
   - Comment out the lines after "for www", and uncomment the lines "for www-exp".
 
 - Edit the file %%PREFIX%%/tinderbox/scripts/www-exp/inc_ds.php
-  (copy from inc_ds.php-dist)
+  (copy from inc_ds.php.dist)
 
   - $DB_HOST should be localhost
   - $DB_DRIVER should be pgsql
   - $DB_USER should be tinderbox
 
 - Edit the file %%PREFIX%%/tinderbox/scripts/www-exp/inc_tinderbox.php
-  (copy from inc_tinderbox.php-dist)
+  (copy from inc_tinderbox.php.dist)
 
   - $rootdir should be %%PREFIX%%/tinderbox
   - $wwwrooturi should be /tb
@@ -75,9 +75,11 @@ The following walkthrough is the tinderbox environment setup:
 The following walkthrough is the initial tinderbox population setup
 and should be executed in %%PREFIX%%/tinderbox/scripts.
 
+- ./tc init
+
 - Create a jail. A jail is a chrooted version of the FreeBSD operating
-  system, for example 6.0-RELEASE or 5.4-RELEASE:
-  ./create Jail -j 5.4 -d "FreeBSD 5.4-RELEASE" -t RELENG_5_4_0_RELEASE -u CVSUP
+  system, for example 7-STABLE or 7.0-RELEASE:
+  ./create Jail -j 7 -d "FreeBSD 7.0-RELEASE" -t RELENG_7_0_0_RELEASE -u CVSUP
   You can have multiple jails on a single machine.
   This takes a while.
 
@@ -86,7 +88,7 @@ and should be executed in %%PREFIX%%/tinderbox/scripts.
   This takes a while.
 
 - And then link the two together in a build:
-  ./create Build -b 5.4-FreeBSD -j 5.4 -p FreeBSD -d "5.4-RELEASE with FreeBSD ports tree"
+  ./create Build -b 7.0-FreeBSD -j 7 -p FreeBSD -d "7.0-RELEASE with FreeBSD ports tree"
 
 The following walkthrough is the webserver setup:
 
diff --git a/ports-mgmt/tinderbox/pkg-plist b/ports-mgmt/tinderbox/pkg-plist
index ed0ce52154f7..3d251a972abf 100644
--- a/ports-mgmt/tinderbox/pkg-plist
+++ b/ports-mgmt/tinderbox/pkg-plist
@@ -37,6 +37,7 @@ tinderbox/scripts/pnohang.c
 tinderbox/scripts/portbuild
 tinderbox/scripts/rawenv.dist
 tinderbox/scripts/setup.sh
+tinderbox/scripts/tbkill.sh
 tinderbox/scripts/tc
 tinderbox/scripts/tinderbox-mysql.schema
 tinderbox/scripts/tinderbox-pgsql.schema