Merge (almost replace) this package with ruby-sqlite3 in pkgsrc-wip

packgaed by OBATA Akio, because the latter is more complete.

Bump PKGREVISION.

3 files changed, 125 insertions, 9 deletions

diff --git a/databases/ruby-sqlite3/DESCR b/databases/ruby-sqlite3/DESCR
index afd1daa8683..fe51a45a6d6 100644
--- a/databases/ruby-sqlite3/DESCR
+++ b/databases/ruby-sqlite3/DESCR
@@ -1,2 +1,5 @@
-This module allows Ruby programs to interface with the SQLite database
-engine.
+This module allows Ruby programs to interface with the SQLite3
+database engine (http://www.sqlite.org).  You must have the
+SQLite engine installed in order to build this module.
+
+Note that this module is NOT compatible with SQLite 2.x.
diff --git a/databases/ruby-sqlite3/Makefile b/databases/ruby-sqlite3/Makefile
index 6398f57dc69..d79cbbc35f6 100644
--- a/databases/ruby-sqlite3/Makefile
+++ b/databases/ruby-sqlite3/Makefile
@@ -1,17 +1,31 @@
-# $NetBSD: Makefile,v 1.1.1.1 2006/03/30 16:21:14 minskim Exp $
+# $NetBSD: Makefile,v 1.2 2006/04/05 15:18:34 minskim Exp $
 
 DISTNAME=	sqlite3-ruby-1.1.0
 PKGNAME=	${RUBY_PKGPREFIX}-${DISTNAME:S/-ruby//}
-CATEGORIES=	databases
+PKGREVISION=	1
+CATEGORIES=	databases ruby
 MASTER_SITES=	http://rubyforge.org/frs/download.php/3089/
 EXTRACT_SUFX=	.tar.bz2
 
-MAINTAINER=	minskim@NetBSD.org
+MAINTAINER=	obata@lins.jp
 HOMEPAGE=	http://sqlite-ruby.rubyforge.org/
 COMMENT=	Ruby interface for the SQLite database engine
 
-USE_RUBY_SETUP=	yes
+RUBY_HAS_ARCHLIB=	yes
+USE_RUBY_SETUP=		yes
+
+DOCS=	ChangeLog LICENSE README
 
 .include "../../databases/sqlite3/buildlink3.mk"
+.include "../../devel/swig/buildlink3.mk"
 .include "../../lang/ruby/modules.mk"
+
+post-install:
+	${INSTALL_DATA_DIR} ${RUBY_DOCDIR:Q}/sqlite3/api
+.for f in ${DOCS}
+	${INSTALL_DATA} ${WRKSRC:Q}/${f:Q} ${RUBY_DOCDIR:Q}/sqlite3/
+.endfor
+	cd ${WRKSRC:Q}/doc && ${PAX} -rw -pp * ${RUBY_DOCDIR:Q}/sqlite3
+	cd ${WRKSRC:Q}/api && ${PAX} -rw -pp * ${RUBY_DOCDIR:Q}/sqlite3/api
+
 .include "../../mk/bsd.pkg.mk"
diff --git a/databases/ruby-sqlite3/PLIST b/databases/ruby-sqlite3/PLIST
index 0825828950c..883ca1333ba 100644
--- a/databases/ruby-sqlite3/PLIST
+++ b/databases/ruby-sqlite3/PLIST
@@ -1,9 +1,90 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2006/03/30 16:21:14 minskim Exp $
+@comment $NetBSD: PLIST,v 1.2 2006/04/05 15:18:34 minskim Exp $
+${RUBY_DOCDIR}/sqlite3/ChangeLog
+${RUBY_DOCDIR}/sqlite3/LICENSE
+${RUBY_DOCDIR}/sqlite3/README
+${RUBY_DOCDIR}/sqlite3/api/blank.html
+${RUBY_DOCDIR}/sqlite3/api/classes/DL.html
+${RUBY_DOCDIR}/sqlite3/api/classes/DL/PtrData.html
+${RUBY_DOCDIR}/sqlite3/api/classes/Kernel.html
+${RUBY_DOCDIR}/sqlite3/api/classes/SQLite3.html
+${RUBY_DOCDIR}/sqlite3/api/classes/SQLite3/AbortException.html
+${RUBY_DOCDIR}/sqlite3/api/classes/SQLite3/AuthorizationException.html
+${RUBY_DOCDIR}/sqlite3/api/classes/SQLite3/Blob.html
+${RUBY_DOCDIR}/sqlite3/api/classes/SQLite3/BusyException.html
+${RUBY_DOCDIR}/sqlite3/api/classes/SQLite3/CantOpenException.html
+${RUBY_DOCDIR}/sqlite3/api/classes/SQLite3/Constants.html
+${RUBY_DOCDIR}/sqlite3/api/classes/SQLite3/Constants/ColumnType.html
+${RUBY_DOCDIR}/sqlite3/api/classes/SQLite3/Constants/ErrorCode.html
+${RUBY_DOCDIR}/sqlite3/api/classes/SQLite3/Constants/TextRep.html
+${RUBY_DOCDIR}/sqlite3/api/classes/SQLite3/ConstraintException.html
+${RUBY_DOCDIR}/sqlite3/api/classes/SQLite3/CorruptException.html
+${RUBY_DOCDIR}/sqlite3/api/classes/SQLite3/Database.html
+${RUBY_DOCDIR}/sqlite3/api/classes/SQLite3/Database/FunctionProxy.html
+${RUBY_DOCDIR}/sqlite3/api/classes/SQLite3/Driver.html
+${RUBY_DOCDIR}/sqlite3/api/classes/SQLite3/Driver/DL.html
+${RUBY_DOCDIR}/sqlite3/api/classes/SQLite3/Driver/DL/API.html
+${RUBY_DOCDIR}/sqlite3/api/classes/SQLite3/Driver/DL/Driver.html
+${RUBY_DOCDIR}/sqlite3/api/classes/SQLite3/Driver/Native.html
+${RUBY_DOCDIR}/sqlite3/api/classes/SQLite3/Driver/Native/Driver.html
+${RUBY_DOCDIR}/sqlite3/api/classes/SQLite3/EmptyException.html
+${RUBY_DOCDIR}/sqlite3/api/classes/SQLite3/Error.html
+${RUBY_DOCDIR}/sqlite3/api/classes/SQLite3/Exception.html
+${RUBY_DOCDIR}/sqlite3/api/classes/SQLite3/FormatException.html
+${RUBY_DOCDIR}/sqlite3/api/classes/SQLite3/FullException.html
+${RUBY_DOCDIR}/sqlite3/api/classes/SQLite3/IOException.html
+${RUBY_DOCDIR}/sqlite3/api/classes/SQLite3/InternalException.html
+${RUBY_DOCDIR}/sqlite3/api/classes/SQLite3/InterruptException.html
+${RUBY_DOCDIR}/sqlite3/api/classes/SQLite3/LockedException.html
+${RUBY_DOCDIR}/sqlite3/api/classes/SQLite3/MemoryException.html
+${RUBY_DOCDIR}/sqlite3/api/classes/SQLite3/MismatchException.html
+${RUBY_DOCDIR}/sqlite3/api/classes/SQLite3/MisuseException.html
+${RUBY_DOCDIR}/sqlite3/api/classes/SQLite3/NotADatabaseException.html
+${RUBY_DOCDIR}/sqlite3/api/classes/SQLite3/NotFoundException.html
+${RUBY_DOCDIR}/sqlite3/api/classes/SQLite3/PermissionException.html
+${RUBY_DOCDIR}/sqlite3/api/classes/SQLite3/Pragmas.html
+${RUBY_DOCDIR}/sqlite3/api/classes/SQLite3/ProtocolException.html
+${RUBY_DOCDIR}/sqlite3/api/classes/SQLite3/RangeException.html
+${RUBY_DOCDIR}/sqlite3/api/classes/SQLite3/ReadOnlyException.html
+${RUBY_DOCDIR}/sqlite3/api/classes/SQLite3/ResultSet.html
+${RUBY_DOCDIR}/sqlite3/api/classes/SQLite3/ResultSet/FieldsContainer.html
+${RUBY_DOCDIR}/sqlite3/api/classes/SQLite3/ResultSet/TypesContainer.html
+${RUBY_DOCDIR}/sqlite3/api/classes/SQLite3/SQLException.html
+${RUBY_DOCDIR}/sqlite3/api/classes/SQLite3/SchemaChangedException.html
+${RUBY_DOCDIR}/sqlite3/api/classes/SQLite3/Statement.html
+${RUBY_DOCDIR}/sqlite3/api/classes/SQLite3/TooBigException.html
+${RUBY_DOCDIR}/sqlite3/api/classes/SQLite3/Translator.html
+${RUBY_DOCDIR}/sqlite3/api/classes/SQLite3/UnsupportedException.html
+${RUBY_DOCDIR}/sqlite3/api/classes/SQLite3/Value.html
+${RUBY_DOCDIR}/sqlite3/api/classes/SQLite3/Version.html
+${RUBY_DOCDIR}/sqlite3/api/classes/String.html
+${RUBY_DOCDIR}/sqlite3/api/created.rid
+${RUBY_DOCDIR}/sqlite3/api/files/lib/sqlite3/constants_rb.html
+${RUBY_DOCDIR}/sqlite3/api/files/lib/sqlite3/database_rb.html
+${RUBY_DOCDIR}/sqlite3/api/files/lib/sqlite3/driver/dl/api_rb.html
+${RUBY_DOCDIR}/sqlite3/api/files/lib/sqlite3/driver/dl/driver_rb.html
+${RUBY_DOCDIR}/sqlite3/api/files/lib/sqlite3/driver/native/driver_rb.html
+${RUBY_DOCDIR}/sqlite3/api/files/lib/sqlite3/errors_rb.html
+${RUBY_DOCDIR}/sqlite3/api/files/lib/sqlite3/pragmas_rb.html
+${RUBY_DOCDIR}/sqlite3/api/files/lib/sqlite3/resultset_rb.html
+${RUBY_DOCDIR}/sqlite3/api/files/lib/sqlite3/statement_rb.html
+${RUBY_DOCDIR}/sqlite3/api/files/lib/sqlite3/translator_rb.html
+${RUBY_DOCDIR}/sqlite3/api/files/lib/sqlite3/value_rb.html
+${RUBY_DOCDIR}/sqlite3/api/files/lib/sqlite3/version_rb.html
+${RUBY_DOCDIR}/sqlite3/api/files/lib/sqlite3_rb.html
+${RUBY_DOCDIR}/sqlite3/api/fr_class_index.html
+${RUBY_DOCDIR}/sqlite3/api/fr_file_index.html
+${RUBY_DOCDIR}/sqlite3/api/fr_method_index.html
+${RUBY_DOCDIR}/sqlite3/api/index.html
+${RUBY_DOCDIR}/sqlite3/api/rdoc-style.css
+${RUBY_DOCDIR}/sqlite3/faq/faq.html
+${RUBY_DOCDIR}/sqlite3/faq/faq.rb
+${RUBY_DOCDIR}/sqlite3/faq/faq.yml
+${RUBY_SITEARCHLIBDIR}/sqlite3_api.${RUBY_DLEXT}
 ${RUBY_SITELIBDIR}/sqlite3.rb
 ${RUBY_SITELIBDIR}/sqlite3/constants.rb
 ${RUBY_SITELIBDIR}/sqlite3/database.rb
-${RUBY_SITELIBDIR}/sqlite3/driver/dl/api.rb
 ${RUBY_SITELIBDIR}/sqlite3/driver/dl/driver.rb
+${RUBY_SITELIBDIR}/sqlite3/driver/dl/api.rb
 ${RUBY_SITELIBDIR}/sqlite3/driver/native/driver.rb
 ${RUBY_SITELIBDIR}/sqlite3/errors.rb
 ${RUBY_SITELIBDIR}/sqlite3/pragmas.rb
@@ -12,7 +93,25 @@ ${RUBY_SITELIBDIR}/sqlite3/statement.rb
 ${RUBY_SITELIBDIR}/sqlite3/translator.rb
 ${RUBY_SITELIBDIR}/sqlite3/value.rb
 ${RUBY_SITELIBDIR}/sqlite3/version.rb
-@dirrm ${RUBY_SITELIBDIR}/sqlite3/driver/native
+@dirrm ${RUBY_DOCDIR}/sqlite3/api/files/lib/sqlite3/driver/dl
+@dirrm ${RUBY_DOCDIR}/sqlite3/api/files/lib/sqlite3/driver/native
+@dirrm ${RUBY_DOCDIR}/sqlite3/api/files/lib/sqlite3/driver
+@dirrm ${RUBY_DOCDIR}/sqlite3/api/files/lib/sqlite3
+@dirrm ${RUBY_DOCDIR}/sqlite3/api/files/lib
+@dirrm ${RUBY_DOCDIR}/sqlite3/api/files
+@dirrm ${RUBY_DOCDIR}/sqlite3/api/classes/SQLite3/Constants
+@dirrm ${RUBY_DOCDIR}/sqlite3/api/classes/SQLite3/Database
+@dirrm ${RUBY_DOCDIR}/sqlite3/api/classes/SQLite3/Driver/DL
+@dirrm ${RUBY_DOCDIR}/sqlite3/api/classes/SQLite3/Driver/Native
+@dirrm ${RUBY_DOCDIR}/sqlite3/api/classes/SQLite3/Driver
+@dirrm ${RUBY_DOCDIR}/sqlite3/api/classes/SQLite3/ResultSet
+@dirrm ${RUBY_DOCDIR}/sqlite3/api/classes/SQLite3
+@dirrm ${RUBY_DOCDIR}/sqlite3/api/classes/DL
+@dirrm ${RUBY_DOCDIR}/sqlite3/api/classes
+@dirrm ${RUBY_DOCDIR}/sqlite3/api
+@dirrm ${RUBY_DOCDIR}/sqlite3/faq
+@dirrm ${RUBY_DOCDIR}/sqlite3
 @dirrm ${RUBY_SITELIBDIR}/sqlite3/driver/dl
+@dirrm ${RUBY_SITELIBDIR}/sqlite3/driver/native
 @dirrm ${RUBY_SITELIBDIR}/sqlite3/driver
 @dirrm ${RUBY_SITELIBDIR}/sqlite3