From owner-svn-ports-all@FreeBSD.ORG Fri Jun 7 22:17:34 2013 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id A2DC93A6; Fri, 7 Jun 2013 22:17:34 +0000 (UTC) (envelope-from mandree@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 83BBB17F8; Fri, 7 Jun 2013 22:17:34 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r57MHY8S081321; Fri, 7 Jun 2013 22:17:34 GMT (envelope-from mandree@svn.freebsd.org) Received: (from mandree@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r57MHYK8081319; Fri, 7 Jun 2013 22:17:34 GMT (envelope-from mandree@svn.freebsd.org) Message-Id: <201306072217.r57MHYK8081319@svn.freebsd.org> From: Matthias Andree Date: Fri, 7 Jun 2013 22:17:34 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r320227 - in head/ports-mgmt/tinderbox: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 07 Jun 2013 22:17:34 -0000 Author: mandree Date: Fri Jun 7 22:17:33 2013 New Revision: 320227 URL: http://svnweb.freebsd.org/changeset/ports/320227 Log: Fix regression from commit r320140: broke build unless web option was selected. While here, avoid extraction of non-installed webui stuff unless needed. Submitted by: bf@ Added: head/ports-mgmt/tinderbox/files/fail-reasons-patch - copied unchanged from r320221, head/ports-mgmt/tinderbox/files/patch-fail-reasons Deleted: head/ports-mgmt/tinderbox/files/patch-fail-reasons Modified: head/ports-mgmt/tinderbox/Makefile Modified: head/ports-mgmt/tinderbox/Makefile ============================================================================== --- head/ports-mgmt/tinderbox/Makefile Fri Jun 7 21:40:10 2013 (r320226) +++ head/ports-mgmt/tinderbox/Makefile Fri Jun 7 22:17:33 2013 (r320227) @@ -46,10 +46,12 @@ WEBUI= yes .endif .if defined(WEBUI) +EXTRA_PATCHES+= ${PATCHDIR}/fail-reasons-patch WANT_PHP_WEB= yes USE_PHP= session PLIST_SUB+= WEBUI="" .else +EXTRACT_BEFORE_ARGS= --exclude webui -xf PLIST_SUB+= WEBUI="@comment " .endif @@ -98,11 +100,6 @@ RUN_DEPENDS+= lsof:${PORTSDIR}/sysutils/ RUN_DEPENDS+= p5-Compress-Bzip2>=0:${PORTSDIR}/archivers/p5-Compress-Bzip2 .endif -.if ! defined(WEBUI) -post-extract: - @${RM} -R ${WRKSRC}/webui -.endif - post-patch: .if ! ${PORT_OPTIONS:MCHECK_ROOT} ${REINPLACE_CMD} -e 's/^if \[ `id -u` != 0 \]; then/if false; then/' \ Copied: head/ports-mgmt/tinderbox/files/fail-reasons-patch (from r320221, head/ports-mgmt/tinderbox/files/patch-fail-reasons) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/ports-mgmt/tinderbox/files/fail-reasons-patch Fri Jun 7 22:17:33 2013 (r320227, copy of r320221, head/ports-mgmt/tinderbox/files/patch-fail-reasons) @@ -0,0 +1,12 @@ +# http://www.freebsd.org/cgi/query-pr.cgi?pr=ports/177491 by Anonymous +--- webui/templates/default/latest_buildports.tpl.orig ++++ webui/templates/default/latest_buildports.tpl +@@ -50,7 +50,7 @@ + + "> + +- " title=""> ++ " title=""> + + +