Changes 0.9.20:

General:
- Misc substitute_closure() fixes.
- Build fixes.

Documentation:
- gtk-doc boilerplate integrated.  Docs are built now, but
  contain no contents.  By next release hopefully we have
  some content in.  Enable using --enable-gtk-doc.

GObject and Introspection:
- Added harfbuzz-gobject library (hb-gobject.h) that has type
  bindings for all HarfBuzz objects and enums.  Enable using
  --with-gobject.
- Added gobject-introspection boilerplate.  Nothing useful
  right now.  Work in progress.  Gets enabled automatically if
  --with-gobject is used.  Override with --disable-introspection.

OpenType shaper:
- Apply 'mark' in Myanmar shaper.
- Don't apply 'dlig' by default.

Uniscribe shaper:
- Support user features.
- Fix loading of fonts that are also installed on the system.
- Fix shaping of Arabic Presentation Forms.
- Fix build with wide chars.

CoreText shaper:
- Support user features.

Source changes:
- hb_face_t code moved to hb-face.h / hb-face.cc.
- Added hb-deprecated.h.

API changes:
- Added HB_DISABLE_DEPRECATED.
- Deprecated HB_SCRIPT_CANADIAN_ABORIGINAL; replaced by
  HB_SCRIPT_CANADIAN_SYLLABICS.
- Deprecated HB_BUFFER_FLAGS_DEFAULT; replaced by
  HB_BUFFER_FLAG_DEFAULT.
- Deprecated HB_BUFFER_SERIALIZE_FLAGS_DEFAULT; replaced by
  HB_BUFFER_SERIALIZE_FLAG_DEFAULT.

5 files changed, 56 insertions, 18 deletions

diff --git a/fonts/harfbuzz/Makefile b/fonts/harfbuzz/Makefile
index 866a2aabf9a..c2902720ff1 100644
--- a/fonts/harfbuzz/Makefile
+++ b/fonts/harfbuzz/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.20 2013/08/22 15:34:32 jaapb Exp $
+# $NetBSD: Makefile,v 1.21 2013/08/31 22:20:24 adam Exp $
 
-DISTNAME=	harfbuzz-0.9.19
+DISTNAME=	harfbuzz-0.9.20
 CATEGORIES=	fonts
 MASTER_SITES=	http://www.freedesktop.org/software/harfbuzz/release/
 EXTRACT_SUFX=	.tar.bz2
@@ -16,19 +16,18 @@ USE_LANGUAGES=		c c++
 USE_LIBTOOL=		yes
 USE_TOOLS+=		gmake pkg-config
 GNU_CONFIGURE=		yes
-
-PKGCONFIG_OVERRIDE=	src/harfbuzz.pc.in
-
 CONFIGURE_ARGS+=	--with-cairo=no
 CONFIGURE_ARGS+=	--with-coretext=auto
 
-PLIST_VARS+=	icu
+PKGCONFIG_OVERRIDE+=	src/harfbuzz.pc.in
+PKGCONFIG_OVERRIDE+=	src/harfbuzz-icu.pc.in
 
 LDFLAGS.OpenBSD+=	-lz
 
-.include "../../mk/bsd.prefs.mk"
 .include "options.mk"
 
+.include "../../mk/bsd.prefs.mk"
+
 # gcc too old
 .if ${OPSYS} == "MirBSD"
 BUILDLINK_TRANSFORM+=	rm:-fvisibility-inlines-hidden
diff --git a/fonts/harfbuzz/PLIST b/fonts/harfbuzz/PLIST
index 23cf8ecb2d1..8a9509cacef 100644
--- a/fonts/harfbuzz/PLIST
+++ b/fonts/harfbuzz/PLIST
@@ -1,13 +1,14 @@
-@comment $NetBSD: PLIST,v 1.5 2013/08/22 15:34:32 jaapb Exp $
+@comment $NetBSD: PLIST,v 1.6 2013/08/31 22:20:24 adam Exp $
 bin/hb-ot-shape-closure
 bin/hb-shape
 include/harfbuzz/hb-blob.h
 include/harfbuzz/hb-buffer.h
 include/harfbuzz/hb-common.h
+include/harfbuzz/hb-deprecated.h
+include/harfbuzz/hb-face.h
 include/harfbuzz/hb-font.h
 include/harfbuzz/hb-ft.h
 include/harfbuzz/hb-glib.h
-include/harfbuzz/hb-gobject.h
 ${PLIST.icu}include/harfbuzz/hb-icu.h
 include/harfbuzz/hb-ot-layout.h
 include/harfbuzz/hb-ot-tag.h
@@ -22,3 +23,40 @@ lib/libharfbuzz.la
 ${PLIST.icu}lib/libharfbuzz-icu.la
 lib/pkgconfig/harfbuzz.pc
 ${PLIST.icu}lib/pkgconfig/harfbuzz-icu.pc
+share/gtk-doc/html/harfbuzz/api-index-full.html
+share/gtk-doc/html/harfbuzz/ch01.html
+share/gtk-doc/html/harfbuzz/deprecated-api-index.html
+share/gtk-doc/html/harfbuzz/harfbuzz-hb-blob.html
+share/gtk-doc/html/harfbuzz/harfbuzz-hb-buffer.html
+share/gtk-doc/html/harfbuzz/harfbuzz-hb-common.html
+share/gtk-doc/html/harfbuzz/harfbuzz-hb-coretext.html
+share/gtk-doc/html/harfbuzz/harfbuzz-hb-deprecated.html
+share/gtk-doc/html/harfbuzz/harfbuzz-hb-face.html
+share/gtk-doc/html/harfbuzz/harfbuzz-hb-font.html
+share/gtk-doc/html/harfbuzz/harfbuzz-hb-ft.html
+share/gtk-doc/html/harfbuzz/harfbuzz-hb-glib.html
+share/gtk-doc/html/harfbuzz/harfbuzz-hb-gobject.html
+share/gtk-doc/html/harfbuzz/harfbuzz-hb-graphite2.html
+share/gtk-doc/html/harfbuzz/harfbuzz-hb-icu.html
+share/gtk-doc/html/harfbuzz/harfbuzz-hb-ot-layout.html
+share/gtk-doc/html/harfbuzz/harfbuzz-hb-ot-tag.html
+share/gtk-doc/html/harfbuzz/harfbuzz-hb-ot.html
+share/gtk-doc/html/harfbuzz/harfbuzz-hb-set.html
+share/gtk-doc/html/harfbuzz/harfbuzz-hb-shape-plan.html
+share/gtk-doc/html/harfbuzz/harfbuzz-hb-shape.html
+share/gtk-doc/html/harfbuzz/harfbuzz-hb-unicode.html
+share/gtk-doc/html/harfbuzz/harfbuzz-hb-uniscribe.html
+share/gtk-doc/html/harfbuzz/harfbuzz-hb-version.html
+share/gtk-doc/html/harfbuzz/harfbuzz-hb.html
+share/gtk-doc/html/harfbuzz/harfbuzz.devhelp2
+share/gtk-doc/html/harfbuzz/home.png
+share/gtk-doc/html/harfbuzz/index.html
+share/gtk-doc/html/harfbuzz/index.sgml
+share/gtk-doc/html/harfbuzz/left-insensitive.png
+share/gtk-doc/html/harfbuzz/left.png
+share/gtk-doc/html/harfbuzz/object-tree.html
+share/gtk-doc/html/harfbuzz/right-insensitive.png
+share/gtk-doc/html/harfbuzz/right.png
+share/gtk-doc/html/harfbuzz/style.css
+share/gtk-doc/html/harfbuzz/up-insensitive.png
+share/gtk-doc/html/harfbuzz/up.png
diff --git a/fonts/harfbuzz/buildlink3.mk b/fonts/harfbuzz/buildlink3.mk
index 7ca1e7ed21e..5c411098755 100644
--- a/fonts/harfbuzz/buildlink3.mk
+++ b/fonts/harfbuzz/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2013/06/04 22:16:03 tron Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2013/08/31 22:20:24 adam Exp $
 
 BUILDLINK_TREE+=	harfbuzz
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=	harfbuzz
 HARFBUZZ_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.harfbuzz+=	harfbuzz>=0.9.4
-BUILDLINK_ABI_DEPENDS.harfbuzz?=		harfbuzz>=0.9.17nb2
+BUILDLINK_ABI_DEPENDS.harfbuzz+=	harfbuzz>=0.9.17nb2
 BUILDLINK_PKGSRCDIR.harfbuzz?=		../../fonts/harfbuzz
 
 .include "../../devel/glib2/buildlink3.mk"
diff --git a/fonts/harfbuzz/distinfo b/fonts/harfbuzz/distinfo
index 5d6f08b5235..ed65179ce71 100644
--- a/fonts/harfbuzz/distinfo
+++ b/fonts/harfbuzz/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.14 2013/08/22 15:34:32 jaapb Exp $
+$NetBSD: distinfo,v 1.15 2013/08/31 22:20:24 adam Exp $
 
-SHA1 (harfbuzz-0.9.19.tar.bz2) = 5603e084fbf8be1b93722c8e2694643361c489e4
-RMD160 (harfbuzz-0.9.19.tar.bz2) = d76e52542ac11ac03c3fb4f49fddf1535bfefab6
-Size (harfbuzz-0.9.19.tar.bz2) = 926632 bytes
+SHA1 (harfbuzz-0.9.20.tar.bz2) = 82c3c0d461f239d0991e660a5895a11d1c75e535
+RMD160 (harfbuzz-0.9.20.tar.bz2) = 945f10efaa19a7c37902eb799ff57c9d787f5122
+Size (harfbuzz-0.9.20.tar.bz2) = 1030152 bytes
 SHA1 (patch-src_hb-open-type-private.hh) = 876f1afdf2c7babb4cd3c2b9c9e4635167ad1021
diff --git a/fonts/harfbuzz/options.mk b/fonts/harfbuzz/options.mk
index c0eff9708af..92d528db296 100644
--- a/fonts/harfbuzz/options.mk
+++ b/fonts/harfbuzz/options.mk
@@ -1,15 +1,16 @@
-# $NetBSD: options.mk,v 1.1 2013/08/22 15:34:32 jaapb Exp $
+# $NetBSD: options.mk,v 1.2 2013/08/31 22:20:24 adam Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.harfbuzz
 PKG_SUPPORTED_OPTIONS+= icu
 
 .include "../../mk/bsd.options.mk"
 
+PLIST_VARS+=		icu
+
 .if !empty(PKG_OPTIONS:Micu)
 .include "../../textproc/icu/buildlink3.mk"
 CONFIGURE_ARGS+=	--with-icu=yes
-PKGCONFIG_OVERRIDE+=	src/harfbuzz-icu.pc.in
-PLIST.icu=	yes
+PLIST.icu=		yes
 .else
 CONFIGURE_ARGS+=	--with-icu=no
 .endif