Attachment #172973 for bug #211363

Lines 2-8 Link Here

(-)harfbuzz/Makefile (-2 / +2 lines)
2	# $FreeBSD: head/print/harfbuzz/Makefile 418357 2016-07-11 08:21:36Z jbeich $	2	# $FreeBSD: head/print/harfbuzz/Makefile 418357 2016-07-11 08:21:36Z jbeich $
3		3
4	PORTNAME= harfbuzz	4	PORTNAME= harfbuzz
5	PORTVERSION= 1.2.7	5	PORTVERSION= 1.3.0
6	CATEGORIES= print	6	CATEGORIES= print
7	MASTER_SITES= http://www.freedesktop.org/software/harfbuzz/release/	7	MASTER_SITES= http://www.freedesktop.org/software/harfbuzz/release/
8		8
Lines 21-27 Link Here
21	INSTALL_TARGET= install-strip	21	INSTALL_TARGET= install-strip
22	TEST_TARGET= check	22	TEST_TARGET= check
23		23
24	PLIST_SUB+= LIBVER=0.10200.7	24	PLIST_SUB+= LIBVER=0.10300.0
25		25
26	EXTRA_PATCHES+= ${EXTRA_PATCHES_${OPSYS}_${OSREL:R}}	26	EXTRA_PATCHES+= ${EXTRA_PATCHES_${OPSYS}_${OSREL:R}}
27	EXTRA_PATCHES_FreeBSD_9= ${PATCHDIR}/extra-src_hb-open-type-private.hh	27	EXTRA_PATCHES_FreeBSD_9= ${PATCHDIR}/extra-src_hb-open-type-private.hh

Lines 1-2 Link Here

(-)harfbuzz/distinfo (-2 / +3 lines)
1	SHA256 (harfbuzz-1.2.7.tar.bz2) = bba0600ae08b84384e6d2d7175bea10b5fc246c4583dc841498d01894d479026	1	TIMESTAMP = 1469091491
2	SIZE (harfbuzz-1.2.7.tar.bz2) = 1345389	2	SHA256 (harfbuzz-1.3.0.tar.bz2) = b04be31633efee2cae1d62d46434587302554fa837224845a62565ec68a0334d
		3	SIZE (harfbuzz-1.3.0.tar.bz2) = 1351234




# Origin: https://cgit.freedesktop.org/harfbuzz/commit/?id=dd31fc9f7e6d23b414b22874de96eb3c002c80ba
# Subject: Don't build UCDN support when building with GLib (#296)
# Regression from: b424b6c372dfe4c0ed75a49761eb34a416819446.
# Applied to configure instead of configure.ac file, because it was generated.

--- configure.orig	2016-07-21 08:57:54 UTC
+++ configure
@@ -18678,7 +18678,7 @@ fi
 
 
 have_ucdn=true
-if $have_glib || $have_icu && test "x$with_icu" = "xbuiltin"; then
+if $have_glib || test \( $have_icu -a "x$with_icu" = "xbuiltin" \); then
 	have_ucdn=false
 fi
 if $have_ucdn; then

Lines 95-100 Link Here

(-)harfbuzz/pkg-plist (+1 lines)
95	share/gtk-doc/html/harfbuzz/hello-harfbuzz.html	95	share/gtk-doc/html/harfbuzz/hello-harfbuzz.html
96	share/gtk-doc/html/harfbuzz/home.png	96	share/gtk-doc/html/harfbuzz/home.png
97	share/gtk-doc/html/harfbuzz/index.html	97	share/gtk-doc/html/harfbuzz/index.html
		98	share/gtk-doc/html/harfbuzz/index.sgml
98	share/gtk-doc/html/harfbuzz/install-harfbuzz.html	99	share/gtk-doc/html/harfbuzz/install-harfbuzz.html
99	share/gtk-doc/html/harfbuzz/left-insensitive.png	100	share/gtk-doc/html/harfbuzz/left-insensitive.png
100	share/gtk-doc/html/harfbuzz/left.png	101	share/gtk-doc/html/harfbuzz/left.png

Return to bug 211363

Line 0 Link Here

(-)harfbuzz/files/patch-configure (+16 lines)
	1	# Origin: https://cgit.freedesktop.org/harfbuzz/commit/?id=dd31fc9f7e6d23b414b22874de96eb3c002c80ba
	2	# Subject: Don't build UCDN support when building with GLib (#296)
	3	# Regression from: b424b6c372dfe4c0ed75a49761eb34a416819446.
	4	# Applied to configure instead of configure.ac file, because it was generated.
	5
	6	--- configure.orig 2016-07-21 08:57:54 UTC
	7	+++ configure
	8	@@ -18678,7 +18678,7 @@ fi
	9
	10
	11	have_ucdn=true
	12	-if $have_glib \|\| $have_icu && test "x$with_icu" = "xbuiltin"; then
	13	+if $have_glib \|\| test \( $have_icu -a "x$with_icu" = "xbuiltin" \); then
	14	have_ucdn=false
	15	fi
	16	if $have_ucdn; then