From f27d243ab748d182a37f24950368a75b2882ffd0 Mon Sep 17 00:00:00 2001
From: taca <taca@pkgsrc.org>
Date: Sat, 17 Oct 2009 06:31:41 +0000
Subject: Update ruby-mysql package to 2.8.1.

pkgsrc change:
	* Add commented out LICENSE (not sure GPL's version).
	* Enable DESTDIR support.


2009-02-01
  version 2.8.1
     * correspond to Ruby 1.9.1

2008-09-29
  version 2.8
  version 2.7.7
     * When connecting to MySQL, EINTR is occurred sometimes ([ruby-dev:31842])
     * MySQL/Ruby 2.7.* can not be compiled on Ruby 1.8.5.
---
 databases/ruby-mysql/Makefile         | 11 +++++++----
 databases/ruby-mysql/distinfo         | 10 +++++-----
 databases/ruby-mysql/patches/patch-ab | 17 -----------------
 databases/ruby-mysql/patches/patch-ac | 17 +++++++++++++++++
 4 files changed, 29 insertions(+), 26 deletions(-)
 delete mode 100644 databases/ruby-mysql/patches/patch-ab
 create mode 100644 databases/ruby-mysql/patches/patch-ac

diff --git a/databases/ruby-mysql/Makefile b/databases/ruby-mysql/Makefile
index 26e7b96d454..cad7a00889f 100644
--- a/databases/ruby-mysql/Makefile
+++ b/databases/ruby-mysql/Makefile
@@ -1,14 +1,16 @@
-# $NetBSD: Makefile,v 1.28 2008/06/22 15:51:14 taca Exp $
+# $NetBSD: Makefile,v 1.29 2009/10/17 06:31:41 taca Exp $
 #
 
-DISTNAME=	mysql-ruby-2.7.6
-PKGNAME=	${RUBY_PKGPREFIX}-mysql-2.7.6
+DISTNAME=	mysql-ruby-2.8.1
+PKGNAME=	${RUBY_PKGPREFIX}-mysql-2.8.1
 CATEGORIES=	databases ruby
-MASTER_SITES=	http://tmtm.org/downloads/mysql/ruby/
+MASTER_SITES=	http://rubyforge.org/frs/download.php/51087/ \
+		http://tmtm.org/downloads/mysql/ruby/
 
 MAINTAINER=	neumann@s-direktnet.de
 HOMEPAGE=	http://www.tmtm.org/en/mysql/ruby/
 COMMENT=	Ruby extension for MySQL
+#LICENSE=	gnu-gpl-v2
 
 RUBY_HAS_ARCHLIB=	yes
 RUBY_REQD=		1.8.2
@@ -16,6 +18,7 @@ USE_RUBY_EXTCONF=	yes
 INSTALL_TARGET=		site-install
 CONFIGURE_ARGS+=	--with-mysql-config
 INSTALLATION_DIRS=	${RUBY_DOC}/mysql ${RUBY_EG}/mysql
+PKG_DESTDIR_SUPPORT=	destdir
 
 DOCS=		README.html README_ja.html tommy.css
 
diff --git a/databases/ruby-mysql/distinfo b/databases/ruby-mysql/distinfo
index 8854d967560..70744293a4a 100644
--- a/databases/ruby-mysql/distinfo
+++ b/databases/ruby-mysql/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.12 2008/06/22 15:51:14 taca Exp $
+$NetBSD: distinfo,v 1.13 2009/10/17 06:31:41 taca Exp $
 
-SHA1 (mysql-ruby-2.7.6.tar.gz) = cdf10e00e53259364c1129ee09580792b5cdc07b
-RMD160 (mysql-ruby-2.7.6.tar.gz) = af46945cdcfa80ab33abc4615299f2e8c7ffae0b
-Size (mysql-ruby-2.7.6.tar.gz) = 32667 bytes
+SHA1 (mysql-ruby-2.8.1.tar.gz) = 9a5c04cc17be6d92c57756866b8abb894da7ca90
+RMD160 (mysql-ruby-2.8.1.tar.gz) = 42918666f3ed09cc4f52d2f62ce57dece05a8aed
+Size (mysql-ruby-2.8.1.tar.gz) = 34662 bytes
 SHA1 (patch-aa) = 703fd3364aed5df1515a85d46e4b6f809fbaa4f2
-SHA1 (patch-ab) = 9c264974c03511aca8c7a3c6afa886a2f4c5d1fc
+SHA1 (patch-ac) = d5e99221ffcc41e44d3cb66afcbe645d2d0ef893
diff --git a/databases/ruby-mysql/patches/patch-ab b/databases/ruby-mysql/patches/patch-ab
deleted file mode 100644
index 7c02eb1b86a..00000000000
--- a/databases/ruby-mysql/patches/patch-ab
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-ab,v 1.3 2007/01/30 15:54:29 joerg Exp $
-
---- mysql.c.in.orig	2006-12-20 05:31:52.000000000 +0000
-+++ mysql.c.in
-@@ -5,10 +5,12 @@
- #include "ruby.h"
- #include "version.h"
- #ifdef HAVE_MYSQL_H
-+#include <my_global.h>
- #include <mysql.h>
- #include <errmsg.h>
- #include <mysqld_error.h>
- #else
-+#include <mysql/my_global.h>
- #include <mysql/mysql.h>
- #include <mysql/errmsg.h>
- #include <mysql/mysqld_error.h>
diff --git a/databases/ruby-mysql/patches/patch-ac b/databases/ruby-mysql/patches/patch-ac
new file mode 100644
index 00000000000..63fcb120b76
--- /dev/null
+++ b/databases/ruby-mysql/patches/patch-ac
@@ -0,0 +1,17 @@
+$NetBSD: patch-ac,v 1.1 2009/10/17 06:31:41 taca Exp $
+
+--- mysql.c.orig	2009-02-01 17:43:39.000000000 +0900
++++ mysql.c
+@@ -17,10 +17,12 @@
+ #endif
+ 
+ #ifdef HAVE_MYSQL_H
++#include <my_global.h>
+ #include <mysql.h>
+ #include <errmsg.h>
+ #include <mysqld_error.h>
+ #else
++#include <mysql/my_global.h>
+ #include <mysql/mysql.h>
+ #include <mysql/errmsg.h>
+ #include <mysql/mysqld_error.h>
-- 
cgit v1.2.3