3 files changed, 50 insertions, 17 deletions

diff --git a/devel/ireport/Makefile b/devel/ireport/Makefile
index 98b8274d1d38..088c5e746958 100644
--- a/devel/ireport/Makefile
+++ b/devel/ireport/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	ireport
-PORTVERSION=	1.1.0
+PORTVERSION=	1.2.0
 CATEGORIES=	devel databases java
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -17,9 +17,12 @@ COMMENT=	A visual report builder/designer for JasperReports
 
 RUN_DEPENDS=	java:${PORTSDIR}/java/javavmwrapper	\
 		${JAVALIBDIR}/bsh.jar:${PORTSDIR}/java/bsh	\
+		${JAVALIBDIR}/dom4j.jar:${PORTSDIR}/textproc/dom4j	\
+		${JAVALIBDIR}/antlr.jar:${PORTSDIR}/devel/antlr	\
 		${JAVALIBDIR}/looks.jar:${PORTSDIR}/devel/looks	\
 		${JAVALIBDIR}/tinylaf.jar:${PORTSDIR}/devel/tinylaf	\
 		${JAVALIBDIR}/jcmdline.jar:${PORTSDIR}/devel/jcmdline	\
+		${JAVALIBDIR}/xml-apis.jar:${PORTSDIR}/textproc/xerces-j	\
 		${JAVALIBDIR}/jasperreports.jar:${PORTSDIR}/databases/jasperreports
 
 USE_JAVA=	yes
@@ -28,19 +31,25 @@ NO_BUILD=	yes
 
 PLIST_SUB=	VER=${PORTVERSION} VERMAN=0.2.0
 
-JARFILES=	groovy-all-1.0-beta-10.jar iReport.jar jdt-compiler.jar		\
-		jr-bsh-compiler.jar jr-groovy-compiler.jar pngencoder.jar	\
-		barbecue-1.1.jar LICENSE.barbecue-1.1.txt
-
-BASEFILES=	Changelog.txt relnotes${PORTVERSION}.html
+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
+BASEFILES=	Changelog.txt notice.txt relnotes${PORTVERSION}.html
 SUBDIRS=	fonts plugins templates
 
 # Jarfiles to be included in classpath
-CLSSPTH=	barbecue-1.1 bsh commons-beanutils commons-collections commons-digester	\
-		commons-logging-api commons-logging groovy-all-1.0-beta-10 iReport	\
-		itext jasperreports jcmdline jcommon jdt-compiler jfreechart		\
-		jr-bsh-compiler jr-groovy-compiler log4j looks mysql-connector-java	\
-		postgresql poi tinylaf xalan xercesImpl xmlParserAPIs pngencoder
+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		\
+		jexelapiexporter-jr120 jfreechart jr-bsh-compiler	\
+		jr-groovy-compiler jta jxl log4j looks			\
+		mysql-connector-java pngencoder poi postgresql tinylaf	\
+		toniclf xalan xercesImpl xml-apis ${CLSSHSQLDB}
 
 .if !defined(NOPORTDOCS)
 SUBDIRS+=	docs
@@ -48,7 +57,7 @@ SUBDIRS+=	docs
 
 .include <bsd.port.pre.mk>
 
-# Remark: Oracle's dependencies already registered by databases/jasperreports
+# Remark: HSQLDB and Oracle's dependencies already registered by databases/jasperreports
 .if exists(${JAVALIBDIR}/classes12.zip)
 WITH_ORACLE8=	yes
 .endif
@@ -56,13 +65,20 @@ WITH_ORACLE8=	yes
 CLSSORA=	classes12.zip nls_charset12.zip
 .endif
 
-.if exists(${JAVALIBDIR}/ojdbc14.zip)
+.if exists(${JAVALIBDIR}/ojdbc14.jar)
 WITH_ORACLE9=	yes
 .endif
 .if defined(WITH_ORACLE9)
 CLSSORA+=	ojdbc14.jar ocrs12.zip
 .endif
 
+.if exists(${JAVALIBDIR}/hsqldb.jar)
+WITH_HSQLDB=	yes
+.endif
+.if defined(WITH_HSQLDB)
+CLSSHSQLDB=	hsqldb
+.endif
+
 post-extract:
 	@${FIND} ${WRKSRC} -name "*.bat" -exec ${RM} {} \;
 	@${MV} ${WRKSRC}/lib/LICENSE.barbecue.txt ${WRKSRC}/lib/LICENSE.barbecue-1.1.txt
diff --git a/devel/ireport/distinfo b/devel/ireport/distinfo
index 3dfc267b529c..32707b12088a 100644
--- a/devel/ireport/distinfo
+++ b/devel/ireport/distinfo
@@ -1,3 +1,3 @@
-MD5 (iReport-1.1.0.tar.gz) = f9eed85abfb69cddf9c1ff70ee0afc27
-SHA256 (iReport-1.1.0.tar.gz) = 296c549d637e69317bb3a0bcfba9407c623ac036a3e4f76f260a809b1ba63ef6
-SIZE (iReport-1.1.0.tar.gz) = 17541294
+MD5 (iReport-1.2.0.tar.gz) = 73b289bf6b63f01cd0f100b781d2fe18
+SHA256 (iReport-1.2.0.tar.gz) = 76d848e6081b380149cc5d9a57c11c7b8978187b0119ad15e7f7148cfb24af51
+SIZE (iReport-1.2.0.tar.gz) = 21658359
diff --git a/devel/ireport/pkg-plist b/devel/ireport/pkg-plist
index 1ab20b99189e..3f2811679e72 100644
--- a/devel/ireport/pkg-plist
+++ b/devel/ireport/pkg-plist
@@ -8,15 +8,19 @@ bin/iReport
 %%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
@@ -82,7 +86,7 @@ bin/iReport
 %%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/manual0.4.1.html
+%%PORTDOCS%%%%DATADIR%%/docs/manualtoc.html
 %%DATADIR%%/fonts/Balker.ttf
 %%DATADIR%%/fonts/Domestic_Manners.ttf
 %%DATADIR%%/fonts/Dustismo.ttf
@@ -105,6 +109,7 @@ bin/iReport
 %%DATADIR%%/fonts/progenisis.ttf
 @exec ln -sf %D/%%JAVAJARDIR%% %D/%%DATADIR%%/lib
 @unexec rm -f %D/%%DATADIR%%/lib
+%%DATADIR%%/notice.txt
 %%DATADIR%%/plugins/checkupdate.xml
 %%DATADIR%%/plugins/example_1.xml
 %%DATADIR%%/plugins/massive_compiler.xml
@@ -125,14 +130,26 @@ bin/iReport
 %%DATADIR%%/templates/grayT.xml
 %%DATADIR%%/templates/gray_landscapeT.gif
 %%DATADIR%%/templates/gray_landscapeT.xml
+%%JAVAJARDIR%%/LICENSE.asm-attr.txt
+%%JAVAJARDIR%%/LICENSE.asm.txt
 %%JAVAJARDIR%%/LICENSE.barbecue-1.1.txt
+%%JAVAJARDIR%%/LICENSE.jta.txt
+%%JAVAJARDIR%%/asm-attrs.jar
+%%JAVAJARDIR%%/asm.jar
 %%JAVAJARDIR%%/barbecue-1.1.jar
+%%JAVAJARDIR%%/cglib-2.1.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%%/jexelapiexporter-jr120.jar
 %%JAVAJARDIR%%/jr-bsh-compiler.jar
 %%JAVAJARDIR%%/jr-groovy-compiler.jar
+%%JAVAJARDIR%%/jta.jar
+%%JAVAJARDIR%%/jxl.jar
 %%JAVAJARDIR%%/pngencoder.jar
+%%JAVAJARDIR%%/toniclf.jar
 @dirrm %%DATADIR%%/templates
 @dirrm %%DATADIR%%/plugins
 @dirrm %%DATADIR%%/fonts