Wed Jan 28 08:17:33 2015 UTC ()
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.


(wiz)
diff -r1.45 -r1.46 pkgsrc/fonts/harfbuzz/Makefile
cvs diff -r1.45 -r1.46 pkgsrc/fonts/harfbuzz/Makefile (expand / switch to unified diff)

--- pkgsrc/fonts/harfbuzz/Makefile 2015/01/25 18:50:15 1.45
+++ pkgsrc/fonts/harfbuzz/Makefile 2015/01/28 08:17:33 1.46
@@ -1,34 +1,42 @@ @@ -1,34 +1,42 @@
1# $NetBSD: Makefile,v 1.45 2015/01/25 18:50:15 wiz Exp $ 1# $NetBSD: Makefile,v 1.46 2015/01/28 08:17:33 wiz Exp $
2 2
3DISTNAME= harfbuzz-0.9.38 3DISTNAME= harfbuzz-0.9.38
4CATEGORIES= fonts 4CATEGORIES= fonts
5MASTER_SITES= http://www.freedesktop.org/software/harfbuzz/release/ 5MASTER_SITES= http://www.freedesktop.org/software/harfbuzz/release/
6EXTRACT_SUFX= .tar.bz2 6EXTRACT_SUFX= .tar.bz2
7 7
8MAINTAINER= pkgsrc-users@NetBSD.org 8MAINTAINER= pkgsrc-users@NetBSD.org
9HOMEPAGE= http://harfbuzz.org/ 9HOMEPAGE= http://harfbuzz.org/
10COMMENT= OpenType text shaping engine 10COMMENT= OpenType text shaping engine
11LICENSE= mit 11LICENSE= mit
12 12
13USE_LANGUAGES= c c++ 13USE_LANGUAGES= c c++
14USE_LIBTOOL= yes 14USE_LIBTOOL= yes
15USE_TOOLS+= gmake pkg-config 15USE_TOOLS+= gmake pkg-config
16GNU_CONFIGURE= yes 16GNU_CONFIGURE= yes
17CONFIGURE_ARGS+= --with-cairo=no 17CONFIGURE_ARGS+= --with-cairo=no
18 18
19PKGCONFIG_OVERRIDE+= src/harfbuzz.pc.in 19PKGCONFIG_OVERRIDE+= src/harfbuzz.pc.in
20PKGCONFIG_OVERRIDE+= src/harfbuzz-icu.pc.in 20PKGCONFIG_OVERRIDE+= src/harfbuzz-icu.pc.in
21 21
 22# The freetype2 version in the pkg-config file was not properly
 23# defined in NetBSD-6, NetBSD-7 and -current up to 7.99.4.
 24# Manually override the detection since pkgsrc makes sure the proper
 25# version is available.
 26CONFIGURE_ARGS+= --with-freetype=yes
 27CONFIGURE_ENV+= FREETYPE_CFLAGS="`pkg-config --cflags freetype2`"
 28CONFIGURE_ENV+= FREETYPE_LIBS="`pkg-config --libs freetype2`"
 29
22LDFLAGS.OpenBSD+= -lz 30LDFLAGS.OpenBSD+= -lz
23 31
24.include "options.mk" 32.include "options.mk"
25 33
26.include "../../mk/bsd.prefs.mk" 34.include "../../mk/bsd.prefs.mk"
27 35
28# gcc too old 36# gcc too old
29.if ${OPSYS} == "MirBSD" 37.if ${OPSYS} == "MirBSD"
30BUILDLINK_TRANSFORM+= rm:-fvisibility-inlines-hidden 38BUILDLINK_TRANSFORM+= rm:-fvisibility-inlines-hidden
31.endif 39.endif
32 40
33PLIST_VARS+= coretext 41PLIST_VARS+= coretext
34 42