diff options
| -rw-r--r-- | databases/ruby-sqlite/Makefile | 7 | ||||
| -rw-r--r-- | databases/ruby-sqlite/distinfo | 3 | ||||
| -rw-r--r-- | databases/ruby-sqlite/patches/patch-aa | 62 |
3 files changed, 67 insertions, 5 deletions
diff --git a/databases/ruby-sqlite/Makefile b/databases/ruby-sqlite/Makefile index 25c8337c8d9..b5f7ea522bc 100644 --- a/databases/ruby-sqlite/Makefile +++ b/databases/ruby-sqlite/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1.1.1 2009/10/17 12:24:46 taca Exp $ +# $NetBSD: Makefile,v 1.2 2010/09/10 04:52:59 taca Exp $ DISTNAME= sqlite-ruby-2.2.3 PKGNAME= ${RUBY_PKGPREFIX}-${DISTNAME:S/-ruby//} @@ -7,9 +7,8 @@ CATEGORIES= databases MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://sqlite-ruby.rubyforge.org/ COMMENT= Ruby interface for the SQLite database engine +LICENSE= modified-bsd -GEM_BUILD= gemspec - -.include "../../misc/rubygems/rubygem.mk" +.include "../../lang/ruby/gem.mk" .include "../../databases/sqlite/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/databases/ruby-sqlite/distinfo b/databases/ruby-sqlite/distinfo index 2fdf3da7677..fda2044cb0d 100644 --- a/databases/ruby-sqlite/distinfo +++ b/databases/ruby-sqlite/distinfo @@ -1,5 +1,6 @@ -$NetBSD: distinfo,v 1.1.1.1 2009/10/17 12:24:46 taca Exp $ +$NetBSD: distinfo,v 1.2 2010/09/10 04:52:59 taca Exp $ SHA1 (sqlite-ruby-2.2.3.gem) = 6f672af52910c4206697fb5cffc83407b97d4b63 RMD160 (sqlite-ruby-2.2.3.gem) = d83bfae2535f116faef6216ec94dcc1aba4f71bf Size (sqlite-ruby-2.2.3.gem) = 41472 bytes +SHA1 (patch-aa) = 09f1daf1a514ff3fa06994d31a0f1fab6a7a8bf3 diff --git a/databases/ruby-sqlite/patches/patch-aa b/databases/ruby-sqlite/patches/patch-aa new file mode 100644 index 00000000000..121c291f42d --- /dev/null +++ b/databases/ruby-sqlite/patches/patch-aa @@ -0,0 +1,62 @@ +$NetBSD: patch-aa,v 1.1 2010/09/10 04:52:59 taca Exp $ + +--- ext/sqlite-api.c.orig 2010-08-27 23:55:51.000000000 +0000 ++++ ext/sqlite-api.c +@@ -270,7 +270,7 @@ static_api_open( VALUE module, VALUE fil + Check_Type( file_name, T_STRING ); + Check_Type( mode, T_FIXNUM ); + +- s_file_name = STR2CSTR( file_name ); ++ s_file_name = StringValuePtr( file_name ); + i_mode = FIX2INT( mode ); + + db = sqlite_open( s_file_name, i_mode, &errmsg ); +@@ -329,7 +329,7 @@ static_api_compile( VALUE module, VALUE + Check_Type( sql, T_STRING ); + + result = sqlite_compile( handle, +- STR2CSTR( sql ), ++ StringValuePtr( sql ), + &sql_tail, + &vm, + &errmsg ); +@@ -545,7 +545,7 @@ static VALUE + static_api_complete( VALUE module, VALUE sql ) + { + Check_Type( sql, T_STRING ); +- return ( sqlite_complete( STR2CSTR( sql ) ) ? Qtrue : Qfalse ); ++ return ( sqlite_complete( StringValuePtr( sql ) ) ? Qtrue : Qfalse ); + } + + /** +@@ -780,8 +780,8 @@ static_api_set_result( VALUE module, VAL + { + case T_STRING: + sqlite_set_result_string( func_ptr, +- RSTRING(result)->ptr, +- RSTRING(result)->len ); ++ RSTRING_PTR(result), ++ RSTRING_LEN(result) ); + break; + + case T_FIXNUM: +@@ -817,8 +817,8 @@ static_api_set_result_error( VALUE modul + GetFunc( func_ptr, func ); + Check_Type( string, T_STRING ); + +- sqlite_set_result_error( func_ptr, RSTRING(string)->ptr, +- RSTRING(string)->len ); ++ sqlite_set_result_error( func_ptr, RSTRING_PTR(string), ++ RSTRING_LEN(string) ); + + return string; + } +@@ -1188,7 +1188,7 @@ static_raise_db_error2( int code, char * + if( *msg ) free( *msg ); + *msg = NULL; + +- static_raise_db_error( code, "%s", STR2CSTR( err ) ); ++ static_raise_db_error( code, "%s", StringValuePtr( err ) ); + } + + static void |