head 1.14; access; symbols pkgsrc-2023Q4:1.14.0.94 pkgsrc-2023Q4-base:1.14 pkgsrc-2023Q3:1.14.0.92 pkgsrc-2023Q3-base:1.14 pkgsrc-2023Q2:1.14.0.90 pkgsrc-2023Q2-base:1.14 pkgsrc-2023Q1:1.14.0.88 pkgsrc-2023Q1-base:1.14 pkgsrc-2022Q4:1.14.0.86 pkgsrc-2022Q4-base:1.14 pkgsrc-2022Q3:1.14.0.84 pkgsrc-2022Q3-base:1.14 pkgsrc-2022Q2:1.14.0.82 pkgsrc-2022Q2-base:1.14 pkgsrc-2022Q1:1.14.0.80 pkgsrc-2022Q1-base:1.14 pkgsrc-2021Q4:1.14.0.78 pkgsrc-2021Q4-base:1.14 pkgsrc-2021Q3:1.14.0.76 pkgsrc-2021Q3-base:1.14 pkgsrc-2021Q2:1.14.0.74 pkgsrc-2021Q2-base:1.14 pkgsrc-2021Q1:1.14.0.72 pkgsrc-2021Q1-base:1.14 pkgsrc-2020Q4:1.14.0.70 pkgsrc-2020Q4-base:1.14 pkgsrc-2020Q3:1.14.0.68 pkgsrc-2020Q3-base:1.14 pkgsrc-2020Q2:1.14.0.64 pkgsrc-2020Q2-base:1.14 pkgsrc-2020Q1:1.14.0.44 pkgsrc-2020Q1-base:1.14 pkgsrc-2019Q4:1.14.0.66 pkgsrc-2019Q4-base:1.14 pkgsrc-2019Q3:1.14.0.62 pkgsrc-2019Q3-base:1.14 pkgsrc-2019Q2:1.14.0.60 pkgsrc-2019Q2-base:1.14 pkgsrc-2019Q1:1.14.0.58 pkgsrc-2019Q1-base:1.14 pkgsrc-2018Q4:1.14.0.56 pkgsrc-2018Q4-base:1.14 pkgsrc-2018Q3:1.14.0.54 pkgsrc-2018Q3-base:1.14 pkgsrc-2018Q2:1.14.0.52 pkgsrc-2018Q2-base:1.14 pkgsrc-2018Q1:1.14.0.50 pkgsrc-2018Q1-base:1.14 pkgsrc-2017Q4:1.14.0.48 pkgsrc-2017Q4-base:1.14 pkgsrc-2017Q3:1.14.0.46 pkgsrc-2017Q3-base:1.14 pkgsrc-2017Q2:1.14.0.42 pkgsrc-2017Q2-base:1.14 pkgsrc-2017Q1:1.14.0.40 pkgsrc-2017Q1-base:1.14 pkgsrc-2016Q4:1.14.0.38 pkgsrc-2016Q4-base:1.14 pkgsrc-2016Q3:1.14.0.36 pkgsrc-2016Q3-base:1.14 pkgsrc-2016Q2:1.14.0.34 pkgsrc-2016Q2-base:1.14 pkgsrc-2016Q1:1.14.0.32 pkgsrc-2016Q1-base:1.14 pkgsrc-2015Q4:1.14.0.30 pkgsrc-2015Q4-base:1.14 pkgsrc-2015Q3:1.14.0.28 pkgsrc-2015Q3-base:1.14 pkgsrc-2015Q2:1.14.0.26 pkgsrc-2015Q2-base:1.14 pkgsrc-2015Q1:1.14.0.24 pkgsrc-2015Q1-base:1.14 pkgsrc-2014Q4:1.14.0.22 pkgsrc-2014Q4-base:1.14 pkgsrc-2014Q3:1.14.0.20 pkgsrc-2014Q3-base:1.14 pkgsrc-2014Q2:1.14.0.18 pkgsrc-2014Q2-base:1.14 pkgsrc-2014Q1:1.14.0.16 pkgsrc-2014Q1-base:1.14 pkgsrc-2013Q4:1.14.0.14 pkgsrc-2013Q4-base:1.14 pkgsrc-2013Q3:1.14.0.12 pkgsrc-2013Q3-base:1.14 pkgsrc-2013Q2:1.14.0.10 pkgsrc-2013Q2-base:1.14 pkgsrc-2013Q1:1.14.0.8 pkgsrc-2013Q1-base:1.14 pkgsrc-2012Q4:1.14.0.6 pkgsrc-2012Q4-base:1.14 pkgsrc-2012Q3:1.14.0.4 pkgsrc-2012Q3-base:1.14 pkgsrc-2012Q2:1.14.0.2 pkgsrc-2012Q2-base:1.14 pkgsrc-2012Q1:1.13.0.26 pkgsrc-2012Q1-base:1.13 pkgsrc-2011Q4:1.13.0.24 pkgsrc-2011Q4-base:1.13 pkgsrc-2011Q3:1.13.0.22 pkgsrc-2011Q3-base:1.13 pkgsrc-2011Q2:1.13.0.20 pkgsrc-2011Q2-base:1.13 pkgsrc-2011Q1:1.13.0.18 pkgsrc-2011Q1-base:1.13 pkgsrc-2010Q4:1.13.0.16 pkgsrc-2010Q4-base:1.13 pkgsrc-2010Q3:1.13.0.14 pkgsrc-2010Q3-base:1.13 pkgsrc-2010Q2:1.13.0.12 pkgsrc-2010Q2-base:1.13 pkgsrc-2010Q1:1.13.0.10 pkgsrc-2010Q1-base:1.13 pkgsrc-2009Q4:1.13.0.8 pkgsrc-2009Q4-base:1.13 pkgsrc-2009Q3:1.13.0.6 pkgsrc-2009Q3-base:1.13 pkgsrc-2009Q2:1.13.0.4 pkgsrc-2009Q2-base:1.13 pkgsrc-2009Q1:1.13.0.2 pkgsrc-2009Q1-base:1.13 pkgsrc-2008Q4:1.11.0.24 pkgsrc-2008Q4-base:1.11 pkgsrc-2008Q3:1.11.0.22 pkgsrc-2008Q3-base:1.11 cube-native-xorg:1.11.0.20 cube-native-xorg-base:1.11 pkgsrc-2008Q2:1.11.0.18 pkgsrc-2008Q2-base:1.11 cwrapper:1.11.0.16 pkgsrc-2008Q1:1.11.0.14 pkgsrc-2008Q1-base:1.11 pkgsrc-2007Q4:1.11.0.12 pkgsrc-2007Q4-base:1.11 pkgsrc-2007Q3:1.11.0.10 pkgsrc-2007Q3-base:1.11 pkgsrc-2007Q2:1.11.0.8 pkgsrc-2007Q2-base:1.11 pkgsrc-2007Q1:1.11.0.6 pkgsrc-2007Q1-base:1.11 pkgsrc-2006Q4:1.11.0.4 pkgsrc-2006Q4-base:1.11 pkgsrc-2006Q3:1.11.0.2 pkgsrc-2006Q3-base:1.11 pkgsrc-2006Q2:1.9.0.2 pkgsrc-2006Q2-base:1.9 pkgsrc-2006Q1:1.7.0.2 pkgsrc-2006Q1-base:1.7 pkgsrc-2005Q4:1.5.0.14 pkgsrc-2005Q4-base:1.5 pkgsrc-2005Q3:1.5.0.12 pkgsrc-2005Q3-base:1.5 pkgsrc-2005Q2:1.5.0.10 pkgsrc-2005Q2-base:1.5 pkgsrc-2005Q1:1.5.0.8 pkgsrc-2005Q1-base:1.5 pkgsrc-2004Q4:1.5.0.6 pkgsrc-2004Q4-base:1.5 pkgsrc-2004Q3:1.5.0.4 pkgsrc-2004Q3-base:1.5 pkgsrc-2004Q2:1.5.0.2 pkgsrc-2004Q2-base:1.5 pkgsrc-2004Q1:1.4.0.2 pkgsrc-2004Q1-base:1.4; locks; strict; comment @# @; 1.14 date 2012.05.07.01.54.03; author dholland; state Exp; branches; next 1.13; 1.13 date 2009.03.20.19.25.32; author joerg; state Exp; branches; next 1.12; 1.12 date 2009.03.20.17.30.12; author joerg; state Exp; branches; next 1.11; 1.11 date 2006.07.08.23.11.11; author jlam; state Exp; branches; next 1.10; 1.10 date 2006.07.08.22.39.41; author jlam; state Exp; branches; next 1.9; 1.9 date 2006.04.12.10.27.37; author rillig; state Exp; branches; next 1.8; 1.8 date 2006.04.06.06.22.52; author reed; state Exp; branches; next 1.7; 1.7 date 2006.02.05.23.11.07; author joerg; state Exp; branches; next 1.6; 1.6 date 2006.01.24.07.32.38; author wiz; state Exp; branches; next 1.5; 1.5 date 2004.05.17.21.32.34; author seb; state Exp; branches; next 1.4; 1.4 date 2004.03.18.09.12.15; author jlam; state Exp; branches; next 1.3; 1.3 date 2004.03.16.18.23.27; author jlam; state Exp; branches; next 1.2; 1.2 date 2004.03.05.19.25.41; author jlam; state Exp; branches; next 1.1; 1.1 date 2004.02.23.12.36.25; author recht; state Exp; branches; next ; desc @@ 1.14 log @Set BUILDLINK_ABI_DEPENDS correctly (with +=, not ?=) It turns out there were a lot of these. @ text @# $NetBSD: buildlink3.mk,v 1.13 2009/03/20 19:25:32 joerg Exp $ BUILDLINK_TREE+= pyxml .if !defined(PYXML_BUILDLINK3_MK) PYXML_BUILDLINK3_MK:= .include "../../lang/python/pyversion.mk" BUILDLINK_API_DEPENDS.pyxml+= ${PYPKGPREFIX}-xml>=0.8.3nb1 BUILDLINK_ABI_DEPENDS.pyxml+= ${PYPKGPREFIX}-xml>=0.8.4nb2 BUILDLINK_PKGSRCDIR.pyxml?= ../../textproc/py-xml .include "../../textproc/expat/buildlink3.mk" .endif # PYXML_BUILDLINK3_MK BUILDLINK_TREE+= -pyxml @ 1.13 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.12 2009/03/20 17:30:12 joerg Exp $ d11 1 a11 1 BUILDLINK_ABI_DEPENDS.pyxml?= ${PYPKGPREFIX}-xml>=0.8.4nb2 @ 1.12 log @Include pyversion.mk include the protected part of the buildlink3.mk files, not over and over again. @ text @d1 1 a1 1 # $NetBSD: buildlink3.mk,v 1.11 2006/07/08 23:11:11 jlam Exp $ d3 1 a3 2 BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ PYXML_BUILDLINK3_MK:= ${PYXML_BUILDLINK3_MK}+ d5 2 a6 3 .if !empty(BUILDLINK_DEPTH:M+) BUILDLINK_DEPENDS+= pyxml .endif a7 5 BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Npyxml} BUILDLINK_PACKAGES+= pyxml BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}pyxml .if !empty(PYXML_BUILDLINK3_MK:M+) a12 1 .endif # PYXML_BUILDLINK3_MK d15 1 d17 1 a17 1 BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} @ 1.11 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.10 2006/07/08 22:39:41 jlam Exp $ a5 2 .include "../../lang/python/pyversion.mk" d15 2 @ 1.10 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.9 2006/04/12 10:27:37 rillig Exp $ d14 1 a14 1 BUILDLINK_ORDER+= pyxml @ 1.9 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.8 2006/04/06 06:22:52 reed Exp $ d14 1 @ 1.8 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.7 2006/02/05 23:11:07 joerg Exp $ d23 1 a23 1 BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} @ 1.7 log @Recursive revision bump / recommended bump for gettext ABI change. @ text @d1 1 a1 1 # $NetBSD: buildlink3.mk,v 1.6 2006/01/24 07:32:38 wiz Exp $ d16 2 a17 2 BUILDLINK_DEPENDS.pyxml+= ${PYPKGPREFIX}-xml>=0.8.3nb1 BUILDLINK_RECOMMENDED.pyxml?= ${PYPKGPREFIX}-xml>=0.8.4nb2 @ 1.6 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.5 2004/05/17 21:32:34 seb Exp $ d17 1 a17 1 BUILDLINK_RECOMMENDED.pyxml?= ${PYPKGPREFIX}-xml>=0.8.4nb1 @ 1.5 log @Garbage collect BUILDLINK_PKGBASE. from buildlink3: it is not anymore used since revision 1.139 of mk/buildlink3/bsd.buildlink3.mk. @ text @d1 1 a1 1 # $NetBSD: buildlink3.mk,v 1.4 2004/03/18 09:12:15 jlam Exp $ d17 1 @ 1.4 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.3 2004/03/16 18:23:27 jlam Exp $ a15 1 BUILDLINK_PKGBASE.pyxml?= ${PYPKGPREFIX}-xml @ 1.3 log @If the ${PKGBASE} of a package doesn't match the token passed to BUILDLINK_PACKAGES, then set BUILDLINK_PKGBASE. explicitly so that we can map from to BUILDLINK_PKGBASE.. @ text @d1 1 a1 1 # $NetBSD: buildlink3.mk,v 1.2 2004/03/05 19:25:41 jlam Exp $ d19 1 a22 2 .endif # PYXML_BUILDLINK3_MK @ 1.2 log @Reorder location and setting of BUILDLINK_PACKAGES to match template buildlink3.mk file in revision 1.101 of bsd.buildlink3.mk. @ text @d1 1 a1 1 # $NetBSD: buildlink3.mk,v 1.1 2004/02/23 12:36:25 recht Exp $ d16 1 @ 1.1 log @add bl3 @ text @d1 1 a1 2 # $NetBSD$ # d12 3 d16 2 a17 3 BUILDLINK_PACKAGES+= pyxml BUILDLINK_DEPENDS.pyxml+= ${PYPKGPREFIX}-xml>=0.8.3nb1 BUILDLINK_PKGSRCDIR.pyxml?= ../../textproc/py-xml d21 1 a21 1 .endif # PYXML_BUILDLINK3_MK @