Split off the harfbuzz icu support into it's own port.

PR:		207779
Submitted by:	Vladimir Kondratyev <vladimir@kondratyev.su>
Exp-run by:	antoine@

7 files changed, 78 insertions, 10 deletions

diff --git a/print/Makefile b/print/Makefile
index afaeb3effa6c..7da3edcbc46d 100644
--- a/print/Makefile
+++ b/print/Makefile
@@ -88,6 +88,7 @@
     SUBDIR += gutenprint-ijs
     SUBDIR += gv
     SUBDIR += harfbuzz
+    SUBDIR += harfbuzz-icu
     SUBDIR += hp2xx
     SUBDIR += hpijs
     SUBDIR += hplip
diff --git a/print/harfbuzz-icu/Makefile b/print/harfbuzz-icu/Makefile
new file mode 100644
index 000000000000..5a668d09ec1f
--- /dev/null
+++ b/print/harfbuzz-icu/Makefile
@@ -0,0 +1,11 @@
+# $FreeBSD$
+
+PKGNAMESUFFIX=	-icu
+
+COMMENT=	Harfbuzz ICU support
+
+MASTERDIR=	${.CURDIR}/../../print/harfbuzz
+PLIST=		pkg-plist
+HARFBUZZ_SLAVE=	icu
+
+.include "${MASTERDIR}/Makefile"
diff --git a/print/harfbuzz-icu/pkg-plist b/print/harfbuzz-icu/pkg-plist
new file mode 100644
index 000000000000..e6b56d1ff174
--- /dev/null
+++ b/print/harfbuzz-icu/pkg-plist
@@ -0,0 +1,43 @@
+@comment bin/hb-ot-shape-closure
+@comment bin/hb-shape
+@comment bin/hb-view
+@comment include/harfbuzz/hb-blob.h
+@comment include/harfbuzz/hb-buffer.h
+@comment include/harfbuzz/hb-common.h
+@comment include/harfbuzz/hb-deprecated.h
+@comment include/harfbuzz/hb-face.h
+@comment include/harfbuzz/hb-font.h
+@comment include/harfbuzz/hb-ft.h
+@comment include/harfbuzz/hb-glib.h
+@comment include/harfbuzz/hb-gobject-enums.h
+@comment include/harfbuzz/hb-gobject-structs.h
+@comment include/harfbuzz/hb-gobject.h
+@comment include/harfbuzz/hb-graphite2.h
+include/harfbuzz/hb-icu.h
+@comment include/harfbuzz/hb-ot-font.h
+@comment include/harfbuzz/hb-ot-layout.h
+@comment include/harfbuzz/hb-ot-math.h
+@comment include/harfbuzz/hb-ot-shape.h
+@comment include/harfbuzz/hb-ot-tag.h
+@comment include/harfbuzz/hb-ot-var.h
+@comment include/harfbuzz/hb-ot.h
+@comment include/harfbuzz/hb-set.h
+@comment include/harfbuzz/hb-shape-plan.h
+@comment include/harfbuzz/hb-shape.h
+@comment include/harfbuzz/hb-unicode.h
+@comment include/harfbuzz/hb-version.h
+@comment include/harfbuzz/hb.h
+@comment lib/girepository-1.0/HarfBuzz-0.0.typelib
+@comment lib/libharfbuzz-gobject.so
+@comment lib/libharfbuzz-gobject.so.0
+@comment lib/libharfbuzz-gobject.so.%%LIBVER%%
+lib/libharfbuzz-icu.so
+lib/libharfbuzz-icu.so.0
+lib/libharfbuzz-icu.so.%%LIBVER%%
+@comment lib/libharfbuzz.so
+@comment lib/libharfbuzz.so.0
+@comment lib/libharfbuzz.so.%%LIBVER%%
+@comment libdata/pkgconfig/harfbuzz-gobject.pc
+libdata/pkgconfig/harfbuzz-icu.pc
+@comment libdata/pkgconfig/harfbuzz.pc
+@comment share/gir-1.0/HarfBuzz-0.0.gir
diff --git a/print/harfbuzz/Makefile b/print/harfbuzz/Makefile
index 1c866e634063..19c02f975a05 100644
--- a/print/harfbuzz/Makefile
+++ b/print/harfbuzz/Makefile
@@ -3,18 +3,18 @@
 
 PORTNAME=	harfbuzz
 PORTVERSION=	1.4.6
+PORTREVISION=	1
 CATEGORIES=	print
 MASTER_SITES=	http://www.freedesktop.org/software/harfbuzz/release/
 
 MAINTAINER=	gnome@FreeBSD.org
-COMMENT=	OpenType text shaping engine
+COMMENT?=	OpenType text shaping engine
 
 LIB_DEPENDS=	libfreetype.so:print/freetype2 \
-		libicudata.so:devel/icu \
 		libgraphite2.so:graphics/graphite2
 
 USE_LDCONFIG=	yes
-USES=		compiler:c++0x gettext-runtime gmake gnome libtool \
+USES=		gettext-runtime gmake gnome libtool \
 		pathfix pkgconfig tar:bzip2
 USE_GNOME=	cairo glib20 introspection:build
 GNU_CONFIGURE=	yes
@@ -24,4 +24,20 @@ TEST_TARGET=	check
 
 PLIST_SUB+=	LIBVER=0.10400.6
 
+HARFBUZZ_SLAVE?=	no
+
+.if ${HARFBUZZ_SLAVE} == no
+CONFIGURE_ARGS+=	--without-icu
+.else
+CONFIGURE_ARGS+=	--with-icu \
+		--disable-gtk-doc-html
+USES+=		compiler:c++0x
+LIB_DEPENDS+=	libharfbuzz.so:print/harfbuzz \
+		libicudata.so:devel/icu
+
+post-patch:
+	${REINPLACE_CMD} -e 's|install-data-am: install-data-local|install-data-am:|g' \
+		${WRKSRC}/docs/Makefile.in
+.endif
+
 .include <bsd.port.mk>
diff --git a/print/harfbuzz/pkg-plist b/print/harfbuzz/pkg-plist
index 46e7c9704cc7..919619b3c6f7 100644
--- a/print/harfbuzz/pkg-plist
+++ b/print/harfbuzz/pkg-plist
@@ -13,7 +13,6 @@ include/harfbuzz/hb-gobject-enums.h
 include/harfbuzz/hb-gobject-structs.h
 include/harfbuzz/hb-gobject.h
 include/harfbuzz/hb-graphite2.h
-include/harfbuzz/hb-icu.h
 include/harfbuzz/hb-ot-font.h
 include/harfbuzz/hb-ot-layout.h
 include/harfbuzz/hb-ot-math.h
@@ -31,14 +30,10 @@ lib/girepository-1.0/HarfBuzz-0.0.typelib
 lib/libharfbuzz-gobject.so
 lib/libharfbuzz-gobject.so.0
 lib/libharfbuzz-gobject.so.%%LIBVER%%
-lib/libharfbuzz-icu.so
-lib/libharfbuzz-icu.so.0
-lib/libharfbuzz-icu.so.%%LIBVER%%
 lib/libharfbuzz.so
 lib/libharfbuzz.so.0
 lib/libharfbuzz.so.%%LIBVER%%
 libdata/pkgconfig/harfbuzz-gobject.pc
-libdata/pkgconfig/harfbuzz-icu.pc
 libdata/pkgconfig/harfbuzz.pc
 share/gir-1.0/HarfBuzz-0.0.gir
 share/gtk-doc/html/harfbuzz/HarfBuzz.png
diff --git a/print/tex-xetex/Makefile b/print/tex-xetex/Makefile
index bedf0703291e..dd5e3cce1b52 100644
--- a/print/tex-xetex/Makefile
+++ b/print/tex-xetex/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	xetex
 PORTVERSION=	0.99992
-PORTREVISION=	9
+PORTREVISION=	10
 CATEGORIES=	print
 MASTER_SITES=	ftp://tug.org/historic/systems/texlive/2015/
 PKGNAMEPREFIX=	tex-
@@ -19,6 +19,7 @@ LIB_DEPENDS=	libfreetype.so:print/freetype2 \
 		libgraphite2.so:graphics/graphite2 \
 		libicuio.so:devel/icu \
 		libharfbuzz.so:print/harfbuzz \
+		libharfbuzz-icu.so:print/harfbuzz-icu \
 		libpng.so:graphics/png \
 		libpoppler.so:graphics/poppler \
 		libTECkit.so:textproc/teckit
diff --git a/print/texlive-base/Makefile b/print/texlive-base/Makefile
index f288e4c4b829..e19a0f805be9 100644
--- a/print/texlive-base/Makefile
+++ b/print/texlive-base/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	texlive
 PORTVERSION=	20150521
-PORTREVISION=	16
+PORTREVISION=	17
 CATEGORIES=	print
 MASTER_SITES=	TEX_CTAN/systems/texlive/Source/
 PKGNAMESUFFIX=	-base
@@ -20,6 +20,7 @@ LIB_DEPENDS=	libicuio.so:devel/icu \
 		libgraphite2.so:graphics/graphite2 \
 		libfreetype.so:print/freetype2 \
 		libharfbuzz.so:print/harfbuzz \
+		libharfbuzz-icu.so:print/harfbuzz-icu \
 		libpng.so:graphics/png \
 		libzzip.so:devel/zziplib \
 		libpoppler.so:graphics/poppler \