Import of pkgsrc-2015Q1

fonts/harfbuzz/Makefile

@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.29 2014/02/03 16:46:13 wiz Exp $
+# $NetBSD: Makefile,v 1.48 2015/03/09 08:10:05 wiz Exp $
 
-DISTNAME=	harfbuzz-0.9.26
+DISTNAME=	harfbuzz-0.9.39
 CATEGORIES=	fonts
 MASTER_SITES=	http://www.freedesktop.org/software/harfbuzz/release/
 EXTRACT_SUFX=	.tar.bz2
@@ -10,14 +10,11 @@ HOMEPAGE=	http://harfbuzz.org/
 COMMENT=	OpenType text shaping engine
 LICENSE=	mit
 
-PKG_INSTALLATION_TYPES=	overwrite pkgviews
-
 USE_LANGUAGES=		c c++
 USE_LIBTOOL=		yes
 USE_TOOLS+=		gmake pkg-config
 GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--with-cairo=no
-CONFIGURE_ARGS+=	--with-coretext=auto
 
 PKGCONFIG_OVERRIDE+=	src/harfbuzz.pc.in
 PKGCONFIG_OVERRIDE+=	src/harfbuzz-icu.pc.in
@@ -33,6 +30,27 @@ LDFLAGS.OpenBSD+=	-lz
 BUILDLINK_TRANSFORM+=	rm:-fvisibility-inlines-hidden
 .endif
 
+PLIST_VARS+=	coretext
+
+.if ${OPSYS} == "Darwin"
+.  if !empty(OS_VERSION:M[0-8].*)
+# MacOS X < 10.5 does not have CoreText.
+CONFIGURE_ARGS+=	--with-coretext=no
+
+.  elif !empty(OS_VERSION:M9.*)
+# MacOS X 10.5 has CoreText but it's
+# buggy. CTLineCreateWithAttributedString() seemingly fails when
+# trying to use a font which isn't installed into the system standard
+# path.
+# See http://forum.libcinder.org/topic/text-not-working-in-leopard-osx-10-5
+CONFIGURE_ARGS+=	--with-coretext=no
+
+.  else
+CONFIGURE_ARGS+=	--with-coretext=yes
+PLIST.coretext=		yes
+.  endif
+.endif
+
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
 #cairo is only needed for the hb-view command line utility

fonts/harfbuzz/PLIST

@@ -1,15 +1,17 @@
-@comment $NetBSD: PLIST,v 1.8 2014/02/03 16:46:13 wiz Exp $
+@comment $NetBSD: PLIST,v 1.10 2014/05/27 14:23:58 pho Exp $
 bin/hb-ot-shape-closure
 bin/hb-shape
 include/harfbuzz/hb-blob.h
 include/harfbuzz/hb-buffer.h
 include/harfbuzz/hb-common.h
+${PLIST.coretext}include/harfbuzz/hb-coretext.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
 ${PLIST.icu}include/harfbuzz/hb-icu.h
+include/harfbuzz/hb-ot-font.h
 include/harfbuzz/hb-ot-layout.h
 include/harfbuzz/hb-ot-shape.h
 include/harfbuzz/hb-ot-tag.h

fonts/harfbuzz/PLIST.Darwin

@@ -1,2 +0,0 @@
-@comment $NetBSD: PLIST.Darwin,v 1.1 2012/10/08 19:20:33 adam Exp $
-include/harfbuzz/hb-coretext.h

fonts/harfbuzz/distinfo

@@ -1,6 +1,5 @@
-$NetBSD: distinfo,v 1.21 2014/02/03 16:46:13 wiz Exp $
+$NetBSD: distinfo,v 1.35 2015/03/09 08:10:05 wiz Exp $
 
-SHA1 (harfbuzz-0.9.26.tar.bz2) = 0963768b8ee1f575c5a20828eefb101be6eaae6f
-RMD160 (harfbuzz-0.9.26.tar.bz2) = 3f7000915f877bdd99619a50f3fb4665512b7275
-Size (harfbuzz-0.9.26.tar.bz2) = 1060264 bytes
-SHA1 (patch-src_hb-open-type-private.hh) = 876f1afdf2c7babb4cd3c2b9c9e4635167ad1021
+SHA1 (harfbuzz-0.9.39.tar.bz2) = aedc7f7ed8fdca0ca170f9a5bd7304fe4604174d
+RMD160 (harfbuzz-0.9.39.tar.bz2) = 9c30fa2b466d66d4a11ff2b8ab4676618e8dd52b
+Size (harfbuzz-0.9.39.tar.bz2) = 1181724 bytes

fonts/harfbuzz/patches/patch-src_hb-open-type-private.hh

@@ -1,30 +0,0 @@
-$NetBSD: patch-src_hb-open-type-private.hh,v 1.2 2013/07/07 10:23:14 wiz Exp $
-
-Fix build with gcc 4.2.1 of FreeBSD 9.1.
-
-Patch is taken from
-https://build.opensuse.org/package/view_file?file=mozilla-gcc43.patch&package=MozillaFirefox&project=home%3AWernerFink%3Abranches%3Amozilla
-
---- src/hb-open-type-private.hh.orig	2013-01-08 22:13:42.000000000 +0000
-+++ src/hb-open-type-private.hh
-@@ -941,6 +941,11 @@ struct HeadlessArrayOf
-   DEFINE_SIZE_ARRAY (sizeof (USHORT), array);
- };
- 
-+#if __GNUC__ && (__GNUC__ < 4 || (__GNUC__ == 4 && __GNUC_MINOR__ < 4))
-+// work around GCC 4.3 bug where the search() function gets improperly
-+// optimized away from some instantiations of this template
-+#pragma GCC visibility push(default)
-+#endif
- 
- /* An array with sorted elements.  Supports binary searching. */
- template <typename Type>
-@@ -968,5 +973,8 @@ struct SortedArrayOf : ArrayOf<Type> {
- 
- } /* namespace OT */
- 
-+#if __GNUC__ && (__GNUC__ < 4 || (__GNUC__ == 4 && __GNUC_MINOR__ < 4))
-+#pragma GCC visibility pop
-+#endif
- 
- #endif /* HB_OPEN_TYPE_PRIVATE_HH */