upgrade to 1.2

4 files changed, 40 insertions, 50 deletions

diff --git a/devel/autodia/Makefile b/devel/autodia/Makefile
index ae4699fac800..a9c5580321a8 100644
--- a/devel/autodia/Makefile
+++ b/devel/autodia/Makefile
@@ -7,32 +7,42 @@
 #
 
 PORTNAME=	autodia
-PORTVERSION=	1.0
-PORTREVISION=	1
+PORTVERSION=	1.2
+PORTREVISION=	0
 CATEGORIES=	devel perl5
 MASTER_SITES=	http://droogs.org/autodia/download/
+DISTNAME=	AutoDia-${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
 
-RUN_DEPENDS=	${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Template.pm:${PORTSDIR}/www/p5-Template-Toolkit
+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
+RUN_DEPENDS=	${BUILD_DEPENDS}
 
+PERL_SITELIBDIR=	${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}
 USE_BZIP2=	yes
-USE_PERL5=	yes
-NO_BUILD=	yes
+PERL_CONFIGURE=	yes
+WRKSRC=		${WRKDIR}/Autodia
 
-post-patch:
-	@${PERL} -pi -e "s,%%LOCALBASE%%,${LOCALBASE},g ; \
-		s,%%PERL_VER%%,${PERL_VER},g" ${WRKSRC}/SRC/autodia.pl
+MAN1=	autodia.1
+MAN3PREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
+MAN3=	Autodia.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
 
-do-install:
-	@${MKDIR} ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/autodia
-	${INSTALL_SCRIPT} ${WRKSRC}/SRC/autodia.pl ${PREFIX}/bin/autodia
-	${CP} ${WRKSRC}/SRC/*.pm ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/autodia
-	${CP} ${WRKSRC}/TEMPLATES/* ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/autodia
+DOCS=	CHANGES COPYING CREDITS DEVELOP FAQ INSTALL README
+
+pre-install:
+	@${RM} -f ${WRKSRC}/blib/man3/*.3pm
 
 .if !defined(NOPORTDOCS)
+post-install:
 	@${MKDIR} ${DOCSDIR}
-	${CP} ${WRKSRC}/DOC/* ${DOCSDIR}
+.for file in ${DOCS}
+	${INSTALL_DATA} ${WRKSRC}/${file} ${DOCSDIR}
+.endfor
 .endif
 
 .include <bsd.port.mk>
diff --git a/devel/autodia/distinfo b/devel/autodia/distinfo
index e0c235a67eed..1af0b2c857ac 100644
--- a/devel/autodia/distinfo
+++ b/devel/autodia/distinfo
@@ -1 +1 @@
-MD5 (autodia-1.0.tar.bz2) = eb676526dffe7a2518e0231225d44bba
+MD5 (AutoDia-1.2.tar.bz2) = d08725640718036a5e490ab0c7431056
diff --git a/devel/autodia/files/patch-SRC::autodia.pl b/devel/autodia/files/patch-SRC::autodia.pl
deleted file mode 100644
index c425470ec5c6..000000000000
--- a/devel/autodia/files/patch-SRC::autodia.pl
+++ /dev/null
@@ -1,17 +0,0 @@
---- SRC/autodia.pl.orig	Fri Jul  6 21:58:39 2001
-+++ SRC/autodia.pl	Sat Oct  6 15:27:45 2001
-@@ -1,4 +1,4 @@
--#!/usr/bin/perl -I /home/aaron/downloads/autodia-0.9/SRC
-+#!/usr/bin/perl -I /usr/local/lib/perl5/site_perl/5.6.0/autodia
- 
- ###############################################################
- # AutoDIA - Automatic Dia XML.   (C)Copyright 2001 A Trevena  #
-@@ -156,7 +156,7 @@
- 
-     $config{filenames}    = \@filenames;
-     $config{use_stdout}   = (defined $args{'O'}) ? 1 : 0;
--    $config{templatefile} = (defined $args{'t'}) ? $args{'t'} : "template.xml";
-+    $config{templatefile} = (defined $args{'t'}) ? $args{'t'} : "%%LOCALBASE%%/lib/perl5/site_perl/%%PERL_VER%%/autodia/template.xml";
-     $config{outputfile}   = (defined $args{'o'}) ? $args{'o'} : "autodial.out.xml";
-     $config{no_deps}      = (defined $args{'D'}) ? 1 : 0;
-     $config{sort}         = (defined $args{'s'}) ? 1 : 0;
diff --git a/devel/autodia/pkg-plist b/devel/autodia/pkg-plist
index 991d1fa7b99e..18c2c031dc69 100644
--- a/devel/autodia/pkg-plist
+++ b/devel/autodia/pkg-plist
@@ -1,20 +1,19 @@
 bin/autodia
-lib/perl5/site_perl/%%PERL_VER%%/autodia/Autodia.pm
-lib/perl5/site_perl/%%PERL_VER%%/autodia/Diagram.pm
-lib/perl5/site_perl/%%PERL_VER%%/autodia/DiagramClass.pm
-lib/perl5/site_perl/%%PERL_VER%%/autodia/DiagramComponent.pm
-lib/perl5/site_perl/%%PERL_VER%%/autodia/DiagramDependancy.pm
-lib/perl5/site_perl/%%PERL_VER%%/autodia/DiagramInheritance.pm
-lib/perl5/site_perl/%%PERL_VER%%/autodia/DiagramObject.pm
-lib/perl5/site_perl/%%PERL_VER%%/autodia/DiagramSuperclass.pm
-lib/perl5/site_perl/%%PERL_VER%%/autodia/Handler.pm
-lib/perl5/site_perl/%%PERL_VER%%/autodia/HandlerCpp.pm
-lib/perl5/site_perl/%%PERL_VER%%/autodia/HandlerJava.pm
-lib/perl5/site_perl/%%PERL_VER%%/autodia/HandlerPerl.pm
-lib/perl5/site_perl/%%PERL_VER%%/autodia/simplespec.html
-lib/perl5/site_perl/%%PERL_VER%%/autodia/template.xml
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/autodia
-%%PORTDOCS%%share/doc/autodia/BUGS
+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.pm
+@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
@@ -22,6 +21,4 @@ lib/perl5/site_perl/%%PERL_VER%%/autodia/template.xml
 %%PORTDOCS%%share/doc/autodia/FAQ
 %%PORTDOCS%%share/doc/autodia/INSTALL
 %%PORTDOCS%%share/doc/autodia/README
-%%PORTDOCS%%share/doc/autodia/TODO
-%%PORTDOCS%%share/doc/autodia/faq.txt
 %%PORTDOCS%%@dirrm share/doc/autodia