diff --git a/devel/ireport/Makefile b/devel/ireport/Makefile
index 6e884fac6970..7631f08a2b20 100644
--- a/devel/ireport/Makefile
+++ b/devel/ireport/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	ireport
-PORTVERSION=	1.2.5
+PORTVERSION=	1.3.0
 CATEGORIES=	devel databases java
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -34,37 +34,35 @@ NO_BUILD=	yes
 
 PLIST_SUB=	VER=${PORTVERSION} VERMAN=0.2.0
 
-JARFILES=	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 commons-javaflow-20060411.jar	\
-		ehcache-1.1.jar eigenbase-properties.jar eigenbase-resgen.jar	\
-		eigenbase-xom.jar groovy-all-1.0-beta-10.jar hibernate3.jar	\
+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 ehcache-1.1.jar\
+		eigenbase-properties.jar eigenbase-resgen.jar eigenbase-xom.jar	\
+		flexdock-0.4.1.jar groovy-all-1.0-beta-10.jar hibernate3.jar	\
 		iReport.jar javacup.jar jdt-compiler-3.1.1.jar jpa.jar		\
 		jr-bsh-compiler.jar jsmoothgen-ant-0.9.7.jar jta.jar jxl-2.6.jar\
 		microba-0.4.1-bin.jar mondrian-2.0.1.jar nsisant-1.1.jar	\
-		png-encoder-1.5.jar servlet.jar spring-2.0-m2.jar		\
-		spring-context-2.0-m2.jar spring-hibernate3-2.0-m2.jar		\
-		toniclf.jar
+		png-encoder-1.5.jar rex.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-2006.10.jar toniclf.jar
 BASEFILES=	Changelog.txt notice.txt relnotes${PORTVERSION}.html
 SUBDIRS=	fonts plugins templates
 
 # Jarfiles to be included in classpath
-CLSSPTH=	antlr asm-attrs asm barbecue-1.1 bsh cglib-2.1 commons-beanutils\
-		commons-collections commons-dbcp commons-digester		\
-		commons-javaflow-20060411 commons-logging commons-logging-api	\
-		commons-pool dom4j ehcache-1.1 eigenbase-properties		\
-		eigenbase-resgen eigenbase-xom groovy-all-1.0-beta-10 hibernate3\
-		iReport itext bcel jasperreports javacup jcmdline jcommon	\
-		jdt-compiler-3.1.1 jfreechart jpa jr-bsh-compiler		\
-		jsmoothgen-ant-0.9.7 jta jxl-2.6 log4j looks microba-0.4.1-bin	\
-		mondrian-2.0.1 mysql-connector-java nsisant-1.1 png-encoder-1.5	\
-		poi postgresql servlet spring-2.0-m2 spring-context-2.0-m2	\
-		spring-hibernate3-2.0-m2 tinylaf toniclf xalan xercesImpl	\
-		xml-apis ${CLSSHSQLDB}
-
-.if !defined(NOPORTDOCS)
-SUBDIRS+=	docs
-.endif
+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-pool dom4j		\
+		ehcache-1.1 eigenbase-properties eigenbase-resgen eigenbase-xom	\
+		flexdock-0.4.1 groovy-all-1.0-beta-10 hibernate3 iReport itext	\
+		bcel jasperreports javacup jcmdline jcommon jdt-compiler-3.1.1	\
+		jfreechart jpa jr-bsh-compiler jsmoothgen-ant-0.9.7 jta jxl-2.6	\
+		log4j looks microba-0.4.1-bin mondrian-2.0.1			\
+		mysql-connector-java nsisant-1.1 png-encoder-1.5 poi postgresql	\
+		rex saaj-api-1.3 servlet spring-2.0-m2 spring-context-2.0-m2	\
+		spring-hibernate3-2.0-m2 sqleonardo-2006.10 tinylaf toniclf	\
+		xalan xercesImpl xml-apis ${CLSSHSQLDB}
 
 .include <bsd.port.pre.mk>
 
@@ -112,7 +110,7 @@ do-install:
 	cd ${WRKSRC} && ${FIND} ${SUBDIRS} -type f -exec ${INSTALL_DATA} {} ${DATADIR}/{} \;
 	${RM} -rf ${DATADIR}/fonts/font_licenses	# All GPL
 .if !defined(NOPORTDOCS)
-	${LN} -sf ${DATADIR}/docs ${DOCSDIR}
+	#${LN} -sf ${DATADIR}/docs ${DOCSDIR}
 .endif
 
 post-install:
diff --git a/devel/ireport/distinfo b/devel/ireport/distinfo
index d0766882324d..afb429445a4b 100644
--- a/devel/ireport/distinfo
+++ b/devel/ireport/distinfo
@@ -1,3 +1,3 @@
-MD5 (iReport-1.2.5.tar.gz) = 4194428ae902cdf03cb9cad70520098c
-SHA256 (iReport-1.2.5.tar.gz) = 16929da84bd2f45b61e7333c9adee75f96501eacaa5785e44a9c4f2b55a0f06d
-SIZE (iReport-1.2.5.tar.gz) = 28082191
+MD5 (iReport-1.3.0.tar.gz) = ffcd605870df1c915b35700b16feb91a
+SHA256 (iReport-1.3.0.tar.gz) = fed43a1750f35ea8be0f4b1080465a650ba6e65139744946f63542e7eb354c05
+SIZE (iReport-1.3.0.tar.gz) = 32687733
diff --git a/devel/ireport/files/patch-bin_startup.sh b/devel/ireport/files/patch-bin_startup.sh
index 1a1c39b5f572..fd5c84dbe66c 100644
--- a/devel/ireport/files/patch-bin_startup.sh
+++ b/devel/ireport/files/patch-bin_startup.sh
@@ -1,10 +1,8 @@
---- bin/startup.sh.orig	Wed Apr 26 07:35:37 2006
-+++ bin/startup.sh	Sat Apr 29 00:04:02 2006
-@@ -1,30 +1,12 @@
+--- bin/startup.sh.orig	Thu Nov 16 02:59:28 2006
++++ bin/startup.sh	Thu Nov 16 21:15:54 2006
+@@ -1,33 +1,13 @@
  #! /bin/sh
  
-+IREPORT_CLASSPATH="%%CLSSPTH%%:%%DATADIR%%/fonts"
-+IREPORT_HOME="$HOME/ireport"
  
 -# add the libraries to the IREPORT_CLASSPATH.
 -# EXEDIR is the directory where this executable is.
@@ -18,7 +16,9 @@
 -    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
@@ -30,12 +30,16 @@
 -done
 -
 -IREPORT_CLASSPATH="${EXEDIR}/../classes":"${EXEDIR}/../fonts":$IREPORT_CLASSPATH
--IREPORT_HOME="${EXEDIR}/.."
+-cd ..
+-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 "$@"
 +# 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 it.businesslogic.ireport.gui.MainFrame "$@"
diff --git a/devel/ireport/pkg-plist b/devel/ireport/pkg-plist
index db98879de6bd..f808ff6bb73c 100644
--- a/devel/ireport/pkg-plist
+++ b/devel/ireport/pkg-plist
@@ -1,92 +1,6 @@
 bin/iReport
 %%DATADIR%%/Changelog.txt
 %%DATADIR%%/bin/startup.sh
-%%PORTDOCS%%%%DATADIR%%/docs/cap2.html
-%%PORTDOCS%%%%DATADIR%%/docs/cap3.html
-%%PORTDOCS%%%%DATADIR%%/docs/cap4.html
-%%PORTDOCS%%%%DATADIR%%/docs/cap5.html
-%%PORTDOCS%%%%DATADIR%%/docs/cap6.html
-%%PORTDOCS%%%%DATADIR%%/docs/cap7.html
-%%PORTDOCS%%%%DATADIR%%/docs/cap8.html
-%%PORTDOCS%%%%DATADIR%%/docs/images/jaspersoft_mes.jpg
-%%PORTDOCS%%%%DATADIR%%/docs/images/logo.gif
-%%PORTDOCS%%%%DATADIR%%/docs/images/logo_igor.gif
-%%PORTDOCS%%%%DATADIR%%/docs/images/manual_p1.jpg
-%%PORTDOCS%%%%DATADIR%%/docs/images/manual_p2.jpg
-%%PORTDOCS%%%%DATADIR%%/docs/images/manual_p3.jpg
-%%PORTDOCS%%%%DATADIR%%/docs/images/manual_p4.jpg
-%%PORTDOCS%%%%DATADIR%%/docs/images/manual_p5.jpg
-%%PORTDOCS%%%%DATADIR%%/docs/images/manual_p6.jpg
-%%PORTDOCS%%%%DATADIR%%/docs/images/manual_p7.jpg
-%%PORTDOCS%%%%DATADIR%%/docs/images/new_manual.jpg
-%%PORTDOCS%%%%DATADIR%%/docs/images/null.gif
-%%PORTDOCS%%%%DATADIR%%/docs/images/printer.gif
-%%PORTDOCS%%%%DATADIR%%/docs/images/regsoft.gif
-%%PORTDOCS%%%%DATADIR%%/docs/images/sflogo.gif
-%%PORTDOCS%%%%DATADIR%%/docs/index.html
-%%PORTDOCS%%%%DATADIR%%/docs/manual%%VERMAN%%.html
-%%PORTDOCS%%%%DATADIR%%/docs/manual%%VERMAN%%/2_2.jpg
-%%PORTDOCS%%%%DATADIR%%/docs/manual%%VERMAN%%/3_1.jpg
-%%PORTDOCS%%%%DATADIR%%/docs/manual%%VERMAN%%/3_2.jpg
-%%PORTDOCS%%%%DATADIR%%/docs/manual%%VERMAN%%/3_3.jpg
-%%PORTDOCS%%%%DATADIR%%/docs/manual%%VERMAN%%/3_4.jpg
-%%PORTDOCS%%%%DATADIR%%/docs/manual%%VERMAN%%/3_4big.jpg
-%%PORTDOCS%%%%DATADIR%%/docs/manual%%VERMAN%%/3_5.jpg
-%%PORTDOCS%%%%DATADIR%%/docs/manual%%VERMAN%%/3_5big.jpg
-%%PORTDOCS%%%%DATADIR%%/docs/manual%%VERMAN%%/3_6.jpg
-%%PORTDOCS%%%%DATADIR%%/docs/manual%%VERMAN%%/3_6big.jpg
-%%PORTDOCS%%%%DATADIR%%/docs/manual%%VERMAN%%/3_7.jpg
-%%PORTDOCS%%%%DATADIR%%/docs/manual%%VERMAN%%/4_1.jpg
-%%PORTDOCS%%%%DATADIR%%/docs/manual%%VERMAN%%/4_1big.jpg
-%%PORTDOCS%%%%DATADIR%%/docs/manual%%VERMAN%%/4_2.jpg
-%%PORTDOCS%%%%DATADIR%%/docs/manual%%VERMAN%%/4_2big.jpg
-%%PORTDOCS%%%%DATADIR%%/docs/manual%%VERMAN%%/4_3.jpg
-%%PORTDOCS%%%%DATADIR%%/docs/manual%%VERMAN%%/4_3big.jpg
-%%PORTDOCS%%%%DATADIR%%/docs/manual%%VERMAN%%/4_4.jpg
-%%PORTDOCS%%%%DATADIR%%/docs/manual%%VERMAN%%/4_4big.jpg
-%%PORTDOCS%%%%DATADIR%%/docs/manual%%VERMAN%%/4_5.jpg
-%%PORTDOCS%%%%DATADIR%%/docs/manual%%VERMAN%%/4_6.jpg
-%%PORTDOCS%%%%DATADIR%%/docs/manual%%VERMAN%%/4_6big.jpg
-%%PORTDOCS%%%%DATADIR%%/docs/manual%%VERMAN%%/4_7.jpg
-%%PORTDOCS%%%%DATADIR%%/docs/manual%%VERMAN%%/4_7big.jpg
-%%PORTDOCS%%%%DATADIR%%/docs/manual%%VERMAN%%/4_8.jpg
-%%PORTDOCS%%%%DATADIR%%/docs/manual%%VERMAN%%/4_8big.jpg
-%%PORTDOCS%%%%DATADIR%%/docs/manual%%VERMAN%%/5_1.jpg
-%%PORTDOCS%%%%DATADIR%%/docs/manual%%VERMAN%%/5_2.jpg
-%%PORTDOCS%%%%DATADIR%%/docs/manual%%VERMAN%%/5_2big.jpg
-%%PORTDOCS%%%%DATADIR%%/docs/manual%%VERMAN%%/5_3.jpg
-%%PORTDOCS%%%%DATADIR%%/docs/manual%%VERMAN%%/5_4.jpg
-%%PORTDOCS%%%%DATADIR%%/docs/manual%%VERMAN%%/5_5.jpg
-%%PORTDOCS%%%%DATADIR%%/docs/manual%%VERMAN%%/5_5big.jpg
-%%PORTDOCS%%%%DATADIR%%/docs/manual%%VERMAN%%/6_1.jpg
-%%PORTDOCS%%%%DATADIR%%/docs/manual%%VERMAN%%/7_1.jpg
-%%PORTDOCS%%%%DATADIR%%/docs/manual%%VERMAN%%/7_1big.jpg
-%%PORTDOCS%%%%DATADIR%%/docs/manual%%VERMAN%%/7_2.jpg
-%%PORTDOCS%%%%DATADIR%%/docs/manual%%VERMAN%%/7_2big.jpg
-%%PORTDOCS%%%%DATADIR%%/docs/manual%%VERMAN%%/7_3.jpg
-%%PORTDOCS%%%%DATADIR%%/docs/manual%%VERMAN%%/7_3big.jpg
-%%PORTDOCS%%%%DATADIR%%/docs/manual%%VERMAN%%/8_0.jpg
-%%PORTDOCS%%%%DATADIR%%/docs/manual%%VERMAN%%/8_1.jpg
-%%PORTDOCS%%%%DATADIR%%/docs/manual%%VERMAN%%/8_1big.jpg
-%%PORTDOCS%%%%DATADIR%%/docs/manual%%VERMAN%%/8_2.jpg
-%%PORTDOCS%%%%DATADIR%%/docs/manual%%VERMAN%%/8_2big.jpg
-%%PORTDOCS%%%%DATADIR%%/docs/manual%%VERMAN%%/8_3.jpg
-%%PORTDOCS%%%%DATADIR%%/docs/manual%%VERMAN%%/8_3big.jpg
-%%PORTDOCS%%%%DATADIR%%/docs/manual%%VERMAN%%/8_4.jpg
-%%PORTDOCS%%%%DATADIR%%/docs/manual%%VERMAN%%/8_4big.jpg
-%%PORTDOCS%%%%DATADIR%%/docs/manual%%VERMAN%%/8_5.jpg
-%%PORTDOCS%%%%DATADIR%%/docs/manual%%VERMAN%%/8_5big.jpg
-%%PORTDOCS%%%%DATADIR%%/docs/manual%%VERMAN%%/8_6.jpg
-%%PORTDOCS%%%%DATADIR%%/docs/manual%%VERMAN%%/8_6big.jpg
-%%PORTDOCS%%%%DATADIR%%/docs/manual%%VERMAN%%/8_7.jpg
-%%PORTDOCS%%%%DATADIR%%/docs/manual%%VERMAN%%/8_7big.jpg
-%%PORTDOCS%%%%DATADIR%%/docs/manual%%VERMAN%%/8_8.jpg
-%%PORTDOCS%%%%DATADIR%%/docs/manual%%VERMAN%%/8_8big.jpg
-%%PORTDOCS%%%%DATADIR%%/docs/manual%%VERMAN%%/8_9.jpg
-%%PORTDOCS%%%%DATADIR%%/docs/manual%%VERMAN%%/8_9big.jpg
-%%PORTDOCS%%%%DATADIR%%/docs/manual%%VERMAN%%/options1.jpg
-%%PORTDOCS%%%%DATADIR%%/docs/manual%%VERMAN%%/stylesheet.css
-%%PORTDOCS%%%%DATADIR%%/docs/manualtoc.html
 %%DATADIR%%/fonts/Balker.ttf
 %%DATADIR%%/fonts/Domestic_Manners.ttf
 %%DATADIR%%/fonts/Dustismo.ttf
@@ -131,6 +45,7 @@ bin/iReport
 %%DATADIR%%/templates/grayT.xml
 %%DATADIR%%/templates/gray_landscapeT.gif
 %%DATADIR%%/templates/gray_landscapeT.xml
+%%JAVAJARDIR%%/JasperBabylon-1.0.0.jar
 %%JAVAJARDIR%%/LICENSE.asm-attr.txt
 %%JAVAJARDIR%%/LICENSE.asm.txt
 %%JAVAJARDIR%%/LICENSE.barbecue-1.1.txt
@@ -140,11 +55,13 @@ bin/iReport
 %%JAVAJARDIR%%/asm.jar
 %%JAVAJARDIR%%/barbecue-1.1.jar
 %%JAVAJARDIR%%/cglib-2.1.jar
+%%JAVAJARDIR%%/cincom-jr-xmla.jar
 %%JAVAJARDIR%%/commons-javaflow-20060411.jar
 %%JAVAJARDIR%%/ehcache-1.1.jar
 %%JAVAJARDIR%%/eigenbase-properties.jar
 %%JAVAJARDIR%%/eigenbase-resgen.jar
 %%JAVAJARDIR%%/eigenbase-xom.jar
+%%JAVAJARDIR%%/flexdock-0.4.1.jar
 %%JAVAJARDIR%%/groovy-all-1.0-beta-10.jar
 %%JAVAJARDIR%%/hibernate3.jar
 %%JAVAJARDIR%%/iReport.jar
@@ -159,18 +76,16 @@ bin/iReport
 %%JAVAJARDIR%%/mondrian-2.0.1.jar
 %%JAVAJARDIR%%/nsisant-1.1.jar
 %%JAVAJARDIR%%/png-encoder-1.5.jar
+%%JAVAJARDIR%%/rex.jar
+%%JAVAJARDIR%%/saaj-api-1.3.jar
 %%JAVAJARDIR%%/servlet.jar
 %%JAVAJARDIR%%/spring-2.0-m2.jar
 %%JAVAJARDIR%%/spring-context-2.0-m2.jar
 %%JAVAJARDIR%%/spring-hibernate3-2.0-m2.jar
+%%JAVAJARDIR%%/sqleonardo-2006.10.jar
 %%JAVAJARDIR%%/toniclf.jar
 @dirrm %%DATADIR%%/templates
 @dirrm %%DATADIR%%/plugins
 @dirrm %%DATADIR%%/fonts
-%%PORTDOCS%%@dirrm %%DATADIR%%/docs/manual%%VERMAN%%
-%%PORTDOCS%%@dirrm %%DATADIR%%/docs/images
-%%PORTDOCS%%@dirrm %%DATADIR%%/docs
 @dirrm %%DATADIR%%/bin
 @dirrm %%DATADIR%%
-%%PORTDOCS%%@exec ln -sf %D/%%DATADIR%%/docs %D/%%DOCSDIR%%
-%%PORTDOCS%%@unexec rm -f %D/%%DOCSDIR%%