diff --git a/misc/tinderbox/Makefile b/misc/tinderbox/Makefile
index 8c462e91f57b..7cb1b7aebebe 100644
--- a/misc/tinderbox/Makefile
+++ b/misc/tinderbox/Makefile
@@ -6,7 +6,7 @@
 
 PORTNAME=	tinderbox
 PORTVERSION=	2.3.4
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	misc
 MASTER_SITES=	http://tinderbox.marcuscom.com/
 
@@ -103,20 +103,27 @@ post-patch:
 		${WRKSRC}/lib/setup-mysql.sh
 	@${RM} ${WRKSRC}/lib/setup-mysql.sh.bak
 .endif
+.if ! (${OSVERSION} > 700014 || ( ${OSVERSION} >= 601101 && ${OSVERSION} < 700000 ))
+	${REINPLACE_CMD} -E -e 's!/usr/bin/csup!${PREFIX}/bin/csup!' \
+		${WRKSRC}/create
+	${REINPLACE_CMD} -E -e 's!/usr/bin/csup!${PREFIX}/bin/csup!' \
+		${WRKSRC}/tc
+	@${RM} ${WRKSRC}/create.bak
+	@${RM} ${WRKSRC}/tc.bak
+.endif
+
+pre-install:
+.if !defined(WITH_WEB)
+	${RM} -R ${WRKSRC}/www
+.endif
+.if defined(WITHOUT_WEB_EXP)
+        ${RM} -R ${WRKSRC}/www-exp
+.endif
+
 
 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 fe178712e26c..fae32460582b 100644
--- a/misc/tinderbox/pkg-plist
+++ b/misc/tinderbox/pkg-plist
@@ -109,11 +109,11 @@ tinderbox/scripts/upgrade/mig_shlib.sh
 %%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
-@dirrm tinderbox/scripts/www-exp/module
-@dirrm tinderbox/scripts/www-exp/core
-@dirrm tinderbox/scripts/www
+%%WEB_EXP%%@dirrm tinderbox/scripts/www-exp/templates/default
+%%WEB_EXP%%@dirrm tinderbox/scripts/www-exp/templates
+%%WEB_EXP%%@dirrm tinderbox/scripts/www-exp/module
+%%WEB_EXP%%@dirrm tinderbox/scripts/www-exp/core
+%%WEB%%@dirrm tinderbox/scripts/www
 @dirrm tinderbox/scripts/upgrade
 @dirrm tinderbox/scripts/man/man1
 @dirrm tinderbox/scripts/man
diff --git a/ports-mgmt/tinderbox-devel/Makefile b/ports-mgmt/tinderbox-devel/Makefile
index 8c462e91f57b..7cb1b7aebebe 100644
--- a/ports-mgmt/tinderbox-devel/Makefile
+++ b/ports-mgmt/tinderbox-devel/Makefile
@@ -6,7 +6,7 @@
 
 PORTNAME=	tinderbox
 PORTVERSION=	2.3.4
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	misc
 MASTER_SITES=	http://tinderbox.marcuscom.com/
 
@@ -103,20 +103,27 @@ post-patch:
 		${WRKSRC}/lib/setup-mysql.sh
 	@${RM} ${WRKSRC}/lib/setup-mysql.sh.bak
 .endif
+.if ! (${OSVERSION} > 700014 || ( ${OSVERSION} >= 601101 && ${OSVERSION} < 700000 ))
+	${REINPLACE_CMD} -E -e 's!/usr/bin/csup!${PREFIX}/bin/csup!' \
+		${WRKSRC}/create
+	${REINPLACE_CMD} -E -e 's!/usr/bin/csup!${PREFIX}/bin/csup!' \
+		${WRKSRC}/tc
+	@${RM} ${WRKSRC}/create.bak
+	@${RM} ${WRKSRC}/tc.bak
+.endif
+
+pre-install:
+.if !defined(WITH_WEB)
+	${RM} -R ${WRKSRC}/www
+.endif
+.if defined(WITHOUT_WEB_EXP)
+        ${RM} -R ${WRKSRC}/www-exp
+.endif
+
 
 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 fe178712e26c..fae32460582b 100644
--- a/ports-mgmt/tinderbox-devel/pkg-plist
+++ b/ports-mgmt/tinderbox-devel/pkg-plist
@@ -109,11 +109,11 @@ tinderbox/scripts/upgrade/mig_shlib.sh
 %%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
-@dirrm tinderbox/scripts/www-exp/module
-@dirrm tinderbox/scripts/www-exp/core
-@dirrm tinderbox/scripts/www
+%%WEB_EXP%%@dirrm tinderbox/scripts/www-exp/templates/default
+%%WEB_EXP%%@dirrm tinderbox/scripts/www-exp/templates
+%%WEB_EXP%%@dirrm tinderbox/scripts/www-exp/module
+%%WEB_EXP%%@dirrm tinderbox/scripts/www-exp/core
+%%WEB%%@dirrm tinderbox/scripts/www
 @dirrm tinderbox/scripts/upgrade
 @dirrm tinderbox/scripts/man/man1
 @dirrm tinderbox/scripts/man
diff --git a/ports-mgmt/tinderbox/Makefile b/ports-mgmt/tinderbox/Makefile
index 8c462e91f57b..7cb1b7aebebe 100644
--- a/ports-mgmt/tinderbox/Makefile
+++ b/ports-mgmt/tinderbox/Makefile
@@ -6,7 +6,7 @@
 
 PORTNAME=	tinderbox
 PORTVERSION=	2.3.4
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	misc
 MASTER_SITES=	http://tinderbox.marcuscom.com/
 
@@ -103,20 +103,27 @@ post-patch:
 		${WRKSRC}/lib/setup-mysql.sh
 	@${RM} ${WRKSRC}/lib/setup-mysql.sh.bak
 .endif
+.if ! (${OSVERSION} > 700014 || ( ${OSVERSION} >= 601101 && ${OSVERSION} < 700000 ))
+	${REINPLACE_CMD} -E -e 's!/usr/bin/csup!${PREFIX}/bin/csup!' \
+		${WRKSRC}/create
+	${REINPLACE_CMD} -E -e 's!/usr/bin/csup!${PREFIX}/bin/csup!' \
+		${WRKSRC}/tc
+	@${RM} ${WRKSRC}/create.bak
+	@${RM} ${WRKSRC}/tc.bak
+.endif
+
+pre-install:
+.if !defined(WITH_WEB)
+	${RM} -R ${WRKSRC}/www
+.endif
+.if defined(WITHOUT_WEB_EXP)
+        ${RM} -R ${WRKSRC}/www-exp
+.endif
+
 
 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 fe178712e26c..fae32460582b 100644
--- a/ports-mgmt/tinderbox/pkg-plist
+++ b/ports-mgmt/tinderbox/pkg-plist
@@ -109,11 +109,11 @@ tinderbox/scripts/upgrade/mig_shlib.sh
 %%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
-@dirrm tinderbox/scripts/www-exp/module
-@dirrm tinderbox/scripts/www-exp/core
-@dirrm tinderbox/scripts/www
+%%WEB_EXP%%@dirrm tinderbox/scripts/www-exp/templates/default
+%%WEB_EXP%%@dirrm tinderbox/scripts/www-exp/templates
+%%WEB_EXP%%@dirrm tinderbox/scripts/www-exp/module
+%%WEB_EXP%%@dirrm tinderbox/scripts/www-exp/core
+%%WEB%%@dirrm tinderbox/scripts/www
 @dirrm tinderbox/scripts/upgrade
 @dirrm tinderbox/scripts/man/man1
 @dirrm tinderbox/scripts/man