Rename desktop files to avoid conflicts. Also install desktop files for

libreoffice5-bin.

8 files changed, 9 insertions, 8 deletions

diff --git a/misc/libreoffice4-bin/Makefile b/misc/libreoffice4-bin/Makefile
index 5355c591e41..430ead22bb6 100644
--- a/misc/libreoffice4-bin/Makefile
+++ b/misc/libreoffice4-bin/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2016/03/03 22:05:42 youri Exp $
+# $NetBSD: Makefile,v 1.17 2016/03/04 00:31:49 youri Exp $
 
 DISTNAME=		libreoffice4-bin	# overridden below
 PKGNAME=		libreoffice4-bin-${OO_RELEASE}
@@ -81,4 +81,5 @@ do-install:
 	${LN} -sf ../opt/libreoffice${OO_BASEVER}/program/${i} ${DESTDIR}${PREFIX}/bin/${i}
 .endfor
 
+.include "../../sysutils/desktop-file-utils/desktopdb.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/misc/libreoffice4-bin/PLIST.proglinks b/misc/libreoffice4-bin/PLIST.proglinks
index 5a06d4220b8..7fc55a395b5 100644
--- a/misc/libreoffice4-bin/PLIST.proglinks
+++ b/misc/libreoffice4-bin/PLIST.proglinks
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST.proglinks,v 1.4 2016/03/03 22:05:42 youri Exp $
+@comment $NetBSD: PLIST.proglinks,v 1.5 2016/03/04 00:31:49 youri Exp $
 bin/sbase
 bin/scalc
 bin/sdraw
@@ -6,9 +6,9 @@ bin/simpress
 bin/smath
 bin/soffice
 bin/swriter
-share/applications/base.desktop
-share/applications/calc.desktop
-share/applications/draw.desktop
-share/applications/impress.desktop
-share/applications/math.desktop
-share/applications/writer.desktop
+share/applications/libreoffice-bin-base.desktop
+share/applications/libreoffice-bin-calc.desktop
+share/applications/libreoffice-bin-draw.desktop
+share/applications/libreoffice-bin-impress.desktop
+share/applications/libreoffice-bin-math.desktop
+share/applications/libreoffice-bin-writer.desktop
diff --git a/misc/libreoffice4-bin/files/base.desktop b/misc/libreoffice4-bin/files/libreoffice-bin-base.desktop
index 78e144e8774..78e144e8774 100644
--- a/misc/libreoffice4-bin/files/base.desktop
+++ b/misc/libreoffice4-bin/files/libreoffice-bin-base.desktop
diff --git a/misc/libreoffice4-bin/files/calc.desktop b/misc/libreoffice4-bin/files/libreoffice-bin-calc.desktop
index 0a667a5afa5..0a667a5afa5 100644
--- a/misc/libreoffice4-bin/files/calc.desktop
+++ b/misc/libreoffice4-bin/files/libreoffice-bin-calc.desktop
diff --git a/misc/libreoffice4-bin/files/draw.desktop b/misc/libreoffice4-bin/files/libreoffice-bin-draw.desktop
index 84f19a4e452..84f19a4e452 100644
--- a/misc/libreoffice4-bin/files/draw.desktop
+++ b/misc/libreoffice4-bin/files/libreoffice-bin-draw.desktop
diff --git a/misc/libreoffice4-bin/files/impress.desktop b/misc/libreoffice4-bin/files/libreoffice-bin-impress.desktop
index 95eb4469f21..95eb4469f21 100644
--- a/misc/libreoffice4-bin/files/impress.desktop
+++ b/misc/libreoffice4-bin/files/libreoffice-bin-impress.desktop
diff --git a/misc/libreoffice4-bin/files/math.desktop b/misc/libreoffice4-bin/files/libreoffice-bin-math.desktop
index 3430fdc3847..3430fdc3847 100644
--- a/misc/libreoffice4-bin/files/math.desktop
+++ b/misc/libreoffice4-bin/files/libreoffice-bin-math.desktop
diff --git a/misc/libreoffice4-bin/files/writer.desktop b/misc/libreoffice4-bin/files/libreoffice-bin-writer.desktop
index ca1c2239bc7..ca1c2239bc7 100644
--- a/misc/libreoffice4-bin/files/writer.desktop
+++ b/misc/libreoffice4-bin/files/libreoffice-bin-writer.desktop