Fairly significant update to mysql2, see changelog at https://github.com/brianmario/mysql2/blob/master/CHANGELOG.md
To be compatible with ruby 1.8, don't link against the threaded mysql library. This requires a new patches dir, so use -p0 when applying. Tested on i386, compiles fine on amd64. Looking for OKs. Jeremy Index: Makefile =================================================================== RCS file: /cvs/ports/databases/ruby-mysql2/Makefile,v retrieving revision 1.3 diff -u -p -r1.3 Makefile --- Makefile 6 Jan 2011 04:24:22 -0000 1.3 +++ Makefile 11 Apr 2011 23:16:31 -0000 @@ -2,8 +2,7 @@ COMMENT= modern, simple and very fast Mysql library for Ruby -DISTNAME= mysql2-0.2.6 -REVISION = 0 +DISTNAME= mysql2-0.2.7 CATEGORIES= databases HOMEPAGE= http://github.com/brianmario/mysql2 @@ -18,7 +17,7 @@ PERMIT_DISTFILES_FTP= Yes MODULES= lang/ruby -WANTLIB= mysqlclient +WANTLIB= crypto mysqlclient ssl z LIB_DEPENDS= databases/mysql Index: distinfo =================================================================== RCS file: /cvs/ports/databases/ruby-mysql2/distinfo,v retrieving revision 1.1.1.1 diff -u -p -r1.1.1.1 distinfo --- distinfo 20 Dec 2010 18:00:52 -0000 1.1.1.1 +++ distinfo 11 Apr 2011 23:08:57 -0000 @@ -1,5 +1,5 @@ -MD5 (mysql2-0.2.6.gem) = ys30H81l7sBJmWUibp8SCA== -RMD160 (mysql2-0.2.6.gem) = 8gIxfi4GrvHhqXb9DKcReiW5PpQ= -SHA1 (mysql2-0.2.6.gem) = eJvup7GeSiQCS+Wn07VZ50rBMPs= -SHA256 (mysql2-0.2.6.gem) = p1cChQuo/ZSQIFnaQ2YtkM+cqFfEbv/Bdy63w7CoJz4= -SIZE (mysql2-0.2.6.gem) = 41984 +MD5 (mysql2-0.2.7.gem) = WFeEp9gZLRjQ3PRS96ZH8g== +RMD160 (mysql2-0.2.7.gem) = TclZ0lrbOI7pZOiowZQ7VgoopaA= +SHA1 (mysql2-0.2.7.gem) = UAi1JAUIIgB9++FLMmcHu+QJ0Kk= +SHA256 (mysql2-0.2.7.gem) = 1c8BqE2jDAlrCohy95Q108fHP/UjhmTQrvvZF4YHoPk= +SIZE (mysql2-0.2.7.gem) = 45056 Index: patches/patch-ext_mysql2_extconf_rb =================================================================== RCS file: patches/patch-ext_mysql2_extconf_rb diff -N patches/patch-ext_mysql2_extconf_rb --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ patches/patch-ext_mysql2_extconf_rb 11 Apr 2011 23:14:44 -0000 @@ -0,0 +1,17 @@ +$OpenBSD$ +--- ext/mysql2/extconf.rb.orig Mon Apr 11 16:14:10 2011 ++++ ext/mysql2/extconf.rb Mon Apr 11 16:14:41 2011 +@@ -31,10 +31,10 @@ elsif mc = (with_config('mysql-config') || Dir[GLOB].f + mc = Dir[GLOB].first if mc == true + cflags = `#{mc} --cflags`.chomp + exit 1 if $? != 0 +- libs = `#{mc} --libs_r`.chomp +- if libs.empty? ++ #libs = `#{mc} --libs_r`.chomp ++ #if libs.empty? + libs = `#{mc} --libs`.chomp +- end ++ #end + exit 1 if $? != 0 + $CPPFLAGS += ' ' + cflags + $libs = libs + " " + $libs Index: pkg/PLIST =================================================================== RCS file: /cvs/ports/databases/ruby-mysql2/pkg/PLIST,v retrieving revision 1.1.1.1 diff -u -p -r1.1.1.1 PLIST --- pkg/PLIST 20 Dec 2010 18:00:52 -0000 1.1.1.1 +++ pkg/PLIST 11 Apr 2011 23:09:14 -0000 @@ -4,11 +4,12 @@ ${GEM_LIB}/gems/${DISTNAME}/ ${GEM_LIB}/gems/${DISTNAME}/.gitignore ${GEM_LIB}/gems/${DISTNAME}/.require_paths ${GEM_LIB}/gems/${DISTNAME}/.rspec +${GEM_LIB}/gems/${DISTNAME}/.rvmrc ${GEM_LIB}/gems/${DISTNAME}/CHANGELOG.md +${GEM_LIB}/gems/${DISTNAME}/Gemfile ${GEM_LIB}/gems/${DISTNAME}/MIT-LICENSE ${GEM_LIB}/gems/${DISTNAME}/README.rdoc ${GEM_LIB}/gems/${DISTNAME}/Rakefile -${GEM_LIB}/gems/${DISTNAME}/VERSION ${GEM_LIB}/gems/${DISTNAME}/benchmark/ ${GEM_LIB}/gems/${DISTNAME}/benchmark/active_record.rb ${GEM_LIB}/gems/${DISTNAME}/benchmark/allocations.rb @@ -50,12 +51,15 @@ ${GEM_LIB}/gems/${DISTNAME}/lib/mysql2/ ${GEM_LIB}/gems/${DISTNAME}/lib/mysql2.rb ${GEM_LIB}/gems/${DISTNAME}/lib/mysql2/client.rb ${GEM_LIB}/gems/${DISTNAME}/lib/mysql2/em.rb +${GEM_LIB}/gems/${DISTNAME}/lib/mysql2/em_fiber.rb ${GEM_LIB}/gems/${DISTNAME}/lib/mysql2/error.rb ${GEM_LIB}/gems/${DISTNAME}/lib/mysql2/mysql2.so ${GEM_LIB}/gems/${DISTNAME}/lib/mysql2/result.rb +${GEM_LIB}/gems/${DISTNAME}/lib/mysql2/version.rb ${GEM_LIB}/gems/${DISTNAME}/mysql2.gemspec ${GEM_LIB}/gems/${DISTNAME}/spec/ ${GEM_LIB}/gems/${DISTNAME}/spec/em/ +${GEM_LIB}/gems/${DISTNAME}/spec/em/em_fiber_spec.rb ${GEM_LIB}/gems/${DISTNAME}/spec/em/em_spec.rb ${GEM_LIB}/gems/${DISTNAME}/spec/mysql2/ ${GEM_LIB}/gems/${DISTNAME}/spec/mysql2/client_spec.rb @@ -66,7 +70,6 @@ ${GEM_LIB}/gems/${DISTNAME}/spec/spec_he ${GEM_LIB}/gems/${DISTNAME}/tasks/ ${GEM_LIB}/gems/${DISTNAME}/tasks/benchmarks.rake ${GEM_LIB}/gems/${DISTNAME}/tasks/compile.rake -${GEM_LIB}/gems/${DISTNAME}/tasks/jeweler.rake ${GEM_LIB}/gems/${DISTNAME}/tasks/rspec.rake ${GEM_LIB}/gems/${DISTNAME}/tasks/vendor_mysql.rake ${GEM_LIB}/specifications/${DISTNAME}.gemspec
