Index: Makefile
===================================================================
--- Makefile	(revision 450187)
+++ Makefile	(working copy)
@@ -3,41 +3,26 @@
 
 PORTNAME=	harfbuzz
 PORTVERSION=	1.5.1
-PORTREVISION=	1
+PORTREVISION=	2
 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=		gettext-runtime gmake gnome libtool \
+USES=		compiler:c++0x gettext-runtime gmake gnome 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
 INSTALL_TARGET=	install-strip
 TEST_TARGET=	check
 
 PLIST_SUB+=	LIBVER=0.10501.0
 
-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>
Index: pkg-plist
===================================================================
--- pkg-plist	(revision 450187)
+++ pkg-plist	(working copy)
@@ -13,6 +13,7 @@
 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
@@ -33,8 +34,12 @@
 lib/libharfbuzz.so
 lib/libharfbuzz.so.0
 lib/libharfbuzz.so.%%LIBVER%%
+lib/libharfbuzz-icu.so
+lib/libharfbuzz-icu.so.0
+lib/libharfbuzz-icu.so.%%LIBVER%%
 libdata/pkgconfig/harfbuzz-gobject.pc
 libdata/pkgconfig/harfbuzz.pc
+libdata/pkgconfig/harfbuzz-icu.pc
 share/gir-1.0/HarfBuzz-0.0.gir
 share/gtk-doc/html/harfbuzz/HarfBuzz.png
 share/gtk-doc/html/harfbuzz/a-clustering-example-for-levels-0-and-1.html