- Update to 0.4.3

- remove Makefile.common since ruby-dbd_* pkgs are now seperate sources

5 files changed, 39 insertions, 88 deletions

diff --git a/databases/ruby-dbi/Makefile b/databases/ruby-dbi/Makefile
index ddbcf4ef77b6..bfb244933b9f 100644
--- a/databases/ruby-dbi/Makefile
+++ b/databases/ruby-dbi/Makefile
@@ -5,45 +5,27 @@
 # $FreeBSD$
 #
 
-PORTNAME=	${RUBY_DBI_PORTNAME}
-PORTVERSION=	${RUBY_DBI_PORTVERSION}
+PORTNAME=	dbi
+PORTVERSION=	0.4.3
 CATEGORIES=	databases ruby
-MASTER_SITES=	${RUBY_DBI_MASTER_SITES}
-MASTER_SITE_SUBDIR=	${RUBY_DBI_MASTER_SITE_SUBDIR}
+MASTER_SITES=	RF
+MASTER_SITE_SUBDIR=	ruby-dbi
 PKGNAMEPREFIX=	${RUBY_PKGNAMEPREFIX}
-DISTNAME=	${RUBY_DBI_DISTNAME}
 DIST_SUBDIR=	ruby
 
 MAINTAINER=	ruby@FreeBSD.org
 COMMENT=	DBI-for-Ruby - a common interface for SQL-based databases
 
-RUN_DEPENDS=	${RUBY_SITELIBDIR}/aspectr.rb:${PORTSDIR}/devel/ruby-aspectr
+RUN_DEPENDS=	${RUBY_SITELIBDIR}/aspectr.rb:${PORTSDIR}/devel/ruby-aspectr \
+    		rubygem-deprecated>0:${PORTSDIR}/devel/rubygem-deprecated
 
 USE_RUBY=	yes
 USE_RUBY_SETUP=	yes
 
-WRKSRC=		${RUBY_DBI_WRKSRC}
-CONFIGURE_ARGS=	--with=bin/commandline,${PORTNAME}
-
-DOCS_EN=	README.1st doc/*
-
-.include "${.CURDIR}/Makefile.common"
-
-post-extract:
-	${MV} ${WRKSRC}/README ${WRKSRC}/README.1st
-
 post-install:
-	${MKDIR} ${RUBY_SITEARCHLIBDIR}/${PORTNAME}
-	${MKDIR} ${RUBY_SITELIBDIR}/DBD
-	${MKDIR} ${RUBY_SITEARCHLIBDIR}/DBD
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${RUBY_MODEXAMPLESDIR}
 	${INSTALL_DATA} ${WRKSRC}/examples/* ${RUBY_MODEXAMPLESDIR}/
-	${MKDIR} ${RUBY_MODDOCDIR}
-.for f in ${DOCS_EN}
-	${CP} -R ${WRKSRC}/${f} ${RUBY_MODDOCDIR}/
-.endfor
 .endif
-	@${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.mk>
diff --git a/databases/ruby-dbi/Makefile.common b/databases/ruby-dbi/Makefile.common
deleted file mode 100644
index 9812ce187ff3..000000000000
--- a/databases/ruby-dbi/Makefile.common
+++ /dev/null
@@ -1,21 +0,0 @@
-# $FreeBSD$
-
-RUBY_DBI_PORTNAME=	dbi
-# Don't forget to clear PORTREVISION's on update
-RUBY_DBI_VERSION=	0.1.1
-RUBY_DBI_PORTVERSION=	${RUBY_DBI_VERSION}
-RUBY_DBI_MASTER_SITES=	${MASTER_SITE_RUBYFORGE}
-RUBY_DBI_MASTER_SITE_SUBDIR=	ruby-${RUBY_DBI_PORTNAME}
-RUBY_DBI_DISTNAME=	${RUBY_DBI_PORTNAME}-${PORTVERSION}
-
-RUBY_DBI_PORTDIR=	${PORTSDIR}/databases/ruby-${RUBY_DBI_PORTNAME}
-
-RUBY_DBI_WRKSRC?=	${WRKDIR}/ruby-dbi
-
-MD5_FILE?=		${RUBY_DBI_PORTDIR}/distinfo
-
-.if ${PORTNAME} == dbi
-RUBY_MODNAME?=		${RUBY_DBI_PORTNAME}
-.else
-RUBY_MODNAME?=		${RUBY_DBI_PORTNAME}/${PORTNAME}
-.endif
diff --git a/databases/ruby-dbi/distinfo b/databases/ruby-dbi/distinfo
index 593df7a1a1be..338f895d3730 100644
--- a/databases/ruby-dbi/distinfo
+++ b/databases/ruby-dbi/distinfo
@@ -1,3 +1,3 @@
-MD5 (ruby/dbi-0.1.1.tar.gz) = 1077f898080bb0af1098ee4b5b54f8d1
-SHA256 (ruby/dbi-0.1.1.tar.gz) = f45a301a81dbc86aa3202f0f0b6eb63e4a3fdd0b622605135575a2000d581b0f
-SIZE (ruby/dbi-0.1.1.tar.gz) = 155533
+MD5 (ruby/dbi-0.4.3.tar.gz) = 7091868735031d896f7fbbf59ef4c401
+SHA256 (ruby/dbi-0.4.3.tar.gz) = 5f4d0c92c43ccfc4d0075dfe17e3315a2d2d8aaeaee207a81985dd7be75f45fa
+SIZE (ruby/dbi-0.4.3.tar.gz) = 81851
diff --git a/databases/ruby-dbi/pkg-message b/databases/ruby-dbi/pkg-message
deleted file mode 100644
index d03c73a5b366..000000000000
--- a/databases/ruby-dbi/pkg-message
+++ /dev/null
@@ -1,4 +0,0 @@
-====
-DBD modules are available as separate ports.  Check out
-databases/ruby-dbd_* and install the ones you need.
-====
diff --git a/databases/ruby-dbi/pkg-plist b/databases/ruby-dbi/pkg-plist
index 54cb2f060fdf..5310d3f6cae5 100644
--- a/databases/ruby-dbi/pkg-plist
+++ b/databases/ruby-dbi/pkg-plist
@@ -1,42 +1,36 @@
-@exec mkdir -p %D/%%RUBY_SITEARCHLIBDIR%%/DBD
-@exec mkdir -p %D/%%RUBY_SITEARCHLIBDIR%%/dbi
-@exec mkdir -p %D/%%RUBY_SITELIBDIR%%/DBD
-bin/sqlsh.rb
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/dbd/frontbase/README
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/dbd/mysql/HISTORY
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/dbd/mysql/README
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/dbd/postgresql/README
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/html/ChangeLog.html
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/html/DBD_SPEC.html
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/html/DBI_SPEC.html
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/html/index.html
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/html/rubyStyle.css
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/DBD_SPEC
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/DBI_SPEC
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/README.1st
-%%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%/dbd/frontbase
-%%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%/dbd/mysql
-%%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%/dbd/postgresql
-%%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%/dbd
-%%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%/html
-%%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/persistence.rb
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/sqlsh.rb.new
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/test1.pl
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/test1.rb
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/test_blob.rb
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/trace_test.rb
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/xmlgen.rb
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/xmltest.rb
-%%PORTDOCS%%@dirrm %%RUBY_MODEXAMPLESDIR%%
-@dirrm %%RUBY_SITEARCHLIBDIR%%/DBD
-@dirrm %%RUBY_SITEARCHLIBDIR%%/dbi
+bin/dbi
+bin/test_broken_dbi
+%%RUBY_SITELIBDIR%%/dbi.rb
+%%RUBY_SITELIBDIR%%/dbi/base_classes.rb
+%%RUBY_SITELIBDIR%%/dbi/base_classes/database.rb
+%%RUBY_SITELIBDIR%%/dbi/base_classes/driver.rb
+%%RUBY_SITELIBDIR%%/dbi/base_classes/statement.rb
+%%RUBY_SITELIBDIR%%/dbi/binary.rb
 %%RUBY_SITELIBDIR%%/dbi/columninfo.rb
+%%RUBY_SITELIBDIR%%/dbi/exceptions.rb
+%%RUBY_SITELIBDIR%%/dbi/handles.rb
+%%RUBY_SITELIBDIR%%/dbi/handles/database.rb
+%%RUBY_SITELIBDIR%%/dbi/handles/driver.rb
+%%RUBY_SITELIBDIR%%/dbi/handles/statement.rb
 %%RUBY_SITELIBDIR%%/dbi/row.rb
 %%RUBY_SITELIBDIR%%/dbi/sql.rb
+%%RUBY_SITELIBDIR%%/dbi/sql/preparedstatement.rb
+%%RUBY_SITELIBDIR%%/dbi/sql_type_constants.rb
 %%RUBY_SITELIBDIR%%/dbi/trace.rb
+%%RUBY_SITELIBDIR%%/dbi/types.rb
+%%RUBY_SITELIBDIR%%/dbi/typeutil.rb
 %%RUBY_SITELIBDIR%%/dbi/utils.rb
-%%RUBY_SITELIBDIR%%/dbi/version.rb
-%%RUBY_SITELIBDIR%%/dbi.rb
-@dirrm %%RUBY_SITELIBDIR%%/DBD
+%%RUBY_SITELIBDIR%%/dbi/utils/date.rb
+%%RUBY_SITELIBDIR%%/dbi/utils/tableformatter.rb
+%%RUBY_SITELIBDIR%%/dbi/utils/time.rb
+%%RUBY_SITELIBDIR%%/dbi/utils/timestamp.rb
+%%RUBY_SITELIBDIR%%/dbi/utils/xmlformatter.rb
+@dirrm %%RUBY_SITELIBDIR%%/dbi/utils
+@dirrm %%RUBY_SITELIBDIR%%/dbi/sql
+@dirrm %%RUBY_SITELIBDIR%%/dbi/handles
+@dirrm %%RUBY_SITELIBDIR%%/dbi/base_classes
 @dirrm %%RUBY_SITELIBDIR%%/dbi
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/test1.pl
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/test1.rb
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/xmltest.rb
+%%PORTDOCS%%@dirrm %%RUBY_MODEXAMPLESDIR%%