head 1.42; access; symbols pkgsrc-2023Q4:1.42.0.2 pkgsrc-2023Q4-base:1.42 pkgsrc-2023Q3:1.41.0.2 pkgsrc-2023Q3-base:1.41 pkgsrc-2023Q2:1.40.0.4 pkgsrc-2023Q2-base:1.40 pkgsrc-2023Q1:1.40.0.2 pkgsrc-2023Q1-base:1.40 pkgsrc-2022Q4:1.39.0.20 pkgsrc-2022Q4-base:1.39 pkgsrc-2022Q3:1.39.0.18 pkgsrc-2022Q3-base:1.39 pkgsrc-2022Q2:1.39.0.16 pkgsrc-2022Q2-base:1.39 pkgsrc-2022Q1:1.39.0.14 pkgsrc-2022Q1-base:1.39 pkgsrc-2021Q4:1.39.0.12 pkgsrc-2021Q4-base:1.39 pkgsrc-2021Q3:1.39.0.10 pkgsrc-2021Q3-base:1.39 pkgsrc-2021Q2:1.39.0.8 pkgsrc-2021Q2-base:1.39 pkgsrc-2021Q1:1.39.0.6 pkgsrc-2021Q1-base:1.39 pkgsrc-2020Q4:1.39.0.4 pkgsrc-2020Q4-base:1.39 pkgsrc-2020Q3:1.39.0.2 pkgsrc-2020Q3-base:1.39 pkgsrc-2020Q2:1.37.0.8 pkgsrc-2020Q2-base:1.37 pkgsrc-2020Q1:1.37.0.4 pkgsrc-2020Q1-base:1.37 pkgsrc-2019Q4:1.37.0.6 pkgsrc-2019Q4-base:1.37 pkgsrc-2019Q3:1.37.0.2 pkgsrc-2019Q3-base:1.37 pkgsrc-2019Q2:1.36.0.8 pkgsrc-2019Q2-base:1.36 pkgsrc-2019Q1:1.36.0.6 pkgsrc-2019Q1-base:1.36 pkgsrc-2018Q4:1.36.0.4 pkgsrc-2018Q4-base:1.36 pkgsrc-2018Q3:1.36.0.2 pkgsrc-2018Q3-base:1.36 pkgsrc-2018Q2:1.35.0.4 pkgsrc-2018Q2-base:1.35 pkgsrc-2018Q1:1.35.0.2 pkgsrc-2018Q1-base:1.35 pkgsrc-2017Q4:1.33.0.40 pkgsrc-2017Q4-base:1.33 pkgsrc-2017Q3:1.33.0.38 pkgsrc-2017Q3-base:1.33 pkgsrc-2017Q2:1.33.0.34 pkgsrc-2017Q2-base:1.33 pkgsrc-2017Q1:1.33.0.32 pkgsrc-2017Q1-base:1.33 pkgsrc-2016Q4:1.33.0.30 pkgsrc-2016Q4-base:1.33 pkgsrc-2016Q3:1.33.0.28 pkgsrc-2016Q3-base:1.33 pkgsrc-2016Q2:1.33.0.26 pkgsrc-2016Q2-base:1.33 pkgsrc-2016Q1:1.33.0.24 pkgsrc-2016Q1-base:1.33 pkgsrc-2015Q4:1.33.0.22 pkgsrc-2015Q4-base:1.33 pkgsrc-2015Q3:1.33.0.20 pkgsrc-2015Q3-base:1.33 pkgsrc-2015Q2:1.33.0.18 pkgsrc-2015Q2-base:1.33 pkgsrc-2015Q1:1.33.0.16 pkgsrc-2015Q1-base:1.33 pkgsrc-2014Q4:1.33.0.14 pkgsrc-2014Q4-base:1.33 pkgsrc-2014Q3:1.33.0.12 pkgsrc-2014Q3-base:1.33 pkgsrc-2014Q2:1.33.0.10 pkgsrc-2014Q2-base:1.33 pkgsrc-2014Q1:1.33.0.8 pkgsrc-2014Q1-base:1.33 pkgsrc-2013Q4:1.33.0.6 pkgsrc-2013Q4-base:1.33 pkgsrc-2013Q3:1.33.0.4 pkgsrc-2013Q3-base:1.33 pkgsrc-2013Q2:1.33.0.2 pkgsrc-2013Q2-base:1.33 pkgsrc-2013Q1:1.29.0.6 pkgsrc-2013Q1-base:1.29 pkgsrc-2012Q4:1.29.0.4 pkgsrc-2012Q4-base:1.29 pkgsrc-2012Q3:1.29.0.2 pkgsrc-2012Q3-base:1.29 pkgsrc-2012Q2:1.28.0.2 pkgsrc-2012Q2-base:1.28 pkgsrc-2012Q1:1.27.0.4 pkgsrc-2012Q1-base:1.27 pkgsrc-2011Q4:1.27.0.2 pkgsrc-2011Q4-base:1.27 pkgsrc-2011Q3:1.26.0.22 pkgsrc-2011Q3-base:1.26 pkgsrc-2011Q2:1.26.0.20 pkgsrc-2011Q2-base:1.26 pkgsrc-2011Q1:1.26.0.18 pkgsrc-2011Q1-base:1.26 pkgsrc-2010Q4:1.26.0.16 pkgsrc-2010Q4-base:1.26 pkgsrc-2010Q3:1.26.0.14 pkgsrc-2010Q3-base:1.26 pkgsrc-2010Q2:1.26.0.12 pkgsrc-2010Q2-base:1.26 pkgsrc-2010Q1:1.26.0.10 pkgsrc-2010Q1-base:1.26 pkgsrc-2009Q4:1.26.0.8 pkgsrc-2009Q4-base:1.26 pkgsrc-2009Q3:1.26.0.6 pkgsrc-2009Q3-base:1.26 pkgsrc-2009Q2:1.26.0.4 pkgsrc-2009Q2-base:1.26 pkgsrc-2009Q1:1.26.0.2 pkgsrc-2009Q1-base:1.26 pkgsrc-2008Q4:1.25.0.14 pkgsrc-2008Q4-base:1.25 pkgsrc-2008Q3:1.25.0.12 pkgsrc-2008Q3-base:1.25 cube-native-xorg:1.25.0.10 cube-native-xorg-base:1.25 pkgsrc-2008Q2:1.25.0.8 pkgsrc-2008Q2-base:1.25 cwrapper:1.25.0.6 pkgsrc-2008Q1:1.25.0.4 pkgsrc-2008Q1-base:1.25 pkgsrc-2007Q4:1.25.0.2 pkgsrc-2007Q4-base:1.25 pkgsrc-2007Q3:1.24.0.10 pkgsrc-2007Q3-base:1.24 pkgsrc-2007Q2:1.24.0.8 pkgsrc-2007Q2-base:1.24 pkgsrc-2007Q1:1.24.0.6 pkgsrc-2007Q1-base:1.24 pkgsrc-2006Q4:1.24.0.4 pkgsrc-2006Q4-base:1.24 pkgsrc-2006Q3:1.24.0.2 pkgsrc-2006Q3-base:1.24 pkgsrc-2006Q2:1.22.0.2 pkgsrc-2006Q2-base:1.22 pkgsrc-2006Q1:1.20.0.2 pkgsrc-2006Q1-base:1.20 pkgsrc-2005Q4:1.18.0.6 pkgsrc-2005Q4-base:1.18 pkgsrc-2005Q3:1.18.0.4 pkgsrc-2005Q3-base:1.18 pkgsrc-2005Q2:1.18.0.2 pkgsrc-2005Q2-base:1.18 pkgsrc-2005Q1:1.17.0.4 pkgsrc-2005Q1-base:1.17 pkgsrc-2004Q4:1.17.0.2 pkgsrc-2004Q4-base:1.17 pkgsrc-2004Q3:1.16.0.6 pkgsrc-2004Q3-base:1.16 pkgsrc-2004Q2:1.16.0.4 pkgsrc-2004Q2-base:1.16 pkgsrc-2004Q1:1.16.0.2 pkgsrc-2004Q1-base:1.16; locks; strict; comment @# @; 1.42 date 2023.11.12.13.21.26; author wiz; state Exp; branches; next 1.41; commitid SjpNXQIV5XeZ3kME; 1.41 date 2023.08.14.05.24.24; author wiz; state Exp; branches; next 1.40; commitid LOSB79OLVxvXjIAE; 1.40 date 2023.01.29.21.14.35; author ryoon; state Exp; branches; next 1.39; commitid QL7aBXsBGmQvUtbE; 1.39 date 2020.08.17.20.17.25; author leot; state Exp; branches; next 1.38; commitid ybGS4iX9Fz8imskC; 1.38 date 2020.08.17.15.23.28; author leot; state Exp; branches; next 1.37; commitid 7GH0omcc6lStIqkC; 1.37 date 2019.09.09.12.22.03; author gdt; state Exp; branches; next 1.36; commitid 2NcCPxW2IjzqLkCB; 1.36 date 2018.08.31.09.06.07; author tnn; state Exp; branches; next 1.35; commitid sjuQgl74P9ZkHfQA; 1.35 date 2018.03.31.04.30.33; author schmonz; state Exp; branches; next 1.34; commitid Vc9tkbdmXyhV5zwA; 1.34 date 2018.03.12.11.15.32; author wiz; state Exp; branches; next 1.33; commitid Mv60lx3Uo1UqW9uA; 1.33 date 2013.06.04.22.16.02; author tron; state Exp; branches; next 1.32; commitid wB5zURIqYs6HAlSw; 1.32 date 2013.06.04.08.04.21; author tron; state Exp; branches; next 1.31; commitid xYkTaHjCgx6HSgSw; 1.31 date 2013.06.03.15.18.40; author tron; state Exp; branches; next 1.30; commitid ZRb5w1EB5TqCjbSw; 1.30 date 2013.06.03.10.04.56; author wiz; state Exp; branches; next 1.29; commitid kGMtnUPdN4amz9Sw; 1.29 date 2012.07.31.18.12.28; author drochner; state Exp; branches; next 1.28; 1.28 date 2012.05.07.01.53.29; author dholland; state Exp; branches; next 1.27; 1.27 date 2011.11.01.06.01.12; author sbd; state Exp; branches; next 1.26; 1.26 date 2009.03.20.19.24.34; author joerg; state Exp; branches; next 1.25; 1.25 date 2007.10.16.18.12.56; author reed; state Exp; branches; next 1.24; 1.24 date 2006.07.08.23.10.49; author jlam; state Exp; branches; next 1.23; 1.23 date 2006.07.08.22.39.16; author jlam; state Exp; branches; next 1.22; 1.22 date 2006.04.12.10.27.15; author rillig; state Exp; branches; next 1.21; 1.21 date 2006.04.06.06.21.59; author reed; state Exp; branches; next 1.20; 1.20 date 2006.02.05.23.09.09; author joerg; state Exp; branches; next 1.19; 1.19 date 2006.01.24.07.32.07; author wiz; state Exp; branches; next 1.18; 1.18 date 2005.04.21.17.40.19; author kristerw; state Exp; branches; next 1.17; 1.17 date 2004.10.03.00.14.42; author tv; state Exp; branches; next 1.16; 1.16 date 2004.03.18.09.12.11; author jlam; state Exp; branches; next 1.15; 1.15 date 2004.03.10.17.57.14; author jlam; state Exp; branches; next 1.14; 1.14 date 2004.02.19.19.12.26; author jlam; state Exp; branches; next 1.13; 1.13 date 2004.02.19.18.51.01; author jlam; state Exp; branches; next 1.12; 1.12 date 2004.02.18.16.53.52; author jlam; state Exp; branches; next 1.11; 1.11 date 2004.02.18.16.35.27; author jlam; state Exp; branches; next 1.10; 1.10 date 2004.02.18.14.58.37; author jlam; state Exp; branches; next 1.9; 1.9 date 2004.02.17.16.27.54; author jmmv; state Exp; branches; next 1.8; 1.8 date 2004.02.17.14.44.10; author jlam; state Exp; branches; next 1.7; 1.7 date 2004.02.17.09.13.33; author jlam; state Exp; branches; next 1.6; 1.6 date 2004.02.16.22.47.23; author jlam; state Exp; branches; next 1.5; 1.5 date 2004.02.16.19.24.14; author jlam; state Exp; branches; next 1.4; 1.4 date 2004.02.16.19.16.59; author jlam; state Exp; branches; next 1.3; 1.3 date 2004.02.09.20.20.43; author reed; state Exp; branches; next 1.2; 1.2 date 2004.01.24.03.26.46; author jlam; state Exp; branches; next 1.1; 1.1 date 2004.01.24.01.57.01; author jlam; state Exp; branches; next ; desc @@ 1.42 log @*: revebump for new brotli option for freetype2 Addresses PR 57693 @ text @# $NetBSD: buildlink3.mk,v 1.41 2023/08/14 05:24:24 wiz Exp $ BUILDLINK_TREE+= fontconfig .if !defined(FONTCONFIG_BUILDLINK3_MK) FONTCONFIG_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.fontconfig+= fontconfig>=2.11.91 BUILDLINK_ABI_DEPENDS.fontconfig+= fontconfig>=2.14.2nb3 BUILDLINK_PKGSRCDIR.fontconfig?= ../../fonts/fontconfig .include "../../archivers/bzip2/buildlink3.mk" .include "../../devel/gettext-lib/buildlink3.mk" .include "../../devel/zlib/buildlink3.mk" .include "../../graphics/freetype2/buildlink3.mk" .include "../../textproc/expat/buildlink3.mk" .endif # FONTCONFIG_BUILDLINK3_MK BUILDLINK_TREE+= -fontconfig @ 1.41 log @*: recursive bump for Python 3.11 as new default @ text @d1 1 a1 1 # $NetBSD: buildlink3.mk,v 1.40 2023/01/29 21:14:35 ryoon Exp $ d9 1 a9 1 BUILDLINK_ABI_DEPENDS.fontconfig+= fontconfig>=2.14.2nb2 @ 1.40 log @*: Recursive revbup from graphics/freetype2 @ text @d1 1 a1 1 # $NetBSD: buildlink3.mk,v 1.39 2020/08/17 20:17:25 leot Exp $ d9 1 a9 1 BUILDLINK_ABI_DEPENDS.fontconfig+= fontconfig>=2.14.1nb1 @ 1.39 log @*: revbump after fontconfig bl3 changes (libuuid removal) @ text @d1 1 a1 1 # $NetBSD: buildlink3.mk,v 1.38 2020/08/17 15:23:28 leot Exp $ d9 1 a9 1 BUILDLINK_ABI_DEPENDS.fontconfig+= fontconfig>=2.13.1nb1 @ 1.38 log @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 in: And change proposed on tech-pkg@@: Thanks to also for reviews, suggestions and discussions! @ text @d1 1 a1 1 # $NetBSD: buildlink3.mk,v 1.37 2019/09/09 12:22:03 gdt Exp $ d9 1 a9 1 BUILDLINK_ABI_DEPENDS.fontconfig+= fontconfig>=2.13.0 @ 1.37 log @fonts/fontconfig: Bump bl3 API_dEPENDS to 2.11.91 If the base fontconfig is old, and some but not all fontconfig-using packages need newer, we end up with some binaries having two different fontconfigs. Adjust fontconfig's API_DEPENDS to 2.11.91, because pango needs at least that. This means that pkgsrc fontconfig will always be used on netbsd-8. The only sound approach appears to be a hard choice of system vs pkgsrc fontconfig, without per-package overrides, but that's a bigger step. We could also consider changing API_DEPENDS to match the pkgsrc fontconfig, so base is only used if newer. (Needs a revbump.) As discussed on tech-pkg. @ text @d1 1 a1 1 # $NetBSD: buildlink3.mk,v 1.36 2018/08/31 09:06:07 tnn Exp $ a14 1 .include "../../devel/libuuid/buildlink3.mk" @ 1.36 log @fontconfig: needs libbz2 @ text @d1 1 a1 1 # $NetBSD: buildlink3.mk,v 1.35 2018/03/31 04:30:33 schmonz Exp $ d8 1 a8 1 BUILDLINK_API_DEPENDS.fontconfig+= fontconfig>=2.10.93 @ 1.35 log @Since fontconfig depends on devel/gettext-lib (as of 2.13.0nb1), anything depending on fontconfig does too. Add it to buildlink3.mk. This is a high-impact change to commit during the freeze, but seems both correct and necessary, and has wiz@@'s OK. @ text @d1 1 a1 1 # $NetBSD: buildlink3.mk,v 1.34 2018/03/12 11:15:32 wiz Exp $ d12 1 @ 1.34 log @Recursive bumps for fontconfig and libzip dependency changes. @ text @d1 1 a1 1 # $NetBSD: buildlink3.mk,v 1.33 2013/06/04 22:16:02 tron Exp $ d12 1 @ 1.33 log @Try to fix the fallout caused by the fix for PR pkg/47882. Part 3: Recursively bump package revisions again after the "freetype2" and "fontconfig" handling was fixed. @ text @d1 1 a1 1 # $NetBSD: buildlink3.mk,v 1.32 2013/06/04 08:04:21 tron Exp $ d9 1 a9 1 BUILDLINK_ABI_DEPENDS.fontconfig+= fontconfig>=2.10.93nb2 d13 1 @ 1.32 log @The API dependency shouldn't contain a package revision. @ text @d1 1 a1 1 # $NetBSD: buildlink3.mk,v 1.31 2013/06/03 15:18:40 tron Exp $ d9 1 a9 1 BUILDLINK_ABI_DEPENDS.fontconfig+= fontconfig>=2.10.93nb1 @ 1.31 log @Bump the required API version as well to enforce the new version at build time. @ text @d1 1 a1 1 # $NetBSD: buildlink3.mk,v 1.30 2013/06/03 10:04:56 wiz Exp $ d8 1 a8 1 BUILDLINK_API_DEPENDS.fontconfig+= fontconfig>=2.10.93nb1 @ 1.30 log @Bump freetype2 and fontconfig dependencies to current pkgsrc versions, to address issues with NetBSD-6(and earlier)'s fontconfig not being new enough for pango. While doing that, also bump freetype2 dependency to current pkgsrc version. Suggested by tron in PR 47882 @ text @d1 1 a1 1 # $NetBSD: buildlink3.mk,v 1.29 2012/07/31 18:12:28 drochner Exp $ d8 1 a8 1 BUILDLINK_API_DEPENDS.fontconfig+= fontconfig>=2.4.2 @ 1.29 log @update to 2.10.1 changes: * FC_GLOBAL_ADVANCE now deprecated * Disable non-Unicode SFNT names by default (Use --enable-iconv to enable it) * Available config files has been moved to /usr/share/fontconfig/conf.avail * Warns multiple values of s and s in and * Add XDG Base Directory Specification support * Add FC_LANG environment variable for default substitute language. * Add more options to configure the installation paths * Add "namelang" object to obtain the localized name of the family, style and fullname. * Unicode 6.1 support * CACHEDIR.TAG support * Fix several build issues with older gcc, MinGW, Win32. * Fix a fail of creating caches on some filesystems * Fix memory leaks * Add/Update orthography files * Improve documents * and more bug fixes and enhancements. pkgsrc changes: some cleanup - install only useful stuff to /etc @ text @d1 1 a1 1 # $NetBSD: buildlink3.mk,v 1.28 2012/05/07 01:53:29 dholland Exp $ d9 1 a9 1 BUILDLINK_ABI_DEPENDS.fontconfig+= fontconfig>=2.8.0nb2 @ 1.28 log @Set BUILDLINK_ABI_DEPENDS correctly (with +=, not ?=) It turns out there were a lot of these. @ text @d1 1 a1 1 # $NetBSD: buildlink3.mk,v 1.27 2011/11/01 06:01:12 sbd Exp $ a11 1 .include "../../converters/libiconv/buildlink3.mk" @ 1.27 log @Recursive bump for graphics/freetype2 buildlink addition. @ text @d1 1 a1 1 # $NetBSD: buildlink3.mk,v 1.26 2009/03/20 19:24:34 joerg Exp $ d9 1 a9 1 BUILDLINK_ABI_DEPENDS.fontconfig?= fontconfig>=2.8.0nb2 @ 1.26 log @Simply and speed up buildlink3.mk files and processing. This changes the buildlink3.mk files to use an include guard for the recursive include. The use of BUILDLINK_DEPTH, BUILDLINK_DEPENDS, BUILDLINK_PACKAGES and BUILDLINK_ORDER is handled by a single new variable BUILDLINK_TREE. Each buildlink3.mk file adds a pair of enter/exit marker, which can be used to reconstruct the tree and to determine first level includes. Avoiding := for large variables (BUILDLINK_ORDER) speeds up parse time as += has linear complexity. The include guard reduces system time by avoiding reading files over and over again. For complex packages this reduces both %user and %sys time to half of the former time. @ text @d1 1 a1 1 # $NetBSD: buildlink3.mk,v 1.25 2007/10/16 18:12:56 reed Exp $ d9 1 @ 1.25 log @The ABI and API changed in 2.4.2. So get rid of BUILDLINK_ABI_DEPENDS.fontconfig. And increase BUILDLINK_API_DEPENDS.fontconfig to fontconfig>=2.4.2. Noticed this when using a binary package for qt4-libs built on different system: /usr/pkg/qt4/lib/libQtGui.so: undefined reference to `FcFreeTypeQueryFace' I am not bumping the PKGREVISIONs for all the dependents, since the upgrade to fontconfig 2.4.2 happened ten months ago. @ text @d1 1 a1 1 # $NetBSD: buildlink3.mk,v 1.24 2006/07/08 23:10:49 jlam Exp $ d3 1 a3 2 BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ FONTCONFIG_BUILDLINK3_MK:= ${FONTCONFIG_BUILDLINK3_MK}+ d5 2 a6 3 .if !empty(BUILDLINK_DEPTH:M+) BUILDLINK_DEPENDS+= fontconfig .endif a7 5 BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nfontconfig} BUILDLINK_PACKAGES+= fontconfig BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}fontconfig .if !empty(FONTCONFIG_BUILDLINK3_MK:M+) a9 1 .endif # FONTCONFIG_BUILDLINK3_MK d15 1 d17 1 a17 1 BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} @ 1.24 log @Change the format of BUILDLINK_ORDER to contain depth information as well, and add a new helper target and script, "show-buildlink3", that outputs a listing of the buildlink3.mk files included as well as the depth at which they are included. For example, "make show-buildlink3" in fonts/Xft2 displays: zlib fontconfig iconv zlib freetype2 expat freetype2 Xrender renderproto @ text @d1 1 a1 1 # $NetBSD: buildlink3.mk,v 1.23 2006/07/08 22:39:16 jlam Exp $ d15 1 a15 2 BUILDLINK_API_DEPENDS.fontconfig+= fontconfig>=1.0.1 BUILDLINK_ABI_DEPENDS.fontconfig+= fontconfig>=2.3.2nb2 @ 1.23 log @Track information in a new variable BUILDLINK_ORDER that informs us of the order in which buildlink3.mk files are (recursively) included by a package Makefile. @ text @d1 1 a1 1 # $NetBSD: buildlink3.mk,v 1.22 2006/04/12 10:27:15 rillig Exp $ d12 1 a12 1 BUILDLINK_ORDER+= fontconfig @ 1.22 log @Aligned the last line of the buildlink3.mk files with the first line, so that they look nicer. @ text @d1 1 a1 1 # $NetBSD: buildlink3.mk,v 1.21 2006/04/06 06:21:59 reed Exp $ d12 1 @ 1.21 log @Over 1200 files touched but no revisions bumped :) RECOMMENDED is removed. It becomes ABI_DEPENDS. BUILDLINK_RECOMMENDED.foo becomes BUILDLINK_ABI_DEPENDS.foo. BUILDLINK_DEPENDS.foo becomes BUILDLINK_API_DEPENDS.foo. BUILDLINK_DEPENDS does not change. IGNORE_RECOMMENDED (which defaulted to "no") becomes USE_ABI_DEPENDS which defaults to "yes". Added to obsolete.mk checking for IGNORE_RECOMMENDED. I did not manually go through and fix any aesthetic tab/spacing issues. I have tested the above patch on DragonFly building and packaging subversion and pkglint and their many dependencies. I have also tested USE_ABI_DEPENDS=no on my NetBSD workstation (where I have used IGNORE_RECOMMENDED for a long time). I have been an active user of IGNORE_RECOMMENDED since it was available. As suggested, I removed the documentation sentences suggesting bumping for "security" issues. As discussed on tech-pkg. I will commit to revbump, pkglint, pkg_install, createbuildlink separately. Note that if you use wip, it will fail! I will commit to pkgsrc-wip later (within day). @ text @d1 1 a1 1 # $NetBSD: buildlink3.mk,v 1.20 2006/02/05 23:09:09 joerg Exp $ d24 1 a24 1 BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} @ 1.20 log @Recursive revision bump / recommended bump for gettext ABI change. @ text @d1 1 a1 1 # $NetBSD: buildlink3.mk,v 1.19 2006/01/24 07:32:07 wiz Exp $ d14 2 a15 2 BUILDLINK_DEPENDS.fontconfig+= fontconfig>=1.0.1 BUILDLINK_RECOMMENDED.fontconfig+= fontconfig>=2.3.2nb2 @ 1.19 log @Bump BUILDLINK_RECOMMENDED of textproc/expat to 2.0.0 because of the shlib major bump. PKGREVISION++ for the dependencies. @ text @d1 1 a1 1 # $NetBSD: buildlink3.mk,v 1.18 2005/04/21 17:40:19 kristerw Exp $ d15 1 a15 1 BUILDLINK_RECOMMENDED.fontconfig+= fontconfig>=2.3.2nb1 @ 1.18 log @Include converters/libiconv/buildlink3.mk. @ text @d1 1 a1 1 # $NetBSD: buildlink3.mk,v 1.17 2004/10/03 00:14:42 tv Exp $ d15 1 a15 1 BUILDLINK_RECOMMENDED.fontconfig+= fontconfig>=2.2.96nb1 @ 1.17 log @Libtool fix for PR pkg/26633, and other issues. Update libtool to 1.5.10 in the process. (More information on tech-pkg.) Bump PKGREVISION and BUILDLINK_DEPENDS of all packages using libtool and installing .la files. Bump PKGREVISION (only) of all packages depending directly on the above via a buildlink3 include. @ text @d1 1 a1 1 # $NetBSD: buildlink3.mk,v 1.16 2004/03/18 09:12:11 jlam Exp $ d19 1 @ 1.16 log @Fix serious bug where BUILDLINK_PACKAGES wasn't being ordered properly by moving the inclusion of buildlink3.mk files outside of the protected region. This bug would be seen by users that have set PREFER_PKGSRC or PREFER_NATIVE to non-default values. BUILDLINK_PACKAGES should be ordered so that for any package in the list, that package doesn't depend on any packages to the left of it in the list. This ordering property is used to check for builtin packages in the correct order. The problem was that including a buildlink3.mk file for correctly ensured that was removed from BUILDLINK_PACKAGES and appended to the end. However, since the inclusion of any other buildlink3.mk files within that buildlink3.mk was in a region that was protected against multiple inclusion, those dependencies weren't also moved to the end of BUILDLINK_PACKAGES. @ text @d1 1 a1 1 # $NetBSD: buildlink3.mk,v 1.15 2004/03/10 17:57:14 jlam Exp $ d15 1 @ 1.15 log @Split out the code that deals with checking whether the software is built-in or not into a separate builtin.mk file. The code to deal checking for built-in software is much simpler to deal with in pkgsrc. The buildlink3.mk file for a package will be of the usual format regardless of the package, which makes it simpler for packagers to update a package. The builtin.mk file for a package must define a single yes/no variable USE_BUILTIN. that is used by bsd.buildlink3.mk to decide whether to use the built-in software or to use the pkgsrc software. @ text @d1 1 a1 1 # $NetBSD: buildlink3.mk,v 1.14 2004/02/19 19:12:26 jlam Exp $ d16 1 a21 2 .endif # FONTCONFIG_BUILDLINK3_MK @ 1.14 log @Add BUILDLINK_DEPENDS. for dependencies in a section that is invoked only if we're not using the built-in versions of the package. @ text @d1 1 a1 1 # $NetBSD: buildlink3.mk,v 1.13 2004/02/19 18:51:01 jlam Exp $ d3 1 a3 1 BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ d6 6 a11 1 .include "../../mk/bsd.prefs.mk" a13 1 BUILDLINK_PACKAGES+= fontconfig a15 3 .endif # FONTCONFIG_BUILDLINK3_MK BUILDLINK_CHECK_BUILTIN.fontconfig?= NO d17 3 a19 54 _FONTCONFIG_FONTCONFIG_H= ${X11BASE}/include/fontconfig/fontconfig.h _X11_TMPL= ${X11BASE}/lib/X11/config/X11.tmpl .if !defined(BUILDLINK_IS_BUILTIN.fontconfig) BUILDLINK_IS_BUILTIN.fontconfig= NO . if exists(${_FONTCONFIG_FONTCONFIG_H}) && exists(${_X11_TMPL}) _IS_BUILTIN.fontconfig!= \ if ${GREP} -q BuildFontconfigLibrary ${_X11_TMPL}; then \ ${ECHO} "YES"; \ else \ ${ECHO} "NO"; \ fi BUILDLINK_IS_BUILTIN.fontconfig= ${_IS_BUILTIN.fontconfig} . if !empty(BUILDLINK_CHECK_BUILTIN.fontconfig:M[nN][oO]) && \ !empty(_IS_BUILTIN.fontconfig:M[yY][eE][sS]) # # Create an appropriate package name for the built-in fontconfig distributed # with the system. This package name can be used to check against # BUILDLINK_DEPENDS. to see if we need to install the pkgsrc version # or if the built-in one is sufficient. # _FONTCONFIG_MAJOR!= \ ${AWK} '/\#define[ ]*FC_MAJOR/ { print $$3 }' \ ${_FONTCONFIG_FONTCONFIG_H} _FONTCONFIG_MINOR!= \ ${AWK} '/\#define[ ]*FC_MINOR/ { print $$3 }' \ ${_FONTCONFIG_FONTCONFIG_H} _FONTCONFIG_REVISION!= \ ${AWK} '/\#define[ ]*FC_REVISION/ { print $$3 }' \ ${_FONTCONFIG_FONTCONFIG_H} _FONTCONFIG_VERSION= \ ${_FONTCONFIG_MAJOR}.${_FONTCONFIG_MINOR}.${_FONTCONFIG_REVISION} _FONTCONFIG_PKG= fontconfig-${_FONTCONFIG_VERSION} BUILDLINK_IS_BUILTIN.fontconfig?= YES . for _depend_ in ${BUILDLINK_DEPENDS.fontconfig} . if !empty(BUILDLINK_IS_BUILTIN.fontconfig:M[yY][eE][sS]) BUILDLINK_IS_BUILTIN.fontconfig!= \ if ${PKG_ADMIN} pmatch '${_depend_}' ${_FONTCONFIG_PKG}; then \ ${ECHO} "YES"; \ else \ ${ECHO} "NO"; \ fi . endif . endfor . endif . endif MAKEFLAGS+= \ BUILDLINK_IS_BUILTIN.fontconfig=${BUILDLINK_IS_BUILTIN.fontconfig} .endif .if !empty(BUILDLINK_CHECK_BUILTIN.fontconfig:M[yY][eE][sS]) BUILDLINK_USE_BUILTIN.fontconfig= YES .endif a20 48 .if !defined(BUILDLINK_USE_BUILTIN.fontconfig) . if !empty(BUILDLINK_IS_BUILTIN.fontconfig:M[yY][eE][sS]) BUILDLINK_USE_BUILTIN.fontconfig= YES . else BUILDLINK_USE_BUILTIN.fontconfig= NO . endif . if !empty(PREFER_NATIVE:M[yY][eE][sS]) && \ !empty(BUILDLINK_IS_BUILTIN.fontconfig:M[yY][eE][sS]) BUILDLINK_USE_BUILTIN.fontconfig= YES . endif . if !empty(PREFER_PKGSRC:M[yY][eE][sS]) BUILDLINK_USE_BUILTIN.fontconfig= NO . endif . if !empty(PREFER_NATIVE:Mfontconfig) && \ !empty(BUILDLINK_IS_BUILTIN.fontconfig:M[yY][eE][sS]) BUILDLINK_USE_BUILTIN.fontconfig= YES . endif . if !empty(PREFER_PKGSRC:Mfontconfig) BUILDLINK_USE_BUILTIN.fontconfig= NO . endif .endif .if !empty(BUILDLINK_USE_BUILTIN.fontconfig:M[nN][oO]) BUILDLINK_DEPENDS.fontconfig+= fontconfig>=2.1nb2 BUILDLINK_DEPENDS.freetype2+= freetype2>=2.1.3 . if !empty(BUILDLINK_DEPTH:M+) BUILDLINK_DEPENDS+= fontconfig . endif .endif .if !empty(BUILDLINK_USE_BUILTIN.fontconfig:M[yY][eE][sS]) BUILDLINK_USE_BUILTIN.zlib= yes BUILDLINK_USE_BUILTIN.freetype2= yes BUILDLINK_USE_BUILTIN.expat= yes .endif .if !empty(FONTCONFIG_BUILDLINK3_MK:M+) . if !empty(BUILDLINK_USE_BUILTIN.fontconfig:M[yY][eE][sS]) BUILDLINK_PREFIX.fontconfig= ${X11BASE} BUILDLINK_FILES.fontconfig+= lib/pkgconfig/fontconfig.pc . endif USE_X11= yes . if !empty(BUILDLINK_CHECK_BUILTIN.fontconfig:M[nN][oO]) . include "../../devel/zlib/buildlink3.mk" . include "../../graphics/freetype2/buildlink3.mk" . include "../../textproc/expat/buildlink3.mk" . endif @ 1.13 log @Move the settings, which force the use of builtin versions of dependencies if the builtin version of the package is being used, into a global location so that they're always executed. @ text @d1 1 a1 1 # $NetBSD: buildlink3.mk,v 1.12 2004/02/18 16:53:52 jlam Exp $ d96 1 d113 1 a113 4 USE_X11= yes BUILDLINK_DEPENDS.freetype2+= freetype2>=2.1.3 @ 1.12 log @If we're using the built-in version of the software, then we must also be using built-in versions of any other software pulled in via buildlink3.mk files. @ text @d1 1 a1 1 # $NetBSD: buildlink3.mk,v 1.11 2004/02/18 16:35:27 jlam Exp $ d101 1 a101 4 .if !empty(FONTCONFIG_BUILDLINK3_MK:M+) . if !empty(BUILDLINK_USE_BUILTIN.fontconfig:M[yY][eE][sS]) BUILDLINK_PREFIX.fontconfig= ${X11BASE} BUILDLINK_FILES.fontconfig+= lib/pkgconfig/fontconfig.pc d105 6 @ 1.11 log @Reorder some lines so that BUILDLINK_USE_BUILTIN. set in the environment overrides all other settings. @ text @d1 1 a1 1 # $NetBSD: buildlink3.mk,v 1.10 2004/02/18 14:58:37 jlam Exp $ d103 5 a107 2 BUILDLINK_PREFIX.fontconfig= ${X11BASE} BUILDLINK_FILES.fontconfig+= lib/pkgconfig/fontconfig.pc d109 2 a110 1 USE_X11= yes @ 1.10 log @fontconfig had a really weird version numbering system. Version 2.0 is practically verbatim with the "1.0.1" release that's in XFree86 4.3.x. There have in fact been only function additions to the fontconfig API since 2.0, so fontconfig has never actually had a bump in the shared library major. Therefore, allow "fontconfig>=1.0.1" as the base requirement. @ text @d1 1 a1 1 # $NetBSD: buildlink3.mk,v 1.9 2004/02/17 16:27:54 jmmv Exp $ d67 1 a67 1 .if !empty(BUILDLINK_IS_BUILTIN.fontconfig:M[yY][eE][sS]) a68 2 .else BUILDLINK_USE_BUILTIN.fontconfig= NO d71 2 a72 2 .if !empty(PREFER_NATIVE:M[yY][eE][sS]) && \ !empty(BUILDLINK_IS_BUILTIN.fontconfig:M[yY][eE][sS]) d74 1 a74 2 .endif .if !empty(PREFER_PKGSRC:M[yY][eE][sS]) d76 4 a79 3 .endif .if !empty(PREFER_NATIVE:Mfontconfig) && \ !empty(BUILDLINK_IS_BUILTIN.fontconfig:M[yY][eE][sS]) d81 2 a82 2 .endif .if !empty(PREFER_PKGSRC:Mfontconfig) d84 3 a86 3 .endif .if !empty(BUILDLINK_CHECK_BUILTIN.fontconfig:M[yY][eE][sS]) d88 4 @ 1.9 log @When using the native version of this library, symlink the .pc file into the buildlink directory so that pkg-config can find it. Ok'ed by jlam@@. @ text @d1 1 a1 1 # $NetBSD: buildlink3.mk,v 1.8 2004/02/17 14:44:10 jlam Exp $ d10 1 a10 1 BUILDLINK_DEPENDS.fontconfig+= fontconfig>=2.1nb1 @ 1.8 log @Missing a "=" in the ">=". @ text @d1 1 a1 1 # $NetBSD: buildlink3.mk,v 1.7 2004/02/17 09:13:33 jlam Exp $ d102 1 @ 1.7 log @Don't include other buildlink3.mk files if we're just checking whether the software is built-in. @ text @d1 1 a1 1 # $NetBSD: buildlink3.mk,v 1.6 2004/02/16 22:47:23 jlam Exp $ d93 1 a93 1 BUILDLINK_DEPENDS.fontconfig+= fontconfig>2.1nb2 @ 1.6 log @fontconfig is in the "fonts" category. @ text @d1 1 a1 1 # $NetBSD: buildlink3.mk,v 1.5 2004/02/16 19:24:14 jlam Exp $ d106 5 a110 3 . include "../../devel/zlib/buildlink3.mk" . include "../../graphics/freetype2/buildlink3.mk" . include "../../textproc/expat/buildlink3.mk" @ 1.5 log @Typo. @ text @d1 1 a1 1 # $NetBSD: buildlink3.mk,v 1.4 2004/02/16 19:16:59 jlam Exp $ d11 1 a11 1 BUILDLINK_PKGSRCDIR.fontconfig?= ../../x11/fontconfig @ 1.4 log @Do the dance to check the version of the XFree86-provided fontconfig. Also correct the list of buildlink2.mk files included by fontconfig/buildlink2.mk. @ text @d1 1 a1 1 # $NetBSD: buildlink3.mk,v 1.21 2004/02/16 18:33:01 jlam Exp $ d16 1 a16 1 _FONTCONFIG_FONTCONFIG_H= ${X11BASE}/include/fontconfig/fonticonfig.h @ 1.3 log @Raise BUILDLINK_DEPENDS.freetype2 to at least 2.1.3. Even 2.0.9 is not good enough for newer fontconfig; for example, gtk2 won't buildlink correctly (and will use older X version of include/freetype2/freetype/ftbdf.h) and libfontconfig needs FT_Get_BDF_Property which is not defined. No PKGREVISION bump is needed, because would not even build in first place. @ text @d1 1 a1 1 # $NetBSD: buildlink3.mk,v 1.2 2004/01/24 03:26:46 jlam Exp $ d3 1 a3 1 BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ d6 1 a6 3 .if !empty(BUILDLINK_DEPTH:M+) BUILDLINK_DEPENDS+= fontconfig .endif d11 55 a65 1 BUILDLINK_PKGSRCDIR.fontconfig?= ../../fonts/fontconfig d67 37 d109 1 a109 1 .endif # FONTCONFIG_BUILDLINK3_MK d111 1 a111 1 BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} @ 1.2 log @Append to BUILDLINK_DEPENDS. instead of setting a default value. In the normal case when BUILDLINK_DEPENDS. isn't specified, it receives a value only once due to the multiple inclusion protection in the bulldlink3.mk files. In the case where a package includes several buildlink3.mk files that each want a slightly different version of another dependency, having BUILDLINK_DEPENDS. be a list allows for the strictest dependency to be matched. @ text @d1 1 a1 1 # $NetBSD: buildlink3.mk,v 1.1 2004/01/24 01:57:01 jlam Exp $ d15 1 a15 1 BUILDLINK_DEPENDS.freetype2+= freetype2>=2.0.9 @ 1.1 log @bl3ify @ text @d1 1 a1 1 # $NetBSD$ d12 1 a12 1 BUILDLINK_DEPENDS.fontconfig?= fontconfig>=2.1nb1 @