pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/fonts/harfbuzz The freetype2 version in the pkg-config...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/f3967f1ce34f
branches:  trunk
changeset: 645416:f3967f1ce34f
user:      wiz <wiz%pkgsrc.org@localhost>
date:      Wed Jan 28 08:17:33 2015 +0000

description:
The freetype2 version in the pkg-config file was not properly
defined in NetBSD-6, NetBSD-7 and -current up to 7.99.4.
Manually override the detection since pkgsrc makes sure the proper
version is available.

Based on a patch by Leonardo Taccari on pkgsrc-changes.

diffstat:

 fonts/harfbuzz/Makefile |  10 +++++++++-
 1 files changed, 9 insertions(+), 1 deletions(-)

diffs (24 lines):

diff -r a0816d9fd4a3 -r f3967f1ce34f fonts/harfbuzz/Makefile
--- a/fonts/harfbuzz/Makefile   Wed Jan 28 07:22:58 2015 +0000
+++ b/fonts/harfbuzz/Makefile   Wed Jan 28 08:17:33 2015 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.45 2015/01/25 18:50:15 wiz Exp $
+# $NetBSD: Makefile,v 1.46 2015/01/28 08:17:33 wiz Exp $
 
 DISTNAME=      harfbuzz-0.9.38
 CATEGORIES=    fonts
@@ -19,6 +19,14 @@
 PKGCONFIG_OVERRIDE+=   src/harfbuzz.pc.in
 PKGCONFIG_OVERRIDE+=   src/harfbuzz-icu.pc.in
 
+# The freetype2 version in the pkg-config file was not properly
+# defined in NetBSD-6, NetBSD-7 and -current up to 7.99.4.
+# Manually override the detection since pkgsrc makes sure the proper
+# version is available.
+CONFIGURE_ARGS+=       --with-freetype=yes
+CONFIGURE_ENV+=                FREETYPE_CFLAGS="`pkg-config --cflags freetype2`"
+CONFIGURE_ENV+=                FREETYPE_LIBS="`pkg-config --libs freetype2`"
+
 LDFLAGS.OpenBSD+=      -lz
 
 .include "options.mk"



Home | Main Index | Thread Index | Old Index