4 files changed, 33 insertions, 28 deletions

diff --git a/devel/ireport/Makefile b/devel/ireport/Makefile
index 151830d8187b..99ef0d6fb31c 100644
--- a/devel/ireport/Makefile
+++ b/devel/ireport/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	ireport
-PORTVERSION=	1.2.1
+PORTVERSION=	1.2.2
 CATEGORIES=	devel databases java
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -33,24 +33,22 @@ PLIST_SUB=	VER=${PORTVERSION} VERMAN=0.2.0
 
 JARFILES=	LICENSE.asm-attr.txt LICENSE.asm.txt LICENSE.barbecue-1.1.txt	\
 		LICENSE.jta.txt asm-attrs.jar asm.jar barbecue-1.1.jar		\
-		cglib-2.1.jar ehcache-1.1.jar groovy-all-1.0-beta-10.jar	\
-		hibernate3.jar iReport.jar jdt-compiler.jar			\
-		jr-bsh-compiler.jar jr-groovy-compiler.jar			\
-		jsmoothgen-ant-0.9.7.jar jta.jar jxl.jar pngencoder.jar		\
-		toniclf.jar
+		cglib-2.1.jar commons-javaflow-20060411.jar ehcache-1.1.jar	\
+		groovy-all-1.0-beta-10.jar hibernate3.jar iReport.jar		\
+		jdt-compiler.jar jr-bsh-compiler.jar jsmoothgen-ant-0.9.7.jar	\
+		jta.jar jxl.jar nsisant-1.1.jar png-encoder-1.5.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.jar barbecue-1.1 bsh cglib-2.1	\
-		commons-beanutils commons-collections commons-digester	\
-		commons-logging commons-logging-api dom4j ehcache-1.1	\
-		groovy-all-1.0-beta-10 hibernate3 iReport itext		\
-		jasperreports jcmdline jcommon jdt-compiler		\
-		jfreechart jr-bsh-compiler jr-groovy-compiler		\
-		jsmoothgen-ant-0.9.7 jta jxl log4j looks		\
-		mysql-connector-java pngencoder poi postgresql tinylaf	\
-		toniclf xalan xercesImpl xml-apis ${CLSSHSQLDB}
+CLSSPTH=	antlr asm-attrs asm barbecue-1.1 bsh cglib-2.1 commons-beanutils\
+		commons-collections commons-digester commons-javaflow-20060411	\
+		commons-logging commons-logging-api dom4j ehcache-1.1		\
+		groovy-all-1.0-beta-10 hibernate3 iReport itext	jasperreports	\
+		jcmdline jcommon jdt-compiler jfreechart jr-bsh-compiler	\
+		jsmoothgen-ant-0.9.7 jta jxl log4j looks mysql-connector-java	\
+		nsisant-1.1 png-encoder-1.5 poi postgresql tinylaf toniclf xalan\
+		xercesImpl xml-apis ${CLSSHSQLDB}
 
 .if !defined(NOPORTDOCS)
 SUBDIRS+=	docs
diff --git a/devel/ireport/distinfo b/devel/ireport/distinfo
index a48248a2efa6..17bc7d3a8823 100644
--- a/devel/ireport/distinfo
+++ b/devel/ireport/distinfo
@@ -1,3 +1,3 @@
-MD5 (iReport-1.2.1.tar.gz) = 0e2878031c8471f1a0878cd528df6fd5
-SHA256 (iReport-1.2.1.tar.gz) = 77699a8eed0cb10827b8c8ca2601100592d66d362eb9c28470b2e8e1479cdabf
-SIZE (iReport-1.2.1.tar.gz) = 22542233
+MD5 (iReport-1.2.2.tar.gz) = dc99405544d3c2c702df86ae871ae3eb
+SHA256 (iReport-1.2.2.tar.gz) = 4e9e22f833a0fd030db6e0329dedc31af045d127340d06e91faa33755f478f55
+SIZE (iReport-1.2.2.tar.gz) = 22750810
diff --git a/devel/ireport/files/patch-bin_startup.sh b/devel/ireport/files/patch-bin_startup.sh
index 1710b12045cf..1a1c39b5f572 100644
--- a/devel/ireport/files/patch-bin_startup.sh
+++ b/devel/ireport/files/patch-bin_startup.sh
@@ -1,9 +1,11 @@
---- bin/startup.sh.orig	Fri Apr  7 03:38:58 2006
-+++ bin/startup.sh	Sat Apr  8 22:40:32 2006
-@@ -1,30 +1,6 @@
+--- 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/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.
 -EXEDIR=${0%/*}
@@ -27,9 +29,13 @@
 -  fi
 -done
 -
--IREPORT_CLASSPATH="${EXEDIR}/../classes":${EXEDIR}/../fonts:$IREPORT_CLASSPATH
+-IREPORT_CLASSPATH="${EXEDIR}/../classes":"${EXEDIR}/../fonts":$IREPORT_CLASSPATH
 -IREPORT_HOME="${EXEDIR}/.."
-+IREPORT_CLASSPATH="%%CLSSPTH%%:%%DATADIR%%/fonts"
-+IREPORT_HOME="%%DATADIR%%"
- 
+-
++# 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 "$@"
diff --git a/devel/ireport/pkg-plist b/devel/ireport/pkg-plist
index bddd2abadf33..e1f78e7be4fe 100644
--- a/devel/ireport/pkg-plist
+++ b/devel/ireport/pkg-plist
@@ -139,17 +139,18 @@ bin/iReport
 %%JAVAJARDIR%%/asm.jar
 %%JAVAJARDIR%%/barbecue-1.1.jar
 %%JAVAJARDIR%%/cglib-2.1.jar
+%%JAVAJARDIR%%/commons-javaflow-20060411.jar
 %%JAVAJARDIR%%/ehcache-1.1.jar
 %%JAVAJARDIR%%/groovy-all-1.0-beta-10.jar
 %%JAVAJARDIR%%/hibernate3.jar
 %%JAVAJARDIR%%/iReport.jar
 %%JAVAJARDIR%%/jdt-compiler.jar
 %%JAVAJARDIR%%/jr-bsh-compiler.jar
-%%JAVAJARDIR%%/jr-groovy-compiler.jar
 %%JAVAJARDIR%%/jsmoothgen-ant-0.9.7.jar
 %%JAVAJARDIR%%/jta.jar
 %%JAVAJARDIR%%/jxl.jar
-%%JAVAJARDIR%%/pngencoder.jar
+%%JAVAJARDIR%%/nsisant-1.1.jar
+%%JAVAJARDIR%%/png-encoder-1.5.jar
 %%JAVAJARDIR%%/toniclf.jar
 @dirrm %%DATADIR%%/templates
 @dirrm %%DATADIR%%/plugins