Re: CVS commit: pkgsrc/fonts/harfbuzz

[Leonardo Taccari <iamleot%gmail.com@localhost>]

Thomas Klausner writes:
> Or we just override the detection and fill in the values it wants
> (CFLAGS, LIBS). Probably easiest and avoids a patch that can't be sent
> upstream.
Good idea!

Patches attached in this email. Please review them (especially if there
is a nicer syntax to invoke the shell commands feel free to change it
:)).

Successfully tested on NetBSD-current, pkgsrc-current with the
in-reality-not-old freetype2 --modversion (9.20.3).


Ciao,
L.

Index: Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/fonts/harfbuzz/Makefile,v
retrieving revision 1.45
diff -u -r1.45 Makefile
--- Makefile    25 Jan 2015 18:50:15 -0000      1.45
+++ Makefile    26 Jan 2015 16:16:07 -0000
@@ -1,6 +1,7 @@
 # $NetBSD: Makefile,v 1.45 2015/01/25 18:50:15 wiz Exp $
 
 DISTNAME=      harfbuzz-0.9.38
+PKGREVISION=   1
 CATEGORIES=    fonts
 MASTER_SITES=  http://www.freedesktop.org/software/harfbuzz/release/
 EXTRACT_SUFX=  .tar.bz2
@@ -14,11 +15,18 @@
 USE_LIBTOOL=           yes
 USE_TOOLS+=            gmake pkg-config
 GNU_CONFIGURE=         yes
+CONFIGURE_ARGS+=       --with-freetype=yes
 CONFIGURE_ARGS+=       --with-cairo=no
 
 PKGCONFIG_OVERRIDE+=   src/harfbuzz.pc.in
 PKGCONFIG_OVERRIDE+=   src/harfbuzz-icu.pc.in
 
+# XXX: freetype2 version on NetBSD is not correctly defined. Manually check
+# FREETYPE_ variables in order to get rid of the pkg-config comparison done by
+# harfbuzz's configure script.
+CONFIGURE_ENV+=                FREETYPE_CFLAGS="`pkg-config --cflags freetype2`"
+CONFIGURE_ENV+=                FREETYPE_LIBS="`pkg-config --libs freetype2`"
+
 LDFLAGS.OpenBSD+=      -lz
 
 .include "options.mk"