Use harfbuzz-2.4.0 as internal harfbuzz

* Improve handling of additional distfiles
* Bump PKGREVISION

3 files changed, 18 insertions, 17 deletions

diff --git a/misc/libreoffice/Makefile b/misc/libreoffice/Makefile
index 93bca0d8743..a1250302664 100644
--- a/misc/libreoffice/Makefile
+++ b/misc/libreoffice/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.188 2019/04/03 00:32:54 ryoon Exp $
+# $NetBSD: Makefile,v 1.189 2019/04/03 13:36:30 ryoon Exp $
 
 VERREL=		6.2.2
 VERRC=		2
 VER=		${VERREL}.${VERRC}
 DISTNAME=	libreoffice-${VER}
-PKGREVISION=	3
+PKGREVISION=	4
 CATEGORIES=	misc
 MASTER_SITES=	http://download.documentfoundation.org/libreoffice/src/${VERREL}/
 EXTRACT_SUFX=	.tar.xz
@@ -107,14 +107,15 @@ DISTFILES+=		${md}
 SITES.${md}=		https://dev-www.libreoffice.org/src/
 .endfor
 
-MORE_DISTFILES+=		49a64f3bcf20a7909ba2751349231d6652ded9cd2840e961b5164d09de3ffa63-opens___.ttf
+MORE_DISTFILES2+=		49a64f3bcf20a7909ba2751349231d6652ded9cd2840e961b5164d09de3ffa63-opens___.ttf
 SITES.49a64f3bcf20a7909ba2751349231d6652ded9cd2840e961b5164d09de3ffa63-opens___.ttf=	https://dev-www.libreoffice.org/extern/
 
-MORE_DISTFILES+=		harfbuzz-2.3.1.tar.bz2
-SITES.harfbuzz-2.3.1.tar.bz2=	https://www.freedesktop.org/software/harfbuzz/release/
+MORE_DISTFILES2+=		harfbuzz-2.4.0.tar.bz2
+SITES.harfbuzz-2.4.0.tar.bz2=	https://www.freedesktop.org/software/harfbuzz/release/
 
-DISTFILES+=	49a64f3bcf20a7909ba2751349231d6652ded9cd2840e961b5164d09de3ffa63-opens___.ttf
-DISTFILES+=	harfbuzz-2.3.1.tar.bz2
+.for md2 in ${MORE_DISTFILES2}
+DISTFILES+=		${md2}
+.endfor
 
 .include "options.mk"
 
@@ -247,7 +248,7 @@ debugrun:
 
 post-extract:
 	${MKDIR} -p ${WRKSRC}/src
-.for md in ${MORE_DISTFILES}
+.for md in ${MORE_DISTFILES} ${MORE_DISTFILES2}
 	${LN} -s ${DISTDIR}/${DIST_SUBDIR}/${md} ${WRKSRC}/src/${md}
 .endfor
 	mkdir ${WRKSRC}/tmp
diff --git a/misc/libreoffice/distinfo b/misc/libreoffice/distinfo
index 9da44bce7fe..06b93955789 100644
--- a/misc/libreoffice/distinfo
+++ b/misc/libreoffice/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.75 2019/03/22 23:32:24 ryoon Exp $
+$NetBSD: distinfo,v 1.76 2019/04/03 13:36:30 ryoon Exp $
 
 SHA1 (libreoffice/0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz) = 452eba922e4f41603539c9dc39947d2271e47093
 RMD160 (libreoffice/0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz) = dbeb7a7f8c89961ca2e544b810345d025561866b
@@ -144,10 +144,10 @@ SHA1 (libreoffice/graphite2-minimal-1.3.10.tgz) = a2dac9614ab6b11ba5529f9043467d
 RMD160 (libreoffice/graphite2-minimal-1.3.10.tgz) = 508f69ef2f6c4e8e3843d4a367aea8e1c00439e3
 SHA512 (libreoffice/graphite2-minimal-1.3.10.tgz) = 0bbf2b586d3b9f09aa6f8e68575482d63ea4ebc712bd2103ba678074b581ac0e5593fdb6d26be60a74fea0261da2797d4c0db7d384d75837fbf93dd4ac3579a2
 Size (libreoffice/graphite2-minimal-1.3.10.tgz) = 155690 bytes
-SHA1 (libreoffice/harfbuzz-2.3.1.tar.bz2) = eb8d4257ea3b533fcc7a9207a92cd018108a2fdf
-RMD160 (libreoffice/harfbuzz-2.3.1.tar.bz2) = 6c2500882f1f67635e59908efb1f2264e2c00aaa
-SHA512 (libreoffice/harfbuzz-2.3.1.tar.bz2) = 78a8f05bfcc95cfe3fc0f1a595bdc7298c9c1456db6c7ef70914051fda43f37aaff15eac75aa6922eca82d2291baeb8385e02e6aacb44ca05b4873c311a662ac
-Size (libreoffice/harfbuzz-2.3.1.tar.bz2) = 17942960 bytes
+SHA1 (libreoffice/harfbuzz-2.4.0.tar.bz2) = f0f12b9eb1ba53a82533c25901ba023fa92af83c
+RMD160 (libreoffice/harfbuzz-2.4.0.tar.bz2) = d8425d624be09239d0981a00464bda92cec69502
+SHA512 (libreoffice/harfbuzz-2.4.0.tar.bz2) = 88919576ac23f1ba36705212c3bd1cd3c91294f99234c076f13c6cb1f5c78447638c5cfb1bb397f5948db799e6b343667aab2f631fe35295c3d10d10783fd12a
+Size (libreoffice/harfbuzz-2.4.0.tar.bz2) = 17922003 bytes
 SHA1 (libreoffice/language-subtag-registry-2018-04-23.tar.bz2) = 9414d32c4898e2c424dce590bab6e925df151a17
 RMD160 (libreoffice/language-subtag-registry-2018-04-23.tar.bz2) = 8b10fc6ec25128a79274a67e84c2585aad540ee8
 SHA512 (libreoffice/language-subtag-registry-2018-04-23.tar.bz2) = 94972420f4227933c27789b5a808071d11e9ee53f5184a47452772ac235ed17c1ac02c8a8d24a3f3c1067f75161d524fb587097e348c144ae50ee539b4e78cd7
@@ -219,7 +219,7 @@ SHA1 (patch-bridges_source_cpp__uno_gcc3__linux__x86-64_share.hxx) = f7eaf2748c6
 SHA1 (patch-configure.ac) = c9b10c86e809961f9312d1dbd925c6bc77042f56
 SHA1 (patch-desktop_scripts_soffice.sh) = 8f2b909ac798ba00f0f9ab5accd0c128c50b1fa5
 SHA1 (patch-desktop_unx_source_pagein.c) = 0aa2b289df6d0fa524bf057d532aa5f9ceb6dde5
-SHA1 (patch-download.lst) = 089f98a44543f4324498c873388215135c924a09
+SHA1 (patch-download.lst) = f6db8e621d9fee8652e62d5bb637d54618bfdb04
 SHA1 (patch-external_harfbuzz_UnpackedTarball__harfbuzz.mk) = 5c5d965558f3c431cde6fc280438b23494b22607
 SHA1 (patch-external_mariadb-connector-c_UnpackedTarball__mariadb-connector-c.mk) = 01798842e3f573f627be31660195edbac802df89
 SHA1 (patch-external_mariadb-connector-c_netbsd.patch) = e20e0cc58153b865551a8dd2819fb141f20fcb8d
diff --git a/misc/libreoffice/patches/patch-download.lst b/misc/libreoffice/patches/patch-download.lst
index 7dc2e5037f4..6a36b150eca 100644
--- a/misc/libreoffice/patches/patch-download.lst
+++ b/misc/libreoffice/patches/patch-download.lst
@@ -1,4 +1,4 @@
-$NetBSD: patch-download.lst,v 1.11 2019/02/19 16:28:03 ryoon Exp $
+$NetBSD: patch-download.lst,v 1.12 2019/04/03 13:36:30 ryoon Exp $
 
 --- download.lst.orig	2019-01-23 19:35:25.000000000 +0000
 +++ download.lst
@@ -8,8 +8,8 @@ $NetBSD: patch-download.lst,v 1.11 2019/02/19 16:28:03 ryoon Exp $
  export GRAPHITE_TARBALL := graphite2-minimal-1.3.10.tgz
 -export HARFBUZZ_SHA256SUM := 3c592f86fa0da69e2e0e98cae9f5d5b61def3bb7948aa00ca45748f27fa545fd
 -export HARFBUZZ_TARBALL := harfbuzz-1.8.4.tar.bz2
-+export HARFBUZZ_SHA256SUM := f205699d5b91374008d6f8e36c59e419ae2d9a7bb8c5d9f34041b9a5abcae468
-+export HARFBUZZ_TARBALL := harfbuzz-2.3.1.tar.bz2
++export HARFBUZZ_SHA256SUM := 9035005903da74667d28bb181986e879e11da3d5986722759fa145cca781ead6
++export HARFBUZZ_TARBALL := harfbuzz-2.4.0.tar.bz2
  export HSQLDB_SHA256SUM := d30b13f4ba2e3b6a2d4f020c0dee0a9fb9fc6fbcc2d561f36b78da4bf3802370
  export HSQLDB_TARBALL := 17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip
  export HUNSPELL_SHA256SUM := 57be4e03ae9dd62c3471f667a0d81a14513e314d4d92081292b90435944ff951