--- print/harfbuzz/Makefile	(revision 410455)
+++ print/harfbuzz/Makefile	(working copy)
@@ -7,10 +7,9 @@ 
 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:${PORTSDIR}/print/freetype2 \
-		libicudata.so:${PORTSDIR}/devel/icu \
+LIB_DEPENDS?=	libfreetype.so:${PORTSDIR}/print/freetype2 \
 		libgraphite2.so:${PORTSDIR}/graphics/graphite2
 
 USE_LDCONFIG=	yes
@@ -17,11 +16,13 @@ 
 USES=		gmake libtool pathfix pkgconfig tar:bzip2
 USE_GNOME=	cairo glib20 introspection:build
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--with-graphite2 --with-gobject=yes
+CONFIGURE_ARGS=	--with-graphite2 --with-gobject=yes --with-icu=${BUILD_ICU}
 INSTALL_TARGET=	install-strip
 
 PLIST_SUB+=	LIBVER=0.10200.3
 
+BUILD_ICU?=	no
+
 .include <bsd.port.pre.mk>
 
 .if ${OSVERSION} < 1000024
--- print/harfbuzz/pkg-plist	(revision 410455)
+++ print/harfbuzz/pkg-plist	(working copy)
@@ -13,7 +13,6 @@ 
 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-shape.h
@@ -29,14 +28,10 @@ 
 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
--- print/harfbuzz-icu/Makefile	(nonexistent)
+++ print/harfbuzz-icu/Makefile	(working copy)
@@ -0,0 +1,38 @@ 
+# Created by: Vladimir Kondratiev <wulf@cicgroup.ru>
+# $FreeBSD$
+
+PORTNAME=	harfbuzz
+PKGNAMESUFFIX=	-icu
+
+COMMENT=	OpenType text shaping engine (icu backend)
+
+LIB_DEPENDS=	libharfbuzz.so:${PORTSDIR}/print/harfbuzz \
+		libicudata.so:${PORTSDIR}/devel/icu
+
+MASTERDIR=      ${.CURDIR}/../harfbuzz
+PLIST=          ${.CURDIR}/pkg-plist
+
+BUILD_ICU=	yes
+BUILD_WRKSRC=	${WRKSRC}/src
+ALL_TARGET=	libharfbuzz-icu.la harfbuzz-icu.pc
+
+post-patch:
+	${REINPLACE_CMD} -e \
+		'/libharfbuzz_icu_la_LIBADD/s/libharfbuzz.la/-lharfbuzz/' \
+			${BUILD_WRKSRC}/Makefile.in ${BUILD_WRKSRC}/Makefile.am
+	${REINPLACE_CMD} -e \
+		'/HAVE_ICU_TRUE.*am__DEPENDENCIES_1/ s/libharfbuzz.la//' \
+			${BUILD_WRKSRC}/Makefile.in
+
+do-install:
+	${MKDIR} ${STAGEDIR}${PREFIX}/include/harfbuzz/
+	${INSTALL_DATA} ${BUILD_WRKSRC}/hb-icu.h \
+		${STAGEDIR}${PREFIX}/include/harfbuzz/
+	${INSTALL_DATA} ${BUILD_WRKSRC}/harfbuzz-icu.pc \
+		${STAGEDIR}${PREFIX}/libdata/pkgconfig/
+	${INSTALL_LIB} ${BUILD_WRKSRC}/.libs/libharfbuzz-icu.so.[0-9].* \
+		${STAGEDIR}${PREFIX}/lib/
+	cd ${BUILD_WRKSRC}/.libs/ && ${CP} -R libharfbuzz-icu.so \
+		libharfbuzz-icu.so.[0-9] ${STAGEDIR}${PREFIX}/lib/
+
+.include "${MASTERDIR}/Makefile"
--- print/harfbuzz-icu/pkg-plist	(nonexistent)
+++ print/harfbuzz-icu/pkg-plist	(working copy)
@@ -0,0 +1,5 @@ 
+include/harfbuzz/hb-icu.h
+lib/libharfbuzz-icu.so
+lib/libharfbuzz-icu.so.0
+lib/libharfbuzz-icu.so.%%LIBVER%%
+libdata/pkgconfig/harfbuzz-icu.pc
--- editors/libreoffice/Makefile	(revision 410516)
+++ editors/libreoffice/Makefile	(working copy)
@@ -48,6 +48,7 @@ 
 		liblpsolve55.so:${PORTSDIR}/math/lp_solve \
 		libcmis-0.5.so:${PORTSDIR}/net/libcmis \
 		libharfbuzz.so:${PORTSDIR}/print/harfbuzz \
+		libharfbuzz-icu.so:${PORTSDIR}/print/harfbuzz-icu \
 		libmspub-0.1.so:${PORTSDIR}/print/libmspub01 \
 		libpagemaker-0.0.so:${PORTSDIR}/print/libpagemaker \
 		libnss3.so:${PORTSDIR}/security/nss \
--- editors/libreoffice4/Makefile	(revision 410516)
+++ editors/libreoffice4/Makefile	(working copy)
@@ -51,6 +51,7 @@ 
 		liblpsolve55.so:${PORTSDIR}/math/lp_solve \
 		libcmis-0.5.so:${PORTSDIR}/net/libcmis \
 		libharfbuzz.so:${PORTSDIR}/print/harfbuzz \
+		libharfbuzz-icu.so:${PORTSDIR}/print/harfbuzz-icu \
 		libmspub-0.1.so:${PORTSDIR}/print/libmspub01 \
 		libnss3.so:${PORTSDIR}/security/nss \
 		libclucene-core.so:${PORTSDIR}/textproc/clucene \
--- www/chromium/Makefile	(revision 410516)
+++ www/chromium/Makefile	(working copy)
@@ -34,6 +34,7 @@ 
 		libFLAC.so:${PORTSDIR}/audio/flac \
 		libgnome-keyring.so:${PORTSDIR}/security/libgnome-keyring \
 		libharfbuzz.so:${PORTSDIR}/print/harfbuzz \
+		libharfbuzz-icu.so:${PORTSDIR}/print/harfbuzz-icu \
 		libcups.so:${PORTSDIR}/print/cups-client \
 		libevent.so:${PORTSDIR}/devel/libevent2 \
 		libexif.so:${PORTSDIR}/graphics/libexif \
--- www/webkit-gtk2/Makefile	(revision 410516)
+++ www/webkit-gtk2/Makefile	(working copy)
@@ -19,6 +19,7 @@ 
 		libsecret-1.so:${PORTSDIR}/security/libsecret \
 		libicutu.so:${PORTSDIR}/devel/icu \
 		libharfbuzz.so:${PORTSDIR}/print/harfbuzz \
+		libharfbuzz-icu.so:${PORTSDIR}/print/harfbuzz-icu \
 		libwebp.so:${PORTSDIR}/graphics/webp \
 		libcurl.so:${PORTSDIR}/ftp/curl \
 		libsoup-2.4.so:${PORTSDIR}/devel/libsoup
--- www/webkit-gtk3/Makefile	(revision 410516)
+++ www/webkit-gtk3/Makefile	(working copy)
@@ -19,6 +19,7 @@ 
 		libsecret-1.so:${PORTSDIR}/security/libsecret \
 		libicutu.so:${PORTSDIR}/devel/icu \
 		libharfbuzz.so:${PORTSDIR}/print/harfbuzz \
+		libharfbuzz-icu.so:${PORTSDIR}/print/harfbuzz-icu \
 		libwebp.so:${PORTSDIR}/graphics/webp \
 		libcurl.so:${PORTSDIR}/ftp/curl \
 		libsoup-2.4.so:${PORTSDIR}/devel/libsoup
--- www/webkit2-gtk3/Makefile	(revision 410516)
+++ www/webkit2-gtk3/Makefile	(working copy)
@@ -20,6 +20,7 @@ 
 		libsecret-1.so:${PORTSDIR}/security/libsecret \
 		libicutu.so:${PORTSDIR}/devel/icu \
 		libharfbuzz.so:${PORTSDIR}/print/harfbuzz \
+		libharfbuzz-icu.so:${PORTSDIR}/print/harfbuzz-icu \
 		libsoup-2.4.so:${PORTSDIR}/devel/libsoup
 RUN_DEPENDS=	geoclue>=0:${PORTSDIR}/net/geoclue