Thu Mar 3 23:22:34 2016 UTC ()
Add desktop files, making it easier for users to launch the programs.


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

--- pkgsrc/misc/libreoffice5-bin/Makefile 2016/02/14 19:54:47 1.2
+++ pkgsrc/misc/libreoffice5-bin/Makefile 2016/03/03 23:22:34 1.3
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.2 2016/02/14 19:54:47 ryoon Exp $ 1# $NetBSD: Makefile,v 1.3 2016/03/03 23:22:34 youri Exp $
2 2
3DISTNAME= libreoffice5-bin # overridden below 3DISTNAME= libreoffice5-bin # overridden below
4PKGNAME= libreoffice5-bin-${OO_RELEASE} 4PKGNAME= libreoffice5-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]*
@@ -55,29 +55,31 @@ USE_TOOLS+= patch uniq @@ -55,29 +55,31 @@ USE_TOOLS+= patch uniq
55 55
56.if ${EMUL_PLATFORM} == "linux-i386" 56.if ${EMUL_PLATFORM} == "linux-i386"
57DISTNAME= LibreOffice_${OO_RELEASE}_Linux_x86_rpm 57DISTNAME= LibreOffice_${OO_RELEASE}_Linux_x86_rpm
58WRKSRC= ${WRKDIR}/LibreOffice_${OO_RELEASEV}_Linux_x86_rpm 58WRKSRC= ${WRKDIR}/LibreOffice_${OO_RELEASEV}_Linux_x86_rpm
59MASTER_SITES= http://download.documentfoundation.org/libreoffice/stable/${OO_RELEASE}/rpm/x86/ 59MASTER_SITES= http://download.documentfoundation.org/libreoffice/stable/${OO_RELEASE}/rpm/x86/
60.elif ${EMUL_PLATFORM} == "linux-x86_64" 60.elif ${EMUL_PLATFORM} == "linux-x86_64"
61DISTNAME= LibreOffice_${OO_RELEASE}_Linux_x86-64_rpm 61DISTNAME= LibreOffice_${OO_RELEASE}_Linux_x86-64_rpm
62WRKSRC= ${WRKDIR}/LibreOffice_${OO_RELEASEV}_Linux_x86-64_rpm 62WRKSRC= ${WRKDIR}/LibreOffice_${OO_RELEASEV}_Linux_x86-64_rpm
63MASTER_SITES= http://download.documentfoundation.org/libreoffice/stable/${OO_RELEASE}/rpm/x86_64/ 63MASTER_SITES= http://download.documentfoundation.org/libreoffice/stable/${OO_RELEASE}/rpm/x86_64/
64.endif 64.endif
65 65
66.include "options.mk" 66.include "options.mk"
67 67
68INSTALLATION_DIRS= bin 68INSTALLATION_DIRS= bin share/applications
 69DESKTOP_FILESDIR= ${.CURDIR}/../../misc/libreoffice4-bin/files
69 70
70do-install: 71do-install:
71 ${UNIQ} ${RPM2PKG_PLIST} | \ 72 ${UNIQ} ${RPM2PKG_PLIST} | \
72 ${SED} -e 's,^@exec mkdir -m 755 -p %D/,@pkgdir,' > ${WRKDIR}/PLIST 73 ${SED} -e 's,^@exec mkdir -m 755 -p %D/,@pkgdir,' > ${WRKDIR}/PLIST
73 ${RM} -f ${DESTDIR}${PREFIX}/bin/soffice 74 ${RM} -f ${DESTDIR}${PREFIX}/bin/soffice
74 ${SED} -e "s|@@PREFIX@@|${PREFIX}|g" -e "s|@@OO_VER@@|${OO_VER}|g" \ 75 ${SED} -e "s|@@PREFIX@@|${PREFIX}|g" -e "s|@@OO_VER@@|${OO_VER}|g" \
75 -e "s|@@JAVA_HOME@@|${PKG_JAVA_HOME}|g" \ 76 -e "s|@@JAVA_HOME@@|${PKG_JAVA_HOME}|g" \
76 -e "s|@@OO_BASEVER@@|${OO_BASEVER}|g" \ 77 -e "s|@@OO_BASEVER@@|${OO_BASEVER}|g" \
77 < ${FILESDIR}/soffice > ${DESTDIR}${PREFIX}/bin/soffice 78 < ${FILESDIR}/soffice > ${DESTDIR}${PREFIX}/bin/soffice
78 ${CHMOD} +x ${DESTDIR}${PREFIX}/bin/soffice 79 ${CHMOD} +x ${DESTDIR}${PREFIX}/bin/soffice
 80 ${INSTALL_DATA} ${DESKTOP_FILESDIR}/*.desktop ${DESTDIR}${PREFIX}/share/applications
79.for i in sbase scalc sdraw simpress smath swriter 81.for i in sbase scalc sdraw simpress smath swriter
80 ${LN} -sf ../opt/libreoffice${OO_BASEVER}/program/${i} ${DESTDIR}${PREFIX}/bin/${i} 82 ${LN} -sf ../opt/libreoffice${OO_BASEVER}/program/${i} ${DESTDIR}${PREFIX}/bin/${i}
81.endfor 83.endfor
82 84
83.include "../../mk/bsd.pkg.mk" 85.include "../../mk/bsd.pkg.mk"
cvs diff -r1.1 -r1.2 pkgsrc/misc/libreoffice5-bin/PLIST.proglinks (expand / switch to unified diff)

--- pkgsrc/misc/libreoffice5-bin/PLIST.proglinks 2016/01/08 23:53:13 1.1
+++ pkgsrc/misc/libreoffice5-bin/PLIST.proglinks 2016/03/03 23:22:34 1.2