CVS commit: pkgsrc/misc/libreoffice

["Tobias Nygren" <tnn%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   tnn
Date:           Tue May 19 22:03:25 UTC 2020

Modified Files:
        pkgsrc/misc/libreoffice: distinfo
Added Files:
        pkgsrc/misc/libreoffice/patches:
            patch-instsetoo__native_inc__openoffice_unix_find-requires-x11.sh

Log Message:
fix shell portability


To generate a diff of this commit:
cvs rdiff -u -r1.98 -r1.99 pkgsrc/misc/libreoffice/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/misc/libreoffice/patches/patch-instsetoo__native_inc__openoffice_unix_find-requires-x11.sh

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/misc/libreoffice/distinfo
diff -u pkgsrc/misc/libreoffice/distinfo:1.98 pkgsrc/misc/libreoffice/distinfo:1.99
--- pkgsrc/misc/libreoffice/distinfo:1.98       Mon Apr 20 13:00:48 2020
+++ pkgsrc/misc/libreoffice/distinfo    Tue May 19 22:03:25 2020
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.98 2020/04/20 13:00:48 joerg Exp $
+$NetBSD: distinfo,v 1.99 2020/05/19 22:03:25 tnn Exp $
 
 SHA1 (libreoffice/0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz) = 452eba922e4f41603539c9dc39947d2271e47093
 RMD160 (libreoffice/0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz) = dbeb7a7f8c89961ca2e544b810345d025561866b
@@ -233,6 +233,7 @@ SHA1 (patch-external_pdfium_pkgsrc.patch
 SHA1 (patch-external_pdfium_pkgsrc2.patch.1) = 0a804bcdf8f35cf298c5768954a6e57b2e40fd98
 SHA1 (patch-external_postgresql_ExternalProject__postgresql.mk) = 48e68ff43b971996f81985ee79d71f7b83cce428
 SHA1 (patch-i18nutil_source_utility_unicode.cxx) = 014d48574a379f92f2d0afe3c91d2c2956708dd8
+SHA1 (patch-instsetoo__native_inc__openoffice_unix_find-requires-x11.sh) = e871e2096c367e742dc5758fe60ae819846def29
 SHA1 (patch-sal_osl_unx_system.hxx) = 478dd47dc512d283a554600951010bbaa10c2c0e
 SHA1 (patch-sal_rtl_cipher.cxx) = e5e46d0b96e25572be86bf26f0053436859736cd
 SHA1 (patch-sc_source_core_opencl_formulagroupcl.cxx) = 1a589c8190a28f603671faf1d84cac022425849e

Added files:

Index: pkgsrc/misc/libreoffice/patches/patch-instsetoo__native_inc__openoffice_unix_find-requires-x11.sh
diff -u /dev/null pkgsrc/misc/libreoffice/patches/patch-instsetoo__native_inc__openoffice_unix_find-requires-x11.sh:1.1
--- /dev/null   Tue May 19 22:03:25 2020
+++ pkgsrc/misc/libreoffice/patches/patch-instsetoo__native_inc__openoffice_unix_find-requires-x11.sh   Tue May 19 22:03:25 2020
@@ -0,0 +1,17 @@
+$NetBSD: patch-instsetoo__native_inc__openoffice_unix_find-requires-x11.sh,v 1.1 2020/05/19 22:03:25 tnn Exp $
+
+Shell compatibility
+
+--- instsetoo_native/inc_openoffice/unix/find-requires-x11.sh.orig     2020-04-07 15:26:49.000000000 +0000
++++ instsetoo_native/inc_openoffice/unix/find-requires-x11.sh
+@@ -18,8 +18,8 @@
+ #
+ 
+ cat > /dev/null
+-[[ "${PLATFORMID}" == "linux_x86_64" ]] && mark64="()(64bit)"
+-if [[ "${OS}" == "AIX" ]]; then
++[ "${PLATFORMID}" = "linux_x86_64" ] && mark64="()(64bit)"
++if [ "${OS}" = "AIX" ]; then
+   echo "libfreetype.a(libfreetype.so.6${mark64})"
+ else
+   echo "libfreetype.so.6${mark64}"