git: 9e221f278f09 - main - databases/rubygem-sqlite3: Update to 1.6.0

From: Po-Chuan Hsieh <sunpoet_at_FreeBSD.org>
Date: Mon, 30 Jan 2023 13:11:50 UTC
The branch main has been updated by sunpoet:

URL: https://cgit.FreeBSD.org/ports/commit/?id=9e221f278f09a7721a775f0bd6a800e699bc0520

commit 9e221f278f09a7721a775f0bd6a800e699bc0520
Author:     Po-Chuan Hsieh <sunpoet@FreeBSD.org>
AuthorDate: 2023-01-30 12:36:07 +0000
Commit:     Po-Chuan Hsieh <sunpoet@FreeBSD.org>
CommitDate: 2023-01-30 13:00:30 +0000

    databases/rubygem-sqlite3: Update to 1.6.0
    
    Changes:        https://github.com/sparklemotion/sqlite3-ruby/releases
---
 databases/rubygem-sqlite3/Makefile                 |  4 +-
 databases/rubygem-sqlite3/distinfo                 |  6 +-
 .../files/patch-ext-sqlite3-extconf.rb             | 90 +---------------------
 3 files changed, 6 insertions(+), 94 deletions(-)

diff --git a/databases/rubygem-sqlite3/Makefile b/databases/rubygem-sqlite3/Makefile
index 167dda1f3b78..452528499a51 100644
--- a/databases/rubygem-sqlite3/Makefile
+++ b/databases/rubygem-sqlite3/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	sqlite3
-PORTVERSION=	1.5.4
+PORTVERSION=	1.6.0
 CATEGORIES=	databases rubygems
 MASTER_SITES=	RG
 
@@ -14,6 +14,6 @@ LIB_DEPENDS=	libsqlite3.so:databases/sqlite3
 
 USES=		gem
 
-CONFIGURE_ARGS=	--with-sqlite3-dir=${LOCALBASE}
+CONFIGURE_ARGS=	--enable-system-libraries --with-sqlite3-dir=${LOCALBASE}
 
 .include <bsd.port.mk>
diff --git a/databases/rubygem-sqlite3/distinfo b/databases/rubygem-sqlite3/distinfo
index 410055cf8f3f..3e025990f270 100644
--- a/databases/rubygem-sqlite3/distinfo
+++ b/databases/rubygem-sqlite3/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1669058033
-SHA256 (rubygem/sqlite3-1.5.4.gem) = 5d4f6bed23a629651c965f5107861f11df479d74eeef3a70d6ec702f28112101
-SIZE (rubygem/sqlite3-1.5.4.gem) = 3167744
+TIMESTAMP = 1674590094
+SHA256 (rubygem/sqlite3-1.6.0.gem) = 3d74af62d3cbf51856c4f9acd17e350d1d58c7e9639dbd3d7a38b00acac54438
+SIZE (rubygem/sqlite3-1.6.0.gem) = 3169280
diff --git a/databases/rubygem-sqlite3/files/patch-ext-sqlite3-extconf.rb b/databases/rubygem-sqlite3/files/patch-ext-sqlite3-extconf.rb
index 5b727bf95bf9..a23814fdd850 100644
--- a/databases/rubygem-sqlite3/files/patch-ext-sqlite3-extconf.rb
+++ b/databases/rubygem-sqlite3/files/patch-ext-sqlite3-extconf.rb
@@ -1,4 +1,4 @@
---- ext/sqlite3/extconf.rb.orig	2022-11-27 23:59:11 UTC
+--- ext/sqlite3/extconf.rb.orig	2023-01-21 15:48:25 UTC
 +++ ext/sqlite3/extconf.rb
 @@ -1,5 +1,4 @@
  require "mkmf"
@@ -6,91 +6,3 @@
  require "yaml"
  
  module Sqlite3
-@@ -49,42 +48,6 @@ module Sqlite3
-       end
- 
-       def configure_packaged_libraries
--        minimal_recipe.tap do |recipe|
--          recipe.configure_options += ["--enable-shared=no", "--enable-static=yes"]
--          ENV.to_h.tap do |env|
--            additional_cflags = [
--              "-fPIC", # needed for linking the static library into a shared library
--              "-O2", # see https://github.com/sparklemotion/sqlite3-ruby/issues/335 for some benchmarks
--            ]
--            env["CFLAGS"] = [env["CFLAGS"], additional_cflags].flatten.join(" ")
--            recipe.configure_options += env.select { |k,v| ENV_ALLOWLIST.include?(k) }
--                                           .map { |key, value| "#{key}=#{value.strip}" }
--          end
--
--          unless File.exist?(File.join(recipe.target, recipe.host, recipe.name, recipe.version))
--            recipe.cook
--          end
--          recipe.activate
--
--          # on macos, pkg-config will not return --cflags without this
--          ENV["PKG_CONFIG_ALLOW_SYSTEM_CFLAGS"] = "t"
--
--          lib_path = File.join(recipe.path, "lib")
--          pcfile = File.join(lib_path, "pkgconfig", "sqlite3.pc")
--          abort_pkg_config("pkg_config") unless pkg_config(pcfile)
--
--          # see https://bugs.ruby-lang.org/issues/18490
--          flags = xpopen(["pkg-config", "--libs", "--static", pcfile], err: [:child, :out], &:read)
--          abort_pkg_config("xpopen") unless $?.success?
--          flags = flags.split
--
--          # see https://github.com/flavorjones/mini_portile/issues/118
--          "-L#{lib_path}".tap do |lib_path_flag|
--            flags.prepend(lib_path_flag) unless flags.include?(lib_path_flag)
--          end
--
--          flags.each { |flag| append_ldflags(flag) }
--        end
-       end
- 
-       def configure_extension
-@@ -125,15 +88,6 @@ module Sqlite3
-       end
- 
-       def minimal_recipe
--        MiniPortile.new(libname, sqlite3_config[:version]).tap do |recipe|
--          if sqlite_source_dir
--            recipe.source_directory = sqlite_source_dir
--          else
--            recipe.files = sqlite3_config[:files]
--            recipe.target = File.join(package_root_dir, "ports")
--            recipe.patch_files = Dir[File.join(package_root_dir, "patches", "*.patch")].sort
--          end
--        end
-       end
- 
-       def package_root_dir
-@@ -141,12 +95,9 @@ module Sqlite3
-       end
- 
-       def sqlite3_config
--        mini_portile_config[:sqlite3]
-       end
- 
-       def mini_portile_config
--        # TODO: once Ruby 2.7 is no longer supported, use symbolize_names: true
--        YAML.load_file(File.join(package_root_dir, "dependencies.yml"))
-       end
- 
-       def abort_could_not_find(missing)
-@@ -158,7 +109,6 @@ module Sqlite3
-       end
- 
-       def cross_build?
--        enable_config("cross-build")
-       end
- 
-       def sqlite_source_dir
-@@ -166,7 +116,6 @@ module Sqlite3
-       end
- 
-       def download
--        minimal_recipe.download
-       end
- 
-       def print_help