Mon Aug 17 15:23:28 2020 UTC ()
fontconfig: remove libuuid bl3 inclusion in buildlink3.mk

libuuid is marked as a private dependency and it is an implementation
detail.

On some platforms (e.g. NetBSD) by including libuuid bl3 fonts/fontconfig was
unconditionally installed due that.

Problem originally analyzed by <wiz> in:

 <https://mail-index.NetBSD.org/tech-pkg/2019/06/19/msg021438.html>

And change proposed on tech-pkg@:

 <https://mail-index.NetBSD.org/tech-pkg/2020/07/13/msg023550.html>

Thanks to <wiz> also for reviews, suggestions and discussions!


(leot)
diff -r1.37 -r1.38 pkgsrc/fonts/fontconfig/buildlink3.mk

cvs diff -r1.37 -r1.38 pkgsrc/fonts/fontconfig/buildlink3.mk (expand / switch to unified diff)

--- pkgsrc/fonts/fontconfig/buildlink3.mk 2019/09/09 12:22:03 1.37
+++ pkgsrc/fonts/fontconfig/buildlink3.mk 2020/08/17 15:23:28 1.38
@@ -1,20 +1,19 @@ @@ -1,20 +1,19 @@
1# $NetBSD: buildlink3.mk,v 1.37 2019/09/09 12:22:03 gdt Exp $ 1# $NetBSD: buildlink3.mk,v 1.38 2020/08/17 15:23:28 leot Exp $
2 2
3BUILDLINK_TREE+= fontconfig 3BUILDLINK_TREE+= fontconfig
4 4
5.if !defined(FONTCONFIG_BUILDLINK3_MK) 5.if !defined(FONTCONFIG_BUILDLINK3_MK)
6FONTCONFIG_BUILDLINK3_MK:= 6FONTCONFIG_BUILDLINK3_MK:=
7 7
8BUILDLINK_API_DEPENDS.fontconfig+= fontconfig>=2.11.91 8BUILDLINK_API_DEPENDS.fontconfig+= fontconfig>=2.11.91
9BUILDLINK_ABI_DEPENDS.fontconfig+= fontconfig>=2.13.0 9BUILDLINK_ABI_DEPENDS.fontconfig+= fontconfig>=2.13.0
10BUILDLINK_PKGSRCDIR.fontconfig?= ../../fonts/fontconfig 10BUILDLINK_PKGSRCDIR.fontconfig?= ../../fonts/fontconfig
11 11
12.include "../../archivers/bzip2/buildlink3.mk" 12.include "../../archivers/bzip2/buildlink3.mk"
13.include "../../devel/gettext-lib/buildlink3.mk" 13.include "../../devel/gettext-lib/buildlink3.mk"
14.include "../../devel/zlib/buildlink3.mk" 14.include "../../devel/zlib/buildlink3.mk"
15.include "../../devel/libuuid/buildlink3.mk" 
16.include "../../graphics/freetype2/buildlink3.mk" 15.include "../../graphics/freetype2/buildlink3.mk"
17.include "../../textproc/expat/buildlink3.mk" 16.include "../../textproc/expat/buildlink3.mk"
18.endif # FONTCONFIG_BUILDLINK3_MK 17.endif # FONTCONFIG_BUILDLINK3_MK
19 18
20BUILDLINK_TREE+= -fontconfig 19BUILDLINK_TREE+= -fontconfig