Update to 3.2 release. This release offers no changes over Release Candidate 3.

Here is a summary of changes from Tinderbox 3.1.2 to 3.2:
* A new tc function, ``tbversion'' has been added to print the version
of Tinderbox.  This command relies on a ${pb}/.version file which is
generated when the Tinderbox release distribution is created.  Be sure
to copy this file if you copy the contents of the Tinderbox release to
another location.
* Log file markup support has been added.  Log files can be viewed with
certain patterns colorized to make them easier to spot (e.g. GCC
warnings).  Currently, the list of patterns is not easily changeable,
but a facility to add new patterns is forthcoming.
* A new tc function, ``copyBuild'' has been added which allows one to
copy attributes (e.g. env files, ports, packages, etc.) from one Build
to another.
* Quiet tinderd if a port in the queue does not exist.
* The log file header lines in port build logs have been reordered for
easier (human) reading.  If this changes causes too much consternation
for existing scripts, it can be reverted.
* Fix a bug with Postgres in that psql wants to output space-delimited
results by default, and this can mess up upgrades.
* A -u argument has been added to ``addBuildPortsQueueEntry'' so that a
username can be set for a queue entry.
* The ``addBuildPortsQueueEntry'' command now looks up users by both
name and ID.  This fixes a bug where tinderd doesn't send Build
completion mail.
* The error spit out by ``listBuildPortsQueue'' when the queue is empty
has been removed.
* Two new inc_tinderbox config variables have been added:
reload_interval_latest and reload_interval_current which allow one to
set the reload interval for the ``Current and Latest Builds'' page while
no port is building and while a port is building respectively.
* Some additional error checking has been added to the webui.
* A search interface has been added for searching for ports in the
webui.
* Canonical PHP tags are now used instead of short tags.  This makes it
easier to deploy Tinderbox in various configurations.
* The tinderd queue view has been changed.  The field for adding new
ports is now first.
* A favicon.ico file is now shipped for the webui.
* Some other bugs have been fixed in the webui.
* The ``tbversion'' command usage has been added.
* An bug in the log file parsing code which could result in fetch
failure false positives has been fixed.
* The search interface has been added to the top of the homepage.
* The Delete buttons have been moved to the top of the page.
* Some migration issues have been fixed.

The contributors to Tinderbox 3.2's development and testing are Beat
Gätzi, Martin Wilke, Matt, Ion-Mihai Tetcu, Frank Wall, Boris
Samorodov, Cory R. King, and Aron Schlesinger.

Add conflicts with ports-mgmt/tinderbox.

MFC after:	3 days

2 files changed, 6 insertions, 4 deletions

diff --git a/ports-mgmt/tinderbox-devel/Makefile b/ports-mgmt/tinderbox-devel/Makefile
index 0dcc8884267..64bc3e49723 100644
--- a/ports-mgmt/tinderbox-devel/Makefile
+++ b/ports-mgmt/tinderbox-devel/Makefile
@@ -5,7 +5,7 @@
 # $FreeBSD$
 
 PORTNAME=	tinderbox
-PORTVERSION=	3.2.r3
+PORTVERSION=	3.2
 CATEGORIES=	ports-mgmt
 MASTER_SITES=	http://tinderbox.marcuscom.com/ \
 		http://T32.TecNik93.com/FreeBSD/ports/${PORTNAME}/sources/
@@ -15,6 +15,8 @@ DIST_SUBDIR=	${PORTNAME}
 MAINTAINER=	itetcu@FreeBSD.org
 COMMENT=	Port build tinderbox system, devel version
 
+CONFLICTS=	tinderbox-[0-9]*
+
 OPTIONS=	PGSQL "With pgsql" Off \
 		MYSQL "With mysql" On \
 		CSUP  "Use csup for updates" On \
diff --git a/ports-mgmt/tinderbox-devel/distinfo b/ports-mgmt/tinderbox-devel/distinfo
index 34b983260d3..d984ad89c88 100644
--- a/ports-mgmt/tinderbox-devel/distinfo
+++ b/ports-mgmt/tinderbox-devel/distinfo
@@ -1,3 +1,3 @@
-MD5 (tinderbox/tinderbox-3.2.r3.tar.gz) = b7b6742574e08715802686cc8fb4dcf6
-SHA256 (tinderbox/tinderbox-3.2.r3.tar.gz) = df650edf27c5db9e7ca91339d501a9a3f1e79aebdc9383a550c2f22b6ba9d6eb
-SIZE (tinderbox/tinderbox-3.2.r3.tar.gz) = 128279
+MD5 (tinderbox/tinderbox-3.2.tar.gz) = 3a964f2d919d0d8c3e81d8d8ee35e903
+SHA256 (tinderbox/tinderbox-3.2.tar.gz) = 47101dc078751867c9d9dfe9da4d471bc10755dad9d539ecaad066c12a039b22
+SIZE (tinderbox/tinderbox-3.2.tar.gz) = 128293