Thu Jul 30 21:56:30 2015 UTC ()
Bump PKGREVISION.

* Enable report builder with jfreereport.


(ryoon)
diff -r1.74 -r1.75 pkgsrc/misc/libreoffice4/Makefile
diff -r1.8 -r1.9 pkgsrc/misc/libreoffice4/PLIST.java
diff -r1.10 -r1.11 pkgsrc/misc/libreoffice4/options.mk
cvs diff -r1.74 -r1.75 pkgsrc/misc/libreoffice4/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/misc/libreoffice4/Attic/Makefile 2015/07/16 11:55:26 1.74
+++ pkgsrc/misc/libreoffice4/Attic/Makefile 2015/07/30 21:56:30 1.75
@@ -1,21 +1,21 @@ @@ -1,21 +1,21 @@
1# $NetBSD: Makefile,v 1.74 2015/07/16 11:55:26 ryoon Exp $ 1# $NetBSD: Makefile,v 1.75 2015/07/30 21:56:30 ryoon Exp $
2 2
3VERREL= 4.4.4 3VERREL= 4.4.4
4VERRC= 3 4VERRC= 3
5VER= ${VERREL}.${VERRC} 5VER= ${VERREL}.${VERRC}
6DISTNAME= libreoffice-${VER} 6DISTNAME= libreoffice-${VER}
7PKGNAME= libreoffice4-${VER} 7PKGNAME= libreoffice4-${VER}
8PKGREVISION= 1 8PKGREVISION= 2
9CATEGORIES= misc 9CATEGORIES= misc
10MASTER_SITES= http://download.documentfoundation.org/libreoffice/src/${VERREL}/ 10MASTER_SITES= http://download.documentfoundation.org/libreoffice/src/${VERREL}/
11EXTRACT_SUFX= .tar.xz 11EXTRACT_SUFX= .tar.xz
12 12
13MAINTAINER= ryoon@NetBSD.org 13MAINTAINER= ryoon@NetBSD.org
14HOMEPAGE= http://www.libreoffice.org/ 14HOMEPAGE= http://www.libreoffice.org/
15COMMENT= Office productivity suite, 4.x branch 15COMMENT= Office productivity suite, 4.x branch
16LICENSE= gnu-lgpl-v3 16LICENSE= gnu-lgpl-v3
17 17
18# With -O2, when preference window is opened, soffice.bin crashes with SIGFPE. 18# With -O2, when preference window is opened, soffice.bin crashes with SIGFPE.
19.include "../../mk/bsd.prefs.mk" 19.include "../../mk/bsd.prefs.mk"
20.if !empty(MACHINE_PLATFORM:MNetBSD-5.*) 20.if !empty(MACHINE_PLATFORM:MNetBSD-5.*)
21BUILDLINK_TRANSFORM+= opt:-O2:-O 21BUILDLINK_TRANSFORM+= opt:-O2:-O
cvs diff -r1.8 -r1.9 pkgsrc/misc/libreoffice4/Attic/PLIST.java (expand / switch to unified diff)

--- pkgsrc/misc/libreoffice4/Attic/PLIST.java 2015/03/12 15:01:25 1.8
+++ pkgsrc/misc/libreoffice4/Attic/PLIST.java 2015/07/30 21:56:30 1.9
@@ -1,32 +1,49 @@ @@ -1,32 +1,49 @@
1@comment $NetBSD: PLIST.java,v 1.8 2015/03/12 15:01:25 ryoon Exp $ 1@comment $NetBSD: PLIST.java,v 1.9 2015/07/30 21:56:30 ryoon Exp $
2${PKGNAME}/program/classes/ScriptFramework.jar 2${PKGNAME}/program/classes/ScriptFramework.jar
3${PKGNAME}/program/classes/ScriptProviderForBeanShell.jar 3${PKGNAME}/program/classes/ScriptProviderForBeanShell.jar
4${PKGNAME}/program/classes/ScriptProviderForJava.jar 4${PKGNAME}/program/classes/ScriptProviderForJava.jar
5${PKGNAME}/program/classes/XMergeBridge.jar 5${PKGNAME}/program/classes/XMergeBridge.jar
6${PKGNAME}/program/classes/bsh.jar 6${PKGNAME}/program/classes/bsh.jar
 7${PKGNAME}/program/classes/commons-logging-1.2.jar
7${PKGNAME}/program/classes/commonwizards.jar 8${PKGNAME}/program/classes/commonwizards.jar
 9${PKGNAME}/program/classes/flow-engine.jar
 10${PKGNAME}/program/classes/flute-1.1.6.jar
8${PKGNAME}/program/classes/form.jar 11${PKGNAME}/program/classes/form.jar
 12${PKGNAME}/program/classes/libbase-1.1.6.jar
 13${PKGNAME}/program/classes/libfonts-1.1.6.jar
 14${PKGNAME}/program/classes/libformula-1.1.7.jar
 15${PKGNAME}/program/classes/liblayout.jar
 16${PKGNAME}/program/classes/libloader-1.1.6.jar
 17${PKGNAME}/program/classes/librepository-1.1.6.jar
 18${PKGNAME}/program/classes/libserializer-1.1.6.jar
 19${PKGNAME}/program/classes/libxml-1.1.7.jar
9${PKGNAME}/program/classes/officebean.jar 20${PKGNAME}/program/classes/officebean.jar
10${PKGNAME}/program/classes/query.jar 21${PKGNAME}/program/classes/query.jar
11${PKGNAME}/program/classes/report.jar 22${PKGNAME}/program/classes/report.jar
 23${PKGNAME}/program/classes/reportbuilder.jar
 24${PKGNAME}/program/classes/reportbuilderwizard.jar
 25${PKGNAME}/program/classes/sac.jar
12${PKGNAME}/program/classes/sdbc_hsqldb.jar 26${PKGNAME}/program/classes/sdbc_hsqldb.jar
13${PKGNAME}/program/classes/smoketest.jar 27${PKGNAME}/program/classes/smoketest.jar
14${PKGNAME}/program/classes/table.jar 28${PKGNAME}/program/classes/table.jar
15${PKGNAME}/program/classes/unoil.jar 29${PKGNAME}/program/classes/unoil.jar
16${PKGNAME}/program/classes/xmerge.jar 30${PKGNAME}/program/classes/xmerge.jar
17${PKGNAME}/program/libhsqldb.so 31${PKGNAME}/program/libhsqldb.so
18${PKGNAME}/program/libjdbclo.so 32${PKGNAME}/program/libjdbclo.so
19${PKGNAME}/program/libofficebean.so 33${PKGNAME}/program/libofficebean.so
 34${PKGNAME}/program/librptlo.so
 35${PKGNAME}/program/librptuilo.so
 36${PKGNAME}/program/librptxmllo.so
20${PKGNAME}/program/services/scriptproviderforbeanshell.rdb 37${PKGNAME}/program/services/scriptproviderforbeanshell.rdb
21${PKGNAME}/share/Scripts/beanshell/Capitalise/capitalise.bsh 38${PKGNAME}/share/Scripts/beanshell/Capitalise/capitalise.bsh
22${PKGNAME}/share/Scripts/beanshell/Capitalise/parcel-descriptor.xml 39${PKGNAME}/share/Scripts/beanshell/Capitalise/parcel-descriptor.xml
23${PKGNAME}/share/Scripts/beanshell/HelloWorld/helloworld.bsh 40${PKGNAME}/share/Scripts/beanshell/HelloWorld/helloworld.bsh
24${PKGNAME}/share/Scripts/beanshell/HelloWorld/parcel-descriptor.xml 41${PKGNAME}/share/Scripts/beanshell/HelloWorld/parcel-descriptor.xml
25${PKGNAME}/share/Scripts/beanshell/Highlight/ButtonPressHandler.bsh 42${PKGNAME}/share/Scripts/beanshell/Highlight/ButtonPressHandler.bsh
26${PKGNAME}/share/Scripts/beanshell/Highlight/ShowDialog.bsh 43${PKGNAME}/share/Scripts/beanshell/Highlight/ShowDialog.bsh
27${PKGNAME}/share/Scripts/beanshell/Highlight/highlighter.bsh 44${PKGNAME}/share/Scripts/beanshell/Highlight/highlighter.bsh
28${PKGNAME}/share/Scripts/beanshell/Highlight/parcel-descriptor.xml 45${PKGNAME}/share/Scripts/beanshell/Highlight/parcel-descriptor.xml
29${PKGNAME}/share/Scripts/beanshell/MemoryUsage/memusage.bsh 46${PKGNAME}/share/Scripts/beanshell/MemoryUsage/memusage.bsh
30${PKGNAME}/share/Scripts/beanshell/MemoryUsage/parcel-descriptor.xml 47${PKGNAME}/share/Scripts/beanshell/MemoryUsage/parcel-descriptor.xml
31${PKGNAME}/share/Scripts/beanshell/WordCount/parcel-descriptor.xml 48${PKGNAME}/share/Scripts/beanshell/WordCount/parcel-descriptor.xml
32${PKGNAME}/share/Scripts/beanshell/WordCount/wordcount.bsh 49${PKGNAME}/share/Scripts/beanshell/WordCount/wordcount.bsh
@@ -2710,26 +2727,68 @@ ${PKGNAME}/share/extensions/wiki-publish @@ -2710,26 +2727,68 @@ ${PKGNAME}/share/extensions/wiki-publish
2710${PKGNAME}/share/extensions/wiki-publisher/help/zu.done 2727${PKGNAME}/share/extensions/wiki-publisher/help/zu.done
2711${PKGNAME}/share/extensions/wiki-publisher/help/zu/help.db_ 2728${PKGNAME}/share/extensions/wiki-publisher/help/zu/help.db_
2712${PKGNAME}/share/extensions/wiki-publisher/help/zu/help.ht_ 2729${PKGNAME}/share/extensions/wiki-publisher/help/zu/help.ht_
2713${PKGNAME}/share/extensions/wiki-publisher/help/zu/help.idxl/_0.cfs 2730${PKGNAME}/share/extensions/wiki-publisher/help/zu/help.idxl/_0.cfs
2714${PKGNAME}/share/extensions/wiki-publisher/help/zu/help.idxl/segments.gen 2731${PKGNAME}/share/extensions/wiki-publisher/help/zu/help.idxl/segments.gen
2715${PKGNAME}/share/extensions/wiki-publisher/help/zu/help.idxl/segments_3 2732${PKGNAME}/share/extensions/wiki-publisher/help/zu/help.idxl/segments_3
2716${PKGNAME}/share/extensions/wiki-publisher/help/zu/help.jar 2733${PKGNAME}/share/extensions/wiki-publisher/help/zu/help.jar
2717${PKGNAME}/share/extensions/wiki-publisher/help/zu/help.key_ 2734${PKGNAME}/share/extensions/wiki-publisher/help/zu/help.key_
2718${PKGNAME}/share/extensions/wiki-publisher/help/zu/help.tree 2735${PKGNAME}/share/extensions/wiki-publisher/help/zu/help.tree
2719${PKGNAME}/share/extensions/wiki-publisher/license/THIRDPARTYLICENSEREADME.html 2736${PKGNAME}/share/extensions/wiki-publisher/license/THIRDPARTYLICENSEREADME.html
2720${PKGNAME}/share/extensions/wiki-publisher/mediawiki.jar 2737${PKGNAME}/share/extensions/wiki-publisher/mediawiki.jar
2721${PKGNAME}/share/extensions/wiki-publisher/registration/LICENSE 2738${PKGNAME}/share/extensions/wiki-publisher/registration/LICENSE
2722${PKGNAME}/share/extensions/wiki-publisher/templates/MediaWiki/mediawiki.ott 2739${PKGNAME}/share/extensions/wiki-publisher/templates/MediaWiki/mediawiki.ott
 2740${PKGNAME}/share/man/man1/libreoffice.1
 2741${PKGNAME}/share/man/man1/libreoffice.1.gz
 2742${PKGNAME}/share/man/man1/lobase.1
 2743${PKGNAME}/share/man/man1/lobase.1.gz
 2744${PKGNAME}/share/man/man1/localc.1
 2745${PKGNAME}/share/man/man1/localc.1.gz
 2746${PKGNAME}/share/man/man1/lodraw.1
 2747${PKGNAME}/share/man/man1/lodraw.1.gz
 2748${PKGNAME}/share/man/man1/loffice.1
 2749${PKGNAME}/share/man/man1/loffice.1.gz
 2750${PKGNAME}/share/man/man1/lofromtemplate.1
 2751${PKGNAME}/share/man/man1/lofromtemplate.1.gz
 2752${PKGNAME}/share/man/man1/loimpress.1
 2753${PKGNAME}/share/man/man1/loimpress.1.gz
 2754${PKGNAME}/share/man/man1/lomath.1
 2755${PKGNAME}/share/man/man1/lomath.1.gz
 2756${PKGNAME}/share/man/man1/loweb.1
 2757${PKGNAME}/share/man/man1/loweb.1.gz
 2758${PKGNAME}/share/man/man1/lowriter.1
 2759${PKGNAME}/share/man/man1/lowriter.1.gz
 2760${PKGNAME}/share/man/man1/oobase.1
 2761${PKGNAME}/share/man/man1/oobase.1.gz
 2762${PKGNAME}/share/man/man1/oocalc.1
 2763${PKGNAME}/share/man/man1/oocalc.1.gz
 2764${PKGNAME}/share/man/man1/oodraw.1
 2765${PKGNAME}/share/man/man1/oodraw.1.gz
 2766${PKGNAME}/share/man/man1/ooffice.1
 2767${PKGNAME}/share/man/man1/ooffice.1.gz
 2768${PKGNAME}/share/man/man1/oofromtemplate.1
 2769${PKGNAME}/share/man/man1/oofromtemplate.1.gz
 2770${PKGNAME}/share/man/man1/ooimpress.1
 2771${PKGNAME}/share/man/man1/ooimpress.1.gz
 2772${PKGNAME}/share/man/man1/oomath.1
 2773${PKGNAME}/share/man/man1/oomath.1.gz
 2774${PKGNAME}/share/man/man1/ooweb.1
 2775${PKGNAME}/share/man/man1/ooweb.1.gz
 2776${PKGNAME}/share/man/man1/oowriter.1
 2777${PKGNAME}/share/man/man1/oowriter.1.gz
 2778${PKGNAME}/share/man/man1/unopkg.1
 2779${PKGNAME}/share/man/man1/unopkg.1.gz
 2780${PKGNAME}/share/registry/reportbuilder.xcd
 2781${PKGNAME}/share/template/common/wizard/report/default.otr
2723${PKGNAME}/ure/bin/javaldx 2782${PKGNAME}/ure/bin/javaldx
2724${PKGNAME}/ure/lib/JREProperties.class 2783${PKGNAME}/ure/lib/JREProperties.class
2725${PKGNAME}/ure/lib/libjava_uno.so 2784${PKGNAME}/ure/lib/libjava_uno.so
2726${PKGNAME}/ure/lib/libjavaloaderlo.so 2785${PKGNAME}/ure/lib/libjavaloaderlo.so
2727${PKGNAME}/ure/lib/libjavavmlo.so 2786${PKGNAME}/ure/lib/libjavavmlo.so
2728${PKGNAME}/ure/lib/libjpipe.so 2787${PKGNAME}/ure/lib/libjpipe.so
2729${PKGNAME}/ure/lib/libjuh.so 2788${PKGNAME}/ure/lib/libjuh.so
2730${PKGNAME}/ure/lib/libjuhx.so 2789${PKGNAME}/ure/lib/libjuhx.so
2731${PKGNAME}/ure/lib/libjvmaccesslo.so 2790${PKGNAME}/ure/lib/libjvmaccesslo.so
2732${PKGNAME}/ure/lib/libjvmfwklo.so 2791${PKGNAME}/ure/lib/libjvmfwklo.so
2733${PKGNAME}/ure/share/java/java_uno.jar 2792${PKGNAME}/ure/share/java/java_uno.jar
2734${PKGNAME}/ure/share/java/juh.jar 2793${PKGNAME}/ure/share/java/juh.jar
2735${PKGNAME}/ure/share/java/jurt.jar 2794${PKGNAME}/ure/share/java/jurt.jar
cvs diff -r1.10 -r1.11 pkgsrc/misc/libreoffice4/Attic/options.mk (expand / switch to unified diff)

--- pkgsrc/misc/libreoffice4/Attic/options.mk 2015/03/16 18:16:26 1.10
+++ pkgsrc/misc/libreoffice4/Attic/options.mk 2015/07/30 21:56:30 1.11
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: options.mk,v 1.10 2015/03/16 18:16:26 ryoon Exp $ 1# $NetBSD: options.mk,v 1.11 2015/07/30 21:56:30 ryoon Exp $
2 2
3PKG_OPTIONS_VAR= PKG_OPTIONS.libreoffice4 3PKG_OPTIONS_VAR= PKG_OPTIONS.libreoffice4
4PKG_SUPPORTED_OPTIONS= java debug kde4 gtk3 4PKG_SUPPORTED_OPTIONS= java debug kde4 gtk3
5 5
6.include "../../mk/bsd.prefs.mk" 6.include "../../mk/bsd.prefs.mk"
7.if ${OPSYS} == "NetBSD" || ${OPSYS} == "SunOS" 7.if ${OPSYS} == "NetBSD" || ${OPSYS} == "SunOS"
8PKG_SUGGESTED_OPTIONS= java 8PKG_SUGGESTED_OPTIONS= java
9.endif 9.endif
10 10
11.include "../../mk/bsd.options.mk" 11.include "../../mk/bsd.options.mk"
12 12
13PLIST_VARS+= java kde4 gtk3 13PLIST_VARS+= java kde4 gtk3
14 14
@@ -20,28 +20,28 @@ USE_JAVA2= yes @@ -20,28 +20,28 @@ USE_JAVA2= yes
20BUILD_DEPENDS+= apache-ant-[0-9]*:../../devel/apache-ant 20BUILD_DEPENDS+= apache-ant-[0-9]*:../../devel/apache-ant
21FIND_PREFIX:= ANTDIR=apache-ant 21FIND_PREFIX:= ANTDIR=apache-ant
22CONFIGURE_ARGS+= --with-ant-home=${ANTDIR} 22CONFIGURE_ARGS+= --with-ant-home=${ANTDIR}
23 23
24DEPENDS+= hsqldb18-[0-9]*:../../databases/hsqldb18 24DEPENDS+= hsqldb18-[0-9]*:../../databases/hsqldb18
25FIND_PREFIX+= HSQLDB_SYSDIR=hsqldb18 25FIND_PREFIX+= HSQLDB_SYSDIR=hsqldb18
26CONFIGURE_ARGS+= --with-hsqldb-jar=${HSQLDB_SYSDIR}/lib/java/hsqldb18/hsqldb.jar 26CONFIGURE_ARGS+= --with-hsqldb-jar=${HSQLDB_SYSDIR}/lib/java/hsqldb18/hsqldb.jar
27.include "../../mk/find-prefix.mk" 27.include "../../mk/find-prefix.mk"
28CONFIGURE_ARGS+= --enable-ext-wiki-publisher \ 28CONFIGURE_ARGS+= --enable-ext-wiki-publisher \
29 --with-java \ 29 --with-java \
30 --with-jdk-home=${PKG_JAVA_HOME} \ 30 --with-jdk-home=${PKG_JAVA_HOME} \
31 --without-system-beanshell \ 31 --without-system-beanshell \
32 --enable-scripting-beanshell \ 32 --enable-scripting-beanshell \
33 --disable-report-builder \ 33 --with-system-hsqldb \
34 --with-system-hsqldb 34 --without-system-jfreereport
35PLIST_SRC+= ${PLIST_SRC_DFLT:Q} ${PKGDIR}/PLIST.java 35PLIST_SRC+= ${PLIST_SRC_DFLT:Q} ${PKGDIR}/PLIST.java
36. if !empty(PKG_JVM:Mopenjdk7) 36. if !empty(PKG_JVM:Mopenjdk7)
37CONFIGURE_ARGS+= --disable-scripting-javascript 37CONFIGURE_ARGS+= --disable-scripting-javascript
38. else 38. else
39PLIST_SRC+= ${PKGDIR}/PLIST.javascript 39PLIST_SRC+= ${PKGDIR}/PLIST.javascript
40. endif 40. endif
41PLIST.java= yes 41PLIST.java= yes
42.else 42.else
43CONFIGURE_ARGS+= --without-java 43CONFIGURE_ARGS+= --without-java
44.endif 44.endif
45 45
46.if !empty(PKG_OPTIONS:Mdebug) 46.if !empty(PKG_OPTIONS:Mdebug)
47CONFIGURE_ARGS+= --enable-debug 47CONFIGURE_ARGS+= --enable-debug