kpriv/pkgsrc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Bump PKGREVISION

Browse source 
* Disable JavaScript scripting (macro) support, it conflicts with
  OpenJDK7's Rhino JavaScript support. Use beanshell or Python.
* Remove redundant CONFIGURE_ARGS
This commit is contained in:
ryoon 2014-06-03 03:21:39 +00:00
parent 18557a79c1
commit e79124fd25
4 changed files with 12 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
misc/libreoffice4/Makefile
View file

@ -1,9 +1,9 @@
# $NetBSD: Makefile,v 1.27 2014/05/29 23:36:58 wiz Exp $
# $NetBSD: Makefile,v 1.28 2014/06/03 03:21:39 ryoon Exp $
VER= 4.2.4.2
DISTNAME= libreoffice-${VER}
PKGNAME= libreoffice4-${VER}
PKGREVISION= 2
PKGREVISION= 3
CATEGORIES= misc
MASTER_SITES= http://download.documentfoundation.org/libreoffice/src/4.2.4/
EXTRACT_SUFX= .tar.xz
@ -58,7 +58,6 @@ MORE_DISTFILES= \
3c219630e4302863a9a83d0efde889db-commons-logging-1.1.1-src.tar.gz \
46e92b68e31e858512b680b3b61dc4c1-mythes-1.2.3.tar.gz \
36271d3fa0d9dec1632029b6d7aac925-liblangtag-0.5.1.tar.bz2 \
798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip \
7a15edea7d415ac5150ea403e27401fd-open-sans-font-ttf-1.10.tar.gz \
8ce2fcd72becf06c41f7201d15373ed9-librepository-1.1.6.zip \
97b2d4dba862397f446b217e2b623e71-libloader-1.1.6.zip \
@ -155,9 +154,6 @@ CONFIGURE_ARGS+= --with-parallelism=${MAKE_JOBS:Q}
CONFIGURE_ARGS+= --with-boost-libdir=${BUILDLINK_PREFIX.boost-libs}/lib
CONFIGURE_ARGS+= --with-system-libs
CONFIGURE_ARGS+= --with-system-dicts
CONFIGURE_ARGS+= --enable-scripting-beanshell
CONFIGURE_ARGS+= --without-system-beanshell
CONFIGURE_ARGS+= --enable-scripting-javascript
# internal vigra should be used because only header files are used.
CONFIGURE_ARGS+= --without-system-vigra
CONFIGURE_ARGS+= --with-vendor="pkgsrc"

12
misc/libreoffice4/PLIST.java
View file

@ -1,8 +1,7 @@
@comment $NetBSD: PLIST.java,v 1.3 2014/02/02 07:43:40 ryoon Exp $
@comment $NetBSD: PLIST.java,v 1.4 2014/06/03 03:21:39 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/commons-logging-1.1.1.jar
@ -10,7 +9,6 @@ ${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/js.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
@ -34,7 +32,6 @@ ${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
@ -56,13 +53,6 @@ ${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

5
misc/libreoffice4/distinfo
View file

@ -1,4 +1,4 @@
$NetBSD: distinfo,v 1.17 2014/06/01 14:31:08 ryoon Exp $
$NetBSD: distinfo,v 1.18 2014/06/03 03:21:39 ryoon Exp $
SHA1 (libreoffice/0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz) = 452eba922e4f41603539c9dc39947d2271e47093
RMD160 (libreoffice/0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz) = dbeb7a7f8c89961ca2e544b810345d025561866b
@ -66,9 +66,6 @@ Size (libreoffice/5c781723a0d9ed6188960defba8e91cf-liberation-fonts-ttf-2.00.1.t
SHA1 (libreoffice/625ff5f2f968dd908bca43c9469d6e6b-commons-lang-2.4-src.tar.gz) = 61ec8be8c2cf8f4c4272545666f936dd9f7e2a29
RMD160 (libreoffice/625ff5f2f968dd908bca43c9469d6e6b-commons-lang-2.4-src.tar.gz) = c474272aa3ebf7147a3cf6a59cfa97fa33979c9e
Size (libreoffice/625ff5f2f968dd908bca43c9469d6e6b-commons-lang-2.4-src.tar.gz) = 522654 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

14
misc/libreoffice4/options.mk
View file

@ -1,4 +1,4 @@
# $NetBSD: options.mk,v 1.5 2014/05/29 23:03:55 wiz Exp $
# $NetBSD: options.mk,v 1.6 2014/06/03 03:21:39 ryoon Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.libreoffice4
PKG_SUPPORTED_OPTIONS= java debug kde4 gtk3
@ -17,17 +17,19 @@ USE_JAVA= yes
USE_JAVA2= yes
BUILD_DEPENDS+= apache-ant-[0-9]*:../../devel/apache-ant
FIND_PREFIX:= ANTDIR=apache-ant
CONFIGURE_ARGS+= --with-ant-home=${ANTDIR}
DEPENDS+= hsqldb18-[0-9]*:../../databases/hsqldb18
FIND_PREFIX:= HSQLDB_SYSDIR=hsqldb18
FIND_PREFIX+= HSQLDB_SYSDIR=hsqldb18
CONFIGURE_ARGS+= --with-hsqldb-jar=${HSQLDB_SYSDIR}/lib/java/hsqldb18/hsqldb.jar
.include "../../mk/find-prefix.mk"
CONFIGURE_ARGS+= --enable-ext-wiki-publisher \
--with-java \
--with-jdk-home=${PKG_JAVA_HOME} \
--with-ant-home=${ANTDIR} \
--without-system-beanshell \
--enable-scripting-beanshell \
--enable-scripting-javascript \
--with-system-hsqldb \
--with-hsqldb-jar=${HSQLDB_SYSDIR}/lib/java/hsqldb18/hsqldb.jar
--disable-scripting-javascript \
--with-system-hsqldb
.include "../../mk/java-env.mk"
.include "../../mk/java-vm.mk"
PLIST_SRC+= ${PLIST_SRC_DFLT:Q} PLIST.java