aboutsummaryrefslogtreecommitdiffstats
path: root/ports-mgmt/tinderbox
diff options
context:
space:
mode:
authoritetcu <itetcu@FreeBSD.org>2008-07-02 04:06:20 +0800
committeritetcu <itetcu@FreeBSD.org>2008-07-02 04:06:20 +0800
commit828ed9d036be80b4dd707f1b2be6fea1b66ee9c6 (patch)
tree79e4e4fc099845542072d7476519ae5bfa586df1 /ports-mgmt/tinderbox
parent108158ac667b16167fa0239e4168396cf23f9c54 (diff)
downloadfreebsd-ports-gnome-828ed9d036be80b4dd707f1b2be6fea1b66ee9c6.tar.gz
freebsd-ports-gnome-828ed9d036be80b4dd707f1b2be6fea1b66ee9c6.tar.zst
freebsd-ports-gnome-828ed9d036be80b4dd707f1b2be6fea1b66ee9c6.zip
Don't try to patch inexistent files if WEB_EXP in not on.
PR: ports/124929 [1], ports/124762 [2] Submitted by: Jona Joachim <jaj@hcl-club.lu>, Alex Kozlov <spam@rm-rf.kiev.ua> [2], lioux@ [1]
Diffstat (limited to 'ports-mgmt/tinderbox')
-rw-r--r--ports-mgmt/tinderbox/Makefile5
-rw-r--r--ports-mgmt/tinderbox/files/extra-patch-www-exp__core__TinderboxDS.php (renamed from ports-mgmt/tinderbox/files/patch-www-exp__core__TinderboxDS.php)0
-rw-r--r--ports-mgmt/tinderbox/files/extra-patch-www-exp__module__moduleBuildPorts.php (renamed from ports-mgmt/tinderbox/files/patch-www-exp__module__moduleBuildPorts.php)0
3 files changed, 5 insertions, 0 deletions
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