Upgrade to iReport-1.2.1.

Changelog at
<https://sourceforge.net/project/shownotes.php?release_id=407766>.

4 files changed, 16 insertions, 13 deletions

diff --git a/devel/ireport/Makefile b/devel/ireport/Makefile
index 088c5e746958..151830d8187b 100644
--- a/devel/ireport/Makefile
+++ b/devel/ireport/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	ireport
-PORTVERSION=	1.2.0
+PORTVERSION=	1.2.1
 CATEGORIES=	devel databases java
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -35,8 +35,9 @@ 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			\
-		jexelapiexporter-jr120.jar jr-bsh-compiler.jar			\
-		jr-groovy-compiler.jar jta.jar jxl.jar pngencoder.jar toniclf.jar
+		jr-bsh-compiler.jar jr-groovy-compiler.jar			\
+		jsmoothgen-ant-0.9.7.jar jta.jar jxl.jar pngencoder.jar		\
+		toniclf.jar
 BASEFILES=	Changelog.txt notice.txt relnotes${PORTVERSION}.html
 SUBDIRS=	fonts plugins templates
 
@@ -46,8 +47,8 @@ CLSSPTH=	antlr asm-attrs asm.jar barbecue-1.1 bsh cglib-2.1	\
 		commons-logging commons-logging-api dom4j ehcache-1.1	\
 		groovy-all-1.0-beta-10 hibernate3 iReport itext		\
 		jasperreports jcmdline jcommon jdt-compiler		\
-		jexelapiexporter-jr120 jfreechart jr-bsh-compiler	\
-		jr-groovy-compiler jta jxl log4j looks			\
+		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}
 
@@ -99,6 +100,7 @@ do-install:
 	${INSTALL_DATA} ${BASEFILES:S|^|${WRKSRC}/|} ${DATADIR}
 	cd ${WRKSRC} && ${FIND} ${SUBDIRS} -type d -exec ${MKDIR} ${DATADIR}/{} \;
 	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}
 .endif
diff --git a/devel/ireport/distinfo b/devel/ireport/distinfo
index 32707b12088a..a48248a2efa6 100644
--- a/devel/ireport/distinfo
+++ b/devel/ireport/distinfo
@@ -1,3 +1,3 @@
-MD5 (iReport-1.2.0.tar.gz) = 73b289bf6b63f01cd0f100b781d2fe18
-SHA256 (iReport-1.2.0.tar.gz) = 76d848e6081b380149cc5d9a57c11c7b8978187b0119ad15e7f7148cfb24af51
-SIZE (iReport-1.2.0.tar.gz) = 21658359
+MD5 (iReport-1.2.1.tar.gz) = 0e2878031c8471f1a0878cd528df6fd5
+SHA256 (iReport-1.2.1.tar.gz) = 77699a8eed0cb10827b8c8ca2601100592d66d362eb9c28470b2e8e1479cdabf
+SIZE (iReport-1.2.1.tar.gz) = 22542233
diff --git a/devel/ireport/files/patch-bin_startup.sh b/devel/ireport/files/patch-bin_startup.sh
index 8a7f62394c4d..1710b12045cf 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	Fri Jan 28 02:01:47 2005
-+++ bin/startup.sh	Mon May 23 21:45:26 2005
+--- 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/sh
  
@@ -27,9 +27,9 @@
 -  fi
 -done
 -
--IREPORT_CLASSPATH="${EXEDIR}/../classes":$IREPORT_CLASSPATH
+-IREPORT_CLASSPATH="${EXEDIR}/../classes":${EXEDIR}/../fonts:$IREPORT_CLASSPATH
 -IREPORT_HOME="${EXEDIR}/.."
-+IREPORT_CLASSPATH="%%CLSSPTH%%"
++IREPORT_CLASSPATH="%%CLSSPTH%%:%%DATADIR%%/fonts"
 +IREPORT_HOME="%%DATADIR%%"
  
  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 3f2811679e72..bddd2abadf33 100644
--- a/devel/ireport/pkg-plist
+++ b/devel/ireport/pkg-plist
@@ -115,6 +115,7 @@ bin/iReport
 %%DATADIR%%/plugins/massive_compiler.xml
 %%DATADIR%%/plugins/oracle_options.xml
 %%DATADIR%%/plugins/text_wizard.xml
+%%DATADIR%%/plugins/translationStatus.xml
 %%DATADIR%%/relnotes%%VER%%.html
 %%DATADIR%%/templates/YBC.gif
 %%DATADIR%%/templates/YBC.xml
@@ -143,9 +144,9 @@ bin/iReport
 %%JAVAJARDIR%%/hibernate3.jar
 %%JAVAJARDIR%%/iReport.jar
 %%JAVAJARDIR%%/jdt-compiler.jar
-%%JAVAJARDIR%%/jexelapiexporter-jr120.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