Sun Dec 28 15:51:01 2014 UTC ()

Fix build error on older Mac OS versions, where ndbm.h does not include db.h.
Patch from Sevan Janiyan in PR pkg/49508.


(bsiegert)

diff -r1.39 -r1.40 pkgsrc/lang/ruby193-base/distinfo
diff -r0 -r1.3 pkgsrc/lang/ruby193-base/patches/patch-ext_dbm_extconf.rb

--- pkgsrc/lang/ruby193-base/Attic/distinfo 2014/12/14 13:59:53 1.39
+++ pkgsrc/lang/ruby193-base/Attic/distinfo 2014/12/28 15:51:01 1.40

 @@ -1,21 +1,22 @@
-$NetBSD: distinfo,v 1.39 2014/12/14 13:59:53 taca Exp $
+$NetBSD: distinfo,v 1.40 2014/12/28 15:51:01 bsiegert Exp $
 SHA1 (ruby-1.9.3-p551.tar.bz2) = 35600f4e2ac98653fa8a634104cb6ab3d47a1535
 RMD160 (ruby-1.9.3-p551.tar.bz2) = 59cfcaf4e02957f53bf83557962b0d428156bc01
 Size (ruby-1.9.3-p551.tar.bz2) = 10049332 bytes
 SHA1 (patch-configure) = 0ef7e10bbff37118c48053e7189f87528a3e408b
 SHA1 (patch-configure.in) = 09dfe819b6a9bd7c9af704eeaef659857d33d0c3
 SHA1 (patch-defs_default__gems) = fb24111736f1a76a05e853aa068024dbdd24e5a5
 SHA1 (patch-ext_dbm_extconf.rb) = 239eff48cb4d7d491e4d8a7ac9bd023217acb59c
 SHA1 (patch-ext_dl_extconf.rb) = aed210606893d2b9c463d794df039f06003848e4
 SHA1 (patch-ext_tk_extconf.rb) = 7cda490107ce8d23644152feeade8a8cf21d9898
 SHA1 (patch-ext_tk_lib_tk.rb) = 78034ed6fa0f24099ce06a717da2423731b276cb
 SHA1 (patch-ext_tk_lib_tk_autoload.rb) = e8bcb93feae90fd46531a412f6c963a6d5d2c132
 SHA1 (patch-ext_tk_lib_tk_fontchooser.rb) = cb0155332e5f519ada386fae770cd2f879527323
 SHA1 (patch-ext_tk_lib_tk_tk__mac.rb) = c7b946dd8d37014d9cd43ce787fbb560a21cce2e
 SHA1 (patch-ext_tk_lib_tkextlib_tcllib_validator.rb) = 4e429b8775f9a079e5338d58db7520179566c4b7
 SHA1 (patch-ext_tk_lib_tkextlib_tile_treeview.rb) = e31201b5d0f5c333f14b795ac5e670fdb9a250cf
 SHA1 (patch-ext_tk_lib_tkextlib_tkimg_dted.rb) = c73d94032c22cbefb55daee2ba359d70751b1416
 SHA1 (patch-ext_tk_lib_tkextlib_tkimg_raw.rb) = 2c99d8f59c0ad5d6a493dd6e663850262487f5ef
 SHA1 (patch-ext_tk_tcltklib.c) = c58bffdde4a89ea7c442b1cf37c12c5ce53ee890
 SHA1 (patch-lib_rdoc_ri_driver.rb) = acb4cb022893eb8dea2adf7564f5e5e1a0f1e9c8
 SHA1 (patch-lib_rubygems.rb) = e472c981e544b75c3762385895c9a0197be9badd

$NetBSD: patch-ext_dbm_extconf.rb,v 1.3 2014/12/28 15:51:01 bsiegert Exp $

--- ext/dbm/extconf.rb.orig    2014-12-28 14:04:40.000000000 +0000
+++ ext/dbm/extconf.rb
@@ -247,7 +247,7 @@ def headers.db_check2(db, hdr)
     have_library("gdbm") or return false
   end
 
-  if have_type("DBM", hdr, hsearch) and
+  if have_type("DBM", ["db.h", hdr], hsearch) and
      (db == 'libc' ? have_func('dbm_open("", 0, 0)', hdr, hsearch) :
                      have_library(db, 'dbm_open("", 0, 0)', hdr, hsearch)) and
      have_func('dbm_clearerr((DBM *)0)', hdr, hsearch) and