Update to 3.4RC2.

Note: this release contains schema/DB changes.  Be sure to run the upgrade
procedure to properly incorporate the new changes.  There will be at least one
other DB change before 3.4 release, too.

3 files changed, 25 insertions, 17 deletions

diff --git a/ports-mgmt/tinderbox-devel/Makefile b/ports-mgmt/tinderbox-devel/Makefile
index 06a2d78175ef..50ead0d39231 100644
--- a/ports-mgmt/tinderbox-devel/Makefile
+++ b/ports-mgmt/tinderbox-devel/Makefile
@@ -5,10 +5,10 @@
 # $FreeBSD$
 
 PORTNAME=	tinderbox
-DISTVERSION=	3.4-${SNAP}
-PORTREVISION=	1
+DISTVERSION=	3.4${SNAP}
 CATEGORIES=	ports-mgmt
-MASTER_SITES=	http://T32.TecNik93.com/FreeBSD/ports/${PORTNAME}/sources/
+MASTER_SITES=	http://tinderbox.marcuscom.com/ \
+		http://T32.TecNik93.com/FreeBSD/ports/${PORTNAME}/sources/
 PKGNAMESUFFIX=	-devel
 DIST_SUBDIR=	${PORTNAME}
 
@@ -19,7 +19,6 @@ CONFLICTS=	tinderbox-[0-9]*
 
 OPTIONS=	PGSQL "With pgsql" Off \
 		MYSQL "With mysql" On \
-		CVSUP "Use cvsup for updates" Off \
 		WEBUI   "Install web interface" On \
 		APACHE "Use Apache for web interface" On \
 		HIAWATHA "Use Hiawatha for web interface" Off \
@@ -35,7 +34,8 @@ NO_BUILD=	yes
 WANT_PERL=	yes
 SUB_FILES=	pkg-message
 
-SNAP=		20110101 # 22:28:07 UTC
+SNAP=		.r2
+#SNAP=		-20110101 # 22:28:07 UTC
 
 MAN1=		tc-configCcache.1 tc-configDistfile.1 tc-configGet.1 \
 		tc-configJail.1 tc-configTinderd.1 tc-init.1
@@ -69,12 +69,7 @@ RUN_DEPENDS+=	${LOCALBASE}/share/pear/MDB2/Driver/mysql.php:${PORTSDIR}/database
 USE_PHP+=	mysql
 .endif
 USE_MYSQL=	yes
-IGNORE_WITH_MYSQL=	323 40
-RUN_DEPENDS+=	${SITE_PERL}/${PERL_ARCH}/DBD/mysql.pm:${PORTSDIR}/databases/p5-DBD-mysql${MYSQL_VER:S/323//}
-.endif
-
-.if defined(WITH_CVSUP)
-RUN_DEPENDS+=	cvsup:${PORTSDIR}/net/cvsup-without-gui
+RUN_DEPENDS+=	${SITE_PERL}/${PERL_ARCH}/DBD/mysql.pm:${PORTSDIR}/databases/p5-DBD-mysql${MYSQL_VER}
 .endif
 
 .if !defined(WITHOUT_APACHE) && defined(WITH_WEBUI)
diff --git a/ports-mgmt/tinderbox-devel/distinfo b/ports-mgmt/tinderbox-devel/distinfo
index e8564c4205c4..d9f89cebd3a8 100644
--- a/ports-mgmt/tinderbox-devel/distinfo
+++ b/ports-mgmt/tinderbox-devel/distinfo
@@ -1,2 +1,2 @@
-SHA256 (tinderbox/tinderbox-3.4-20110101.tar.gz) = 49e871f3c8de108891036156dc7d8d4fb2104c00fb3bba0a3f644853f73ab0c8
-SIZE (tinderbox/tinderbox-3.4-20110101.tar.gz) = 140469
+SHA256 (tinderbox/tinderbox-3.4.r2.tar.gz) = 53bde7a964f14c786cb5fefd8f3d369d63429537b3461415cedaf4320c4dfe0f
+SIZE (tinderbox/tinderbox-3.4.r2.tar.gz) = 146093
diff --git a/ports-mgmt/tinderbox-devel/pkg-plist b/ports-mgmt/tinderbox-devel/pkg-plist
index 668d0b7bbf3f..dc115056823d 100644
--- a/ports-mgmt/tinderbox-devel/pkg-plist
+++ b/ports-mgmt/tinderbox-devel/pkg-plist
@@ -1,5 +1,4 @@
 etc/rc.d/tinderbox
-tinderbox/scripts/Makefile
 tinderbox/scripts/README
 tinderbox/scripts/contrib/hooks/compress_wrkdir/README.txt
 tinderbox/scripts/contrib/hooks/compress_wrkdir/compress_wrkdir.sh
@@ -8,6 +7,8 @@ tinderbox/scripts/contrib/hooks/kse-fix/kse-fix.sh
 tinderbox/scripts/contrib/hooks/kse-fix/libmap.conf
 tinderbox/scripts/contrib/hooks/make-jobs-safe/README.txt
 tinderbox/scripts/contrib/hooks/make-jobs-safe/make-jobs-safe.sh
+tinderbox/scripts/contrib/hooks/mass-build-pgsql/mass-build-pgsql.sh
+tinderbox/scripts/contrib/hooks/mass-build-pgsql/README.txt
 tinderbox/scripts/ds.ph.dist
 tinderbox/scripts/etc/env/.keep_me
 tinderbox/scripts/etc/rc.d/tinderd
@@ -49,14 +50,26 @@ tinderbox/scripts/sql/values.pfr
 tinderbox/scripts/tc
 tinderbox/scripts/tinderbox.ph.dist
 tinderbox/scripts/tinderd
-tinderbox/scripts/tools/genpat.pl
-tinderbox/scripts/upgrade/.keep_me
 tinderbox/scripts/upgrade/build_ports.map
 tinderbox/scripts/upgrade/build_ports_queue.map
 tinderbox/scripts/upgrade/builds.map
 tinderbox/scripts/upgrade/config.map
 tinderbox/scripts/upgrade/hooks.map
 tinderbox/scripts/upgrade/jails.map
+tinderbox/scripts/upgrade/mig_pgsql_tinderbox-3.2.4_to_3.2.5.sql
+tinderbox/scripts/upgrade/mig_mysql_tinderbox-3.0_to_3.1.sql
+tinderbox/scripts/upgrade/mig_pgsql_tinderbox-3.0_to_3.1.sql
+tinderbox/scripts/upgrade/mig_mysql_tinderbox-3.1_to_3.2.sql
+tinderbox/scripts/upgrade/mig_pgsql_tinderbox-3.1_to_3.2.sql
+tinderbox/scripts/upgrade/mig_mysql_tinderbox-3.2_to_3.2.1.sql
+tinderbox/scripts/upgrade/mig_pgsql_tinderbox-3.2_to_3.2.1.sql
+tinderbox/scripts/upgrade/mig_mysql_tinderbox-3.2.1_to_3.2.2.sql
+tinderbox/scripts/upgrade/mig_pgsql_tinderbox-3.2.1_to_3.2.2.sql
+tinderbox/scripts/upgrade/mig_mysql_tinderbox-3.2.2_to_3.2.3.sql
+tinderbox/scripts/upgrade/mig_pgsql_tinderbox-3.2.2_to_3.2.3.sql
+tinderbox/scripts/upgrade/mig_mysql_tinderbox-3.2.3_to_3.2.4.sql
+tinderbox/scripts/upgrade/mig_pgsql_tinderbox-3.2.3_to_3.2.4.sql
+tinderbox/scripts/upgrade/mig_mysql_tinderbox-3.2.4_to_3.2.5.sql
 tinderbox/scripts/upgrade/order.lst
 tinderbox/scripts/upgrade/user_permissions.map
 %%WEBUI%%tinderbox/scripts/webui/.cvsignore
@@ -141,13 +154,13 @@ tinderbox/scripts/upgrade/user_permissions.map
 %%WEBUI%%@dirrm tinderbox/scripts/webui/core
 %%WEBUI%%@dirrmtry tinderbox/scripts/webui
 @dirrm tinderbox/scripts/upgrade
-@dirrm tinderbox/scripts/tools
 @dirrm tinderbox/scripts/sql
 @dirrm tinderbox/scripts/lib/Tinderbox
 @dirrm tinderbox/scripts/lib
 @dirrm tinderbox/scripts/etc/rc.d
 @dirrm tinderbox/scripts/etc/env
 @dirrm tinderbox/scripts/etc
+@dirrm tinderbox/scripts/contrib/hooks/mass-build-pgsql
 @dirrm tinderbox/scripts/contrib/hooks/make-jobs-safe
 @dirrm tinderbox/scripts/contrib/hooks/kse-fix
 @dirrm tinderbox/scripts/contrib/hooks/compress_wrkdir