Update Ruby/DBI and DBD modules to 0.0.12.

8 files changed, 22 insertions, 9 deletions

diff --git a/databases/ruby-dbd_proxy/Makefile b/databases/ruby-dbd_proxy/Makefile
index 4fc26e97b9ab..08137f3a5e55 100644
--- a/databases/ruby-dbd_proxy/Makefile
+++ b/databases/ruby-dbd_proxy/Makefile
@@ -22,7 +22,7 @@ USE_RUBY=	yes
 USE_RUBY_SETUP=	yes
 
 WRKSRC=		${RUBY_DBI_WRKSRC}
-CONFIGURE_ARGS=	--with=lib/${PORTNAME}
+CONFIGURE_ARGS=	--with=bin/proxyserver,lib/${PORTNAME}
 
 .include "${.CURDIR}/../ruby-dbi/Makefile.common"
 
diff --git a/databases/ruby-dbd_proxy/pkg-plist b/databases/ruby-dbd_proxy/pkg-plist
index efb15f978e7f..d1a0f040e2bb 100644
--- a/databases/ruby-dbd_proxy/pkg-plist
+++ b/databases/ruby-dbd_proxy/pkg-plist
@@ -1,2 +1,3 @@
+bin/proxyserver.rb
 %%RUBY_SITELIBDIR%%/DBD/Proxy/Proxy.rb
 @dirrm %%RUBY_SITELIBDIR%%/DBD/Proxy
diff --git a/databases/ruby-dbd_sqlite/Makefile b/databases/ruby-dbd_sqlite/Makefile
index adb09d1bfecd..d840fd3be067 100644
--- a/databases/ruby-dbd_sqlite/Makefile
+++ b/databases/ruby-dbd_sqlite/Makefile
@@ -24,10 +24,20 @@ USE_RUBY_SETUP=	yes
 WRKSRC=		${RUBY_DBI_WRKSRC}
 CONFIGURE_ARGS=	--with=ext/${PORTNAME}
 
-post-patch:
-	${RUBY} -i- -pe 'gsub "/usr/local", "${LOCALBASE}"' \
-		${WRKSRC}/ext/dbd_sqlite/extconf.rb
+DOCS_EN=	ext/${PORTNAME}/README
 
 .include "${.CURDIR}/../ruby-dbi/Makefile.common"
 
+post-patch:
+	${RUBY} -i- -pe 'gsub "/usr/local", "${LOCALBASE}"' \
+		${WRKSRC}/ext/${PORTNAME}/extconf.rb
+
+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_sqlite/pkg-plist b/databases/ruby-dbd_sqlite/pkg-plist
index e32e88f69229..87eaf3b25da2 100644
--- a/databases/ruby-dbd_sqlite/pkg-plist
+++ b/databases/ruby-dbd_sqlite/pkg-plist
@@ -1,2 +1,4 @@
 %%RUBY_SITEARCHLIBDIR%%/DBD/SQLite/SQLite.so
 @dirrm %%RUBY_SITEARCHLIBDIR%%/DBD/SQLite
+%%PORTDOCS%%%%RUBY_DOCDIR%%/dbi/dbd_sqlite/README
+%%PORTDOCS%%@dirrm %%RUBY_DOCDIR%%/dbi/dbd_sqlite
diff --git a/databases/ruby-dbi/Makefile b/databases/ruby-dbi/Makefile
index c599bfaa5474..138f95e206f1 100644
--- a/databases/ruby-dbi/Makefile
+++ b/databases/ruby-dbi/Makefile
@@ -19,7 +19,7 @@ USE_RUBY=	yes
 USE_RUBY_SETUP=	yes
 
 WRKSRC=		${RUBY_DBI_WRKSRC}
-CONFIGURE_ARGS=	--with=lib/${PORTNAME},lib/wrapper
+CONFIGURE_ARGS=	--with=bin/commandline,lib/${PORTNAME},lib/wrapper
 
 DOCS_EN=	README.1st doc/* lib/${PORTNAME}/doc/*
 
diff --git a/databases/ruby-dbi/Makefile.common b/databases/ruby-dbi/Makefile.common
index 988e50296292..d7cfa9baea4c 100644
--- a/databases/ruby-dbi/Makefile.common
+++ b/databases/ruby-dbi/Makefile.common
@@ -2,7 +2,7 @@
 
 RUBY_DBI_PORTNAME=	dbi
 # Don't forget to clear PORTREVISION's on update
-RUBY_DBI_VERSION=	0.0.11
+RUBY_DBI_VERSION=	0.0.12
 RUBY_DBI_PORTVERSION=	${RUBY_DBI_VERSION}
 RUBY_DBI_MASTER_SITES=	http://www.ruby-projects.org/downloads/dbi/
 RUBY_DBI_DISTNAME=	ruby-${RUBY_DBI_PORTNAME}-all-${PORTVERSION}
diff --git a/databases/ruby-dbi/distinfo b/databases/ruby-dbi/distinfo
index a62c2314724b..1e4858247e8f 100644
--- a/databases/ruby-dbi/distinfo
+++ b/databases/ruby-dbi/distinfo
@@ -1 +1 @@
-MD5 (ruby/ruby-dbi-all-0.0.11.tar.gz) = f011742fce4c0d2c67b7452cb52e96ae
+MD5 (ruby/ruby-dbi-all-0.0.12.tar.gz) = 15240ab7b43bbda771959bd92fa5067d
diff --git a/databases/ruby-dbi/pkg-plist b/databases/ruby-dbi/pkg-plist
index daf8cc5f8c30..8ad59aa0afcf 100644
--- a/databases/ruby-dbi/pkg-plist
+++ b/databases/ruby-dbi/pkg-plist
@@ -1,3 +1,4 @@
+bin/sqlsh.rb
 %%RUBY_SITELIBDIR%%/dbi.rb
 %%RUBY_SITELIBDIR%%/dbi/columninfo.rb
 %%RUBY_SITELIBDIR%%/dbi/dbi.rb
@@ -10,12 +11,11 @@
 @dirrm %%RUBY_SITEARCHLIBDIR%%/dbi
 @dirrm %%RUBY_SITEARCHLIBDIR%%/DBD
 %%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/dbi/persistence.rb
-%%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/xmlgen.rb
 %%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/dbi/xmltest.rb
 %%PORTDOCS%%@dirrm %%RUBY_EXAMPLESDIR%%/dbi
 %%PORTDOCS%%%%RUBY_DOCDIR%%/dbi/ChangeLog