4 files changed, 98 insertions, 19 deletions

diff --git a/databases/ruby-sqlite/Makefile b/databases/ruby-sqlite/Makefile
index a801abe33013..17fa00a5a6b1 100644
--- a/databases/ruby-sqlite/Makefile
+++ b/databases/ruby-sqlite/Makefile
@@ -6,11 +6,9 @@
 #
 
 PORTNAME=	sqlite
-PORTVERSION=	1.0
-PORTREVISION=	1
+PORTVERSION=	2.2.2
 CATEGORIES=	databases ruby
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	${PORTNAME}-ruby
+MASTER_SITES=	http://rubyforge.org/frs/download.php/1901/
 PKGNAMEPREFIX=	${RUBY_PKGNAMEPREFIX}
 DISTNAME=	${PORTNAME}-ruby-${PORTVERSION}
 DIST_SUBDIR=	ruby
@@ -20,18 +18,26 @@ COMMENT=	Ruby interface to the SQLite DB engine
 
 LIB_DEPENDS=	sqlite.2:${PORTSDIR}/databases/sqlite2
 
+USE_BZIP2=	yes
 USE_RUBY=	yes
 USE_RUBY_EXTCONF=	yes
 
-WRKSRC=	${WRKDIR}/${PORTNAME}
+CONFIGURE_WRKSRC=	${WRKSRC}/ext
+BUILD_WRKSRC=		${WRKSRC}/ext
+INSTALL_WRKSRC=		${WRKSRC}/ext
 INSTALL_TARGET=	site-install
 
+DOCS=	ChangeLog LICENSE api/* doc/*
+
+post-extract:
+	${LN} -s ../lib ${WRKSRC}/ext/
+
 post-install:
 .if !defined(NOPORTDOCS)
-	${MKDIR} ${RUBY_MODEXAMPLESDIR}/
-	${INSTALL_DATA} ${WRKSRC}/samples/* ${RUBY_MODEXAMPLESDIR}/
 	${MKDIR} ${RUBY_MODDOCDIR}
-	${INSTALL_DATA} ${WRKSRC}/README ${RUBY_MODDOCDIR}/
+.for f in ${DOCS}
+	${CP} -R ${WRKSRC}/${f} ${RUBY_MODDOCDIR}/
+.endfor
 .endif
 
 .include <bsd.port.mk>
diff --git a/databases/ruby-sqlite/distinfo b/databases/ruby-sqlite/distinfo
index 6dd3fda20bbf..201a47c30e62 100644
--- a/databases/ruby-sqlite/distinfo
+++ b/databases/ruby-sqlite/distinfo
@@ -1,2 +1,2 @@
-MD5 (ruby/sqlite-ruby-1.0.tar.gz) = cc22e5ce8b3ddcb3de27eb4d7eaa23bc
-SIZE (ruby/sqlite-ruby-1.0.tar.gz) = 13823
+MD5 (ruby/sqlite-ruby-2.2.2.tar.bz2) = 274e30cab90f4941984ea5b3273ef058
+SIZE (ruby/sqlite-ruby-2.2.2.tar.bz2) = 56347
diff --git a/databases/ruby-sqlite/pkg-descr b/databases/ruby-sqlite/pkg-descr
index 433dc455feb5..da584570b2f6 100644
--- a/databases/ruby-sqlite/pkg-descr
+++ b/databases/ruby-sqlite/pkg-descr
@@ -6,4 +6,4 @@ you want portability between backends, use DBI.  If you want ease of
 use with SQLite, use this.
 
 Author:	minam <jgb3@email.byu.edu>
-WWW:	http://sqlite-ruby.sourceforge.net/
+WWW:	http://sqlite-ruby.rubyforge.org
diff --git a/databases/ruby-sqlite/pkg-plist b/databases/ruby-sqlite/pkg-plist
index a569f9720d7f..5d1dac9367bc 100644
--- a/databases/ruby-sqlite/pkg-plist
+++ b/databases/ruby-sqlite/pkg-plist
@@ -1,10 +1,83 @@
-%%RUBY_SITEARCHLIBDIR%%/_sqlite.so
+%%RUBY_SITEARCHLIBDIR%%/sqlite_api.so
 %%RUBY_SITELIBDIR%%/sqlite.rb
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/advanced.rb
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/dbdef.sql
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/define_db.rb
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/pragma.rb
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/queries.rb
-%%PORTDOCS%%@dirrm %%RUBY_MODEXAMPLESDIR%%
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/README
+%%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
+%%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%%/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%%/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
+%%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
 %%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%