Attachment 195757 Details for Bug 230289 – patch file

[patch] patch file

databases_rubygem-dbm.patch (text/plain), 25.93 KB, created by Yasuhiro Kimura on 2018-08-02 07:08:34 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Yasuhiro Kimura

Created: 2018-08-02 07:08:34 UTC

Size: 25.93 KB

patch

obsolete

>Index: Mk/bsd.ruby.mk
>===================================================================
>--- Mk/bsd.ruby.mk	(revision 476221)
>+++ Mk/bsd.ruby.mk	(working copy)
>@@ -155,7 +155,7 @@
> # Ruby 2.3
> #
> RUBY_RELVERSION=	2.3.7
>-RUBY_PORTREVISION=	1
>+RUBY_PORTREVISION=	2
> RUBY_PORTEPOCH=		1
> RUBY_PATCHLEVEL=	0
> RUBY23=			""	# PLIST_SUB helpers
>@@ -165,7 +165,7 @@
> # Ruby 2.4
> #
> RUBY_RELVERSION=	2.4.4
>-RUBY_PORTREVISION=	2
>+RUBY_PORTREVISION=	3
> RUBY_PORTEPOCH=		1
> RUBY_PATCHLEVEL=	0
> RUBY24=			""	# PLIST_SUB helpers
>@@ -175,7 +175,7 @@
> # Ruby 2.5
> #
> RUBY_RELVERSION=	2.5.1
>-RUBY_PORTREVISION=	2
>+RUBY_PORTREVISION=	3
> RUBY_PORTEPOCH=		1
> RUBY_PATCHLEVEL=	0
> RUBY25=			""	# PLIST_SUB helpers
>Index: databases/Makefile
>===================================================================
>--- databases/Makefile	(revision 476221)
>+++ databases/Makefile	(working copy)
>@@ -949,6 +949,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
>===================================================================
>--- databases/rubygem-dbm/Makefile	(nonexistent)
>+++ databases/rubygem-dbm/Makefile	(working copy)
>@@ -0,0 +1,47 @@
>+# $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=		BACKEND_BDB BACKEND_GDBM BACKEND_LIBC BACKEND_QDBM
>+OPTIONS_DEFAULT=		BACKEND_BDB
>+BACKEND_DESC=			Select back end dbm library
>+BACKEND_BDB_DESC=		Use Berkeley DB as back end
>+BACKEND_BDB_USES=		bdb
>+BACKEND_GDBM_DESC=		Use GDBM as back end
>+BACKEND_GDBM_LIB_DEPENDS+=	libgdbm.so:databases/gdbm
>+BACKEND_LIBC_DESC=		Use libc as back end
>+BACKEND_QDBM_DESC=		Use QDBM as back end
>+BACKEND_QDBM_LIB_DEPENDS+=	libqdbm.so:databases/qdbm
>+
>+.include <bsd.port.pre.mk>
>+
>+.if ${ARCH} == aarch64 || ${ARCH} == amd64 || ${ARCH} == i386
>+LIB_DEPENDS+=	libunwind.so:devel/libunwind
>+.endif
>+
>+.if ${PORT_OPTIONS:MBACKEND_BDB}
>+CONFIGURE_ARGS+=	--with-dbm-type=db${BDB_VER}
>+.elif ${PORT_OPTIONS:MBACKEND_GDBM}
>+CONFIGURE_ARGS+=	--with-dbm-type=gdbm_compat
>+.elif ${PORT_OPTIONS:MBACKEND_LIBC}
>+CONFIGURE_ARGS+=	--with-dbm-type=libc
>+.elif ${PORT_OPTIONS:MBACKEND_QDBM}
>+CONFIGURE_ARGS+=	--with-dbm-type=qdbm
>+.endif
>+
>+pre-configure-BACKEND_GDBM-on:
>+	@if [ ! -f ${PREFIX}/lib/libgdbm_compat.a ]; then ${ECHO_CMD} You need to reinstall database/gdbm with COMPAT option ON.; exit 1; fi
>+
>+.include <bsd.port.post.mk>
>Index: databases/rubygem-dbm/distinfo
>===================================================================
>--- databases/rubygem-dbm/distinfo	(nonexistent)
>+++ databases/rubygem-dbm/distinfo	(working copy)
>@@ -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
>===================================================================
>--- databases/rubygem-dbm/files/patch-ext_dbm_extconf.rb	(nonexistent)
>+++ databases/rubygem-dbm/files/patch-ext_dbm_extconf.rb	(working copy)
>@@ -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
>===================================================================
>--- databases/rubygem-dbm/pkg-descr	(nonexistent)
>+++ databases/rubygem-dbm/pkg-descr	(working copy)
>@@ -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://rubygems.org/gems/dbm
>Index: lang/ruby23/Makefile
>===================================================================
>--- lang/ruby23/Makefile	(revision 476221)
>+++ lang/ruby23/Makefile	(working copy)
>@@ -18,14 +18,14 @@
> LICENSE_FILE_BSD2CLAUSE=${WRKSRC}/BSDL
> LICENSE_FILE_RUBY=	${WRKSRC}/COPYING
> 
>+BROKEN_SSL=	openssl-devel
>+BROKEN_SSL_REASON_openssl-devel=does not detect and buid the openssl*.rb bits
>+
> # Using LIB_DEPENDS finds the libffi from gcc which causes problems
> BUILD_DEPENDS=	libffi>=0:devel/libffi
> LIB_DEPENDS=	libyaml.so:textproc/libyaml
> RUN_DEPENDS=	libffi>=0:devel/libffi
> 
>-BROKEN_SSL=	openssl-devel
>-BROKEN_SSL_REASON_openssl-devel=does not detect and buid the openssl*.rb bits	
>-
> CONFIGURE_ARGS=	${RUBY_CONFIGURE_ARGS} \
> 		--disable-rpath \
> 		--enable-pthread \
>@@ -38,8 +38,8 @@
> GNU_CONFIGURE=	yes
> # Keep this, else ruby will fail to load libraries dependent of libpthread.
> LIBS+=		-lpthread -L${LOCALBASE}/lib
>+USES=		autoreconf cpe ssl tar:xz
> USE_LDCONFIG=	yes
>-USES=		autoreconf cpe ssl tar:xz
> WRKSRC=		${RUBY_WRKSRC}
> 
> RUBY_VER=		2.3
>@@ -161,6 +161,9 @@
> # We get the gem executable from ports.
> 	@${RM} ${BUILD_WRKSRC}/bin/gem
> 
>+# We get DBM class library from ports.
>+	@${RM} -r ${BUILD_WRKSRC}/ext/dbm
>+
> #
> # Prepare modules we are wanting to build via external ports
> #
>Index: lang/ruby23/files/patch-lib_rdoc_generator_json_index.rb
>===================================================================
>--- lang/ruby23/files/patch-lib_rdoc_generator_json_index.rb	(revision 476221)
>+++ lang/ruby23/files/patch-lib_rdoc_generator_json_index.rb	(working copy)
>@@ -1,5 +1,5 @@
>---- ./lib/rdoc/generator/json_index.rb.orig	2017-11-12 19:38:46.598341000 -0500
>-+++ ./lib/rdoc/generator/json_index.rb	2017-11-12 19:38:59.759125000 -0500
>+--- ./lib/rdoc/generator/json_index.rb.orig	2017-11-13 00:38:46 UTC
>++++ ./lib/rdoc/generator/json_index.rb	
> @@ -175,7 +175,7 @@
>      debug_msg "Writing gzipped search index to %s" % outfile
>  
>Index: lang/ruby23/pkg-message
>===================================================================
>--- lang/ruby23/pkg-message	(revision 476221)
>+++ lang/ruby23/pkg-message	(working copy)
>@@ -8,7 +8,8 @@
> And some of the standard libraries are provided as separate ports
> since they require extra dependencies:
> 
>-	databases/ruby-gdbm:	GDBM module
>+	databases/rubygem-dbm:	dbm library
>+	databases/ruby-gdbm:	gdbm library
> 
> Install them as occasion demands.
> ====
>Index: lang/ruby23/pkg-plist
>===================================================================
>--- lang/ruby23/pkg-plist	(revision 476221)
>+++ lang/ruby23/pkg-plist	(working copy)
>@@ -43,7 +43,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
>@@ -1093,8 +1092,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
>@@ -3286,9 +3283,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
>@@ -4476,7 +4470,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
>@@ -5642,45 +5635,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/ruby24/Makefile
>===================================================================
>--- lang/ruby24/Makefile	(revision 476221)
>+++ lang/ruby24/Makefile	(working copy)
>@@ -36,8 +36,8 @@
> GNU_CONFIGURE=	yes
> # Keep this, else ruby will fail to load libraries dependent of libpthread.
> LIBS+=		-lpthread -L${LOCALBASE}/lib
>+USES=		autoreconf cpe ssl tar:xz
> USE_LDCONFIG=	yes
>-USES=		autoreconf cpe ssl tar:xz
> WRKSRC=		${RUBY_WRKSRC}
> 
> RUBY_VER=		2.4
>@@ -132,7 +132,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
>+.for d in bin/rake doc/rake lib/rake test/rake man/rake.1 lib/rake.rb ext/win32ole bin/gem ext/dbm
> 	@${RM} -r ${BUILD_WRKSRC}/${d}
> .endfor
> # Used by databases/ruby-gdbm port
>Index: lang/ruby24/files/patch-configure.in
>===================================================================
>--- lang/ruby24/files/patch-configure.in	(revision 476221)
>+++ lang/ruby24/files/patch-configure.in	(working copy)
>@@ -1,5 +1,5 @@
>---- configure.in.orig	2018-03-02 20:59:11.000000000 +0800
>-+++ configure.in	2018-07-19 14:22:04.753721000 +0800
>+--- configure.in.orig	2018-03-02 12:59:11 UTC
>++++ configure.in
> @@ -3423,7 +3423,6 @@
>  			: ${LDSHARED='$(CC) -shared'}
>  			if test "$rb_cv_binary_elf" = yes; then
>Index: lang/ruby24/files/patch-lib_rdoc_generator_json_index.rb
>===================================================================
>--- lang/ruby24/files/patch-lib_rdoc_generator_json_index.rb	(revision 476221)
>+++ lang/ruby24/files/patch-lib_rdoc_generator_json_index.rb	(working copy)
>@@ -1,5 +1,5 @@
>---- ./lib/rdoc/generator/json_index.rb.orig	2017-11-12 19:37:25.144883000 -0500
>-+++ ./lib/rdoc/generator/json_index.rb	2017-11-12 19:37:44.551836000 -0500
>+--- ./lib/rdoc/generator/json_index.rb.orig	2017-11-13 00:37:25 UTC
>++++ ./lib/rdoc/generator/json_index.rb
> @@ -175,7 +175,7 @@
>      debug_msg "Writing gzipped search index to %s" % outfile
>  
>Index: lang/ruby24/pkg-message
>===================================================================
>--- lang/ruby24/pkg-message	(revision 476221)
>+++ lang/ruby24/pkg-message	(working copy)
>@@ -8,7 +8,8 @@
> And some of the standard libraries are provided as separate ports
> since they require extra dependencies:
> 
>-	databases/ruby-gdbm:	GDBM module
>+	databases/rubygem-dbm:	dbm library
>+	databases/ruby-gdbm:	gdbm library
> 
> Install them as occasion demands.
> ====
>Index: lang/ruby24/pkg-plist
>===================================================================
>--- lang/ruby24/pkg-plist	(revision 476221)
>+++ lang/ruby24/pkg-plist	(working copy)
>@@ -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
>@@ -1104,8 +1103,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
>@@ -3339,9 +3336,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
>@@ -4549,7 +4543,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
>@@ -5737,45 +5730,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	(revision 476221)
>+++ lang/ruby25/Makefile	(working copy)
>@@ -36,8 +36,8 @@
> GNU_CONFIGURE=	yes
> # Keep this, else ruby will fail to load libraries dependent of libpthread.
> LIBS+=		-lpthread -L${LOCALBASE}/lib
>+USES=		autoreconf cpe ssl tar:xz
> USE_LDCONFIG=	yes
>-USES=		autoreconf cpe ssl tar:xz
> WRKSRC=		${RUBY_WRKSRC}
> 
> RUBY_VER=		2.5
>@@ -132,7 +132,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
>+.for d in bin/rake doc/rake lib/rake test/rake man/rake.1 lib/rake.rb ext/win32ole bin/gem ext/dbm
> 	@${RM} -r ${BUILD_WRKSRC}/${d}
> .endfor
> # Used by databases/ruby-gdbm port
>Index: lang/ruby25/files/patch-configure.ac
>===================================================================
>--- lang/ruby25/files/patch-configure.ac	(revision 476221)
>+++ lang/ruby25/files/patch-configure.ac	(working copy)
>@@ -1,5 +1,5 @@
>---- configure.ac.orig	2018-01-04 02:12:16.000000000 +0800
>-+++ configure.ac	2018-07-19 14:45:11.636321000 +0800
>+--- configure.ac.orig	2018-01-03 18:12:16 UTC
>++++ configure.ac
> @@ -3245,7 +3245,6 @@
>  			: ${LDSHARED='$(CC) -shared'}
>  			AS_IF([test "$rb_cv_binary_elf" = yes], [
>Index: lang/ruby25/files/patch-lib_rdoc_generator_json_index.rb
>===================================================================
>--- lang/ruby25/files/patch-lib_rdoc_generator_json_index.rb	(revision 476221)
>+++ lang/ruby25/files/patch-lib_rdoc_generator_json_index.rb	(working copy)
>@@ -1,5 +1,5 @@
>---- ./lib/rdoc/generator/json_index.rb.orig	2017-11-12 19:37:25.144883000 -0500
>-+++ ./lib/rdoc/generator/json_index.rb	2017-11-12 19:37:44.551836000 -0500
>+--- ./lib/rdoc/generator/json_index.rb.orig	2017-11-13 00:37:25 UTC
>++++ ./lib/rdoc/generator/json_index.rb
> @@ -175,7 +175,7 @@
>      debug_msg "Writing gzipped search index to %s" % outfile
>  
>Index: lang/ruby25/pkg-message
>===================================================================
>--- lang/ruby25/pkg-message	(revision 476221)
>+++ lang/ruby25/pkg-message	(working copy)
>@@ -8,7 +8,8 @@
> And some of the standard libraries are provided as separate ports
> since they require extra dependencies:
> 
>-	databases/ruby-gdbm:	GDBM module
>+	databases/rubygem-dbm:	dbm library
>+	databases/ruby-gdbm:	gdbm library
> 
> Install them as occasion demands.
> ====
>Index: lang/ruby25/pkg-plist
>===================================================================
>--- lang/ruby25/pkg-plist	(revision 476221)
>+++ lang/ruby25/pkg-plist	(working copy)
>@@ -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
>@@ -1115,8 +1114,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
>@@ -3280,9 +3277,6 @@
> %%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/da6/group__exception.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
>@@ -4464,7 +4458,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
>@@ -5649,45 +5642,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

Actions: View | Diff

Attachments on bug 230289: 195757 | 196255 | 197396 | 198412 | 202104