- Update to 2.14.

PR:		ports/172501
Submitted by:	KATO Tsuguru <tkato432@yahoo.com>

9 files changed, 127 insertions, 62 deletions

diff --git a/devel/autodia/Makefile b/devel/autodia/Makefile
index 81a65b3dac33..562b72c11b59 100644
--- a/devel/autodia/Makefile
+++ b/devel/autodia/Makefile
@@ -2,53 +2,75 @@
 # $FreeBSD$
 
 PORTNAME=	autodia
-PORTVERSION=	2.03
-PORTREVISION=	7
+PORTVERSION=	2.14
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
-MASTER_SITE_SUBDIR=	Tree/TEEJAY
-
+MASTER_SITE_SUBDIR=	CPAN:TEEJAY
 DISTNAME=	Autodia-${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Automatic Dia XML - from Source Code and Data
 
-BUILD_DEPENDS=	p5-Template-Toolkit>=0:${PORTSDIR}/www/p5-Template-Toolkit \
-		p5-Inline-Java>=0:${PORTSDIR}/devel/p5-Inline-Java \
-		p5-GraphViz>=0:${PORTSDIR}/graphics/p5-GraphViz \
-		p5-VCG>=0:${PORTSDIR}/graphics/p5-VCG \
-		p5-XML-Simple>=0:${PORTSDIR}/textproc/p5-XML-Simple \
-		p5-SpringGraph>=0:${PORTSDIR}/graphics/p5-SpringGraph
+LICENSE=	GPLv2
+
+BUILD_DEPENDS=	p5-XML-Simple>=0:${PORTSDIR}/textproc/p5-XML-Simple \
+		p5-Template-Toolkit>=0:${PORTSDIR}/www/p5-Template-Toolkit \
+		p5-HTML-Mason>=0:${PORTSDIR}/www/p5-HTML-Mason
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
+OPTIONS_DEFINE=	GRAPHVIZ SPRINGGRAPH VCG DOCS
+OPTIONS_DEFAULT=	GRAPHVIZ SPRINGGRAPH VCG
+SPRINGGRAPH_DESC=	SpringGraph support
+VCG_DESC=		VCG support
+
 PERL_CONFIGURE=	yes
 
-MAN1=	autodia.pl.1 autodia_java.pl.1
-MAN3=	Autodia.3 autodia.3 autodia_java.3 \
-	Autodia::Diagram.3 \
-	Autodia::Diagram::Class.3 \
-	Autodia::Diagram::Component.3 \
-	Autodia::Diagram::Dependancy.3 \
-	Autodia::Diagram::Inheritance.3 \
-	Autodia::Diagram::Object.3 \
-	Autodia::Diagram::Superclass.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::Torque.3 \
-	Autodia::Handler::dia.3 \
-	Autodia::Handler::umbrello.3
-
-DOCS=	CHANGES COPYING CREDITS DEVELOP FAQ INSTALL MANIFEST README TODO
-
-.if !defined(NOPORTDOCS)
+MAN1=		autodia.pl.1
+MAN3=		Autodia.3 autodia.3 \
+		Autodia::Diagram.3 \
+		Autodia::Diagram::Class.3 \
+		Autodia::Diagram::Component.3 \
+		Autodia::Handler.3 \
+		Autodia::Handler::ASP.3 \
+		Autodia::Handler::CSharp.3 \
+		Autodia::Handler::Cpp.3 \
+		Autodia::Handler::DBI.3 \
+		Autodia::Handler::DBI_SQLT.3 \
+		Autodia::Handler::Mason.3 \
+		Autodia::Handler::PHP.3 \
+		Autodia::Handler::Perl.3 \
+		Autodia::Handler::SQL.3 \
+		Autodia::Handler::Torque.3 \
+		Autodia::Handler::dia.3 \
+		Autodia::Handler::umbrello.3
+PORTDOCS=	CHANGES CREDITS DEVELOP FAQ INSTALL MANIFEST README TODO
+
+.include <bsd.port.options.mk>
+
+.if ${PORT_OPTIONS:MGRAPHVIZ}
+RUN_DEPENDS+=	p5-GraphViz>=0:${PORTSDIR}/graphics/p5-GraphViz
+.endif
+
+.if ${PORT_OPTIONS:MSPRINGGRAPH}
+RUN_DEPENDS+=	p5-SpringGraph>=0:${PORTSDIR}/graphics/p5-SpringGraph
+.endif
+
+.if ${PORT_OPTIONS:MVCG}
+RUN_DEPENDS+=	p5-VCG>=0:${PORTSDIR}/graphics/p5-VCG
+.endif
+
+post-patch:
+	@${REINPLACE_CMD} -e \
+		'/^#!/s|/.*perl|${PERL}|' ${WRKSRC}/autodia.pl
+
+pre-configure:
+	@${FIND} ${WRKSRC} -name "*.orig" -delete
+
 post-install:
+.if ${PORT_OPTIONS:MDOCS}
 	@${MKDIR} ${DOCSDIR}
-.for file in ${DOCS}
-	${INSTALL_DATA} ${WRKSRC}/${file} ${DOCSDIR}
+.for i in ${PORTDOCS}
+	${INSTALL_DATA} ${WRKSRC}/${i} ${DOCSDIR}
 .endfor
 .endif
 
diff --git a/devel/autodia/distinfo b/devel/autodia/distinfo
index c31f9688431d..594e92d49975 100644
--- a/devel/autodia/distinfo
+++ b/devel/autodia/distinfo
@@ -1,2 +1,2 @@
-SHA256 (Autodia-2.03.tar.gz) = 5f7118956a0930d91baf2f391bcab1bc23f08471f97b5bb317374e6c2918f7df
-SIZE (Autodia-2.03.tar.gz) = 61843
+SHA256 (Autodia-2.14.tar.gz) = ac8125c88abe39d9fe01ca3acc13a00a29f3336a4bb7ef60447e6b8b822ff422
+SIZE (Autodia-2.14.tar.gz) = 78070
diff --git a/devel/autodia/files/patch-Dependency.pm b/devel/autodia/files/patch-Dependency.pm
new file mode 100644
index 000000000000..c221cfa6aa89
--- /dev/null
+++ b/devel/autodia/files/patch-Dependency.pm
@@ -0,0 +1,10 @@
+--- lib/Autodia/Diagram/Dependancy.pm.orig	2008-04-16 22:56:29.000000000 +0900
++++ lib/Autodia/Diagram/Dependancy.pm	2012-10-03 07:08:41.000000000 +0900
+@@ -156,7 +156,3 @@
+ 1;
+ 
+ ############################################################################
+-
+-=head1 
+-
+-=cut
diff --git a/devel/autodia/files/patch-Inheritance.pm b/devel/autodia/files/patch-Inheritance.pm
new file mode 100644
index 000000000000..cf086b119bcc
--- /dev/null
+++ b/devel/autodia/files/patch-Inheritance.pm
@@ -0,0 +1,10 @@
+--- lib/Autodia/Diagram/Inheritance.pm.orig	2008-05-20 21:27:16.000000000 +0900
++++ lib/Autodia/Diagram/Inheritance.pm	2012-10-03 07:08:41.000000000 +0900
+@@ -162,7 +162,3 @@
+ 
+ ##############################################################
+ 
+-=head1
+-
+-=cut
+-
diff --git a/devel/autodia/files/patch-Object.pm b/devel/autodia/files/patch-Object.pm
new file mode 100644
index 000000000000..223cab85621f
--- /dev/null
+++ b/devel/autodia/files/patch-Object.pm
@@ -0,0 +1,10 @@
+--- lib/Autodia/Diagram/Object.pm.orig	2008-04-16 22:56:29.000000000 +0900
++++ lib/Autodia/Diagram/Object.pm	2012-10-03 07:08:41.000000000 +0900
+@@ -182,7 +182,3 @@
+ 1;
+ 
+ ###############################################################################
+-
+-=head1
+-
+-=cut
diff --git a/devel/autodia/files/patch-Realization.pm b/devel/autodia/files/patch-Realization.pm
new file mode 100644
index 000000000000..30fcb792ead3
--- /dev/null
+++ b/devel/autodia/files/patch-Realization.pm
@@ -0,0 +1,10 @@
+--- lib/Autodia/Diagram/Realization.pm.orig	2009-06-24 19:43:51.000000000 +0900
++++ lib/Autodia/Diagram/Realization.pm	2012-10-03 07:08:41.000000000 +0900
+@@ -143,7 +143,3 @@
+ 1;
+ 
+ ############################################################################
+-
+-=head1 
+-
+-=cut
diff --git a/devel/autodia/files/patch-Superclass.pm b/devel/autodia/files/patch-Superclass.pm
new file mode 100644
index 000000000000..2f4111e4750e
--- /dev/null
+++ b/devel/autodia/files/patch-Superclass.pm
@@ -0,0 +1,10 @@
+--- lib/Autodia/Diagram/Superclass.pm.orig	2009-06-25 01:01:34.000000000 +0900
++++ lib/Autodia/Diagram/Superclass.pm	2012-10-03 07:08:41.000000000 +0900
+@@ -143,7 +143,3 @@
+ 1;
+ 
+ ##########################################################################
+-
+-=head1 
+-
+-=cut
diff --git a/devel/autodia/pkg-descr b/devel/autodia/pkg-descr
index 09c8dfbd0794..7e62a0ee167f 100644
--- a/devel/autodia/pkg-descr
+++ b/devel/autodia/pkg-descr
@@ -9,4 +9,4 @@ currently this is C++, DBI, Java, PHP, Perl, Python, SQL and Torque (XML
 DB schema).
 Adding a handler is easy - read the DEVELOP file for details.
 
-WWW: http://droogs.org/autodia/
+WWW: http://search.cpan.org/~teejay/Autodia/
diff --git a/devel/autodia/pkg-plist b/devel/autodia/pkg-plist
index 4fa155ee5c18..ae86bbae2e72 100644
--- a/devel/autodia/pkg-plist
+++ b/devel/autodia/pkg-plist
@@ -1,39 +1,32 @@
 bin/autodia.pl
-bin/autodia_java.pl
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Autodia/.packlist
 %%SITE_PERL%%/Autodia.pm
-%%SITE_PERL%%/autodia.pl
-%%SITE_PERL%%/autodia_java.pl
-%%SITE_PERL%%/Autodia/Handler.pm
 %%SITE_PERL%%/Autodia/Diagram.pm
-%%SITE_PERL%%/Autodia/Diagram/Dependancy.pm
-%%SITE_PERL%%/Autodia/Diagram/Object.pm
 %%SITE_PERL%%/Autodia/Diagram/Class.pm
-%%SITE_PERL%%/Autodia/Diagram/Inheritance.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/Realization.pm
+%%SITE_PERL%%/Autodia/Diagram/Relation.pm
 %%SITE_PERL%%/Autodia/Diagram/Superclass.pm
-%%SITE_PERL%%/Autodia/Handler/python.pm
-%%SITE_PERL%%/Autodia/Handler/umbrello.pm
-%%SITE_PERL%%/Autodia/Handler/SQL.pm
-%%SITE_PERL%%/Autodia/Handler/Perl.pm
-%%SITE_PERL%%/Autodia/Handler/Torque.pm
+%%SITE_PERL%%/Autodia/Handler.pm
+%%SITE_PERL%%/Autodia/Handler/ASP.pm
+%%SITE_PERL%%/Autodia/Handler/CSharp.pm
 %%SITE_PERL%%/Autodia/Handler/Cpp.pm
 %%SITE_PERL%%/Autodia/Handler/DBI.pm
-%%SITE_PERL%%/Autodia/Handler/Java.pm
+%%SITE_PERL%%/Autodia/Handler/DBI_SQLT.pm
+%%SITE_PERL%%/Autodia/Handler/Mason.pm
 %%SITE_PERL%%/Autodia/Handler/PHP.pm
+%%SITE_PERL%%/Autodia/Handler/Perl.pm
+%%SITE_PERL%%/Autodia/Handler/SQL.pm
+%%SITE_PERL%%/Autodia/Handler/Torque.pm
 %%SITE_PERL%%/Autodia/Handler/dia.pm
-%%PORTDOCS%%%%DOCSDIR%%/CHANGES
-%%PORTDOCS%%%%DOCSDIR%%/COPYING
-%%PORTDOCS%%%%DOCSDIR%%/CREDITS
-%%PORTDOCS%%%%DOCSDIR%%/DEVELOP
-%%PORTDOCS%%%%DOCSDIR%%/FAQ
-%%PORTDOCS%%%%DOCSDIR%%/INSTALL
-%%PORTDOCS%%%%DOCSDIR%%/MANIFEST
-%%PORTDOCS%%%%DOCSDIR%%/README
-%%PORTDOCS%%%%DOCSDIR%%/TODO
+%%SITE_PERL%%/Autodia/Handler/python.pm
+%%SITE_PERL%%/Autodia/Handler/umbrello.pm
+%%SITE_PERL%%/autodia.pl
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Autodia/.packlist
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Autodia
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto
-@dirrm %%SITE_PERL%%/Autodia/Diagram
 @dirrm %%SITE_PERL%%/Autodia/Handler
+@dirrm %%SITE_PERL%%/Autodia/Diagram
 @dirrm %%SITE_PERL%%/Autodia
-%%PORTDOCS%%@dirrm %%DOCSDIR%%