- Update to 0.07

- Port now requires perl 5.6

13 files changed, 29 insertions, 184 deletions

diff --git a/databases/p5-SQL-Translator/Makefile b/databases/p5-SQL-Translator/Makefile
index 1486c3345bb9..b303229fd5d0 100644
--- a/databases/p5-SQL-Translator/Makefile
+++ b/databases/p5-SQL-Translator/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	SQL-Translator
-PORTVERSION=	0.06
-PORTREVISION=	2
+PORTVERSION=	0.07
 CATEGORIES=	databases perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	SQL
@@ -29,7 +28,10 @@ BUILD_DEPENDS=	${SITE_PERL}/Class/Base.pm:${PORTSDIR}/devel/p5-Class-Base \
 		${SITE_PERL}/XML/Writer.pm:${PORTSDIR}/textproc/p5-XML-Writer \
 		${SITE_PERL}/XML/XPath.pm:${PORTSDIR}/textproc/p5-XML-XPath \
 		${SITE_PERL}/YAML.pm:${PORTSDIR}/textproc/p5-YAML \
-		${SITE_PERL}/${PERL_ARCH}/Storable.pm:${PORTSDIR}/devel/p5-Storable
+		${SITE_PERL}/${PERL_ARCH}/Storable.pm:${PORTSDIR}/devel/p5-Storable \
+		${SITE_PERL}/Class/Data/Inheritable.pm:${PORTSDIR}/devel/p5-Class-Data-Inheritable \
+		${SITE_PERL}/Class/MakeMethods.pm:${PORTSDIR}/devel/p5-Class-MakeMethods \
+		${SITE_PERL}/Log/Log4perl.pm:${PORTSDIR}/devel/p5-Log-Log4perl
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
 PERL_MODBUILD=	yes
@@ -42,7 +44,9 @@ MAN1=		sqlt-diagram.1 \
 MAN3=		SQL::Translator.3 \
 		SQL::Translator::Manual.3 \
 		SQL::Translator::Parser.3 \
+		SQL::Translator::Parser::Access.3 \
 		SQL::Translator::Parser::DBI.3 \
+		SQL::Translator::Parser::DBI::DB2.3 \
 		SQL::Translator::Parser::DBI::MySQL.3 \
 		SQL::Translator::Parser::DBI::PostgreSQL.3 \
 		SQL::Translator::Parser::DBI::SQLite.3 \
@@ -68,9 +72,11 @@ MAN3=		SQL::Translator.3 \
 		SQL::Translator::Producer::Oracle.3 \
 		SQL::Translator::Producer::POD.3 \
 		SQL::Translator::Producer::PostgreSQL.3 \
+		SQL::Translator::Producer::SQLServer.3 \
 		SQL::Translator::Producer::SQLite.3 \
 		SQL::Translator::Producer::Storable.3 \
 		SQL::Translator::Producer::Sybase.3 \
+		SQL::Translator::Producer::TT::Base.3 \
 		SQL::Translator::Producer::TT::Table.3 \
 		SQL::Translator::Producer::TTSchema.3 \
 		SQL::Translator::Producer::XML.3 \
@@ -81,6 +87,7 @@ MAN3=		SQL::Translator.3 \
 		SQL::Translator::Schema::Constraint.3 \
 		SQL::Translator::Schema::Field.3 \
 		SQL::Translator::Schema::Index.3 \
+		SQL::Translator::Schema::Object.3 \
 		SQL::Translator::Schema::Procedure.3 \
 		SQL::Translator::Schema::Table.3 \
 		SQL::Translator::Schema::Trigger.3 \
@@ -89,21 +96,7 @@ MAN3=		SQL::Translator.3 \
 		Test::SQL::Translator.3
 
 .include <bsd.port.pre.mk>
-
 .if ${PERL_LEVEL} < 500600
-BUILD_DEPENDS+=	${SITE_PERL}/${PERL_ARCH}/IO/Dir.pm:${PORTSDIR}/devel/p5-IO
-EXTRA_PATCHES+=	${PATCHDIR}/5.005_03-patch-lib::SQL::Translator::Parser::xSV.pm \
-		${PATCHDIR}/5.005_03-patch-lib::SQL::Translator::Producer::Diagram.pm \
-		${PATCHDIR}/5.005_03-patch-lib::SQL::Translator::Producer::GraphViz.pm \
-		${PATCHDIR}/5.005_03-patch-lib::SQL::Translator::Producer::HTML.pm \
-		${PATCHDIR}/5.005_03-patch-lib::SQL::Translator::Producer::XML::SQLFairy.pm \
-		${PATCHDIR}/5.005_03-patch-lib::SQL::Translator::Schema::Table.pm \
-		${PATCHDIR}/5.005_03-patch-lib::SQL::Translator::Utils.pm \
-		${PATCHDIR}/5.005_03-patch-t::05bgep-re.t \
-		${PATCHDIR}/5.005_03-patch-t::19sybase-parser.t \
-		${PATCHDIR}/5.005_03-patch-t::27sqlite-parser.t \
-		${PATCHDIR}/5.005_03-patch-t::31dumper.t
-
+IGNORE=	requires Perl 5.6. Install lang/perl5 or lang/perl5.8, and try again
 .endif
-
 .include <bsd.port.post.mk>
diff --git a/databases/p5-SQL-Translator/distinfo b/databases/p5-SQL-Translator/distinfo
index 303df75089b0..8ace9b62935d 100644
--- a/databases/p5-SQL-Translator/distinfo
+++ b/databases/p5-SQL-Translator/distinfo
@@ -1,2 +1,2 @@
-MD5 (SQL-Translator-0.06.tar.gz) = e7aae659a682ddbb46bbd6b2c15a4b6e
-SIZE (SQL-Translator-0.06.tar.gz) = 181138
+MD5 (SQL-Translator-0.07.tar.gz) = 5e6d8be5f6256343125a130a57a3e463
+SIZE (SQL-Translator-0.07.tar.gz) = 319475
diff --git a/databases/p5-SQL-Translator/files/5.005_03-patch-lib::SQL::Translator::Parser::xSV.pm b/databases/p5-SQL-Translator/files/5.005_03-patch-lib::SQL::Translator::Parser::xSV.pm
deleted file mode 100644
index b46ac635ca6a..000000000000
--- a/databases/p5-SQL-Translator/files/5.005_03-patch-lib::SQL::Translator::Parser::xSV.pm
+++ /dev/null
@@ -1,15 +0,0 @@
---- lib/SQL/Translator/Parser/xSV.pm.orig	Sun May  9 21:39:20 2004
-+++ lib/SQL/Translator/Parser/xSV.pm	Sun May  9 21:39:50 2004
-@@ -174,9 +174,9 @@
-                 $size = [ $size->[0] + $size->[1] ];
-             }
- 
--            my $field = $table->get_field( $field );
--            $field->size( $size );
--            $field->data_type( $data_type );
-+            my $f = $table->get_field( $field );
-+            $f->size( $size );
-+            $f->data_type( $data_type );
-         }
-     }
- 
diff --git a/databases/p5-SQL-Translator/files/5.005_03-patch-lib::SQL::Translator::Producer::Diagram.pm b/databases/p5-SQL-Translator/files/5.005_03-patch-lib::SQL::Translator::Producer::Diagram.pm
deleted file mode 100644
index c608978dffb4..000000000000
--- a/databases/p5-SQL-Translator/files/5.005_03-patch-lib::SQL::Translator::Producer::Diagram.pm
+++ /dev/null
@@ -1,39 +0,0 @@
---- lib/SQL/Translator/Producer/Diagram.pm.orig	Sun May  9 15:00:01 2004
-+++ lib/SQL/Translator/Producer/Diagram.pm	Sun May  9 15:09:32 2004
-@@ -502,27 +502,27 @@
-     #
-     debug("imap file = '$imap_file'");
-     if ( $imap_file && @imap_coords ) {
--        open my $fh, ">$imap_file" or die "Can't write '$imap_file': $!\n";
--        print $fh qq[<html><body><img src="" usemap="#imap" border="0">\n].
-+        open FH, ">$imap_file" or die "Can't write '$imap_file': $!\n";
-+        print FH qq[<html><body><img src="" usemap="#imap" border="0">\n].
-             qq[<map name="imap">\n];
-         for my $rec ( @imap_coords ) {
-             my $href = shift @$rec;
--            print $fh q[<area coords="].join(',', @$rec).qq[" href="$href">\n];
-+            print FH q[<area coords="].join(',', @$rec).qq[" href="$href">\n];
-         } 
--        print $fh qq[</body></html>];
--        close $fh;
-+        print FH qq[</body></html>];
-+        close FH;
-     }
- 
-     #
-     # Print the image.
-     #
-     if ( $out_file ) {
--        open my $fh, ">$out_file" or die "Can't write '$out_file': $!\n";
--        print $fh $gd->$output_type;
--        close $fh;
-+        open FH, ">$out_file" or die "Can't write '$out_file': $!\n";
-+        print FH $gd->$output_type();
-+        close FH;
-     }
-     else {
--        return $gd->$output_type;
-+        return $gd->$output_type();
-     }
- }
- 
diff --git a/databases/p5-SQL-Translator/files/5.005_03-patch-lib::SQL::Translator::Producer::GraphViz.pm b/databases/p5-SQL-Translator/files/5.005_03-patch-lib::SQL::Translator::Producer::GraphViz.pm
deleted file mode 100644
index 9fb168c5e872..000000000000
--- a/databases/p5-SQL-Translator/files/5.005_03-patch-lib::SQL::Translator::Producer::GraphViz.pm
+++ /dev/null
@@ -1,21 +0,0 @@
---- lib/SQL/Translator/Producer/GraphViz.pm.orig	Sun May  9 15:10:03 2004
-+++ lib/SQL/Translator/Producer/GraphViz.pm	Sun May  9 15:10:53 2004
-@@ -378,13 +378,13 @@
-     #
-     my $output_method = "as_$output_type";
-     if ( $out_file ) {
--        open my $fh, ">$out_file" or die "Can't write '$out_file': $!\n";
--        binmode $fh;
--        print $fh $gv->$output_method;
--        close $fh;
-+        open FH, ">$out_file" or die "Can't write '$out_file': $!\n";
-+        binmode FH;
-+        print FH $gv->$output_method();
-+        close FH;
-     }
-     else {
--        return $gv->$output_method;
-+        return $gv->$output_method();
-     }
- }
- 
diff --git a/databases/p5-SQL-Translator/files/5.005_03-patch-lib::SQL::Translator::Producer::HTML.pm b/databases/p5-SQL-Translator/files/5.005_03-patch-lib::SQL::Translator::Producer::HTML.pm
deleted file mode 100644
index 4027c3bcf168..000000000000
--- a/databases/p5-SQL-Translator/files/5.005_03-patch-lib::SQL::Translator::Producer::HTML.pm
+++ /dev/null
@@ -1,11 +0,0 @@
---- lib/SQL/Translator/Producer/HTML.pm.orig	Sun May  9 21:14:22 2004
-+++ lib/SQL/Translator/Producer/HTML.pm	Sun May  9 21:14:45 2004
-@@ -59,7 +59,7 @@
-                                    CGI::Pretty->new }
-                     : do { require CGI;
-                             import CGI; 
--                                   CGI->new };
-+                                   CGI->new('') };
-     my ($table, @table_names);
- 
-     if ($wrap) {
diff --git a/databases/p5-SQL-Translator/files/5.005_03-patch-lib::SQL::Translator::Producer::XML::SQLFairy.pm b/databases/p5-SQL-Translator/files/5.005_03-patch-lib::SQL::Translator::Producer::XML::SQLFairy.pm
deleted file mode 100644
index 3dec8c3d081f..000000000000
--- a/databases/p5-SQL-Translator/files/5.005_03-patch-lib::SQL::Translator::Producer::XML::SQLFairy.pm
+++ /dev/null
@@ -1,17 +0,0 @@
---- lib/SQL/Translator/Producer/XML/SQLFairy.pm.orig	Fri Sep  3 16:27:14 2004
-+++ lib/SQL/Translator/Producer/XML/SQLFairy.pm	Sun Oct 24 17:00:03 2004
-@@ -349,11 +349,11 @@
-     # The order comes from the meths list passed in.
-     my @tags;
-     my @attr;
--    foreach ( grep { defined $obj->$_ } @meths ) {
-+    foreach ( grep { defined $obj->$_() } @meths ) {
-         my $what = m/$elements_re/ ? \@tags : \@attr;
-         my $val = $_ eq 'extra'
--            ? { $obj->$_ }
--            : $obj->$_;
-+            ? { $obj->$_() }
-+            : $obj->$_();
-         $val = ref $val eq 'ARRAY' ? join(',', @$val) : $val;
-         push @$what, $_ => $val;
-     };
diff --git a/databases/p5-SQL-Translator/files/5.005_03-patch-lib::SQL::Translator::Schema::Table.pm b/databases/p5-SQL-Translator/files/5.005_03-patch-lib::SQL::Translator::Schema::Table.pm
deleted file mode 100644
index 8659883ca5f2..000000000000
--- a/databases/p5-SQL-Translator/files/5.005_03-patch-lib::SQL::Translator::Schema::Table.pm
+++ /dev/null
@@ -1,11 +0,0 @@
---- lib/SQL/Translator/Schema/Table.pm.orig	Sun May  9 19:09:06 2004
-+++ lib/SQL/Translator/Schema/Table.pm	Sun May  9 19:09:30 2004
-@@ -104,7 +104,7 @@
-     my $constraint_class = 'SQL::Translator::Schema::Constraint';
-     my $constraint;
- 
--    if ( UNIVERSAL::isa( $_[0], $constraint_class ) ) {
-+    if ( UNIVERSAL::isa( $_[0]||'', $constraint_class ) ) {
-         $constraint = shift;
-         $constraint->table( $self );
-     }
diff --git a/databases/p5-SQL-Translator/files/5.005_03-patch-lib::SQL::Translator::Utils.pm b/databases/p5-SQL-Translator/files/5.005_03-patch-lib::SQL::Translator::Utils.pm
deleted file mode 100644
index 291f79cfe45f..000000000000
--- a/databases/p5-SQL-Translator/files/5.005_03-patch-lib::SQL::Translator::Utils.pm
+++ /dev/null
@@ -1,11 +0,0 @@
---- lib/SQL/Translator/Utils.pm.orig	Mon Feb  9 23:04:26 2004
-+++ lib/SQL/Translator/Utils.pm	Sun May  9 19:11:27 2004
-@@ -123,7 +123,7 @@
- # arguments.  Modified to also handle a list of references.
- # ----------------------------------------------------------------------
- sub parse_list_arg {
--    my $list = UNIVERSAL::isa( $_[0], 'ARRAY' ) ? shift : [ @_ ];
-+    my $list = UNIVERSAL::isa( $_[0]||'', 'ARRAY' ) ? shift : [ @_ ];
- 
-     #
-     # This protects stringification of references.
diff --git a/databases/p5-SQL-Translator/files/5.005_03-patch-t::05bgep-re.t b/databases/p5-SQL-Translator/files/5.005_03-patch-t::05bgep-re.t
deleted file mode 100644
index 4efb2a815e6e..000000000000
--- a/databases/p5-SQL-Translator/files/5.005_03-patch-t::05bgep-re.t
+++ /dev/null
@@ -1,11 +0,0 @@
---- t/05bgep-re.t.orig	Sun May  9 19:03:10 2004
-+++ t/05bgep-re.t	Sun May  9 19:03:27 2004
-@@ -44,7 +44,7 @@
-                                 SUFFIX => '.xml',
-                                 DIR => tmpdir);
-     print $fh $data;
--    $fh->close;
-+    close $fh;
- 
-     ok(XML::Parser->new->parsefile($fname),
-         "Successfully parsed output");
diff --git a/databases/p5-SQL-Translator/files/5.005_03-patch-t::19sybase-parser.t b/databases/p5-SQL-Translator/files/5.005_03-patch-t::19sybase-parser.t
deleted file mode 100644
index 66b1c1f778d7..000000000000
--- a/databases/p5-SQL-Translator/files/5.005_03-patch-t::19sybase-parser.t
+++ /dev/null
@@ -1,15 +0,0 @@
---- t/19sybase-parser.t.orig	Sun May  9 19:14:03 2004
-+++ t/19sybase-parser.t	Sun May  9 19:14:34 2004
-@@ -17,9 +17,9 @@
- my $data;
- {
-     local $/;
--    open my $fh, "<$file" or die "Can't read file '$file': $!\n";
--    $data = <$fh>;
--    close $fh;
-+    open FH, "<$file" or die "Can't read file '$file': $!\n";
-+    $data = <FH>;
-+    close FH;
- }
- 
- ok( $data, 'Data' );
diff --git a/databases/p5-SQL-Translator/files/5.005_03-patch-t::27sqlite-parser.t b/databases/p5-SQL-Translator/files/5.005_03-patch-t::27sqlite-parser.t
deleted file mode 100644
index 89822ced61c1..000000000000
--- a/databases/p5-SQL-Translator/files/5.005_03-patch-t::27sqlite-parser.t
+++ /dev/null
@@ -1,13 +0,0 @@
---- t/27sqlite-parser.t.orig	Sun May  9 21:02:06 2004
-+++ t/27sqlite-parser.t	Sun May  9 21:02:33 2004
-@@ -13,8 +13,8 @@
- 
- {
-     local $/;
--    open my $fh, "<$file" or die "Can't read file '$file': $!\n";
--    my $data = <$fh>;
-+    open FH, "<$file" or die "Can't read file '$file': $!\n";
-+    my $data = <FH>;
-     my $t = SQL::Translator->new;
-     parse($t, $data);
- 
diff --git a/databases/p5-SQL-Translator/pkg-plist b/databases/p5-SQL-Translator/pkg-plist
index f912eb0381a8..cc47029b34ed 100644
--- a/databases/p5-SQL-Translator/pkg-plist
+++ b/databases/p5-SQL-Translator/pkg-plist
@@ -6,7 +6,11 @@ bin/sqlt-graph
 %%SITE_PERL%%/SQL/Translator.pm
 %%SITE_PERL%%/SQL/Translator/Manual.pod
 %%SITE_PERL%%/SQL/Translator/Parser.pm
+%%SITE_PERL%%/SQL/Translator/Parser/Access.pm
+%%SITE_PERL%%/SQL/Translator/Parser/DB2.pm
+%%SITE_PERL%%/SQL/Translator/Parser/DB2/Grammar.pm
 %%SITE_PERL%%/SQL/Translator/Parser/DBI.pm
+%%SITE_PERL%%/SQL/Translator/Parser/DBI/DB2.pm
 %%SITE_PERL%%/SQL/Translator/Parser/DBI/MySQL.pm
 %%SITE_PERL%%/SQL/Translator/Parser/DBI/PostgreSQL.pm
 %%SITE_PERL%%/SQL/Translator/Parser/DBI/SQLite.pm
@@ -32,9 +36,11 @@ bin/sqlt-graph
 %%SITE_PERL%%/SQL/Translator/Producer/Oracle.pm
 %%SITE_PERL%%/SQL/Translator/Producer/POD.pm
 %%SITE_PERL%%/SQL/Translator/Producer/PostgreSQL.pm
+%%SITE_PERL%%/SQL/Translator/Producer/SQLServer.pm
 %%SITE_PERL%%/SQL/Translator/Producer/SQLite.pm
 %%SITE_PERL%%/SQL/Translator/Producer/Storable.pm
 %%SITE_PERL%%/SQL/Translator/Producer/Sybase.pm
+%%SITE_PERL%%/SQL/Translator/Producer/TT/Base.pm
 %%SITE_PERL%%/SQL/Translator/Producer/TT/Table.pm
 %%SITE_PERL%%/SQL/Translator/Producer/TTSchema.pm
 %%SITE_PERL%%/SQL/Translator/Producer/XML.pm
@@ -44,21 +50,31 @@ bin/sqlt-graph
 %%SITE_PERL%%/SQL/Translator/Schema/Constants.pm
 %%SITE_PERL%%/SQL/Translator/Schema/Constraint.pm
 %%SITE_PERL%%/SQL/Translator/Schema/Field.pm
+%%SITE_PERL%%/SQL/Translator/Schema/Graph.pm
+%%SITE_PERL%%/SQL/Translator/Schema/Graph/CompoundEdge.pm
+%%SITE_PERL%%/SQL/Translator/Schema/Graph/Edge.pm
+%%SITE_PERL%%/SQL/Translator/Schema/Graph/HyperEdge.pm
+%%SITE_PERL%%/SQL/Translator/Schema/Graph/Node.pm
+%%SITE_PERL%%/SQL/Translator/Schema/Graph/Port.pm
 %%SITE_PERL%%/SQL/Translator/Schema/Index.pm
+%%SITE_PERL%%/SQL/Translator/Schema/Object.pm
 %%SITE_PERL%%/SQL/Translator/Schema/Procedure.pm
 %%SITE_PERL%%/SQL/Translator/Schema/Table.pm
 %%SITE_PERL%%/SQL/Translator/Schema/Trigger.pm
 %%SITE_PERL%%/SQL/Translator/Schema/View.pm
+%%SITE_PERL%%/SQL/Translator/Shell.pm
 %%SITE_PERL%%/SQL/Translator/Utils.pm
 %%SITE_PERL%%/Test/SQL/Translator.pm
 @dirrm %%SITE_PERL%%/Test/SQL
 @unexec rmdir %D/%%SITE_PERL%%/Test 2>/dev/null || true
+@dirrm %%SITE_PERL%%/SQL/Translator/Schema/Graph
 @dirrm %%SITE_PERL%%/SQL/Translator/Schema
 @dirrm %%SITE_PERL%%/SQL/Translator/Producer/XML
 @dirrm %%SITE_PERL%%/SQL/Translator/Producer/TT
 @dirrm %%SITE_PERL%%/SQL/Translator/Producer
 @dirrm %%SITE_PERL%%/SQL/Translator/Parser/XML
 @dirrm %%SITE_PERL%%/SQL/Translator/Parser/DBI
+@dirrm %%SITE_PERL%%/SQL/Translator/Parser/DB2
 @dirrm %%SITE_PERL%%/SQL/Translator/Parser
 @dirrm %%SITE_PERL%%/SQL/Translator
 @unexec rmdir %D/%%SITE_PERL%%/SQL 2>/dev/null || true