From owner-svn-ports-head@FreeBSD.ORG  Sat Nov  8 05:22:31 2014
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id A1873F49;
 Sat,  8 Nov 2014 05:22:31 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 8DD458E;
 Sat,  8 Nov 2014 05:22:31 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sA85MVgK091538;
 Sat, 8 Nov 2014 05:22:31 GMT (envelope-from ache@FreeBSD.org)
Received: (from ache@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id sA85MVSP091537;
 Sat, 8 Nov 2014 05:22:31 GMT (envelope-from ache@FreeBSD.org)
Message-Id: <201411080522.sA85MVSP091537@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: ache set sender to ache@FreeBSD.org
 using -f
From: "Andrey A. Chernov" <ache@FreeBSD.org>
Date: Sat, 8 Nov 2014 05:22:31 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r372304 - head/lang/ruby20
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head/>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 08 Nov 2014 05:22:31 -0000

Author: ache
Date: Sat Nov  8 05:22:30 2014
New Revision: 372304
URL: https://svnweb.freebsd.org/changeset/ports/372304
QAT: https://qat.redports.org/buildarchive/r372304/

Log:
  Handle the case when dtrace build is disabled (WITHOUT_CDDL=yes)
  
  Approved by:    swills

Modified:
  head/lang/ruby20/Makefile

Modified: head/lang/ruby20/Makefile
==============================================================================
--- head/lang/ruby20/Makefile	Fri Nov  7 23:16:16 2014	(r372303)
+++ head/lang/ruby20/Makefile	Sat Nov  8 05:22:30 2014	(r372304)
@@ -86,7 +86,9 @@ CPPFLAGS+=	-I${LOCALBASE}/include
 LIBS+=		-L${LOCALBASE}/lib ${PTHREAD_LIBS}
 
 .if ${OPSYS} == "FreeBSD"
-.if (${ARCH} == "i386" && ${OSVERSION} > 1010000) || (${ARCH} == "amd64" && ${OSVERSION} > 903000)
+.if exists(/usr/sbin/dtrace) && \
+	((${ARCH} == "i386" && ${OSVERSION} > 1010000) || \
+	(${ARCH} == "amd64" && ${OSVERSION} > 903000))
 CONFIGURE_ARGS+=	--enable-dtrace
 .else
 CONFIGURE_ARGS+=	--disable-dtrace