Re: CVS commit: pkgsrc/fonts/harfbuzz

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

Hello Thomas and matthew,

Leonardo Taccari writes:
> Attached in this email there is a patch that fixes the harfbuzz-0.9.38
> problem. It's a quick work-around and needs to be reviewed.
After trying to analyze a pkgsrc/fonts/harfbuzz problem it seems that
PKGCONFIG_VERSION.freetype2 in src/external/mit/xorg/lib/freetype was
not bumped during the updates (I cc-ed mrg@ and tech-x11@ for this
reason).
xsrc/external/mit/freetype/dist/docs/VERSION.DLL seems also to confirm
that:

 [...]
 release     libtool     so
 -------------------------------
   2.5.3     17.2.11    6.11.2
 [...]
   2.3.9      9.20.3    6.3.20
 [...]

...while according to pkg-config(1) we have:

 $ pkg-config --modversion freetype2
 9.20.3

Indeed it seems that PKG_CONFIG_VERSION.freetype2 was added in -r1.4 of
Makefile (freetype2-2.3.9) and then it was not bumped.

After applying the patches the work-around for harfbuzz-0.9.38 that I
have posted in my previous email will be no more needed.

I will attach a possible patch to fix this issue. Please review it
because it is the first time that I am touching a xsrc Makefile (and I
have not tested it).


Thank you for your attention,
Ciao,
L.

Index: Makefile
===================================================================
RCS file: /cvsroot/src/external/mit/xorg/lib/freetype/Makefile,v
retrieving revision 1.12
diff -u -r1.12 Makefile
--- Makefile	20 Mar 2014 08:57:48 -0000	1.12
+++ Makefile	26 Jan 2015 03:30:46 -0000
@@ -100,7 +100,7 @@
 
 PKGCONFIG=	freetype2
 PKGDIST.freetype2=	${.CURDIR}
-PKGCONFIG_VERSION.freetype2=	9.20.3
+PKGCONFIG_VERSION.freetype2=	17.2.11
 
 .include <bsd.x11.mk>
 .include <bsd.lib.mk>