5 files changed, 17 insertions, 30 deletions

diff --git a/ports-mgmt/tinderbox/Makefile b/ports-mgmt/tinderbox/Makefile
index d09c0d4b09a7..b23605b71e39 100644
--- a/ports-mgmt/tinderbox/Makefile
+++ b/ports-mgmt/tinderbox/Makefile
@@ -5,8 +5,7 @@
 # $FreeBSD$
 
 PORTNAME=	tinderbox
-PORTVERSION=	3.2
-PORTREVISION=	1
+PORTVERSION=	3.3
 CATEGORIES=	ports-mgmt
 MASTER_SITES=	http://tinderbox.marcuscom.com/ \
 		http://T32.TecNik93.com/FreeBSD/ports/${PORTNAME}/sources/
@@ -42,7 +41,6 @@ IGNORE=	is useless without a database. Please (re)run 'make config' and choose o
 .endif
 
 .if defined(WITH_WEBUI)
-RUN_DEPENDS+=	${LOCALBASE}/share/pear/DB.php:${PORTSDIR}/databases/pear-DB
 WANT_PHP_WEB=	yes
 USE_PHP=	session
 PLIST_SUB+=	WEBUI=""
@@ -53,6 +51,7 @@ PLIST_SUB+=	WEBUI="@comment "
 .if defined(WITH_PGSQL)
 USE_PGSQL=	yes
 .if defined(WITH_WEBUI)
+RUN_DEPENDS+=	${LOCALBASE}/share/pear/MDB2/Driver/pgsql.php:${PORTSDIR}/databases/pear-MDB2_Driver_pgsql
 USE_PHP+=	pgsql
 .endif
 RUN_DEPENDS+=	${SITE_PERL}/${PERL_ARCH}/DBD/Pg.pm:${PORTSDIR}/databases/p5-DBD-Pg
@@ -60,6 +59,7 @@ RUN_DEPENDS+=	${SITE_PERL}/${PERL_ARCH}/DBD/Pg.pm:${PORTSDIR}/databases/p5-DBD-P
 
 .if !defined(WITHOUT_MYSQL)
 .if defined(WITH_WEBUI)
+RUN_DEPENDS+=	${LOCALBASE}/share/pear/MDB2/Driver/mysql.php:${PORTSDIR}/databases/pear-MDB2_Driver_mysql
 USE_PHP+=	mysql
 .endif
 USE_MYSQL=	yes
diff --git a/ports-mgmt/tinderbox/distinfo b/ports-mgmt/tinderbox/distinfo
index d984ad89c88f..6e155f05b829 100644
--- a/ports-mgmt/tinderbox/distinfo
+++ b/ports-mgmt/tinderbox/distinfo
@@ -1,3 +1,3 @@
-MD5 (tinderbox/tinderbox-3.2.tar.gz) = 3a964f2d919d0d8c3e81d8d8ee35e903
-SHA256 (tinderbox/tinderbox-3.2.tar.gz) = 47101dc078751867c9d9dfe9da4d471bc10755dad9d539ecaad066c12a039b22
-SIZE (tinderbox/tinderbox-3.2.tar.gz) = 128293
+MD5 (tinderbox/tinderbox-3.3.tar.gz) = e4cabaa46918aba3121f0d91e4b54c9f
+SHA256 (tinderbox/tinderbox-3.3.tar.gz) = 403ddecb04b901bc2e59943d185cfab8878cba592e6458ce2402984347380475
+SIZE (tinderbox/tinderbox-3.3.tar.gz) = 132918
diff --git a/ports-mgmt/tinderbox/files/patch-tc_command.sh b/ports-mgmt/tinderbox/files/patch-tc_command.sh
deleted file mode 100644
index f488f28668ab..000000000000
--- a/ports-mgmt/tinderbox/files/patch-tc_command.sh
+++ /dev/null
@@ -1,11 +0,0 @@
---- lib/tc_command.sh_ori	2009-09-17 15:36:34.000000000 +0200
-+++ lib/tc_command.sh	2009-09-17 15:36:40.000000000 +0200
-@@ -1649,7 +1649,7 @@
-     # Set up the chrooted environment
-     osmajor=$(echo ${jail} | sed -E -e 's|(^[[:digit:]]+).*$|\1|')
-     case ${osmajor} in
--    6|7|8)	tinderbuild_setup;;
-+    6|7|8|9)	tinderbuild_setup;;
-     *)		echo "tinderbuild: unhandled OS version: ${osmajor}"
- 		tinderbuild_cleanup 1
- 		;;
diff --git a/ports-mgmt/tinderbox/files/patch-tinderbox.env b/ports-mgmt/tinderbox/files/patch-tinderbox.env
deleted file mode 100644
index 06a3a118ded0..000000000000
--- a/ports-mgmt/tinderbox/files/patch-tinderbox.env
+++ /dev/null
@@ -1,13 +0,0 @@
---- lib/tinderbox.env.orig	2009-09-17 15:35:00.000000000 +0200
-+++ lib/tinderbox.env	2009-09-17 15:37:07.000000000 +0200
-@@ -17,6 +17,10 @@
- #8PKGZIPCMD=bzip2
- #8INDEXFILE=INDEX-8
- #8X_WINDOW_SYSTEM=xorg
-+#9PKGSUFFIX=.tbz
-+#9PKGZIPCMD=bzip2
-+#9INDEXFILE=INDEX-9
-+#9X_WINDOW_SYSTEM=xorg
- #
- LOCALBASE=/usr/local
- X11BASE=/usr/local
diff --git a/ports-mgmt/tinderbox/pkg-plist b/ports-mgmt/tinderbox/pkg-plist
index 22923929878f..472d969ae331 100644
--- a/ports-mgmt/tinderbox/pkg-plist
+++ b/ports-mgmt/tinderbox/pkg-plist
@@ -2,6 +2,11 @@ etc/rc.d/tinderbox
 tinderbox/scripts/.version
 tinderbox/scripts/README
 tinderbox/scripts/ds.ph.dist
+tinderbox/scripts/contrib/hooks/make-jobs-safe/README.txt
+tinderbox/scripts/contrib/hooks/make-jobs-safe/make-jobs-safe.sh
+tinderbox/scripts/contrib/hooks/kse-fix/libmap.conf
+tinderbox/scripts/contrib/hooks/kse-fix/README.txt
+tinderbox/scripts/contrib/hooks/kse-fix/kse-fix.sh
 tinderbox/scripts/etc/env/.keep_me
 tinderbox/scripts/etc/rc.d/tinderd
 tinderbox/scripts/lib/Tinderbox/Build.pm
@@ -52,6 +57,8 @@ tinderbox/scripts/upgrade/mig_mysql_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.0_to_3.1.sql
 tinderbox/scripts/upgrade/mig_pgsql_tinderbox-3.1_to_3.2.sql
+tinderbox/scripts/upgrade/mig_pgsql_tinderbox-3.2_to_3.2.1.sql
+tinderbox/scripts/upgrade/mig_mysql_tinderbox-3.2_to_3.2.1.sql
 tinderbox/scripts/upgrade/order.lst
 tinderbox/scripts/upgrade/user_permissions.map
 %%WEBUI%%tinderbox/scripts/webui/core/Build.php
@@ -137,5 +144,9 @@ tinderbox/scripts/upgrade/user_permissions.map
 @dirrm tinderbox/scripts/etc/rc.d
 @dirrm tinderbox/scripts/etc/env
 @dirrm tinderbox/scripts/etc
+@dirrm tinderbox/scripts/contrib/hooks/kse-fix
+@dirrm tinderbox/scripts/contrib/hooks/make-jobs-safe
+@dirrm tinderbox/scripts/contrib/hooks
+@dirrm tinderbox/scripts/contrib
 @dirrm tinderbox/scripts
 @dirrmtry tinderbox