4 files changed, 28 insertions, 32 deletions

diff --git a/databases/p5-SQL-Translator/Makefile b/databases/p5-SQL-Translator/Makefile
index c593dd87e187..51a0ab436863 100644
--- a/databases/p5-SQL-Translator/Makefile
+++ b/databases/p5-SQL-Translator/Makefile
@@ -6,12 +6,10 @@
 #
 
 PORTNAME=	SQL-Translator
-PORTVERSION=	0.09.004
-PORTREVISION=	2
+PORTVERSION=	0.11003
 CATEGORIES=	databases perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
-DISTNAME=	${PORTNAME}-${PORTVERSION:R}${PORTVERSION:E}
 
 MAINTAINER=	lth@FreeBSD.org
 COMMENT=	Manipulate structured data definitions (SQL and more)
@@ -19,24 +17,25 @@ COMMENT=	Manipulate structured data definitions (SQL and more)
 BUILD_DEPENDS=	p5-Class-Base>=0:${PORTSDIR}/devel/p5-Class-Base \
 		p5-Class-Data-Inheritable>=0.02:${PORTSDIR}/devel/p5-Class-Data-Inheritable \
 		p5-Class-MakeMethods>=0:${PORTSDIR}/devel/p5-Class-MakeMethods \
+		p5-Carp-Clan>=0:${PORTSDIR}/devel/p5-Carp-Clan \
+		p5-File-ShareDir>=1:${PORTSDIR}/devel/p5-File-ShareDir \
 		p5-Digest-SHA1>=2.0:${PORTSDIR}/security/p5-Digest-SHA1 \
 		p5-IO>=0:${PORTSDIR}/devel/p5-IO \
-		p5-Parse-RecDescent>=1.94:${PORTSDIR}/devel/p5-Parse-RecDescent \
+		p5-Parse-RecDescent>=1.962.2:${PORTSDIR}/devel/p5-Parse-RecDescent \
 		p5-Class-Accessor>=0:${PORTSDIR}/devel/p5-Class-Accessor \
 		p5-DBI>=0:${PORTSDIR}/databases/p5-DBI \
-		p5-Template-Toolkit>=2.10:${PORTSDIR}/www/p5-Template-Toolkit \
+		p5-Template-Toolkit>=2.20:${PORTSDIR}/www/p5-Template-Toolkit \
 		p5-GD>=0:${PORTSDIR}/graphics/p5-GD \
 		p5-GraphViz>=0:${PORTSDIR}/graphics/p5-GraphViz \
 		p5-Graph>=0:${PORTSDIR}/math/p5-Graph \
 		p5-IO-stringy>=0:${PORTSDIR}/devel/p5-IO-stringy \
-		p5-Spreadsheet-ParseExcel>=0.2602:${PORTSDIR}/textproc/p5-Spreadsheet-ParseExcel \
+		p5-Spreadsheet-ParseExcel>=0.41:${PORTSDIR}/textproc/p5-Spreadsheet-ParseExcel \
 		p5-Text-RecordParser>=0.02:${PORTSDIR}/textproc/p5-Text-RecordParser \
 		p5-XML-Writer>=0.500:${PORTSDIR}/textproc/p5-XML-Writer \
-		p5-XML-XPath>=1.13:${PORTSDIR}/textproc/p5-XML-XPath \
-		p5-YAML>=0.39:${PORTSDIR}/textproc/p5-YAML
+		p5-YAML>=0.66:${PORTSDIR}/textproc/p5-YAML
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
-PERL_MODBUILD=	yes
+PERL_CONFIGURE=	yes
 
 MAN1=		sqlt-diagram.1 \
 		sqlt-diff-old.1 \
@@ -108,4 +107,7 @@ MAN3=		SQL::Translator.3 \
 		SQL::Translator::Utils.3 \
 		Test::SQL::Translator.3
 
+post-patch:
+	@${FIND} ${WRKSRC} -name "*.orig" -delete
+
 .include <bsd.port.mk>
diff --git a/databases/p5-SQL-Translator/distinfo b/databases/p5-SQL-Translator/distinfo
index b86fc0664d26..da9d2af3735c 100644
--- a/databases/p5-SQL-Translator/distinfo
+++ b/databases/p5-SQL-Translator/distinfo
@@ -1,3 +1,3 @@
-MD5 (SQL-Translator-0.09004.tar.gz) = 0f54df1319ad5c5c6e833cbb5d51e383
-SHA256 (SQL-Translator-0.09004.tar.gz) = 46f7236cd3faaa355b03a1240e68c6ab0a3d09aedb489a7eccd6c85067bdbb81
-SIZE (SQL-Translator-0.09004.tar.gz) = 592269
+MD5 (SQL-Translator-0.11003.tar.gz) = ada140a904b21a17aa47c64903a87f18
+SHA256 (SQL-Translator-0.11003.tar.gz) = 069540b04d85d73bf28dd176da97a47affc22da3d04553aef830c284ef28c735
+SIZE (SQL-Translator-0.11003.tar.gz) = 402788
diff --git a/databases/p5-SQL-Translator/files/patch-lib::SQL::Translator::Parser::DBI.pm b/databases/p5-SQL-Translator/files/patch-lib::SQL::Translator::Parser::DBI.pm
deleted file mode 100644
index 3c5bde293133..000000000000
--- a/databases/p5-SQL-Translator/files/patch-lib::SQL::Translator::Parser::DBI.pm
+++ /dev/null
@@ -1,11 +0,0 @@
---- lib/SQL/Translator/Parser/DBI.pm.orig	2009-03-17 11:34:29.000000000 +0900
-+++ lib/SQL/Translator/Parser/DBI.pm	2009-03-17 11:34:45.000000000 +0900
-@@ -170,7 +170,7 @@
-     my $pkg     = "SQL::Translator::Parser::DBI::$driver";
-     my $sub     = $pkg.'::parse';
- 
--    $tr->load( $pkg );
-+    SQL::Translator::load( $pkg );
- 
-     eval {
-         no strict 'refs';
diff --git a/databases/p5-SQL-Translator/pkg-plist b/databases/p5-SQL-Translator/pkg-plist
index c7a67502f5ca..829dca979094 100644
--- a/databases/p5-SQL-Translator/pkg-plist
+++ b/databases/p5-SQL-Translator/pkg-plist
@@ -38,14 +38,6 @@ bin/sqlt-graph
 %%SITE_PERL%%/SQL/Translator/Producer/ClassDBI.pm
 %%SITE_PERL%%/SQL/Translator/Producer/DB2.pm
 %%SITE_PERL%%/SQL/Translator/Producer/DiaUml.pm
-%%SITE_PERL%%/SQL/Translator/Producer/DiaUml/diagram.tt2
-%%SITE_PERL%%/SQL/Translator/Producer/DiaUml/layer.tt2
-%%SITE_PERL%%/SQL/Translator/Producer/DiaUml/schema.tt2
-%%SITE_PERL%%/SQL/Translator/Producer/DiaUml/uml-attribute.tt2
-%%SITE_PERL%%/SQL/Translator/Producer/DiaUml/uml-class-all.tt2
-%%SITE_PERL%%/SQL/Translator/Producer/DiaUml/uml-class-end.tt2
-%%SITE_PERL%%/SQL/Translator/Producer/DiaUml/uml-class-start.tt2
-%%SITE_PERL%%/SQL/Translator/Producer/DiaUml/uml-class.tt2
 %%SITE_PERL%%/SQL/Translator/Producer/Diagram.pm
 %%SITE_PERL%%/SQL/Translator/Producer/Dumper.pm
 %%SITE_PERL%%/SQL/Translator/Producer/GraphViz.pm
@@ -83,12 +75,25 @@ bin/sqlt-graph
 %%SITE_PERL%%/SQL/Translator/Schema/View.pm
 %%SITE_PERL%%/SQL/Translator/Utils.pm
 %%SITE_PERL%%/Test/SQL/Translator.pm
+%%SITE_PERL%%/auto/share/dist/SQL-Translator/DiaUml/diagram.tt2
+%%SITE_PERL%%/auto/share/dist/SQL-Translator/DiaUml/layer.tt2
+%%SITE_PERL%%/auto/share/dist/SQL-Translator/DiaUml/schema.tt2
+%%SITE_PERL%%/auto/share/dist/SQL-Translator/DiaUml/uml-attribute.tt2
+%%SITE_PERL%%/auto/share/dist/SQL-Translator/DiaUml/uml-class-all.tt2
+%%SITE_PERL%%/auto/share/dist/SQL-Translator/DiaUml/uml-class-end.tt2
+%%SITE_PERL%%/auto/share/dist/SQL-Translator/DiaUml/uml-class-start.tt2
+%%SITE_PERL%%/auto/share/dist/SQL-Translator/DiaUml/uml-class.tt2
+%%SITE_PERL%%/auto/share/dist/SQL-Translator/Grammar/DB2.gra
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/SQL/Translator/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/SQL/Translator
+@dirrm %%SITE_PERL%%/auto/share/dist/SQL-Translator/Grammar
+@dirrm %%SITE_PERL%%/auto/share/dist/SQL-Translator/DiaUml
+@dirrm %%SITE_PERL%%/auto/share/dist/SQL-Translator
 @dirrm %%SITE_PERL%%/Test/SQL
 @dirrmtry %%SITE_PERL%%/Test
 @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/DiaUml
 @dirrm %%SITE_PERL%%/SQL/Translator/Producer/TT
 @dirrm %%SITE_PERL%%/SQL/Translator/Producer
 @dirrm %%SITE_PERL%%/SQL/Translator/Parser/XML