[pkgsrc/trunk]: pkgsrc/misc/libreoffice4 Bump PKGREVISION.

[ryoon <ryoon%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/dafee1169145
branches:  trunk
changeset: 648128:dafee1169145
user:      ryoon <ryoon%pkgsrc.org@localhost>
date:      Thu Mar 12 02:59:04 2015 +0000

description:
Bump PKGREVISION.

* Install desktop files with patches from jaapb@. (PKGREVISION bump)
* Try to invoke Apache Ant process under NetBSD 6.
  /bin/sh under NetBSD 6 return non-0 value
  from "undef Platform", when $Platform is not defined.
  And more something is required to built this package under NetBSD 6.

diffstat:

 misc/libreoffice4/Makefile                                             |   22 +-
 misc/libreoffice4/PLIST                                                |  523 +++++++++-
 misc/libreoffice4/distinfo                                             |    7 +-
 misc/libreoffice4/patches/patch-Makefile.in                            |   13 +
 misc/libreoffice4/patches/patch-bin_distro-install-desktop-integration |   46 +
 misc/libreoffice4/patches/patch-solenv_bin_ooinstall                   |   19 +
 misc/libreoffice4/patches/patch-solenv_gbuild_ExternalProject.mk       |   13 +
 misc/libreoffice4/patches/patch-sysui_desktop_share_create_tree.sh     |   22 +
 8 files changed, 640 insertions(+), 25 deletions(-)

diffs (truncated from 763 to 300 lines):

diff -r dceb1fc8154c -r dafee1169145 misc/libreoffice4/Makefile
--- a/misc/libreoffice4/Makefile        Thu Mar 12 01:01:06 2015 +0000
+++ b/misc/libreoffice4/Makefile        Thu Mar 12 02:59:04 2015 +0000
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.63 2015/03/09 09:02:20 wiz Exp $
+# $NetBSD: Makefile,v 1.64 2015/03/12 02:59:04 ryoon Exp $
 
 VERREL=                4.4.1
 VERRC=         2
 VER=           ${VERREL}.${VERRC}
 DISTNAME=      libreoffice-${VER}
 PKGNAME=       libreoffice4-${VER}
-PKGREVISION=   2
+PKGREVISION=   3
 CATEGORIES=    misc
 MASTER_SITES=  http://download.documentfoundation.org/libreoffice/src/${VERREL}/
 EXTRACT_SUFX=  .tar.xz
@@ -228,21 +228,21 @@
 #      mkdir ${WRKSRC}/${OBJDIR}
 
 do-install:
-       cd ${WRKSRC} && make DESTDIR="${DESTDIR}" install
+       cd ${WRKSRC} && make DESTDIR="${DESTDIR}" PREFIXDIR="${PREFIX}" distro-pack-install
 # make install cleans ${DESTDIR}${PREFIX}/*, so bin etc. are removed.
 .for d in ${INSTALLATION_DIRS}
        cd ${DESTDIR}${PREFIX} && \
                ${MKDIR} ${d}
 .endfor
 
-post-install:
-.for f in ${LO_PROGRAMS}
-       cd ${DESTDIR}${PREFIX}/bin && ${LN} -s ../${PKGNAME_NOREV}/program/${f}
-.endfor
-       ${LN} -s ${DESTDIR}${PREFIX}/${PKGNAME_NOREV}/program/soffice ${DESTDIR}${PREFIX}/bin/libreoffice
-.for f in ${LO_DESKTOP_FILES}
-       cd ${DESTDIR}${PREFIX}/share/applications && ${LN} -s ${DESTDIR}${PREFIX}/${PKGNAME_NOREV}/share/xdg/${f}
-.endfor
+#post-install:
+#.for f in ${LO_PROGRAMS}
+#      cd ${DESTDIR}${PREFIX}/bin && ${LN} -s ../${PKGNAME_NOREV}/program/${f}
+#.endfor
+#      ${LN} -s ${DESTDIR}${PREFIX}/bin/soffice ${DESTDIR}${PREFIX}/bin/libreoffice
+#.for f in ${LO_DESKTOP_FILES}
+#      cd ${DESTDIR}${PREFIX}/share/applications && ${LN} -s ${DESTDIR}${PREFIX}/${PKGNAME_NOREV}/share/xdg/${f}
+#.endfor
 
 .include "../../converters/libabw/buildlink3.mk"
 .include "../../converters/libcdr/buildlink3.mk"
diff -r dceb1fc8154c -r dafee1169145 misc/libreoffice4/PLIST
--- a/misc/libreoffice4/PLIST   Thu Mar 12 01:01:06 2015 +0000
+++ b/misc/libreoffice4/PLIST   Thu Mar 12 02:59:04 2015 +0000
@@ -1,12 +1,31 @@
-@comment $NetBSD: PLIST,v 1.11 2015/02/28 04:47:34 ryoon Exp $
+@comment $NetBSD: PLIST,v 1.12 2015/03/12 02:59:04 ryoon Exp $
 bin/libreoffice
-bin/sbase
-bin/scalc
-bin/sdraw
-bin/simpress
-bin/smath
+bin/lobase
+bin/localc
+bin/lodraw
+bin/loffice
+bin/lofromtemplate
+bin/loimpress
+bin/lomath
+bin/loweb
+bin/lowriter
+bin/oobase
+bin/oocalc
+bin/oodraw
+bin/ooffice
+bin/oofromtemplate
+bin/ooimpress
+bin/oomath
+bin/ooweb
+bin/oowriter
+@comment bin/sbase
+@comment bin/scalc
+@comment bin/sdraw
+@comment bin/simpress
+@comment bin/smath
 bin/soffice
-bin/swriter
+@comment bin/swriter
+bin/unopkg
 ${PKGNAME}/CREDITS.fodt
 ${PKGNAME}/LICENSE
 ${PKGNAME}/LICENSE.fodt
@@ -56,6 +75,7 @@
 ${PKGNAME}/program/gnome-open-url
 ${PKGNAME}/program/intro.png
 ${PKGNAME}/program/kde-open-url
+${PKGNAME}/program/java-set-classpath
 ${PKGNAME}/program/libOGLTranslo.so
 ${PKGNAME}/program/libPresentationMinimizerlo.so
 ${PKGNAME}/program/libPresenterScreenlo.so
@@ -12920,6 +12940,26 @@
 ${PKGNAME}/share/gallery/www-graf/ylwup.gif
 ${PKGNAME}/share/glade/libreoffice-catalog.xml
 ${PKGNAME}/share/labels/labels.xml
+${PKGNAME}/share/man/man1/libreoffice.1.gz
+${PKGNAME}/share/man/man1/lobase.1.gz
+${PKGNAME}/share/man/man1/localc.1.gz
+${PKGNAME}/share/man/man1/lodraw.1.gz
+${PKGNAME}/share/man/man1/loffice.1.gz
+${PKGNAME}/share/man/man1/lofromtemplate.1.gz
+${PKGNAME}/share/man/man1/loimpress.1.gz
+${PKGNAME}/share/man/man1/lomath.1.gz
+${PKGNAME}/share/man/man1/loweb.1.gz
+${PKGNAME}/share/man/man1/lowriter.1.gz
+${PKGNAME}/share/man/man1/oobase.1.gz
+${PKGNAME}/share/man/man1/oocalc.1.gz
+${PKGNAME}/share/man/man1/oodraw.1.gz
+${PKGNAME}/share/man/man1/ooffice.1.gz
+${PKGNAME}/share/man/man1/oofromtemplate.1.gz
+${PKGNAME}/share/man/man1/ooimpress.1.gz
+${PKGNAME}/share/man/man1/oomath.1.gz
+${PKGNAME}/share/man/man1/ooweb.1.gz
+${PKGNAME}/share/man/man1/oowriter.1.gz
+${PKGNAME}/share/man/man1/unopkg.1.gz
 ${PKGNAME}/share/psprint/driver/SGENPRT.PS
 ${PKGNAME}/share/psprint/psprint.conf
 ${PKGNAME}/share/registry/Langpack-af.xcd
@@ -13527,12 +13567,469 @@
 ${PKGNAME}/ure/lib/unorc
 ${PKGNAME}/ure/share/misc/services.rdb
 ${PKGNAME}/ure/share/misc/types.rdb
-share/applications/calc.desktop
-share/applications/draw.desktop
-share/applications/impress.desktop
-share/applications/math.desktop
-share/applications/startcenter.desktop
-share/applications/writer.desktop
+share/appdata/libreoffice-base.appdata.xml
+share/appdata/libreoffice-calc.appdata.xml
+share/appdata/libreoffice-draw.appdata.xml
+share/appdata/libreoffice-impress.appdata.xml
+share/appdata/libreoffice-writer.appdata.xml
+share/applications/libreoffice-base.desktop
+share/applications/libreoffice-calc.desktop
+share/applications/libreoffice-draw.desktop
+share/applications/libreoffice-impress.desktop
+share/applications/libreoffice-math.desktop
+share/applications/libreoffice-startcenter.desktop
+share/applications/libreoffice-writer.desktop
+share/applications/libreoffice-xsltfilter.desktop
+share/application-registry/libreoffice.applications
+share/icons/gnome/128x128/apps/libreoffice-base.png
+share/icons/gnome/128x128/apps/libreoffice-calc.png
+share/icons/gnome/128x128/apps/libreoffice-draw.png
+share/icons/gnome/128x128/apps/libreoffice-impress.png
+share/icons/gnome/128x128/apps/libreoffice-main.png
+share/icons/gnome/128x128/apps/libreoffice-math.png
+share/icons/gnome/128x128/apps/libreoffice-startcenter.png
+share/icons/gnome/128x128/apps/libreoffice-writer.png
+share/icons/gnome/128x128/mimetypes/libreoffice-oasis-database.png
+share/icons/gnome/128x128/mimetypes/libreoffice-oasis-drawing-template.png
+share/icons/gnome/128x128/mimetypes/libreoffice-oasis-drawing.png
+share/icons/gnome/128x128/mimetypes/libreoffice-oasis-formula.png
+share/icons/gnome/128x128/mimetypes/libreoffice-oasis-master-document.png
+share/icons/gnome/128x128/mimetypes/libreoffice-oasis-presentation-template.png
+share/icons/gnome/128x128/mimetypes/libreoffice-oasis-presentation.png
+share/icons/gnome/128x128/mimetypes/libreoffice-oasis-spreadsheet-template.png
+share/icons/gnome/128x128/mimetypes/libreoffice-oasis-spreadsheet.png
+share/icons/gnome/128x128/mimetypes/libreoffice-oasis-text-template.png
+share/icons/gnome/128x128/mimetypes/libreoffice-oasis-text.png
+share/icons/gnome/128x128/mimetypes/libreoffice-oasis-web-template.png
+share/icons/gnome/16x16/apps/libreoffice-base.png
+share/icons/gnome/16x16/apps/libreoffice-calc.png
+share/icons/gnome/16x16/apps/libreoffice-draw.png
+share/icons/gnome/16x16/apps/libreoffice-impress.png
+share/icons/gnome/16x16/apps/libreoffice-main.png
+share/icons/gnome/16x16/apps/libreoffice-math.png
+share/icons/gnome/16x16/apps/libreoffice-startcenter.png
+share/icons/gnome/16x16/apps/libreoffice-writer.png
+share/icons/gnome/16x16/mimetypes/libreoffice-database.png
+share/icons/gnome/16x16/mimetypes/libreoffice-drawing-template.png
+share/icons/gnome/16x16/mimetypes/libreoffice-drawing.png
+share/icons/gnome/16x16/mimetypes/libreoffice-extension.png
+share/icons/gnome/16x16/mimetypes/libreoffice-formula.png
+share/icons/gnome/16x16/mimetypes/libreoffice-master-document.png
+share/icons/gnome/16x16/mimetypes/libreoffice-oasis-database.png
+share/icons/gnome/16x16/mimetypes/libreoffice-oasis-drawing-template.png
+share/icons/gnome/16x16/mimetypes/libreoffice-oasis-drawing.png
+share/icons/gnome/16x16/mimetypes/libreoffice-oasis-formula.png
+share/icons/gnome/16x16/mimetypes/libreoffice-oasis-master-document.png
+share/icons/gnome/16x16/mimetypes/libreoffice-oasis-presentation-template.png
+share/icons/gnome/16x16/mimetypes/libreoffice-oasis-presentation.png
+share/icons/gnome/16x16/mimetypes/libreoffice-oasis-spreadsheet-template.png
+share/icons/gnome/16x16/mimetypes/libreoffice-oasis-spreadsheet.png
+share/icons/gnome/16x16/mimetypes/libreoffice-oasis-text-template.png
+share/icons/gnome/16x16/mimetypes/libreoffice-oasis-text.png
+share/icons/gnome/16x16/mimetypes/libreoffice-oasis-web-template.png
+share/icons/gnome/16x16/mimetypes/libreoffice-presentation-template.png
+share/icons/gnome/16x16/mimetypes/libreoffice-presentation.png
+share/icons/gnome/16x16/mimetypes/libreoffice-spreadsheet-template.png
+share/icons/gnome/16x16/mimetypes/libreoffice-spreadsheet.png
+share/icons/gnome/16x16/mimetypes/libreoffice-text-template.png
+share/icons/gnome/16x16/mimetypes/libreoffice-text.png
+share/icons/gnome/256x256/apps/libreoffice-base.png
+share/icons/gnome/256x256/apps/libreoffice-calc.png
+share/icons/gnome/256x256/apps/libreoffice-draw.png
+share/icons/gnome/256x256/apps/libreoffice-impress.png
+share/icons/gnome/256x256/apps/libreoffice-main.png
+share/icons/gnome/256x256/apps/libreoffice-math.png
+share/icons/gnome/256x256/apps/libreoffice-startcenter.png
+share/icons/gnome/256x256/apps/libreoffice-writer.png
+share/icons/gnome/256x256/mimetypes/libreoffice-oasis-database.png
+share/icons/gnome/256x256/mimetypes/libreoffice-oasis-drawing-template.png
+share/icons/gnome/256x256/mimetypes/libreoffice-oasis-drawing.png
+share/icons/gnome/256x256/mimetypes/libreoffice-oasis-formula.png
+share/icons/gnome/256x256/mimetypes/libreoffice-oasis-master-document.png
+share/icons/gnome/256x256/mimetypes/libreoffice-oasis-presentation-template.png
+share/icons/gnome/256x256/mimetypes/libreoffice-oasis-presentation.png
+share/icons/gnome/256x256/mimetypes/libreoffice-oasis-spreadsheet-template.png
+share/icons/gnome/256x256/mimetypes/libreoffice-oasis-spreadsheet.png
+share/icons/gnome/256x256/mimetypes/libreoffice-oasis-text-template.png
+share/icons/gnome/256x256/mimetypes/libreoffice-oasis-text.png
+share/icons/gnome/256x256/mimetypes/libreoffice-oasis-web-template.png
+share/icons/gnome/32x32/apps/libreoffice-base.png
+share/icons/gnome/32x32/apps/libreoffice-calc.png
+share/icons/gnome/32x32/apps/libreoffice-draw.png
+share/icons/gnome/32x32/apps/libreoffice-impress.png
+share/icons/gnome/32x32/apps/libreoffice-main.png
+share/icons/gnome/32x32/apps/libreoffice-math.png
+share/icons/gnome/32x32/apps/libreoffice-startcenter.png
+share/icons/gnome/32x32/apps/libreoffice-writer.png
+share/icons/gnome/32x32/mimetypes/libreoffice-database.png
+share/icons/gnome/32x32/mimetypes/libreoffice-drawing-template.png
+share/icons/gnome/32x32/mimetypes/libreoffice-drawing.png
+share/icons/gnome/32x32/mimetypes/libreoffice-extension.png
+share/icons/gnome/32x32/mimetypes/libreoffice-formula.png
+share/icons/gnome/32x32/mimetypes/libreoffice-master-document.png
+share/icons/gnome/32x32/mimetypes/libreoffice-oasis-database.png
+share/icons/gnome/32x32/mimetypes/libreoffice-oasis-drawing-template.png
+share/icons/gnome/32x32/mimetypes/libreoffice-oasis-drawing.png
+share/icons/gnome/32x32/mimetypes/libreoffice-oasis-formula.png
+share/icons/gnome/32x32/mimetypes/libreoffice-oasis-master-document.png
+share/icons/gnome/32x32/mimetypes/libreoffice-oasis-presentation-template.png
+share/icons/gnome/32x32/mimetypes/libreoffice-oasis-presentation.png
+share/icons/gnome/32x32/mimetypes/libreoffice-oasis-spreadsheet-template.png
+share/icons/gnome/32x32/mimetypes/libreoffice-oasis-spreadsheet.png
+share/icons/gnome/32x32/mimetypes/libreoffice-oasis-text-template.png
+share/icons/gnome/32x32/mimetypes/libreoffice-oasis-text.png
+share/icons/gnome/32x32/mimetypes/libreoffice-oasis-web-template.png
+share/icons/gnome/32x32/mimetypes/libreoffice-presentation-template.png
+share/icons/gnome/32x32/mimetypes/libreoffice-presentation.png
+share/icons/gnome/32x32/mimetypes/libreoffice-spreadsheet-template.png
+share/icons/gnome/32x32/mimetypes/libreoffice-spreadsheet.png
+share/icons/gnome/32x32/mimetypes/libreoffice-text-template.png
+share/icons/gnome/32x32/mimetypes/libreoffice-text.png
+share/icons/gnome/48x48/apps/libreoffice-base.png
+share/icons/gnome/48x48/apps/libreoffice-calc.png
+share/icons/gnome/48x48/apps/libreoffice-draw.png
+share/icons/gnome/48x48/apps/libreoffice-impress.png
+share/icons/gnome/48x48/apps/libreoffice-main.png
+share/icons/gnome/48x48/apps/libreoffice-math.png
+share/icons/gnome/48x48/apps/libreoffice-startcenter.png
+share/icons/gnome/48x48/apps/libreoffice-writer.png
+share/icons/gnome/48x48/mimetypes/libreoffice-database.png
+share/icons/gnome/48x48/mimetypes/libreoffice-drawing-template.png
+share/icons/gnome/48x48/mimetypes/libreoffice-drawing.png
+share/icons/gnome/48x48/mimetypes/libreoffice-extension.png
+share/icons/gnome/48x48/mimetypes/libreoffice-formula.png
+share/icons/gnome/48x48/mimetypes/libreoffice-master-document.png
+share/icons/gnome/48x48/mimetypes/libreoffice-oasis-database.png
+share/icons/gnome/48x48/mimetypes/libreoffice-oasis-drawing-template.png
+share/icons/gnome/48x48/mimetypes/libreoffice-oasis-drawing.png
+share/icons/gnome/48x48/mimetypes/libreoffice-oasis-formula.png
+share/icons/gnome/48x48/mimetypes/libreoffice-oasis-master-document.png
+share/icons/gnome/48x48/mimetypes/libreoffice-oasis-presentation-template.png
+share/icons/gnome/48x48/mimetypes/libreoffice-oasis-presentation.png
+share/icons/gnome/48x48/mimetypes/libreoffice-oasis-spreadsheet-template.png
+share/icons/gnome/48x48/mimetypes/libreoffice-oasis-spreadsheet.png
+share/icons/gnome/48x48/mimetypes/libreoffice-oasis-text-template.png
+share/icons/gnome/48x48/mimetypes/libreoffice-oasis-text.png
+share/icons/gnome/48x48/mimetypes/libreoffice-oasis-web-template.png
+share/icons/gnome/48x48/mimetypes/libreoffice-presentation-template.png
+share/icons/gnome/48x48/mimetypes/libreoffice-presentation.png
+share/icons/gnome/48x48/mimetypes/libreoffice-spreadsheet-template.png
+share/icons/gnome/48x48/mimetypes/libreoffice-spreadsheet.png
+share/icons/gnome/48x48/mimetypes/libreoffice-text-template.png
+share/icons/gnome/48x48/mimetypes/libreoffice-text.png
+share/icons/gnome/512x512/apps/libreoffice-main.png
+share/icons/gnome/512x512/mimetypes/libreoffice-oasis-database.png
+share/icons/gnome/512x512/mimetypes/libreoffice-oasis-drawing-template.png
+share/icons/gnome/512x512/mimetypes/libreoffice-oasis-drawing.png
+share/icons/gnome/512x512/mimetypes/libreoffice-oasis-formula.png
+share/icons/gnome/512x512/mimetypes/libreoffice-oasis-master-document.png
+share/icons/gnome/512x512/mimetypes/libreoffice-oasis-presentation-template.png
+share/icons/gnome/512x512/mimetypes/libreoffice-oasis-presentation.png
+share/icons/gnome/512x512/mimetypes/libreoffice-oasis-spreadsheet-template.png
+share/icons/gnome/512x512/mimetypes/libreoffice-oasis-spreadsheet.png
+share/icons/gnome/512x512/mimetypes/libreoffice-oasis-text-template.png
+share/icons/gnome/512x512/mimetypes/libreoffice-oasis-text.png
+share/icons/gnome/512x512/mimetypes/libreoffice-oasis-web-template.png
+share/icons/gnome/scalable/apps/libreoffice-base.svg
+share/icons/gnome/scalable/apps/libreoffice-calc.svg