Update to 2.9.13

* Fix build with Ruby 2.2.
* Use setup.rb instead of extconf.rb.
* Use GITHUB framework.

Changelog:
Not available.

4 files changed, 25 insertions, 35 deletions

diff --git a/databases/ruby-mysql/Makefile b/databases/ruby-mysql/Makefile
index 20d7596673e..ece5b4e55fd 100644
--- a/databases/ruby-mysql/Makefile
+++ b/databases/ruby-mysql/Makefile
@@ -1,26 +1,26 @@
-# $NetBSD: Makefile,v 1.37 2013/03/02 20:33:24 wiz Exp $
+# $NetBSD: Makefile,v 1.38 2015/05/19 13:32:38 ryoon Exp $
 #
 
-DISTNAME=	mysql-ruby-2.8.2
-PKGNAME=	${RUBY_PKGPREFIX}-mysql-2.8.2
-PKGREVISION=	4
+DISTNAME=	ruby-mysql-2.9.13
+PKGNAME=	${RUBY_PKGPREFIX}-mysql-2.9.13
 CATEGORIES=	databases ruby
-MASTER_SITES=	http://rubyforge.org/frs/download.php/51087/ \
-		http://tmtm.org/downloads/mysql/ruby/
+MASTER_SITES=	${MASTER_SITE_GITHUB:=tmtm/}
+GITHUB_PROJECT=	ruby-mysql
+GITHUB_TAG=	${PKGVERSION_NOREV}
 
 MAINTAINER=	neumann@s-direktnet.de
 HOMEPAGE=	http://www.tmtm.org/en/mysql/ruby/
 COMMENT=	Ruby extension for MySQL
 LICENSE=	gnu-gpl-v2 OR ruby-license
 
-USE_RUBY_EXTCONF=	yes
-INSTALL_TARGET=		site-install
-CONFIGURE_ARGS+=	--with-mysql-config
+USE_RUBY_SETUP=		yes
+USE_RUBY_SETUP_PKG=	yes
+
 INSTALLATION_DIRS=	${RUBY_DOC}/mysql ${RUBY_EG}/mysql
 
-DOCS=		README.html README_ja.html tommy.css
+DOCS=		README.rdoc
 
-post-install:
+ppost-install:
 .for f in ${DOCS}
 	${INSTALL_DATA} ${WRKSRC}/${f} ${DESTDIR}${PREFIX}/${RUBY_DOC}/mysql
 .endfor
diff --git a/databases/ruby-mysql/PLIST b/databases/ruby-mysql/PLIST
index dc9aee74c06..dcc373121a4 100644
--- a/databases/ruby-mysql/PLIST
+++ b/databases/ruby-mysql/PLIST
@@ -1,6 +1,10 @@
-@comment $NetBSD: PLIST,v 1.7 2009/06/14 17:43:25 joerg Exp $
-${RUBY_VENDORARCHLIB}/mysql.${RUBY_DLEXT}
-${RUBY_DOC}/mysql/README.html
-${RUBY_DOC}/mysql/README_ja.html
-${RUBY_DOC}/mysql/tommy.css
-${RUBY_EG}/mysql/test.rb
+@comment $NetBSD: PLIST,v 1.8 2015/05/19 13:32:38 ryoon Exp $
+${RUBY_VENDORLIB}/mysql.rb
+${RUBY_VENDORLIB}/mysql/charset.rb
+${RUBY_VENDORLIB}/mysql/constants.rb
+${RUBY_VENDORLIB}/mysql/error.rb
+${RUBY_VENDORLIB}/mysql/packet.rb
+${RUBY_VENDORLIB}/mysql/protocol.rb
+${RUBY_VENDORARCHLIB}/ext.${RUBY_DLEXT}
+@pkgdir share/examples/${RUBY_NAME}/mysql
+@pkgdir share/doc/${RUBY_NAME}/mysql
diff --git a/databases/ruby-mysql/distinfo b/databases/ruby-mysql/distinfo
index 1b543d94d33..58c4fc1fa17 100644
--- a/databases/ruby-mysql/distinfo
+++ b/databases/ruby-mysql/distinfo
@@ -1,6 +1,5 @@
-$NetBSD: distinfo,v 1.14 2010/09/10 04:34:12 taca Exp $
+$NetBSD: distinfo,v 1.15 2015/05/19 13:32:38 ryoon Exp $
 
-SHA1 (mysql-ruby-2.8.2.tar.gz) = c20ec0f41f19f11270963d9c9e0d5a2bba27801e
-RMD160 (mysql-ruby-2.8.2.tar.gz) = 0cd9a6071f0878a5ab4b47d9a023066f5ae39955
-Size (mysql-ruby-2.8.2.tar.gz) = 32710 bytes
-SHA1 (patch-aa) = 703fd3364aed5df1515a85d46e4b6f809fbaa4f2
+SHA1 (ruby-mysql-2.9.13.tar.gz) = af92f965e0a0f10833b6d99702bb35910c8298f8
+RMD160 (ruby-mysql-2.9.13.tar.gz) = 53f6d2c1d612599565793cf1b6b798dd262ae6d2
+Size (ruby-mysql-2.9.13.tar.gz) = 57403 bytes
diff --git a/databases/ruby-mysql/patches/patch-aa b/databases/ruby-mysql/patches/patch-aa
deleted file mode 100644
index 108b5951415..00000000000
--- a/databases/ruby-mysql/patches/patch-aa
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aa,v 1.3 2007/01/28 15:21:07 taca Exp $
-
---- extconf.rb.orig	2006-10-29 23:59:44.000000000 +0900
-+++ extconf.rb
-@@ -12,7 +12,7 @@ elsif mc = with_config('mysql-config') t
-   $CPPFLAGS += ' ' + cflags
-   $libs = libs + " " + $libs
- else
--  inc, lib = dir_config('mysql', '/usr/local')
-+  inc, lib = dir_config('mysql', config['prefix'])
-   libs = ['m', 'z', 'socket', 'nsl', 'mygcc']
-   while not find_library('mysqlclient', 'mysql_query', lib, "#{lib}/mysql") do
-     exit 1 if libs.empty?