From 3fb563c5a851691c3d1ad079ec90940beaca3697 Mon Sep 17 00:00:00 2001
From: jeremy <jeremy@openbsd.org>
Date: Fri, 25 Nov 2022 00:19:52 +0000
Subject: [PATCH] Update to ruby sqlite3 1.5.4

Upstream changed to using an embedded SQLite by default.  Use
--enable-system-libraries to use the system SQLite. Add a build
dependency on ruby-mini_portile2, and add a patch so it isn't
needed at runtime.
---
 databases/ruby-sqlite3/Makefile               |  4 +++-
 databases/ruby-sqlite3/distinfo               |  4 ++--
 .../ruby-sqlite3/patches/patch-_metadata      | 15 ++++++++++++
 databases/ruby-sqlite3/pkg/PLIST              | 23 ++++++++-----------
 4 files changed, 30 insertions(+), 16 deletions(-)
 create mode 100644 databases/ruby-sqlite3/patches/patch-_metadata

diff --git a/databases/ruby-sqlite3/Makefile b/databases/ruby-sqlite3/Makefile
index bf761addc0e..fb88cc39481 100644
--- a/databases/ruby-sqlite3/Makefile
+++ b/databases/ruby-sqlite3/Makefile
@@ -1,6 +1,6 @@
 COMMENT=	access a SQLite3 database from ruby
 
-DISTNAME=	sqlite3-1.4.2
+DISTNAME=	sqlite3-1.5.4
 CATEGORIES=	databases
 
 MAINTAINER =	Jeremy Evans <jeremy@openbsd.org>
@@ -14,8 +14,10 @@ MODULES=		lang/ruby
 
 WANTLIB=		sqlite3
 LIB_DEPENDS=		databases/sqlite3
+BUILD_DEPENDS=		devel/ruby-mini_portile2,${MODRUBY_FLAVOR}>=2.7.0,<3.0
 
 CONFIGURE_STYLE=	ruby gem ext
+CONFIGURE_ARGS=		--enable-system-libraries
 
 MODRUBY_TEST=	rake
 TEST_DEPENDS=	devel/ruby-mocha,${MODRUBY_FLAVOR} \
diff --git a/databases/ruby-sqlite3/distinfo b/databases/ruby-sqlite3/distinfo
index 43efd179477..4477bf4b83f 100644
--- a/databases/ruby-sqlite3/distinfo
+++ b/databases/ruby-sqlite3/distinfo
@@ -1,2 +1,2 @@
-SHA256 (sqlite3-1.4.2.gem) = 6LjvOw91wY4afuYsVnjIJ+mTieU/pV63qaX1dFkASlI=
-SIZE (sqlite3-1.4.2.gem) = 70656
+SHA256 (sqlite3-1.5.4.gem) = XU9r7SOmKWUcll9RB4YfEd9HnXTu7zpw1uxwLygRIQE=
+SIZE (sqlite3-1.5.4.gem) = 3167744
diff --git a/databases/ruby-sqlite3/patches/patch-_metadata b/databases/ruby-sqlite3/patches/patch-_metadata
new file mode 100644
index 00000000000..1eaa67e1c0e
--- /dev/null
+++ b/databases/ruby-sqlite3/patches/patch-_metadata
@@ -0,0 +1,15 @@
+Make mini_portile2 a development dependency, as it is only needed
+for building.
+
+Index: .metadata
+--- .metadata.orig
++++ .metadata
+@@ -19,7 +19,7 @@ dependencies:
+     - - "~>"
+       - !ruby/object:Gem::Version
+         version: 2.8.0
+-  type: :runtime
++  type: :development
+   prerelease: false
+   version_requirements: !ruby/object:Gem::Requirement
+     requirements:
diff --git a/databases/ruby-sqlite3/pkg/PLIST b/databases/ruby-sqlite3/pkg/PLIST
index 0ff5dd4a54d..27fb06746e1 100644
--- a/databases/ruby-sqlite3/pkg/PLIST
+++ b/databases/ruby-sqlite3/pkg/PLIST
@@ -1,17 +1,17 @@
 ${GEM_LIB}/cache/${DISTNAME}.gem
 ${GEM_LIB}/gems/${DISTNAME}/
 ${GEM_LIB}/gems/${DISTNAME}/.gemtest
-${GEM_LIB}/gems/${DISTNAME}/.travis.yml
-${GEM_LIB}/gems/${DISTNAME}/API_CHANGES.rdoc
-${GEM_LIB}/gems/${DISTNAME}/CHANGELOG.rdoc
+${GEM_LIB}/gems/${DISTNAME}/API_CHANGES.md
+${GEM_LIB}/gems/${DISTNAME}/CHANGELOG.md
+${GEM_LIB}/gems/${DISTNAME}/CONTRIBUTING.md
 ${GEM_LIB}/gems/${DISTNAME}/ChangeLog.cvs
 ${GEM_LIB}/gems/${DISTNAME}/Gemfile
 ${GEM_LIB}/gems/${DISTNAME}/LICENSE
-${GEM_LIB}/gems/${DISTNAME}/Manifest.txt
-${GEM_LIB}/gems/${DISTNAME}/README.rdoc
-${GEM_LIB}/gems/${DISTNAME}/Rakefile
-${GEM_LIB}/gems/${DISTNAME}/appveyor.yml
+${GEM_LIB}/gems/${DISTNAME}/LICENSE-DEPENDENCIES
+${GEM_LIB}/gems/${DISTNAME}/README.md
+${GEM_LIB}/gems/${DISTNAME}/dependencies.yml
 ${GEM_LIB}/gems/${DISTNAME}/faq/
+${GEM_LIB}/gems/${DISTNAME}/faq/faq.md
 ${GEM_LIB}/gems/${DISTNAME}/faq/faq.rb
 ${GEM_LIB}/gems/${DISTNAME}/faq/faq.yml
 ${GEM_LIB}/gems/${DISTNAME}/lib/
@@ -27,12 +27,9 @@ ${GEM_LIB}/gems/${DISTNAME}/lib/sqlite3/statement.rb
 ${GEM_LIB}/gems/${DISTNAME}/lib/sqlite3/translator.rb
 ${GEM_LIB}/gems/${DISTNAME}/lib/sqlite3/value.rb
 ${GEM_LIB}/gems/${DISTNAME}/lib/sqlite3/version.rb
-${GEM_LIB}/gems/${DISTNAME}/rakelib/
-${GEM_LIB}/gems/${DISTNAME}/rakelib/faq.rake
-${GEM_LIB}/gems/${DISTNAME}/rakelib/gem.rake
-${GEM_LIB}/gems/${DISTNAME}/rakelib/native.rake
-${GEM_LIB}/gems/${DISTNAME}/rakelib/vendor_sqlite3.rake
-${GEM_LIB}/gems/${DISTNAME}/setup.rb
+${GEM_LIB}/gems/${DISTNAME}/ports/
+${GEM_LIB}/gems/${DISTNAME}/ports/archives/
+${GEM_LIB}/gems/${DISTNAME}/ports/archives/sqlite-autoconf-3400000.tar.gz
 ${GEM_LIB}/gems/${DISTNAME}/test/
 ${GEM_LIB}/gems/${DISTNAME}/test/helper.rb
 ${GEM_LIB}/gems/${DISTNAME}/test/test_backup.rb