Update to the latest version of the amalgalite gem. Changelog at https://github.com/copiousfreetime/amalgalite/blob/main/HISTORY.md
Drop dependency on arrayfields, no longer needed. Drop test code from the port as the gem no longer ships with tests. Drop patch that was merged upstream. Note that the ruby33 FLAVOR doesn't build due to a csv gem version issue. However, that FLAVOR isn't built by default, and we'll be dropping the ruby33 FLAVOR from ports after OpenBSD 8.0. So I don't think it's worth the effort to set FLAVORS just to remove it again in a couple months. Tested on amd64. I plan to commit in a couple days unless there are objections. Best, Jeremy Index: Makefile =================================================================== RCS file: /cvs/ports/databases/ruby-amalgalite/Makefile,v diff -u -p -u -p -r1.28 Makefile --- Makefile 13 Nov 2024 03:09:34 -0000 1.28 +++ Makefile 7 Sep 2026 16:09:54 -0000 @@ -1,6 +1,6 @@ COMMENT = ruby SQLite3 embedded database library -DISTNAME = amalgalite-1.9.4 +DISTNAME = amalgalite-2.0.0 CATEGORIES = databases HOMEPAGE = https://github.com/copiousfreetime/amalgalite @@ -17,15 +17,7 @@ CONFIGURE_STYLE = ruby gem ext CONFIGURE_ARGS = --with-cflags="-O1" .endif -BUILD_DEPENDS = ${RUN_DEPENDS} -RUN_DEPENDS = devel/ruby-arrayfields,${MODRUBY_FLAVOR}>=4.9,<5.0 - AMALGALITE_SO_DIR = amalgalite/${MODRUBY_REV} SUBST_VARS += AMALGALITE_SO_DIR - -TEST_DEPENDS = ${FULLPKGNAME}:${BUILD_PKGPATH} -MODRUBY_TEST = rspec3 -MODRUBY_TEST_TARGET = spec -MODRUBY_TEST_ENV = LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 .include <bsd.port.mk> Index: distinfo =================================================================== RCS file: /cvs/ports/databases/ruby-amalgalite/distinfo,v diff -u -p -u -p -r1.11 distinfo --- distinfo 13 Nov 2024 03:09:34 -0000 1.11 +++ distinfo 7 Sep 2026 16:04:35 -0000 @@ -1,2 +1,2 @@ -SHA256 (amalgalite-1.9.4.gem) = OAugVkTqIREWbAPJbU4v/syKEUXQVfyrEQh7smUNIYA= -SIZE (amalgalite-1.9.4.gem) = 2618880 +SHA256 (amalgalite-2.0.0.gem) = OUpbEh6SpOlHvz/IUrmdKIWTCp7T0ybGhg8PzksW/As= +SIZE (amalgalite-2.0.0.gem) = 2650624 Index: patches/patch-ext_amalgalite_c_extconf_rb =================================================================== RCS file: patches/patch-ext_amalgalite_c_extconf_rb diff -N patches/patch-ext_amalgalite_c_extconf_rb --- patches/patch-ext_amalgalite_c_extconf_rb 29 Oct 2025 00:15:51 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,11 +0,0 @@ -Work with Ruby 3.3.10 (and any Ruby version with 2 digit tiny version). -Index: ext/amalgalite/c/extconf.rb ---- ext/amalgalite/c/extconf.rb.orig -+++ ext/amalgalite/c/extconf.rb -@@ -80,5 +80,5 @@ ignoreable_warnings.each do |warning| - $CFLAGS += " -Wno-#{warning}" - end - --subdir = RUBY_VERSION.sub(/\.\d$/,'') -+subdir = RUBY_VERSION.sub(/\.\d+\z/,'') - create_makefile("amalgalite/#{subdir}/amalgalite") Index: pkg/PLIST =================================================================== RCS file: /cvs/ports/databases/ruby-amalgalite/pkg/PLIST,v diff -u -p -u -p -r1.9 PLIST --- pkg/PLIST 11 Mar 2022 18:31:43 -0000 1.9 +++ pkg/PLIST 7 Sep 2026 16:06:55 -0000 @@ -1,26 +1,12 @@ -${GEM_BIN}/amalgalite-pack${GEM_BIN_SUFFIX} ${GEM_LIB}/cache/${DISTNAME}.gem ${GEM_LIB}/gems/${DISTNAME}/ ${GEM_LIB}/gems/${DISTNAME}/CONTRIBUTING.md ${GEM_LIB}/gems/${DISTNAME}/HISTORY.md -${GEM_LIB}/gems/${DISTNAME}/LICENSE +${GEM_LIB}/gems/${DISTNAME}/LICENSE.txt ${GEM_LIB}/gems/${DISTNAME}/Manifest.txt ${GEM_LIB}/gems/${DISTNAME}/README.md -${GEM_LIB}/gems/${DISTNAME}/Rakefile ${GEM_LIB}/gems/${DISTNAME}/TODO.md -${GEM_LIB}/gems/${DISTNAME}/bin/ -${GEM_LIB}/gems/${DISTNAME}/bin/amalgalite-pack -${GEM_LIB}/gems/${DISTNAME}/examples/ -${GEM_LIB}/gems/${DISTNAME}/examples/a.rb -${GEM_LIB}/gems/${DISTNAME}/examples/blob.rb -${GEM_LIB}/gems/${DISTNAME}/examples/bootstrap.rb -${GEM_LIB}/gems/${DISTNAME}/examples/define_aggregate.rb -${GEM_LIB}/gems/${DISTNAME}/examples/define_function.rb -${GEM_LIB}/gems/${DISTNAME}/examples/fts5.rb -${GEM_LIB}/gems/${DISTNAME}/examples/gem-db.rb -${GEM_LIB}/gems/${DISTNAME}/examples/require_me.rb -${GEM_LIB}/gems/${DISTNAME}/examples/requires.rb -${GEM_LIB}/gems/${DISTNAME}/examples/schema-info.rb +${GEM_LIB}/gems/${DISTNAME}/amalgalite.gemspec ${GEM_LIB}/gems/${DISTNAME}/lib/ ${GEM_LIB}/gems/${DISTNAME}/lib/amalgalite/ ${GEM_LIB}/gems/${DISTNAME}/lib/amalgalite.rb @@ -31,19 +17,17 @@ ${GEM_LIB}/gems/${DISTNAME}/lib/amalgali ${GEM_LIB}/gems/${DISTNAME}/lib/amalgalite/boolean.rb ${GEM_LIB}/gems/${DISTNAME}/lib/amalgalite/busy_timeout.rb ${GEM_LIB}/gems/${DISTNAME}/lib/amalgalite/column.rb -${GEM_LIB}/gems/${DISTNAME}/lib/amalgalite/core_ext/ -${GEM_LIB}/gems/${DISTNAME}/lib/amalgalite/core_ext/kernel/ -${GEM_LIB}/gems/${DISTNAME}/lib/amalgalite/core_ext/kernel/require.rb ${GEM_LIB}/gems/${DISTNAME}/lib/amalgalite/csv_table_importer.rb ${GEM_LIB}/gems/${DISTNAME}/lib/amalgalite/database.rb ${GEM_LIB}/gems/${DISTNAME}/lib/amalgalite/function.rb ${GEM_LIB}/gems/${DISTNAME}/lib/amalgalite/index.rb ${GEM_LIB}/gems/${DISTNAME}/lib/amalgalite/memory_database.rb -${GEM_LIB}/gems/${DISTNAME}/lib/amalgalite/packer.rb ${GEM_LIB}/gems/${DISTNAME}/lib/amalgalite/paths.rb ${GEM_LIB}/gems/${DISTNAME}/lib/amalgalite/profile_tap.rb ${GEM_LIB}/gems/${DISTNAME}/lib/amalgalite/progress_handler.rb -${GEM_LIB}/gems/${DISTNAME}/lib/amalgalite/requires.rb +${GEM_LIB}/gems/${DISTNAME}/lib/amalgalite/result/ +${GEM_LIB}/gems/${DISTNAME}/lib/amalgalite/result.rb +${GEM_LIB}/gems/${DISTNAME}/lib/amalgalite/result/row.rb ${GEM_LIB}/gems/${DISTNAME}/lib/amalgalite/schema.rb ${GEM_LIB}/gems/${DISTNAME}/lib/amalgalite/sqlite3/ ${GEM_LIB}/gems/${DISTNAME}/lib/amalgalite/sqlite3.rb @@ -67,45 +51,4 @@ ${GEM_LIB}/gems/${DISTNAME}/lib/amalgali ${GEM_LIB}/gems/${DISTNAME}/lib/amalgalite/type_maps/text_map.rb ${GEM_LIB}/gems/${DISTNAME}/lib/amalgalite/version.rb ${GEM_LIB}/gems/${DISTNAME}/lib/amalgalite/view.rb -${GEM_LIB}/gems/${DISTNAME}/spec/ -${GEM_LIB}/gems/${DISTNAME}/spec/aggregate_spec.rb -${GEM_LIB}/gems/${DISTNAME}/spec/amalgalite_spec.rb -${GEM_LIB}/gems/${DISTNAME}/spec/blob_spec.rb -${GEM_LIB}/gems/${DISTNAME}/spec/boolean_spec.rb -${GEM_LIB}/gems/${DISTNAME}/spec/busy_handler.rb -${GEM_LIB}/gems/${DISTNAME}/spec/data/ -${GEM_LIB}/gems/${DISTNAME}/spec/data/iso-3166-country.txt -${GEM_LIB}/gems/${DISTNAME}/spec/data/iso-3166-schema.sql -${GEM_LIB}/gems/${DISTNAME}/spec/data/iso-3166-subcountry.txt -${GEM_LIB}/gems/${DISTNAME}/spec/data/make-iso-db.sh -${GEM_LIB}/gems/${DISTNAME}/spec/database_spec.rb -${GEM_LIB}/gems/${DISTNAME}/spec/default_map_spec.rb -${GEM_LIB}/gems/${DISTNAME}/spec/function_spec.rb -${GEM_LIB}/gems/${DISTNAME}/spec/integeration_spec.rb -${GEM_LIB}/gems/${DISTNAME}/spec/iso_3166_database.rb -${GEM_LIB}/gems/${DISTNAME}/spec/json_spec.rb -${GEM_LIB}/gems/${DISTNAME}/spec/packer_spec.rb -${GEM_LIB}/gems/${DISTNAME}/spec/paths_spec.rb -${GEM_LIB}/gems/${DISTNAME}/spec/progress_handler_spec.rb -${GEM_LIB}/gems/${DISTNAME}/spec/requires_spec.rb -${GEM_LIB}/gems/${DISTNAME}/spec/rtree_spec.rb -${GEM_LIB}/gems/${DISTNAME}/spec/schema_spec.rb -${GEM_LIB}/gems/${DISTNAME}/spec/spec_helper.rb -${GEM_LIB}/gems/${DISTNAME}/spec/sqlite3/ -${GEM_LIB}/gems/${DISTNAME}/spec/sqlite3/constants_spec.rb -${GEM_LIB}/gems/${DISTNAME}/spec/sqlite3/database_status_spec.rb -${GEM_LIB}/gems/${DISTNAME}/spec/sqlite3/status_spec.rb -${GEM_LIB}/gems/${DISTNAME}/spec/sqlite3/version_spec.rb -${GEM_LIB}/gems/${DISTNAME}/spec/sqlite3_spec.rb -${GEM_LIB}/gems/${DISTNAME}/spec/statement_spec.rb -${GEM_LIB}/gems/${DISTNAME}/spec/storage_map_spec.rb -${GEM_LIB}/gems/${DISTNAME}/spec/tap_spec.rb -${GEM_LIB}/gems/${DISTNAME}/spec/text_map_spec.rb -${GEM_LIB}/gems/${DISTNAME}/spec/type_map_spec.rb -${GEM_LIB}/gems/${DISTNAME}/spec/version_spec.rb -${GEM_LIB}/gems/${DISTNAME}/tasks/ -${GEM_LIB}/gems/${DISTNAME}/tasks/custom.rake -${GEM_LIB}/gems/${DISTNAME}/tasks/default.rake -${GEM_LIB}/gems/${DISTNAME}/tasks/extension.rake -${GEM_LIB}/gems/${DISTNAME}/tasks/this.rb ${GEM_LIB}/specifications/${DISTNAME}.gemspec
