Sun Oct 16 11:57:44 2022 UTC ()
libreoffice: fix a check portability warning


(tnn)
diff -r1.132 -r1.133 pkgsrc/misc/libreoffice/distinfo
diff -r1.3 -r1.4 pkgsrc/misc/libreoffice/patches/patch-instsetoo__native_inc__openoffice_unix_find-requires-x11.sh
cvs diff -r1.132 -r1.133 pkgsrc/misc/libreoffice/distinfo (expand / switch to unified diff)

--- pkgsrc/misc/libreoffice/distinfo 2022/09/17 23:56:03 1.132
+++ pkgsrc/misc/libreoffice/distinfo 2022/10/16 11:57:44 1.133
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1$NetBSD: distinfo,v 1.132 2022/09/17 23:56:03 ryoon Exp $ 1$NetBSD: distinfo,v 1.133 2022/10/16 11:57:44 tnn Exp $
2 2
3BLAKE2s (libreoffice/0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz) = 0e0a0ae1eb07e5058749dc1726bc59971c723b4b16c57d83f24b6ac6ddd96d71 3BLAKE2s (libreoffice/0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz) = 0e0a0ae1eb07e5058749dc1726bc59971c723b4b16c57d83f24b6ac6ddd96d71
4SHA512 (libreoffice/0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz) = b9c02d63e9b47a838dbe67c05b9e9e4983d13b9d74794e1c30c73d341c3bc905c9edec3a72fa339ae8c0e06d97e69ac2ea23bf51336b77af14cab7ae67721a46 4SHA512 (libreoffice/0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz) = b9c02d63e9b47a838dbe67c05b9e9e4983d13b9d74794e1c30c73d341c3bc905c9edec3a72fa339ae8c0e06d97e69ac2ea23bf51336b77af14cab7ae67721a46
5Size (libreoffice/0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz) = 96939 bytes 5Size (libreoffice/0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz) = 96939 bytes
6BLAKE2s (libreoffice/1725634df4bb3dcb1b2c91a6175f8789-GentiumBasic_1102.zip) = 898f7c9312c09f88efd9dde54d0d525b9b536cf9cbafffdb73d2c1d7dd334628 6BLAKE2s (libreoffice/1725634df4bb3dcb1b2c91a6175f8789-GentiumBasic_1102.zip) = 898f7c9312c09f88efd9dde54d0d525b9b536cf9cbafffdb73d2c1d7dd334628
7SHA512 (libreoffice/1725634df4bb3dcb1b2c91a6175f8789-GentiumBasic_1102.zip) = 2fa01482dd74fcb62176317f7dcda504472f28f7eda22882903e4e71272743228e5b9d7614fb554e6bd390c0dbcfd8a31dcdbb29a7f54266f376ff2ee376178f 7SHA512 (libreoffice/1725634df4bb3dcb1b2c91a6175f8789-GentiumBasic_1102.zip) = 2fa01482dd74fcb62176317f7dcda504472f28f7eda22882903e4e71272743228e5b9d7614fb554e6bd390c0dbcfd8a31dcdbb29a7f54266f376ff2ee376178f
8Size (libreoffice/1725634df4bb3dcb1b2c91a6175f8789-GentiumBasic_1102.zip) = 811606 bytes 8Size (libreoffice/1725634df4bb3dcb1b2c91a6175f8789-GentiumBasic_1102.zip) = 811606 bytes
9BLAKE2s (libreoffice/33e1e61fab06a547851ed308b4ffef42-dejavu-fonts-ttf-2.37.zip) = c78072514f9612f642bd4a340bb9cf8e19859c6641d18abc7e8d68b376358a82 9BLAKE2s (libreoffice/33e1e61fab06a547851ed308b4ffef42-dejavu-fonts-ttf-2.37.zip) = c78072514f9612f642bd4a340bb9cf8e19859c6641d18abc7e8d68b376358a82
10SHA512 (libreoffice/33e1e61fab06a547851ed308b4ffef42-dejavu-fonts-ttf-2.37.zip) = f5628efe484b6220d0bf8177aa826c28e7a36f0bcca2019e057c20f5915d579057f931377ec686dbfeebef05fcf6453472be77a21ef282bd9d8d0eaf62549a49 10SHA512 (libreoffice/33e1e61fab06a547851ed308b4ffef42-dejavu-fonts-ttf-2.37.zip) = f5628efe484b6220d0bf8177aa826c28e7a36f0bcca2019e057c20f5915d579057f931377ec686dbfeebef05fcf6453472be77a21ef282bd9d8d0eaf62549a49
11Size (libreoffice/33e1e61fab06a547851ed308b4ffef42-dejavu-fonts-ttf-2.37.zip) = 5522795 bytes 11Size (libreoffice/33e1e61fab06a547851ed308b4ffef42-dejavu-fonts-ttf-2.37.zip) = 5522795 bytes
12BLAKE2s (libreoffice/3404ab6b1792ae5f16bbd603bd1e1d03-libformula-1.1.7.zip) = e395a8e9cd971a21598b823819daba73192436a11322a7bc1274d9ac22772ebf 12BLAKE2s (libreoffice/3404ab6b1792ae5f16bbd603bd1e1d03-libformula-1.1.7.zip) = e395a8e9cd971a21598b823819daba73192436a11322a7bc1274d9ac22772ebf
13SHA512 (libreoffice/3404ab6b1792ae5f16bbd603bd1e1d03-libformula-1.1.7.zip) = 9fe106bbdb55365f589246e5a0d10bbe9b35224132b66a1823dc6361633a67f2acc0e8c393dc7ed70d086858d16d242b8806b8b2184c98e3d20d0be85bed9c44 13SHA512 (libreoffice/3404ab6b1792ae5f16bbd603bd1e1d03-libformula-1.1.7.zip) = 9fe106bbdb55365f589246e5a0d10bbe9b35224132b66a1823dc6361633a67f2acc0e8c393dc7ed70d086858d16d242b8806b8b2184c98e3d20d0be85bed9c44
14Size (libreoffice/3404ab6b1792ae5f16bbd603bd1e1d03-libformula-1.1.7.zip) = 1180582 bytes 14Size (libreoffice/3404ab6b1792ae5f16bbd603bd1e1d03-libformula-1.1.7.zip) = 1180582 bytes
@@ -174,26 +174,26 @@ SHA1 (patch-bridges_source_cpp__uno_gcc3 @@ -174,26 +174,26 @@ SHA1 (patch-bridges_source_cpp__uno_gcc3
174SHA1 (patch-bridges_source_cpp__uno_gcc3__linux__x86-64_share.hxx) = e664faa4044feaafe8214fdf42f7d008b9aa29fc 174SHA1 (patch-bridges_source_cpp__uno_gcc3__linux__x86-64_share.hxx) = e664faa4044feaafe8214fdf42f7d008b9aa29fc
175SHA1 (patch-configure.ac) = b68def12350216375eb177ee730328b9523cea48 175SHA1 (patch-configure.ac) = b68def12350216375eb177ee730328b9523cea48
176SHA1 (patch-desktop_scripts_soffice.sh) = e6342e08781ca8dac72a1f28407517d79155577c 176SHA1 (patch-desktop_scripts_soffice.sh) = e6342e08781ca8dac72a1f28407517d79155577c
177SHA1 (patch-external_mariadb-connector-c_UnpackedTarball__mariadb-connector-c.mk) = 0a682ef486310474684ccd279e864f96259a3087 177SHA1 (patch-external_mariadb-connector-c_UnpackedTarball__mariadb-connector-c.mk) = 0a682ef486310474684ccd279e864f96259a3087
178SHA1 (patch-external_mariadb-connector-c_netbsd.patch) = c8a82ce0c3d293108daa41f81d9cee376ca50a82 178SHA1 (patch-external_mariadb-connector-c_netbsd.patch) = c8a82ce0c3d293108daa41f81d9cee376ca50a82
179SHA1 (patch-external_pdfium_Library__pdfium.mk) = f7c6d5da07cd3d7b2ee327a0df0581e7fe441621 179SHA1 (patch-external_pdfium_Library__pdfium.mk) = f7c6d5da07cd3d7b2ee327a0df0581e7fe441621
180SHA1 (patch-external_pdfium_UnpackedTarball__pdfium.mk) = b5806e94fd125e900385aa571bccaedba9878b90 180SHA1 (patch-external_pdfium_UnpackedTarball__pdfium.mk) = b5806e94fd125e900385aa571bccaedba9878b90
181SHA1 (patch-external_pdfium_pkgsrc.patch.1) = a8247f5394c39cf94470e7a88088ab86f766c03b 181SHA1 (patch-external_pdfium_pkgsrc.patch.1) = a8247f5394c39cf94470e7a88088ab86f766c03b
182SHA1 (patch-external_postgresql_ExternalProject__postgresql.mk) = 545a10100e439b996e3f235a8a5dff682fd48879 182SHA1 (patch-external_postgresql_ExternalProject__postgresql.mk) = 545a10100e439b996e3f235a8a5dff682fd48879
183SHA1 (patch-external_skia_Library__skia.mk) = bf97a0724bd8cb5e249b63e60e85e2e7217cfdad 183SHA1 (patch-external_skia_Library__skia.mk) = bf97a0724bd8cb5e249b63e60e85e2e7217cfdad
184SHA1 (patch-external_skia_UnpackedTarball__skia.mk) = 7c0a0ccfe67b5e45340be07d476032a39cbd38e5 184SHA1 (patch-external_skia_UnpackedTarball__skia.mk) = 7c0a0ccfe67b5e45340be07d476032a39cbd38e5
185SHA1 (patch-external_skia_netbsd.patch.0) = 7852da3030ce31cd089cba99c7949eda57ffaf8f 185SHA1 (patch-external_skia_netbsd.patch.0) = 7852da3030ce31cd089cba99c7949eda57ffaf8f
186SHA1 (patch-i18nutil_source_utility_unicode.cxx) = 138a0f278ad7ba7f6ae4657007f0c2fbe111be71 186SHA1 (patch-i18nutil_source_utility_unicode.cxx) = 138a0f278ad7ba7f6ae4657007f0c2fbe111be71
187SHA1 (patch-instsetoo__native_inc__openoffice_unix_find-requires-x11.sh) = 3595ea18e6231d09665268cb716df61456c444d6 187SHA1 (patch-instsetoo__native_inc__openoffice_unix_find-requires-x11.sh) = bdac61080480210dee6e356b7e39eab9a3bba7cf
188SHA1 (patch-sal_osl_unx_system.hxx) = 478dd47dc512d283a554600951010bbaa10c2c0e 188SHA1 (patch-sal_osl_unx_system.hxx) = 478dd47dc512d283a554600951010bbaa10c2c0e
189SHA1 (patch-sal_rtl_cipher.cxx) = e5e46d0b96e25572be86bf26f0053436859736cd 189SHA1 (patch-sal_rtl_cipher.cxx) = e5e46d0b96e25572be86bf26f0053436859736cd
190SHA1 (patch-sc_source_core_tool_math.cxx) = 94ea14291d87ab7ad43a8f277738685e2743cb4a 190SHA1 (patch-sc_source_core_tool_math.cxx) = 94ea14291d87ab7ad43a8f277738685e2743cb4a
191SHA1 (patch-slideshow_source_engine_box2dtools.cxx) = b59a872552754af29ce6208fd9dd3e25633c9fba 191SHA1 (patch-slideshow_source_engine_box2dtools.cxx) = b59a872552754af29ce6208fd9dd3e25633c9fba
192SHA1 (patch-solenv_gbuild_platform_NETBSD_AARCH64_GCC.mk) = eda8dbd0e9394b2dde2f98c0df39e7e9888f49dc 192SHA1 (patch-solenv_gbuild_platform_NETBSD_AARCH64_GCC.mk) = eda8dbd0e9394b2dde2f98c0df39e7e9888f49dc
193SHA1 (patch-store_source_storbase.hxx) = 69c58db3984f22de45c7e32fdfd4f7c28340adf1 193SHA1 (patch-store_source_storbase.hxx) = 69c58db3984f22de45c7e32fdfd4f7c28340adf1
194SHA1 (patch-sw_source_core_bastyp_calc.cxx) = 317f206500c88aea4a645a6f1dea8e0a837ad581 194SHA1 (patch-sw_source_core_bastyp_calc.cxx) = 317f206500c88aea4a645a6f1dea8e0a837ad581
195SHA1 (patch-sw_source_uibase_config_usrpref.cxx) = 8f761c368e38435aea53bfcfcdc1f3aba0c73d03 195SHA1 (patch-sw_source_uibase_config_usrpref.cxx) = 8f761c368e38435aea53bfcfcdc1f3aba0c73d03
196SHA1 (patch-vcl_unx_generic_app_geninst.cxx) = aa8f1a7e0fe2b6254a05e8370f1d12d25ba9795a 196SHA1 (patch-vcl_unx_generic_app_geninst.cxx) = aa8f1a7e0fe2b6254a05e8370f1d12d25ba9795a
197SHA1 (patch-xmloff_source_draw_ximp3dscene.cxx) = bdd0b2563e54424dd468c2334e17ab23057a69fb 197SHA1 (patch-xmloff_source_draw_ximp3dscene.cxx) = bdd0b2563e54424dd468c2334e17ab23057a69fb
198SHA1 (patch-xmlsecurity_source_gpg_CertificateImpl.hxx) = 56ac06159e0805edc1685d271b632f1af438be86 198SHA1 (patch-xmlsecurity_source_gpg_CertificateImpl.hxx) = 56ac06159e0805edc1685d271b632f1af438be86
199SHA1 (patch-xmlsecurity_source_gpg_xmlsignature__gpgimpl.cxx) = 151ccef192a8491bca5d39f2a02d938b3e4fad67 199SHA1 (patch-xmlsecurity_source_gpg_xmlsignature__gpgimpl.cxx) = 151ccef192a8491bca5d39f2a02d938b3e4fad67
cvs diff -r1.3 -r1.4 pkgsrc/misc/libreoffice/patches/patch-instsetoo__native_inc__openoffice_unix_find-requires-x11.sh (expand / switch to unified diff)

--- pkgsrc/misc/libreoffice/patches/patch-instsetoo__native_inc__openoffice_unix_find-requires-x11.sh 2022/07/17 10:58:12 1.3
+++ pkgsrc/misc/libreoffice/patches/patch-instsetoo__native_inc__openoffice_unix_find-requires-x11.sh 2022/10/16 11:57:44 1.4
@@ -1,17 +1,22 @@ @@ -1,17 +1,22 @@
1$NetBSD: patch-instsetoo__native_inc__openoffice_unix_find-requires-x11.sh,v 1.3 2022/07/17 10:58:12 tnn Exp $ 1$NetBSD: patch-instsetoo__native_inc__openoffice_unix_find-requires-x11.sh,v 1.4 2022/10/16 11:57:44 tnn Exp $
2 2
3shell portability 3shell portability
4 4
5--- instsetoo_native/inc_openoffice/unix/find-requires-x11.sh.orig 2022-04-27 11:23:38.000000000 +0000 5--- instsetoo_native/inc_openoffice/unix/find-requires-x11.sh.orig 2022-09-09 18:45:51.000000000 +0000
6+++ instsetoo_native/inc_openoffice/unix/find-requires-x11.sh 6+++ instsetoo_native/inc_openoffice/unix/find-requires-x11.sh
7@@ -18,8 +18,8 @@ 7@@ -18,12 +18,12 @@
8 # 8 #
9  9
10 cat > /dev/null 10 cat > /dev/null
11-[[ "${PLATFORMID}" == "linux_x86_64" || "${PLATFORMID}" == "linux_aarch64" ]] && mark64="()(64bit)" 11-[[ "${PLATFORMID}" == "linux_x86_64" || "${PLATFORMID}" == "linux_aarch64" ]] && mark64="()(64bit)"
12-if [[ "${OS}" == "AIX" ]]; then 12-if [[ "${OS}" == "AIX" ]]; then
13+[ "${PLATFORMID}" = "linux_x86_64" -o "${PLATFORMID}" = "linux_aarch64" ] && mark64="()(64bit)" 13+[ "${PLATFORMID}" = "linux_x86_64" -o "${PLATFORMID}" = "linux_aarch64" ] && mark64="()(64bit)"
14+if [ "${OS}" = "AIX" ]; then 14+if [ "${OS}" = "AIX" ]; then
15 echo "libfreetype.a(libfreetype.so.6${mark64})" 15 echo "libfreetype.a(libfreetype.so.6${mark64})"
16 else 16 else
17 echo "libfreetype.so.6${mark64}" 17 echo "libfreetype.so.6${mark64}"
 18- if [[ "${XINERAMA_LINK}" == "dynamic" ]]; then
 19+ if [[ "${XINERAMA_LINK}" = "dynamic" ]]; then
 20 echo "libXinerama.so.1${mark64}"
 21 fi
 22 fi