diff options
author | ryoon <ryoon@pkgsrc.org> | 2015-03-12 02:59:04 +0000 |
---|---|---|
committer | ryoon <ryoon@pkgsrc.org> | 2015-03-12 02:59:04 +0000 |
commit | 40b20920c774a3b037ebd1162f8809663180e123 (patch) | |
tree | 66e975fd276fe6bd1ffe8b135752d91f18d36c29 /misc | |
parent | 005e93c616586574ad6ccdfaccf4c1134c2f7484 (diff) | |
download | pkgsrc-40b20920c774a3b037ebd1162f8809663180e123.tar.gz |
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 (limited to 'misc')
-rw-r--r-- | misc/libreoffice4/Makefile | 22 | ||||
-rw-r--r-- | misc/libreoffice4/PLIST | 523 | ||||
-rw-r--r-- | misc/libreoffice4/distinfo | 7 | ||||
-rw-r--r-- | misc/libreoffice4/patches/patch-Makefile.in | 13 | ||||
-rw-r--r-- | misc/libreoffice4/patches/patch-bin_distro-install-desktop-integration | 46 | ||||
-rw-r--r-- | misc/libreoffice4/patches/patch-solenv_bin_ooinstall | 19 | ||||
-rw-r--r-- | misc/libreoffice4/patches/patch-solenv_gbuild_ExternalProject.mk | 13 | ||||
-rw-r--r-- | misc/libreoffice4/patches/patch-sysui_desktop_share_create_tree.sh | 22 |
8 files changed, 640 insertions, 25 deletions
diff --git a/misc/libreoffice4/Makefile b/misc/libreoffice4/Makefile index 9c4b779f3fd..2759570234b 100644 --- a/misc/libreoffice4/Makefile +++ b/misc/libreoffice4/Makefile @@ -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 @@ post-extract: # 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 --git a/misc/libreoffice4/PLIST b/misc/libreoffice4/PLIST index f139066f99a..727032c2074 100644 --- a/misc/libreoffice4/PLIST +++ b/misc/libreoffice4/PLIST @@ -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/gengal.bin ${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/ylwright.gif ${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/libxmlreaderlo.so ${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 +share/icons/gnome/scalable/apps/libreoffice-draw.svg +share/icons/gnome/scalable/apps/libreoffice-impress.svg +share/icons/gnome/scalable/apps/libreoffice-main.svg +share/icons/gnome/scalable/apps/libreoffice-math.svg +share/icons/gnome/scalable/apps/libreoffice-startcenter.svg +share/icons/gnome/scalable/apps/libreoffice-writer.svg +share/icons/gnome/scalable/mimetypes/libreoffice-oasis-database.svg +share/icons/gnome/scalable/mimetypes/libreoffice-oasis-drawing-template.svg +share/icons/gnome/scalable/mimetypes/libreoffice-oasis-drawing.svg +share/icons/gnome/scalable/mimetypes/libreoffice-oasis-formula.svg +share/icons/gnome/scalable/mimetypes/libreoffice-oasis-master-document.svg +share/icons/gnome/scalable/mimetypes/libreoffice-oasis-presentation-template.svg +share/icons/gnome/scalable/mimetypes/libreoffice-oasis-presentation.svg +share/icons/gnome/scalable/mimetypes/libreoffice-oasis-spreadsheet-template.svg +share/icons/gnome/scalable/mimetypes/libreoffice-oasis-spreadsheet.svg +share/icons/gnome/scalable/mimetypes/libreoffice-oasis-text-template.svg +share/icons/gnome/scalable/mimetypes/libreoffice-oasis-text.svg +share/icons/gnome/scalable/mimetypes/libreoffice-oasis-web-template.svg +share/icons/hicolor/128x128/apps/libreoffice-base.png +share/icons/hicolor/128x128/apps/libreoffice-calc.png +share/icons/hicolor/128x128/apps/libreoffice-draw.png +share/icons/hicolor/128x128/apps/libreoffice-impress.png +share/icons/hicolor/128x128/apps/libreoffice-main.png +share/icons/hicolor/128x128/apps/libreoffice-math.png +share/icons/hicolor/128x128/apps/libreoffice-startcenter.png +share/icons/hicolor/128x128/apps/libreoffice-writer.png +share/icons/hicolor/128x128/mimetypes/libreoffice-oasis-database.png +share/icons/hicolor/128x128/mimetypes/libreoffice-oasis-drawing-template.png +share/icons/hicolor/128x128/mimetypes/libreoffice-oasis-drawing.png +share/icons/hicolor/128x128/mimetypes/libreoffice-oasis-formula.png +share/icons/hicolor/128x128/mimetypes/libreoffice-oasis-master-document.png +share/icons/hicolor/128x128/mimetypes/libreoffice-oasis-presentation-template.png +share/icons/hicolor/128x128/mimetypes/libreoffice-oasis-presentation.png +share/icons/hicolor/128x128/mimetypes/libreoffice-oasis-spreadsheet-template.png +share/icons/hicolor/128x128/mimetypes/libreoffice-oasis-spreadsheet.png +share/icons/hicolor/128x128/mimetypes/libreoffice-oasis-text-template.png +share/icons/hicolor/128x128/mimetypes/libreoffice-oasis-text.png +share/icons/hicolor/128x128/mimetypes/libreoffice-oasis-web-template.png +share/icons/hicolor/16x16/apps/libreoffice-base.png +share/icons/hicolor/16x16/apps/libreoffice-calc.png +share/icons/hicolor/16x16/apps/libreoffice-draw.png +share/icons/hicolor/16x16/apps/libreoffice-impress.png +share/icons/hicolor/16x16/apps/libreoffice-main.png +share/icons/hicolor/16x16/apps/libreoffice-math.png +share/icons/hicolor/16x16/apps/libreoffice-startcenter.png +share/icons/hicolor/16x16/apps/libreoffice-writer.png +share/icons/hicolor/16x16/mimetypes/libreoffice-database.png +share/icons/hicolor/16x16/mimetypes/libreoffice-drawing-template.png +share/icons/hicolor/16x16/mimetypes/libreoffice-drawing.png +share/icons/hicolor/16x16/mimetypes/libreoffice-extension.png +share/icons/hicolor/16x16/mimetypes/libreoffice-formula.png +share/icons/hicolor/16x16/mimetypes/libreoffice-master-document.png +share/icons/hicolor/16x16/mimetypes/libreoffice-oasis-database.png +share/icons/hicolor/16x16/mimetypes/libreoffice-oasis-drawing-template.png +share/icons/hicolor/16x16/mimetypes/libreoffice-oasis-drawing.png +share/icons/hicolor/16x16/mimetypes/libreoffice-oasis-formula.png +share/icons/hicolor/16x16/mimetypes/libreoffice-oasis-master-document.png +share/icons/hicolor/16x16/mimetypes/libreoffice-oasis-presentation-template.png +share/icons/hicolor/16x16/mimetypes/libreoffice-oasis-presentation.png +share/icons/hicolor/16x16/mimetypes/libreoffice-oasis-spreadsheet-template.png +share/icons/hicolor/16x16/mimetypes/libreoffice-oasis-spreadsheet.png +share/icons/hicolor/16x16/mimetypes/libreoffice-oasis-text-template.png +share/icons/hicolor/16x16/mimetypes/libreoffice-oasis-text.png +share/icons/hicolor/16x16/mimetypes/libreoffice-oasis-web-template.png +share/icons/hicolor/16x16/mimetypes/libreoffice-presentation-template.png +share/icons/hicolor/16x16/mimetypes/libreoffice-presentation.png +share/icons/hicolor/16x16/mimetypes/libreoffice-spreadsheet-template.png +share/icons/hicolor/16x16/mimetypes/libreoffice-spreadsheet.png +share/icons/hicolor/16x16/mimetypes/libreoffice-text-template.png +share/icons/hicolor/16x16/mimetypes/libreoffice-text.png +share/icons/hicolor/256x256/apps/libreoffice-base.png +share/icons/hicolor/256x256/apps/libreoffice-calc.png +share/icons/hicolor/256x256/apps/libreoffice-draw.png +share/icons/hicolor/256x256/apps/libreoffice-impress.png +share/icons/hicolor/256x256/apps/libreoffice-main.png +share/icons/hicolor/256x256/apps/libreoffice-math.png +share/icons/hicolor/256x256/apps/libreoffice-startcenter.png +share/icons/hicolor/256x256/apps/libreoffice-writer.png +share/icons/hicolor/256x256/mimetypes/libreoffice-oasis-database.png +share/icons/hicolor/256x256/mimetypes/libreoffice-oasis-drawing-template.png +share/icons/hicolor/256x256/mimetypes/libreoffice-oasis-drawing.png +share/icons/hicolor/256x256/mimetypes/libreoffice-oasis-formula.png +share/icons/hicolor/256x256/mimetypes/libreoffice-oasis-master-document.png +share/icons/hicolor/256x256/mimetypes/libreoffice-oasis-presentation-template.png +share/icons/hicolor/256x256/mimetypes/libreoffice-oasis-presentation.png +share/icons/hicolor/256x256/mimetypes/libreoffice-oasis-spreadsheet-template.png +share/icons/hicolor/256x256/mimetypes/libreoffice-oasis-spreadsheet.png +share/icons/hicolor/256x256/mimetypes/libreoffice-oasis-text-template.png +share/icons/hicolor/256x256/mimetypes/libreoffice-oasis-text.png +share/icons/hicolor/256x256/mimetypes/libreoffice-oasis-web-template.png +share/icons/hicolor/32x32/apps/libreoffice-base.png +share/icons/hicolor/32x32/apps/libreoffice-calc.png +share/icons/hicolor/32x32/apps/libreoffice-draw.png +share/icons/hicolor/32x32/apps/libreoffice-impress.png +share/icons/hicolor/32x32/apps/libreoffice-main.png +share/icons/hicolor/32x32/apps/libreoffice-math.png +share/icons/hicolor/32x32/apps/libreoffice-startcenter.png +share/icons/hicolor/32x32/apps/libreoffice-writer.png +share/icons/hicolor/32x32/mimetypes/libreoffice-database.png +share/icons/hicolor/32x32/mimetypes/libreoffice-drawing-template.png +share/icons/hicolor/32x32/mimetypes/libreoffice-drawing.png +share/icons/hicolor/32x32/mimetypes/libreoffice-extension.png +share/icons/hicolor/32x32/mimetypes/libreoffice-formula.png +share/icons/hicolor/32x32/mimetypes/libreoffice-master-document.png +share/icons/hicolor/32x32/mimetypes/libreoffice-oasis-database.png +share/icons/hicolor/32x32/mimetypes/libreoffice-oasis-drawing-template.png +share/icons/hicolor/32x32/mimetypes/libreoffice-oasis-drawing.png +share/icons/hicolor/32x32/mimetypes/libreoffice-oasis-formula.png +share/icons/hicolor/32x32/mimetypes/libreoffice-oasis-master-document.png +share/icons/hicolor/32x32/mimetypes/libreoffice-oasis-presentation-template.png +share/icons/hicolor/32x32/mimetypes/libreoffice-oasis-presentation.png +share/icons/hicolor/32x32/mimetypes/libreoffice-oasis-spreadsheet-template.png +share/icons/hicolor/32x32/mimetypes/libreoffice-oasis-spreadsheet.png +share/icons/hicolor/32x32/mimetypes/libreoffice-oasis-text-template.png +share/icons/hicolor/32x32/mimetypes/libreoffice-oasis-text.png +share/icons/hicolor/32x32/mimetypes/libreoffice-oasis-web-template.png +share/icons/hicolor/32x32/mimetypes/libreoffice-presentation-template.png +share/icons/hicolor/32x32/mimetypes/libreoffice-presentation.png +share/icons/hicolor/32x32/mimetypes/libreoffice-spreadsheet-template.png +share/icons/hicolor/32x32/mimetypes/libreoffice-spreadsheet.png +share/icons/hicolor/32x32/mimetypes/libreoffice-text-template.png +share/icons/hicolor/32x32/mimetypes/libreoffice-text.png +share/icons/hicolor/48x48/apps/libreoffice-base.png +share/icons/hicolor/48x48/apps/libreoffice-calc.png +share/icons/hicolor/48x48/apps/libreoffice-draw.png +share/icons/hicolor/48x48/apps/libreoffice-impress.png +share/icons/hicolor/48x48/apps/libreoffice-main.png +share/icons/hicolor/48x48/apps/libreoffice-math.png +share/icons/hicolor/48x48/apps/libreoffice-startcenter.png +share/icons/hicolor/48x48/apps/libreoffice-writer.png +share/icons/hicolor/48x48/mimetypes/libreoffice-database.png +share/icons/hicolor/48x48/mimetypes/libreoffice-drawing-template.png +share/icons/hicolor/48x48/mimetypes/libreoffice-drawing.png +share/icons/hicolor/48x48/mimetypes/libreoffice-extension.png +share/icons/hicolor/48x48/mimetypes/libreoffice-formula.png +share/icons/hicolor/48x48/mimetypes/libreoffice-master-document.png +share/icons/hicolor/48x48/mimetypes/libreoffice-oasis-database.png +share/icons/hicolor/48x48/mimetypes/libreoffice-oasis-drawing-template.png +share/icons/hicolor/48x48/mimetypes/libreoffice-oasis-drawing.png +share/icons/hicolor/48x48/mimetypes/libreoffice-oasis-formula.png +share/icons/hicolor/48x48/mimetypes/libreoffice-oasis-master-document.png +share/icons/hicolor/48x48/mimetypes/libreoffice-oasis-presentation-template.png +share/icons/hicolor/48x48/mimetypes/libreoffice-oasis-presentation.png +share/icons/hicolor/48x48/mimetypes/libreoffice-oasis-spreadsheet-template.png +share/icons/hicolor/48x48/mimetypes/libreoffice-oasis-spreadsheet.png +share/icons/hicolor/48x48/mimetypes/libreoffice-oasis-text-template.png +share/icons/hicolor/48x48/mimetypes/libreoffice-oasis-text.png +share/icons/hicolor/48x48/mimetypes/libreoffice-oasis-web-template.png +share/icons/hicolor/48x48/mimetypes/libreoffice-presentation-template.png +share/icons/hicolor/48x48/mimetypes/libreoffice-presentation.png +share/icons/hicolor/48x48/mimetypes/libreoffice-spreadsheet-template.png +share/icons/hicolor/48x48/mimetypes/libreoffice-spreadsheet.png +share/icons/hicolor/48x48/mimetypes/libreoffice-text-template.png +share/icons/hicolor/48x48/mimetypes/libreoffice-text.png +share/icons/hicolor/512x512/apps/libreoffice-main.png +share/icons/hicolor/512x512/mimetypes/libreoffice-oasis-database.png +share/icons/hicolor/512x512/mimetypes/libreoffice-oasis-drawing-template.png +share/icons/hicolor/512x512/mimetypes/libreoffice-oasis-drawing.png +share/icons/hicolor/512x512/mimetypes/libreoffice-oasis-formula.png +share/icons/hicolor/512x512/mimetypes/libreoffice-oasis-master-document.png +share/icons/hicolor/512x512/mimetypes/libreoffice-oasis-presentation-template.png +share/icons/hicolor/512x512/mimetypes/libreoffice-oasis-presentation.png +share/icons/hicolor/512x512/mimetypes/libreoffice-oasis-spreadsheet-template.png +share/icons/hicolor/512x512/mimetypes/libreoffice-oasis-spreadsheet.png +share/icons/hicolor/512x512/mimetypes/libreoffice-oasis-text-template.png +share/icons/hicolor/512x512/mimetypes/libreoffice-oasis-text.png +share/icons/hicolor/512x512/mimetypes/libreoffice-oasis-web-template.png +share/icons/hicolor/scalable/apps/libreoffice-base.svg +share/icons/hicolor/scalable/apps/libreoffice-calc.svg +share/icons/hicolor/scalable/apps/libreoffice-draw.svg +share/icons/hicolor/scalable/apps/libreoffice-impress.svg +share/icons/hicolor/scalable/apps/libreoffice-main.svg +share/icons/hicolor/scalable/apps/libreoffice-math.svg +share/icons/hicolor/scalable/apps/libreoffice-startcenter.svg +share/icons/hicolor/scalable/apps/libreoffice-writer.svg +share/icons/hicolor/scalable/mimetypes/libreoffice-oasis-database.svg +share/icons/hicolor/scalable/mimetypes/libreoffice-oasis-drawing-template.svg +share/icons/hicolor/scalable/mimetypes/libreoffice-oasis-drawing.svg +share/icons/hicolor/scalable/mimetypes/libreoffice-oasis-formula.svg +share/icons/hicolor/scalable/mimetypes/libreoffice-oasis-master-document.svg +share/icons/hicolor/scalable/mimetypes/libreoffice-oasis-presentation-template.svg +share/icons/hicolor/scalable/mimetypes/libreoffice-oasis-presentation.svg +share/icons/hicolor/scalable/mimetypes/libreoffice-oasis-spreadsheet-template.svg +share/icons/hicolor/scalable/mimetypes/libreoffice-oasis-spreadsheet.svg +share/icons/hicolor/scalable/mimetypes/libreoffice-oasis-text-template.svg +share/icons/hicolor/scalable/mimetypes/libreoffice-oasis-text.svg +share/icons/hicolor/scalable/mimetypes/libreoffice-oasis-web-template.svg +share/icons/locolor/16x16/apps/libreoffice-base.png +share/icons/locolor/16x16/apps/libreoffice-calc.png +share/icons/locolor/16x16/apps/libreoffice-draw.png +share/icons/locolor/16x16/apps/libreoffice-impress.png +share/icons/locolor/16x16/apps/libreoffice-math.png +share/icons/locolor/16x16/apps/libreoffice-startcenter.png +share/icons/locolor/16x16/apps/libreoffice-writer.png +share/icons/locolor/16x16/mimetypes/libreoffice-database.png +share/icons/locolor/16x16/mimetypes/libreoffice-drawing-template.png +share/icons/locolor/16x16/mimetypes/libreoffice-drawing.png +share/icons/locolor/16x16/mimetypes/libreoffice-extension.png +share/icons/locolor/16x16/mimetypes/libreoffice-formula.png +share/icons/locolor/16x16/mimetypes/libreoffice-master-document.png +share/icons/locolor/16x16/mimetypes/libreoffice-oasis-database.png +share/icons/locolor/16x16/mimetypes/libreoffice-oasis-drawing-template.png +share/icons/locolor/16x16/mimetypes/libreoffice-oasis-drawing.png +share/icons/locolor/16x16/mimetypes/libreoffice-oasis-formula.png +share/icons/locolor/16x16/mimetypes/libreoffice-oasis-master-document.png +share/icons/locolor/16x16/mimetypes/libreoffice-oasis-presentation-template.png +share/icons/locolor/16x16/mimetypes/libreoffice-oasis-presentation.png +share/icons/locolor/16x16/mimetypes/libreoffice-oasis-spreadsheet-template.png +share/icons/locolor/16x16/mimetypes/libreoffice-oasis-spreadsheet.png +share/icons/locolor/16x16/mimetypes/libreoffice-oasis-text-template.png +share/icons/locolor/16x16/mimetypes/libreoffice-oasis-text.png +share/icons/locolor/16x16/mimetypes/libreoffice-oasis-web-template.png +share/icons/locolor/16x16/mimetypes/libreoffice-presentation-template.png +share/icons/locolor/16x16/mimetypes/libreoffice-presentation.png +share/icons/locolor/16x16/mimetypes/libreoffice-spreadsheet-template.png +share/icons/locolor/16x16/mimetypes/libreoffice-spreadsheet.png +share/icons/locolor/16x16/mimetypes/libreoffice-text-template.png +share/icons/locolor/16x16/mimetypes/libreoffice-text.png +share/icons/locolor/32x32/apps/libreoffice-base.png +share/icons/locolor/32x32/apps/libreoffice-calc.png +share/icons/locolor/32x32/apps/libreoffice-draw.png +share/icons/locolor/32x32/apps/libreoffice-impress.png +share/icons/locolor/32x32/apps/libreoffice-math.png +share/icons/locolor/32x32/apps/libreoffice-startcenter.png +share/icons/locolor/32x32/apps/libreoffice-writer.png +share/icons/locolor/32x32/mimetypes/libreoffice-database.png +share/icons/locolor/32x32/mimetypes/libreoffice-drawing-template.png +share/icons/locolor/32x32/mimetypes/libreoffice-drawing.png +share/icons/locolor/32x32/mimetypes/libreoffice-extension.png +share/icons/locolor/32x32/mimetypes/libreoffice-formula.png +share/icons/locolor/32x32/mimetypes/libreoffice-master-document.png +share/icons/locolor/32x32/mimetypes/libreoffice-oasis-database.png +share/icons/locolor/32x32/mimetypes/libreoffice-oasis-drawing-template.png +share/icons/locolor/32x32/mimetypes/libreoffice-oasis-drawing.png +share/icons/locolor/32x32/mimetypes/libreoffice-oasis-formula.png +share/icons/locolor/32x32/mimetypes/libreoffice-oasis-master-document.png +share/icons/locolor/32x32/mimetypes/libreoffice-oasis-presentation-template.png +share/icons/locolor/32x32/mimetypes/libreoffice-oasis-presentation.png +share/icons/locolor/32x32/mimetypes/libreoffice-oasis-spreadsheet-template.png +share/icons/locolor/32x32/mimetypes/libreoffice-oasis-spreadsheet.png +share/icons/locolor/32x32/mimetypes/libreoffice-oasis-text-template.png +share/icons/locolor/32x32/mimetypes/libreoffice-oasis-text.png +share/icons/locolor/32x32/mimetypes/libreoffice-oasis-web-template.png +share/icons/locolor/32x32/mimetypes/libreoffice-presentation-template.png +share/icons/locolor/32x32/mimetypes/libreoffice-presentation.png +share/icons/locolor/32x32/mimetypes/libreoffice-spreadsheet-template.png +share/icons/locolor/32x32/mimetypes/libreoffice-spreadsheet.png +share/icons/locolor/32x32/mimetypes/libreoffice-text-template.png +share/icons/locolor/32x32/mimetypes/libreoffice-text.png +share/mime-info/libreoffice.keys +share/mime-info/libreoffice.mime +share/mime/packages/libreoffice.xml +share/mimelnk/application/libreoffice-drawing-template.desktop +share/mimelnk/application/libreoffice-drawing.desktop +share/mimelnk/application/libreoffice-extension.desktop +share/mimelnk/application/libreoffice-formula.desktop +share/mimelnk/application/libreoffice-master-document.desktop +share/mimelnk/application/libreoffice-ms-excel-sheet-12.desktop +share/mimelnk/application/libreoffice-ms-excel-sheet-binary-12.desktop +share/mimelnk/application/libreoffice-ms-excel-sheet.desktop +share/mimelnk/application/libreoffice-ms-excel-template-12.desktop +share/mimelnk/application/libreoffice-ms-powerpoint-presentation-12.desktop +share/mimelnk/application/libreoffice-ms-powerpoint-presentation.desktop +share/mimelnk/application/libreoffice-ms-powerpoint-template-12.desktop +share/mimelnk/application/libreoffice-ms-word-document-12.desktop +share/mimelnk/application/libreoffice-ms-word-document.desktop +share/mimelnk/application/libreoffice-ms-word-document2.desktop +share/mimelnk/application/libreoffice-ms-word-template-12.desktop +share/mimelnk/application/libreoffice-oasis-database.desktop +share/mimelnk/application/libreoffice-oasis-drawing-flat-xml.desktop +share/mimelnk/application/libreoffice-oasis-drawing-template.desktop +share/mimelnk/application/libreoffice-oasis-drawing.desktop +share/mimelnk/application/libreoffice-oasis-formula.desktop +share/mimelnk/application/libreoffice-oasis-master-document.desktop +share/mimelnk/application/libreoffice-oasis-master-document-template.desktop +share/mimelnk/application/libreoffice-oasis-presentation-flat-xml.desktop +share/mimelnk/application/libreoffice-oasis-presentation-template.desktop +share/mimelnk/application/libreoffice-oasis-presentation.desktop +share/mimelnk/application/libreoffice-oasis-spreadsheet-flat-xml.desktop +share/mimelnk/application/libreoffice-oasis-spreadsheet-template.desktop +share/mimelnk/application/libreoffice-oasis-spreadsheet.desktop +share/mimelnk/application/libreoffice-oasis-text-flat-xml.desktop +share/mimelnk/application/libreoffice-oasis-text-template.desktop +share/mimelnk/application/libreoffice-oasis-text.desktop +share/mimelnk/application/libreoffice-oasis-web-template.desktop +share/mimelnk/application/libreoffice-openxmlformats-officedocument-presentationml-presentation.desktop +share/mimelnk/application/libreoffice-openxmlformats-officedocument-presentationml-template.desktop +share/mimelnk/application/libreoffice-openxmlformats-officedocument-spreadsheetml-sheet.desktop +share/mimelnk/application/libreoffice-openxmlformats-officedocument-spreadsheetml-template.desktop +share/mimelnk/application/libreoffice-openxmlformats-officedocument-wordprocessingml-document.desktop +share/mimelnk/application/libreoffice-openxmlformats-officedocument-wordprocessingml-template.desktop +share/mimelnk/application/libreoffice-presentation-template.desktop +share/mimelnk/application/libreoffice-presentation.desktop +share/mimelnk/application/libreoffice-spreadsheet-template.desktop +share/mimelnk/application/libreoffice-spreadsheet.desktop +share/mimelnk/application/libreoffice-text-template.desktop +share/mimelnk/application/libreoffice-text.desktop +@pkgdir share/applications @pkgdir ${PKGNAME}/share/uno_packages/cache/uno_packages @pkgdir ${PKGNAME}/share/autotext/zu @pkgdir ${PKGNAME}/share/autotext/xh diff --git a/misc/libreoffice4/distinfo b/misc/libreoffice4/distinfo index 569db116f0d..7912436f0cc 100644 --- a/misc/libreoffice4/distinfo +++ b/misc/libreoffice4/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.36 2015/03/03 21:39:13 ryoon Exp $ +$NetBSD: distinfo,v 1.37 2015/03/12 02:59:04 ryoon Exp $ SHA1 (libreoffice/0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz) = 452eba922e4f41603539c9dc39947d2271e47093 RMD160 (libreoffice/0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz) = dbeb7a7f8c89961ca2e544b810345d025561866b @@ -147,14 +147,19 @@ Size (libreoffice/libreoffice-help-4.4.1.2.tar.xz) = 1875832 bytes SHA1 (libreoffice/libreoffice-translations-4.4.1.2.tar.xz) = 4bd9e7fe5f983e4f3b32ef76d1f59c46c7ac2fd5 RMD160 (libreoffice/libreoffice-translations-4.4.1.2.tar.xz) = d33e1b7a430af95b1c21d6d21a70e93c01da4d4e Size (libreoffice/libreoffice-translations-4.4.1.2.tar.xz) = 127649116 bytes +SHA1 (patch-Makefile.in) = e34092a731f4da0d8c048945c75287327b6b9cb2 +SHA1 (patch-bin_distro-install-desktop-integration) = 78921a0fb6db8b87f5d64c09579dc6f9211949b5 SHA1 (patch-configure.ac) = 271be73ef8ed5e507660098a92b98eeca85bb62f SHA1 (patch-desktop_Library__sofficeapp.mk) = e445b1a265fadf4f83f1c40bc541c11c26860352 SHA1 (patch-odk_CustomTarget__classes.mk) = 991896c402d1d2505e5aacec5df78439c8e9a767 +SHA1 (patch-solenv_bin_ooinstall) = 3c9be63acc0af31ca0509f6546ae02ac53aff878 SHA1 (patch-solenv_gbuild_AllLangResTarget.mk) = c6fa51c74e3be0e9d4f18e1481039d44d6c3db98 SHA1 (patch-solenv_gbuild_Deliver.mk) = 07ffb548a24edfe64fcf370423a2124c7a32cafb +SHA1 (patch-solenv_gbuild_ExternalProject.mk) = dd55f3e5fd17f6060898c68a7e1d97e647d4b5b1 SHA1 (patch-solenv_gbuild_Module.mk) = 729f051341b21325537a7f9902e7283caa66a456 SHA1 (patch-svx_Executable__gengal.mk) = 45de03599790cabea05539b4bb9fd01098c25eb8 SHA1 (patch-sw_Executable__tiledrendering.mk) = a1a4c520582772526d821a78e42a23e182cdfba1 +SHA1 (patch-sysui_desktop_share_create_tree.sh) = 338cb0f157ea9b49965aa7b31350173b8b7557a6 SHA1 (patch-vcl_Executable__ui-previewer.mk) = e392b3a2e53c0f46b8ba84a0b83a6bbd9421bb9b SHA1 (patch-vcl_Executable__vcldemo.mk) = 4530798dec71410af0c3798461bc17f5228d53c6 SHA1 (patch-vcl_Library__vcl.mk) = bcb400be81b7ba3f572b2f22985c967ac496ce02 diff --git a/misc/libreoffice4/patches/patch-Makefile.in b/misc/libreoffice4/patches/patch-Makefile.in new file mode 100644 index 00000000000..56a6e6d0400 --- /dev/null +++ b/misc/libreoffice4/patches/patch-Makefile.in @@ -0,0 +1,13 @@ +$NetBSD: patch-Makefile.in,v 1.1 2015/03/12 02:59:04 ryoon Exp $ + +--- Makefile.in.orig 2015-01-22 20:05:28.000000000 +0000 ++++ Makefile.in +@@ -312,7 +312,7 @@ else + endif + + distro-pack-install: install +- $(SRCDIR)/bin/distro-install-clean-up ++# $(SRCDIR)/bin/distro-install-clean-up + $(SRCDIR)/bin/distro-install-desktop-integration + $(SRCDIR)/bin/distro-install-sdk + $(SRCDIR)/bin/distro-install-file-lists diff --git a/misc/libreoffice4/patches/patch-bin_distro-install-desktop-integration b/misc/libreoffice4/patches/patch-bin_distro-install-desktop-integration new file mode 100644 index 00000000000..74ccfe835b2 --- /dev/null +++ b/misc/libreoffice4/patches/patch-bin_distro-install-desktop-integration @@ -0,0 +1,46 @@ +$NetBSD: patch-bin_distro-install-desktop-integration,v 1.1 2015/03/12 02:59:04 ryoon Exp $ + +--- bin/distro-install-desktop-integration.orig 2015-01-22 20:05:28.000000000 +0000 ++++ bin/distro-install-desktop-integration +@@ -94,13 +94,13 @@ add_wrapper() + } + + # install desktop integration from plain packages +-sysui_temp=`mktemp -t -d distro-pack-desktop-integration-XXXXXX` ++sysui_temp=`mktemp -d -t distro-pack-desktop-integration-XXXXXX` + cp -a workdir/CustomTarget/sysui/share/libreoffice/* "$sysui_temp" + cp -a sysui/desktop/share/create_tree.sh "$sysui_temp" + builddir=`pwd` + cd $sysui_temp + # we want non-versioned stuff in the distro packages +-sed -i \ ++gsed -i \ + -e "s/\($INSTALLDIRNAME\)$PRODUCTVERSION_NODOT/\1/" \ + -e "s/\($INSTALLDIRNAME\)$PRODUCTVERSION/\1/" \ + -e "s/\($PRODUCTNAME\) $PRODUCTVERSION/\1/" \ +@@ -111,6 +111,7 @@ sed -i \ + export PREFIX=$INSTALLDIRNAME + export ICON_PREFIX=$INSTALLDIRNAME + export ICON_SOURCE_DIR=$builddir/sysui/desktop/icons ++ export APPDATA_SOURCE_DIR=$builddir/sysui/desktop/appstream-appdata + export PRODUCTVERSION= + export KDEMAINDIR=$PREFIXDIR + export PREFIXDIR=${PREFIXDIR} +@@ -130,7 +131,7 @@ fi + # we want non-versioned desktop files + cd $DESTDIR/$INSTALLDIR/share/xdg + # we want non-versioned stuff in the distro packages +-sed -i \ ++gsed -i \ + -e "s/\($INSTALLDIRNAME\)$PRODUCTVERSION_NODOT/\1/" \ + -e "s/\($INSTALLDIRNAME\)$PRODUCTVERSION/\1/" \ + -e "s/\($PRODUCTNAME\) $PRODUCTVERSION/\1/" \ +@@ -145,7 +146,7 @@ if test -f $DESTDIR/gid_Module_Root_Bran + $PREFIXDIR/share/mime/packages \ + $PREFIXDIR/share/mime-info \ + $PREFIXDIR/share/icons ; do +- find "$DESTDIR$dir" \( -type f -o -type l \) -printf "$dir/%P\n" >>$DESTDIR/gid_Module_Root_Brand ++ find "$DESTDIR$dir" \( -type f -o -type l \) -print | sed -e "s|^$DESTDIR||" >>$DESTDIR/gid_Module_Root_Brand + done + fi + diff --git a/misc/libreoffice4/patches/patch-solenv_bin_ooinstall b/misc/libreoffice4/patches/patch-solenv_bin_ooinstall new file mode 100644 index 00000000000..51b5942d977 --- /dev/null +++ b/misc/libreoffice4/patches/patch-solenv_bin_ooinstall @@ -0,0 +1,19 @@ +$NetBSD: patch-solenv_bin_ooinstall,v 1.1 2015/03/12 02:59:04 ryoon Exp $ + +--- solenv/bin/ooinstall.orig 2014-04-08 11:46:25.000000000 +0000 ++++ solenv/bin/ooinstall +@@ -87,10 +87,10 @@ if ($is_windows) { + # make distro-pack-install shufle with the SDK installation to make it LSB compliant + # it creates symlinks from the orignal path to /usr/share; they are not valid with $DESTDIR + # and potential second ooinstall call fails with strange error messages if the old tree is still there +-if ($destdir && "$ENV{DESTDIR}" ne "/" && -d "$ENV{DESTDIR}") { +- print "Cleaning destdir...\n"; +- system ("rm -rf \"$ENV{DESTDIR}\"") && die "Failed to clean up destdir: $!"; +-} ++#if ($destdir && "$ENV{DESTDIR}" ne "/" && -d "$ENV{DESTDIR}") { ++# print "Cleaning destdir...\n"; ++# system ("rm -rf \"$ENV{DESTDIR}\"") && die "Failed to clean up destdir: $!"; ++#} + + print "Running LibreOffice installer\n"; + diff --git a/misc/libreoffice4/patches/patch-solenv_gbuild_ExternalProject.mk b/misc/libreoffice4/patches/patch-solenv_gbuild_ExternalProject.mk new file mode 100644 index 00000000000..e7bf39222c0 --- /dev/null +++ b/misc/libreoffice4/patches/patch-solenv_gbuild_ExternalProject.mk @@ -0,0 +1,13 @@ +$NetBSD: patch-solenv_gbuild_ExternalProject.mk,v 1.1 2015/03/12 02:59:04 ryoon Exp $ + +--- solenv/gbuild/ExternalProject.mk.orig 2015-02-20 17:33:24.000000000 +0000 ++++ solenv/gbuild/ExternalProject.mk +@@ -212,7 +212,7 @@ define gb_ExternalProject_run + $(if $(findstring YES,$(UNPACKED_IS_BIN_TARBALL)),\ + touch $@, + $(call gb_Helper_print_on_error,cd $(EXTERNAL_WORKDIR)/$(3) && \ +- unset Platform && \ ++ (unset Platform || true)&& \ + $(if $(WRAPPERS),export $(WRAPPERS) &&) \ + $(if $(NMAKE),INCLUDE="$(gb_ExternalProject_INCLUDE)" LIB="$(ILIB)" MAKEFLAGS=) \ + $(2) && touch $@,$(EXTERNAL_WORKDIR)/$(if $(3),$(3)/,)$(if $(4),$(4),$(1).log)) diff --git a/misc/libreoffice4/patches/patch-sysui_desktop_share_create_tree.sh b/misc/libreoffice4/patches/patch-sysui_desktop_share_create_tree.sh new file mode 100644 index 00000000000..31dd5f73dfe --- /dev/null +++ b/misc/libreoffice4/patches/patch-sysui_desktop_share_create_tree.sh @@ -0,0 +1,22 @@ +$NetBSD: patch-sysui_desktop_share_create_tree.sh,v 1.1 2015/03/12 02:59:04 ryoon Exp $ + +--- sysui/desktop/share/create_tree.sh.orig 2015-02-20 17:33:24.000000000 +0000 ++++ sysui/desktop/share/create_tree.sh +@@ -63,7 +63,7 @@ test -n "${OFFICE_PREFIX}" && office_pre + office_root=${office_prefix}/${PREFIX} + + #this symlink is needed to have the API boostrap functions running right +-ln -sf "${office_root}/program/soffice" "${DESTDIR}/${PREFIXDIR}/bin/${PREFIX}" ++ln -sf "${INSTALLDIR}/program/soffice" "${DESTDIR}/${PREFIXDIR}/bin/${PREFIX}" + + if test "${PREFIX}" != libreoffice${PRODUCTVERSION} -a "${PREFIX}" != libreofficedev${PRODUCTVERSION} ; then + # compat symlinks +@@ -79,7 +79,7 @@ chmod 0644 "${DESTDIR}/${PREFIXDIR}/shar + + mkdir -p "${DESTDIR}/${PREFIXDIR}/share/applications" + for i in `cat launcherlist`; do +- ln -sf "${office_root}/share/xdg/${i}" "${DESTDIR}/${PREFIXDIR}/share/applications/${PREFIX}-${i}" ++ ln -sf "${INSTALLDIR}/share/xdg/${i}" "${DESTDIR}/${PREFIXDIR}/share/applications/${PREFIX}-${i}" + done + + mkdir -p "${DESTDIR}/${PREFIXDIR}/share/appdata" |