[pkgsrc/trunk]: pkgsrc/databases/ruby-mysql - Use "--with-mysql-config" optio...

[taca <taca%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/874e4154be4c
branches:  trunk
changeset: 518558:874e4154be4c
user:      taca <taca%pkgsrc.org@localhost>
date:      Wed Sep 13 13:12:54 2006 +0000

description:
- Use "--with-mysql-config" option to CONFIGURE_ARGS.
- Include my_global.h header to make sure to define "ulong" on FreeBSD
  and DragonFly BSD.

Bump PKGREVISION.

diffstat:

 databases/ruby-mysql/Makefile         |   6 +++---
 databases/ruby-mysql/distinfo         |   3 ++-
 databases/ruby-mysql/patches/patch-ab |  17 +++++++++++++++++
 3 files changed, 22 insertions(+), 4 deletions(-)

diffs (57 lines):

diff -r 3931254fa1ba -r 874e4154be4c databases/ruby-mysql/Makefile
--- a/databases/ruby-mysql/Makefile     Wed Sep 13 13:08:20 2006 +0000
+++ b/databases/ruby-mysql/Makefile     Wed Sep 13 13:12:54 2006 +0000
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.23 2006/08/07 16:13:52 taca Exp $
+# $NetBSD: Makefile,v 1.24 2006/09/13 13:12:54 taca Exp $
 #
 
 DISTNAME=      mysql-ruby-2.7.1
 PKGNAME=       ${RUBY_PKGPREFIX}-mysql-2.7.1
+PKGREVISION=   1
 CATEGORIES=    databases ruby
 MASTER_SITES=  http://tmtm.org/downloads/mysql/ruby/
 
@@ -14,8 +15,7 @@
 RUBY_REQD=             1.8.2
 USE_RUBY_EXTCONF=      yes
 INSTALL_TARGET=                site-install
-CONFIGURE_ARGS+= --with-mysql-include-dir=${BUILDLINK_PREFIX.mysql-client}/include \
-               --with-mysql-lib-dir=${BUILDLINK_PREFIX.mysql-client}/lib/mysql
+CONFIGURE_ARGS+=       --with-mysql-config
 
 DOCS=          README.html README_ja.html tommy.css
 
diff -r 3931254fa1ba -r 874e4154be4c databases/ruby-mysql/distinfo
--- a/databases/ruby-mysql/distinfo     Wed Sep 13 13:08:20 2006 +0000
+++ b/databases/ruby-mysql/distinfo     Wed Sep 13 13:12:54 2006 +0000
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.8 2006/08/07 16:13:52 taca Exp $
+$NetBSD: distinfo,v 1.9 2006/09/13 13:12:54 taca Exp $
 
 SHA1 (mysql-ruby-2.7.1.tar.gz) = 792f5dc6181bf4b718aca13798fe34ece30c9e3f
 RMD160 (mysql-ruby-2.7.1.tar.gz) = 38ca6db716e9f93e6199a04f2d0f1e7449afea8e
 Size (mysql-ruby-2.7.1.tar.gz) = 29711 bytes
 SHA1 (patch-aa) = 7134c3b1da98d89687ff4ef76d7c80cfe7ed9e4a
+SHA1 (patch-ab) = 44a551082f05dc91269a7649e597a7f426701de1
diff -r 3931254fa1ba -r 874e4154be4c databases/ruby-mysql/patches/patch-ab
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/databases/ruby-mysql/patches/patch-ab     Wed Sep 13 13:12:54 2006 +0000
@@ -0,0 +1,17 @@
+$NetBSD: patch-ab,v 1.1 2006/09/13 13:12:54 taca Exp $
+
+--- mysql.c.in.orig    2006-06-04 23:29:28.000000000 +0900
++++ 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>