This is needed by the Rails 3.1 update.  mysql2 0.2.x bundles the
ActiveRecord adapter which was moved into ActiveRecord in Rails 3.1.
mysql2 0.3.x no longer includes the adapter.  Using mysql2 0.2.x with
Rails 3.1 could lead to problems, so this should be commited at the same
time as the Rails 3.1 diff.

Tested on i386, builds fine on amd64.  OKs?

Jeremy

Index: databases/ruby-mysql2/Makefile
===================================================================
RCS file: /cvs/ports/databases/ruby-mysql2/Makefile,v
retrieving revision 1.6
diff -u -p -r1.6 Makefile
--- databases/ruby-mysql2/Makefile      9 Nov 2011 00:17:38 -0000       1.6
+++ databases/ruby-mysql2/Makefile      2 Dec 2011 19:15:32 -0000
@@ -2,9 +2,8 @@
 
 COMMENT=       modern, simple and very fast Mysql library for Ruby
 
-DISTNAME=      mysql2-0.2.7
+DISTNAME=      mysql2-0.3.10
 CATEGORIES=    databases
-REVISION =     1
 
 HOMEPAGE=      http://github.com/brianmario/mysql2
 
Index: databases/ruby-mysql2/distinfo
===================================================================
RCS file: /cvs/ports/databases/ruby-mysql2/distinfo,v
retrieving revision 1.2
diff -u -p -r1.2 distinfo
--- databases/ruby-mysql2/distinfo      14 Apr 2011 17:23:32 -0000      1.2
+++ databases/ruby-mysql2/distinfo      2 Dec 2011 19:17:05 -0000
@@ -1,5 +1,5 @@
-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
+MD5 (mysql2-0.3.10.gem) = b27Mtp/silVnTqH8Jf/LVg==
+RMD160 (mysql2-0.3.10.gem) = 2F27KQykso56T0j/s7eFFj5xe9I=
+SHA1 (mysql2-0.3.10.gem) = XeCvKFS44+BK0DIHeYnjeenDtgM=
+SHA256 (mysql2-0.3.10.gem) = RhYZ6Q8+w5wFDQzlTj8k5M3kejq0c4zoYbRi2a/INGo=
+SIZE (mysql2-0.3.10.gem) = 41984
Index: databases/ruby-mysql2/pkg/PLIST
===================================================================
RCS file: /cvs/ports/databases/ruby-mysql2/pkg/PLIST,v
retrieving revision 1.3
diff -u -p -r1.3 PLIST
--- databases/ruby-mysql2/pkg/PLIST     9 Nov 2011 00:17:38 -0000       1.3
+++ databases/ruby-mysql2/pkg/PLIST     2 Dec 2011 19:17:07 -0000
@@ -4,19 +4,22 @@ ${GEM_LIB}/gems/${DISTNAME}/
 ${GEM_LIB}/gems/${DISTNAME}/.gitignore
 ${GEM_LIB}/gems/${DISTNAME}/.rspec
 ${GEM_LIB}/gems/${DISTNAME}/.rvmrc
+${GEM_LIB}/gems/${DISTNAME}/.travis.yml
 ${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}/README.md
 ${GEM_LIB}/gems/${DISTNAME}/Rakefile
 ${GEM_LIB}/gems/${DISTNAME}/benchmark/
 ${GEM_LIB}/gems/${DISTNAME}/benchmark/active_record.rb
+${GEM_LIB}/gems/${DISTNAME}/benchmark/active_record_threaded.rb
 ${GEM_LIB}/gems/${DISTNAME}/benchmark/allocations.rb
 ${GEM_LIB}/gems/${DISTNAME}/benchmark/escape.rb
 ${GEM_LIB}/gems/${DISTNAME}/benchmark/query_with_mysql_casting.rb
 ${GEM_LIB}/gems/${DISTNAME}/benchmark/query_without_mysql_casting.rb
 ${GEM_LIB}/gems/${DISTNAME}/benchmark/sequel.rb
 ${GEM_LIB}/gems/${DISTNAME}/benchmark/setup_db.rb
+${GEM_LIB}/gems/${DISTNAME}/benchmark/threaded.rb
 ${GEM_LIB}/gems/${DISTNAME}/examples/
 ${GEM_LIB}/gems/${DISTNAME}/examples/eventmachine.rb
 ${GEM_LIB}/gems/${DISTNAME}/examples/threaded.rb
@@ -35,22 +38,12 @@ ${GEM_LIB}/gems/${DISTNAME}/ext/mysql2/m
 ${GEM_LIB}/gems/${DISTNAME}/ext/mysql2/result.c
 ${GEM_LIB}/gems/${DISTNAME}/ext/mysql2/result.h
 ${GEM_LIB}/gems/${DISTNAME}/ext/mysql2/result.o
+${GEM_LIB}/gems/${DISTNAME}/ext/mysql2/wait_for_single_fd.h
 ${GEM_LIB}/gems/${DISTNAME}/lib/
-${GEM_LIB}/gems/${DISTNAME}/lib/active_record/
-${GEM_LIB}/gems/${DISTNAME}/lib/active_record/connection_adapters/
-${GEM_LIB}/gems/${DISTNAME}/lib/active_record/connection_adapters/em_mysql2_adapter.rb
-${GEM_LIB}/gems/${DISTNAME}/lib/active_record/connection_adapters/mysql2_adapter.rb
-${GEM_LIB}/gems/${DISTNAME}/lib/active_record/fiber_patches.rb
-${GEM_LIB}/gems/${DISTNAME}/lib/arel/
-${GEM_LIB}/gems/${DISTNAME}/lib/arel/engines/
-${GEM_LIB}/gems/${DISTNAME}/lib/arel/engines/sql/
-${GEM_LIB}/gems/${DISTNAME}/lib/arel/engines/sql/compilers/
-${GEM_LIB}/gems/${DISTNAME}/lib/arel/engines/sql/compilers/mysql2_compiler.rb
 ${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
@@ -58,7 +51,6 @@ ${GEM_LIB}/gems/${DISTNAME}/lib/mysql2/v
 ${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

Reply via email to