mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-12-23 04:23:08 +00:00
Code Issues Releases Activity

databases/ruby-bdb: Fix build with upcoming databases/db18

Browse Source 
While here, return to pool due to more than 3 years of consecutive
maintainer timeouts.

PR:		248416
Submitted by:	Yasuhiro KIMURA <yasu@utahime.org>
Approved by:	maintainer timeout (> 2 months)
This commit is contained in:
Koichiro Iwao 2020-10-13 02:25:16 +00:00
parent d38c4a59a5
commit dab61e0251
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=552172
2 changed files with 27 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
databases/ruby-bdb/Makefile
View File

@ -11,7 +11,7 @@ MASTER_SITES= ftp://ftp.idaemons.org/pub/distfiles/ruby/ \
PKGNAMEPREFIX= ${RUBY_PKGNAMEPREFIX}
DIST_SUBDIR= ruby
MAINTAINER= knu@FreeBSD.org
MAINTAINER= ruby@FreeBSD.org
COMMENT= Ruby interface to Oracle Berkeley DB revision 2 or later
LICENSE= RUBY

28
databases/ruby-bdb/files/patch-src-extconf.rb
View File

@ -1,6 +1,6 @@
--- src/extconf.rb.orig 2015-01-22 16:09:31 UTC
--- src/extconf.rb.orig 2011-04-06 19:35:39 UTC
+++ src/extconf.rb
@@ -36,16 +36,16 @@
@@ -36,16 +36,16 @@ end
if unknown = enable_config("unknown")
libs = if CONFIG.key?("LIBRUBYARG_STATIC")
@ -21,3 +21,27 @@
when /solaris2/
$DLDFLAGS ||= ""
$DLDFLAGS += " -R#{lib_dir}"
@@ -63,10 +63,12 @@ end
if csv = with_config('db-version')
version = csv.split(',', -1)
version << '' if version.empty?
-elsif m = lib_dir.match(%r{/db(?:([2-9])|([2-9])([0-9])|-([2-9]).([0-9]))(?:$|/)}) ||
- inc_dir.match(%r{/db(?:([2-9])|([2-9])([0-9])|-([2-9]).([0-9]))(?:$|/)})
+elsif m = lib_dir.match(%r{/db(?:([2-9])|([2-9])([0-9])|-([2-9]).([0-9]))|([1-9][0-9]+)(?:$|/)}) ||
+ inc_dir.match(%r{/db(?:([2-9])|([2-9])([0-9])|-([2-9]).([0-9]))(|([1-9][0-9]+)?:$|/)})
if m[1]
version = [m[1], '']
+ elsif m[6]
+ version = [m[6], '']
else
if m[2]
major, minor = m[2], m[3]
@@ -94,7 +96,7 @@ catch(:done) do
end
next if with_ver.empty?
if !unique.is_a?(String) || unique.empty?
- m = with_ver.match(/^[^0-9]*([2-9])\.?([0-9]{0,3})/)
+ m = with_ver.match(/^[^0-9]*([1-9][0-9]*)\.?([0-9]{0,3})/)
major = m[1].to_i
minor = m[2].to_i
db_version = "db_version_" + (1000 * major + minor).to_s