From nobody Sun Sep 08 18:55:27 2024 X-Original-To: dev-commits-ports-main@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 4X1zgN6vlFz5VZJx; Sun, 08 Sep 2024 18:55:28 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4X1zgM55Myz4LFg; Sun, 8 Sep 2024 18:55:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1725821727; 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=WsRNxIHS5PYU1wysbHsi37GT3zlLDidzk7NXpUCfbRM=; b=dNmDcIHqUCg6ZbjnZ5N5ynTso635TlHQptmCqqsFDg61A/X+0O5LBwYoMu2ZWPWkrO+9Hw ZsSVeavNnOfa3ZOSuLYrVgizOtbi/8qsMcIIA/aBOM0OLesTnLU5qM6CJr5hE+qvQKbE+U /3JjYKqzAuPpK9+YKvoctehKN8j1EG8U2FLAAWwWGvjc0I9JoFgBeITtgiIAgw79wfufyj eai2l8Lze+JsSFglXo2axkJPpGKL6dceqbYgkoSocUxYd66VMJcqovpTynEITnfW7xWyqO B72n0mKpQE6CImM+ukB1V8s51ZcZGZnTKjQxXghApvdgpW1Qzhn0xZndV1SJ3A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1725821727; a=rsa-sha256; cv=none; b=JLsM5EmeKZFhALEete5XTnefrEK6EV9f0dfqdXKMeIEw/NGTLJMFETSe4W939JHY259vu4 BFF/b9I1BoE+aqBQHWoarICRIVbPDWcqfYlj6d0Qyjf2DNKd6UdMTiuC92JmAXCYVnRNNh dpqGKr6WZ6f+0gDNCIQB5LJ3S1Cbif1M3+PHW/TfWfDK2gTI18ffoadgTnJwXNbUKwUrwp vX0SXoc4iZ26wjQ1MvuKVqZLOX59wQx2GNVJX+BAIEhfPYtT91F+KVQI0PZ1jbJ4G2YCAu ego9AFZCbkSbnqZEVSvoZASzzsyZKSzhUYDBLiFm/ipaZFlddTq2iFicvZKLxA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1725821727; 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=WsRNxIHS5PYU1wysbHsi37GT3zlLDidzk7NXpUCfbRM=; b=SeoCIT27jSZc9nrfE0KqcqqQHVZsn8M/gZWxZXRSXy/F+0z22l2GQWE8j93Apms/KQguUi KSORpHuv+EoJkphEjMkmnWbgRuuWLJwTUF7JViUna4xu1uVBNoQTRzO2P6uZgROKfReW0D dd0GxWWnIdqDe5Tfcm0ZwVDIuYtqST3YC45trdbRXIa2dwnGS9jDSojFdA2U6+gxDs21ww GeJuboKre0vTJfhntlJvMJpwkDQ1XMvbFuU8z2qrIWZugsRdDf0qfbOF88zRDVwz+D2m7G PBLU9h6mh/KJtLGoYQ6n271uoqPtWwcqNq/OeOCrbIYoE+W39JUIk/Gn6JmmWw== 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 4X1zgM3sH0zWyR; Sun, 8 Sep 2024 18:55:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 488ItRcO077842; Sun, 8 Sep 2024 18:55:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 488ItRGi077839; Sun, 8 Sep 2024 18:55:27 GMT (envelope-from git) Date: Sun, 8 Sep 2024 18:55:27 GMT Message-Id: <202409081855.488ItRGi077839@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Po-Chuan Hsieh Subject: git: 1bb965829324 - main - archivers/rubygem-bzip2-ruby: Fix build List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: sunpoet X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 1bb96582932418cea2685af0d8f2dbba046f4dfa Auto-Submitted: auto-generated The branch main has been updated by sunpoet: URL: https://cgit.FreeBSD.org/ports/commit/?id=1bb96582932418cea2685af0d8f2dbba046f4dfa commit 1bb96582932418cea2685af0d8f2dbba046f4dfa Author: Po-Chuan Hsieh AuthorDate: 2024-09-08 18:33:06 +0000 Commit: Po-Chuan Hsieh CommitDate: 2024-09-08 18:40:17 +0000 archivers/rubygem-bzip2-ruby: Fix build - Unmark DEPRECATED and remove EXPIRATION_DATE - Clean up Makefile --- archivers/rubygem-bzip2-ruby/Makefile | 12 +------ .../rubygem-bzip2-ruby/files/patch-ext_bzip2.c | 40 ++++++++++++++++++++-- 2 files changed, 39 insertions(+), 13 deletions(-) diff --git a/archivers/rubygem-bzip2-ruby/Makefile b/archivers/rubygem-bzip2-ruby/Makefile index 439ae6269c72..ebb3c2b2bb05 100644 --- a/archivers/rubygem-bzip2-ruby/Makefile +++ b/archivers/rubygem-bzip2-ruby/Makefile @@ -11,18 +11,8 @@ WWW= https://github.com/brianmario/bzip2-ruby LICENSE= BSD2CLAUSE RUBY LICENSE_COMB= dual -DEPRECATED= Does not work with ruby32 -# Sync with the removal of ruby31 -EXPIRATION_DATE= 2025-03-31 - USES= gem -BROKEN_RUBY32= yes - -.include - -.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${OSVERSION} >= 1302507 && ${OSVERSION} < 1400000 )) -CONFIGURE_ARGS+= --with-cflags="-Wno-error=incompatible-function-pointer-types" -.endif +CONFIGURE_ARGS= --with-cflags=-Wno-incompatible-function-pointer-types .include diff --git a/archivers/rubygem-bzip2-ruby/files/patch-ext_bzip2.c b/archivers/rubygem-bzip2-ruby/files/patch-ext_bzip2.c index 05384a6fbdda..b6fcb5161ae9 100644 --- a/archivers/rubygem-bzip2-ruby/files/patch-ext_bzip2.c +++ b/archivers/rubygem-bzip2-ruby/files/patch-ext_bzip2.c @@ -1,6 +1,6 @@ ---- ext/bzip2.c.orig 2016-07-26 12:25:25 UTC +--- ext/bzip2.c.orig 2024-09-07 15:54:07 UTC +++ ext/bzip2.c -@@ -247,9 +247,6 @@ static VALUE bz_writer_close(VALUE obj) +@@ -247,9 +247,6 @@ static VALUE bz_writer_close(VALUE obj) { Get_BZ2(obj, bzf); res = bz_writer_internal_close(bzf); @@ -10,3 +10,39 @@ return res; } +@@ -495,7 +492,7 @@ static VALUE bz_writer_init(int argc, VALUE *argv, VAL + } + bziv->bz2 = obj; + } else { +- iv = Data_Make_Struct(rb_cData, struct bz_iv, 0, free, bziv); ++ iv = Data_Make_Struct(rb_cObject, struct bz_iv, 0, free, bziv); + bziv->io = a; + bziv->bz2 = obj; + rb_ary_push(bz_internal_ary, iv); +@@ -1733,7 +1730,7 @@ void Init_bzip2_ext() { + /* + Writer + */ +- bz_cWriter = rb_define_class_under(bz_mBzip2, "Writer", rb_cData); ++ bz_cWriter = rb_define_class_under(bz_mBzip2, "Writer", rb_cObject); + #if HAVE_RB_DEFINE_ALLOC_FUNC + rb_define_alloc_func(bz_cWriter, bz_writer_s_alloc); + #else +@@ -1757,7 +1754,7 @@ void Init_bzip2_ext() { + /* + Reader + */ +- bz_cReader = rb_define_class_under(bz_mBzip2, "Reader", rb_cData); ++ bz_cReader = rb_define_class_under(bz_mBzip2, "Reader", rb_cObject); + rb_include_module(bz_cReader, rb_mEnumerable); + #if HAVE_RB_DEFINE_ALLOC_FUNC + rb_define_alloc_func(bz_cReader, bz_reader_s_alloc); +@@ -1798,7 +1795,7 @@ void Init_bzip2_ext() { + /* + Internal + */ +- bz_cInternal = rb_define_class_under(bz_mBzip2, "InternalStr", rb_cData); ++ bz_cInternal = rb_define_class_under(bz_mBzip2, "InternalStr", rb_cObject); + #if HAVE_RB_DEFINE_ALLOC_FUNC + rb_undef_alloc_func(bz_cInternal); + #else