Update Ruby/DBI to 0.0.5.

ruby-dbd_postgresql has been renamed to ruby-dbd_pg. (without a
repocopy since ruby-dbd_postgresql has no history)

22 files changed, 138 insertions, 129 deletions

diff --git a/databases/Makefile b/databases/Makefile
index 47141e7b80f1..1b7484d99170 100644
--- a/databases/Makefile
+++ b/databases/Makefile
@@ -72,7 +72,7 @@
     SUBDIR += ruby-bdb
     SUBDIR += ruby-cdb
     SUBDIR += ruby-dbd_mysql
-    SUBDIR += ruby-dbd_postgresql
+    SUBDIR += ruby-dbd_pg
     SUBDIR += ruby-dbd_sybase
     SUBDIR += ruby-dbi
     SUBDIR += ruby-gdbm
diff --git a/databases/ruby-dbd_mysql/Makefile b/databases/ruby-dbd_mysql/Makefile
index c2d57d90bc5b..ddfa733245de 100644
--- a/databases/ruby-dbd_mysql/Makefile
+++ b/databases/ruby-dbd_mysql/Makefile
@@ -6,38 +6,33 @@
 #
 
 PORTNAME=	dbd_mysql
-PORTVERSION=	0.0.4
+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-dbi-${PORTVERSION}
-EXTRACT_SUFX=	.tgz
+DISTNAME=	${RUBY_DBI_DISTNAME}
 DIST_SUBDIR=	ruby
 
 MAINTAINER=	knu@FreeBSD.org
 
-RUN_DEPENDS=	${RUBY_SITELIBDIR}/dbi.rb:${.CURDIR}/../ruby-dbi \
+RUN_DEPENDS=	${RUBY_SITELIBDIR}/dbi.rb:${RUBY_DBI_PORTDIR} \
 		${RUBY_SITEARCHLIBDIR}/mysql.so:${.CURDIR}/../ruby-mysql
 
 USE_RUBY=	yes
+USE_RUBY_SETUP=	yes
 
-NO_BUILD=	yes
+WRKSRC=		${RUBY_DBI_WRKSRC}
+CONFIGURE_ARGS=	--with=lib/${PORTNAME}
 
-WRKSRC=		${WRKDIR}/lib/${PORTNAME}
+DOCS_EN=	lib/${PORTNAME}/doc/*
 
-EXAMPLES_EN=	../../examples/test1.rb
-DOCS_EN=	doc/*
+.include "${.CURDIR}/../ruby-dbi/Makefile.common"
 
-do-install:
-	${INSTALL_DATA} ${WRKSRC}/*.rb ${RUBY_SITELIBDIR}/dbi/
+post-install:
 .if !defined(NOPORTDOCS)
-	${MKDIR} ${RUBY_EXAMPLESDIR}/dbi/${PORTNAME}
-.for f in ${EXAMPLES_EN}
-	${INSTALL_DATA} ${WRKSRC}/${f} ${RUBY_EXAMPLESDIR}/dbi/${PORTNAME}/
-.endfor
-	${MKDIR} ${RUBY_DOCDIR}/dbi/${PORTNAME}
+	${MKDIR} ${RUBY_DOCDIR}/${RUBY_DBI_PORTNAME}/${PORTNAME}
 .for f in ${DOCS_EN}
-	${INSTALL_DATA} ${WRKSRC}/${f} ${RUBY_DOCDIR}/dbi/${PORTNAME}/
+	${INSTALL_DATA} ${WRKSRC}/${f} ${RUBY_DOCDIR}/${RUBY_DBI_PORTNAME}/${PORTNAME}/
 .endfor
 .endif
 
diff --git a/databases/ruby-dbd_mysql/distinfo b/databases/ruby-dbd_mysql/distinfo
deleted file mode 100644
index 577d95dcd0c3..000000000000
--- a/databases/ruby-dbd_mysql/distinfo
+++ /dev/null
@@ -1 +0,0 @@
-MD5 (ruby/ruby-dbi-0.0.4.tgz) = 65dc83374cce86f8494fd47537902449
diff --git a/databases/ruby-dbd_mysql/pkg-descr b/databases/ruby-dbd_mysql/pkg-descr
index d6a66f296340..816affcffeb0 100644
--- a/databases/ruby-dbd_mysql/pkg-descr
+++ b/databases/ruby-dbd_mysql/pkg-descr
@@ -1,4 +1,4 @@
-This is the MySQL driver for Rainer Perl's DBI-for-Ruby.
+This is the MySQL driver for DBI-for-Ruby.
 
 Author:	Rainer Perl <rainer.perl@sprytech.com>
-WWW:	http://www.sprytech.com/~rainer.perl/ruby/
+WWW:	http://www.ruby-projects.org/dbi/
diff --git a/databases/ruby-dbd_mysql/pkg-plist b/databases/ruby-dbd_mysql/pkg-plist
index 86a95a0707e7..b41ebb46bce4 100644
--- a/databases/ruby-dbd_mysql/pkg-plist
+++ b/databases/ruby-dbd_mysql/pkg-plist
@@ -1,6 +1,5 @@
-%%RUBY_SITELIBDIR%%/dbi/dbd_mysql.rb
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/dbi/dbd_mysql/test1.rb
-%%PORTDOCS%%@dirrm %%RUBY_EXAMPLESDIR%%/dbi/dbd_mysql
+%%RUBY_SITELIBDIR%%/DBD/Mysql/Mysql.rb
+@dirrm %%RUBY_SITELIBDIR%%/DBD/Mysql
 %%PORTDOCS%%%%RUBY_DOCDIR%%/dbi/dbd_mysql/HISTORY
 %%PORTDOCS%%%%RUBY_DOCDIR%%/dbi/dbd_mysql/README
 %%PORTDOCS%%@dirrm %%RUBY_DOCDIR%%/dbi/dbd_mysql
diff --git a/databases/ruby-dbd_pg/Makefile b/databases/ruby-dbd_pg/Makefile
new file mode 100644
index 000000000000..03d8df99037c
--- /dev/null
+++ b/databases/ruby-dbd_pg/Makefile
@@ -0,0 +1,39 @@
+# New ports collection makefile for:	dbd_pg for DBD-for-Ruby
+# Date created:		9 June 2001
+# Whom:			Akinori MUSHA aka knu <knu@idaemons.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME=	dbd_pg
+PORTVERSION=	${RUBY_DBI_PORTVERSION}
+CATEGORIES=	databases ruby
+MASTER_SITES=	${RUBY_DBI_MASTER_SITES}
+PKGNAMEPREFIX=	${RUBY_PKGNAMEPREFIX}
+DISTNAME=	${RUBY_DBI_DISTNAME}
+DIST_SUBDIR=	ruby
+
+MAINTAINER=	knu@FreeBSD.org
+
+RUN_DEPENDS=	${RUBY_SITELIBDIR}/dbi.rb:${RUBY_DBI_PORTDIR} \
+		${RUBY_SITEARCHLIBDIR}/postgres.so:${.CURDIR}/../ruby-postgres
+
+USE_RUBY=	yes
+USE_RUBY_SETUP=	yes
+
+WRKSRC=		${RUBY_DBI_WRKSRC}
+CONFIGURE_ARGS=	--with=lib/${PORTNAME}
+
+DOCS_EN=	lib/${PORTNAME}/doc/*
+
+.include "${.CURDIR}/../ruby-dbi/Makefile.common"
+
+post-install:
+.if !defined(NOPORTDOCS)
+	${MKDIR} ${RUBY_DOCDIR}/${RUBY_DBI_PORTNAME}/${PORTNAME}
+.for f in ${DOCS_EN}
+	${INSTALL_DATA} ${WRKSRC}/${f} ${RUBY_DOCDIR}/${RUBY_DBI_PORTNAME}/${PORTNAME}/
+.endfor
+.endif
+
+.include <bsd.port.mk>
diff --git a/databases/ruby-dbd_postgresql/pkg-comment b/databases/ruby-dbd_pg/pkg-comment
index e5eabfa618d9..e5eabfa618d9 100644
--- a/databases/ruby-dbd_postgresql/pkg-comment
+++ b/databases/ruby-dbd_pg/pkg-comment
diff --git a/databases/ruby-dbd_pg/pkg-descr b/databases/ruby-dbd_pg/pkg-descr
new file mode 100644
index 000000000000..cfb254e2a545
--- /dev/null
+++ b/databases/ruby-dbd_pg/pkg-descr
@@ -0,0 +1,5 @@
+This is the PostgreSQL driver for DBI-for-Ruby.
+
+Author:	Jim Weirich <jweirich@one.ent>
+WWW:	http://www.ruby-projects.org/dbi/
+
diff --git a/databases/ruby-dbd_pg/pkg-plist b/databases/ruby-dbd_pg/pkg-plist
new file mode 100644
index 000000000000..24122cb73973
--- /dev/null
+++ b/databases/ruby-dbd_pg/pkg-plist
@@ -0,0 +1,4 @@
+%%RUBY_SITELIBDIR%%/DBD/Pg/Pg.rb
+@dirrm %%RUBY_SITELIBDIR%%/DBD/Pg
+%%PORTDOCS%%%%RUBY_DOCDIR%%/dbi/dbd_pg/README
+%%PORTDOCS%%@dirrm %%RUBY_DOCDIR%%/dbi/dbd_pg
diff --git a/databases/ruby-dbd_postgresql/Makefile b/databases/ruby-dbd_postgresql/Makefile
deleted file mode 100644
index 6c540a80dbed..000000000000
--- a/databases/ruby-dbd_postgresql/Makefile
+++ /dev/null
@@ -1,42 +0,0 @@
-# New ports collection makefile for:	dbd_postgresql for DBD-for-Ruby
-# Date created:		3 June 2001
-# Whom:			Akinori MUSHA aka knu <knu@idaemons.org>
-#
-# $FreeBSD$
-#
-
-PORTNAME=	dbd_postgresql
-PORTVERSION=	0.0.4
-CATEGORIES=	databases ruby
-MASTER_SITES=	ftp://ftp.one.net/pub/users/jweirich/tools/ruby-dbi/
-PKGNAMEPREFIX=	${RUBY_PKGNAMEPREFIX}
-DISTNAME=	ruby-dbi-postgresql-${PORTVERSION}
-EXTRACT_SUFX=	.tgz
-DIST_SUBDIR=	ruby
-
-MAINTAINER=	knu@FreeBSD.org
-
-RUN_DEPENDS=	${RUBY_SITELIBDIR}/dbi.rb:${.CURDIR}/../ruby-dbi \
-		${RUBY_SITEARCHLIBDIR}/postgres.so:${.CURDIR}/../ruby-postgres
-
-USE_RUBY=	yes
-
-NO_BUILD=	yes
-
-EXAMPLES_EN=	*.rb
-DOCS_EN=	README
-
-do-install:
-	${INSTALL_DATA} ${WRKSRC}/dbi/*.rb ${RUBY_SITELIBDIR}/dbi/
-.if !defined(NOPORTDOCS)
-	${MKDIR} ${RUBY_EXAMPLESDIR}/dbi/${PORTNAME}
-.for f in ${EXAMPLES_EN}
-	${INSTALL_DATA} ${WRKSRC}/${f} ${RUBY_EXAMPLESDIR}/dbi/${PORTNAME}/
-.endfor
-	${MKDIR} ${RUBY_DOCDIR}/dbi/${PORTNAME}
-.for f in ${DOCS_EN}
-	${INSTALL_DATA} ${WRKSRC}/${f} ${RUBY_DOCDIR}/dbi/${PORTNAME}/
-.endfor
-.endif
-
-.include <bsd.port.mk>
diff --git a/databases/ruby-dbd_postgresql/distinfo b/databases/ruby-dbd_postgresql/distinfo
deleted file mode 100644
index c84daf3e6cab..000000000000
--- a/databases/ruby-dbd_postgresql/distinfo
+++ /dev/null
@@ -1 +0,0 @@
-MD5 (ruby/ruby-dbi-postgresql-0.0.4.tgz) = 14ae1d7428e2f4a03108cbad67305587
diff --git a/databases/ruby-dbd_postgresql/pkg-descr b/databases/ruby-dbd_postgresql/pkg-descr
deleted file mode 100644
index 03a6942dd360..000000000000
--- a/databases/ruby-dbd_postgresql/pkg-descr
+++ /dev/null
@@ -1,3 +0,0 @@
-This is the PostgreSQL driver for Rainer Perl's DBI-for-Ruby.
-
-Author:	Jim Weirich <jweirich@one.ent>
diff --git a/databases/ruby-dbd_postgresql/pkg-plist b/databases/ruby-dbd_postgresql/pkg-plist
deleted file mode 100644
index 5562f2c6f957..000000000000
--- a/databases/ruby-dbd_postgresql/pkg-plist
+++ /dev/null
@@ -1,9 +0,0 @@
-%%RUBY_SITELIBDIR%%/dbi/dbd_postgresql.rb
-%%RUBY_SITELIBDIR%%/dbi/sqlquote.rb
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/dbi/dbd_postgresql/runtests.rb
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/dbi/dbd_postgresql/testdbi.rb
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/dbi/dbd_postgresql/testdbipostgres.rb
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/dbi/dbd_postgresql/testsqlquote.rb
-%%PORTDOCS%%@dirrm %%RUBY_EXAMPLESDIR%%/dbi/dbd_postgresql
-%%PORTDOCS%%%%RUBY_DOCDIR%%/dbi/dbd_postgresql/README
-%%PORTDOCS%%@dirrm %%RUBY_DOCDIR%%/dbi/dbd_postgresql
diff --git a/databases/ruby-dbd_sybase/Makefile b/databases/ruby-dbd_sybase/Makefile
index 2e0c60605e75..b867712f532f 100644
--- a/databases/ruby-dbd_sybase/Makefile
+++ b/databases/ruby-dbd_sybase/Makefile
@@ -6,33 +6,33 @@
 #
 
 PORTNAME=	dbd_sybase
-PORTVERSION=	0.0.4
+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-dbi-${PORTVERSION}
-EXTRACT_SUFX=	.tgz
+DISTNAME=	${RUBY_DBI_DISTNAME}
 DIST_SUBDIR=	ruby
 
 MAINTAINER=	knu@FreeBSD.org
 
 LIB_DEPENDS=	tds.0:${.CURDIR}/../freetds
-RUN_DEPENDS=	${RUBY_SITELIBDIR}/dbi.rb:${.CURDIR}/../ruby-dbi
+RUN_DEPENDS=	${RUBY_SITELIBDIR}/dbi.rb:${RUBY_DBI_PORTDIR}
 
 USE_RUBY=	yes
-USE_RUBY_EXTCONF=	yes
+USE_RUBY_SETUP=	yes
 
-WRKSRC=		${WRKDIR}/ext/${PORTNAME}
-INSTALL_TARGET=	site-install
+WRKSRC=		${RUBY_DBI_WRKSRC}
+CONFIGURE_ARGS=	--with=ext/${PORTNAME}
 
-DOCS_EN=	doc/*
+DOCS_EN=	ext/${PORTNAME}/doc/*
+
+.include "${.CURDIR}/../ruby-dbi/Makefile.common"
 
 post-install:
-	cd ${RUBY_SITEARCHLIBDIR} && ${MV} ${PORTNAME}.so dbi/
 .if !defined(NOPORTDOCS)
-	${MKDIR} ${RUBY_DOCDIR}/dbi/${PORTNAME}
+	${MKDIR} ${RUBY_DOCDIR}/${RUBY_DBI_PORTNAME}/${PORTNAME}
 .for f in ${DOCS_EN}
-	${INSTALL_DATA} ${WRKSRC}/${f} ${RUBY_DOCDIR}/dbi/${PORTNAME}/
+	${INSTALL_DATA} ${WRKSRC}/${f} ${RUBY_DOCDIR}/${RUBY_DBI_PORTNAME}/${PORTNAME}/
 .endfor
 .endif
 
diff --git a/databases/ruby-dbd_sybase/distinfo b/databases/ruby-dbd_sybase/distinfo
deleted file mode 100644
index 577d95dcd0c3..000000000000
--- a/databases/ruby-dbd_sybase/distinfo
+++ /dev/null
@@ -1 +0,0 @@
-MD5 (ruby/ruby-dbi-0.0.4.tgz) = 65dc83374cce86f8494fd47537902449
diff --git a/databases/ruby-dbd_sybase/files/patch-extconf.rb b/databases/ruby-dbd_sybase/files/patch-extconf.rb
deleted file mode 100644
index 8bc4a421da7f..000000000000
--- a/databases/ruby-dbd_sybase/files/patch-extconf.rb
+++ /dev/null
@@ -1,16 +0,0 @@
---- extconf.rb.orig	Mon Apr 23 21:31:46 2001
-+++ extconf.rb	Sun Jun  3 03:44:04 2001
-@@ -1,11 +1,7 @@
- require 'mkmf'
- 
--# You may need to change these parameters
--FREETDSDIR = "/usr/local/freetds"
--# end of parameters
-+dir_config("freetds", "/usr/local/freetds")
- 
--$CFLAGS = "-I#{FREETDSDIR}/include"
--$LDFLAGS = "-L#{FREETDSDIR}/lib"
- $libs = "-ltds"
- 
--create_makefile("dbd_sybase")
-+create_makefile("dbd_sybase")
diff --git a/databases/ruby-dbd_sybase/pkg-descr b/databases/ruby-dbd_sybase/pkg-descr
index 9fbcaf7ccce7..1c886765ee78 100644
--- a/databases/ruby-dbd_sybase/pkg-descr
+++ b/databases/ruby-dbd_sybase/pkg-descr
@@ -1,4 +1,4 @@
-This is the Sybase driver for Rainer Perl's DBI-for-Ruby.
+This is the Sybase driver for DBI-for-Ruby.
 
 Author:	Rainer Perl <rainer.perl@sprytech.com>
-WWW:	http://www.sprytech.com/~rainer.perl/ruby/
+WWW:	http://www.ruby-projects.org/dbi/
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