Index: Mk/bsd.ruby.mk
===================================================================
--- Mk/bsd.ruby.mk
+++ Mk/bsd.ruby.mk
@@ -155,7 +155,7 @@
 # Ruby 2.4
 #
 RUBY_RELVERSION=	2.4.6
-RUBY_PORTREVISION=	0
+RUBY_PORTREVISION=	1
 RUBY_PORTEPOCH=		1
 RUBY_PATCHLEVEL=	0
 RUBY24=			""	# PLIST_SUB helpers
@@ -165,7 +165,7 @@
 # Ruby 2.5
 #
 RUBY_RELVERSION=	2.5.5
-RUBY_PORTREVISION=	1
+RUBY_PORTREVISION=	2
 RUBY_PORTEPOCH=		1
 RUBY_PATCHLEVEL=	0
 RUBY25=			""	# PLIST_SUB helpers
Index: databases/Makefile
===================================================================
--- databases/Makefile
+++ databases/Makefile
@@ -922,6 +922,7 @@
     SUBDIR += rubygem-dbd-sqlite3
     SUBDIR += rubygem-dbf
     SUBDIR += rubygem-dbi
+    SUBDIR += rubygem-dbm
     SUBDIR += rubygem-dm-aggregates
     SUBDIR += rubygem-dm-chunked_query
     SUBDIR += rubygem-dm-constraints
Index: databases/rubygem-dbm/Makefile
===================================================================
--- /dev/null
+++ databases/rubygem-dbm/Makefile
@@ -0,0 +1,33 @@
+# $FreeBSD$
+
+PORTNAME=	dbm
+PORTVERSION=	1.0.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=		BDB
+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 <bsd.port.mk>
Index: databases/rubygem-dbm/distinfo
===================================================================
--- /dev/null
+++ databases/rubygem-dbm/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1533121221
+SHA256 (rubygem/dbm-1.0.0.gem) = 68d75998920c92bd81dc9f26e53fb821fa647ba74864cf99ed05fb7afd36317f
+SIZE (rubygem/dbm-1.0.0.gem) = 14336
Index: databases/rubygem-dbm/files/patch-ext_dbm_extconf.rb
===================================================================
--- /dev/null
+++ databases/rubygem-dbm/files/patch-ext_dbm_extconf.rb
@@ -0,0 +1,59 @@
+--- ext/dbm/extconf.rb.orig	2018-08-01 14:46:21 UTC
++++ ext/dbm/extconf.rb
+@@ -23,7 +23,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 db48 db3 gdbm_compat gdbm qdbm)
+ end
+ 
+ headers = {
+@@ -32,8 +32,9 @@ 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"],
+   "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
+ 
+ 
+ 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)
+   # 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
+ 
Index: databases/rubygem-dbm/pkg-descr
===================================================================
--- /dev/null
+++ databases/rubygem-dbm/pkg-descr
@@ -0,0 +1,24 @@
+The DBM class provides a wrapper to a Unix-style Database Manager
+library.
+
+Dbm databases do not have tables or columns; they are simple key-value
+data stores, like a Ruby Hash except not resident in RAM. Keys and
+values must be strings.
+
+The exact library used depends on how Ruby was compiled. It could be
+any of the following:
+
+* The original ndbm library is released in 4.3BSD. It is based on dbm
+  library in Unix Version 7 but has different API to support multiple
+  databases in a process.
+* Berkeley DB versions 1 thru 6, also known as BDB and Sleepycat DB,
+  now owned by Oracle Corporation.
+* Berkeley DB 1.x, still found in 4.4BSD derivatives (FreeBSD,
+  OpenBSD, etc).
+* GDBM, the GNU implementation of dbm.
+* QDBM, another open source reimplementation of dbm.
+
+All of these dbm implementations have their own Ruby interfaces
+available, which provide richer (but varying) APIs.
+
+WWW: https://github.com/ruby/dbm
Index: lang/rubinius/Makefile
===================================================================
--- lang/rubinius/Makefile
+++ lang/rubinius/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	rubinius
-PORTVERSION=	3.86
-PORTREVISION=	1
+PORTVERSION=	3.107
 CATEGORIES=	lang
 MASTER_SITES=	http://releases.rubini.us/:source
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX}:source
@@ -19,14 +18,15 @@
 
 BUILD_DEPENDS=	${LOCALBASE}/bin/bundle:sysutils/rubygem-bundler \
 		${LOCALBASE}/bin/bison:devel/bison \
-		${LLVM_CONFIG_PATH}:devel/llvm${LLVM_DEFAULT}
+		${LLVM_CONFIG_PATH}:devel/llvm${LLVM_DEFAULT} \
+		rake:devel/rubygem-rake \
+		bash:shells/bash
 LIB_DEPENDS=	libyaml.so:textproc/libyaml
 
-HAS_CONFIGURE=	yes
+#HAS_CONFIGURE=	yes
 CONFIGURE_ARGS=	-P "${PREFIX}" \
 		-I "${PREFIX}/include/rubinius" \
 		-L "${PREFIX}/lib/ruby/rubinius" \
-		-G "${PREFIX}/lib/ruby/gems/rubinius" \
 		-B "${PREFIX}/bin" \
 		-M "${PREFIX}/man" \
 		--cc ${LLVM_CC_PATH} \
@@ -49,10 +49,6 @@
 GEM_PATH=	${WRKSRC}/gems/ruby/${RUBY_VER}
 RAKE_BIN=	${GEM_PATH}/bin/rake
 
-# https://github.com/rubinius/rubinius/issues/3716
-CFLAGS+=	-Qunused-arguments
-CPPFLAGS+=	-Qunused-arguments
-CXXFLAGS+=	-Qunused-arguments
 
 # Hack to prevent rbx from creating $HOME/.rbx during compilation of gems
 MAKE_ENV+=	HOME=${WRKSRC}
@@ -69,10 +65,10 @@
 
 .include <bsd.port.pre.mk>
 
-.if ${SSL_DEFAULT} == base
-BROKEN_FreeBSD_12=	checking for OpenSSL_add_all_digests() in -lcrypto... no
-BROKEN_FreeBSD_13=	checking for OpenSSL_add_all_digests() in -lcrypto... no
-.endif
+#.if ${SSL_DEFAULT} == base
+#BROKEN_FreeBSD_12=	checking for OpenSSL_add_all_digests() in -lcrypto... no
+#BROKEN_FreeBSD_13=	checking for OpenSSL_add_all_digests() in -lcrypto... no
+#.endif
 
 .if ${ARCH} == "amd64"
 F_ARCH=		x86_64
@@ -80,37 +76,30 @@
 F_ARCH=		x86
 .endif
 
-post-extract:
-.for DF in ${DISTFILES:N*\:source}
-	@${LN} -s ${DISTDIR}/${DF:C/:gems//g} ${WRKSRC}/vendor/cache/
-.endfor
-	@${CP} ${FILESDIR}/build-tool.c ${WRKDIR}
+#post-extract:
+#.for DF in ${DISTFILES:N*\:source}
+#	@${LN} -s ${DISTDIR}/${DF:C/:gems//g} ${WRKSRC}/vendor/cache/
+#.endfor
+#	@${CP} ${FILESDIR}/build-tool.c ${WRKDIR}
 
 post-patch:
 	@${GREP} -Rl '#!.*ruby$$'  ${WRKSRC} |${XARGS} ${REINPLACE_CMD} -e '/^#!.*ruby$$/s/ruby$$/${RUBY_NAME}/g'
-	@${REINPLACE_CMD} -e "s,%%CC%%,${LLVM_CC_PATH}," ${WRKSRC}/configure ${WRKDIR}/build-tool.c
-	@${REINPLACE_CMD} -e "s,%%CXX%%,${LLVM_CXX_PATH}," ${WRKSRC}/configure ${WRKDIR}/build-tool.c
+	@${REINPLACE_CMD} -e "s,%%CC%%,${LLVM_CC_PATH}," ${WRKSRC}/configure
+	@${REINPLACE_CMD} -e "s,%%CXX%%,${LLVM_CXX_PATH}," ${WRKSRC}/configure
 
-pre-configure:
-	@cd ${WRKSRC} && ${MKDIR} gems && ${LOCALBASE}/bin/bundle install --local --path=${WRKSRC}/gems
+#pre-configure:
+#	@cd ${WRKSRC} && ${MKDIR} gems && ${LOCALBASE}/bin/bundle install --local --path=${WRKSRC}/gems
 
 post-configure:
 	# Setup paths to compilers
-	@${CC} -o ${WRKSRC}/build/bin/build-tool ${WRKDIR}/build-tool.c
+	#@${CC} -o ${WRKSRC}/build/bin/build-tool ${WRKDIR}/build-tool.c
 	@${LN} -sf ${WRKSRC}/build/bin/build-tool ${WRKSRC}/build/bin/cc
 	@${LN} -sf ${WRKSRC}/build/bin/build-tool ${WRKSRC}/build/bin/c++
 
+#do-build:
+#	${LOCALBASE}/bin/rake
+
 do-build:
-	# "build" target here installs into ${STAGEDIR}${PREFIX}
-	@(cd ${WRKSRC}/; ${SETENV} ${MAKE_ENV} ${RAKE_BIN} -j ${MAKE_JOBS_NUMBER} build)
-	@${MKDIR} ${STAGEDIR}${PREFIX}/lib/ruby/site_ruby/rubinius
-	@${MKDIR} ${STAGEDIR}${PREFIX}/lib/ruby/vendor_ruby/rubinius
-	@${TOUCH} ${STAGEDIR}${PREFIX}/lib/ruby/site_ruby/rubinius/.keep_me
-	@${TOUCH} ${STAGEDIR}${PREFIX}/lib/ruby/vendor_ruby/rubinius/.keep_me
-	@${MV} ${STAGEDIR}${PREFIX}/bin/testrb ${STAGEDIR}${PREFIX}/bin/testrbx
-	@${FIND} ${STAGEDIR} -type f -name '*.so' |${XARGS} ${STRIP_CMD}
-	@${FIND} ${STAGEDIR} -type f -name 'gem_make.out' -delete
-	@${FIND} ${STAGEDIR} -type f -name 'mkmf.log' -delete
-	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/rbx
+	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${LOCALBASE}/bin/bash ./build.sh ${CONFIGURE_ARGS}
 
 .include <bsd.port.post.mk>
Index: lang/rubinius/distinfo
===================================================================
--- lang/rubinius/distinfo
+++ lang/rubinius/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1506919612
-SHA256 (rubinius-3.86.tar.bz2) = cfb0650b937d109cf52c982f185ef247cc7a184dbb5f16c625d4827cef11f6fb
-SIZE (rubinius-3.86.tar.bz2) = 12559664
+TIMESTAMP = 1555988521
+SHA256 (rubinius-3.107.tar.bz2) = 46d68cb26ce83fb503b25776770abad6a55ef03a14cd4fd05f44e17becb71589
+SIZE (rubinius-3.107.tar.bz2) = 16168637
Index: lang/ruby24/Makefile
===================================================================
--- lang/ruby24/Makefile
+++ lang/ruby24/Makefile
@@ -133,7 +133,7 @@
 post-patch:
 	@${FIND} ${WRKSRC}/ -name "*.orig" -delete
 # We get these from other ports
-.for d in bin/rake doc/rake lib/rake test/rake man/rake.1 lib/rake.rb ext/win32ole bin/gem ext/gdbm
+.for d in bin/rake doc/rake lib/rake test/rake man/rake.1 lib/rake.rb ext/win32ole bin/gem ext/dbm ext/gdbm
 	@${RM} -r ${BUILD_WRKSRC}/${d}
 .endfor
 
Index: lang/ruby24/pkg-message
===================================================================
--- lang/ruby24/pkg-message
+++ lang/ruby24/pkg-message
@@ -8,6 +8,7 @@
 And some of the standard libraries are provided as separate ports
 since they require extra dependencies:
 
+	databases/rubygem-dbm:  DBM module
 	databases/rubygem-gdbm:	GDBM module
 
 Install them as occasion demands.
Index: lang/ruby24/pkg-plist
===================================================================
--- lang/ruby24/pkg-plist
+++ lang/ruby24/pkg-plist
@@ -45,7 +45,6 @@
 %%RUBY_ARCHLIBDIR%%/continuation.so
 %%RUBY_ARCHLIBDIR%%/coverage.so
 %%RUBY_ARCHLIBDIR%%/date_core.so
-%%RUBY_ARCHLIBDIR%%/dbm.so
 %%RUBY_ARCHLIBDIR%%/digest.so
 %%RUBY_ARCHLIBDIR%%/digest/bubblebabble.so
 %%RUBY_ARCHLIBDIR%%/digest/md5.so
@@ -1570,8 +1569,6 @@
 %%CAPIDOCS%%%%RUBY_DOCDIR%%/capi/html/d0/dca/cparse_8c__incl.png
 %%CAPIDOCS%%%%RUBY_DOCDIR%%/capi/html/d0/dce/structtranscoder__entry__t.html
 %%CAPIDOCS%%%%RUBY_DOCDIR%%/capi/html/d0/dcf/struct_r_data.html
-%%CAPIDOCS%%%%RUBY_DOCDIR%%/capi/html/d0/dd4/dbm_8c.html
-%%CAPIDOCS%%%%RUBY_DOCDIR%%/capi/html/d0/dd4/dbm_8c_source.html
 %%CAPIDOCS%%%%RUBY_DOCDIR%%/capi/html/d0/dd6/cls__align__longdouble_8c__incl.map
 %%CAPIDOCS%%%%RUBY_DOCDIR%%/capi/html/d0/dd6/cls__align__longdouble_8c__incl.md5
 %%CAPIDOCS%%%%RUBY_DOCDIR%%/capi/html/d0/dd6/cls__align__longdouble_8c__incl.png
@@ -7762,9 +7759,6 @@
 %%CAPIDOCS%%%%RUBY_DOCDIR%%/capi/html/da/d9c/structmy__ffi__struct.html
 %%CAPIDOCS%%%%RUBY_DOCDIR%%/capi/html/da/da3/uninitialized_8c.html
 %%CAPIDOCS%%%%RUBY_DOCDIR%%/capi/html/da/da3/uninitialized_8c_source.html
-%%CAPIDOCS%%%%RUBY_DOCDIR%%/capi/html/da/da7/dbm_8c__incl.map
-%%CAPIDOCS%%%%RUBY_DOCDIR%%/capi/html/da/da7/dbm_8c__incl.md5
-%%CAPIDOCS%%%%RUBY_DOCDIR%%/capi/html/da/da7/dbm_8c__incl.png
 %%CAPIDOCS%%%%RUBY_DOCDIR%%/capi/html/da/daa/m32r_2ffitarget_8h.html
 %%CAPIDOCS%%%%RUBY_DOCDIR%%/capi/html/da/daa/m32r_2ffitarget_8h_source.html
 %%CAPIDOCS%%%%RUBY_DOCDIR%%/capi/html/da/daf/closure__loc__fn0_8c.html
@@ -13785,7 +13779,6 @@
 %%CAPIDOCS%%%%RUBY_DOCDIR%%/capi/html/dir_dfc81d2f50f6fc5c959b742953049d17.html
 %%CAPIDOCS%%%%RUBY_DOCDIR%%/capi/html/dir_e2880ea4861c7faab396f7eae0d279cf.html
 %%CAPIDOCS%%%%RUBY_DOCDIR%%/capi/html/dir_e569f1f249a5b8928005532ef02d400a.html
-%%CAPIDOCS%%%%RUBY_DOCDIR%%/capi/html/dir_ed02b758e553a4ff9880be20db501742.html
 %%CAPIDOCS%%%%RUBY_DOCDIR%%/capi/html/dir_edcac78fefd555296ea74cbd19166f0f.html
 %%CAPIDOCS%%%%RUBY_DOCDIR%%/capi/html/dir_f31b4e64177b4fa91891089086fd6e81.html
 %%CAPIDOCS%%%%RUBY_DOCDIR%%/capi/html/dir_f3bfeebb553c3f6ecfb19202628b4493.html
@@ -14973,45 +14966,6 @@
 %%RDOC%%%%RUBY_RIDIR%%/Coverage/peek_result-c.ri
 %%RDOC%%%%RUBY_RIDIR%%/Coverage/result-c.ri
 %%RDOC%%%%RUBY_RIDIR%%/Coverage/start-c.ri
-%%RDOC%%%%RUBY_RIDIR%%/DBM/%5b%5d%3d-i.ri
-%%RDOC%%%%RUBY_RIDIR%%/DBM/%5b%5d-i.ri
-%%RDOC%%%%RUBY_RIDIR%%/DBM/cdesc-DBM.ri
-%%RDOC%%%%RUBY_RIDIR%%/DBM/clear-i.ri
-%%RDOC%%%%RUBY_RIDIR%%/DBM/close-i.ri
-%%RDOC%%%%RUBY_RIDIR%%/DBM/closed%3f-i.ri
-%%RDOC%%%%RUBY_RIDIR%%/DBM/delete-i.ri
-%%RDOC%%%%RUBY_RIDIR%%/DBM/delete_if-i.ri
-%%RDOC%%%%RUBY_RIDIR%%/DBM/each-i.ri
-%%RDOC%%%%RUBY_RIDIR%%/DBM/each_key-i.ri
-%%RDOC%%%%RUBY_RIDIR%%/DBM/each_pair-i.ri
-%%RDOC%%%%RUBY_RIDIR%%/DBM/each_value-i.ri
-%%RDOC%%%%RUBY_RIDIR%%/DBM/empty%3f-i.ri
-%%RDOC%%%%RUBY_RIDIR%%/DBM/fetch-i.ri
-%%RDOC%%%%RUBY_RIDIR%%/DBM/has_key%3f-i.ri
-%%RDOC%%%%RUBY_RIDIR%%/DBM/has_value%3f-i.ri
-%%RDOC%%%%RUBY_RIDIR%%/DBM/include%3f-i.ri
-%%RDOC%%%%RUBY_RIDIR%%/DBM/invert-i.ri
-%%RDOC%%%%RUBY_RIDIR%%/DBM/key%3f-i.ri
-%%RDOC%%%%RUBY_RIDIR%%/DBM/key-i.ri
-%%RDOC%%%%RUBY_RIDIR%%/DBM/keys-i.ri
-%%RDOC%%%%RUBY_RIDIR%%/DBM/length-i.ri
-%%RDOC%%%%RUBY_RIDIR%%/DBM/member%3f-i.ri
-%%RDOC%%%%RUBY_RIDIR%%/DBM/new-c.ri
-%%RDOC%%%%RUBY_RIDIR%%/DBM/open-c.ri
-%%RDOC%%%%RUBY_RIDIR%%/DBM/reject%21-i.ri
-%%RDOC%%%%RUBY_RIDIR%%/DBM/reject-i.ri
-%%RDOC%%%%RUBY_RIDIR%%/DBM/replace-i.ri
-%%RDOC%%%%RUBY_RIDIR%%/DBM/select-i.ri
-%%RDOC%%%%RUBY_RIDIR%%/DBM/shift-i.ri
-%%RDOC%%%%RUBY_RIDIR%%/DBM/size-i.ri
-%%RDOC%%%%RUBY_RIDIR%%/DBM/store-i.ri
-%%RDOC%%%%RUBY_RIDIR%%/DBM/to_a-i.ri
-%%RDOC%%%%RUBY_RIDIR%%/DBM/to_hash-i.ri
-%%RDOC%%%%RUBY_RIDIR%%/DBM/update-i.ri
-%%RDOC%%%%RUBY_RIDIR%%/DBM/value%3f-i.ri
-%%RDOC%%%%RUBY_RIDIR%%/DBM/values-i.ri
-%%RDOC%%%%RUBY_RIDIR%%/DBM/values_at-i.ri
-%%RDOC%%%%RUBY_RIDIR%%/DBMError/cdesc-DBMError.ri
 %%RDOC%%%%RUBY_RIDIR%%/DEBUGGER__/Thread/cdesc-Thread.ri
 %%RDOC%%%%RUBY_RIDIR%%/DEBUGGER__/break_points-c.ri
 %%RDOC%%%%RUBY_RIDIR%%/DEBUGGER__/cdesc-DEBUGGER__.ri
Index: lang/ruby25/Makefile
===================================================================
--- lang/ruby25/Makefile
+++ lang/ruby25/Makefile
@@ -133,7 +133,7 @@
 post-patch:
 	@${FIND} ${WRKSRC}/ -name "*.orig" -delete
 # We get these from other ports
-.for d in bin/rake doc/rake lib/rake test/rake man/rake.1 lib/rake.rb ext/win32ole bin/gem ext/gdbm
+.for d in bin/rake doc/rake lib/rake test/rake man/rake.1 lib/rake.rb ext/win32ole bin/gem ext/dbm ext/gdbm
 	@${RM} -r ${BUILD_WRKSRC}/${d}
 .endfor
 
Index: lang/ruby25/pkg-message
===================================================================
--- lang/ruby25/pkg-message
+++ lang/ruby25/pkg-message
@@ -8,6 +8,7 @@
 And some of the standard libraries are provided as separate ports
 since they require extra dependencies:
 
+	databases/rubygem-dbm:	DBM module
 	databases/rubygem-gdbm:	GDBM module
 
 Install them as occasion demands.
Index: lang/ruby25/pkg-plist
===================================================================
--- lang/ruby25/pkg-plist
+++ lang/ruby25/pkg-plist
@@ -45,7 +45,6 @@
 %%RUBY_ARCHLIBDIR%%/continuation.so
 %%RUBY_ARCHLIBDIR%%/coverage.so
 %%RUBY_ARCHLIBDIR%%/date_core.so
-%%RUBY_ARCHLIBDIR%%/dbm.so
 %%RUBY_ARCHLIBDIR%%/digest.so
 %%RUBY_ARCHLIBDIR%%/digest/bubblebabble.so
 %%RUBY_ARCHLIBDIR%%/digest/md5.so
@@ -1338,8 +1337,6 @@
 %%CAPIDOCS%%%%RUBY_DOCDIR%%/capi/html/d0/dca/cparse_8c__incl.png
 %%CAPIDOCS%%%%RUBY_DOCDIR%%/capi/html/d0/dce/structtranscoder__entry__t.html
 %%CAPIDOCS%%%%RUBY_DOCDIR%%/capi/html/d0/dcf/struct_r_data.html
-%%CAPIDOCS%%%%RUBY_DOCDIR%%/capi/html/d0/dd4/dbm_8c.html
-%%CAPIDOCS%%%%RUBY_DOCDIR%%/capi/html/d0/dd4/dbm_8c_source.html
 %%CAPIDOCS%%%%RUBY_DOCDIR%%/capi/html/d0/dd6/cls__align__longdouble_8c__incl.map
 %%CAPIDOCS%%%%RUBY_DOCDIR%%/capi/html/d0/dd6/cls__align__longdouble_8c__incl.md5
 %%CAPIDOCS%%%%RUBY_DOCDIR%%/capi/html/d0/dd6/cls__align__longdouble_8c__incl.png
@@ -5024,9 +5021,6 @@
 %%CAPIDOCS%%%%RUBY_DOCDIR%%/capi/html/da/da6/group__exception_gac9d130ee30ed9061af51b20fbe3eb580_icgraph.map
 %%CAPIDOCS%%%%RUBY_DOCDIR%%/capi/html/da/da6/group__exception_gac9d130ee30ed9061af51b20fbe3eb580_icgraph.md5
 %%CAPIDOCS%%%%RUBY_DOCDIR%%/capi/html/da/da6/group__exception_gac9d130ee30ed9061af51b20fbe3eb580_icgraph.png
-%%CAPIDOCS%%%%RUBY_DOCDIR%%/capi/html/da/da7/dbm_8c__incl.map
-%%CAPIDOCS%%%%RUBY_DOCDIR%%/capi/html/da/da7/dbm_8c__incl.md5
-%%CAPIDOCS%%%%RUBY_DOCDIR%%/capi/html/da/da7/dbm_8c__incl.png
 %%CAPIDOCS%%%%RUBY_DOCDIR%%/capi/html/da/daa/m32r_2ffitarget_8h.html
 %%CAPIDOCS%%%%RUBY_DOCDIR%%/capi/html/da/daa/m32r_2ffitarget_8h_source.html
 %%CAPIDOCS%%%%RUBY_DOCDIR%%/capi/html/da/daf/closure__loc__fn0_8c.html
@@ -7979,7 +7973,6 @@
 %%CAPIDOCS%%%%RUBY_DOCDIR%%/capi/html/dir_dac09067abbbebbfd6b5b3e47930c087.html
 %%CAPIDOCS%%%%RUBY_DOCDIR%%/capi/html/dir_e2880ea4861c7faab396f7eae0d279cf.html
 %%CAPIDOCS%%%%RUBY_DOCDIR%%/capi/html/dir_e569f1f249a5b8928005532ef02d400a.html
-%%CAPIDOCS%%%%RUBY_DOCDIR%%/capi/html/dir_ed02b758e553a4ff9880be20db501742.html
 %%CAPIDOCS%%%%RUBY_DOCDIR%%/capi/html/dir_edcac78fefd555296ea74cbd19166f0f.html
 %%CAPIDOCS%%%%RUBY_DOCDIR%%/capi/html/dir_f31b4e64177b4fa91891089086fd6e81.html
 %%CAPIDOCS%%%%RUBY_DOCDIR%%/capi/html/dir_f3bfeebb553c3f6ecfb19202628b4493.html
@@ -9164,45 +9157,6 @@
 %%RDOC%%%%RUBY_RIDIR%%/Coverage/result-c.ri
 %%RDOC%%%%RUBY_RIDIR%%/Coverage/running%3f-c.ri
 %%RDOC%%%%RUBY_RIDIR%%/Coverage/start-c.ri
-%%RDOC%%%%RUBY_RIDIR%%/DBM/%5b%5d%3d-i.ri
-%%RDOC%%%%RUBY_RIDIR%%/DBM/%5b%5d-i.ri
-%%RDOC%%%%RUBY_RIDIR%%/DBM/cdesc-DBM.ri
-%%RDOC%%%%RUBY_RIDIR%%/DBM/clear-i.ri
-%%RDOC%%%%RUBY_RIDIR%%/DBM/close-i.ri
-%%RDOC%%%%RUBY_RIDIR%%/DBM/closed%3f-i.ri
-%%RDOC%%%%RUBY_RIDIR%%/DBM/delete-i.ri
-%%RDOC%%%%RUBY_RIDIR%%/DBM/delete_if-i.ri
-%%RDOC%%%%RUBY_RIDIR%%/DBM/each-i.ri
-%%RDOC%%%%RUBY_RIDIR%%/DBM/each_key-i.ri
-%%RDOC%%%%RUBY_RIDIR%%/DBM/each_pair-i.ri
-%%RDOC%%%%RUBY_RIDIR%%/DBM/each_value-i.ri
-%%RDOC%%%%RUBY_RIDIR%%/DBM/empty%3f-i.ri
-%%RDOC%%%%RUBY_RIDIR%%/DBM/fetch-i.ri
-%%RDOC%%%%RUBY_RIDIR%%/DBM/has_key%3f-i.ri
-%%RDOC%%%%RUBY_RIDIR%%/DBM/has_value%3f-i.ri
-%%RDOC%%%%RUBY_RIDIR%%/DBM/include%3f-i.ri
-%%RDOC%%%%RUBY_RIDIR%%/DBM/invert-i.ri
-%%RDOC%%%%RUBY_RIDIR%%/DBM/key%3f-i.ri
-%%RDOC%%%%RUBY_RIDIR%%/DBM/key-i.ri
-%%RDOC%%%%RUBY_RIDIR%%/DBM/keys-i.ri
-%%RDOC%%%%RUBY_RIDIR%%/DBM/length-i.ri
-%%RDOC%%%%RUBY_RIDIR%%/DBM/member%3f-i.ri
-%%RDOC%%%%RUBY_RIDIR%%/DBM/new-c.ri
-%%RDOC%%%%RUBY_RIDIR%%/DBM/open-c.ri
-%%RDOC%%%%RUBY_RIDIR%%/DBM/reject%21-i.ri
-%%RDOC%%%%RUBY_RIDIR%%/DBM/reject-i.ri
-%%RDOC%%%%RUBY_RIDIR%%/DBM/replace-i.ri
-%%RDOC%%%%RUBY_RIDIR%%/DBM/select-i.ri
-%%RDOC%%%%RUBY_RIDIR%%/DBM/shift-i.ri
-%%RDOC%%%%RUBY_RIDIR%%/DBM/size-i.ri
-%%RDOC%%%%RUBY_RIDIR%%/DBM/store-i.ri
-%%RDOC%%%%RUBY_RIDIR%%/DBM/to_a-i.ri
-%%RDOC%%%%RUBY_RIDIR%%/DBM/to_hash-i.ri
-%%RDOC%%%%RUBY_RIDIR%%/DBM/update-i.ri
-%%RDOC%%%%RUBY_RIDIR%%/DBM/value%3f-i.ri
-%%RDOC%%%%RUBY_RIDIR%%/DBM/values-i.ri
-%%RDOC%%%%RUBY_RIDIR%%/DBM/values_at-i.ri
-%%RDOC%%%%RUBY_RIDIR%%/DBMError/cdesc-DBMError.ri
 %%RDOC%%%%RUBY_RIDIR%%/DEBUGGER__/Thread/cdesc-Thread.ri
 %%RDOC%%%%RUBY_RIDIR%%/DEBUGGER__/break_points-c.ri
 %%RDOC%%%%RUBY_RIDIR%%/DEBUGGER__/cdesc-DEBUGGER__.ri