Index: head/databases/rubygem-dbm/Makefile =================================================================== --- head/databases/rubygem-dbm/Makefile (revision 521619) +++ head/databases/rubygem-dbm/Makefile (revision 521620) @@ -1,34 +1,33 @@ # $FreeBSD$ PORTNAME= dbm -PORTVERSION= 1.0.0 -PORTREVISION= 1 +PORTVERSION= 1.1.0 CATEGORIES= databases rubygems MASTER_SITES= RG MAINTAINER= yasu@utahime.org COMMENT= Wrapper for the UNIX-style Database Manager Library LICENSE= BSD2CLAUSE USES= gem USE_RUBY= yes OPTIONS_SINGLE= BACKEND OPTIONS_SINGLE_BACKEND= BDB GDBM LIBC QDBM OPTIONS_DEFAULT= LIBC BACKEND_DESC= Select backend dbm library BDB_USES= bdb BDB_CONFIGURE_ON= --with-dbm-type=db${BDB_VER} GDBM_CONFIGURE_ON= --with-dbm-type=gdbm_compat GDBM_LIB_DEPENDS= libgdbm.so:databases/gdbm LIBC_DESC= libc ndbm support LIBC_CONFIGURE_ON= --with-dbm-type=libc QDBM_DESC= QDBM support QDBM_CONFIGURE_ON= --with-dbm-type=qdbm QDBM_LIB_DEPENDS= libqdbm.so:databases/qdbm pre-configure-GDBM-on: @if [ ! -f ${LOCALBASE}/lib/libgdbm_compat.a ]; then ${ECHO_CMD} You need to reinstall database/gdbm with COMPAT option ON.; exit 1; fi .include Index: head/databases/rubygem-dbm/distinfo =================================================================== --- head/databases/rubygem-dbm/distinfo (revision 521619) +++ head/databases/rubygem-dbm/distinfo (revision 521620) @@ -1,3 +1,3 @@ -TIMESTAMP = 1533121221 -SHA256 (rubygem/dbm-1.0.0.gem) = 68d75998920c92bd81dc9f26e53fb821fa647ba74864cf99ed05fb7afd36317f -SIZE (rubygem/dbm-1.0.0.gem) = 14336 +TIMESTAMP = 1575181462 +SHA256 (rubygem/dbm-1.1.0.gem) = 3bbc86d4bd84f464de4c9bcf2c3b897001239c2368e980fe0b797c175ee107fc +SIZE (rubygem/dbm-1.1.0.gem) = 14336 Index: head/databases/rubygem-dbm/files/patch-ext_dbm_extconf.rb =================================================================== --- head/databases/rubygem-dbm/files/patch-ext_dbm_extconf.rb (revision 521619) +++ head/databases/rubygem-dbm/files/patch-ext_dbm_extconf.rb (revision 521620) @@ -1,59 +1,49 @@ ---- ext/dbm/extconf.rb.orig 2018-08-01 14:46:21 UTC +--- ext/dbm/extconf.rb.orig 2019-12-01 06:24:29 UTC +++ ext/dbm/extconf.rb -@@ -23,7 +23,7 @@ dir_config("dbm") +@@ -24,7 +24,7 @@ dir_config("dbm") if dblib = with_config("dbm-type", nil) dblib = dblib.split(/[ ,]+/) else -- dblib = %w(libc db db2 db1 db5 db4 db3 gdbm_compat gdbm qdbm) +- dblib = %w(libc db db2 db1 db6 db5 db4 db3 gdbm_compat gdbm qdbm) + dblib = %w(libc db db2 db1 db6 db5 db48 db3 gdbm_compat gdbm qdbm) end headers = { -@@ -32,8 +32,9 @@ headers = { +@@ -33,7 +33,7 @@ headers = { "db1" => ["db1/ndbm.h", "db1.h", "ndbm.h"], "db2" => ["db2/db.h", "db2.h", "db.h"], "db3" => ["db3/db.h", "db3.h", "db.h"], - "db4" => ["db4/db.h", "db4.h", "db.h"], + "db48" => ["db48/db.h", "db4.h", "db.h"], "db5" => ["db5/db.h", "db5.h", "db.h"], -+ "db6" => ["db6/db.h", "db6.h", "db.h"], + "db6" => ["db6/db.h", "db6.h", "db.h"], "gdbm_compat" => ["gdbm-ndbm.h", "gdbm/ndbm.h", "ndbm.h"], # GDBM since 1.8.1 - "gdbm" => ["gdbm-ndbm.h", "gdbm/ndbm.h", "ndbm.h"], # GDBM until 1.8.0 - "qdbm" => ["qdbm/relic.h", "relic.h"], -@@ -125,13 +126,26 @@ end +@@ -127,6 +127,19 @@ end def headers.db_check2(db, hdr) + libraries = { + "db" => "db", + "db1" => "db1", + "db2" => "db2", + "db3" => "db3", + "db48" => "db-4.8", + "db5" => "db-5", + "db6" => "db-6", + "gdbm_compat" => "gdbm_compat", + "gdbm" => "gdbm", + "qdbm" => "qdbm", + } + $defs.push(%{-DRUBYDBM_DBM_HEADER='"#{hdr}"'}) $defs.push(%{-DRUBYDBM_DBM_TYPE='"#{db}"'}) - hsearch = nil - - case db -- when /^db[2-5]?$/ -+ when /^db[2-6].*$/ - hsearch = "-DDB_DBM_HSEARCH" - when "gdbm_compat" - have_library("gdbm") or return false -@@ -145,7 +159,7 @@ def headers.db_check2(db, hdr) +@@ -147,7 +160,7 @@ def headers.db_check2(db, hdr) # 4.3BSD original ndbm is contained in libc. # 4.4BSD (and its derivatives such as NetBSD) contains Berkeley DB 1 in libc. if !(db == 'libc' ? have_func('dbm_open("", 0, 0)', hdr, hsearch) : - have_library(db, 'dbm_open("", 0, 0)', hdr, hsearch)) + have_library(libraries[db], 'dbm_open("", 0, 0)', hdr, hsearch)) return false end