6 files changed, 10 insertions, 0 deletions

diff --git a/ports-mgmt/tinderbox-devel/Makefile b/ports-mgmt/tinderbox-devel/Makefile
index 17e4c2403956..34db3f5f9b02 100644
--- a/ports-mgmt/tinderbox-devel/Makefile
+++ b/ports-mgmt/tinderbox-devel/Makefile
@@ -53,6 +53,9 @@ PLIST_SUB+=	WEB="@comment "
 .endif
 
 .if !defined(WITHOUT_WEB_EXP)
+EXTRA_PATCHES+=	${FILESDIR}/extra-patch-www-exp__core__TinderboxDS.php \
+		${FILESDIR}/extra-patch-www-exp__module__moduleBuildPorts.php
+
 PLIST_SUB+=	WEB_EXP=""
 .else
 PLIST_SUB+=	WEB_EXP="@comment "
@@ -121,8 +124,10 @@ post-patch:
 	@${RM} ${WRKSRC}/lib/setup-mysql.sh.bak
 .endif
 	@${RM} ${WRKSRC}/buildscript.orig
+.if defined(WITH_WEB_EXP)
 	@${RM} ${WRKSRC}/www-exp/core/TinderboxDS.php.orig
 	@${RM} ${WRKSRC}/www-exp/module/moduleBuildPorts.php.orig
+.endif
 
 do-install:
 	${MKDIR} ${PREFIX}/tinderbox/scripts
diff --git a/ports-mgmt/tinderbox-devel/files/patch-www-exp__core__TinderboxDS.php b/ports-mgmt/tinderbox-devel/files/extra-patch-www-exp__core__TinderboxDS.php
index 38799701d61f..38799701d61f 100644
--- a/ports-mgmt/tinderbox-devel/files/patch-www-exp__core__TinderboxDS.php
+++ b/ports-mgmt/tinderbox-devel/files/extra-patch-www-exp__core__TinderboxDS.php
diff --git a/ports-mgmt/tinderbox-devel/files/patch-www-exp__module__moduleBuildPorts.php b/ports-mgmt/tinderbox-devel/files/extra-patch-www-exp__module__moduleBuildPorts.php
index 8b4d57e33f66..8b4d57e33f66 100644
--- a/ports-mgmt/tinderbox-devel/files/patch-www-exp__module__moduleBuildPorts.php
+++ b/ports-mgmt/tinderbox-devel/files/extra-patch-www-exp__module__moduleBuildPorts.php
diff --git a/ports-mgmt/tinderbox/Makefile b/ports-mgmt/tinderbox/Makefile
index 17e4c2403956..34db3f5f9b02 100644
--- a/ports-mgmt/tinderbox/Makefile
+++ b/ports-mgmt/tinderbox/Makefile
@@ -53,6 +53,9 @@ PLIST_SUB+=	WEB="@comment "
 .endif
 
 .if !defined(WITHOUT_WEB_EXP)
+EXTRA_PATCHES+=	${FILESDIR}/extra-patch-www-exp__core__TinderboxDS.php \
+		${FILESDIR}/extra-patch-www-exp__module__moduleBuildPorts.php
+
 PLIST_SUB+=	WEB_EXP=""
 .else
 PLIST_SUB+=	WEB_EXP="@comment "
@@ -121,8 +124,10 @@ post-patch:
 	@${RM} ${WRKSRC}/lib/setup-mysql.sh.bak
 .endif
 	@${RM} ${WRKSRC}/buildscript.orig
+.if defined(WITH_WEB_EXP)
 	@${RM} ${WRKSRC}/www-exp/core/TinderboxDS.php.orig
 	@${RM} ${WRKSRC}/www-exp/module/moduleBuildPorts.php.orig
+.endif
 
 do-install:
 	${MKDIR} ${PREFIX}/tinderbox/scripts
diff --git a/ports-mgmt/tinderbox/files/patch-www-exp__core__TinderboxDS.php b/ports-mgmt/tinderbox/files/extra-patch-www-exp__core__TinderboxDS.php
index 38799701d61f..38799701d61f 100644
--- a/ports-mgmt/tinderbox/files/patch-www-exp__core__TinderboxDS.php
+++ b/ports-mgmt/tinderbox/files/extra-patch-www-exp__core__TinderboxDS.php
diff --git a/ports-mgmt/tinderbox/files/patch-www-exp__module__moduleBuildPorts.php b/ports-mgmt/tinderbox/files/extra-patch-www-exp__module__moduleBuildPorts.php
index 8b4d57e33f66..8b4d57e33f66 100644
--- a/ports-mgmt/tinderbox/files/patch-www-exp__module__moduleBuildPorts.php
+++ b/ports-mgmt/tinderbox/files/extra-patch-www-exp__module__moduleBuildPorts.php