3 files changed, 26 insertions, 49 deletions

diff --git a/databases/p5-SQL-Translator/Makefile b/databases/p5-SQL-Translator/Makefile
index e36ccfb0ea75..6551c92e2ee7 100644
--- a/databases/p5-SQL-Translator/Makefile
+++ b/databases/p5-SQL-Translator/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	SQL-Translator
-PORTVERSION=	0.11016
+PORTVERSION=	0.11018
 CATEGORIES=	databases perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
@@ -10,48 +10,45 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 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 \
+LICENSE=	ART10 GPLv1
+LICENSE_COMB=	dual
+
+BUILD_DEPENDS=	p5-Carp-Clan>=0:${PORTSDIR}/devel/p5-Carp-Clan \
+		p5-DBI>=1.54:${PORTSDIR}/databases/p5-DBI \
 		p5-File-ShareDir>=1:${PORTSDIR}/devel/p5-File-ShareDir \
-		p5-Digest-SHA1>=2.0:${PORTSDIR}/security/p5-Digest-SHA1 \
-		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.20:${PORTSDIR}/www/p5-Template-Toolkit \
-		p5-IO-stringy>=0:${PORTSDIR}/devel/p5-IO-stringy \
-		p5-Moo>=0.009007:${PORTSDIR}/devel/p5-Moo \
-		p5-Package-Variant>=0:${PORTSDIR}/devel/p5-Package-Variant \
+		p5-JSON>=2:${PORTSDIR}/converters/p5-JSON \
+		p5-List-MoreUtils>=0.09:${PORTSDIR}/lang/p5-List-MoreUtils \
+		p5-Moo>=1.000003:${PORTSDIR}/devel/p5-Moo \
+		p5-Package-Variant>=1.001001:${PORTSDIR}/devel/p5-Package-Variant \
+		p5-Parse-RecDescent>=1.967.009:${PORTSDIR}/devel/p5-Parse-RecDescent \
 		p5-Spreadsheet-ParseExcel>=0.41:${PORTSDIR}/textproc/p5-Spreadsheet-ParseExcel \
-		p5-Text-ParseWords>0:${PORTSDIR}/textproc/p5-Text-ParseWords \
+		p5-Template-Toolkit>=2.20:${PORTSDIR}/www/p5-Template-Toolkit \
+		p5-Text-ParseWords>=0:${PORTSDIR}/textproc/p5-Text-ParseWords \
 		p5-Text-RecordParser>=0.02:${PORTSDIR}/textproc/p5-Text-RecordParser \
-		p5-Try-Tiny>=0:${PORTSDIR}/lang/p5-Try-Tiny \
-		p5-XML-LibXML>=1.69:${PORTSDIR}/textproc/p5-XML-LibXML \
+		p5-Try-Tiny>=0.04:${PORTSDIR}/lang/p5-Try-Tiny \
 		p5-XML-Writer>=0.5:${PORTSDIR}/textproc/p5-XML-Writer \
-		p5-YAML>0:${PORTSDIR}/textproc/p5-YAML
+		p5-XML-LibXML>=1.69:${PORTSDIR}/textproc/p5-XML-LibXML \
+		p5-YAML>=0.66:${PORTSDIR}/textproc/p5-YAML
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Test-Differences>=0.61:${PORTSDIR}/devel/p5-Test-Differences \
+TEST_DEPENDS=	p5-HTML-Parser>=0:${PORTSDIR}/www/p5-HTML-Parser \
+		p5-Test-Differences>=0.61:${PORTSDIR}/devel/p5-Test-Differences \
 		p5-Test-Exception>=0:${PORTSDIR}/devel/p5-Test-Exception
 
 OPTIONS_DEFINE=	DIAGRAM
 DIAGRAM_DESC=	Diagram generation support
 
+REINPLACE_ARGS=	-i ''
 USES=		perl5
 USE_PERL5=	configure
 
+DIAGRAM_BUILD_DEPENDS=	p5-GD>=0:${PORTSDIR}/graphics/p5-GD \
+			p5-Graph>=0:${PORTSDIR}/math/p5-Graph \
+			p5-GraphViz>=0:${PORTSDIR}/graphics/p5-GraphViz
+
 post-patch:
-	@${FIND} ${WRKSRC} -name "*.orig" -delete
+	@${REINPLACE_CMD} -e 's|@EXPORT|&_OK|' ${WRKSRC}/lib/SQL/Translator/Parser/xSV.pm
 
 regression-test: build
 	cd ${WRKSRC}/ && ${MAKE} test
 
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MDIAGRAM}
-BUILD_DEPENDS+= p5-GD>=0:${PORTSDIR}/graphics/p5-GD \
-		p5-Graph>=0:${PORTSDIR}/math/p5-Graph \
-		p5-GraphViz>=0:${PORTSDIR}/graphics/p5-GraphViz
-.endif
-
 .include <bsd.port.mk>
diff --git a/databases/p5-SQL-Translator/distinfo b/databases/p5-SQL-Translator/distinfo
index 194830e86200..917e588aac74 100644
--- a/databases/p5-SQL-Translator/distinfo
+++ b/databases/p5-SQL-Translator/distinfo
@@ -1,2 +1,2 @@
-SHA256 (SQL-Translator-0.11016.tar.gz) = be7e63537ec13c2e5f6b82701878ae5bb03b33209e0cd8208b0a1b93f3cb9493
-SIZE (SQL-Translator-0.11016.tar.gz) = 421466
+SHA256 (SQL-Translator-0.11018.tar.gz) = f16a5899db1c7ed9dac7dea27a163b051d731ddb406fdbd7557d6467786a17ff
+SIZE (SQL-Translator-0.11018.tar.gz) = 427483
diff --git a/databases/p5-SQL-Translator/files/patch-lib::SQL::Translator::Parser::xSV.pm b/databases/p5-SQL-Translator/files/patch-lib::SQL::Translator::Parser::xSV.pm
deleted file mode 100644
index 6134f1d6ea8f..000000000000
--- a/databases/p5-SQL-Translator/files/patch-lib::SQL::Translator::Parser::xSV.pm
+++ /dev/null
@@ -1,20 +0,0 @@
---- ./lib/SQL/Translator/Parser/xSV.pm.orig	2009-02-13 13:35:07.000000000 +0100
-+++ ./lib/SQL/Translator/Parser/xSV.pm	2009-03-10 15:19:30.000000000 +0100
-@@ -64,7 +64,7 @@ C<SQL::Translator::Utils::normalize_name
- 
- use strict;
- use warnings;
--our @EXPORT;
-+our @EXPORT_OK;
- our $VERSION = '1.59';
- 
- use Exporter;
-@@ -73,7 +73,7 @@ use Text::RecordParser;
- use SQL::Translator::Utils qw(debug normalize_name);
- 
- use base qw(Exporter);
--@EXPORT = qw(parse);
-+@EXPORT_OK = qw(parse);
- 
- #
- # Passed a SQL::Translator instance and a string containing the data