Thu Mar 5 23:22:46 2015 UTC ()
Update libreoffice4-bin from 4.2.5.2 to 4.4.1.2.

Even the section summary of the changes is to big to include here.
Refer to http://www.libreoffice.org/download/release-notes/ for the change
logs.

Tested on netbsd-6/amd64 with suse121 compat packages.

spadmin is gone and soffice-patch hasn't been needed in a while. No need to
keep the patches for them around.


(bad)
diff -r1.8 -r1.9 pkgsrc/misc/libreoffice4-bin/Makefile
diff -r1.1 -r1.2 pkgsrc/misc/libreoffice4-bin/PLIST.proglinks
diff -r1.7 -r1.8 pkgsrc/misc/libreoffice4-bin/distinfo
diff -r1.1 -r0 pkgsrc/misc/libreoffice4-bin/files/soffice-patch
diff -r1.1 -r0 pkgsrc/misc/libreoffice4-bin/files/spadmin-patch
cvs diff -r1.8 -r1.9 pkgsrc/misc/libreoffice4-bin/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/misc/libreoffice4-bin/Attic/Makefile 2014/06/23 12:59:49 1.8
+++ pkgsrc/misc/libreoffice4-bin/Attic/Makefile 2015/03/05 23:22:45 1.9
@@ -1,54 +1,54 @@ @@ -1,54 +1,54 @@
1# $NetBSD: Makefile,v 1.8 2014/06/23 12:59:49 ryoon Exp $ 1# $NetBSD: Makefile,v 1.9 2015/03/05 23:22:45 bad 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]*
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]*
21 21
22OO_VER= 4 22OO_VER= 4
23OO_BASEVER= 4.2 23OO_BASEVER= 4.4
24OO_RELEASE= 4.2.5 24OO_RELEASE= 4.4.1
25OO_RELEASEV= 4.2.5.2 25OO_RELEASEV= 4.4.1.2
26PLIST_SUBST+= VER=${OO_VER:Q} BASEVER=${OO_BASEVER:Q} 26PLIST_SUBST+= VER=${OO_VER:Q} BASEVER=${OO_BASEVER:Q}
27MESSAGE_SUBST+= VER=${OO_VER:Q} 27MESSAGE_SUBST+= VER=${OO_VER:Q}
28FILES_SUBST+= VER=${OO_VER:Q} 28FILES_SUBST+= VER=${OO_VER:Q}
29 29
30TEMP?= ${WRKSRC} 30TEMP?= ${WRKSRC}
31EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} 31EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX}
32BUILD_DIRS= # empty 32BUILD_DIRS= # empty
33 33
34PLIST_SRC= ${PKGDIR}/PLIST.proglinks 34PLIST_SRC= ${PKGDIR}/PLIST.proglinks
35PLIST_SRC+= ${WRKDIR}/PLIST 35PLIST_SRC+= ${WRKDIR}/PLIST
36PLIST_SRC+= ${PKGDIR}/PLIST.dirs 36PLIST_SRC+= ${PKGDIR}/PLIST.dirs
37 37
38EMUL_PLATFORMS= linux-i386 linux-x86_64 38EMUL_PLATFORMS= linux-i386 linux-x86_64
39#EMUL_PLATFORMS+= solaris-i386 solaris-sparc 39#EMUL_PLATFORMS+= solaris-i386 solaris-sparc
40EMUL_MODULES.linux= freetype2 x11 locale png fontconfig cups gtk2 krb5 40EMUL_MODULES.linux= freetype2 x11 locale png fontconfig cups gtk2 krb5
41EMUL_MODULES.linux+= dbus dbus-glib 41EMUL_MODULES.linux+= dbus dbus-glib glx
42EMUL_REQD= suse>=11.3 42EMUL_REQD= suse>=11.3
43 43
44EMUL_PKG_FMT= rpm 44EMUL_PKG_FMT= rpm
45RPMFILES= ${WRKSRC}/RPMS/*.rpm 45RPMFILES= ${WRKSRC}/RPMS/*.rpm
46RPM2PKG_PREFIX= ${DESTDIR}${PREFIX} 46RPM2PKG_PREFIX= ${DESTDIR}${PREFIX}
47RPM2PKG_SUBPREFIX= # empty 47RPM2PKG_SUBPREFIX= # empty
48RPM2PKG_STAGE= do-install 48RPM2PKG_STAGE= do-install
49RUN_LDCONFIG= no 49RUN_LDCONFIG= no
50 50
51USE_TOOLS+= patch uniq 51USE_TOOLS+= patch uniq
52 52
53.include "../../mk/bsd.prefs.mk" 53.include "../../mk/bsd.prefs.mk"
54 54
@@ -57,30 +57,26 @@ DISTNAME= LibreOffice_${OO_RELEASE}_Lin @@ -57,30 +57,26 @@ DISTNAME= LibreOffice_${OO_RELEASE}_Lin
57WRKSRC= ${WRKDIR}/LibreOffice_${OO_RELEASEV}_Linux_x86_rpm 57WRKSRC= ${WRKDIR}/LibreOffice_${OO_RELEASEV}_Linux_x86_rpm
58MASTER_SITES= http://download.documentfoundation.org/libreoffice/stable/${OO_RELEASE}/rpm/x86/ 58MASTER_SITES= http://download.documentfoundation.org/libreoffice/stable/${OO_RELEASE}/rpm/x86/
59.elif ${EMUL_PLATFORM} == "linux-x86_64" 59.elif ${EMUL_PLATFORM} == "linux-x86_64"
60DISTNAME= LibreOffice_${OO_RELEASE}_Linux_x86-64_rpm 60DISTNAME= LibreOffice_${OO_RELEASE}_Linux_x86-64_rpm
61WRKSRC= ${WRKDIR}/LibreOffice_${OO_RELEASEV}_Linux_x86-64_rpm 61WRKSRC= ${WRKDIR}/LibreOffice_${OO_RELEASEV}_Linux_x86-64_rpm
62MASTER_SITES= http://download.documentfoundation.org/libreoffice/stable/${OO_RELEASE}/rpm/x86_64/ 62MASTER_SITES= http://download.documentfoundation.org/libreoffice/stable/${OO_RELEASE}/rpm/x86_64/
63.endif 63.endif
64 64
65.include "options.mk" 65.include "options.mk"
66 66
67INSTALLATION_DIRS= bin 67INSTALLATION_DIRS= bin
68 68
69do-install: 69do-install:
70# ${PATCH} -d ${DESTDIR}${PREFIX}/opt/libreoffice${OO_BASEVER}/program < ${FILESDIR}/soffice-patch 
71# ${RM} -f ${DESTDIR}${PREFIX}/opt/libreoffice${OO_BASEVER}/program/soffice.orig 
72 ${PATCH} -d ${DESTDIR}${PREFIX}/opt/libreoffice${OO_BASEVER}/program < ${FILESDIR}/spadmin-patch 
73 ${RM} -f ${DESTDIR}${PREFIX}/opt/libreoffice${OO_BASEVER}/program/spadmin.orig 
74 ${UNIQ} ${RPM2PKG_PLIST} | \ 70 ${UNIQ} ${RPM2PKG_PLIST} | \
75 ${SED} -e 's,^@exec mkdir -m 755 -p %D/,@pkgdir,' > ${WRKDIR}/PLIST 71 ${SED} -e 's,^@exec mkdir -m 755 -p %D/,@pkgdir,' > ${WRKDIR}/PLIST
76 ${RM} -f ${DESTDIR}${PREFIX}/bin/soffice 72 ${RM} -f ${DESTDIR}${PREFIX}/bin/soffice
77 ${SED} -e "s|@@PREFIX@@|${PREFIX}|g" -e "s|@@OO_VER@@|${OO_VER}|g" \ 73 ${SED} -e "s|@@PREFIX@@|${PREFIX}|g" -e "s|@@OO_VER@@|${OO_VER}|g" \
78 -e "s|@@JAVA_HOME@@|${PKG_JAVA_HOME}|g" \ 74 -e "s|@@JAVA_HOME@@|${PKG_JAVA_HOME}|g" \
79 -e "s|@@OO_BASEVER@@|${OO_BASEVER}|g" \ 75 -e "s|@@OO_BASEVER@@|${OO_BASEVER}|g" \
80 < ${FILESDIR}/soffice > ${DESTDIR}${PREFIX}/bin/soffice 76 < ${FILESDIR}/soffice > ${DESTDIR}${PREFIX}/bin/soffice
81 ${CHMOD} +x ${DESTDIR}${PREFIX}/bin/soffice 77 ${CHMOD} +x ${DESTDIR}${PREFIX}/bin/soffice
82.for i in scalc sdraw simpress smath spadmin swriter 78.for i in scalc sdraw simpress smath swriter
83 ${LN} -sf ../opt/libreoffice${OO_BASEVER}/program/${i} ${DESTDIR}${PREFIX}/bin/${i} 79 ${LN} -sf ../opt/libreoffice${OO_BASEVER}/program/${i} ${DESTDIR}${PREFIX}/bin/${i}
84.endfor 80.endfor
85 81
86.include "../../mk/bsd.pkg.mk" 82.include "../../mk/bsd.pkg.mk"
cvs diff -r1.1 -r1.2 pkgsrc/misc/libreoffice4-bin/Attic/PLIST.proglinks (expand / switch to unified diff)

--- pkgsrc/misc/libreoffice4-bin/Attic/PLIST.proglinks 2013/04/13 11:12:33 1.1
+++ pkgsrc/misc/libreoffice4-bin/Attic/PLIST.proglinks 2015/03/05 23:22:45 1.2
cvs diff -r1.7 -r1.8 pkgsrc/misc/libreoffice4-bin/Attic/distinfo (expand / switch to unified diff)

--- pkgsrc/misc/libreoffice4-bin/Attic/distinfo 2014/06/23 12:59:49 1.7
+++ pkgsrc/misc/libreoffice4-bin/Attic/distinfo 2015/03/05 23:22:45 1.8
@@ -1,8 +1,8 @@ @@ -1,8 +1,8 @@
1$NetBSD: distinfo,v 1.7 2014/06/23 12:59:49 ryoon Exp $ 1$NetBSD: distinfo,v 1.8 2015/03/05 23:22:45 bad Exp $
2 2
3SHA1 (LibreOffice_4.2.5_Linux_x86-64_rpm.tar.gz) = 0be7055ba57b79ddc133c431d12571908e1633dd 3SHA1 (LibreOffice_4.4.1_Linux_x86-64_rpm.tar.gz) = d70444159342e65aea72a4a3373b397dc3371917
4RMD160 (LibreOffice_4.2.5_Linux_x86-64_rpm.tar.gz) = f11008f83edd30b77e437408a001027077d06046 4RMD160 (LibreOffice_4.4.1_Linux_x86-64_rpm.tar.gz) = cea55fdc6b98b54569e51ffb38a1ae2b4e59b1dc
5Size (LibreOffice_4.2.5_Linux_x86-64_rpm.tar.gz) = 220267932 bytes 5Size (LibreOffice_4.4.1_Linux_x86-64_rpm.tar.gz) = 229333956 bytes
6SHA1 (LibreOffice_4.2.5_Linux_x86_rpm.tar.gz) = 1687f508d3577b87e2694e20205b4ca9b3159fda 6SHA1 (LibreOffice_4.4.1_Linux_x86_rpm.tar.gz) = 7fc7f82aeb537e5f5b6b923cdabff764949871cc
7RMD160 (LibreOffice_4.2.5_Linux_x86_rpm.tar.gz) = bff31937fef3e88244071cae96e82bf0f4a101b8 7RMD160 (LibreOffice_4.4.1_Linux_x86_rpm.tar.gz) = 6c35dc87cdfd5e5a52e93447518c8fe82fe1c3df
8Size (LibreOffice_4.2.5_Linux_x86_rpm.tar.gz) = 206943110 bytes 8Size (LibreOffice_4.4.1_Linux_x86_rpm.tar.gz) = 212722282 bytes
File Deleted: pkgsrc/misc/libreoffice4-bin/files/Attic/soffice-patch
File Deleted: pkgsrc/misc/libreoffice4-bin/files/Attic/spadmin-patch