From nobody Sun Jan 21 12:51:32 2024 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4THtX52HfDz57PkY; Sun, 21 Jan 2024 12:51:33 +0000 (UTC) (envelope-from git@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4THtX46nJhz4SZk; Sun, 21 Jan 2024 12:51:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705841493; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=nBDsLK6LsXnMSPbBgk5+s4pTHpfjON5Mk0pR7pBFYsA=; b=TldncwYUdyxgS2VoDhS9MZnzO/NvrUMSoDB5P9yXwwSHo086hKOpX7gcR9Lkdh6REKrjbj WE83CyhbvpjijTGtA6ipmobans9Kslkgo/8wy9PJN7j7lmW0xX7lpUVW5I+kVYmwgjUFnw WNYn45FC2ZuC8jrCXqaZKhCeWuarC434UPnT6oJvlMMoo/k+Mf9saCQQkzDw6ZcljGvW0T yj9RlvJBkU2DZI3M36+BAbWS6Kj0UFQSKi9agMR3ym16CI/0xoaOLgDpYYQM5n/EkNKgmI AqM2CGjCjNtKs3Nvyv+oLBtwh8T5Rk2iNEBQlyk+lFjX6F/aSh1l1hRllbqEBA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705841493; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=nBDsLK6LsXnMSPbBgk5+s4pTHpfjON5Mk0pR7pBFYsA=; b=CgMzspPEGXMKgXLMP4yG6xhDWKX2pg4qoL6JYTPdIXEUtCRdfTm5qPzJ4VkLMCctfQOkKS FxdJe05qRnDy/JiMXl/19F+5cbHPjkZ7OwiXMan4TT1H/zHzCmeWPFvagxYimW4hjFtzjH BQjnkVj8dZB7G4DO6uX/Z9hZ3VC3i5i8r92VRRwztESd8ZmPT2eRLCc84EihT84FdjXPIz w1ROPz5dSntiBCwplIEvZaDyaNUsd0vgWoALpVMQ6Us5npnb7tKc5dE94jUSWGc99p1Ugb vIVLS07wgQ5vsYhF6sVlb8oKChED2pQyqBhA1QkyJbV+ZYqAxqF2zG0rVF6Ctw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1705841493; a=rsa-sha256; cv=none; b=H82T261Xy0kMq5AjQ6LXVNWt4eYJRhCqJCgl8R6Q9oU37M0MGNsHkoMhBz31haYTyNPT7D PTC8WNAFSN1OfUiPKm/WFcAa/VB1bBYhiJrvNEucqsUL0UxNy4Fems8EqLntCD6fS7MCnu GnioPhgkBPqqr91uKtvkaGbwvIaqEmpJVZewoF7AkPTvjJCDKk+JDrfaPvaqeetZhDLUGf Yt0XWBjpDQ2DTon7qGhQSqKvxGHQdnkNJjWWwXkLJLbSfeCFy3MfvPhUf0QZ6MoNBwZsBA CGm17+VvB1jvras86XC1N7prqe9Qnq6n9XewjatcD7MD+Eza17hBX5qc4b4Q0A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4THtX45vHxzJvM; Sun, 21 Jan 2024 12:51:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 40LCpWKs007076; Sun, 21 Jan 2024 12:51:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40LCpW4U007073; Sun, 21 Jan 2024 12:51:32 GMT (envelope-from git) Date: Sun, 21 Jan 2024 12:51:32 GMT Message-Id: <202401211251.40LCpW4U007073@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Muhammad Moinur Rahman Subject: git: 2c2da76dd903 - main - devel/rubygem-p4ruby: Update version 2017.1.1599185=>2023.1.2544327 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bofh X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 2c2da76dd90366799ab5ee9dfa3748e14b2eb344 Auto-Submitted: auto-generated The branch main has been updated by bofh: URL: https://cgit.FreeBSD.org/ports/commit/?id=2c2da76dd90366799ab5ee9dfa3748e14b2eb344 commit 2c2da76dd90366799ab5ee9dfa3748e14b2eb344 Author: Muhammad Moinur Rahman AuthorDate: 2024-01-21 10:55:44 +0000 Commit: Muhammad Moinur Rahman CommitDate: 2024-01-21 12:51:15 +0000 devel/rubygem-p4ruby: Update version 2017.1.1599185=>2023.1.2544327 - Fix build with ruby32 - Adopt port Changelog: https://github.com/perforce/p4ruby/releases/tag/2023.1 PR: 276466 --- devel/rubygem-p4ruby/Makefile | 13 +++++--- devel/rubygem-p4ruby/distinfo | 6 ++-- ...ext__P4__extconf.rb => patch-ext_P4_extconf.rb} | 36 +++++++++++++--------- .../files/patch-ext__P4__clientprogressruby.cpp | 13 -------- .../files/patch-ext__P4__clientuserruby.cpp | 17 ---------- .../files/patch-ext__P4__p4clientapi.cpp | 23 -------------- 6 files changed, 34 insertions(+), 74 deletions(-) diff --git a/devel/rubygem-p4ruby/Makefile b/devel/rubygem-p4ruby/Makefile index 4f16122d5a48..98622bdcae12 100644 --- a/devel/rubygem-p4ruby/Makefile +++ b/devel/rubygem-p4ruby/Makefile @@ -1,12 +1,11 @@ PORTNAME= p4ruby -PORTVERSION= 2017.1.1599185 -PORTREVISION= 1 +PORTVERSION= 2023.1.2544327 CATEGORIES= devel rubygems MASTER_SITES= RG -MAINTAINER= ports@FreeBSD.org +MAINTAINER= bofh@FreeBSD.org COMMENT= Ruby bindings for the Perforce API -WWW= http://www.perforce.com/perforce/loadsupp.html +WWW= https://github.com/perforce/p4ruby LICENSE= BSD2CLAUSE @@ -18,4 +17,10 @@ USES= gem CONFIGURE_ARGS= --with-p4api-dir=${LOCALBASE} --with-p4api-lib=${LOCALBASE}/lib/perforce +post-patch: + @${REINPLACE_CMD} 's|#include \"p4/|#include \"perforce/|g; s|#include diff --git a/devel/rubygem-p4ruby/distinfo b/devel/rubygem-p4ruby/distinfo index 939acc56eeda..60596af748f4 100644 --- a/devel/rubygem-p4ruby/distinfo +++ b/devel/rubygem-p4ruby/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1514155086 -SHA256 (rubygem/p4ruby-2017.1.1599185.gem) = 98a5bc92ee8693134fd1b0d949e196b02ece2f4f2002707d1bf5e49c62eb3be2 -SIZE (rubygem/p4ruby-2017.1.1599185.gem) = 57856 +TIMESTAMP = 1705833034 +SHA256 (rubygem/p4ruby-2023.1.2544327.gem) = fa8d73fb464e351582ac2dd766921bbe9ddb1a1495da1c2d322b9bd2d5380519 +SIZE (rubygem/p4ruby-2023.1.2544327.gem) = 56832 diff --git a/devel/rubygem-p4ruby/files/patch-ext__P4__extconf.rb b/devel/rubygem-p4ruby/files/patch-ext_P4_extconf.rb similarity index 65% rename from devel/rubygem-p4ruby/files/patch-ext__P4__extconf.rb rename to devel/rubygem-p4ruby/files/patch-ext_P4_extconf.rb index 60fd8e0d0bd7..65ed4911dbd5 100644 --- a/devel/rubygem-p4ruby/files/patch-ext__P4__extconf.rb +++ b/devel/rubygem-p4ruby/files/patch-ext_P4_extconf.rb @@ -1,6 +1,6 @@ ---- ext/P4/extconf.rb.orig 2016-03-25 23:50:09.485520000 +0000 -+++ ext/P4/extconf.rb 2016-03-25 23:52:32.288698000 +0000 -@@ -354,22 +354,8 @@ +--- ext/P4/extconf.rb.orig 2024-01-21 10:40:57 UTC ++++ ext/P4/extconf.rb +@@ -384,23 +384,8 @@ def resolve_p4api_dir # When running rake compile, use this instead of other options, I'm not sure how # gem/bundler options are passed through via rake @@ -10,7 +10,7 @@ - end - - if !p4api_dir && !with_config('p4api-dir') && enable_config('p4api-download', true) -- download_api_via_ftp +- download_api_via_https - unzip_file - p4api_dir = downloaded_p4api_dir - dir_config('p4api', "#{p4api_dir}/include", "#{p4api_dir}/lib") @@ -20,25 +20,33 @@ - elsif !p4api_dir - raise '--with-p4api-dir option has not been specified, and --disable-p4api-download is in effect' - end +- + p4api_dir = with_config('p4api-dir') + dir_config('supp', "#{p4api_dir}/include/perforce", "#{p4api_dir}/lib/perforce") - p4api_dir end -@@ -569,7 +555,8 @@ + +@@ -455,12 +440,12 @@ def p4_platform_label + raise 'Automatic fetching of p4api from perforce FTP is not supported on Windows' + when /darwin19|darwin[2-9][0-9]/ + "macosx1015#{p4_cpu(:darwin)}" +- when /darwin/ ++ when /darwin/ + "darwin90#{p4_cpu(:darwin)}" + when /solaris/ + "solaris10#{p4_cpu(:solaris)}" + when /linux/ +- "linux26#{p4_cpu(:linux)}" ++ "linux26#{p4_cpu(:linux)}" + end + end + +@@ -586,7 +571,7 @@ puts "$libs #{$libs}" puts "$libs #{$libs}" # Parse the Version file into a ruby structure -version_info = P4ApiVersion.load(p4api_dir) -+#version_info = P4ApiVersion.load(p4api_dir) +version_info = P4ApiVersion.load("#{p4api_dir}/share/examples/p4api") create_p4rubyconf_header(version_info, $libs) # This will generate a standard extconf.h based on what we discover locally. -@@ -577,4 +564,4 @@ - # don't believe we need to rely on actually. - create_header - --create_makefile('P4') -\ No newline at end of file -+create_makefile('P4') diff --git a/devel/rubygem-p4ruby/files/patch-ext__P4__clientprogressruby.cpp b/devel/rubygem-p4ruby/files/patch-ext__P4__clientprogressruby.cpp deleted file mode 100644 index e6432730805e..000000000000 --- a/devel/rubygem-p4ruby/files/patch-ext__P4__clientprogressruby.cpp +++ /dev/null @@ -1,13 +0,0 @@ ---- ./ext/P4/clientprogressruby.cpp.orig 2015-02-11 21:56:41.253726893 +0000 -+++ ./ext/P4/clientprogressruby.cpp 2015-02-11 21:57:19.286226444 +0000 -@@ -39,8 +39,8 @@ - #include "gc_hack.h" - #include "extconf.h" - #include "p4utils.h" --#include "p4/clientapi.h" --#include "p4/clientprog.h" -+#include "perforce/clientapi.h" -+#include "perforce/clientprog.h" - #include "clientprogressruby.h" - - extern VALUE eP4; diff --git a/devel/rubygem-p4ruby/files/patch-ext__P4__clientuserruby.cpp b/devel/rubygem-p4ruby/files/patch-ext__P4__clientuserruby.cpp deleted file mode 100644 index 98e44005b68e..000000000000 --- a/devel/rubygem-p4ruby/files/patch-ext__P4__clientuserruby.cpp +++ /dev/null @@ -1,17 +0,0 @@ ---- ./ext/P4/clientuserruby.cpp.orig 2015-02-11 21:56:41.253726893 +0000 -+++ ./ext/P4/clientuserruby.cpp 2015-02-11 21:57:33.343960720 +0000 -@@ -37,10 +37,10 @@ - #include - #include - #include "undefdups.h" --#include --#include --#include --#include -+#include -+#include -+#include -+#include - #include "p4rubyconf.h" - #include "gc_hack.h" - #include "p4result.h" diff --git a/devel/rubygem-p4ruby/files/patch-ext__P4__p4clientapi.cpp b/devel/rubygem-p4ruby/files/patch-ext__P4__p4clientapi.cpp deleted file mode 100644 index 54dfb983d2aa..000000000000 --- a/devel/rubygem-p4ruby/files/patch-ext__P4__p4clientapi.cpp +++ /dev/null @@ -1,23 +0,0 @@ ---- ./ext/P4/p4clientapi.cpp.orig 2015-02-11 21:56:41.253726893 +0000 -+++ ./ext/P4/p4clientapi.cpp 2015-02-11 21:57:42.902119989 +0000 -@@ -36,13 +36,13 @@ - ******************************************************************************/ - #include - #include "undefdups.h" --#include --#include --#include --#include --#include --#include --#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include - #include "p4result.h" - #include "p4rubydebug.h" - #include "clientuserruby.h"