5 files changed, 59 insertions, 19 deletions
diff --git a/databases/ruby-dbi/Makefile b/databases/ruby-dbi/Makefile
index 46ec571dece0..474631d145d3 100644
--- a/databases/ruby-dbi/Makefile
+++ b/databases/ruby-dbi/Makefile
@@ -5,37 +5,41 @@
 # $FreeBSD$
 #
 
-PORTNAME=	dbi
-PORTVERSION=	0.0.4
-PORTREVISION=	1
+PORTNAME=	${RUBY_DBI_PORTNAME}
+PORTVERSION=	${RUBY_DBI_PORTVERSION}
 CATEGORIES=	databases ruby
-MASTER_SITES=	http://www.sprytech.com/~rainer.perl/ruby/files/
+MASTER_SITES=	${RUBY_DBI_MASTER_SITES}
 PKGNAMEPREFIX=	${RUBY_PKGNAMEPREFIX}
-DISTNAME=	ruby-${PORTNAME}-${PORTVERSION}
-EXTRACT_SUFX=	.tgz
-DIST_SUBDIR=	ruby
+DISTNAME=	${RUBY_DBI_DISTNAME}
+DIST_SUBDIR=	ruby	
 
 MAINTAINER=	knu@FreeBSD.org
 
 USE_RUBY=	yes
+USE_RUBY_SETUP=	yes
 
-NO_WRKSUBDIR=	yes
+WRKSRC=		${RUBY_DBI_WRKSRC}
+CONFIGURE_ARGS=	--with=lib/${PORTNAME},lib/wrapper
 
-NO_BUILD=	yes
+DOCS_EN=	README.1st doc/* lib/${PORTNAME}/doc/*
 
-DOCS_EN=	README.1st lib/${PORTNAME}/doc/*
+.include "${.CURDIR}/Makefile.common"
 
 post-extract:
 	${MV} ${WRKSRC}/README ${WRKSRC}/README.1st
+	${RM} ${WRKSRC}/doc/create_html
+	${RM} ${WRKSRC}/lib/${PORTNAME}/doc/create_html
 
-do-install:
-	${INSTALL_DATA} ${WRKSRC}/lib/${PORTNAME}/*.rb ${RUBY_SITELIBDIR}/
+post-install:
 	${MKDIR} ${RUBY_SITEARCHLIBDIR}/${PORTNAME}
-	${MKDIR} ${RUBY_SITELIBDIR}/${PORTNAME}
+	${MKDIR} ${RUBY_SITELIBDIR}/DBD
+	${MKDIR} ${RUBY_SITEARCHLIBDIR}/DBD
 .if !defined(NOPORTDOCS)
+	${MKDIR} ${RUBY_EXAMPLESDIR}/${PORTNAME}
+	${CP} -R ${WRKSRC}/examples/* ${RUBY_EXAMPLESDIR}/${PORTNAME}/
 	${MKDIR} ${RUBY_DOCDIR}/${PORTNAME}
 .for f in ${DOCS_EN}
-	${INSTALL_DATA} ${WRKSRC}/${f} ${RUBY_DOCDIR}/${PORTNAME}/
+	${CP} -R ${WRKSRC}/${f} ${RUBY_DOCDIR}/${PORTNAME}/
 .endfor
 .endif
 
diff --git a/databases/ruby-dbi/Makefile.common b/databases/ruby-dbi/Makefile.common
new file mode 100644
index 000000000000..1594d3c6453f
--- /dev/null
+++ b/databases/ruby-dbi/Makefile.common
@@ -0,0 +1,14 @@
+# $FreeBSD$
+
+RUBY_DBI_PORTNAME=	dbi
+RUBY_DBI_VERSION=	0.0.5
+RUBY_DBI_PORTVERSION=	${RUBY_DBI_VERSION}
+RUBY_DBI_PORTREVISION=	# none
+RUBY_DBI_MASTER_SITES=	http://www.ruby-projects.org/downloads/dbi/
+RUBY_DBI_DISTNAME=	ruby-${RUBY_DBI_PORTNAME}-all-${PORTVERSION}
+
+RUBY_DBI_PORTDIR=	${PORTSDIR}/databases/ruby-${RUBY_DBI_PORTNAME}
+
+RUBY_DBI_WRKSRC?=	${WRKDIR}/ruby-${RUBY_DBI_PORTNAME}-all
+
+MD5_FILE?=		${RUBY_DBI_PORTDIR}/distinfo
diff --git a/databases/ruby-dbi/distinfo b/databases/ruby-dbi/distinfo
index 577d95dcd0c3..d5452f18b2a3 100644
--- a/databases/ruby-dbi/distinfo
+++ b/databases/ruby-dbi/distinfo
@@ -1 +1 @@
-MD5 (ruby/ruby-dbi-0.0.4.tgz) = 65dc83374cce86f8494fd47537902449
+MD5 (ruby/ruby-dbi-all-0.0.5.tar.gz) = 385ee3f747fb4cb02ffa16adf94b3e77
diff --git a/databases/ruby-dbi/pkg-descr b/databases/ruby-dbi/pkg-descr
index 6abf17dd7e95..deb2c19f5b1a 100644
--- a/databases/ruby-dbi/pkg-descr
+++ b/databases/ruby-dbi/pkg-descr
@@ -1,5 +1,6 @@
 This is a DBI-for-Ruby.  It is designed to behave like the DBI you
 know from Perl.
 
-Author:	Rainer Perl <rainer.perl@sprytech.com>
-WWW:	http://www.sprytech.com/~rainer.perl/ruby/
+Authors:	Rainer Perl <rainer.perl@sprytech.com>,
+		Michael Neumann <neumann@s-direktnet.de>
+WWW:	http://www.ruby-projects.org/dbi/
diff --git a/databases/ruby-dbi/pkg-plist b/databases/ruby-dbi/pkg-plist
index 68e8d94d7d6f..a3c4cdd04605 100644
--- a/databases/ruby-dbi/pkg-plist
+++ b/databases/ruby-dbi/pkg-plist
@@ -1,7 +1,28 @@
 %%RUBY_SITELIBDIR%%/dbi.rb
-@dirrm %%RUBY_SITEARCHLIBDIR%%/dbi
+%%RUBY_SITELIBDIR%%/dbi/dbi.rb
+%%RUBY_SITELIBDIR%%/dbi/row.rb
+%%RUBY_SITELIBDIR%%/dbi/sql.rb
+%%RUBY_SITELIBDIR%%/dbi/trace.rb
+%%RUBY_SITELIBDIR%%/dbi/utils.rb
 @dirrm %%RUBY_SITELIBDIR%%/dbi
+@dirrm %%RUBY_SITELIBDIR%%/DBD
+@dirrm %%RUBY_SITEARCHLIBDIR%%/DBD
+%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/dbi/proxyserver.rb
+%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/dbi/sqlsh.rb
+%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/dbi/sqlsh.rb.new
+%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/dbi/test1.pl
+%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/dbi/test1.rb
+%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/dbi/test_blob.rb
+%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/dbi/xmltest.rb
+%%PORTDOCS%%@dirrm %%RUBY_EXAMPLESDIR%%/dbi
+%%PORTDOCS%%%%RUBY_DOCDIR%%/dbi/DBD_SPEC
+%%PORTDOCS%%%%RUBY_DOCDIR%%/dbi/DBI_SPEC
 %%PORTDOCS%%%%RUBY_DOCDIR%%/dbi/HISTORY
-%%PORTDOCS%%%%RUBY_DOCDIR%%/dbi/README
 %%PORTDOCS%%%%RUBY_DOCDIR%%/dbi/README.1st
+%%PORTDOCS%%%%RUBY_DOCDIR%%/dbi/index.rd
+%%PORTDOCS%%%%RUBY_DOCDIR%%/dbi/html/DBD_SPEC.html
+%%PORTDOCS%%%%RUBY_DOCDIR%%/dbi/html/DBI_SPEC.html
+%%PORTDOCS%%%%RUBY_DOCDIR%%/dbi/html/index.html
+%%PORTDOCS%%%%RUBY_DOCDIR%%/dbi/html/rubyStyle.css
+%%PORTDOCS%%@dirrm %%RUBY_DOCDIR%%/dbi/html
 %%PORTDOCS%%@dirrm %%RUBY_DOCDIR%%/dbi