4 files changed, 107 insertions, 82 deletions

diff --git a/databases/rubygem-sqlite3-ruby/Makefile b/databases/rubygem-sqlite3-ruby/Makefile
index 17fa00a5a6b1..76c9432c909d 100644
--- a/databases/rubygem-sqlite3-ruby/Makefile
+++ b/databases/rubygem-sqlite3-ruby/Makefile
@@ -1,37 +1,31 @@
-# New ports collection makefile for:	sqlite-ruby
+# New ports collection makefile for:	sqlite3-ruby
 # Date created:		26 June 2003
 # Whom:			Akinori MUSHA aka knu <knu@idaemons.org>
 #
 # $FreeBSD$
 #
 
-PORTNAME=	sqlite
-PORTVERSION=	2.2.2
+PORTNAME=	sqlite3
+PORTVERSION=	0.5.0
 CATEGORIES=	databases ruby
-MASTER_SITES=	http://rubyforge.org/frs/download.php/1901/
+MASTER_SITES=	http://rubyforge.org/frs/download.php/2301/
 PKGNAMEPREFIX=	${RUBY_PKGNAMEPREFIX}
 DISTNAME=	${PORTNAME}-ruby-${PORTVERSION}
 DIST_SUBDIR=	ruby
 
 MAINTAINER=	knu@FreeBSD.org
-COMMENT=	Ruby interface to the SQLite DB engine
+COMMENT=	Ruby interface to the SQLite DB engine version 3
 
-LIB_DEPENDS=	sqlite.2:${PORTSDIR}/databases/sqlite2
+LIB_DEPENDS=	sqlite3.8:${PORTSDIR}/databases/sqlite3
 
 USE_BZIP2=	yes
 USE_RUBY=	yes
-USE_RUBY_EXTCONF=	yes
+USE_RUBY_SETUP=	yes
 
-CONFIGURE_WRKSRC=	${WRKSRC}/ext
-BUILD_WRKSRC=		${WRKSRC}/ext
-INSTALL_WRKSRC=		${WRKSRC}/ext
-INSTALL_TARGET=	site-install
+NO_BUILD=	yes
 
 DOCS=	ChangeLog LICENSE api/* doc/*
 
-post-extract:
-	${LN} -s ../lib ${WRKSRC}/ext/
-
 post-install:
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${RUBY_MODDOCDIR}
diff --git a/databases/rubygem-sqlite3-ruby/distinfo b/databases/rubygem-sqlite3-ruby/distinfo
index 201a47c30e62..3742db4bf84c 100644
--- a/databases/rubygem-sqlite3-ruby/distinfo
+++ b/databases/rubygem-sqlite3-ruby/distinfo
@@ -1,2 +1,2 @@
-MD5 (ruby/sqlite-ruby-2.2.2.tar.bz2) = 274e30cab90f4941984ea5b3273ef058
-SIZE (ruby/sqlite-ruby-2.2.2.tar.bz2) = 56347
+MD5 (ruby/sqlite3-ruby-0.5.0.tar.bz2) = 7ef518b86687a385867665ef0bbb5881
+SIZE (ruby/sqlite3-ruby-0.5.0.tar.bz2) = 52853
diff --git a/databases/rubygem-sqlite3-ruby/files/patch-api.rb b/databases/rubygem-sqlite3-ruby/files/patch-api.rb
new file mode 100644
index 000000000000..1f2361725562
--- /dev/null
+++ b/databases/rubygem-sqlite3-ruby/files/patch-api.rb
@@ -0,0 +1,11 @@
+--- lib/sqlite3/driver/dl/api.rb.orig	Wed Dec 22 13:45:15 2004
++++ lib/sqlite3/driver/dl/api.rb	Sun Dec 26 06:03:27 2004
+@@ -38,7 +38,7 @@
+     extend ::DL::Importable
+ 
+     library_name = case RUBY_PLATFORM.downcase
+-      when /linux/
++      when /linux/, /freebsd|netbsd|openbsd|dragonfly/
+         "libsqlite3.so"
+       when /win32/
+         "sqlite3.dll"
diff --git a/databases/rubygem-sqlite3-ruby/pkg-plist b/databases/rubygem-sqlite3-ruby/pkg-plist
index 5d1dac9367bc..aefc8cf73996 100644
--- a/databases/rubygem-sqlite3-ruby/pkg-plist
+++ b/databases/rubygem-sqlite3-ruby/pkg-plist
@@ -1,83 +1,103 @@
-%%RUBY_SITEARCHLIBDIR%%/sqlite_api.so
-%%RUBY_SITELIBDIR%%/sqlite.rb
-%%RUBY_SITELIBDIR%%/sqlite/database.rb
-%%RUBY_SITELIBDIR%%/sqlite/parsed_statement.rb
-%%RUBY_SITELIBDIR%%/sqlite/pragmas.rb
-%%RUBY_SITELIBDIR%%/sqlite/resultset.rb
-%%RUBY_SITELIBDIR%%/sqlite/statement.rb
-%%RUBY_SITELIBDIR%%/sqlite/translator.rb
-%%RUBY_SITELIBDIR%%/sqlite/version.rb
-@dirrm %%RUBY_SITELIBDIR%%/sqlite
+%%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/errors.rb
+%%RUBY_SITELIBDIR%%/sqlite3/pragmas.rb
+%%RUBY_SITELIBDIR%%/sqlite3/resultset.rb
+%%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/dl
+@dirrm %%RUBY_SITELIBDIR%%/sqlite3/driver
+@dirrm %%RUBY_SITELIBDIR%%/sqlite3
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/ChangeLog
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/LICENSE
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/blank.html
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/classes/SQLite.html
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/classes/SQLite/API.html
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/classes/SQLite/Database.html
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/classes/SQLite/Database/FunctionProxy.html
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/classes/SQLite/Exceptions.html
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/classes/SQLite/Exceptions/AbortException.html
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/classes/SQLite/Exceptions/AuthorizationException.html
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/classes/SQLite/Exceptions/BusyException.html
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/classes/SQLite/Exceptions/CantOpenException.html
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/classes/SQLite/Exceptions/ConstraintException.html
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/classes/SQLite/Exceptions/CorruptException.html
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/classes/SQLite/Exceptions/DatabaseException.html
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/classes/SQLite/Exceptions/EmptyException.html
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/classes/SQLite/Exceptions/FormatException.html
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/classes/SQLite/Exceptions/FullException.html
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/classes/SQLite/Exceptions/IOErrorException.html
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/classes/SQLite/Exceptions/InternalException.html
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/classes/SQLite/Exceptions/InterruptException.html
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/classes/SQLite/Exceptions/LockedException.html
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/classes/SQLite/Exceptions/MismatchException.html
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/classes/SQLite/Exceptions/MisuseException.html
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/classes/SQLite/Exceptions/NotADatabaseException.html
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/classes/SQLite/Exceptions/NotFoundException.html
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/classes/SQLite/Exceptions/OutOfMemoryException.html
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/classes/SQLite/Exceptions/PermissionsException.html
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/classes/SQLite/Exceptions/ProtocolException.html
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/classes/SQLite/Exceptions/RangeException.html
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/classes/SQLite/Exceptions/ReadOnlyException.html
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/classes/SQLite/Exceptions/SQLException.html
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/classes/SQLite/Exceptions/SchemaChangedException.html
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/classes/SQLite/Exceptions/TooBigException.html
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/classes/SQLite/Exceptions/UnsupportedOSFeatureException.html
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/classes/SQLite/ParsedStatement.html
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/classes/SQLite/Pragmas.html
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/classes/SQLite/ResultSet.html
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/classes/SQLite/ResultSet/FieldsContainer.html
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/classes/SQLite/ResultSet/TypesContainer.html
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/classes/SQLite/Statement.html
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/classes/SQLite/Translator.html
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/classes/SQLite/Version.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/classes/DL.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/classes/DL/PtrData.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/classes/Kernel.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/classes/SQLite3.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/classes/SQLite3/AbortException.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/classes/SQLite3/AuthorizationException.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/classes/SQLite3/Blob.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/classes/SQLite3/BusyException.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/classes/SQLite3/CantOpenException.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/classes/SQLite3/Constants.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/classes/SQLite3/Constants/ColumnType.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/classes/SQLite3/Constants/ErrorCode.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/classes/SQLite3/Constants/TextRep.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/classes/SQLite3/ConstraintException.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/classes/SQLite3/CorruptException.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/classes/SQLite3/Database.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/classes/SQLite3/Database/FunctionProxy.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/classes/SQLite3/Driver.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/classes/SQLite3/Driver/DL.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/classes/SQLite3/Driver/DL/API.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/classes/SQLite3/Driver/DL/Driver.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/classes/SQLite3/EmptyException.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/classes/SQLite3/Error.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/classes/SQLite3/Exception.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/classes/SQLite3/FullException.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/classes/SQLite3/IOException.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/classes/SQLite3/InternalException.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/classes/SQLite3/InterruptException.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/classes/SQLite3/LockedException.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/classes/SQLite3/MemoryException.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/classes/SQLite3/MismatchException.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/classes/SQLite3/MisuseException.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/classes/SQLite3/NotFoundException.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/classes/SQLite3/PermissionException.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/classes/SQLite3/Pragmas.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/classes/SQLite3/ProtocolException.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/classes/SQLite3/ReadOnlyException.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/classes/SQLite3/ResultSet.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/classes/SQLite3/ResultSet/FieldsContainer.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/classes/SQLite3/ResultSet/TypesContainer.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/classes/SQLite3/SQLException.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/classes/SQLite3/SchemaChangedException.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/classes/SQLite3/Statement.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/classes/SQLite3/TooBigException.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/classes/SQLite3/Translator.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/classes/SQLite3/UnsupportedException.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/classes/SQLite3/Value.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/classes/SQLite3/Version.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/classes/String.html
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/created.rid
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/faq/faq.html
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/faq/faq.rb
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/faq/faq.yml
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/files/README.html
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/files/ext/sqlite-api_c.html
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/files/lib/sqlite/database_rb.html
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/files/lib/sqlite/parsed_statement_rb.html
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/files/lib/sqlite/pragmas_rb.html
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/files/lib/sqlite/resultset_rb.html
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/files/lib/sqlite/statement_rb.html
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/files/lib/sqlite/translator_rb.html
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/files/lib/sqlite/version_rb.html
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/files/lib/sqlite_rb.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/files/lib/sqlite3/constants_rb.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/files/lib/sqlite3/database_rb.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/files/lib/sqlite3/driver/dl/api_rb.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/files/lib/sqlite3/driver/dl/driver_rb.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/files/lib/sqlite3/errors_rb.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/files/lib/sqlite3/pragmas_rb.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/files/lib/sqlite3/resultset_rb.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/files/lib/sqlite3/statement_rb.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/files/lib/sqlite3/translator_rb.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/files/lib/sqlite3/value_rb.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/files/lib/sqlite3/version_rb.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/files/lib/sqlite3_rb.html
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/fr_class_index.html
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/fr_file_index.html
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/fr_method_index.html
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/index.html
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/rdoc-style.css
-%%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%/files/lib/sqlite
+%%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%/files/lib/sqlite3/driver/dl
+%%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%/files/lib/sqlite3/driver
+%%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%/files/lib/sqlite3
 %%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%/files/lib
-%%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%/files/ext
 %%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%/files
 %%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%/faq
-%%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%/classes/SQLite/ResultSet
-%%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%/classes/SQLite/Exceptions
-%%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%/classes/SQLite/Database
-%%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%/classes/SQLite
+%%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%/classes/SQLite3/ResultSet
+%%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%/classes/SQLite3/Driver/DL
+%%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%/classes/SQLite3/Driver
+%%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%/classes/SQLite3/Database
+%%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%/classes/SQLite3/Constants
+%%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%/classes/SQLite3
+%%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%/classes/DL
 %%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%/classes
 %%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%