3 files changed, 50 insertions, 38 deletions

diff --git a/devel/autodia/Makefile b/devel/autodia/Makefile
index aa5e282fedfb..45e4d6ee8c7a 100644
--- a/devel/autodia/Makefile
+++ b/devel/autodia/Makefile
@@ -7,7 +7,7 @@
 #
 
 PORTNAME=	autodia
-PORTVERSION=	1.3
+PORTVERSION=	1.5
 PORTREVISION=	0
 CATEGORIES=	devel perl5
 MASTER_SITES=	http://droogs.org/autodia/download/
@@ -16,19 +16,27 @@ DISTNAME=	Autodia-${PORTVERSION}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Automatic Dia XML - from Source Code and Data
 
-BUILD_DEPENDS=	${PERL_SITELIBDIR}/${PERL_ARCH}/Template.pm:${PORTSDIR}/www/p5-Template-Toolkit \
-		${PERL_SITELIBDIR}/Inline.pm:${PORTSDIR}/devel/p5-Inline \
-		${PERL_SITELIBDIR}/Inline/Java.pm:${PORTSDIR}/devel/p5-Inline-Java
+BUILD_DEPENDS=	${SITE_PERL}/${PERL_ARCH}/Template.pm:${PORTSDIR}/www/p5-Template-Toolkit \
+		${SITE_PERL}/Inline/Java.pm:${PORTSDIR}/devel/p5-Inline-Java \
+		${SITE_PERL}/GraphViz.pm:${PORTSDIR}/graphics/p5-GraphViz \
+		${SITE_PERL}/VCG.pm:${PORTSDIR}/graphics/p5-VCG \
+		${SITE_PERL}/XML/Simple.pm:${PORTSDIR}/textproc/p5-XML-Simple
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
-PERL_SITELIBDIR=	${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}
 PERL_CONFIGURE=	yes
 
 MAN3PREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
-MAN3=	Autodia.3 autodia.3 autodia_java.3 Autodia::Diagram.3 \
-	Autodia::Diagram::Class.3 Autodia::Diagram::Component.3 \
-	Autodia::Handler.3 Autodia::Handler::Cpp.3 Autodia::Handler::PHP.3 \
-	Autodia::Handler::Perl.3
+MAN3=	Autodia.3 autodia.3 autodia_java.3 \
+	Autodia::Diagram.3 \
+	Autodia::Diagram::Class.3 \
+	Autodia::Diagram::Component.3 \
+	Autodia::Handler.3 \
+	Autodia::Handler::Cpp.3 \
+	Autodia::Handler::DBI.3 \
+	Autodia::Handler::PHP.3 \
+	Autodia::Handler::Perl.3 \
+	Autodia::Handler::SQL.3 \
+	Autodia::Handler::dia.3
 
 DOCS=	CHANGES COPYING CREDITS DEVELOP FAQ INSTALL README
 
diff --git a/devel/autodia/distinfo b/devel/autodia/distinfo
index 2969470d449e..c2c20741b703 100644
--- a/devel/autodia/distinfo
+++ b/devel/autodia/distinfo
@@ -1 +1 @@
-MD5 (Autodia-1.3.tar.gz) = 4f3cf8c2aa81df384d961027b67a2462
+MD5 (Autodia-1.5.tar.gz) = 9cb7baeeb899159343c4c9633cf2c0cf
diff --git a/devel/autodia/pkg-plist b/devel/autodia/pkg-plist
index 13ab71e7309f..353c21f880d0 100644
--- a/devel/autodia/pkg-plist
+++ b/devel/autodia/pkg-plist
@@ -1,30 +1,34 @@
 bin/autodia.pl
 bin/autodia_java.pl
-lib/perl5/site_perl/%%PERL_VER%%/Autodia/Diagram.pm
-lib/perl5/site_perl/%%PERL_VER%%/Autodia/Diagram/Class.pm
-lib/perl5/site_perl/%%PERL_VER%%/Autodia/Diagram/Component.pm
-lib/perl5/site_perl/%%PERL_VER%%/Autodia/Diagram/Dependancy.pm
-lib/perl5/site_perl/%%PERL_VER%%/Autodia/Diagram/Inheritance.pm
-lib/perl5/site_perl/%%PERL_VER%%/Autodia/Diagram/Object.pm
-lib/perl5/site_perl/%%PERL_VER%%/Autodia/Diagram/Superclass.pm
-lib/perl5/site_perl/%%PERL_VER%%/Autodia/Handler.pm
-lib/perl5/site_perl/%%PERL_VER%%/Autodia/Handler/Cpp.pm
-lib/perl5/site_perl/%%PERL_VER%%/Autodia/Handler/Java.pm
-lib/perl5/site_perl/%%PERL_VER%%/Autodia/Handler/Perl.pm
-lib/perl5/site_perl/%%PERL_VER%%/Autodia/Handler/PHP.pm
-lib/perl5/site_perl/%%PERL_VER%%/Autodia.pm
-lib/perl5/site_perl/%%PERL_VER%%/autodia.pl
-lib/perl5/site_perl/%%PERL_VER%%/autodia_java.pl
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Autodia/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/mach/auto/Autodia
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/Autodia/Diagram
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/Autodia/Handler
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/Autodia
-%%PORTDOCS%%share/doc/autodia/CHANGES
-%%PORTDOCS%%share/doc/autodia/COPYING
-%%PORTDOCS%%share/doc/autodia/CREDITS
-%%PORTDOCS%%share/doc/autodia/DEVELOP
-%%PORTDOCS%%share/doc/autodia/FAQ
-%%PORTDOCS%%share/doc/autodia/INSTALL
-%%PORTDOCS%%share/doc/autodia/README
-%%PORTDOCS%%@dirrm share/doc/autodia
+%%SITE_PERL%%/Autodia/Diagram.pm
+%%SITE_PERL%%/Autodia/Diagram/Class.pm
+%%SITE_PERL%%/Autodia/Diagram/Component.pm
+%%SITE_PERL%%/Autodia/Diagram/Dependancy.pm
+%%SITE_PERL%%/Autodia/Diagram/Inheritance.pm
+%%SITE_PERL%%/Autodia/Diagram/Object.pm
+%%SITE_PERL%%/Autodia/Diagram/Superclass.pm
+%%SITE_PERL%%/Autodia/Handler.pm
+%%SITE_PERL%%/Autodia/Handler/Cpp.pm
+%%SITE_PERL%%/Autodia/Handler/DBI.pm
+%%SITE_PERL%%/Autodia/Handler/Java.pm
+%%SITE_PERL%%/Autodia/Handler/PHP.pm
+%%SITE_PERL%%/Autodia/Handler/Perl.pm
+%%SITE_PERL%%/Autodia/Handler/SQL.pm
+%%SITE_PERL%%/Autodia/Handler/dia.pm
+%%SITE_PERL%%/Autodia.pm
+%%SITE_PERL%%/autodia.pl
+%%SITE_PERL%%/autodia_java.pl
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Autodia/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Autodia
+@dirrm %%SITE_PERL%%/Autodia/Diagram
+@dirrm %%SITE_PERL%%/Autodia/Handler
+@dirrm %%SITE_PERL%%/Autodia
+%%PORTDOCS%%%%DOCSDIR%%/CHANGES
+%%PORTDOCS%%%%DOCSDIR%%/COPYING
+%%PORTDOCS%%%%DOCSDIR%%/CREDITS
+%%PORTDOCS%%%%DOCSDIR%%/DEVELOP
+%%PORTDOCS%%%%DOCSDIR%%/FAQ
+%%PORTDOCS%%%%DOCSDIR%%/INSTALL
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
+lib/perllocal.pod-autodia