Date: Thu, 8 Nov 2012 21:35:17 +0000 (UTC) From: Emanuel Haupt <ehaupt@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r307200 - in head/ports-mgmt/tinderbox-devel: . files Message-ID: <201211082135.qA8LZHCo028390@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: ehaupt Date: Thu Nov 8 21:35:17 2012 New Revision: 307200 URL: http://svnweb.freebsd.org/changeset/ports/307200 Log: Import an upstream patch to fix build with ccache and nullfs. While here trim Makefile header. PR: 173440 Approved by: itetcu (maintainer) Feature safe: yes Added: head/ports-mgmt/tinderbox-devel/files/patch-lib__tinderlib.sh (contents, props changed) Modified: head/ports-mgmt/tinderbox-devel/Makefile Modified: head/ports-mgmt/tinderbox-devel/Makefile ============================================================================== --- head/ports-mgmt/tinderbox-devel/Makefile Thu Nov 8 21:31:57 2012 (r307199) +++ head/ports-mgmt/tinderbox-devel/Makefile Thu Nov 8 21:35:17 2012 (r307200) @@ -1,12 +1,9 @@ -# Ports collection makefile for: misc/tinderbox -# Whom: Edwin Groothuis <edwin@mavetju.org> -# Date created: 31 december 2005 -# +# Created by: Edwin Groothuis <edwin@mavetju.org> # $FreeBSD$ PORTNAME= tinderbox DISTVERSION= 3.4${SNAP} -PORTREVISION= 1 +PORTREVISION= 2 PORTEPOCH= 1 CATEGORIES= ports-mgmt MASTER_SITES= http://tinderbox.marcuscom.com/ \ Added: head/ports-mgmt/tinderbox-devel/files/patch-lib__tinderlib.sh ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/ports-mgmt/tinderbox-devel/files/patch-lib__tinderlib.sh Thu Nov 8 21:35:17 2012 (r307200) @@ -0,0 +1,28 @@ +--- ./lib/tinderlib.sh.orig 2012-11-07 10:17:43.000000000 +0100 ++++ ./lib/tinderlib.sh 2012-11-07 10:18:27.000000000 +0100 +@@ -23,7 +23,7 @@ + # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + # SUCH DAMAGE. + # +-# $MCom: portstools/tinderbox/lib/tinderlib.sh,v 1.55.2.9 2012/04/04 10:38:41 beat Exp $ ++# $MCom: portstools/tinderbox/lib/tinderlib.sh,v 1.55.2.10 2012/05/21 01:19:28 marcus Exp $ + # + + tinderLocJail () { +@@ -225,6 +225,7 @@ + requestMount () { + # set up defaults + _type="" ++ _options="" + _srcloc="" + _dstloc="" + _nullfs=0 +@@ -632,7 +633,7 @@ + + for r in ${reqs} ; do + if [ "${use_pkgng}" = "yes" ]; then +- if [ -z $(pkg info -qgO ${r}) ]; then ++ if [ -z $(pkg info -q ${r}) ]; then + missing="${missing} ${r}" + error=1 + fi
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201211082135.qA8LZHCo028390>