6 files changed, 282 insertions, 174 deletions

diff --git a/misc/tinderbox/Makefile b/misc/tinderbox/Makefile
index 87f3c8ab4388..8c462e91f57b 100644
--- a/misc/tinderbox/Makefile
+++ b/misc/tinderbox/Makefile
@@ -6,18 +6,19 @@
 
 PORTNAME=	tinderbox
 PORTVERSION=	2.3.4
+PORTREVISION=	1
 CATEGORIES=	misc
 MASTER_SITES=	http://tinderbox.marcuscom.com/
 
 MAINTAINER=	itetcu@FreeBSD.org
 COMMENT=	Port build tinderbox system
 
-RUN_DEPENDS=	${LOCALBASE}/share/pear/DB.php:${PORTSDIR}/databases/pear-DB
-
 OPTIONS=	PGSQL "With pgsql" Off \
 		MYSQL "With mysql" On \
 		CSUP  "Use csup for updates" On \
 		CVSUP "Use cvsup for updates" Off \
+		WEB   "Install web interface" Off \
+		WEB_EXP "Install the new web interface" On \
 		APACHE "Use Apache for web interface" On \
 		LIGHTTPD "Use LightHTTPD for web interface" Off
 
@@ -34,17 +35,36 @@ MAN1=		tc-configCcache.1 tc-configDistfile.1 tc-configGet.1 \
 IGNORE=	is useless without a database. Please (re)run 'make config' and choose one of PGSQL and MYSQL
 .endif
 
+.if defined(WITH_WEB) || !defined(WITHOUT_WEB_EXP)
+RUN_DEPENDS+=	${LOCALBASE}/share/pear/DB.php:${PORTSDIR}/databases/pear-DB
 WANT_PHP_WEB=	yes
 USE_PHP=	session
+.endif
+
+.if defined(WITH_WEB)
+PLIST_SUB+=	WEB=""
+.else
+PLIST_SUB+=	WEB="@comment "
+.endif
+
+.if !defined(WITHOUT_WEB_EXP)
+PLIST_SUB+=	WEB_EXP=""
+.else
+PLIST_SUB+=	WEB_EXP="@comment "
+.endif
 
 .if defined(WITH_PGSQL)
 USE_PGSQL=	yes
+.if defined(WITH_WEB) || !defined(WITHOUT_WEB_EXP)
 USE_PHP+=	pgsql
+.endif
 RUN_DEPENDS+=	${SITE_PERL}/${PERL_ARCH}/DBD/Pg.pm:${PORTSDIR}/databases/p5-DBD-Pg
 .endif
 
 .if !defined(WITHOUT_MYSQL)
+.if defined(WITH_WEB) || !defined(WITHOUT_WEB_EXP)
 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//}
@@ -60,15 +80,21 @@ RUN_DEPENDS+=	csup:${PORTSDIR}/net/csup
 RUN_DEPENDS+=	cvsup:${PORTSDIR}/net/cvsup-without-gui
 .endif
 
-.if !defined(WITHOUT_APACHE)
+.if !defined(WITHOUT_APACHE) && (defined(WITH_WEB) || !defined(WITHOUT_WEB_EXP))
 USE_APACHE=	1.3+
-.elif defined(WITH_LIGHTTPD)
+.elif defined(WITH_LIGHTTPD) && (defined(WITH_WEB) || !defined(WITHOUT_WEB_EXP))
 RUN_DEPENDS+=	lighttpd:${PORTSDIR}/www/lighttpd
 .endif
 
+.if defined(WITH_WEB) || !defined(WITHOUT_WEB_EXP)
 .include "${PORTSDIR}/Mk/bsd.php.mk"
+.endif
 
-#post-extract:
+pre-everything::
+.if (!defined(WITHOUT_APACHE) || defined(WITH_LIGHTTPD)) && !(defined(WITH_WEB) || !defined(WITHOUT_WEB_EXP))
+	@${ECHO_CMD} "It doesn't make sense to depend on Apache or LightHTTPD if not using either web interface."
+	@${FALSE}
+.endif
 
 post-patch:
 .if defined(WITH_MYSQL)
@@ -81,6 +107,16 @@ post-patch:
 do-install:
 	${MKDIR} ${PREFIX}/tinderbox/scripts
 	${CP} -R ${WRKSRC}/* ${PREFIX}/tinderbox/scripts
+.if !defined(WITH_WEB) || !defined(WITHOUT_WEB_EXP)
+	@${ECHO_CMD} "Removing web interface componenets ..."
+	@${RM} -R ${PREFIX}/tinderbox/scripts/www
+	@${ECHO_CMD} "Done."
+.endif
+.if defined(WITHOUT_WEB_EXP)
+	@${ECHO_CMD} "Removing web interface componenets ..."
+	@${RM} -R ${PREFIX}/tinderbox/scripts/www-exp
+	@${ECHO_CMD} "Done."
+.endif
 
 post-install:
 	cd ${WRKSRC}/man/man1 && ${INSTALL_MAN} ${MAN1} ${MAN1PREFIX}/man/man1
diff --git a/misc/tinderbox/pkg-plist b/misc/tinderbox/pkg-plist
index 7c5eec8c2614..fe178712e26c 100644
--- a/misc/tinderbox/pkg-plist
+++ b/misc/tinderbox/pkg-plist
@@ -55,59 +55,59 @@ tinderbox/scripts/upgrade/mig_pgsql_tinderbox-2.2.0_to_2.3.0.sql
 tinderbox/scripts/upgrade/mig_pgsql_tinderbox-2.3.0_to_2.3.1.sql
 tinderbox/scripts/upgrade/mig_pgsql_tinderbox-2.3.1_to_2.3.2.sql
 tinderbox/scripts/upgrade/mig_shlib.sh
-tinderbox/scripts/www-exp/core/Build.php
-tinderbox/scripts/www-exp/core/BuildPortsQueue.php
-tinderbox/scripts/www-exp/core/Host.php
-tinderbox/scripts/www-exp/core/Jail.php
-tinderbox/scripts/www-exp/core/Port.php
-tinderbox/scripts/www-exp/core/PortFailReason.php
-tinderbox/scripts/www-exp/core/PortsTree.php
-tinderbox/scripts/www-exp/core/TinderObject.php
-tinderbox/scripts/www-exp/core/TinderboxDS.php
-tinderbox/scripts/www-exp/core/User.php
-tinderbox/scripts/www-exp/core/functions.php
-tinderbox/scripts/www-exp/inc_ds.php.dist
-tinderbox/scripts/www-exp/inc_tinderbox.php.dist
-tinderbox/scripts/www-exp/index.php
-tinderbox/scripts/www-exp/module/module.php
-tinderbox/scripts/www-exp/module/moduleBuildPorts.php
-tinderbox/scripts/www-exp/module/moduleBuilds.php
-tinderbox/scripts/www-exp/module/moduleHosts.php
-tinderbox/scripts/www-exp/module/modulePortFailureReasons.php
-tinderbox/scripts/www-exp/module/modulePorts.php
-tinderbox/scripts/www-exp/module/moduleSession.php
-tinderbox/scripts/www-exp/module/moduleTinderd.php
-tinderbox/scripts/www-exp/module/moduleUsers.php
-tinderbox/scripts/www-exp/templates/default/current_buildports.tpl
-tinderbox/scripts/www-exp/templates/default/describe_port.tpl
-tinderbox/scripts/www-exp/templates/default/display_login.tpl
-tinderbox/scripts/www-exp/templates/default/failed_buildports.tpl
-tinderbox/scripts/www-exp/templates/default/latest_buildports.tpl
-tinderbox/scripts/www-exp/templates/default/list_buildports.tpl
-tinderbox/scripts/www-exp/templates/default/list_builds.tpl
-tinderbox/scripts/www-exp/templates/default/list_failure_reasons.tpl
-tinderbox/scripts/www-exp/templates/default/list_tinderd_queue.tpl
-tinderbox/scripts/www-exp/templates/default/messages.inc
-tinderbox/scripts/www-exp/templates/default/please_login.tpl
-tinderbox/scripts/www-exp/templates/default/tinderstyle.css
-tinderbox/scripts/www-exp/templates/default/user_admin.tpl
-tinderbox/scripts/www-exp/templates/default/user_permissions.tpl
-tinderbox/scripts/www-exp/templates/default/user_properties.tpl
-tinderbox/scripts/www/Build.php
-tinderbox/scripts/www/Jail.php
-tinderbox/scripts/www/Makefile
-tinderbox/scripts/www/Port.php
-tinderbox/scripts/www/PortsTree.php
-tinderbox/scripts/www/TinderObject.php
-tinderbox/scripts/www/TinderboxDS.php
-tinderbox/scripts/www/failures.php
-tinderbox/scripts/www/inc_ds.php.dist
-tinderbox/scripts/www/inc_tinderbox.php.dist
-tinderbox/scripts/www/index.php
-tinderbox/scripts/www/lastbuilds.php
-tinderbox/scripts/www/showbuild.php
-tinderbox/scripts/www/showport.php
-tinderbox/scripts/www/tinderstyle.css
+%%WEB_EXP%%tinderbox/scripts/www-exp/core/Build.php
+%%WEB_EXP%%tinderbox/scripts/www-exp/core/BuildPortsQueue.php
+%%WEB_EXP%%tinderbox/scripts/www-exp/core/Host.php
+%%WEB_EXP%%tinderbox/scripts/www-exp/core/Jail.php
+%%WEB_EXP%%tinderbox/scripts/www-exp/core/Port.php
+%%WEB_EXP%%tinderbox/scripts/www-exp/core/PortFailReason.php
+%%WEB_EXP%%tinderbox/scripts/www-exp/core/PortsTree.php
+%%WEB_EXP%%tinderbox/scripts/www-exp/core/TinderObject.php
+%%WEB_EXP%%tinderbox/scripts/www-exp/core/TinderboxDS.php
+%%WEB_EXP%%tinderbox/scripts/www-exp/core/User.php
+%%WEB_EXP%%tinderbox/scripts/www-exp/core/functions.php
+%%WEB_EXP%%tinderbox/scripts/www-exp/inc_ds.php.dist
+%%WEB_EXP%%tinderbox/scripts/www-exp/inc_tinderbox.php.dist
+%%WEB_EXP%%tinderbox/scripts/www-exp/index.php
+%%WEB_EXP%%tinderbox/scripts/www-exp/module/module.php
+%%WEB_EXP%%tinderbox/scripts/www-exp/module/moduleBuildPorts.php
+%%WEB_EXP%%tinderbox/scripts/www-exp/module/moduleBuilds.php
+%%WEB_EXP%%tinderbox/scripts/www-exp/module/moduleHosts.php
+%%WEB_EXP%%tinderbox/scripts/www-exp/module/modulePortFailureReasons.php
+%%WEB_EXP%%tinderbox/scripts/www-exp/module/modulePorts.php
+%%WEB_EXP%%tinderbox/scripts/www-exp/module/moduleSession.php
+%%WEB_EXP%%tinderbox/scripts/www-exp/module/moduleTinderd.php
+%%WEB_EXP%%tinderbox/scripts/www-exp/module/moduleUsers.php
+%%WEB_EXP%%tinderbox/scripts/www-exp/templates/default/current_buildports.tpl
+%%WEB_EXP%%tinderbox/scripts/www-exp/templates/default/describe_port.tpl
+%%WEB_EXP%%tinderbox/scripts/www-exp/templates/default/display_login.tpl
+%%WEB_EXP%%tinderbox/scripts/www-exp/templates/default/failed_buildports.tpl
+%%WEB_EXP%%tinderbox/scripts/www-exp/templates/default/latest_buildports.tpl
+%%WEB_EXP%%tinderbox/scripts/www-exp/templates/default/list_buildports.tpl
+%%WEB_EXP%%tinderbox/scripts/www-exp/templates/default/list_builds.tpl
+%%WEB_EXP%%tinderbox/scripts/www-exp/templates/default/list_failure_reasons.tpl
+%%WEB_EXP%%tinderbox/scripts/www-exp/templates/default/list_tinderd_queue.tpl
+%%WEB_EXP%%tinderbox/scripts/www-exp/templates/default/messages.inc
+%%WEB_EXP%%tinderbox/scripts/www-exp/templates/default/please_login.tpl
+%%WEB_EXP%%tinderbox/scripts/www-exp/templates/default/tinderstyle.css
+%%WEB_EXP%%tinderbox/scripts/www-exp/templates/default/user_admin.tpl
+%%WEB_EXP%%tinderbox/scripts/www-exp/templates/default/user_permissions.tpl
+%%WEB_EXP%%tinderbox/scripts/www-exp/templates/default/user_properties.tpl
+%%WEB%%tinderbox/scripts/www/Build.php
+%%WEB%%tinderbox/scripts/www/Jail.php
+%%WEB%%tinderbox/scripts/www/Makefile
+%%WEB%%tinderbox/scripts/www/Port.php
+%%WEB%%tinderbox/scripts/www/PortsTree.php
+%%WEB%%tinderbox/scripts/www/TinderObject.php
+%%WEB%%tinderbox/scripts/www/TinderboxDS.php
+%%WEB%%tinderbox/scripts/www/failures.php
+%%WEB%%tinderbox/scripts/www/inc_ds.php.dist
+%%WEB%%tinderbox/scripts/www/inc_tinderbox.php.dist
+%%WEB%%tinderbox/scripts/www/index.php
+%%WEB%%tinderbox/scripts/www/lastbuilds.php
+%%WEB%%tinderbox/scripts/www/showbuild.php
+%%WEB%%tinderbox/scripts/www/showport.php
+%%WEB%%tinderbox/scripts/www/tinderstyle.css
 
 @dirrm tinderbox/scripts/www-exp/templates/default
 @dirrm tinderbox/scripts/www-exp/templates
diff --git a/ports-mgmt/tinderbox-devel/Makefile b/ports-mgmt/tinderbox-devel/Makefile
index 87f3c8ab4388..8c462e91f57b 100644
--- a/ports-mgmt/tinderbox-devel/Makefile
+++ b/ports-mgmt/tinderbox-devel/Makefile
@@ -6,18 +6,19 @@
 
 PORTNAME=	tinderbox
 PORTVERSION=	2.3.4
+PORTREVISION=	1
 CATEGORIES=	misc
 MASTER_SITES=	http://tinderbox.marcuscom.com/
 
 MAINTAINER=	itetcu@FreeBSD.org
 COMMENT=	Port build tinderbox system
 
-RUN_DEPENDS=	${LOCALBASE}/share/pear/DB.php:${PORTSDIR}/databases/pear-DB
-
 OPTIONS=	PGSQL "With pgsql" Off \
 		MYSQL "With mysql" On \
 		CSUP  "Use csup for updates" On \
 		CVSUP "Use cvsup for updates" Off \
+		WEB   "Install web interface" Off \
+		WEB_EXP "Install the new web interface" On \
 		APACHE "Use Apache for web interface" On \
 		LIGHTTPD "Use LightHTTPD for web interface" Off
 
@@ -34,17 +35,36 @@ MAN1=		tc-configCcache.1 tc-configDistfile.1 tc-configGet.1 \
 IGNORE=	is useless without a database. Please (re)run 'make config' and choose one of PGSQL and MYSQL
 .endif
 
+.if defined(WITH_WEB) || !defined(WITHOUT_WEB_EXP)
+RUN_DEPENDS+=	${LOCALBASE}/share/pear/DB.php:${PORTSDIR}/databases/pear-DB
 WANT_PHP_WEB=	yes
 USE_PHP=	session
+.endif
+
+.if defined(WITH_WEB)
+PLIST_SUB+=	WEB=""
+.else
+PLIST_SUB+=	WEB="@comment "
+.endif
+
+.if !defined(WITHOUT_WEB_EXP)
+PLIST_SUB+=	WEB_EXP=""
+.else
+PLIST_SUB+=	WEB_EXP="@comment "
+.endif
 
 .if defined(WITH_PGSQL)
 USE_PGSQL=	yes
+.if defined(WITH_WEB) || !defined(WITHOUT_WEB_EXP)
 USE_PHP+=	pgsql
+.endif
 RUN_DEPENDS+=	${SITE_PERL}/${PERL_ARCH}/DBD/Pg.pm:${PORTSDIR}/databases/p5-DBD-Pg
 .endif
 
 .if !defined(WITHOUT_MYSQL)
+.if defined(WITH_WEB) || !defined(WITHOUT_WEB_EXP)
 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//}
@@ -60,15 +80,21 @@ RUN_DEPENDS+=	csup:${PORTSDIR}/net/csup
 RUN_DEPENDS+=	cvsup:${PORTSDIR}/net/cvsup-without-gui
 .endif
 
-.if !defined(WITHOUT_APACHE)
+.if !defined(WITHOUT_APACHE) && (defined(WITH_WEB) || !defined(WITHOUT_WEB_EXP))
 USE_APACHE=	1.3+
-.elif defined(WITH_LIGHTTPD)
+.elif defined(WITH_LIGHTTPD) && (defined(WITH_WEB) || !defined(WITHOUT_WEB_EXP))
 RUN_DEPENDS+=	lighttpd:${PORTSDIR}/www/lighttpd
 .endif
 
+.if defined(WITH_WEB) || !defined(WITHOUT_WEB_EXP)
 .include "${PORTSDIR}/Mk/bsd.php.mk"
+.endif
 
-#post-extract:
+pre-everything::
+.if (!defined(WITHOUT_APACHE) || defined(WITH_LIGHTTPD)) && !(defined(WITH_WEB) || !defined(WITHOUT_WEB_EXP))
+	@${ECHO_CMD} "It doesn't make sense to depend on Apache or LightHTTPD if not using either web interface."
+	@${FALSE}
+.endif
 
 post-patch:
 .if defined(WITH_MYSQL)
@@ -81,6 +107,16 @@ post-patch:
 do-install:
 	${MKDIR} ${PREFIX}/tinderbox/scripts
 	${CP} -R ${WRKSRC}/* ${PREFIX}/tinderbox/scripts
+.if !defined(WITH_WEB) || !defined(WITHOUT_WEB_EXP)
+	@${ECHO_CMD} "Removing web interface componenets ..."
+	@${RM} -R ${PREFIX}/tinderbox/scripts/www
+	@${ECHO_CMD} "Done."
+.endif
+.if defined(WITHOUT_WEB_EXP)
+	@${ECHO_CMD} "Removing web interface componenets ..."
+	@${RM} -R ${PREFIX}/tinderbox/scripts/www-exp
+	@${ECHO_CMD} "Done."
+.endif
 
 post-install:
 	cd ${WRKSRC}/man/man1 && ${INSTALL_MAN} ${MAN1} ${MAN1PREFIX}/man/man1
diff --git a/ports-mgmt/tinderbox-devel/pkg-plist b/ports-mgmt/tinderbox-devel/pkg-plist
index 7c5eec8c2614..fe178712e26c 100644
--- a/ports-mgmt/tinderbox-devel/pkg-plist
+++ b/ports-mgmt/tinderbox-devel/pkg-plist
@@ -55,59 +55,59 @@ tinderbox/scripts/upgrade/mig_pgsql_tinderbox-2.2.0_to_2.3.0.sql
 tinderbox/scripts/upgrade/mig_pgsql_tinderbox-2.3.0_to_2.3.1.sql
 tinderbox/scripts/upgrade/mig_pgsql_tinderbox-2.3.1_to_2.3.2.sql
 tinderbox/scripts/upgrade/mig_shlib.sh
-tinderbox/scripts/www-exp/core/Build.php
-tinderbox/scripts/www-exp/core/BuildPortsQueue.php
-tinderbox/scripts/www-exp/core/Host.php
-tinderbox/scripts/www-exp/core/Jail.php
-tinderbox/scripts/www-exp/core/Port.php
-tinderbox/scripts/www-exp/core/PortFailReason.php
-tinderbox/scripts/www-exp/core/PortsTree.php
-tinderbox/scripts/www-exp/core/TinderObject.php
-tinderbox/scripts/www-exp/core/TinderboxDS.php
-tinderbox/scripts/www-exp/core/User.php
-tinderbox/scripts/www-exp/core/functions.php
-tinderbox/scripts/www-exp/inc_ds.php.dist
-tinderbox/scripts/www-exp/inc_tinderbox.php.dist
-tinderbox/scripts/www-exp/index.php
-tinderbox/scripts/www-exp/module/module.php
-tinderbox/scripts/www-exp/module/moduleBuildPorts.php
-tinderbox/scripts/www-exp/module/moduleBuilds.php
-tinderbox/scripts/www-exp/module/moduleHosts.php
-tinderbox/scripts/www-exp/module/modulePortFailureReasons.php
-tinderbox/scripts/www-exp/module/modulePorts.php
-tinderbox/scripts/www-exp/module/moduleSession.php
-tinderbox/scripts/www-exp/module/moduleTinderd.php
-tinderbox/scripts/www-exp/module/moduleUsers.php
-tinderbox/scripts/www-exp/templates/default/current_buildports.tpl
-tinderbox/scripts/www-exp/templates/default/describe_port.tpl
-tinderbox/scripts/www-exp/templates/default/display_login.tpl
-tinderbox/scripts/www-exp/templates/default/failed_buildports.tpl
-tinderbox/scripts/www-exp/templates/default/latest_buildports.tpl
-tinderbox/scripts/www-exp/templates/default/list_buildports.tpl
-tinderbox/scripts/www-exp/templates/default/list_builds.tpl
-tinderbox/scripts/www-exp/templates/default/list_failure_reasons.tpl
-tinderbox/scripts/www-exp/templates/default/list_tinderd_queue.tpl
-tinderbox/scripts/www-exp/templates/default/messages.inc
-tinderbox/scripts/www-exp/templates/default/please_login.tpl
-tinderbox/scripts/www-exp/templates/default/tinderstyle.css
-tinderbox/scripts/www-exp/templates/default/user_admin.tpl
-tinderbox/scripts/www-exp/templates/default/user_permissions.tpl
-tinderbox/scripts/www-exp/templates/default/user_properties.tpl
-tinderbox/scripts/www/Build.php
-tinderbox/scripts/www/Jail.php
-tinderbox/scripts/www/Makefile
-tinderbox/scripts/www/Port.php
-tinderbox/scripts/www/PortsTree.php
-tinderbox/scripts/www/TinderObject.php
-tinderbox/scripts/www/TinderboxDS.php
-tinderbox/scripts/www/failures.php
-tinderbox/scripts/www/inc_ds.php.dist
-tinderbox/scripts/www/inc_tinderbox.php.dist
-tinderbox/scripts/www/index.php
-tinderbox/scripts/www/lastbuilds.php
-tinderbox/scripts/www/showbuild.php
-tinderbox/scripts/www/showport.php
-tinderbox/scripts/www/tinderstyle.css
+%%WEB_EXP%%tinderbox/scripts/www-exp/core/Build.php
+%%WEB_EXP%%tinderbox/scripts/www-exp/core/BuildPortsQueue.php
+%%WEB_EXP%%tinderbox/scripts/www-exp/core/Host.php
+%%WEB_EXP%%tinderbox/scripts/www-exp/core/Jail.php
+%%WEB_EXP%%tinderbox/scripts/www-exp/core/Port.php
+%%WEB_EXP%%tinderbox/scripts/www-exp/core/PortFailReason.php
+%%WEB_EXP%%tinderbox/scripts/www-exp/core/PortsTree.php
+%%WEB_EXP%%tinderbox/scripts/www-exp/core/TinderObject.php
+%%WEB_EXP%%tinderbox/scripts/www-exp/core/TinderboxDS.php
+%%WEB_EXP%%tinderbox/scripts/www-exp/core/User.php
+%%WEB_EXP%%tinderbox/scripts/www-exp/core/functions.php
+%%WEB_EXP%%tinderbox/scripts/www-exp/inc_ds.php.dist
+%%WEB_EXP%%tinderbox/scripts/www-exp/inc_tinderbox.php.dist
+%%WEB_EXP%%tinderbox/scripts/www-exp/index.php
+%%WEB_EXP%%tinderbox/scripts/www-exp/module/module.php
+%%WEB_EXP%%tinderbox/scripts/www-exp/module/moduleBuildPorts.php
+%%WEB_EXP%%tinderbox/scripts/www-exp/module/moduleBuilds.php
+%%WEB_EXP%%tinderbox/scripts/www-exp/module/moduleHosts.php
+%%WEB_EXP%%tinderbox/scripts/www-exp/module/modulePortFailureReasons.php
+%%WEB_EXP%%tinderbox/scripts/www-exp/module/modulePorts.php
+%%WEB_EXP%%tinderbox/scripts/www-exp/module/moduleSession.php
+%%WEB_EXP%%tinderbox/scripts/www-exp/module/moduleTinderd.php
+%%WEB_EXP%%tinderbox/scripts/www-exp/module/moduleUsers.php
+%%WEB_EXP%%tinderbox/scripts/www-exp/templates/default/current_buildports.tpl
+%%WEB_EXP%%tinderbox/scripts/www-exp/templates/default/describe_port.tpl
+%%WEB_EXP%%tinderbox/scripts/www-exp/templates/default/display_login.tpl
+%%WEB_EXP%%tinderbox/scripts/www-exp/templates/default/failed_buildports.tpl
+%%WEB_EXP%%tinderbox/scripts/www-exp/templates/default/latest_buildports.tpl
+%%WEB_EXP%%tinderbox/scripts/www-exp/templates/default/list_buildports.tpl
+%%WEB_EXP%%tinderbox/scripts/www-exp/templates/default/list_builds.tpl
+%%WEB_EXP%%tinderbox/scripts/www-exp/templates/default/list_failure_reasons.tpl
+%%WEB_EXP%%tinderbox/scripts/www-exp/templates/default/list_tinderd_queue.tpl
+%%WEB_EXP%%tinderbox/scripts/www-exp/templates/default/messages.inc
+%%WEB_EXP%%tinderbox/scripts/www-exp/templates/default/please_login.tpl
+%%WEB_EXP%%tinderbox/scripts/www-exp/templates/default/tinderstyle.css
+%%WEB_EXP%%tinderbox/scripts/www-exp/templates/default/user_admin.tpl
+%%WEB_EXP%%tinderbox/scripts/www-exp/templates/default/user_permissions.tpl
+%%WEB_EXP%%tinderbox/scripts/www-exp/templates/default/user_properties.tpl
+%%WEB%%tinderbox/scripts/www/Build.php
+%%WEB%%tinderbox/scripts/www/Jail.php
+%%WEB%%tinderbox/scripts/www/Makefile
+%%WEB%%tinderbox/scripts/www/Port.php
+%%WEB%%tinderbox/scripts/www/PortsTree.php
+%%WEB%%tinderbox/scripts/www/TinderObject.php
+%%WEB%%tinderbox/scripts/www/TinderboxDS.php
+%%WEB%%tinderbox/scripts/www/failures.php
+%%WEB%%tinderbox/scripts/www/inc_ds.php.dist
+%%WEB%%tinderbox/scripts/www/inc_tinderbox.php.dist
+%%WEB%%tinderbox/scripts/www/index.php
+%%WEB%%tinderbox/scripts/www/lastbuilds.php
+%%WEB%%tinderbox/scripts/www/showbuild.php
+%%WEB%%tinderbox/scripts/www/showport.php
+%%WEB%%tinderbox/scripts/www/tinderstyle.css
 
 @dirrm tinderbox/scripts/www-exp/templates/default
 @dirrm tinderbox/scripts/www-exp/templates
diff --git a/ports-mgmt/tinderbox/Makefile b/ports-mgmt/tinderbox/Makefile
index 87f3c8ab4388..8c462e91f57b 100644
--- a/ports-mgmt/tinderbox/Makefile
+++ b/ports-mgmt/tinderbox/Makefile
@@ -6,18 +6,19 @@
 
 PORTNAME=	tinderbox
 PORTVERSION=	2.3.4
+PORTREVISION=	1
 CATEGORIES=	misc
 MASTER_SITES=	http://tinderbox.marcuscom.com/
 
 MAINTAINER=	itetcu@FreeBSD.org
 COMMENT=	Port build tinderbox system
 
-RUN_DEPENDS=	${LOCALBASE}/share/pear/DB.php:${PORTSDIR}/databases/pear-DB
-
 OPTIONS=	PGSQL "With pgsql" Off \
 		MYSQL "With mysql" On \
 		CSUP  "Use csup for updates" On \
 		CVSUP "Use cvsup for updates" Off \
+		WEB   "Install web interface" Off \
+		WEB_EXP "Install the new web interface" On \
 		APACHE "Use Apache for web interface" On \
 		LIGHTTPD "Use LightHTTPD for web interface" Off
 
@@ -34,17 +35,36 @@ MAN1=		tc-configCcache.1 tc-configDistfile.1 tc-configGet.1 \
 IGNORE=	is useless without a database. Please (re)run 'make config' and choose one of PGSQL and MYSQL
 .endif
 
+.if defined(WITH_WEB) || !defined(WITHOUT_WEB_EXP)
+RUN_DEPENDS+=	${LOCALBASE}/share/pear/DB.php:${PORTSDIR}/databases/pear-DB
 WANT_PHP_WEB=	yes
 USE_PHP=	session
+.endif
+
+.if defined(WITH_WEB)
+PLIST_SUB+=	WEB=""
+.else
+PLIST_SUB+=	WEB="@comment "
+.endif
+
+.if !defined(WITHOUT_WEB_EXP)
+PLIST_SUB+=	WEB_EXP=""
+.else
+PLIST_SUB+=	WEB_EXP="@comment "
+.endif
 
 .if defined(WITH_PGSQL)
 USE_PGSQL=	yes
+.if defined(WITH_WEB) || !defined(WITHOUT_WEB_EXP)
 USE_PHP+=	pgsql
+.endif
 RUN_DEPENDS+=	${SITE_PERL}/${PERL_ARCH}/DBD/Pg.pm:${PORTSDIR}/databases/p5-DBD-Pg
 .endif
 
 .if !defined(WITHOUT_MYSQL)
+.if defined(WITH_WEB) || !defined(WITHOUT_WEB_EXP)
 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//}
@@ -60,15 +80,21 @@ RUN_DEPENDS+=	csup:${PORTSDIR}/net/csup
 RUN_DEPENDS+=	cvsup:${PORTSDIR}/net/cvsup-without-gui
 .endif
 
-.if !defined(WITHOUT_APACHE)
+.if !defined(WITHOUT_APACHE) && (defined(WITH_WEB) || !defined(WITHOUT_WEB_EXP))
 USE_APACHE=	1.3+
-.elif defined(WITH_LIGHTTPD)
+.elif defined(WITH_LIGHTTPD) && (defined(WITH_WEB) || !defined(WITHOUT_WEB_EXP))
 RUN_DEPENDS+=	lighttpd:${PORTSDIR}/www/lighttpd
 .endif
 
+.if defined(WITH_WEB) || !defined(WITHOUT_WEB_EXP)
 .include "${PORTSDIR}/Mk/bsd.php.mk"
+.endif
 
-#post-extract:
+pre-everything::
+.if (!defined(WITHOUT_APACHE) || defined(WITH_LIGHTTPD)) && !(defined(WITH_WEB) || !defined(WITHOUT_WEB_EXP))
+	@${ECHO_CMD} "It doesn't make sense to depend on Apache or LightHTTPD if not using either web interface."
+	@${FALSE}
+.endif
 
 post-patch:
 .if defined(WITH_MYSQL)
@@ -81,6 +107,16 @@ post-patch:
 do-install:
 	${MKDIR} ${PREFIX}/tinderbox/scripts
 	${CP} -R ${WRKSRC}/* ${PREFIX}/tinderbox/scripts
+.if !defined(WITH_WEB) || !defined(WITHOUT_WEB_EXP)
+	@${ECHO_CMD} "Removing web interface componenets ..."
+	@${RM} -R ${PREFIX}/tinderbox/scripts/www
+	@${ECHO_CMD} "Done."
+.endif
+.if defined(WITHOUT_WEB_EXP)
+	@${ECHO_CMD} "Removing web interface componenets ..."
+	@${RM} -R ${PREFIX}/tinderbox/scripts/www-exp
+	@${ECHO_CMD} "Done."
+.endif
 
 post-install:
 	cd ${WRKSRC}/man/man1 && ${INSTALL_MAN} ${MAN1} ${MAN1PREFIX}/man/man1
diff --git a/ports-mgmt/tinderbox/pkg-plist b/ports-mgmt/tinderbox/pkg-plist
index 7c5eec8c2614..fe178712e26c 100644
--- a/ports-mgmt/tinderbox/pkg-plist
+++ b/ports-mgmt/tinderbox/pkg-plist
@@ -55,59 +55,59 @@ tinderbox/scripts/upgrade/mig_pgsql_tinderbox-2.2.0_to_2.3.0.sql
 tinderbox/scripts/upgrade/mig_pgsql_tinderbox-2.3.0_to_2.3.1.sql
 tinderbox/scripts/upgrade/mig_pgsql_tinderbox-2.3.1_to_2.3.2.sql
 tinderbox/scripts/upgrade/mig_shlib.sh
-tinderbox/scripts/www-exp/core/Build.php
-tinderbox/scripts/www-exp/core/BuildPortsQueue.php
-tinderbox/scripts/www-exp/core/Host.php
-tinderbox/scripts/www-exp/core/Jail.php
-tinderbox/scripts/www-exp/core/Port.php
-tinderbox/scripts/www-exp/core/PortFailReason.php
-tinderbox/scripts/www-exp/core/PortsTree.php
-tinderbox/scripts/www-exp/core/TinderObject.php
-tinderbox/scripts/www-exp/core/TinderboxDS.php
-tinderbox/scripts/www-exp/core/User.php
-tinderbox/scripts/www-exp/core/functions.php
-tinderbox/scripts/www-exp/inc_ds.php.dist
-tinderbox/scripts/www-exp/inc_tinderbox.php.dist
-tinderbox/scripts/www-exp/index.php
-tinderbox/scripts/www-exp/module/module.php
-tinderbox/scripts/www-exp/module/moduleBuildPorts.php
-tinderbox/scripts/www-exp/module/moduleBuilds.php
-tinderbox/scripts/www-exp/module/moduleHosts.php
-tinderbox/scripts/www-exp/module/modulePortFailureReasons.php
-tinderbox/scripts/www-exp/module/modulePorts.php
-tinderbox/scripts/www-exp/module/moduleSession.php
-tinderbox/scripts/www-exp/module/moduleTinderd.php
-tinderbox/scripts/www-exp/module/moduleUsers.php
-tinderbox/scripts/www-exp/templates/default/current_buildports.tpl
-tinderbox/scripts/www-exp/templates/default/describe_port.tpl
-tinderbox/scripts/www-exp/templates/default/display_login.tpl
-tinderbox/scripts/www-exp/templates/default/failed_buildports.tpl
-tinderbox/scripts/www-exp/templates/default/latest_buildports.tpl
-tinderbox/scripts/www-exp/templates/default/list_buildports.tpl
-tinderbox/scripts/www-exp/templates/default/list_builds.tpl
-tinderbox/scripts/www-exp/templates/default/list_failure_reasons.tpl
-tinderbox/scripts/www-exp/templates/default/list_tinderd_queue.tpl
-tinderbox/scripts/www-exp/templates/default/messages.inc
-tinderbox/scripts/www-exp/templates/default/please_login.tpl
-tinderbox/scripts/www-exp/templates/default/tinderstyle.css
-tinderbox/scripts/www-exp/templates/default/user_admin.tpl
-tinderbox/scripts/www-exp/templates/default/user_permissions.tpl
-tinderbox/scripts/www-exp/templates/default/user_properties.tpl
-tinderbox/scripts/www/Build.php
-tinderbox/scripts/www/Jail.php
-tinderbox/scripts/www/Makefile
-tinderbox/scripts/www/Port.php
-tinderbox/scripts/www/PortsTree.php
-tinderbox/scripts/www/TinderObject.php
-tinderbox/scripts/www/TinderboxDS.php
-tinderbox/scripts/www/failures.php
-tinderbox/scripts/www/inc_ds.php.dist
-tinderbox/scripts/www/inc_tinderbox.php.dist
-tinderbox/scripts/www/index.php
-tinderbox/scripts/www/lastbuilds.php
-tinderbox/scripts/www/showbuild.php
-tinderbox/scripts/www/showport.php
-tinderbox/scripts/www/tinderstyle.css
+%%WEB_EXP%%tinderbox/scripts/www-exp/core/Build.php
+%%WEB_EXP%%tinderbox/scripts/www-exp/core/BuildPortsQueue.php
+%%WEB_EXP%%tinderbox/scripts/www-exp/core/Host.php
+%%WEB_EXP%%tinderbox/scripts/www-exp/core/Jail.php
+%%WEB_EXP%%tinderbox/scripts/www-exp/core/Port.php
+%%WEB_EXP%%tinderbox/scripts/www-exp/core/PortFailReason.php
+%%WEB_EXP%%tinderbox/scripts/www-exp/core/PortsTree.php
+%%WEB_EXP%%tinderbox/scripts/www-exp/core/TinderObject.php
+%%WEB_EXP%%tinderbox/scripts/www-exp/core/TinderboxDS.php
+%%WEB_EXP%%tinderbox/scripts/www-exp/core/User.php
+%%WEB_EXP%%tinderbox/scripts/www-exp/core/functions.php
+%%WEB_EXP%%tinderbox/scripts/www-exp/inc_ds.php.dist
+%%WEB_EXP%%tinderbox/scripts/www-exp/inc_tinderbox.php.dist
+%%WEB_EXP%%tinderbox/scripts/www-exp/index.php
+%%WEB_EXP%%tinderbox/scripts/www-exp/module/module.php
+%%WEB_EXP%%tinderbox/scripts/www-exp/module/moduleBuildPorts.php
+%%WEB_EXP%%tinderbox/scripts/www-exp/module/moduleBuilds.php
+%%WEB_EXP%%tinderbox/scripts/www-exp/module/moduleHosts.php
+%%WEB_EXP%%tinderbox/scripts/www-exp/module/modulePortFailureReasons.php
+%%WEB_EXP%%tinderbox/scripts/www-exp/module/modulePorts.php
+%%WEB_EXP%%tinderbox/scripts/www-exp/module/moduleSession.php
+%%WEB_EXP%%tinderbox/scripts/www-exp/module/moduleTinderd.php
+%%WEB_EXP%%tinderbox/scripts/www-exp/module/moduleUsers.php
+%%WEB_EXP%%tinderbox/scripts/www-exp/templates/default/current_buildports.tpl
+%%WEB_EXP%%tinderbox/scripts/www-exp/templates/default/describe_port.tpl
+%%WEB_EXP%%tinderbox/scripts/www-exp/templates/default/display_login.tpl
+%%WEB_EXP%%tinderbox/scripts/www-exp/templates/default/failed_buildports.tpl
+%%WEB_EXP%%tinderbox/scripts/www-exp/templates/default/latest_buildports.tpl
+%%WEB_EXP%%tinderbox/scripts/www-exp/templates/default/list_buildports.tpl
+%%WEB_EXP%%tinderbox/scripts/www-exp/templates/default/list_builds.tpl
+%%WEB_EXP%%tinderbox/scripts/www-exp/templates/default/list_failure_reasons.tpl
+%%WEB_EXP%%tinderbox/scripts/www-exp/templates/default/list_tinderd_queue.tpl
+%%WEB_EXP%%tinderbox/scripts/www-exp/templates/default/messages.inc
+%%WEB_EXP%%tinderbox/scripts/www-exp/templates/default/please_login.tpl
+%%WEB_EXP%%tinderbox/scripts/www-exp/templates/default/tinderstyle.css
+%%WEB_EXP%%tinderbox/scripts/www-exp/templates/default/user_admin.tpl
+%%WEB_EXP%%tinderbox/scripts/www-exp/templates/default/user_permissions.tpl
+%%WEB_EXP%%tinderbox/scripts/www-exp/templates/default/user_properties.tpl
+%%WEB%%tinderbox/scripts/www/Build.php
+%%WEB%%tinderbox/scripts/www/Jail.php
+%%WEB%%tinderbox/scripts/www/Makefile
+%%WEB%%tinderbox/scripts/www/Port.php
+%%WEB%%tinderbox/scripts/www/PortsTree.php
+%%WEB%%tinderbox/scripts/www/TinderObject.php
+%%WEB%%tinderbox/scripts/www/TinderboxDS.php
+%%WEB%%tinderbox/scripts/www/failures.php
+%%WEB%%tinderbox/scripts/www/inc_ds.php.dist
+%%WEB%%tinderbox/scripts/www/inc_tinderbox.php.dist
+%%WEB%%tinderbox/scripts/www/index.php
+%%WEB%%tinderbox/scripts/www/lastbuilds.php
+%%WEB%%tinderbox/scripts/www/showbuild.php
+%%WEB%%tinderbox/scripts/www/showport.php
+%%WEB%%tinderbox/scripts/www/tinderstyle.css
 
 @dirrm tinderbox/scripts/www-exp/templates/default
 @dirrm tinderbox/scripts/www-exp/templates