From owner-freebsd-ports-bugs@FreeBSD.ORG Tue Jun 24 11:30:02 2008 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 25B9A106567F for ; Tue, 24 Jun 2008 11:30:02 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id 052FC8FC17 for ; Tue, 24 Jun 2008 11:30:02 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.14.2/8.14.2) with ESMTP id m5OBU1Ot059778 for ; Tue, 24 Jun 2008 11:30:01 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.2/8.14.1/Submit) id m5OBU1pG059777; Tue, 24 Jun 2008 11:30:01 GMT (envelope-from gnats) Resent-Date: Tue, 24 Jun 2008 11:30:01 GMT Resent-Message-Id: <200806241130.m5OBU1pG059777@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Mario Sergio Fujikawa Ferreira Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id F17C81065678 for ; Tue, 24 Jun 2008 11:21:13 +0000 (UTC) (envelope-from lioux@uol.com.br) Received: from goat.gigo.com (ipv6.gigo.com [IPv6:2001:470:1:18::2]) by mx1.freebsd.org (Postfix) with ESMTP id E28B88FC23 for ; Tue, 24 Jun 2008 11:21:13 +0000 (UTC) (envelope-from lioux@uol.com.br) Received: from 201.40.48.55 (201-40-48-55.bsace702.dsl.brasiltelecom.net.br [201.40.48.55]) by goat.gigo.com (Postfix) with ESMTPA id C968E114D2 for ; Tue, 24 Jun 2008 04:21:12 -0700 (PDT) Received: (qmail 82217 invoked by uid 1001); 24 Jun 2008 08:12:41 -0300 Message-Id: <20080624111241.82146.qmail@exxodus.fedaykin.here> Date: 24 Jun 2008 08:12:41 -0300 From: Mario Sergio Fujikawa Ferreira To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: itetcu@FreeBSD.org Subject: ports/124929: [PATCH] ports-mgmt/tinderbox: Fix build when WITHOUT_WEB_EXP=true X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 24 Jun 2008 11:30:02 -0000 >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: