3 files changed, 69 insertions, 31 deletions

diff --git a/devel/ireport/Makefile b/devel/ireport/Makefile
index 487cff133878..cad5f6a43833 100644
--- a/devel/ireport/Makefile
+++ b/devel/ireport/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	ireport
-PORTVERSION=	2.0.4
+PORTVERSION=	2.0.5
 CATEGORIES=	devel databases java
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -38,37 +38,52 @@ PLIST_SUB=	VER=${PORTVERSION} VERMAN=0.2.0
 
 JARFILES=	JasperBabylon-1.0.0.jar LICENSE.asm-attr.txt LICENSE.asm.txt	\
 		LICENSE.barbecue-1.1.txt LICENSE.jta.txt LICENSE.microba.txt	\
-		asm-attrs.jar asm.jar barbecue-1.1.jar cglib-2.1.jar		\
-		cincom-jr-xmla.jar commons-javaflow-20060411.jar		\
-		commons-vfs-1.0.jar ehcache-1.1.jar eigenbase-properties.jar	\
-		eigenbase-resgen.jar eigenbase-xom.jar flexdock-0.4.1.jar	\
-		groovy-all-1.0.jar hibernate3.jar iReport.jar			\
-		jasperreports-extensions-1.3.1.jar javacup.jar			\
-		jdt-compiler-3.1.1.jar jpa.jar jsmoothgen-ant-0.9.7.jar jta.jar	\
-		jxl-2.6.jar microba-0.4.1-bin.jar mondrian-2.3.2.8944.jar	\
-		nsisant-1.1.jar png-encoder-1.5.jar rex-20070125.jar		\
-		saaj-api-1.3.jar servlet.jar spring-2.0-m2.jar			\
+		asm-attrs.jar asm.jar batik-anim.jar batik-awt-util.jar		\
+		batik-bridge.jar batik-css.jar batik-dom.jar batik-ext.jar	\
+		batik-gvt.jar batik-parser.jar batik-script.jar			\
+		batik-svg-dom.jar batik-svggen.jar batik-util.jar batik-xml.jar	\
+		barbecue-1.5-beta1.jar cglib-2.1.jar cincom-jr-xmla.jar		\
+		commons-javaflow-20060411.jar commons-vfs-1.0.jar		\
+		ehcache-1.1.jar eigenbase-properties.jar eigenbase-resgen.jar	\
+		eigenbase-xom.jar flexdock-0.4.1.jar groovy-all-1.0.jar		\
+		hibernate3.jar iReport.jar jasperreports-extensions-1.3.1.jar	\
+		jasperreports-flash-2.0.5.jar javacup.jar jdt-compiler-3.1.1.jar\
+		jpa.jar js_activation-1.1.jar js_axis-1.4patched.jar		\
+		js_commons-discovery-0.2.jar js_jasperserver-common-ws-2.1.0.jar\
+		js_jasperserver-ireport-plugin-2.1.0.jar js_jaxrpc.jar		\
+		js_mail-1.4.jar js_wsdl4j-1.5.1.jar jsmoothgen-ant-0.9.7.jar	\
+		jta.jar jxl-2.6.jar microba-0.4.1-bin.jar			\
+		mondrian-2.3.2.8944.jar nsisant-1.1.jar png-encoder-1.5.jar	\
+		rex-20070125.jar saaj-api-1.3.jar servlet.jar spring-2.0-m2.jar	\
 		spring-context-2.0-m2.jar spring-hibernate3-2.0-m2.jar		\
-		sqleonardo-2007.03.jar swingx-2007_05_13.jar toniclf.jar
+		sqleonardo-2007.03.jar swingx-2007_05_13.jar toniclf.jar	\
+		xml-apis-ext.jar
 BASEFILES=	Changelog.txt notice.txt
 SUBDIRS=	fonts plugins templates
 
 # Jarfiles to be included in classpath
-CLSSPTH=	JasperBabylon-1.0.0 antlr asm-attrs asm barbecue-1.1 bsh	\
-		cglib-2.1 cincom-jr-xmla commons-beanutils commons-collections	\
-		commons-dbcp commons-digester commons-javaflow-20060411		\
-		commons-logging commons-logging-api commons-math commons-pool	\
-		commons-vfs-1.0 dom4j ehcache-1.1 eigenbase-properties		\
-		eigenbase-resgen eigenbase-xom flexdock-0.4.1 groovy-all-1.0	\
-		hibernate3 iReport itext bcel jasperreports			\
-		jasperreports-extensions-1.3.1 javacup jaxen-full jcmdline	\
-		jcommon jdt-compiler-3.1.1 jfreechart jpa			\
-		jsmoothgen-ant-0.9.7 jta jxl-2.6 log4j looks microba-0.4.1-bin	\
-		mondrian-2.3.2.8944 mysql-connector-java nsisant-1.1		\
-		png-encoder-1.5 poi postgresql rex-20070125 saaj-api-1.3 servlet\
-		spring-2.0-m2 spring-context-2.0-m2 spring-hibernate3-2.0-m2	\
-		sqleonardo-2007.03 swingx-2007_05_13 tinylaf toniclf xalan	\
-		xercesImpl xml-apis ${CLSSHSQLDB}
+CLSSPTH=	JasperBabylon-1.0.0 antlr asm-attrs asm barbecue-1.5-beta1	\
+		batik-anim batik-awt-util batik-bridge batik-css batik-dom	\
+		batik-ext batik-gvt batik-parser batik-script batik-svg-dom	\
+		batik-svggen batik-util batik-xml bsh cglib-2.1 cincom-jr-xmla	\
+		commons-beanutils commons-collections commons-dbcp		\
+		commons-digester commons-javaflow-20060411 commons-logging	\
+		commons-logging-api commons-math commons-pool commons-vfs-1.0	\
+		dom4j ehcache-1.1 eigenbase-properties eigenbase-resgen		\
+		eigenbase-xom flexdock-0.4.1 groovy-all-1.0 hibernate3 iReport	\
+		itext bcel jasperreports jasperreports-extensions-1.3.1		\
+		jasperreports-flash-2.0.5 javacup jaxen-full jcmdline jcommon	\
+		jdt-compiler-3.1.1 jfreechart jpa js_activation-1.1		\
+		js_axis-1.4patched js_commons-discovery-0.2			\
+		js_jasperserver-common-ws-2.1.0					\
+		js_jasperserver-ireport-plugin-2.1.0 js_jaxrpc js_mail-1.4	\
+		js_wsdl4j-1.5.1 jsmoothgen-ant-0.9.7 jta jxl-2.6 log4j looks	\
+		microba-0.4.1-bin mondrian-2.3.2.8944 mysql-connector-java	\
+		nsisant-1.1 png-encoder-1.5 poi postgresql rex-20070125		\
+		saaj-api-1.3 servlet spring-2.0-m2 spring-context-2.0-m2	\
+		spring-hibernate3-2.0-m2 sqleonardo-2007.03 swingx-2007_05_13	\
+		tinylaf toniclf xalan xercesImpl xml-apis xml-apis-ext		\
+		${CLSSHSQLDB}
 
 .include <bsd.port.pre.mk>
 
diff --git a/devel/ireport/distinfo b/devel/ireport/distinfo
index 4eb26d6088ac..485346ed2a38 100644
--- a/devel/ireport/distinfo
+++ b/devel/ireport/distinfo
@@ -1,3 +1,3 @@
-MD5 (iReport-2.0.4.tar.gz) = 3782110496561b863f12666f0a9b60f8
-SHA256 (iReport-2.0.4.tar.gz) = 0bcd26a43197206580f05ddfa7645a59bed84235a936711106c99ade10154cf0
-SIZE (iReport-2.0.4.tar.gz) = 39597847
+MD5 (iReport-2.0.5.tar.gz) = 77599645e73cfa61350cc99da5a643ab
+SHA256 (iReport-2.0.5.tar.gz) = e8ebc77fcffb9bf79d2ad12bee81ce5cbc6b130b5fb46d7f67b82795698daff0
+SIZE (iReport-2.0.5.tar.gz) = 45746275
diff --git a/devel/ireport/pkg-plist b/devel/ireport/pkg-plist
index b66b98840105..5b279d5dafe8 100644
--- a/devel/ireport/pkg-plist
+++ b/devel/ireport/pkg-plist
@@ -54,7 +54,20 @@ bin/iReport
 %%JAVAJARDIR%%/LICENSE.microba.txt
 %%JAVAJARDIR%%/asm-attrs.jar
 %%JAVAJARDIR%%/asm.jar
-%%JAVAJARDIR%%/barbecue-1.1.jar
+%%JAVAJARDIR%%/barbecue-1.5-beta1.jar
+%%JAVAJARDIR%%/batik-anim.jar
+%%JAVAJARDIR%%/batik-awt-util.jar
+%%JAVAJARDIR%%/batik-bridge.jar
+%%JAVAJARDIR%%/batik-css.jar
+%%JAVAJARDIR%%/batik-dom.jar
+%%JAVAJARDIR%%/batik-ext.jar
+%%JAVAJARDIR%%/batik-gvt.jar
+%%JAVAJARDIR%%/batik-parser.jar
+%%JAVAJARDIR%%/batik-script.jar
+%%JAVAJARDIR%%/batik-svg-dom.jar
+%%JAVAJARDIR%%/batik-svggen.jar
+%%JAVAJARDIR%%/batik-util.jar
+%%JAVAJARDIR%%/batik-xml.jar
 %%JAVAJARDIR%%/cglib-2.1.jar
 %%JAVAJARDIR%%/cincom-jr-xmla.jar
 %%JAVAJARDIR%%/commons-javaflow-20060411.jar
@@ -68,9 +81,18 @@ bin/iReport
 %%JAVAJARDIR%%/hibernate3.jar
 %%JAVAJARDIR%%/iReport.jar
 %%JAVAJARDIR%%/jasperreports-extensions-1.3.1.jar
+%%JAVAJARDIR%%/jasperreports-flash-2.0.5.jar
 %%JAVAJARDIR%%/javacup.jar
 %%JAVAJARDIR%%/jdt-compiler-3.1.1.jar
 %%JAVAJARDIR%%/jpa.jar
+%%JAVAJARDIR%%/js_activation-1.1.jar
+%%JAVAJARDIR%%/js_axis-1.4patched.jar
+%%JAVAJARDIR%%/js_commons-discovery-0.2.jar
+%%JAVAJARDIR%%/js_jasperserver-common-ws-2.1.0.jar
+%%JAVAJARDIR%%/js_jasperserver-ireport-plugin-2.1.0.jar
+%%JAVAJARDIR%%/js_jaxrpc.jar
+%%JAVAJARDIR%%/js_mail-1.4.jar
+%%JAVAJARDIR%%/js_wsdl4j-1.5.1.jar
 %%JAVAJARDIR%%/jsmoothgen-ant-0.9.7.jar
 %%JAVAJARDIR%%/jta.jar
 %%JAVAJARDIR%%/jxl-2.6.jar
@@ -87,6 +109,7 @@ bin/iReport
 %%JAVAJARDIR%%/sqleonardo-2007.03.jar
 %%JAVAJARDIR%%/swingx-2007_05_13.jar
 %%JAVAJARDIR%%/toniclf.jar
+%%JAVAJARDIR%%/xml-apis-ext.jar
 @dirrm %%DATADIR%%/templates
 @dirrm %%DATADIR%%/plugins
 @dirrm %%DATADIR%%/fonts