diff options
author | taca <taca> | 2007-10-28 02:33:24 +0000 |
---|---|---|
committer | taca <taca> | 2007-10-28 02:33:24 +0000 |
commit | 9367b453aaf82523d86d3336089725abfc766a12 (patch) | |
tree | d7ba3a646c39b895acd4b3875f35e87db96627bb | |
parent | 680a340ac0b77b5d83785f560208d989adb3ca5d (diff) | |
download | pkgsrc-9367b453aaf82523d86d3336089725abfc766a12.tar.gz |
Trying to build problem ext/dbm extention on some platforms.
Detect db3 and db4 like db2 for dbm library.
-rw-r--r-- | lang/ruby18-base/distinfo | 4 | ||||
-rw-r--r-- | lang/ruby18-base/patches/patch-ac | 32 |
2 files changed, 31 insertions, 5 deletions
diff --git a/lang/ruby18-base/distinfo b/lang/ruby18-base/distinfo index ac125959c9f..bcf0e97b4e4 100644 --- a/lang/ruby18-base/distinfo +++ b/lang/ruby18-base/distinfo @@ -1,9 +1,9 @@ -$NetBSD: distinfo,v 1.24 2007/10/06 06:12:35 taca Exp $ +$NetBSD: distinfo,v 1.25 2007/10/28 02:33:24 taca Exp $ SHA1 (ruby-1.8.6-p111.tar.bz2) = d85d25786e0ce30f8f54f5cfa36968ec0f6b9a5f RMD160 (ruby-1.8.6-p111.tar.bz2) = 8ff9b8592a80062742be61b2b4e1158282b61c4b Size (ruby-1.8.6-p111.tar.bz2) = 3919396 bytes SHA1 (patch-aa) = eb218253249d7fc8fe32c5d1ad00f355714861f9 SHA1 (patch-ab) = 973e36950d5b497c7283b928153e9f0ae9fe023e -SHA1 (patch-ac) = b84bc931ab3dd7fe619cca846a300673fa71f48e +SHA1 (patch-ac) = eb4dd068729ba2a2c7d4d659f6bcdb1410227f3b SHA1 (patch-ad) = f58380acbde2cd346b622b1a547a2840c61cee1f diff --git a/lang/ruby18-base/patches/patch-ac b/lang/ruby18-base/patches/patch-ac index 03fc4d9e2b5..92479ea910b 100644 --- a/lang/ruby18-base/patches/patch-ac +++ b/lang/ruby18-base/patches/patch-ac @@ -1,8 +1,34 @@ -$NetBSD: patch-ac,v 1.5 2007/01/19 19:50:46 minskim Exp $ +$NetBSD: patch-ac,v 1.6 2007/10/28 02:33:24 taca Exp $ ---- ext/dbm/extconf.rb.orig 2007-01-19 11:39:20.000000000 -0800 +--- ext/dbm/extconf.rb.orig 2007-02-13 08:01:19.000000000 +0900 +++ ext/dbm/extconf.rb -@@ -36,7 +36,8 @@ def headers.db_check(db) +@@ -5,13 +5,15 @@ dir_config("dbm") + if dblib = with_config("dbm-type", nil) + dblib = dblib.split(/[ ,]+/) + else +- dblib = %w(db db2 db1 dbm gdbm gdbm_compat qdbm) ++ dblib = %w(db db2 db1 db4 db3 dbm gdbm gdbm_compat qdbm) + end + + headers = { + "db" => ["db.h"], + "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"], + "dbm" => ["ndbm.h"], + "gdbm" => ["gdbm-ndbm.h", "ndbm.h"], + "gdbm_compat" => ["gdbm-ndbm.h", "ndbm.h"], +@@ -24,7 +26,7 @@ def headers.db_check(db) + hsearch = nil + + case db +- when /^db2?$/ ++ when /^db[2-4]?$/ + db_prefix = "__db_n" + hsearch = "-DDB_DBM_HSEARCH " + when "gdbm" +@@ -36,7 +38,8 @@ def headers.db_check(db) db_prefix ||= "" if (have_library(db, db_prefix+"dbm_open") || have_func(db_prefix+"dbm_open")) and |