Upgrade to 1.1.0.

Remove dependency on graphics/barbecue (newer): must install the
included barbecue.jar.

Changelog at:
<http://sourceforge.net/project/shownotes.php?group_id=64348&release_id=390352>

3 files changed, 13 insertions, 12 deletions

diff --git a/devel/ireport/Makefile b/devel/ireport/Makefile
index cf320b5bee59..98b8274d1d38 100644
--- a/devel/ireport/Makefile
+++ b/devel/ireport/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	ireport
-PORTVERSION=	0.5.3
+PORTVERSION=	1.1.0
 CATEGORIES=	devel databases java
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -20,28 +20,27 @@ RUN_DEPENDS=	java:${PORTSDIR}/java/javavmwrapper	\
 		${JAVALIBDIR}/looks.jar:${PORTSDIR}/devel/looks	\
 		${JAVALIBDIR}/tinylaf.jar:${PORTSDIR}/devel/tinylaf	\
 		${JAVALIBDIR}/jcmdline.jar:${PORTSDIR}/devel/jcmdline	\
-		${JAVALIBDIR}/barbecue.jar:${PORTSDIR}/graphics/barbecue	\
 		${JAVALIBDIR}/jasperreports.jar:${PORTSDIR}/databases/jasperreports
 
 USE_JAVA=	yes
 JAVA_VERSION=	1.4+
-USE_REINPLACE=	yes
 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
+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
 SUBDIRS=	fonts plugins templates
 
 # Jarfiles to be included in classpath
-CLSSPTH=	barbecue bsh commons-beanutils commons-collections commons-digester	\
+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
+		postgresql poi tinylaf xalan xercesImpl xmlParserAPIs pngencoder
 
 .if !defined(NOPORTDOCS)
 SUBDIRS+=	docs
@@ -66,8 +65,7 @@ CLSSORA+=	ojdbc14.jar ocrs12.zip
 
 post-extract:
 	@${FIND} ${WRKSRC} -name "*.bat" -exec ${RM} {} \;
-	@${RMDIR} -p ${WRKSRC}/docs/releases/Release0.3.2/Release\ Document\ 0.3.2_files	\
-		2>/dev/null | ${TRUE}
+	@${MV} ${WRKSRC}/lib/LICENSE.barbecue.txt ${WRKSRC}/lib/LICENSE.barbecue-1.1.txt
 
 pre-configure:
 	@${REINPLACE_CMD} -e 's|%%CLSSPTH%%|${CLSSPTH:S,^,${JAVALIBDIR}/,g:S,$,.jar£,g}|;	\
diff --git a/devel/ireport/distinfo b/devel/ireport/distinfo
index f11bf2b164f0..3dfc267b529c 100644
--- a/devel/ireport/distinfo
+++ b/devel/ireport/distinfo
@@ -1,3 +1,3 @@
-MD5 (iReport-0.5.3.tar.gz) = 85a096d008ab80cd6cfc4499cf9b8332
-SHA256 (iReport-0.5.3.tar.gz) = 5fb9bbf4c679acfa5a8220f5709d1ec8cbeee1fa3dc6ed998a76e208912bd360
-SIZE (iReport-0.5.3.tar.gz) = 17137421
+MD5 (iReport-1.1.0.tar.gz) = f9eed85abfb69cddf9c1ff70ee0afc27
+SHA256 (iReport-1.1.0.tar.gz) = 296c549d637e69317bb3a0bcfba9407c623ac036a3e4f76f260a809b1ba63ef6
+SIZE (iReport-1.1.0.tar.gz) = 17541294
diff --git a/devel/ireport/pkg-plist b/devel/ireport/pkg-plist
index a112d645d1df..1ab20b99189e 100644
--- a/devel/ireport/pkg-plist
+++ b/devel/ireport/pkg-plist
@@ -125,11 +125,14 @@ bin/iReport
 %%DATADIR%%/templates/grayT.xml
 %%DATADIR%%/templates/gray_landscapeT.gif
 %%DATADIR%%/templates/gray_landscapeT.xml
+%%JAVAJARDIR%%/LICENSE.barbecue-1.1.txt
+%%JAVAJARDIR%%/barbecue-1.1.jar
 %%JAVAJARDIR%%/groovy-all-1.0-beta-10.jar
 %%JAVAJARDIR%%/iReport.jar
 %%JAVAJARDIR%%/jdt-compiler.jar
 %%JAVAJARDIR%%/jr-bsh-compiler.jar
 %%JAVAJARDIR%%/jr-groovy-compiler.jar
+%%JAVAJARDIR%%/pngencoder.jar
 @dirrm %%DATADIR%%/templates
 @dirrm %%DATADIR%%/plugins
 @dirrm %%DATADIR%%/fonts