Sun Jul 7 12:50:09 2019 UTC ()
libreoffice6-bin: update to 6.2.4.

Upstream changes (not bother to quote for Linux bin):
 https://wiki.documentfoundation.org/Releases/6.2.4/RC1#List_of_fixed_bugs
 https://wiki.documentfoundation.org/Releases/6.2.4/RC2#List_of_fixed_bugs


(tsutsui)
diff -r1.2 -r1.3 pkgsrc/misc/libreoffice6-bin/Makefile
diff -r1.3 -r1.4 pkgsrc/misc/libreoffice6-bin/distinfo
cvs diff -r1.2 -r1.3 pkgsrc/misc/libreoffice6-bin/Makefile (switch to unified diff)

--- pkgsrc/misc/libreoffice6-bin/Makefile 2019/05/11 08:13:00 1.2
+++ pkgsrc/misc/libreoffice6-bin/Makefile 2019/07/07 12:50:09 1.3
@@ -1,87 +1,87 @@ @@ -1,87 +1,87 @@
1# $NetBSD: Makefile,v 1.2 2019/05/11 08:13:00 tsutsui Exp $ 1# $NetBSD: Makefile,v 1.3 2019/07/07 12:50:09 tsutsui Exp $
2 2
3DISTNAME= libreoffice6-bin # overridden below 3DISTNAME= libreoffice6-bin # overridden below
4PKGNAME= libreoffice6-bin-${OO_RELEASE} 4PKGNAME= libreoffice6-bin-${OO_RELEASE}
5CATEGORIES= misc 5CATEGORIES= misc
6 6
7MAINTAINER= tsutsui@NetBSD.org 7MAINTAINER= tsutsui@NetBSD.org
8HOMEPAGE= https://www.libreoffice.org/ 8HOMEPAGE= https://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]*
15CONFLICTS+= openoffice2-bin-[0-9]* 15CONFLICTS+= openoffice2-bin-[0-9]*
16CONFLICTS+= openoffice2-[0-9]* 16CONFLICTS+= openoffice2-[0-9]*
17CONFLICTS+= openoffice3-[0-9]* 17CONFLICTS+= openoffice3-[0-9]*
18CONFLICTS+= openoffice3-bin-[0-9]* 18CONFLICTS+= openoffice3-bin-[0-9]*
19CONFLICTS+= openoffice-linux-[0-9]* 19CONFLICTS+= openoffice-linux-[0-9]*
20CONFLICTS+= libreoffice3-bin-[0-9]* 20CONFLICTS+= libreoffice3-bin-[0-9]*
21CONFLICTS+= libreoffice4-bin-[0-9]* 21CONFLICTS+= libreoffice4-bin-[0-9]*
22CONFLICTS+= libreoffice5-bin-[0-9]* 22CONFLICTS+= libreoffice5-bin-[0-9]*
23 23
24OO_VER= 6 24OO_VER= 6
25OO_BASEVER= ${OO_VER}.2 25OO_BASEVER= ${OO_VER}.2
26OO_RELEASE= ${OO_BASEVER}.3 26OO_RELEASE= ${OO_BASEVER}.4
27OO_RELEASEV= ${OO_RELEASE}.2 27OO_RELEASEV= ${OO_RELEASE}.2
28PLIST_SUBST+= VER=${OO_VER:Q} BASEVER=${OO_BASEVER:Q} 28PLIST_SUBST+= VER=${OO_VER:Q} BASEVER=${OO_BASEVER:Q}
29MESSAGE_SUBST+= VER=${OO_VER:Q} 29MESSAGE_SUBST+= VER=${OO_VER:Q}
30FILES_SUBST+= VER=${OO_VER:Q} 30FILES_SUBST+= VER=${OO_VER:Q}
31 31
32TEMP?= ${WRKSRC} 32TEMP?= ${WRKSRC}
33EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} 33EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX}
34BUILD_DIRS= # empty 34BUILD_DIRS= # empty
35 35
36PLIST_SRC= ${PKGDIR}/PLIST.proglinks 36PLIST_SRC= ${PKGDIR}/PLIST.proglinks
37PLIST_SRC+= ${WRKDIR}/PLIST 37PLIST_SRC+= ${WRKDIR}/PLIST
38PLIST_SRC+= ${PKGDIR}/PLIST.dirs 38PLIST_SRC+= ${PKGDIR}/PLIST.dirs
39 39
40EMUL_PLATFORMS= linux-i386 linux-x86_64 40EMUL_PLATFORMS= linux-i386 linux-x86_64
41#EMUL_PLATFORMS+= solaris-i386 solaris-sparc 41#EMUL_PLATFORMS+= solaris-i386 solaris-sparc
42EMUL_MODULES.linux= avahi cups dbus dbus-glib fontconfig freetype2 glx 42EMUL_MODULES.linux= avahi cups dbus dbus-glib fontconfig freetype2 glx
43EMUL_MODULES.linux+= gstreamer gtk2 krb5 locale png qt4 x11 43EMUL_MODULES.linux+= gstreamer gtk2 krb5 locale png qt4 x11
44EMUL_REQD= suse>=13.1 44EMUL_REQD= suse>=13.1
45 45
46EMUL_PKG_FMT= rpm 46EMUL_PKG_FMT= rpm
47RPMFILES= ${WRKSRC}/RPMS/*.rpm 47RPMFILES= ${WRKSRC}/RPMS/*.rpm
48RPM2PKG_PREFIX= ${DESTDIR}${PREFIX} 48RPM2PKG_PREFIX= ${DESTDIR}${PREFIX}
49RPM2PKG_SUBPREFIX= # empty 49RPM2PKG_SUBPREFIX= # empty
50RPM2PKG_STAGE= do-install 50RPM2PKG_STAGE= do-install
51RUN_LDCONFIG= no 51RUN_LDCONFIG= no
52 52
53USE_TOOLS+= patch uniq 53USE_TOOLS+= patch uniq
54 54
55.include "../../mk/bsd.prefs.mk" 55.include "../../mk/bsd.prefs.mk"
56 56
57.if ${EMUL_PLATFORM} == "linux-i386" 57.if ${EMUL_PLATFORM} == "linux-i386"
58DISTNAME= LibreOffice_${OO_RELEASE}_Linux_x86_rpm 58DISTNAME= LibreOffice_${OO_RELEASE}_Linux_x86_rpm
59WRKSRC= ${WRKDIR}/LibreOffice_${OO_RELEASEV}_Linux_x86_rpm 59WRKSRC= ${WRKDIR}/LibreOffice_${OO_RELEASEV}_Linux_x86_rpm
60MASTER_SITES= http://download.documentfoundation.org/libreoffice/stable/${OO_RELEASE}/rpm/x86/ 60MASTER_SITES= http://download.documentfoundation.org/libreoffice/stable/${OO_RELEASE}/rpm/x86/
61.elif ${EMUL_PLATFORM} == "linux-x86_64" 61.elif ${EMUL_PLATFORM} == "linux-x86_64"
62DISTNAME= LibreOffice_${OO_RELEASE}_Linux_x86-64_rpm 62DISTNAME= LibreOffice_${OO_RELEASE}_Linux_x86-64_rpm
63WRKSRC= ${WRKDIR}/LibreOffice_${OO_RELEASEV}_Linux_x86-64_rpm 63WRKSRC= ${WRKDIR}/LibreOffice_${OO_RELEASEV}_Linux_x86-64_rpm
64MASTER_SITES= http://download.documentfoundation.org/libreoffice/stable/${OO_RELEASE}/rpm/x86_64/ 64MASTER_SITES= http://download.documentfoundation.org/libreoffice/stable/${OO_RELEASE}/rpm/x86_64/
65.endif 65.endif
66 66
67.include "options.mk" 67.include "options.mk"
68 68
69INSTALLATION_DIRS= bin share/applications 69INSTALLATION_DIRS= bin share/applications
70DESKTOP_FILESDIR= ${.CURDIR}/../../misc/libreoffice6-bin/files 70DESKTOP_FILESDIR= ${.CURDIR}/../../misc/libreoffice6-bin/files
71 71
72do-install: 72do-install:
73 ${UNIQ} ${RPM2PKG_PLIST} | \ 73 ${UNIQ} ${RPM2PKG_PLIST} | \
74 ${SED} -e 's,^@exec mkdir -m 755 -p %D/,@pkgdir,' > ${WRKDIR}/PLIST 74 ${SED} -e 's,^@exec mkdir -m 755 -p %D/,@pkgdir,' > ${WRKDIR}/PLIST
75 ${RM} -f ${DESTDIR}${PREFIX}/bin/soffice 75 ${RM} -f ${DESTDIR}${PREFIX}/bin/soffice
76 ${SED} -e "s|@@PREFIX@@|${PREFIX}|g" -e "s|@@OO_VER@@|${OO_VER}|g" \ 76 ${SED} -e "s|@@PREFIX@@|${PREFIX}|g" -e "s|@@OO_VER@@|${OO_VER}|g" \
77 -e "s|@@JAVA_HOME@@|${PKG_JAVA_HOME}|g" \ 77 -e "s|@@JAVA_HOME@@|${PKG_JAVA_HOME}|g" \
78 -e "s|@@OO_BASEVER@@|${OO_BASEVER}|g" \ 78 -e "s|@@OO_BASEVER@@|${OO_BASEVER}|g" \
79 < ${FILESDIR}/soffice > ${DESTDIR}${PREFIX}/bin/soffice 79 < ${FILESDIR}/soffice > ${DESTDIR}${PREFIX}/bin/soffice
80 ${CHMOD} +x ${DESTDIR}${PREFIX}/bin/soffice 80 ${CHMOD} +x ${DESTDIR}${PREFIX}/bin/soffice
81 ${INSTALL_DATA} ${DESKTOP_FILESDIR}/*.desktop ${DESTDIR}${PREFIX}/share/applications 81 ${INSTALL_DATA} ${DESKTOP_FILESDIR}/*.desktop ${DESTDIR}${PREFIX}/share/applications
82.for i in sbase scalc sdraw simpress smath swriter 82.for i in sbase scalc sdraw simpress smath swriter
83 ${LN} -sf ../opt/libreoffice${OO_BASEVER}/program/${i} ${DESTDIR}${PREFIX}/bin/${i} 83 ${LN} -sf ../opt/libreoffice${OO_BASEVER}/program/${i} ${DESTDIR}${PREFIX}/bin/${i}
84.endfor 84.endfor
85 85
86.include "../../sysutils/desktop-file-utils/desktopdb.mk" 86.include "../../sysutils/desktop-file-utils/desktopdb.mk"
87.include "../../mk/bsd.pkg.mk" 87.include "../../mk/bsd.pkg.mk"
cvs diff -r1.3 -r1.4 pkgsrc/misc/libreoffice6-bin/distinfo (switch to unified diff)

--- pkgsrc/misc/libreoffice6-bin/distinfo 2019/05/11 08:13:00 1.3
+++ pkgsrc/misc/libreoffice6-bin/distinfo 2019/07/07 12:50:09 1.4
@@ -1,10 +1,10 @@ @@ -1,10 +1,10 @@
1$NetBSD: distinfo,v 1.3 2019/05/11 08:13:00 tsutsui Exp $ 1$NetBSD: distinfo,v 1.4 2019/07/07 12:50:09 tsutsui Exp $
2 2
3SHA1 (LibreOffice_6.2.3_Linux_x86_rpm.tar.gz) = 93e0c09658c340cc2efe1b6e28d794afdef5f5a6 3SHA1 (LibreOffice_6.2.4_Linux_x86_rpm.tar.gz) = 6e5356d0524c102983039fd865bf4ddfd3cb686b
4RMD160 (LibreOffice_6.2.3_Linux_x86_rpm.tar.gz) = da56be92f0f98f7333fe0728f547e8bcb686917f 4RMD160 (LibreOffice_6.2.4_Linux_x86_rpm.tar.gz) = 56248507850e95aa958d57b3e8d921595388bb3f
5SHA512 (LibreOffice_6.2.3_Linux_x86_rpm.tar.gz) = a8e36abc8684f8e14d257ae886c71bfca12703c7dfdb05c52593e704cfd4c3ec29746fd1ebb1f4939268662c84957cf2d790230ae922db561c12466db2de9713 5SHA512 (LibreOffice_6.2.4_Linux_x86_rpm.tar.gz) = 0a05f8707a7a629f7ef30dc9bd804252e29f6cb10f3bdb72178286b1c12c4597ac5decc98c0ec85ae23531a224a9dca3c8de37792a62085c8d78a9a5469f066a
6Size (LibreOffice_6.2.3_Linux_x86_rpm.tar.gz) = 224234812 bytes 6Size (LibreOffice_6.2.4_Linux_x86_rpm.tar.gz) = 224240386 bytes
7SHA1 (LibreOffice_6.2.3_Linux_x86-64_rpm.tar.gz) = 16c4c6b49bbb6c14bf1fed4b246f909e80bb4c1e 7SHA1 (LibreOffice_6.2.4_Linux_x86-64_rpm.tar.gz) = 6d4963d31fbcf85240fdbf654459da949c89cd64
8RMD160 (LibreOffice_6.2.3_Linux_x86-64_rpm.tar.gz) = a5c9eda6782cc7d79de27d17ae1595d81f4459d9 8RMD160 (LibreOffice_6.2.4_Linux_x86-64_rpm.tar.gz) = e9670749640a586e4473e6aa3fbc43fefefdf7c0
9SHA512 (LibreOffice_6.2.3_Linux_x86-64_rpm.tar.gz) = c898d10ab4fbe27321e8e6ea2b4b3ebddfe418b92de00a8915afeac48cd64e4e72c066b916a418fa7b3cf80e73636ba44fa5993a787794c43d820c4a4f7373e2 9SHA512 (LibreOffice_6.2.4_Linux_x86-64_rpm.tar.gz) = 1a441ae308bd089c8b9d98c2dc5ec1c480199a37fef4865d1ff28544c70df426cd7c5c86d38dd97f9b2379c3c686987d483cea4bc9429b2fc6758c549b24e1a1
10Size (LibreOffice_6.2.3_Linux_x86-64_rpm.tar.gz) = 242771026 bytes 10Size (LibreOffice_6.2.4_Linux_x86-64_rpm.tar.gz) = 243513507 bytes