Bump PKGREVISION.

* Enable JavaScript scriptiong support in non-openjdk7 case.

5 files changed, 37 insertions, 8 deletions

diff --git a/misc/libreoffice4/Makefile b/misc/libreoffice4/Makefile
index 2d5a2b14174..d64bbfe229c 100644
--- a/misc/libreoffice4/Makefile
+++ b/misc/libreoffice4/Makefile
@@ -1,10 +1,11 @@
-# $NetBSD: Makefile,v 1.61 2015/02/28 04:47:34 ryoon Exp $
+# $NetBSD: Makefile,v 1.62 2015/03/03 21:39:13 ryoon Exp $
 
 VERREL=		4.4.1
 VERRC=		2
 VER=		${VERREL}.${VERRC}
 DISTNAME=	libreoffice-${VER}
 PKGNAME=	libreoffice4-${VER}
+PKGREVISION=	1
 CATEGORIES=	misc
 MASTER_SITES=	http://download.documentfoundation.org/libreoffice/src/${VERREL}/
 EXTRACT_SUFX=	.tar.xz
@@ -83,7 +84,8 @@ MORE_DISTFILES= \
 	368f114c078f94214a308a74c7e991bc-crosextrafonts-20130214.tar.gz \
 	OpenCOLLADA-master-6509aa13af.tar.bz2 \
 	CoinMP-1.7.6.tgz \
-	c74b7223abe75949b4af367942d96c7a-crosextrafonts-carlito-20130920.tar.gz
+	c74b7223abe75949b4af367942d96c7a-crosextrafonts-carlito-20130920.tar.gz \
+	798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip
 
 .for md in ${MORE_DISTFILES}
 DISTFILES+=		${md}
diff --git a/misc/libreoffice4/PLIST.java b/misc/libreoffice4/PLIST.java
index 93bb99f2f55..bdf3992840d 100644
--- a/misc/libreoffice4/PLIST.java
+++ b/misc/libreoffice4/PLIST.java
@@ -1,11 +1,13 @@
-@comment $NetBSD: PLIST.java,v 1.6 2015/02/04 18:19:34 ryoon Exp $
+@comment $NetBSD: PLIST.java,v 1.7 2015/03/03 21:39:13 ryoon Exp $
 ${PKGNAME}/program/classes/ScriptFramework.jar
 ${PKGNAME}/program/classes/ScriptProviderForBeanShell.jar
 ${PKGNAME}/program/classes/ScriptProviderForJava.jar
+${PKGNAME}/program/classes/ScriptProviderForJavaScript.jar
 ${PKGNAME}/program/classes/XMergeBridge.jar
 ${PKGNAME}/program/classes/bsh.jar
 ${PKGNAME}/program/classes/commonwizards.jar
 ${PKGNAME}/program/classes/form.jar
+${PKGNAME}/program/classes/js.jar
 ${PKGNAME}/program/classes/officebean.jar
 ${PKGNAME}/program/classes/query.jar
 ${PKGNAME}/program/classes/report.jar
@@ -18,6 +20,7 @@ ${PKGNAME}/program/libhsqldb.so
 ${PKGNAME}/program/libjdbclo.so
 ${PKGNAME}/program/libofficebean.so
 ${PKGNAME}/program/services/scriptproviderforbeanshell.rdb
+${PKGNAME}/program/services/scriptproviderforjavascript.rdb
 ${PKGNAME}/share/Scripts/beanshell/Capitalise/capitalise.bsh
 ${PKGNAME}/share/Scripts/beanshell/Capitalise/parcel-descriptor.xml
 ${PKGNAME}/share/Scripts/beanshell/HelloWorld/helloworld.bsh
@@ -39,6 +42,13 @@ ${PKGNAME}/share/Scripts/java/Highlight/parcel-descriptor.xml
 ${PKGNAME}/share/Scripts/java/MemoryUsage/MemoryUsage.jar
 ${PKGNAME}/share/Scripts/java/MemoryUsage/MemoryUsage.java
 ${PKGNAME}/share/Scripts/java/MemoryUsage/parcel-descriptor.xml
+${PKGNAME}/share/Scripts/javascript/ExportSheetsToHTML/exportsheetstohtml.js
+${PKGNAME}/share/Scripts/javascript/ExportSheetsToHTML/parcel-descriptor.xml
+${PKGNAME}/share/Scripts/javascript/HelloWorld/helloworld.js
+${PKGNAME}/share/Scripts/javascript/HelloWorld/parcel-descriptor.xml
+${PKGNAME}/share/Scripts/javascript/Highlight/ButtonPressHandler.js
+${PKGNAME}/share/Scripts/javascript/Highlight/ShowDialog.js
+${PKGNAME}/share/Scripts/javascript/Highlight/parcel-descriptor.xml
 ${PKGNAME}/share/extensions/nlpsolver/EvolutionarySolver.jar
 ${PKGNAME}/share/extensions/nlpsolver/META-INF/manifest.xml
 ${PKGNAME}/share/extensions/nlpsolver/components.rdb
diff --git a/misc/libreoffice4/PLIST.javascript b/misc/libreoffice4/PLIST.javascript
new file mode 100644
index 00000000000..a2d77a3dfa2
--- /dev/null
+++ b/misc/libreoffice4/PLIST.javascript
@@ -0,0 +1,10 @@
+${PKGNAME}/program/classes/ScriptProviderForJavaScript.jar
+${PKGNAME}/program/classes/js.jar
+${PKGNAME}/program/services/scriptproviderforjavascript.rdb
+${PKGNAME}/share/Scripts/javascript/ExportSheetsToHTML/exportsheetstohtml.js
+${PKGNAME}/share/Scripts/javascript/ExportSheetsToHTML/parcel-descriptor.xml
+${PKGNAME}/share/Scripts/javascript/HelloWorld/helloworld.js
+${PKGNAME}/share/Scripts/javascript/HelloWorld/parcel-descriptor.xml
+${PKGNAME}/share/Scripts/javascript/Highlight/ButtonPressHandler.js
+${PKGNAME}/share/Scripts/javascript/Highlight/ShowDialog.js
+${PKGNAME}/share/Scripts/javascript/Highlight/parcel-descriptor.xml
diff --git a/misc/libreoffice4/distinfo b/misc/libreoffice4/distinfo
index f61b2be293d..569db116f0d 100644
--- a/misc/libreoffice4/distinfo
+++ b/misc/libreoffice4/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.35 2015/02/28 04:47:35 ryoon Exp $
+$NetBSD: distinfo,v 1.36 2015/03/03 21:39:13 ryoon Exp $
 
 SHA1 (libreoffice/0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz) = 452eba922e4f41603539c9dc39947d2271e47093
 RMD160 (libreoffice/0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz) = dbeb7a7f8c89961ca2e544b810345d025561866b
@@ -63,6 +63,9 @@ Size (libreoffice/46eb0e7f213ad61bd5dee0c494132cb0-libwps-0.2.9.tar.bz2) = 47420
 SHA1 (libreoffice/5c781723a0d9ed6188960defba8e91cf-liberation-fonts-ttf-2.00.1.tar.gz) = 84b40d7f8bb0cd085dd70b3abed197133d761557
 RMD160 (libreoffice/5c781723a0d9ed6188960defba8e91cf-liberation-fonts-ttf-2.00.1.tar.gz) = 99ee3851f3f1ae9a431541de5765312f01ef19d7
 Size (libreoffice/5c781723a0d9ed6188960defba8e91cf-liberation-fonts-ttf-2.00.1.tar.gz) = 2285857 bytes
+SHA1 (libreoffice/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip) = 8a90669029e107b61953b90ba11545fef586c2ca
+RMD160 (libreoffice/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip) = 68e248ec03675458f0536282ef250efa42c4c154
+Size (libreoffice/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip) = 1521926 bytes
 SHA1 (libreoffice/7a15edea7d415ac5150ea403e27401fd-open-sans-font-ttf-1.10.tar.gz) = 8896e0e17c66d2ed134faa5f8b95794334b81f80
 RMD160 (libreoffice/7a15edea7d415ac5150ea403e27401fd-open-sans-font-ttf-1.10.tar.gz) = 46384cde5caf553206290a7c174297db0b98cc5a
 Size (libreoffice/7a15edea7d415ac5150ea403e27401fd-open-sans-font-ttf-1.10.tar.gz) = 466545 bytes
diff --git a/misc/libreoffice4/options.mk b/misc/libreoffice4/options.mk
index a320b671486..d89d7ab4c53 100644
--- a/misc/libreoffice4/options.mk
+++ b/misc/libreoffice4/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.8 2015/02/04 18:19:34 ryoon Exp $
+# $NetBSD: options.mk,v 1.9 2015/03/03 21:39:13 ryoon Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.libreoffice4
 PKG_SUPPORTED_OPTIONS=	java debug kde4 gtk3
@@ -9,6 +9,8 @@ PKG_SUGGESTED_OPTIONS=	java
 .endif
 
 .include "../../mk/bsd.options.mk"
+.include "../../mk/java-env.mk"
+.include "../../mk/java-vm.mk"
 
 PLIST_VARS+=	java kde4 gtk3
 
@@ -28,12 +30,14 @@ CONFIGURE_ARGS+=	--enable-ext-wiki-publisher \
 			--with-jdk-home=${PKG_JAVA_HOME} \
 			--without-system-beanshell \
 			--enable-scripting-beanshell \
-			--disable-scripting-javascript \
 			--disable-report-builder \
 			--with-system-hsqldb
-.include "../../mk/java-env.mk"
-.include "../../mk/java-vm.mk"
 PLIST_SRC+=		${PLIST_SRC_DFLT:Q} ${PKGDIR}/PLIST.java
+.  if !empty(PKG_JVM:Mopenjdk7)
+CONFIGURE_ARGS+=	--disable-scripting-javascript
+.  else
+PLIST_SRC+=		${PKGDIR}/PLIST.javascript
+.  endif
 PLIST.java=		yes
 .else
 CONFIGURE_ARGS+=	--without-java