From owner-svn-ports-all@freebsd.org Thu Apr 2 04:15:43 2020 Return-Path: Delivered-To: svn-ports-all@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 594FF2B5168; Thu, 2 Apr 2020 04:15:43 +0000 (UTC) (envelope-from fluffy@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 48t8qy4sfzz4Hbv; Thu, 2 Apr 2020 04:15:42 +0000 (UTC) (envelope-from fluffy@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 0244E9D83; Thu, 2 Apr 2020 04:09:55 +0000 (UTC) (envelope-from fluffy@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 03249t9B045885; Thu, 2 Apr 2020 04:09:55 GMT (envelope-from fluffy@FreeBSD.org) Received: (from fluffy@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 03249tcg045884; Thu, 2 Apr 2020 04:09:55 GMT (envelope-from fluffy@FreeBSD.org) Message-Id: <202004020409.03249tcg045884@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: fluffy set sender to fluffy@FreeBSD.org using -f From: Dima Panov Date: Thu, 2 Apr 2020 04:09:55 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r530256 - head/irc/weechat/files X-SVN-Group: ports-head X-SVN-Commit-Author: fluffy X-SVN-Commit-Paths: head/irc/weechat/files X-SVN-Commit-Revision: 530256 X-SVN-Commit-Repository: ports 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.29 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: Thu, 02 Apr 2020 04:15:43 -0000 Author: fluffy Date: Thu Apr 2 04:09:55 2020 New Revision: 530256 URL: https://svnweb.freebsd.org/changeset/ports/530256 Log: irc/weechat: fix patch-cmake_FindRuby.cmake before 2020Q2 branch Bernard obliviously commit raw patch for port itself rather than applied result for src Pointyhat to: brnrd PR: 243641 (originally was) Submitted by: fluffy Approved by: portmgr blanket (fix build issue) Modified: head/irc/weechat/files/patch-cmake_FindRuby.cmake Modified: head/irc/weechat/files/patch-cmake_FindRuby.cmake ============================================================================== --- head/irc/weechat/files/patch-cmake_FindRuby.cmake Thu Apr 2 01:32:07 2020 (r530255) +++ head/irc/weechat/files/patch-cmake_FindRuby.cmake Thu Apr 2 04:09:55 2020 (r530256) @@ -1,23 +1,20 @@ ---- weechat/files/patch-cmake_FindRuby.cmake (nonexistent) -+++ weechat/files/patch-cmake_FindRuby.cmake (working copy) -@@ -0,0 +1,20 @@ -+--- cmake/FindRuby.cmake.orig 2019-12-08 08:48:53 UTC -++++ cmake/FindRuby.cmake -+@@ -33,7 +33,7 @@ endif() -+ -+ find_package(PkgConfig) -+ if(PKG_CONFIG_FOUND) -+- pkg_search_module(RUBY ruby-2.6 ruby-2.5 ruby-2.4 ruby-2.3 ruby-2.2 ruby-2.1 ruby-2.0 ruby-1.9) -++ pkg_search_module(RUBY ruby-2.7 ruby-2.6 ruby-2.5 ruby-2.4 ruby-2.3 ruby-2.2 ruby-2.1 ruby-2.0 ruby-1.9) -+ endif() -+ -+ if(RUBY_FOUND) -+@@ -41,7 +41,7 @@ if(RUBY_FOUND) -+ mark_as_advanced(RUBY_LIB) -+ else() -+ find_program(RUBY_EXECUTABLE -+- NAMES ruby2.6.0 ruby260 ruby2.6 ruby2.5.0 ruby250 ruby2.5 ruby2.4.0 ruby240 ruby2.4 ruby2.3.0 ruby230 ruby2.3 ruby23 ruby2.2.3 ruby223 ruby2.2.2 ruby222 ruby2.2.1 ruby221 ruby2.2.0 ruby220 ruby2.2 ruby22 ruby2.1.7 ruby217 ruby2.1.6 ruby216 ruby2.1.5 ruby215 ruby2.1.4 ruby214 ruby2.1.3 ruby213 ruby2.1.2 ruby212 ruby2.1.1 ruby211 ruby2.1.0 ruby210 ruby2.1 ruby21 ruby2.0 ruby20 ruby1.9.3 ruby193 ruby1.9.2 ruby192 ruby1.9.1 ruby191 ruby1.9 ruby19 ruby -++ NAMES ruby2.7.0 ruby270 ruby2.7 ruby2.6.0 ruby260 ruby2.6 ruby2.5.0 ruby250 ruby2.5 ruby2.4.0 ruby240 ruby2.4 ruby2.3.0 ruby230 ruby2.3 ruby23 ruby2.2.3 ruby223 ruby2.2.2 ruby222 ruby2.2.1 ruby221 ruby2.2.0 ruby220 ruby2.2 ruby22 ruby2.1.7 ruby217 ruby2.1.6 ruby216 ruby2.1.5 ruby215 ruby2.1.4 ruby214 ruby2.1.3 ruby213 ruby2.1.2 ruby212 ruby2.1.1 ruby211 ruby2.1.0 ruby210 ruby2.1 ruby21 ruby2.0 ruby20 ruby1.9.3 ruby193 ruby1.9.2 ruby192 ruby1.9.1 ruby191 ruby1.9 ruby19 ruby -+ PATHS /usr/bin /usr/local/bin /usr/pkg/bin -+ ) -+ if(RUBY_EXECUTABLE) +--- cmake/FindRuby.cmake.orig 2019-12-08 08:48:53 UTC ++++ cmake/FindRuby.cmake +@@ -33,7 +33,7 @@ endif() + + find_package(PkgConfig) + if(PKG_CONFIG_FOUND) +- pkg_search_module(RUBY ruby-2.6 ruby-2.5 ruby-2.4 ruby-2.3 ruby-2.2 ruby-2.1 ruby-2.0 ruby-1.9) ++ pkg_search_module(RUBY ruby-2.7 ruby-2.6 ruby-2.5 ruby-2.4 ruby-2.3 ruby-2.2 ruby-2.1 ruby-2.0 ruby-1.9) + endif() + + if(RUBY_FOUND) +@@ -41,7 +41,7 @@ if(RUBY_FOUND) + mark_as_advanced(RUBY_LIB) + else() + find_program(RUBY_EXECUTABLE +- NAMES ruby2.6.0 ruby260 ruby2.6 ruby2.5.0 ruby250 ruby2.5 ruby2.4.0 ruby240 ruby2.4 ruby2.3.0 ruby230 ruby2.3 ruby23 ruby2.2.3 ruby223 ruby2.2.2 ruby222 ruby2.2.1 ruby221 ruby2.2.0 ruby220 ruby2.2 ruby22 ruby2.1.7 ruby217 ruby2.1.6 ruby216 ruby2.1.5 ruby215 ruby2.1.4 ruby214 ruby2.1.3 ruby213 ruby2.1.2 ruby212 ruby2.1.1 ruby211 ruby2.1.0 ruby210 ruby2.1 ruby21 ruby2.0 ruby20 ruby1.9.3 ruby193 ruby1.9.2 ruby192 ruby1.9.1 ruby191 ruby1.9 ruby19 ruby ++ NAMES ruby2.7.0 ruby270 ruby2.7 ruby2.6.0 ruby260 ruby2.6 ruby2.5.0 ruby250 ruby2.5 ruby2.4.0 ruby240 ruby2.4 ruby2.3.0 ruby230 ruby2.3 ruby23 ruby2.2.3 ruby223 ruby2.2.2 ruby222 ruby2.2.1 ruby221 ruby2.2.0 ruby220 ruby2.2 ruby22 ruby2.1.7 ruby217 ruby2.1.6 ruby216 ruby2.1.5 ruby215 ruby2.1.4 ruby214 ruby2.1.3 ruby213 ruby2.1.2 ruby212 ruby2.1.1 ruby211 ruby2.1.0 ruby210 ruby2.1 ruby21 ruby2.0 ruby20 ruby1.9.3 ruby193 ruby1.9.2 ruby192 ruby1.9.1 ruby191 ruby1.9 ruby19 ruby + PATHS /usr/bin /usr/local/bin /usr/pkg/bin + ) + if(RUBY_EXECUTABLE)