Update ruby-odbc package to 0.9998.

Fri Jan 15 2010 version 0.9998 released

	* documentation update
	* reorganized directory layout for making a gem

5 files changed, 39 insertions, 47 deletions

diff --git a/databases/ruby-odbc/Makefile b/databases/ruby-odbc/Makefile
index 17aad514488..f97cd42ad82 100644
--- a/databases/ruby-odbc/Makefile
+++ b/databases/ruby-odbc/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.4 2009/10/19 08:39:37 taca Exp $
+# $NetBSD: Makefile,v 1.5 2010/02/14 12:26:47 taca Exp $
 
-DISTNAME=	ruby-odbc-0.9997
-PKGNAME=	${RUBY_PKGPREFIX}-${GEM_NAME}
+DISTNAME=	ruby-odbc-0.9998
+PKGNAME=	${RUBY_PKGPREFIX}-${DISTNAME:S/ruby-//}
 CATEGORIES=	databases
 MASTER_SITES=	http://www.ch-werner.de/rubyodbc/
 # needs EXTRACT_SUFX since DISTFILE isn't Ruby's gem format.
@@ -13,14 +13,12 @@ COMMENT=	ODBC binding for Ruby
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
-GEM_NAME=	${DISTNAME:S/ruby-//}
 GEM_BUILD=	gemspec
-GEM_CLEANBUILD=	Makefile mkmf.log *.o odbc.${RUBY_DLEXT} utf8/*
 
 CONFIGURE_ARGS=	--disable-dlopen
 
-post-extract:
-	cp ${FILESDIR}/gemspec ${GEM_SPECFILE}
+pre-patch:
+	mv ${WRKSRC}/ruby-odbc.gemspec ${GEM_SPECFILE}
 
 .include "options.mk"
 .include "../../misc/rubygems/rubygem.mk"
diff --git a/databases/ruby-odbc/PLIST b/databases/ruby-odbc/PLIST
index 89a06d550b0..039228e8334 100644
--- a/databases/ruby-odbc/PLIST
+++ b/databases/ruby-odbc/PLIST
@@ -1,18 +1,20 @@
-@comment $NetBSD: PLIST,v 1.3 2009/06/14 18:36:20 joerg Exp $
-${GEM_HOME}/cache/odbc-${PKGVERSION}.gem
+@comment $NetBSD: PLIST,v 1.4 2010/02/14 12:26:47 taca Exp $
+${GEM_HOME}/cache/ruby-odbc-${PKGVERSION}.gem
 ${GEM_LIBDIR}/COPYING
 ${GEM_LIBDIR}/ChangeLog
 ${GEM_LIBDIR}/GPL
 ${GEM_LIBDIR}/MANIFEST
 ${GEM_LIBDIR}/README
-${GEM_LIBDIR}/cqgen.rb
 ${GEM_LIBDIR}/doc/odbc.html
-${GEM_LIBDIR}/extconf.rb
-${GEM_LIBDIR}/init.c
+${GEM_LIBDIR}/ext/extconf.rb
+${GEM_LIBDIR}/ext/init.c
+${GEM_LIBDIR}/ext/odbc.c
+${GEM_LIBDIR}/ext/utf8/extconf.rb
+${GEM_LIBDIR}/ext/utf8/init.c
+${GEM_LIBDIR}/ext/utf8/odbc.c
+${GEM_LIBDIR}/lib/cqgen.rb
 ${GEM_LIBDIR}/lib/odbc.${RUBY_DLEXT}
 ${GEM_LIBDIR}/lib/odbc_utf8.${RUBY_DLEXT}
-${GEM_LIBDIR}/odbc.c
-${GEM_LIBDIR}/test.rb
 ${GEM_LIBDIR}/test/00connect.rb
 ${GEM_LIBDIR}/test/10create_table.rb
 ${GEM_LIBDIR}/test/20insert.rb
@@ -20,8 +22,7 @@ ${GEM_LIBDIR}/test/30select.rb
 ${GEM_LIBDIR}/test/40update.rb
 ${GEM_LIBDIR}/test/50drop_table.rb
 ${GEM_LIBDIR}/test/70close.rb
-${GEM_LIBDIR}/utf8/extconf.rb
-${GEM_LIBDIR}/utf8/init.c
-${GEM_LIBDIR}/utf8/odbc.c
-${GEM_LIBDIR}/utf8/test.rb
-${GEM_HOME}/specifications/odbc-${PKGVERSION}.gemspec
+${GEM_LIBDIR}/test/test.rb
+${GEM_LIBDIR}/test/utf8/test.rb
+${GEM_HOME}/specifications/ruby-odbc-${PKGVERSION}.gemspec
+@pkgdir lib/ruby/gems/1.8/doc/ruby-odbc-${PKGVERSION}/rdoc/classes
diff --git a/databases/ruby-odbc/distinfo b/databases/ruby-odbc/distinfo
index 166a6529a77..7e7d32a3818 100644
--- a/databases/ruby-odbc/distinfo
+++ b/databases/ruby-odbc/distinfo
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.2 2009/10/17 05:44:09 taca Exp $
+$NetBSD: distinfo,v 1.3 2010/02/14 12:26:47 taca Exp $
 
-SHA1 (ruby-odbc-0.9997.tar.gz) = 22f0dab5a86db4c12df00fce28276f757406000f
-RMD160 (ruby-odbc-0.9997.tar.gz) = 48061996522fb0ab8b16aed544619cf8575b94d5
-Size (ruby-odbc-0.9997.tar.gz) = 70279 bytes
+SHA1 (ruby-odbc-0.9998.tar.gz) = ecde85ec01d599e5c39b46b139a152c41c04bec3
+RMD160 (ruby-odbc-0.9998.tar.gz) = d1f881e3036bb5df44f99cb74b76ca893c1a0f90
+Size (ruby-odbc-0.9998.tar.gz) = 69751 bytes
+SHA1 (patch-aa) = 4f06144d3982d52c6e688c5d1bcb5e0081e72afd
diff --git a/databases/ruby-odbc/files/gemspec b/databases/ruby-odbc/files/gemspec
deleted file mode 100644
index 7f57befd940..00000000000
--- a/databases/ruby-odbc/files/gemspec
+++ /dev/null
@@ -1,24 +0,0 @@
-require "rubygems"
-
-NAME     = "odbc"
-VERSION  = "0.9997"
-AUTHOR   = "Christian Werner"
-EMAIL    = "chw@ch-werner.de"
-HOMEPAGE = "http://www.ch-werner.de/rubyodbc"
-SUMMARY  = "ODBC binding for Ruby"
-
-spec = Gem::Specification.new do |s|
-  s.name          = NAME
-  s.email         = EMAIL
-  s.author        = AUTHOR
-  s.version       = VERSION
-  s.summary       = SUMMARY
-  s.platform      = Gem::Platform::RUBY
-  s.has_rdoc      = false
-  s.homepage      = HOMEPAGE
-  s.description   = SUMMARY
-  s.require_paths = ["lib"]
-  s.extra_rdoc_files = ["README", "doc/odbc.html"]
-  s.files = Dir.glob("./**/*")
-  s.extensions    = ["extconf.rb", "utf8/extconf.rb"]
-end
diff --git a/databases/ruby-odbc/patches/patch-aa b/databases/ruby-odbc/patches/patch-aa
new file mode 100644
index 00000000000..4ee9822fb5e
--- /dev/null
+++ b/databases/ruby-odbc/patches/patch-aa
@@ -0,0 +1,16 @@
+$NetBSD: patch-aa,v 1.1 2010/02/14 12:26:47 taca Exp $
+
+--- ../ruby-odbc-0.9998.gemspec.orig	2010-02-02 06:39:35.000000000 +0000
++++ ../ruby-odbc-0.9998.gemspec
+@@ -6,9 +6,10 @@ spec = Gem::Specification.new do |s|
+   s.author = "Christian Werner"
+   s.email = "chw @nospam@ ch-werner.de"
+   s.summary = "ODBC binding for Ruby"
++  s.platform = Gem::Platform::RUBY
+   s.homepage = "http://www.ch-werner.de/rubyodbc"
+   s.files = Dir.glob("**/*")
+-  s.require_paths << 'lib'
++  s.require_paths = ['lib']
+   s.test_files = Dir.glob('tests/*.rb')
+   s.has_rdoc = false
+   s.extra_rdoc_files = ["README", "COPYING", "ChangeLog", "GPL", "doc/odbc.html"]