From owner-svn-ports-head@freebsd.org Wed Jan 29 02:25:24 2020 Return-Path: Delivered-To: svn-ports-head@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id B488A1B2F59; Wed, 29 Jan 2020 02:25:24 +0000 (UTC) (envelope-from meta@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 486nQD4PN9z3yM7; Wed, 29 Jan 2020 02:25:24 +0000 (UTC) (envelope-from meta@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 922265059; Wed, 29 Jan 2020 02:25:24 +0000 (UTC) (envelope-from meta@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 00T2PO22008385; Wed, 29 Jan 2020 02:25:24 GMT (envelope-from meta@FreeBSD.org) Received: (from meta@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 00T2PNho008379; Wed, 29 Jan 2020 02:25:23 GMT (envelope-from meta@FreeBSD.org) Message-Id: <202001290225.00T2PNho008379@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: meta set sender to meta@FreeBSD.org using -f From: Koichiro Iwao Date: Wed, 29 Jan 2020 02:25:23 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r524527 - in head: Mk lang/ruby27 X-SVN-Group: ports-head X-SVN-Commit-Author: meta X-SVN-Commit-Paths: in head: Mk lang/ruby27 X-SVN-Commit-Revision: 524527 X-SVN-Commit-Repository: ports 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.29 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 29 Jan 2020 02:25:24 -0000 Author: meta Date: Wed Jan 29 02:25:23 2020 New Revision: 524527 URL: https://svnweb.freebsd.org/changeset/ports/524527 Log: lang/ruby27: throw out racc from lang/ruby27 because racc is provied as "default gem" since Ruby 2.7 [1]. We provide default gems as gem ports rather than a part of lang/ruby* port. files/patch-tool_rbinstall.rb does that. bin/*racc* are leftover wrapper script that the patch didn't remove default gem racc completely. racc is provided by devel/rubygem-racc. To avoid conflict racc gem port vs ruby port, throw it out completely from ruby port. [1] https://ruby-trunk-changes.hatenablog.com/entry/ruby_trunk_changes_20190620 PR: 242359 237833 Submitted by: Yasuhiro KIMURA (based on) Modified: head/Mk/bsd.ruby.mk head/lang/ruby27/Makefile head/lang/ruby27/pkg-plist Modified: head/Mk/bsd.ruby.mk ============================================================================== --- head/Mk/bsd.ruby.mk Tue Jan 28 23:58:43 2020 (r524526) +++ head/Mk/bsd.ruby.mk Wed Jan 29 02:25:23 2020 (r524527) @@ -176,7 +176,7 @@ RUBY26= "" # PLIST_SUB helpers # Ruby 2.7 # RUBY_VERSION= 2.7.0 -RUBY_PORTREVISION= 0 +RUBY_PORTREVISION= 1 RUBY_PORTEPOCH= 1 RUBY27= "" # PLIST_SUB helpers Modified: head/lang/ruby27/Makefile ============================================================================== --- head/lang/ruby27/Makefile Tue Jan 28 23:58:43 2020 (r524526) +++ head/lang/ruby27/Makefile Wed Jan 29 02:25:23 2020 (r524527) @@ -118,7 +118,7 @@ PKGNAMESUFFIX= ${RUBY_VER:C/\.//} PLIST_SUB+= IF_DEFAULT="@comment " .endif -INSTALLED_SCRIPTS= erb irb racc racc2y rdoc ri ruby y2racc +INSTALLED_SCRIPTS= erb irb rdoc ri ruby INSTALLED_MANUALS= erb irb ri ruby EXTSAMPLES= bigdecimal/sample/*.rb @@ -133,7 +133,7 @@ RB_SET_CONF_VAR=${SH} -c '${REINPLACE_CMD} -E -e "s,(C post-patch: # We get these from other ports -.for d in bin/bundle* lib/bundler* libexec/bundler* man/bundle* bin/gem man/gemfile* \ +.for d in bin/bundle* bin/*racc* lib/bundler* libexec/bundler* man/bundle* bin/gem man/gemfile* \ ext/dbm ext/gdbm ext/win32ole @${RM} -r ${BUILD_WRKSRC}/${d} .endfor Modified: head/lang/ruby27/pkg-plist ============================================================================== --- head/lang/ruby27/pkg-plist Tue Jan 28 23:58:43 2020 (r524526) +++ head/lang/ruby27/pkg-plist Wed Jan 29 02:25:23 2020 (r524527) @@ -2,18 +2,12 @@ bin/erb%%RUBY_SUFFIX%% %%IF_DEFAULT%%bin/irb bin/irb%%RUBY_SUFFIX%% -%%IF_DEFAULT%%bin/racc -bin/racc%%RUBY_SUFFIX%% -%%IF_DEFAULT%%bin/racc2y -bin/racc2y%%RUBY_SUFFIX%% %%IF_DEFAULT%%bin/rdoc bin/rdoc%%RUBY_SUFFIX%% %%IF_DEFAULT%%bin/ri bin/ri%%RUBY_SUFFIX%% %%IF_DEFAULT%%bin/ruby bin/ruby%%RUBY_SUFFIX%% -%%IF_DEFAULT%%bin/y2racc -bin/y2racc%%RUBY_SUFFIX%% include/ruby-%%RUBY_VER%%/%%RUBY_ARCH%%/rb_mjit_min_header-%%RUBY_VERSION%%.h include/ruby-%%RUBY_VER%%/%%RUBY_ARCH%%/ruby/config.h include/ruby-%%RUBY_VER%%/ruby.h