2 files changed, 148 insertions, 156 deletions

diff --git a/devel/ireport/Makefile b/devel/ireport/Makefile
index d50abf91bec8..1b2a137c2929 100644
--- a/devel/ireport/Makefile
+++ b/devel/ireport/Makefile
@@ -14,31 +14,7 @@ DISTNAME=	iReport-${PORTVERSION}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A visual report builder/designer for JasperReports
 
-RUN_DEPENDS=	java:${PORTSDIR}/java/javavmwrapper					\
-		${JAVALIBDIR}/bsh.jar:${PORTSDIR}/lang/bsh				\
-		${JAVALIBDIR}/axis.jar:${PORTSDIR}/www/axis				\
-		${JAVALIBDIR}/antlr.jar:${PORTSDIR}/devel/antlr				\
-		${JAVALIBDIR}/looks.jar:${PORTSDIR}/devel/looks				\
-		${JAVALIBDIR}/mail.jar:${PORTSDIR}/java/javamail			\
-		${JAVALIBDIR}/castor.jar:${PORTSDIR}/java/castor			\
-		${JAVALIBDIR}/groovy.jar:${PORTSDIR}/lang/groovy			\
-		${JAVALIBDIR}/activation.jar:${PORTSDIR}/java/jaf			\
-		${JAVALIBDIR}/dom4j.jar:${PORTSDIR}/textproc/dom4j			\
-		${JAVALIBDIR}/jaxen-full.jar:${PORTSDIR}/java/jaxen			\
-		${JAVALIBDIR}/tinylaf.jar:${PORTSDIR}/devel/tinylaf			\
-		${JAVALIBDIR}/slf4j-api.jar:${PORTSDIR}/devel/slf4j			\
-		${JAVALIBDIR}/bcel.jar:${PORTSDIR}/java/jakarta-bcel			\
-		${JAVASHAREDIR}/rhino/rhino.jar:${PORTSDIR}/lang/rhino			\
-		${JAVALIBDIR}/barbecue.jar:${PORTSDIR}/graphics/barbecue		\
-		${JAVALIBDIR}/xml-apis.jar:${PORTSDIR}/textproc/xerces-j		\
-		${JAVALIBDIR}/spring.jar:${PORTSDIR}/java/springframework		\
-		${JAVASHAREDIR}/apache-ant/lib/ant.jar:${PORTSDIR}/devel/apache-ant	\
-		${JAVALIBDIR}/jasperreports.jar:${PORTSDIR}/databases/jasperreports	\
-		${JAVALIBDIR}/commons-math.jar:${PORTSDIR}/math/jakarta-commons-math	\
-		${JAVALIBDIR}/commons-pool.jar:${PORTSDIR}/java/jakarta-commons-pool	\
-		${JAVALIBDIR}/commons-codec.jar:${PORTSDIR}/java/jakarta-commons-codec	\
-		${JAVALIBDIR}/commons-discovery.jar:${PORTSDIR}/java/jakarta-commons-discovery	\
-		${JAVALIBDIR}/commons-httpclient.jar:${PORTSDIR}/java/jakarta-commons-httpclient
+RUN_DEPENDS=	java:${PORTSDIR}/java/javavmwrapper
 
 USE_JAVA=	yes
 JAVA_VERSION=	1.5+
@@ -50,59 +26,32 @@ LICENSE_FILE=	${WRKSRC}/LICENSE_ireport.txt
 
 PLIST_SUB=	VER=${PORTVERSION} VERMAN=0.2.0
 
-# Installed files
-JARFILES=	asm-attrs.jar asm.jar barcode4j-2.0-LICENSE.txt			\
-		barcode4j-2.0-NOTICE.txt barcode4j-2.0.jar cglib-2.1.jar	\
-		cincom-jr-xmla.jar commons-javaflow-20060411.jar		\
-		commons-vfs-1.0.jar ehcache-1.1.jar				\
-		eigenbase-properties-1.1.0.10924.jar				\
-		eigenbase-resgen-1.3.0.11873.jar eigenbase-xom-1.3.0.11999.jar	\
-		ejb3-persistence.jar hibernate-annotations.jar			\
-		hibernate-commons-annotations.jar hibernate3-LICENSE.txt	\
-		hibernate3.jar iText-2.1.7-LICENSE.txt iText-2.1.7.jar		\
-		iTextAsian.jar jasperreports-chart-themes-3.7.6.jar		\
-		jasperreports-extensions-3.5.3.jar jasperreports-fonts-3.7.6.jar\
-		javacup.jar javassist-3.4.GA.jar jdt-compiler-3.1.1-LICENSE.html\
-		jdt-compiler-3.1.1.jar jpa.jar					\
-		js_jasperserver-common-ws-3.5.0.jar js_saaj-api-1.3.jar		\
-		js_wsdl4j-1.5.1.jar jta.jar jxl-2.6.10-LICENSE.txt		\
-		jxl-2.6.10.jar mondrian-3.1.1.12687-Jaspersoft.jar		\
-		mondrian-3.1.1.12687-LICENSE.html olap4j-0.9.7.145.jar		\
-		png-encoder-1.5.jar rex-20080421.jar saaj-api-1.3.jar		\
-		sqleonardo-2009.03.rc1.jar swingx-2007_10_07.jar xml-apis-ext.jar
-CJSFILES=	com-jaspersoft-ireport-addons.jar		\
-		com-jaspersoft-ireport-components.jar		\
-		com-jaspersoft-ireport-designer-standalone.jar	\
-		com-jaspersoft-ireport-heartbeat.jar		\
-		com-jaspersoft-ireport-jasperserver.jar		\
-		com-jaspersoft-ireport-samples.jar		\
-		com-jaspersoft-ireport.jar			\
-		com-jaspersoft-jrx.jar
-BASEFILES=	Changelog.txt notice.txt
-
 # Jarfiles to be included in classpath
-CLSSPTH=	ant antlr asm-attrs asm barbecue barcode4j-2.0 batik 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 bcel bsh castor cglib-2.1 cincom-jr-xmla	\
-		commons-beanutils commons-collections commons-digester		\
-		commons-javaflow-20060411 commons-logging commons-math		\
-		commons-pool commons-vfs-1.0 crimson dom4j ehcache-1.1		\
-		eigenbase-properties-1.1.0.10924 eigenbase-resgen-1.3.0.11873	\
-		eigenbase-xom-1.3.0.11999 ejb3-persistence groovy		\
-		hibernate-annotations hibernate-commons-annotations hibernate3	\
-		itext iText-2.1.7 iTextAsian jasperreports			\
-		jasperreports-chart-themes-3.7.6 jasperreports-extensions-3.5.3	\
-		jasperreports-fonts-3.7.6 javacup javassist-3.4.GA  jaxen-full	\
-		jcommon jdt-compiler-3.1.1 jfreechart jpa activation axis	\
-		commons-codec commons-discovery commons-httpclient		\
-		js_jasperserver-common-ws-3.5.0 jaxrpc mail js_saaj-api-1.3	\
-		js_wsdl4j-1.5.1 jta jxl-2.6.10 log4j				\
-		mondrian-3.1.1.12687-Jaspersoft olap4j-0.9.7.145 png-encoder-1.5\
-		poi rex-20080421 rhino saaj-api-1.3 slf4j-api slf4j-log4j12	\
-		spring sqleonardo-2009.03.rc1 swingx-2007_10_07 xalan		\
-		xml-apis-ext xml-apis							\
-		${CLSSHSQLDB}
+CLSSPTH=	ant-1.7.1 antlr-2.7.6 asm-attrs asm barbecue-1.5-beta1 \
+		barcode4j-2.0 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 bcel-5.2 \
+		bsh-2.0b4 castor-1.2 cglib-2.1 cincom-jr-xmla \
+		commons-beanutils-1.8.2 commons-collections-3.2.1 \
+		commons-dbcp-1.2.2 commons-digester-1.7 \
+		commons-javaflow-20060411 commons-logging-1.1 commons-math-1.0 \
+		commons-pool-1.3 commons-vfs-1.0 dom4j-1.6 ehcache-1.1 \
+		eigenbase-properties-1.1.0.10924 eigenbase-resgen-1.3.0.11873 \
+		eigenbase-xom-1.3.0.11999 ejb3-persistence groovy-all-1.7.5 \
+		hibernate-annotations hibernate-commons-annotations hibernate3 \
+		hsqldb-1.8.0-10 iText-2.1.7 iTextAsian jakarta-bcel-20050813 \
+		jasperreports-3.7.6 jasperreports-chart-themes-3.7.6 \
+		jasperreports-extensions-3.5.3 jasperreports-fonts-3.7.6 \
+		javacup javassist-3.4.GA jaxen-1.1.1 jcommon-1.0.15 \
+		jdt-compiler-3.1.1 jfreechart-1.0.12 jpa js_activation-1.1 \
+		js_axis-1.4patched js_commons-codec-1.3 \
+		js_commons-discovery-0.2 js_commons-httpclient-3.1 \
+		js_jasperserver-common-ws-3.5.0 js_jaxrpc js_mail-1.4 \
+		js_saaj-api-1.3 js_wsdl4j-1.5.1 jta jxl-2.6.10 log4j-1.2.15 \
+		mondrian-3.1.1.12687-Jaspersoft olap4j-0.9.7.145 \
+		png-encoder-1.5 poi-3.6-20091214 rex-20080421 rhino-1.7R1 \
+		saaj-api-1.3 slf4j-api slf4j-log4j12 spring \
+		sqleonardo-2009.03.rc1 swingx-2007_10_07 xml-apis-ext xml-apis
 
 .include <bsd.port.pre.mk>
 
@@ -121,49 +70,27 @@ WITH_ORACLE9=	yes
 CLSSORA+=	ojdbc14.jar ocrs12.zip
 .endif
 
-.if exists(${JAVALIBDIR}/hsqldb.jar)
-WITH_HSQLDB=	yes
-.endif
-.if defined(WITH_HSQLDB)
-CLSSHSQLDB=	hsqldb
-.endif
-
-# jakarta-commons-dbcp-1.2.2 is marked as broken:
-# does not build unless jakarta-commons-collections is compiled with jdk15.
-.if exists(${JAVALIBDIR}/commons-dbcp.jar)
-RUN_DEPENDS+=	${JAVALIBDIR}/commons-dbcp.jar:${PORTSDIR}/java/jakarta-commons-dbcp
-CLSSPTH+=	commons-dbcp
-.else
-JARFILES+=	commons-dbcp-1.2.2.jar
-CLSSPTH+=	commons-dbcp-1.2.2
-.endif
-
 post-extract:
 	${CP} ${FILESDIR}/startup.sh ${WRKSRC}/bin/
 	${RM} ${WRKSRC}/bin/*.exe
 
 pre-configure:
-	${REINPLACE_CMD} -e 's|%%PORTVERSION%%|${PORTVERSION}|;			\
-		s|%%CLSSPTH%%|${CLSSPTH:S,^,${JAVALIBDIR}/,g:S,$,.jar£,g}|'	\
-		-e 's|jar£ |jar\:|g;						\
-		s|£|:${JAVA_HOME}/lib/tools.jar${CLSSORA:S,^,\:${JAVALIBDIR}/,g}|;	\
-		s|${JAVALIBDIR}/batik|${JAVASHAREDIR}/batik/lib/batik|g;	\
-		s|${JAVALIBDIR}/rhino.jar|${JAVASHAREDIR}/rhino/rhino.jar|;	\
-		s|${JAVALIBDIR}/ant.jar|${JAVASHAREDIR}/apache-ant/lib/ant.jar|;\
-		s|zip |zip|g; s|jar |jar|g'					\
-		-e 's|%%JAVA_HOME%%|${JAVA_HOME}|;				\
-		s|%%DATADIR%%|${DATADIR}|g;					\
-		s|^java |JAVA_VERSION="${JAVA_VERSION}" ${LOCALBASE}/bin/java |'\
+	${REINPLACE_CMD} -e 's|%%PORTVERSION%%|${PORTVERSION}|; \
+		s|%%CLSSPTH%%|${CLSSPTH:S,^,${DATADIR}/,g:S,$,.jar£,g}|' \
+		-e 's|jar£ |jar\:|g; \
+		s|£|:${JAVA_HOME}/lib/tools.jar${CLSSORA:S,^,\:${JAVALIBDIR}/,g}|; \
+		s|zip |zip|g; s|jar |jar|g' \
+		-e 's|%%JAVA_HOME%%|${JAVA_HOME}|; \
+		s|%%DATADIR%%|${DATADIR}|g; \
+		s|^java |JAVA_VERSION="${JAVA_VERSION}" ${LOCALBASE}/bin/java |' \
 		${WRKSRC}/bin/startup.sh
-	${REINPLACE_CMD} -e 's|/bin/grep|/usr/bin/grep|' ${WRKSRC}/platform9/lib/nbexec
+	${REINPLACE_CMD} -e 's|/bin/grep|/usr/bin/grep|' \
+		${WRKSRC}/platform9/lib/nbexec
 
 do-install:
 	${MKDIR} ${DATADIR}
 	(cd ${WRKSRC} && ${COPYTREE_SHARE} \* ${DATADIR})
 	${CHMOD} ${BINMODE} ${DATADIR}/bin/startup.sh
 	${LN} -sf ${DATADIR}/bin/startup.sh ${PREFIX}/bin/iReport
-	${RM} -rf ${DATADIR}/ireport/modules/ext
-	${INSTALL_DATA} ${JARFILES:S|^|${WRKSRC}/ireport/modules/ext/|} ${JAVAJARDIR}
-	${LN} -sf ${JAVAJARDIR} ${DATADIR}/ireport/modules/ext
 
 .include <bsd.port.post.mk>
diff --git a/devel/ireport/pkg-plist b/devel/ireport/pkg-plist
index b50d5f829daa..18cb219046f9 100644
--- a/devel/ireport/pkg-plist
+++ b/devel/ireport/pkg-plist
@@ -1062,8 +1062,117 @@ bin/iReport
 %%DATADIR%%/ireport/modules/com-jaspersoft-ireport-samples.jar
 %%DATADIR%%/ireport/modules/com-jaspersoft-ireport.jar
 %%DATADIR%%/ireport/modules/com-jaspersoft-jrx.jar
-@exec ln -sf %D/%%JAVAJARDIR%% %D/%%DATADIR%%/ireport/modules/ext
-@unexec rm %D/%%DATADIR%%/ireport/modules/ext 2>&1 >/dev/null || true
+%%DATADIR%%/ireport/modules/ext/ant-1.7.1-LICENSE.txt
+%%DATADIR%%/ireport/modules/ext/ant-1.7.1.jar
+%%DATADIR%%/ireport/modules/ext/antlr-2.7.6-LICENSE.txt
+%%DATADIR%%/ireport/modules/ext/antlr-2.7.6.jar
+%%DATADIR%%/ireport/modules/ext/asm-attrs.jar
+%%DATADIR%%/ireport/modules/ext/asm.jar
+%%DATADIR%%/ireport/modules/ext/barbecue-1.5-beta1-LICENSE.txt
+%%DATADIR%%/ireport/modules/ext/barbecue-1.5-beta1.jar
+%%DATADIR%%/ireport/modules/ext/barcode4j-2.0-LICENSE.txt
+%%DATADIR%%/ireport/modules/ext/barcode4j-2.0-NOTICE.txt
+%%DATADIR%%/ireport/modules/ext/barcode4j-2.0.jar
+%%DATADIR%%/ireport/modules/ext/batik-LICENSE.txt
+%%DATADIR%%/ireport/modules/ext/batik-anim.jar
+%%DATADIR%%/ireport/modules/ext/batik-awt-util.jar
+%%DATADIR%%/ireport/modules/ext/batik-bridge.jar
+%%DATADIR%%/ireport/modules/ext/batik-css.jar
+%%DATADIR%%/ireport/modules/ext/batik-dom.jar
+%%DATADIR%%/ireport/modules/ext/batik-ext.jar
+%%DATADIR%%/ireport/modules/ext/batik-gvt.jar
+%%DATADIR%%/ireport/modules/ext/batik-parser.jar
+%%DATADIR%%/ireport/modules/ext/batik-script.jar
+%%DATADIR%%/ireport/modules/ext/batik-svg-dom.jar
+%%DATADIR%%/ireport/modules/ext/batik-svggen.jar
+%%DATADIR%%/ireport/modules/ext/batik-util.jar
+%%DATADIR%%/ireport/modules/ext/batik-xml.jar
+%%DATADIR%%/ireport/modules/ext/bcel-5.2-LICENSE.txt
+%%DATADIR%%/ireport/modules/ext/bcel-5.2-NOTICE.txt
+%%DATADIR%%/ireport/modules/ext/bcel-5.2.jar
+%%DATADIR%%/ireport/modules/ext/bsh-2.0b4-LICENSE.txt
+%%DATADIR%%/ireport/modules/ext/bsh-2.0b4.jar
+%%DATADIR%%/ireport/modules/ext/castor-1.2.jar
+%%DATADIR%%/ireport/modules/ext/cglib-2.1.jar
+%%DATADIR%%/ireport/modules/ext/cincom-jr-xmla.jar
+%%DATADIR%%/ireport/modules/ext/commons-LICENSE.txt
+%%DATADIR%%/ireport/modules/ext/commons-NOTICE.txt
+%%DATADIR%%/ireport/modules/ext/commons-beanutils-1.8.2.jar
+%%DATADIR%%/ireport/modules/ext/commons-collections-3.2.1.jar
+%%DATADIR%%/ireport/modules/ext/commons-dbcp-1.2.2.jar
+%%DATADIR%%/ireport/modules/ext/commons-digester-1.7.jar
+%%DATADIR%%/ireport/modules/ext/commons-javaflow-20060411.jar
+%%DATADIR%%/ireport/modules/ext/commons-logging-1.1.jar
+%%DATADIR%%/ireport/modules/ext/commons-math-1.0.jar
+%%DATADIR%%/ireport/modules/ext/commons-pool-1.3.jar
+%%DATADIR%%/ireport/modules/ext/commons-vfs-1.0.jar
+%%DATADIR%%/ireport/modules/ext/dom4j-1.6.jar
+%%DATADIR%%/ireport/modules/ext/ehcache-1.1.jar
+%%DATADIR%%/ireport/modules/ext/eigenbase-properties-1.1.0.10924.jar
+%%DATADIR%%/ireport/modules/ext/eigenbase-resgen-1.3.0.11873.jar
+%%DATADIR%%/ireport/modules/ext/eigenbase-xom-1.3.0.11999.jar
+%%DATADIR%%/ireport/modules/ext/ejb3-persistence.jar
+%%DATADIR%%/ireport/modules/ext/groovy-all-1.7.5-LICENSE.txt
+%%DATADIR%%/ireport/modules/ext/groovy-all-1.7.5.jar
+%%DATADIR%%/ireport/modules/ext/hibernate-annotations.jar
+%%DATADIR%%/ireport/modules/ext/hibernate-commons-annotations.jar
+%%DATADIR%%/ireport/modules/ext/hibernate3-LICENSE.txt
+%%DATADIR%%/ireport/modules/ext/hibernate3.jar
+%%DATADIR%%/ireport/modules/ext/hsqldb-1.8.0-10-LICENSE.txt
+%%DATADIR%%/ireport/modules/ext/hsqldb-1.8.0-10.jar
+%%DATADIR%%/ireport/modules/ext/iText-2.1.7-LICENSE.txt
+%%DATADIR%%/ireport/modules/ext/iText-2.1.7.jar
+%%DATADIR%%/ireport/modules/ext/iTextAsian.jar
+%%DATADIR%%/ireport/modules/ext/jakarta-bcel-20050813.jar
+%%DATADIR%%/ireport/modules/ext/jasperreports-3.7.6.jar
+%%DATADIR%%/ireport/modules/ext/jasperreports-LICENSE.txt
+%%DATADIR%%/ireport/modules/ext/jasperreports-chart-themes-3.7.6.jar
+%%DATADIR%%/ireport/modules/ext/jasperreports-extensions-3.5.3.jar
+%%DATADIR%%/ireport/modules/ext/jasperreports-fonts-3.7.6.jar
+%%DATADIR%%/ireport/modules/ext/javacup.jar
+%%DATADIR%%/ireport/modules/ext/javassist-3.4.GA.jar
+%%DATADIR%%/ireport/modules/ext/jaxen-1.1.1-LICENSE.txt
+%%DATADIR%%/ireport/modules/ext/jaxen-1.1.1.jar
+%%DATADIR%%/ireport/modules/ext/jcommon-1.0.15-LICENSE.txt
+%%DATADIR%%/ireport/modules/ext/jcommon-1.0.15.jar
+%%DATADIR%%/ireport/modules/ext/jdt-compiler-3.1.1-LICENSE.html
+%%DATADIR%%/ireport/modules/ext/jdt-compiler-3.1.1.jar
+%%DATADIR%%/ireport/modules/ext/jfreechart-1.0.12-LICENSE.txt
+%%DATADIR%%/ireport/modules/ext/jfreechart-1.0.12.jar
+%%DATADIR%%/ireport/modules/ext/jpa.jar
+%%DATADIR%%/ireport/modules/ext/js_activation-1.1.jar
+%%DATADIR%%/ireport/modules/ext/js_axis-1.4patched.jar
+%%DATADIR%%/ireport/modules/ext/js_commons-codec-1.3.jar
+%%DATADIR%%/ireport/modules/ext/js_commons-discovery-0.2.jar
+%%DATADIR%%/ireport/modules/ext/js_commons-httpclient-3.1.jar
+%%DATADIR%%/ireport/modules/ext/js_jasperserver-common-ws-3.5.0.jar
+%%DATADIR%%/ireport/modules/ext/js_jaxrpc.jar
+%%DATADIR%%/ireport/modules/ext/js_mail-1.4.jar
+%%DATADIR%%/ireport/modules/ext/js_saaj-api-1.3.jar
+%%DATADIR%%/ireport/modules/ext/js_wsdl4j-1.5.1.jar
+%%DATADIR%%/ireport/modules/ext/jta.jar
+%%DATADIR%%/ireport/modules/ext/jxl-2.6.10-LICENSE.txt
+%%DATADIR%%/ireport/modules/ext/jxl-2.6.10.jar
+%%DATADIR%%/ireport/modules/ext/log4j-1.2.15-LICENSE.txt
+%%DATADIR%%/ireport/modules/ext/log4j-1.2.15.jar
+%%DATADIR%%/ireport/modules/ext/mondrian-3.1.1.12687-Jaspersoft.jar
+%%DATADIR%%/ireport/modules/ext/mondrian-3.1.1.12687-LICENSE.html
+%%DATADIR%%/ireport/modules/ext/olap4j-0.9.7.145.jar
+%%DATADIR%%/ireport/modules/ext/png-encoder-1.5.jar
+%%DATADIR%%/ireport/modules/ext/poi-3.6-20091214-LICENSE.txt
+%%DATADIR%%/ireport/modules/ext/poi-3.6-20091214-NOTICE.txt
+%%DATADIR%%/ireport/modules/ext/poi-3.6-20091214.jar
+%%DATADIR%%/ireport/modules/ext/rex-20080421.jar
+%%DATADIR%%/ireport/modules/ext/rhino-1.7R1-LICENSE.txt
+%%DATADIR%%/ireport/modules/ext/rhino-1.7R1.jar
+%%DATADIR%%/ireport/modules/ext/saaj-api-1.3.jar
+%%DATADIR%%/ireport/modules/ext/slf4j-api.jar
+%%DATADIR%%/ireport/modules/ext/slf4j-log4j12.jar
+%%DATADIR%%/ireport/modules/ext/spring.jar
+%%DATADIR%%/ireport/modules/ext/sqleonardo-2009.03.rc1.jar
+%%DATADIR%%/ireport/modules/ext/swingx-2007_10_07.jar
+%%DATADIR%%/ireport/modules/ext/xml-apis-ext.jar
+%%DATADIR%%/ireport/modules/ext/xml-apis.jar
 %%DATADIR%%/ireport/modules/locale/org-netbeans-core-windows_ireport.jar
 %%DATADIR%%/ireport/modules/locale/org-netbeans-core_ireport.jar
 %%DATADIR%%/ireport/samples/Basic_report/simple.jasper
@@ -1929,51 +2038,6 @@ bin/iReport
 %%DATADIR%%/platform9/update_tracking/org-openide-util.xml
 %%DATADIR%%/platform9/update_tracking/org-openide-windows.xml
 %%DATADIR%%/readme.txt
-%%JAVAJARDIR%%/asm-attrs.jar
-%%JAVAJARDIR%%/asm.jar
-%%JAVAJARDIR%%/barcode4j-2.0-LICENSE.txt
-%%JAVAJARDIR%%/barcode4j-2.0-NOTICE.txt
-%%JAVAJARDIR%%/barcode4j-2.0.jar
-%%JAVAJARDIR%%/cglib-2.1.jar
-%%JAVAJARDIR%%/cincom-jr-xmla.jar
-%%JAVAJARDIR%%/commons-dbcp-1.2.2.jar
-%%JAVAJARDIR%%/commons-javaflow-20060411.jar
-%%JAVAJARDIR%%/commons-vfs-1.0.jar
-%%JAVAJARDIR%%/ehcache-1.1.jar
-%%JAVAJARDIR%%/eigenbase-properties-1.1.0.10924.jar
-%%JAVAJARDIR%%/eigenbase-resgen-1.3.0.11873.jar
-%%JAVAJARDIR%%/eigenbase-xom-1.3.0.11999.jar
-%%JAVAJARDIR%%/ejb3-persistence.jar
-%%JAVAJARDIR%%/hibernate-annotations.jar
-%%JAVAJARDIR%%/hibernate-commons-annotations.jar
-%%JAVAJARDIR%%/hibernate3-LICENSE.txt
-%%JAVAJARDIR%%/hibernate3.jar
-%%JAVAJARDIR%%/iText-2.1.7-LICENSE.txt
-%%JAVAJARDIR%%/iText-2.1.7.jar
-%%JAVAJARDIR%%/iTextAsian.jar
-%%JAVAJARDIR%%/jasperreports-chart-themes-3.7.6.jar
-%%JAVAJARDIR%%/jasperreports-extensions-3.5.3.jar
-%%JAVAJARDIR%%/jasperreports-fonts-3.7.6.jar
-%%JAVAJARDIR%%/javacup.jar
-%%JAVAJARDIR%%/javassist-3.4.GA.jar
-%%JAVAJARDIR%%/jdt-compiler-3.1.1-LICENSE.html
-%%JAVAJARDIR%%/jdt-compiler-3.1.1.jar
-%%JAVAJARDIR%%/jpa.jar
-%%JAVAJARDIR%%/js_jasperserver-common-ws-3.5.0.jar
-%%JAVAJARDIR%%/js_saaj-api-1.3.jar
-%%JAVAJARDIR%%/js_wsdl4j-1.5.1.jar
-%%JAVAJARDIR%%/jta.jar
-%%JAVAJARDIR%%/jxl-2.6.10-LICENSE.txt
-%%JAVAJARDIR%%/jxl-2.6.10.jar
-%%JAVAJARDIR%%/mondrian-3.1.1.12687-Jaspersoft.jar
-%%JAVAJARDIR%%/mondrian-3.1.1.12687-LICENSE.html
-%%JAVAJARDIR%%/olap4j-0.9.7.145.jar
-%%JAVAJARDIR%%/png-encoder-1.5.jar
-%%JAVAJARDIR%%/rex-20080421.jar
-%%JAVAJARDIR%%/saaj-api-1.3.jar
-%%JAVAJARDIR%%/sqleonardo-2009.03.rc1.jar
-%%JAVAJARDIR%%/swingx-2007_10_07.jar
-%%JAVAJARDIR%%/xml-apis-ext.jar
 @dirrm %%DATADIR%%/platform9/update_tracking
 @dirrm %%DATADIR%%/platform9/modules/locale
 @dirrm %%DATADIR%%/platform9/modules/ext
@@ -2010,6 +2074,7 @@ bin/iReport
 @dirrm %%DATADIR%%/ireport/samples/Basic_report
 @dirrm %%DATADIR%%/ireport/samples
 @dirrm %%DATADIR%%/ireport/modules/locale
+@dirrm %%DATADIR%%/ireport/modules/ext
 @dirrm %%DATADIR%%/ireport/modules
 @dirrm %%DATADIR%%/ireport/libs
 @dirrm %%DATADIR%%/ireport/fonts