4 files changed, 40 insertions, 37 deletions

diff --git a/devel/ireport/Makefile b/devel/ireport/Makefile
index cad5f6a43833..57adb886cd13 100644
--- a/devel/ireport/Makefile
+++ b/devel/ireport/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	ireport
-PORTVERSION=	2.0.5
+PORTVERSION=	3.0.0
 CATEGORIES=	devel databases java
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -28,7 +28,9 @@ RUN_DEPENDS=	java:${PORTSDIR}/java/javavmwrapper					\
 		${JAVALIBDIR}/jasperreports.jar:${PORTSDIR}/databases/jasperreports	\
 		${JAVALIBDIR}/commons-dbcp.jar:${PORTSDIR}/java/jakarta-commons-dbcp	\
 		${JAVALIBDIR}/commons-math.jar:${PORTSDIR}/math/jakarta-commons-math	\
-		${JAVALIBDIR}/commons-pool.jar:${PORTSDIR}/java/jakarta-commons-pool
+		${JAVALIBDIR}/commons-pool.jar:${PORTSDIR}/java/jakarta-commons-pool	\
+		${JAVALIBDIR}/commons-codec.jar:${PORTSDIR}/java/jakarta-commons-codec	\
+		${JAVALIBDIR}/commons-httpclient.jar:${PORTSDIR}/java/jakarta-commons-httpclient
 
 USE_JAVA=	yes
 JAVA_VERSION=	1.4+
@@ -45,16 +47,17 @@ JARFILES=	JasperBabylon-1.0.0.jar LICENSE.asm-attr.txt LICENSE.asm.txt	\
 		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		\
+		eigenbase-xom.jar flexdock-0.4.1.jar groovy-all-1.5.5.jar	\
+		hibernate3.jar iReport.jar iTextAsian.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-3.0.0.jar				\
+		js_jasperserver-ireport-plugin-3.0.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	\
+		rex-20080421.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	\
 		xml-apis-ext.jar
@@ -66,20 +69,20 @@ 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	\
+		commons-beanutils commons-codec commons-collections commons-dbcp\
+		commons-digester commons-httpclient 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.5.5	\
+		hibernate3 iReport iTextAsian 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-3.0.0					\
+		js_jasperserver-ireport-plugin-3.0.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		\
+		nsisant-1.1 png-encoder-1.5 poi postgresql rex-20080421		\
 		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		\
diff --git a/devel/ireport/distinfo b/devel/ireport/distinfo
index 485346ed2a38..6afa497f1eec 100644
--- a/devel/ireport/distinfo
+++ b/devel/ireport/distinfo
@@ -1,3 +1,3 @@
-MD5 (iReport-2.0.5.tar.gz) = 77599645e73cfa61350cc99da5a643ab
-SHA256 (iReport-2.0.5.tar.gz) = e8ebc77fcffb9bf79d2ad12bee81ce5cbc6b130b5fb46d7f67b82795698daff0
-SIZE (iReport-2.0.5.tar.gz) = 45746275
+MD5 (iReport-3.0.0.tar.gz) = 6623bc39959686d9565c7857ad1de486
+SHA256 (iReport-3.0.0.tar.gz) = 67a557e67edb3a9ac5fa797fb21c11c37ed684dadb38b0b810c4b38d2a78267c
+SIZE (iReport-3.0.0.tar.gz) = 48137221
diff --git a/devel/ireport/files/patch-bin_startup.sh b/devel/ireport/files/patch-bin_startup.sh
index fd5c84dbe66c..72752d857c97 100644
--- a/devel/ireport/files/patch-bin_startup.sh
+++ b/devel/ireport/files/patch-bin_startup.sh
@@ -1,5 +1,5 @@
---- bin/startup.sh.orig	Thu Nov 16 02:59:28 2006
-+++ bin/startup.sh	Thu Nov 16 21:15:54 2006
+--- bin/startup.sh.orig	2008-05-30 08:34:03.000000000 +0200
++++ bin/startup.sh	2008-06-01 15:44:53.000000000 +0200
 @@ -1,33 +1,13 @@
  #! /bin/sh
  
@@ -16,9 +16,7 @@
 -    IREPORT_CLASSPATH="$i":$IREPORT_CLASSPATH
 -  fi
 -done
-+IREPORT_CLASSPATH="%%CLSSPTH%%:%%DATADIR%%/fonts"
-+IREPORT_HOME="$HOME/ireport"
- 
+-
 -DIRLIBS=${EXEDIR}/../lib/*.zip
 -for i in ${DIRLIBS}
 -do
@@ -34,12 +32,13 @@
 -IREPORT_HOME=$(pwd)
 -cd bin
 -#echo $IREPORT_HOME
--
--java -classpath "$IREPORT_CLASSPATH:$CLASSPATH" -Direport.home=$IREPORT_HOME -Djava.security.policy=$IREPORT_HOME/policy.all it.businesslogic.ireport.gui.MainFrame "$@"
++IREPORT_CLASSPATH="%%CLSSPTH%%:%%DATADIR%%/fonts"
++IREPORT_HOME="$HOME/ireport"
+ 
 +# Since iReport-1.2.2, $IREPORT_HOME must be writable
 +/bin/mkdir -p $IREPORT_HOME/lib
 +/bin/rm $IREPORT_HOME/plugins $IREPORT_HOME/templates 2>/dev/null || /usr/bin/true
 +/bin/ln -sf %%DATADIR%%/plugins $IREPORT_HOME/plugins
 +/bin/ln -sf %%DATADIR%%/templates $IREPORT_HOME/templates
 +cd $IREPORT_HOME
-+java -classpath "$IREPORT_CLASSPATH:$CLASSPATH" -Direport.home=$IREPORT_HOME it.businesslogic.ireport.gui.MainFrame "$@"
+ java -classpath "$IREPORT_CLASSPATH:$CLASSPATH" -Direport.home=$IREPORT_HOME -Djava.security.policy=$IREPORT_HOME/policy.all it.businesslogic.ireport.gui.MainFrame "$@"
diff --git a/devel/ireport/pkg-plist b/devel/ireport/pkg-plist
index 335b1143d2a5..83d501aff3fc 100644
--- a/devel/ireport/pkg-plist
+++ b/devel/ireport/pkg-plist
@@ -22,7 +22,7 @@ bin/iReport
 %%DATADIR%%/fonts/flatline.ttf
 %%DATADIR%%/fonts/progenisis.ttf
 @exec ln -sf %D/%%JAVAJARDIR%% %D/%%DATADIR%%/lib
-@rmtry %%DATADIR%%/lib
+%%DATADIR%%/lib
 %%DATADIR%%/notice.txt
 %%DATADIR%%/plugins/JRXMLDataSourcePlugin.xml
 %%DATADIR%%/plugins/checkupdate.xml
@@ -77,9 +77,10 @@ bin/iReport
 %%JAVAJARDIR%%/eigenbase-resgen.jar
 %%JAVAJARDIR%%/eigenbase-xom.jar
 %%JAVAJARDIR%%/flexdock-0.4.1.jar
-%%JAVAJARDIR%%/groovy-all-1.0.jar
+%%JAVAJARDIR%%/groovy-all-1.5.5.jar
 %%JAVAJARDIR%%/hibernate3.jar
 %%JAVAJARDIR%%/iReport.jar
+%%JAVAJARDIR%%/iTextAsian.jar
 %%JAVAJARDIR%%/jasperreports-extensions-1.3.1.jar
 %%JAVAJARDIR%%/jasperreports-flash-2.0.5.jar
 %%JAVAJARDIR%%/javacup.jar
@@ -88,8 +89,8 @@ bin/iReport
 %%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_jasperserver-common-ws-3.0.0.jar
+%%JAVAJARDIR%%/js_jasperserver-ireport-plugin-3.0.0.jar
 %%JAVAJARDIR%%/js_jaxrpc.jar
 %%JAVAJARDIR%%/js_mail-1.4.jar
 %%JAVAJARDIR%%/js_wsdl4j-1.5.1.jar
@@ -100,7 +101,7 @@ bin/iReport
 %%JAVAJARDIR%%/mondrian-2.3.2.8944.jar
 %%JAVAJARDIR%%/nsisant-1.1.jar
 %%JAVAJARDIR%%/png-encoder-1.5.jar
-%%JAVAJARDIR%%/rex-20070125.jar
+%%JAVAJARDIR%%/rex-20080421.jar
 %%JAVAJARDIR%%/saaj-api-1.3.jar
 %%JAVAJARDIR%%/servlet.jar
 %%JAVAJARDIR%%/spring-2.0-m2.jar