6 files changed, 87 insertions, 7 deletions

diff --git a/print/Makefile b/print/Makefile
index 1579abaa46a3..cccf0f65d3de 100644
--- a/print/Makefile
+++ b/print/Makefile
@@ -81,6 +81,7 @@
     SUBDIR += gutenprint
     SUBDIR += gv
     SUBDIR += harfbuzz
+    SUBDIR += harfbuzz-hb-view
     SUBDIR += harfbuzz-icu
     SUBDIR += hp2xx
     SUBDIR += hplip
diff --git a/print/harfbuzz-bh-view/Makefile b/print/harfbuzz-bh-view/Makefile
new file mode 100644
index 000000000000..d5a03a246623
--- /dev/null
+++ b/print/harfbuzz-bh-view/Makefile
@@ -0,0 +1,12 @@
+# $FreeBSD$
+
+PORTREVISION=	0
+PKGNAMESUFFIX=	-hb-view
+
+COMMENT=	Harfbuzz hb-view utility
+
+MASTERDIR=	${.CURDIR}/../../print/harfbuzz
+PLIST=		${.CURDIR}/pkg-plist
+HARFBUZZ_SLAVE=	hb-view
+
+.include "${MASTERDIR}/Makefile"
diff --git a/print/harfbuzz-bh-view/pkg-plist b/print/harfbuzz-bh-view/pkg-plist
new file mode 100644
index 000000000000..b888fd5c3b34
--- /dev/null
+++ b/print/harfbuzz-bh-view/pkg-plist
@@ -0,0 +1,55 @@
+@comment bin/hb-ot-shape-closure
+@comment bin/hb-shape
+@comment bin/hb-subset
+bin/hb-view
+@comment include/harfbuzz/hb-aat-layout.h
+@comment include/harfbuzz/hb-aat.h
+@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
+@comment include/harfbuzz/hb-map.h
+@comment include/harfbuzz/hb-icu.h
+@comment include/harfbuzz/hb-ot-color.h
+@comment include/harfbuzz/hb-ot-deprecated.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-name.h
+@comment include/harfbuzz/hb-ot-shape.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-subset.h
+@comment include/harfbuzz/hb-unicode.h
+@comment include/harfbuzz/hb-version.h
+@comment include/harfbuzz/hb.h
+@comment lib/cmake/harfbuzz/harfbuzz-config.cmake
+@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%%
+@comment lib/libharfbuzz-icu.so
+@comment lib/libharfbuzz-icu.so.0
+@comment lib/libharfbuzz-icu.so.%%LIBVER%%
+@comment lib/libharfbuzz-subset.so
+@comment lib/libharfbuzz-subset.so.0
+@comment lib/libharfbuzz-subset.so.%%LIBVER%%
+@comment lib/libharfbuzz.so
+@comment lib/libharfbuzz.so.0
+@comment lib/libharfbuzz.so.%%LIBVER%%
+@comment libdata/pkgconfig/harfbuzz-gobject.pc
+@comment libdata/pkgconfig/harfbuzz-icu.pc
+@comment libdata/pkgconfig/harfbuzz-subset.pc
+@comment libdata/pkgconfig/harfbuzz.pc
+@comment share/gir-1.0/HarfBuzz-0.0.gir
diff --git a/print/harfbuzz-icu/Makefile b/print/harfbuzz-icu/Makefile
index 297b59fce170..bc6de9101a15 100644
--- a/print/harfbuzz-icu/Makefile
+++ b/print/harfbuzz-icu/Makefile
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-PORTREVISION=	0
+PORTREVISION=	1
 PKGNAMESUFFIX=	-icu
 
 COMMENT=	Harfbuzz ICU support
diff --git a/print/harfbuzz/Makefile b/print/harfbuzz/Makefile
index 54e8cb579595..d4842e6bc0ac 100644
--- a/print/harfbuzz/Makefile
+++ b/print/harfbuzz/Makefile
@@ -3,22 +3,26 @@
 
 PORTNAME=	harfbuzz
 PORTVERSION=	2.6.1
-PORTREVISION?=	0
+PORTREVISION?=	1
 CATEGORIES=	print
 MASTER_SITES=	http://www.freedesktop.org/software/harfbuzz/release/
 
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT?=	OpenType text shaping engine
 
+LICENSE=	MIT
+
 LIB_DEPENDS=	libfreetype.so:print/freetype2 \
 		libgraphite2.so:graphics/graphite2
 
-USE_LDCONFIG=	yes
 USES=		compiler:c++11-lib gettext-runtime gmake gnome libtool \
 		pathfix pkgconfig tar:xz
-USE_GNOME=	cairo glib20 introspection:build
+USE_GNOME=	glib20 introspection:build
+
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-graphite2 --with-gobject=yes
+USE_LDCONFIG=	yes
+
 INSTALL_TARGET=	install-strip
 TEST_TARGET=	check
 
@@ -27,13 +31,22 @@ PLIST_SUB+=	LIBVER=0.20600.1
 HARFBUZZ_SLAVE?=	no
 
 .if ${HARFBUZZ_SLAVE} == no
-CONFIGURE_ARGS+=	--without-icu
-.else
+CONFIGURE_ARGS+=	--without-icu --without-cairo
+.elif ${HARFBUZZ_SLAVE} ==  icu
 CONFIGURE_ARGS+=	--with-icu \
+			--without-cairo \
 		--disable-gtk-doc-html
 LIB_DEPENDS+=	libharfbuzz.so:print/harfbuzz \
 		libicudata.so:devel/icu
 
+.elif ${HARFBUZZ_SLAVE} == hb-view
+CONFIGURE_ARGS+=	--with-cairo \
+			--without-icu
+LIB_DEPENDS+=	libharfbuzz.so:print/harfbuzz
+USE_GNOME+=	cairo
+.endif
+
+.if ${HARFBUZZ_SLAVE} != no
 post-patch:
 	${REINPLACE_CMD} -e 's|install-data-am: install-data-local|install-data-am:|g' \
 		${WRKSRC}/docs/Makefile.in
diff --git a/print/harfbuzz/pkg-plist b/print/harfbuzz/pkg-plist
index 5a24198d77f6..775b7e88953b 100644
--- a/print/harfbuzz/pkg-plist
+++ b/print/harfbuzz/pkg-plist
@@ -1,7 +1,6 @@
 bin/hb-ot-shape-closure
 bin/hb-shape
 bin/hb-subset
-bin/hb-view
 include/harfbuzz/hb-aat-layout.h
 include/harfbuzz/hb-aat.h
 include/harfbuzz/hb-blob.h