1 files changed, 112 insertions, 47 deletions

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