summaryrefslogtreecommitdiff
path: root/lang/ruby18-base
diff options
context:
space:
mode:
authortaca <taca>2010-06-02 13:27:57 +0000
committertaca <taca>2010-06-02 13:27:57 +0000
commit439ad285ce4790fac07217ee482e2339c38f84b9 (patch)
tree4d6d1c45f8a28bb665cec298d5e2fe4f9f9233fa /lang/ruby18-base
parent886b5518185367f84c064e4e9d4c95360d3eb16c (diff)
downloadpkgsrc-439ad285ce4790fac07217ee482e2339c38f84b9.tar.gz
Accepd db5 for library of ext/dbm. (Not tested well.)
Bump PKGREVISION.
Diffstat (limited to 'lang/ruby18-base')
-rw-r--r--lang/ruby18-base/Makefile4
-rw-r--r--lang/ruby18-base/distinfo4
-rw-r--r--lang/ruby18-base/patches/patch-ac15
3 files changed, 12 insertions, 11 deletions
diff --git a/lang/ruby18-base/Makefile b/lang/ruby18-base/Makefile
index f1ebd080308..ee8efc444ee 100644
--- a/lang/ruby18-base/Makefile
+++ b/lang/ruby18-base/Makefile
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.54 2010/01/14 15:07:28 taca Exp $
+# $NetBSD: Makefile,v 1.55 2010/06/02 13:27:57 taca Exp $
#
DISTNAME= ${RUBY_DISTNAME}
PKGNAME= ${RUBY_PKGPREFIX}-base-${RUBY_VERSION_SUFFIX}
CATEGORIES= lang ruby
MASTER_SITES= ${MASTER_SITE_RUBY}
-PKGREVISION= 4
+PKGREVISION= 5
MAINTAINER= taca@NetBSD.org
HOMEPAGE= ${RUBY_HOMEPAGE}
diff --git a/lang/ruby18-base/distinfo b/lang/ruby18-base/distinfo
index 0651b4a2251..32b23e84858 100644
--- a/lang/ruby18-base/distinfo
+++ b/lang/ruby18-base/distinfo
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.42 2010/01/14 15:07:28 taca Exp $
+$NetBSD: distinfo,v 1.43 2010/06/02 13:27:57 taca Exp $
SHA1 (ruby-1.8.7-p174.tar.bz2) = 9e84b49ad545ad54b8e7dc3c227eaaefeb1041aa
RMD160 (ruby-1.8.7-p174.tar.bz2) = f854d456003af1e31d50330c88c3cb152c434249
Size (ruby-1.8.7-p174.tar.bz2) = 4144807 bytes
SHA1 (patch-aa) = 88e4a338c4ca40b32f9e3748eb825769631c3e76
SHA1 (patch-ab) = 93a3dc95ee5e5cd6c7584240a285fa39b6f21efd
-SHA1 (patch-ac) = 77c3ba81bb65d13475bf7ea64328fbc35fe788bf
+SHA1 (patch-ac) = 0119134d778bb85c58ef5bfe30d337dc76ed47e0
SHA1 (patch-bd) = fb1a6a6724210c2fd84464d028932e78890ad7da
SHA1 (patch-be) = 79cd592267068820fa2225242034819ba38aa0b1
SHA1 (patch-dj) = 436c3c0704b878427d947b2e27e5ce0a057eebeb
diff --git a/lang/ruby18-base/patches/patch-ac b/lang/ruby18-base/patches/patch-ac
index 8daa27d00cb..016d4443c3e 100644
--- a/lang/ruby18-base/patches/patch-ac
+++ b/lang/ruby18-base/patches/patch-ac
@@ -1,10 +1,10 @@
-$NetBSD: patch-ac,v 1.7 2009/08/11 14:26:58 taca Exp $
+$NetBSD: patch-ac,v 1.8 2010/06/02 13:27:57 taca Exp $
-* Accept db3 or db4 as include/library.
+* Accept db3, db4 or db5 as include/library.
---- ext/dbm/extconf.rb.orig 2007-02-13 08:01:19.000000000 +0900
+--- ext/dbm/extconf.rb.orig 2007-02-12 23:01:19.000000000 +0000
+++ ext/dbm/extconf.rb
-@@ -5,13 +5,15 @@ dir_config("dbm")
+@@ -5,13 +5,16 @@ dir_config("dbm")
if dblib = with_config("dbm-type", nil)
dblib = dblib.split(/[ ,]+/)
else
@@ -18,19 +18,20 @@ $NetBSD: patch-ac,v 1.7 2009/08/11 14:26:58 taca Exp $
"db2" => ["db2/db.h", "db2.h", "db.h"],
+ "db3" => ["db3/db.h", "db3.h", "db.h"],
+ "db4" => ["db4/db.h", "db4.h", "db.h"],
++ "db5" => ["db5/db.h", "db5.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)
+@@ -24,7 +27,7 @@ def headers.db_check(db)
hsearch = nil
case db
- when /^db2?$/
-+ when /^db[2-4]?$/
++ when /^db[2-5]?$/
db_prefix = "__db_n"
hsearch = "-DDB_DBM_HSEARCH "
when "gdbm"
-@@ -36,7 +38,8 @@ def headers.db_check(db)
+@@ -36,7 +39,8 @@ def headers.db_check(db)
db_prefix ||= ""
if (have_library(db, db_prefix+"dbm_open") || have_func(db_prefix+"dbm_open")) and