Date: 24 Jun 2008 08:12:41 -0300 From: Mario Sergio Fujikawa Ferreira <lioux@FreeBSD.org> To: FreeBSD-gnats-submit@FreeBSD.org Cc: itetcu@FreeBSD.org Subject: ports/124929: [PATCH] ports-mgmt/tinderbox: Fix build when WITHOUT_WEB_EXP=true Message-ID: <20080624111241.82146.qmail@exxodus.fedaykin.here> Resent-Message-ID: <200806241130.m5OBU1pG059777@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 124929
>Category: ports
>Synopsis: [PATCH] ports-mgmt/tinderbox: Fix build when WITHOUT_WEB_EXP=true
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Tue Jun 24 11:30:01 UTC 2008
>Closed-Date:
>Last-Modified:
>Originator: Mario Sergio Fujikawa Ferreira
>Release: FreeBSD 7.0-STABLE i386
>Organization:
>Environment:
System: FreeBSD exxodus.fedaykin.here 7.0-STABLE FreeBSD 7.0-STABLE #58: Mon Jun 16 10:03:00 BRT 2008
>Description:
When WITHOUT_WEB_EXP=true, the following patches should not be
applied. Therefore, I changed them to EXTRA_PATCHES. No PORTREVISION
bump should be necessary since the port does not build if OPTION
WEB_EXP is not selected.
Added file(s):
- files/extra-patch-www-exp__core__TinderboxDS.php
- files/extra-patch-www-exp__module__moduleBuildPorts.php
Removed file(s):
- files/patch-www-exp__core__TinderboxDS.php
- files/patch-www-exp__module__moduleBuildPorts.php
Port maintainer (itetcu@FreeBSD.org) is cc'd.
Generated with FreeBSD Port Tools 0.77
>How-To-Repeat:
>Fix:
--- tinderbox-2.4.3.patch begins here ---
diff -ruN --exclude=CVS /usr/ports/ports-mgmt/tinderbox/Makefile /tmp/tinderbox/Makefile
--- /usr/ports/ports-mgmt/tinderbox/Makefile 2008-06-03 10:25:21.000000000 -0300
+++ /tmp/tinderbox/Makefile 2008-06-24 08:06:04.000000000 -0300
@@ -53,6 +53,10 @@
.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 +125,10 @@
@${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 -ruN --exclude=CVS /usr/ports/ports-mgmt/tinderbox/files/extra-patch-www-exp__core__TinderboxDS.php /tmp/tinderbox/files/extra-patch-www-exp__core__TinderboxDS.php
--- /usr/ports/ports-mgmt/tinderbox/files/extra-patch-www-exp__core__TinderboxDS.php 1969-12-31 21:00:00.000000000 -0300
+++ /tmp/tinderbox/files/extra-patch-www-exp__core__TinderboxDS.php 2008-06-03 10:25:21.000000000 -0300
@@ -0,0 +1,14 @@
+--- ./www-exp/core/TinderboxDS.php.orig 2008-06-02 07:11:02.000000000 +0300
++++ ./www-exp/core/TinderboxDS.php 2008-06-03 15:38:24.000000000 +0300
+@@ -372,6 +372,11 @@
+ if ($sortby == "") $sortby = "Port_Directory";
+ if ($sortby == "Port_Directory") $sortbytable = "p";
+ if ($sortby == "Port_Maintainer") $sortbytable = "p";
++ if ($sortby == "Last_Built") {
++ $sortbytable = "bp";
++ $sortby = "Last_Built desc";
++ }
++
+ $query = "SELECT p.*,
+ bp.Last_Built,
+ bp.Last_Status,
diff -ruN --exclude=CVS /usr/ports/ports-mgmt/tinderbox/files/extra-patch-www-exp__module__moduleBuildPorts.php /tmp/tinderbox/files/extra-patch-www-exp__module__moduleBuildPorts.php
--- /usr/ports/ports-mgmt/tinderbox/files/extra-patch-www-exp__module__moduleBuildPorts.php 1969-12-31 21:00:00.000000000 -0300
+++ /tmp/tinderbox/files/extra-patch-www-exp__module__moduleBuildPorts.php 2008-06-03 10:25:21.000000000 -0300
@@ -0,0 +1,11 @@
+--- ./www-exp/module/moduleBuildPorts.php.orig 2008-06-03 15:53:53.000000000 +0300
++++ ./www-exp/module/moduleBuildPorts.php 2008-06-03 15:54:42.000000000 +0300
+@@ -145,7 +145,7 @@
+ $build_id = false;
+ }
+
+- $ports = $this->TinderboxDS->getLatestPorts( $build_id, 20 );
++ $ports = $this->TinderboxDS->getLatestPorts( $build_id, 30 );
+
+ if( is_array( $ports ) && count( $ports ) > 0 ) {
+ $this->template_assign( 'data', $this->modulePorts->get_list_data( $build_name, $ports ) );
diff -ruN --exclude=CVS /usr/ports/ports-mgmt/tinderbox/files/patch-www-exp__core__TinderboxDS.php /tmp/tinderbox/files/patch-www-exp__core__TinderboxDS.php
--- /usr/ports/ports-mgmt/tinderbox/files/patch-www-exp__core__TinderboxDS.php 2008-06-03 10:25:21.000000000 -0300
+++ /tmp/tinderbox/files/patch-www-exp__core__TinderboxDS.php 1969-12-31 21:00:00.000000000 -0300
@@ -1,14 +0,0 @@
---- ./www-exp/core/TinderboxDS.php.orig 2008-06-02 07:11:02.000000000 +0300
-+++ ./www-exp/core/TinderboxDS.php 2008-06-03 15:38:24.000000000 +0300
-@@ -372,6 +372,11 @@
- if ($sortby == "") $sortby = "Port_Directory";
- if ($sortby == "Port_Directory") $sortbytable = "p";
- if ($sortby == "Port_Maintainer") $sortbytable = "p";
-+ if ($sortby == "Last_Built") {
-+ $sortbytable = "bp";
-+ $sortby = "Last_Built desc";
-+ }
-+
- $query = "SELECT p.*,
- bp.Last_Built,
- bp.Last_Status,
diff -ruN --exclude=CVS /usr/ports/ports-mgmt/tinderbox/files/patch-www-exp__module__moduleBuildPorts.php /tmp/tinderbox/files/patch-www-exp__module__moduleBuildPorts.php
--- /usr/ports/ports-mgmt/tinderbox/files/patch-www-exp__module__moduleBuildPorts.php 2008-06-03 10:25:21.000000000 -0300
+++ /tmp/tinderbox/files/patch-www-exp__module__moduleBuildPorts.php 1969-12-31 21:00:00.000000000 -0300
@@ -1,11 +0,0 @@
---- ./www-exp/module/moduleBuildPorts.php.orig 2008-06-03 15:53:53.000000000 +0300
-+++ ./www-exp/module/moduleBuildPorts.php 2008-06-03 15:54:42.000000000 +0300
-@@ -145,7 +145,7 @@
- $build_id = false;
- }
-
-- $ports = $this->TinderboxDS->getLatestPorts( $build_id, 20 );
-+ $ports = $this->TinderboxDS->getLatestPorts( $build_id, 30 );
-
- if( is_array( $ports ) && count( $ports ) > 0 ) {
- $this->template_assign( 'data', $this->modulePorts->get_list_data( $build_name, $ports ) );
--- tinderbox-2.4.3.patch ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20080624111241.82146.qmail>