Fri Mar 4 00:31:49 2016 UTC ()
Rename desktop files to avoid conflicts. Also install desktop files for
libreoffice5-bin.


(youri)
diff -r1.16 -r1.17 pkgsrc/misc/libreoffice4-bin/Makefile
diff -r1.4 -r1.5 pkgsrc/misc/libreoffice4-bin/PLIST.proglinks
diff -r1.1 -r0 pkgsrc/misc/libreoffice4-bin/files/base.desktop
diff -r1.1 -r0 pkgsrc/misc/libreoffice4-bin/files/calc.desktop
diff -r1.1 -r0 pkgsrc/misc/libreoffice4-bin/files/draw.desktop
diff -r1.1 -r0 pkgsrc/misc/libreoffice4-bin/files/impress.desktop
diff -r1.1 -r0 pkgsrc/misc/libreoffice4-bin/files/math.desktop
diff -r1.1 -r0 pkgsrc/misc/libreoffice4-bin/files/writer.desktop
diff -r0 -r1.1 pkgsrc/misc/libreoffice4-bin/files/libreoffice-bin-base.desktop
diff -r0 -r1.1 pkgsrc/misc/libreoffice4-bin/files/libreoffice-bin-calc.desktop
diff -r0 -r1.1 pkgsrc/misc/libreoffice4-bin/files/libreoffice-bin-draw.desktop
diff -r0 -r1.1 pkgsrc/misc/libreoffice4-bin/files/libreoffice-bin-impress.desktop
diff -r0 -r1.1 pkgsrc/misc/libreoffice4-bin/files/libreoffice-bin-math.desktop
diff -r0 -r1.1 pkgsrc/misc/libreoffice4-bin/files/libreoffice-bin-writer.desktop
diff -r1.2 -r1.3 pkgsrc/misc/libreoffice5-bin/PLIST.proglinks

cvs diff -r1.16 -r1.17 pkgsrc/misc/libreoffice4-bin/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/misc/libreoffice4-bin/Attic/Makefile 2016/03/03 22:05:42 1.16
+++ pkgsrc/misc/libreoffice4-bin/Attic/Makefile 2016/03/04 00:31:49 1.17
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.16 2016/03/03 22:05:42 youri Exp $ 1# $NetBSD: Makefile,v 1.17 2016/03/04 00:31:49 youri Exp $
2 2
3DISTNAME= libreoffice4-bin # overridden below 3DISTNAME= libreoffice4-bin # overridden below
4PKGNAME= libreoffice4-bin-${OO_RELEASE} 4PKGNAME= libreoffice4-bin-${OO_RELEASE}
5CATEGORIES= misc 5CATEGORIES= misc
6 6
7MAINTAINER= ryoon@NetBSD.org 7MAINTAINER= ryoon@NetBSD.org
8HOMEPAGE= http://www.libreoffice.org/ 8HOMEPAGE= http://www.libreoffice.org/
9COMMENT= Integrated office productivity suite (binary pkg) 9COMMENT= Integrated office productivity suite (binary pkg)
10LICENSE= gnu-lgpl-v3 10LICENSE= gnu-lgpl-v3
11 11
12CONFLICTS+= staroffice-[0-9]* 12CONFLICTS+= staroffice-[0-9]*
13CONFLICTS+= openoffice-[0-9]* 13CONFLICTS+= openoffice-[0-9]*
14CONFLICTS+= openoffice-bin-[0-9]* 14CONFLICTS+= openoffice-bin-[0-9]*
@@ -71,14 +71,15 @@ do-install: @@ -71,14 +71,15 @@ do-install:
71 ${UNIQ} ${RPM2PKG_PLIST} | \ 71 ${UNIQ} ${RPM2PKG_PLIST} | \
72 ${SED} -e 's,^@exec mkdir -m 755 -p %D/,@pkgdir,' > ${WRKDIR}/PLIST 72 ${SED} -e 's,^@exec mkdir -m 755 -p %D/,@pkgdir,' > ${WRKDIR}/PLIST
73 ${RM} -f ${DESTDIR}${PREFIX}/bin/soffice 73 ${RM} -f ${DESTDIR}${PREFIX}/bin/soffice
74 ${SED} -e "s|@@PREFIX@@|${PREFIX}|g" -e "s|@@OO_VER@@|${OO_VER}|g" \ 74 ${SED} -e "s|@@PREFIX@@|${PREFIX}|g" -e "s|@@OO_VER@@|${OO_VER}|g" \
75 -e "s|@@JAVA_HOME@@|${PKG_JAVA_HOME}|g" \ 75 -e "s|@@JAVA_HOME@@|${PKG_JAVA_HOME}|g" \
76 -e "s|@@OO_BASEVER@@|${OO_BASEVER}|g" \ 76 -e "s|@@OO_BASEVER@@|${OO_BASEVER}|g" \
77 < ${FILESDIR}/soffice > ${DESTDIR}${PREFIX}/bin/soffice 77 < ${FILESDIR}/soffice > ${DESTDIR}${PREFIX}/bin/soffice
78 ${CHMOD} +x ${DESTDIR}${PREFIX}/bin/soffice 78 ${CHMOD} +x ${DESTDIR}${PREFIX}/bin/soffice
79 ${INSTALL_DATA} ${FILESDIR}/*.desktop ${DESTDIR}${PREFIX}/share/applications 79 ${INSTALL_DATA} ${FILESDIR}/*.desktop ${DESTDIR}${PREFIX}/share/applications
80.for i in sbase scalc sdraw simpress smath swriter 80.for i in sbase scalc sdraw simpress smath swriter
81 ${LN} -sf ../opt/libreoffice${OO_BASEVER}/program/${i} ${DESTDIR}${PREFIX}/bin/${i} 81 ${LN} -sf ../opt/libreoffice${OO_BASEVER}/program/${i} ${DESTDIR}${PREFIX}/bin/${i}
82.endfor 82.endfor
83 83
 84.include "../../sysutils/desktop-file-utils/desktopdb.mk"
84.include "../../mk/bsd.pkg.mk" 85.include "../../mk/bsd.pkg.mk"

cvs diff -r1.4 -r1.5 pkgsrc/misc/libreoffice4-bin/Attic/PLIST.proglinks (expand / switch to unified diff)

--- pkgsrc/misc/libreoffice4-bin/Attic/PLIST.proglinks 2016/03/03 22:05:42 1.4
+++ pkgsrc/misc/libreoffice4-bin/Attic/PLIST.proglinks 2016/03/04 00:31:49 1.5

File Deleted: pkgsrc/misc/libreoffice4-bin/files/Attic/base.desktop

File Deleted: pkgsrc/misc/libreoffice4-bin/files/Attic/calc.desktop

File Deleted: pkgsrc/misc/libreoffice4-bin/files/Attic/draw.desktop

File Deleted: pkgsrc/misc/libreoffice4-bin/files/Attic/impress.desktop

File Deleted: pkgsrc/misc/libreoffice4-bin/files/Attic/math.desktop

File Deleted: pkgsrc/misc/libreoffice4-bin/files/Attic/writer.desktop

File Added: pkgsrc/misc/libreoffice4-bin/files/Attic/libreoffice-bin-base.desktop
#
# This file is part of the LibreOffice project.
#
# This Source Code Form is subject to the terms of the Mozilla Public
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
#
# This file incorporates work covered by the following license notice:
#
#   Licensed to the Apache Software Foundation (ASF) under one or more
#   contributor license agreements. See the NOTICE file distributed
#   with this work for additional information regarding copyright
#   ownership. The ASF licenses this file to you under the Apache
#   License, Version 2.0 (the "License"); you may not use this file
#   except in compliance with the License. You may obtain a copy of
#   the License at http://www.apache.org/licenses/LICENSE-2.0 .
#
[Desktop Entry]
Version=1.0
Terminal=false
Icon=base
Type=Application
Categories=Office;Database;X-Red-Hat-Base;X-MandrivaLinux-MoreApplications-Databases;
Exec=soffice --base
MimeType=application/vnd.oasis.opendocument.database;application/vnd.sun.xml.base;
Name=LibreOffice Base
GenericName=Database Development
Comment=Manage databases, create queries and reports to track and manage your information by using Base.
StartupNotify=true
X-GIO-NoFuse=true
Keywords=Data;SQL;
InitialPreference=5
StartupWMClass=libreoffice-base
X-KDE-Protocols=file,http,ftp,webdav

Actions=NewDocument;
[Desktop Action NewDocument]
Name=New Database
Exec=soffice --base

File Added: pkgsrc/misc/libreoffice4-bin/files/Attic/libreoffice-bin-calc.desktop
#
# This file is part of the LibreOffice project.
#
# This Source Code Form is subject to the terms of the Mozilla Public
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
#
# This file incorporates work covered by the following license notice:
#
#   Licensed to the Apache Software Foundation (ASF) under one or more
#   contributor license agreements. See the NOTICE file distributed
#   with this work for additional information regarding copyright
#   ownership. The ASF licenses this file to you under the Apache
#   License, Version 2.0 (the "License"); you may not use this file
#   except in compliance with the License. You may obtain a copy of
#   the License at http://www.apache.org/licenses/LICENSE-2.0 .
#
[Desktop Entry]
Version=1.0
Terminal=false
Icon=calc
Type=Application
Categories=Office;Spreadsheet;X-Red-Hat-Base;X-MandrivaLinux-Office-Spreadsheets;
Exec=soffice --calc
MimeType=application/vnd.oasis.opendocument.spreadsheet;application/vnd.oasis.opendocument.spreadsheet-template;application/vnd.sun.xml.calc;application/vnd.sun.xml.calc.template;application/msexcel;application/vnd.ms-excel;application/vnd.openxmlformats-officedocument.spreadsheetml.sheet;application/vnd.ms-excel.sheet.macroenabled.12;application/vnd.openxmlformats-officedocument.spreadsheetml.template;application/vnd.ms-excel.template.macroenabled.12;application/vnd.ms-excel.sheet.binary.macroenabled.12;text/csv;application/x-dbf;text/spreadsheet;application/csv;application/excel;application/tab-separated-values;application/vnd.lotus-1-2-3;application/vnd.oasis.opendocument.chart;application/vnd.oasis.opendocument.chart-template;application/x-dbase;application/x-dos_ms_excel;application/x-excel;application/x-msexcel;application/x-ms-excel;application/x-quattropro;application/x-123;text/comma-separated-values;text/tab-separated-values;text/x-comma-separated-values;text/x-csv;application/vnd.oasis.opendocument.spreadsheet-flat-xml;application/vnd.ms-works;application/clarisworks;
Name=LibreOffice Calc
GenericName=Spreadsheet
Comment=Perform calculations, analyze information and manage lists in spreadsheets by using Calc.
StartupNotify=true
X-GIO-NoFuse=true
Keywords=Accounting;Stats;OpenDocument Spreadsheet;Chart;Microsoft Excel;Microsoft Works;OpenOffice Calc;ods;xls;xlsx;
InitialPreference=5
StartupWMClass=libreoffice-calc
X-KDE-Protocols=file,http,ftp,webdav

Actions=NewDocument;
[Desktop Action NewDocument]
Name=New Spreadsheet
Exec=soffice --calc

File Added: pkgsrc/misc/libreoffice4-bin/files/Attic/libreoffice-bin-draw.desktop
#
# This file is part of the LibreOffice project.
#
# This Source Code Form is subject to the terms of the Mozilla Public
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
#
# This file incorporates work covered by the following license notice:
#
#   Licensed to the Apache Software Foundation (ASF) under one or more
#   contributor license agreements. See the NOTICE file distributed
#   with this work for additional information regarding copyright
#   ownership. The ASF licenses this file to you under the Apache
#   License, Version 2.0 (the "License"); you may not use this file
#   except in compliance with the License. You may obtain a copy of
#   the License at http://www.apache.org/licenses/LICENSE-2.0 .
#
[Desktop Entry]
Version=1.0
Terminal=false
Icon=draw
Type=Application
Categories=Office;FlowChart;Graphics;2DGraphics;VectorGraphics;X-Red-Hat-Base;X-MandrivaLinux-Office-Drawing;
Exec=soffice --draw
MimeType=application/vnd.oasis.opendocument.graphics;application/vnd.oasis.opendocument.graphics-flat-xml;application/vnd.oasis.opendocument.graphics-template;application/vnd.sun.xml.draw;application/vnd.sun.xml.draw.template;application/vnd.visio;application/x-wpg;application/vnd.corel-draw;application/vnd.ms-publisher;image/x-freehand;application/clarisworks;application/x-pagemaker;
Name=LibreOffice Draw
GenericName=Drawing Program
Comment=Create and edit drawings, flow charts and logos by using Draw.
StartupNotify=true
X-GIO-NoFuse=true
Keywords=Vector;Schema;Diagram;Layout;OpenDocument Graphics;Microsoft Publisher;Corel Draw;cdr;odg;svg;
InitialPreference=5
StartupWMClass=libreoffice-draw
X-KDE-Protocols=file,http,ftp,webdav

Actions=NewDocument;
[Desktop Action NewDocument]
Name=New Drawing
Exec=soffice --draw

File Added: pkgsrc/misc/libreoffice4-bin/files/Attic/libreoffice-bin-impress.desktop
#
# This file is part of the LibreOffice project.
#
# This Source Code Form is subject to the terms of the Mozilla Public
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
#
# This file incorporates work covered by the following license notice:
#
#   Licensed to the Apache Software Foundation (ASF) under one or more
#   contributor license agreements. See the NOTICE file distributed
#   with this work for additional information regarding copyright
#   ownership. The ASF licenses this file to you under the Apache
#   License, Version 2.0 (the "License"); you may not use this file
#   except in compliance with the License. You may obtain a copy of
#   the License at http://www.apache.org/licenses/LICENSE-2.0 .
#
[Desktop Entry]
Version=1.0
Terminal=false
Icon=impress
Type=Application
Categories=Office;Presentation;X-Red-Hat-Base;X-MandrivaLinux-Office-Presentations;
Exec=soffice --impress
MimeType=application/vnd.oasis.opendocument.presentation;application/vnd.oasis.opendocument.presentation-template;application/vnd.sun.xml.impress;application/vnd.sun.xml.impress.template;application/mspowerpoint;application/vnd.ms-powerpoint;application/vnd.openxmlformats-officedocument.presentationml.presentation;application/vnd.ms-powerpoint.presentation.macroenabled.12;application/vnd.openxmlformats-officedocument.presentationml.template;application/vnd.ms-powerpoint.template.macroenabled.12;application/vnd.openxmlformats-officedocument.presentationml.slide;application/vnd.openxmlformats-officedocument.presentationml.slideshow;application/vnd.ms-powerpoint.slideshow.macroEnabled.12;application/vnd.oasis.opendocument.presentation-flat-xml;application/x-iwork-keynote-sffkey;
Name=LibreOffice Impress
GenericName=Presentation
Comment=Create and edit presentations for slideshows, meeting and Web pages by using Impress.
StartupNotify=true
X-GIO-NoFuse=true
Keywords=Slideshow;Slides;OpenDocument Presentation;Microsoft PowerPoint;Microsoft Works;OpenOffice Impress;odp;ppt;pptx;
InitialPreference=5
StartupWMClass=libreoffice-impress
X-KDE-Protocols=file,http,ftp,webdav

Actions=NewDocument;
[Desktop Action NewDocument]
Name=New Presentation
Exec=soffice --impress

File Added: pkgsrc/misc/libreoffice4-bin/files/Attic/libreoffice-bin-math.desktop
#
# This file is part of the LibreOffice project.
#
# This Source Code Form is subject to the terms of the Mozilla Public
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
#
# This file incorporates work covered by the following license notice:
#
#   Licensed to the Apache Software Foundation (ASF) under one or more
#   contributor license agreements. See the NOTICE file distributed
#   with this work for additional information regarding copyright
#   ownership. The ASF licenses this file to you under the Apache
#   License, Version 2.0 (the "License"); you may not use this file
#   except in compliance with the License. You may obtain a copy of
#   the License at http://www.apache.org/licenses/LICENSE-2.0 .
#
[Desktop Entry]
Version=1.0
Terminal=false
NoDisplay=false
Icon=math
Type=Application
Categories=Office;Spreadsheet;Education;Science;Math;X-Red-Hat-Base;X-MandrivaLinux-Office-Other;
Exec=soffice --math
MimeType=application/vnd.oasis.opendocument.formula;application/vnd.sun.xml.math;application/vnd.oasis.opendocument.formula-template;text/mathml;application/mathml+xml;
Name=LibreOffice Math
GenericName=Formula Editor
Comment=Create and edit scientific formulas and equations by using Math.
StartupNotify=true
X-GIO-NoFuse=true
Keywords=Equation;OpenDocument Formula;Formula;odf;MathML;
InitialPreference=5
StartupWMClass=libreoffice-math
X-KDE-Protocols=file,http,ftp,webdav

Actions=NewDocument;
[Desktop Action NewDocument]
Name=New Formula
Exec=soffice --math

File Added: pkgsrc/misc/libreoffice4-bin/files/Attic/libreoffice-bin-writer.desktop
#
# This file is part of the LibreOffice project.
#
# This Source Code Form is subject to the terms of the Mozilla Public
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
#
# This file incorporates work covered by the following license notice:
#
#   Licensed to the Apache Software Foundation (ASF) under one or more
#   contributor license agreements. See the NOTICE file distributed
#   with this work for additional information regarding copyright
#   ownership. The ASF licenses this file to you under the Apache
#   License, Version 2.0 (the "License"); you may not use this file
#   except in compliance with the License. You may obtain a copy of
#   the License at http://www.apache.org/licenses/LICENSE-2.0 .
#
[Desktop Entry]
Version=1.0
Terminal=false
Icon=writer
Type=Application
Categories=Office;WordProcessor;X-Red-Hat-Base;X-MandrivaLinux-Office-Wordprocessors;
Exec=soffice --writer
MimeType=application/vnd.oasis.opendocument.text;application/vnd.oasis.opendocument.text-template;application/vnd.oasis.opendocument.text-web;application/vnd.oasis.opendocument.text-master;application/vnd.oasis.opendocument.text-master-template;application/vnd.sun.xml.writer;application/vnd.sun.xml.writer.template;application/vnd.sun.xml.writer.global;application/msword;application/vnd.ms-word;application/x-doc;application/x-hwp;application/rtf;text/rtf;application/vnd.wordperfect;application/wordperfect;application/vnd.lotus-wordpro;application/vnd.openxmlformats-officedocument.wordprocessingml.document;application/vnd.ms-word.document.macroenabled.12;application/vnd.openxmlformats-officedocument.wordprocessingml.template;application/vnd.ms-word.template.macroenabled.12;application/vnd.ms-works;application/vnd.stardivision.writer-global;application/x-extension-txt;application/x-t602;text/plain;application/vnd.oasis.opendocument.text-flat-xml;application/x-fictionbook+xml;application/macwriteii;application/x-aportisdoc;application/prs.plucker;application/vnd.palm;application/clarisworks;application/x-sony-bbeb;application/x-abiword;
Name=LibreOffice Writer
GenericName=Word Processor
Comment=Create and edit text and graphics in letters, reports, documents and Web pages by using Writer.
StartupNotify=true
X-GIO-NoFuse=true
Keywords=Text;Letter;Fax;Document;OpenDocument Text;Microsoft Word;Microsoft Works;Lotus WordPro;OpenOffice Writer;CV;odt;doc;docx;rtf;
InitialPreference=5
StartupWMClass=libreoffice-writer
X-KDE-Protocols=file,http,ftp,webdav

Actions=NewDocument;
[Desktop Action NewDocument]
Name=New Document
Exec=soffice --writer

cvs diff -r1.2 -r1.3 pkgsrc/misc/libreoffice5-bin/PLIST.proglinks (expand / switch to unified diff)

--- pkgsrc/misc/libreoffice5-bin/PLIST.proglinks 2016/03/03 23:22:34 1.2
+++ pkgsrc/misc/libreoffice5-bin/PLIST.proglinks 2016/03/04 00:31:49 1.3