Bump PKGREVISION.

* Enable report builder with jfreereport.

3 files changed, 65 insertions, 6 deletions

diff --git a/misc/libreoffice4/Makefile b/misc/libreoffice4/Makefile
index 2135b800d46..258d691b701 100644
--- a/misc/libreoffice4/Makefile
+++ b/misc/libreoffice4/Makefile
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.74 2015/07/16 11:55:26 ryoon Exp $
+# $NetBSD: Makefile,v 1.75 2015/07/30 21:56:30 ryoon Exp $
 
 VERREL=		4.4.4
 VERRC=		3
 VER=		${VERREL}.${VERRC}
 DISTNAME=	libreoffice-${VER}
 PKGNAME=	libreoffice4-${VER}
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	misc
 MASTER_SITES=	http://download.documentfoundation.org/libreoffice/src/${VERREL}/
 EXTRACT_SUFX=	.tar.xz
diff --git a/misc/libreoffice4/PLIST.java b/misc/libreoffice4/PLIST.java
index 39dca17008f..5d3efe95ce0 100644
--- a/misc/libreoffice4/PLIST.java
+++ b/misc/libreoffice4/PLIST.java
@@ -1,14 +1,28 @@
-@comment $NetBSD: PLIST.java,v 1.8 2015/03/12 15:01:25 ryoon Exp $
+@comment $NetBSD: PLIST.java,v 1.9 2015/07/30 21:56:30 ryoon Exp $
 ${PKGNAME}/program/classes/ScriptFramework.jar
 ${PKGNAME}/program/classes/ScriptProviderForBeanShell.jar
 ${PKGNAME}/program/classes/ScriptProviderForJava.jar
 ${PKGNAME}/program/classes/XMergeBridge.jar
 ${PKGNAME}/program/classes/bsh.jar
+${PKGNAME}/program/classes/commons-logging-1.2.jar
 ${PKGNAME}/program/classes/commonwizards.jar
+${PKGNAME}/program/classes/flow-engine.jar
+${PKGNAME}/program/classes/flute-1.1.6.jar
 ${PKGNAME}/program/classes/form.jar
+${PKGNAME}/program/classes/libbase-1.1.6.jar
+${PKGNAME}/program/classes/libfonts-1.1.6.jar
+${PKGNAME}/program/classes/libformula-1.1.7.jar
+${PKGNAME}/program/classes/liblayout.jar
+${PKGNAME}/program/classes/libloader-1.1.6.jar
+${PKGNAME}/program/classes/librepository-1.1.6.jar
+${PKGNAME}/program/classes/libserializer-1.1.6.jar
+${PKGNAME}/program/classes/libxml-1.1.7.jar
 ${PKGNAME}/program/classes/officebean.jar
 ${PKGNAME}/program/classes/query.jar
 ${PKGNAME}/program/classes/report.jar
+${PKGNAME}/program/classes/reportbuilder.jar
+${PKGNAME}/program/classes/reportbuilderwizard.jar
+${PKGNAME}/program/classes/sac.jar
 ${PKGNAME}/program/classes/sdbc_hsqldb.jar
 ${PKGNAME}/program/classes/smoketest.jar
 ${PKGNAME}/program/classes/table.jar
@@ -17,6 +31,9 @@ ${PKGNAME}/program/classes/xmerge.jar
 ${PKGNAME}/program/libhsqldb.so
 ${PKGNAME}/program/libjdbclo.so
 ${PKGNAME}/program/libofficebean.so
+${PKGNAME}/program/librptlo.so
+${PKGNAME}/program/librptuilo.so
+${PKGNAME}/program/librptxmllo.so
 ${PKGNAME}/program/services/scriptproviderforbeanshell.rdb
 ${PKGNAME}/share/Scripts/beanshell/Capitalise/capitalise.bsh
 ${PKGNAME}/share/Scripts/beanshell/Capitalise/parcel-descriptor.xml
@@ -2720,6 +2737,48 @@ ${PKGNAME}/share/extensions/wiki-publisher/license/THIRDPARTYLICENSEREADME.html
 ${PKGNAME}/share/extensions/wiki-publisher/mediawiki.jar
 ${PKGNAME}/share/extensions/wiki-publisher/registration/LICENSE
 ${PKGNAME}/share/extensions/wiki-publisher/templates/MediaWiki/mediawiki.ott
+${PKGNAME}/share/man/man1/libreoffice.1
+${PKGNAME}/share/man/man1/libreoffice.1.gz
+${PKGNAME}/share/man/man1/lobase.1
+${PKGNAME}/share/man/man1/lobase.1.gz
+${PKGNAME}/share/man/man1/localc.1
+${PKGNAME}/share/man/man1/localc.1.gz
+${PKGNAME}/share/man/man1/lodraw.1
+${PKGNAME}/share/man/man1/lodraw.1.gz
+${PKGNAME}/share/man/man1/loffice.1
+${PKGNAME}/share/man/man1/loffice.1.gz
+${PKGNAME}/share/man/man1/lofromtemplate.1
+${PKGNAME}/share/man/man1/lofromtemplate.1.gz
+${PKGNAME}/share/man/man1/loimpress.1
+${PKGNAME}/share/man/man1/loimpress.1.gz
+${PKGNAME}/share/man/man1/lomath.1
+${PKGNAME}/share/man/man1/lomath.1.gz
+${PKGNAME}/share/man/man1/loweb.1
+${PKGNAME}/share/man/man1/loweb.1.gz
+${PKGNAME}/share/man/man1/lowriter.1
+${PKGNAME}/share/man/man1/lowriter.1.gz
+${PKGNAME}/share/man/man1/oobase.1
+${PKGNAME}/share/man/man1/oobase.1.gz
+${PKGNAME}/share/man/man1/oocalc.1
+${PKGNAME}/share/man/man1/oocalc.1.gz
+${PKGNAME}/share/man/man1/oodraw.1
+${PKGNAME}/share/man/man1/oodraw.1.gz
+${PKGNAME}/share/man/man1/ooffice.1
+${PKGNAME}/share/man/man1/ooffice.1.gz
+${PKGNAME}/share/man/man1/oofromtemplate.1
+${PKGNAME}/share/man/man1/oofromtemplate.1.gz
+${PKGNAME}/share/man/man1/ooimpress.1
+${PKGNAME}/share/man/man1/ooimpress.1.gz
+${PKGNAME}/share/man/man1/oomath.1
+${PKGNAME}/share/man/man1/oomath.1.gz
+${PKGNAME}/share/man/man1/ooweb.1
+${PKGNAME}/share/man/man1/ooweb.1.gz
+${PKGNAME}/share/man/man1/oowriter.1
+${PKGNAME}/share/man/man1/oowriter.1.gz
+${PKGNAME}/share/man/man1/unopkg.1
+${PKGNAME}/share/man/man1/unopkg.1.gz
+${PKGNAME}/share/registry/reportbuilder.xcd
+${PKGNAME}/share/template/common/wizard/report/default.otr
 ${PKGNAME}/ure/bin/javaldx
 ${PKGNAME}/ure/lib/JREProperties.class
 ${PKGNAME}/ure/lib/libjava_uno.so
diff --git a/misc/libreoffice4/options.mk b/misc/libreoffice4/options.mk
index 2aa46444dd6..6535c2e0f03 100644
--- a/misc/libreoffice4/options.mk
+++ b/misc/libreoffice4/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.10 2015/03/16 18:16:26 ryoon Exp $
+# $NetBSD: options.mk,v 1.11 2015/07/30 21:56:30 ryoon Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.libreoffice4
 PKG_SUPPORTED_OPTIONS=	java debug kde4 gtk3
@@ -30,8 +30,8 @@ CONFIGURE_ARGS+=	--enable-ext-wiki-publisher \
 			--with-jdk-home=${PKG_JAVA_HOME} \
 			--without-system-beanshell \
 			--enable-scripting-beanshell \
-			--disable-report-builder \
-			--with-system-hsqldb
+			--with-system-hsqldb \
+			--without-system-jfreereport
 PLIST_SRC+=		${PLIST_SRC_DFLT:Q} ${PKGDIR}/PLIST.java
 .  if !empty(PKG_JVM:Mopenjdk7)
 CONFIGURE_ARGS+=	--disable-scripting-javascript