From owner-svn-ports-all@FreeBSD.ORG Tue Nov 11 17:47:08 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id E0AE76E1; Tue, 11 Nov 2014 17:47:07 +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 CD0B2EA1; Tue, 11 Nov 2014 17:47:07 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sABHl7xr015403; Tue, 11 Nov 2014 17:47:07 GMT (envelope-from swills@FreeBSD.org) Received: (from swills@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sABHl6qQ015398; Tue, 11 Nov 2014 17:47:06 GMT (envelope-from swills@FreeBSD.org) Message-Id: <201411111747.sABHl6qQ015398@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: swills set sender to swills@FreeBSD.org using -f From: Steve Wills Date: Tue, 11 Nov 2014 17:47:06 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r372456 - in head: Mk lang/ruby20 lang/ruby21 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.18-1 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: Tue, 11 Nov 2014 17:47:08 -0000 Author: swills Date: Tue Nov 11 17:47:06 2014 New Revision: 372456 URL: https://svnweb.freebsd.org/changeset/ports/372456 QAT: https://qat.redports.org/buildarchive/r372456/ Log: lang/ruby2*: disable dtrace on OS versions without the dtrace fixes from r271413 While here, fix plist issues Modified: head/Mk/bsd.ruby.mk head/lang/ruby20/Makefile head/lang/ruby20/pkg-plist head/lang/ruby21/Makefile head/lang/ruby21/pkg-plist Modified: head/Mk/bsd.ruby.mk ============================================================================== --- head/Mk/bsd.ruby.mk Tue Nov 11 16:30:26 2014 (r372455) +++ head/Mk/bsd.ruby.mk Tue Nov 11 17:47:06 2014 (r372456) @@ -193,7 +193,7 @@ RUBY21= "@comment " # Ruby 2.0 # RUBY_RELVERSION= 2.0.0 -RUBY_PORTREVISION= 2 +RUBY_PORTREVISION= 3 RUBY_PORTEPOCH= 1 RUBY_PATCHLEVEL= 576 @@ -209,7 +209,7 @@ RUBY21= "@comment " # Ruby 2.1 # RUBY_RELVERSION= 2.1.3 -RUBY_PORTREVISION= 2 +RUBY_PORTREVISION= 3 RUBY_PORTEPOCH= 1 RUBY_PATCHLEVEL= 0 Modified: head/lang/ruby20/Makefile ============================================================================== --- head/lang/ruby20/Makefile Tue Nov 11 16:30:26 2014 (r372455) +++ head/lang/ruby20/Makefile Tue Nov 11 17:47:06 2014 (r372456) @@ -86,9 +86,7 @@ CPPFLAGS+= -I${LOCALBASE}/include LIBS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS} .if ${OPSYS} == "FreeBSD" -.if exists(/usr/sbin/dtrace) && \ - ((${ARCH} == "i386" && ${OSVERSION} > 1010000) || \ - (${ARCH} == "amd64" && ${OSVERSION} > 903000)) +.if exists(/usr/sbin/dtrace) && (${OSVERSION} > 1100032) CONFIGURE_ARGS+= --enable-dtrace .else CONFIGURE_ARGS+= --disable-dtrace Modified: head/lang/ruby20/pkg-plist ============================================================================== --- head/lang/ruby20/pkg-plist Tue Nov 11 16:30:26 2014 (r372455) +++ head/lang/ruby20/pkg-plist Tue Nov 11 17:47:06 2014 (r372456) @@ -17128,3 +17128,7 @@ man/man1/%%RUBY_NAME%%.1.gz %%RDOC%%%%RUBY_RIDIR%%/syntax/page-modules_and_classes_rdoc.ri %%RDOC%%%%RUBY_RIDIR%%/syntax/page-precedence_rdoc.ri %%RDOC%%%%RUBY_RIDIR%%/syntax/page-refinements_rdoc.ri +@dir %%RUBY_LIBDIR%%/racc/rdoc +@dir %%RUBY_SITEARCHLIBDIR%% +@dir %%RUBY_VENDORARCHLIBDIR%% +@dir %%RUBY_SITERIDIR%% Modified: head/lang/ruby21/Makefile ============================================================================== --- head/lang/ruby21/Makefile Tue Nov 11 16:30:26 2014 (r372455) +++ head/lang/ruby21/Makefile Tue Nov 11 17:47:06 2014 (r372456) @@ -85,7 +85,7 @@ 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) && (${OSVERSION} > 1100032) CONFIGURE_ARGS+= --enable-dtrace .else CONFIGURE_ARGS+= --disable-dtrace Modified: head/lang/ruby21/pkg-plist ============================================================================== --- head/lang/ruby21/pkg-plist Tue Nov 11 16:30:26 2014 (r372455) +++ head/lang/ruby21/pkg-plist Tue Nov 11 17:47:06 2014 (r372456) @@ -16907,3 +16907,8 @@ man/man1/%%RUBY_NAME%%.1.gz %%RDOC%%%%RUBY_RIDIR%%/syntax/page-precedence_rdoc.ri %%RDOC%%%%RUBY_RIDIR%%/syntax/page-refinements_rdoc.ri %%RDOC%%%%RUBY_RIDIR%%/unknown/cdesc-unknown.ri +@dir %%RUBY_LIBDIR%%/racc/rdoc +@dir %%RUBY_SITEARCHLIBDIR%% +@dir %%RUBY_VENDORARCHLIBDIR%% +@dir %%RUBY_EXAMPLESDIR%%/curses +@dir %%RUBY_SITERIDIR%%