MFH: r476207

print/harfbuzz: update to 1.8.5

Changes:	https://github.com/harfbuzz/harfbuzz/blob/1.8.5/NEWS
ABI:		https://abi-laboratory.pro/tracker/timeline/harfbuzz/
Approved by:	ports-secteam blanket (required by Firefox 63)

print/harfbuzz-icu/Makefile

@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-PORTREVISION=	2
+PORTREVISION=	0
 PKGNAMESUFFIX=	-icu
 
 COMMENT=	Harfbuzz ICU support

print/harfbuzz/Makefile

@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	harfbuzz
-PORTVERSION=	1.8.4
+PORTVERSION=	1.8.5
 PORTREVISION?=	0
 CATEGORIES=	print
 MASTER_SITES=	http://www.freedesktop.org/software/harfbuzz/release/
@@ -22,7 +22,7 @@ CONFIGURE_ARGS=	--with-graphite2 --with-gobject=yes
 INSTALL_TARGET=	install-strip
 TEST_TARGET=	check
 
-PLIST_SUB+=	LIBVER=0.10800.4
+PLIST_SUB+=	LIBVER=0.10800.5
 
 HARFBUZZ_SLAVE?=	no
 

print/harfbuzz/distinfo

@@ -1,3 +1,3 @@
-TIMESTAMP = 1531826405
-SHA256 (harfbuzz-1.8.4.tar.bz2) = 3c592f86fa0da69e2e0e98cae9f5d5b61def3bb7948aa00ca45748f27fa545fd
-SIZE (harfbuzz-1.8.4.tar.bz2) = 3829479
+TIMESTAMP = 1533160284
+SHA256 (harfbuzz-1.8.5.tar.bz2) = 8f6f40fc49dbaf15221807e2c2b9293cbaa73592ef4b3ab430252ca6571120ac
+SIZE (harfbuzz-1.8.5.tar.bz2) = 3859514

print/harfbuzz/files/patch-src_hb-atomic-private.hh

@@ -1,16 +1,15 @@
---- src/hb-atomic-private.hh.orig	2015-04-10 02:16:57 UTC
+--- src/hb-atomic-private.hh.orig	2018-08-01 21:15:00 UTC
 +++ src/hb-atomic-private.hh
-@@ -103,8 +103,12 @@ typedef int hb_atomic_int_impl_t;
- #define hb_atomic_int_impl_add(AI, V)		__sync_fetch_and_add (&(AI), (V))
+@@ -114,7 +114,12 @@ typedef LONG hb_atomic_int_impl_t;
+ typedef int hb_atomic_int_impl_t;
+ #define hb_atomic_int_impl_add(AI, V)		__sync_fetch_and_add ((AI), (V))
 
- #define hb_atomic_ptr_impl_get(P)		(void *) (__sync_synchronize (), *(P))
 +#if defined(__FreeBSD__) && defined(__mips__)
 +#include <machine/atomic.h>
 +#define hb_atomic_ptr_impl_cmpexch(P,O,N)	atomic_cmpset_rel_32 ((uint32_t *)(P), (uint32_t)(O), (uint32_t)(N))
 +#else
  #define hb_atomic_ptr_impl_cmpexch(P,O,N)	__sync_bool_compare_and_swap ((P), (O), (N))
--
 +#endif
 
- #elif !defined(HB_NO_MT) && defined(HAVE_SOLARIS_ATOMIC_OPS)
 
+ #elif !defined(HB_NO_MT) && defined(HAVE_SOLARIS_ATOMIC_OPS)