diff options
author | bad <bad> | 2015-03-05 23:22:45 +0000 |
---|---|---|
committer | bad <bad> | 2015-03-05 23:22:45 +0000 |
commit | 0a87a2af77a6bb6fa5da51eab6988e01ef249c28 (patch) | |
tree | 4fc11213e42d5162d31c219ad55c263e73de1e7d /misc | |
parent | ce499da71e1247ebb48e9c54c42f4e002e9effe2 (diff) | |
download | pkgsrc-0a87a2af77a6bb6fa5da51eab6988e01ef249c28.tar.gz |
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.
Diffstat (limited to 'misc')
-rw-r--r-- | misc/libreoffice4-bin/Makefile | 16 | ||||
-rw-r--r-- | misc/libreoffice4-bin/PLIST.proglinks | 3 | ||||
-rw-r--r-- | misc/libreoffice4-bin/distinfo | 14 | ||||
-rw-r--r-- | misc/libreoffice4-bin/files/soffice-patch | 17 | ||||
-rw-r--r-- | misc/libreoffice4-bin/files/spadmin-patch | 17 |
5 files changed, 14 insertions, 53 deletions
diff --git a/misc/libreoffice4-bin/Makefile b/misc/libreoffice4-bin/Makefile index 01c1058ac57..7dad8259f52 100644 --- a/misc/libreoffice4-bin/Makefile +++ b/misc/libreoffice4-bin/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2014/06/23 12:59:49 ryoon Exp $ +# $NetBSD: Makefile,v 1.9 2015/03/05 23:22:45 bad Exp $ DISTNAME= libreoffice4-bin # overridden below PKGNAME= libreoffice4-bin-${OO_RELEASE} @@ -20,9 +20,9 @@ CONFLICTS+= openoffice-linux-[0-9]* CONFLICTS+= libreoffice3-bin-[0-9]* OO_VER= 4 -OO_BASEVER= 4.2 -OO_RELEASE= 4.2.5 -OO_RELEASEV= 4.2.5.2 +OO_BASEVER= 4.4 +OO_RELEASE= 4.4.1 +OO_RELEASEV= 4.4.1.2 PLIST_SUBST+= VER=${OO_VER:Q} BASEVER=${OO_BASEVER:Q} MESSAGE_SUBST+= VER=${OO_VER:Q} FILES_SUBST+= VER=${OO_VER:Q} @@ -38,7 +38,7 @@ PLIST_SRC+= ${PKGDIR}/PLIST.dirs EMUL_PLATFORMS= linux-i386 linux-x86_64 #EMUL_PLATFORMS+= solaris-i386 solaris-sparc EMUL_MODULES.linux= freetype2 x11 locale png fontconfig cups gtk2 krb5 -EMUL_MODULES.linux+= dbus dbus-glib +EMUL_MODULES.linux+= dbus dbus-glib glx EMUL_REQD= suse>=11.3 EMUL_PKG_FMT= rpm @@ -67,10 +67,6 @@ MASTER_SITES= http://download.documentfoundation.org/libreoffice/stable/${OO_RE INSTALLATION_DIRS= bin do-install: -# ${PATCH} -d ${DESTDIR}${PREFIX}/opt/libreoffice${OO_BASEVER}/program < ${FILESDIR}/soffice-patch -# ${RM} -f ${DESTDIR}${PREFIX}/opt/libreoffice${OO_BASEVER}/program/soffice.orig - ${PATCH} -d ${DESTDIR}${PREFIX}/opt/libreoffice${OO_BASEVER}/program < ${FILESDIR}/spadmin-patch - ${RM} -f ${DESTDIR}${PREFIX}/opt/libreoffice${OO_BASEVER}/program/spadmin.orig ${UNIQ} ${RPM2PKG_PLIST} | \ ${SED} -e 's,^@exec mkdir -m 755 -p %D/,@pkgdir,' > ${WRKDIR}/PLIST ${RM} -f ${DESTDIR}${PREFIX}/bin/soffice @@ -79,7 +75,7 @@ do-install: -e "s|@@OO_BASEVER@@|${OO_BASEVER}|g" \ < ${FILESDIR}/soffice > ${DESTDIR}${PREFIX}/bin/soffice ${CHMOD} +x ${DESTDIR}${PREFIX}/bin/soffice -.for i in scalc sdraw simpress smath spadmin swriter +.for i in scalc sdraw simpress smath swriter ${LN} -sf ../opt/libreoffice${OO_BASEVER}/program/${i} ${DESTDIR}${PREFIX}/bin/${i} .endfor diff --git a/misc/libreoffice4-bin/PLIST.proglinks b/misc/libreoffice4-bin/PLIST.proglinks index c8cd0166fbf..1bbc5930968 100644 --- a/misc/libreoffice4-bin/PLIST.proglinks +++ b/misc/libreoffice4-bin/PLIST.proglinks @@ -1,8 +1,7 @@ -@comment $NetBSD: PLIST.proglinks,v 1.1 2013/04/13 11:12:33 ryoon Exp $ +@comment $NetBSD: PLIST.proglinks,v 1.2 2015/03/05 23:22:45 bad Exp $ bin/scalc bin/sdraw bin/simpress bin/smath bin/soffice -bin/spadmin bin/swriter diff --git a/misc/libreoffice4-bin/distinfo b/misc/libreoffice4-bin/distinfo index b700ed684b6..eef47b92c4d 100644 --- a/misc/libreoffice4-bin/distinfo +++ b/misc/libreoffice4-bin/distinfo @@ -1,8 +1,8 @@ -$NetBSD: distinfo,v 1.7 2014/06/23 12:59:49 ryoon Exp $ +$NetBSD: distinfo,v 1.8 2015/03/05 23:22:45 bad Exp $ -SHA1 (LibreOffice_4.2.5_Linux_x86-64_rpm.tar.gz) = 0be7055ba57b79ddc133c431d12571908e1633dd -RMD160 (LibreOffice_4.2.5_Linux_x86-64_rpm.tar.gz) = f11008f83edd30b77e437408a001027077d06046 -Size (LibreOffice_4.2.5_Linux_x86-64_rpm.tar.gz) = 220267932 bytes -SHA1 (LibreOffice_4.2.5_Linux_x86_rpm.tar.gz) = 1687f508d3577b87e2694e20205b4ca9b3159fda -RMD160 (LibreOffice_4.2.5_Linux_x86_rpm.tar.gz) = bff31937fef3e88244071cae96e82bf0f4a101b8 -Size (LibreOffice_4.2.5_Linux_x86_rpm.tar.gz) = 206943110 bytes +SHA1 (LibreOffice_4.4.1_Linux_x86-64_rpm.tar.gz) = d70444159342e65aea72a4a3373b397dc3371917 +RMD160 (LibreOffice_4.4.1_Linux_x86-64_rpm.tar.gz) = cea55fdc6b98b54569e51ffb38a1ae2b4e59b1dc +Size (LibreOffice_4.4.1_Linux_x86-64_rpm.tar.gz) = 229333956 bytes +SHA1 (LibreOffice_4.4.1_Linux_x86_rpm.tar.gz) = 7fc7f82aeb537e5f5b6b923cdabff764949871cc +RMD160 (LibreOffice_4.4.1_Linux_x86_rpm.tar.gz) = 6c35dc87cdfd5e5a52e93447518c8fe82fe1c3df +Size (LibreOffice_4.4.1_Linux_x86_rpm.tar.gz) = 212722282 bytes diff --git a/misc/libreoffice4-bin/files/soffice-patch b/misc/libreoffice4-bin/files/soffice-patch deleted file mode 100644 index 0d7408aa02b..00000000000 --- a/misc/libreoffice4-bin/files/soffice-patch +++ /dev/null @@ -1,17 +0,0 @@ -# -# $NetBSD: soffice-patch,v 1.1 2013/04/13 11:12:33 ryoon Exp $ -# - ---- soffice.orig 2009-01-18 23:49:18.000000000 +0100 -+++ soffice 2009-01-19 00:10:22.000000000 +0100 -@@ -73,6 +73,10 @@ - esac - done - -+# Set LD_LIBRARY_PATH so that javaldx finds libuno_sal.so.3: -+LD_LIBRARY_PATH=$sd_prog/../basis-link/program:$sd_prog/../basis-link/../ure/lib${LD_LIBRARY_PATH+:$LD_LIBRARY_PATH} -+export LD_LIBRARY_PATH -+ - # extend the ld_library_path for java: javaldx checks the sofficerc for us - if [ -x "$sd_prog/../basis-link/ure-link/bin/javaldx" ] ; then - my_path=`"$sd_prog/../basis-link/ure-link/bin/javaldx" $BOOTSTRAPVARS \ diff --git a/misc/libreoffice4-bin/files/spadmin-patch b/misc/libreoffice4-bin/files/spadmin-patch deleted file mode 100644 index 0792b4b2c63..00000000000 --- a/misc/libreoffice4-bin/files/spadmin-patch +++ /dev/null @@ -1,17 +0,0 @@ -# -# $NetBSD: spadmin-patch,v 1.1 2013/04/13 11:12:33 ryoon Exp $ -# - ---- spadmin.orig 2009-10-08 12:21:04.000000000 +0200 -+++ spadmin 2009-10-08 12:22:22.000000000 +0200 -@@ -56,6 +56,10 @@ - esac - done - -+# Set LD_LIBRARY_PATH so that javaldx finds libuno_sal.so.3: -+LD_LIBRARY_PATH=$sd_prog/../basis-link/program:$sd_prog/../basis-link/../ure/lib${LD_LIBRARY_PATH+:$LD_LIBRARY_PATH} -+export LD_LIBRARY_PATH -+ - # extend the ld_library_path for java: javaldx checks the sofficerc for us - if [ -x "$sd_prog/../basis-link/ure-link/bin/javaldx" ] ; then - my_path=`"$sd_prog/../basis-link/ure-link/bin/javaldx" $BOOTSTRAPVARS \ |