head 1.11; access; symbols pkgsrc-2023Q4:1.11.0.48 pkgsrc-2023Q4-base:1.11 pkgsrc-2023Q3:1.11.0.46 pkgsrc-2023Q3-base:1.11 pkgsrc-2023Q2:1.11.0.44 pkgsrc-2023Q2-base:1.11 pkgsrc-2023Q1:1.11.0.42 pkgsrc-2023Q1-base:1.11 pkgsrc-2022Q4:1.11.0.40 pkgsrc-2022Q4-base:1.11 pkgsrc-2022Q3:1.11.0.38 pkgsrc-2022Q3-base:1.11 pkgsrc-2022Q2:1.11.0.36 pkgsrc-2022Q2-base:1.11 pkgsrc-2022Q1:1.11.0.34 pkgsrc-2022Q1-base:1.11 pkgsrc-2021Q4:1.11.0.32 pkgsrc-2021Q4-base:1.11 pkgsrc-2021Q3:1.11.0.30 pkgsrc-2021Q3-base:1.11 pkgsrc-2021Q2:1.11.0.28 pkgsrc-2021Q2-base:1.11 pkgsrc-2021Q1:1.11.0.26 pkgsrc-2021Q1-base:1.11 pkgsrc-2020Q4:1.11.0.24 pkgsrc-2020Q4-base:1.11 pkgsrc-2020Q3:1.11.0.22 pkgsrc-2020Q3-base:1.11 pkgsrc-2020Q2:1.11.0.20 pkgsrc-2020Q2-base:1.11 pkgsrc-2020Q1:1.11.0.16 pkgsrc-2020Q1-base:1.11 pkgsrc-2019Q4:1.11.0.18 pkgsrc-2019Q4-base:1.11 pkgsrc-2019Q3:1.11.0.14 pkgsrc-2019Q3-base:1.11 pkgsrc-2019Q2:1.11.0.12 pkgsrc-2019Q2-base:1.11 pkgsrc-2019Q1:1.11.0.10 pkgsrc-2019Q1-base:1.11 pkgsrc-2018Q4:1.11.0.8 pkgsrc-2018Q4-base:1.11 pkgsrc-2018Q3:1.11.0.6 pkgsrc-2018Q3-base:1.11 pkgsrc-2018Q2:1.11.0.4 pkgsrc-2018Q2-base:1.11 pkgsrc-2018Q1:1.11.0.2 pkgsrc-2018Q1-base:1.11 pkgsrc-2017Q4:1.10.0.48 pkgsrc-2017Q4-base:1.10 pkgsrc-2017Q3:1.10.0.46 pkgsrc-2017Q3-base:1.10 pkgsrc-2017Q2:1.10.0.42 pkgsrc-2017Q2-base:1.10 pkgsrc-2017Q1:1.10.0.40 pkgsrc-2017Q1-base:1.10 pkgsrc-2016Q4:1.10.0.38 pkgsrc-2016Q4-base:1.10 pkgsrc-2016Q3:1.10.0.36 pkgsrc-2016Q3-base:1.10 pkgsrc-2016Q2:1.10.0.34 pkgsrc-2016Q2-base:1.10 pkgsrc-2016Q1:1.10.0.32 pkgsrc-2016Q1-base:1.10 pkgsrc-2015Q4:1.10.0.30 pkgsrc-2015Q4-base:1.10 pkgsrc-2015Q3:1.10.0.28 pkgsrc-2015Q3-base:1.10 pkgsrc-2015Q2:1.10.0.26 pkgsrc-2015Q2-base:1.10 pkgsrc-2015Q1:1.10.0.24 pkgsrc-2015Q1-base:1.10 pkgsrc-2014Q4:1.10.0.22 pkgsrc-2014Q4-base:1.10 pkgsrc-2014Q3:1.10.0.20 pkgsrc-2014Q3-base:1.10 pkgsrc-2014Q2:1.10.0.18 pkgsrc-2014Q2-base:1.10 pkgsrc-2014Q1:1.10.0.16 pkgsrc-2014Q1-base:1.10 pkgsrc-2013Q4:1.10.0.14 pkgsrc-2013Q4-base:1.10 pkgsrc-2013Q3:1.10.0.12 pkgsrc-2013Q3-base:1.10 pkgsrc-2013Q2:1.10.0.10 pkgsrc-2013Q2-base:1.10 pkgsrc-2013Q1:1.10.0.8 pkgsrc-2013Q1-base:1.10 pkgsrc-2012Q4:1.10.0.6 pkgsrc-2012Q4-base:1.10 pkgsrc-2012Q3:1.10.0.4 pkgsrc-2012Q3-base:1.10 pkgsrc-2012Q2:1.10.0.2 pkgsrc-2012Q2-base:1.10 pkgsrc-2012Q1:1.9.0.8 pkgsrc-2012Q1-base:1.9 pkgsrc-2011Q4:1.9.0.6 pkgsrc-2011Q4-base:1.9 pkgsrc-2011Q3:1.9.0.4 pkgsrc-2011Q3-base:1.9 pkgsrc-2011Q2:1.9.0.2 pkgsrc-2011Q2-base:1.9 pkgsrc-2011Q1:1.8.0.18 pkgsrc-2011Q1-base:1.8 pkgsrc-2010Q4:1.8.0.16 pkgsrc-2010Q4-base:1.8 pkgsrc-2010Q3:1.8.0.14 pkgsrc-2010Q3-base:1.8 pkgsrc-2010Q2:1.8.0.12 pkgsrc-2010Q2-base:1.8 pkgsrc-2010Q1:1.8.0.10 pkgsrc-2010Q1-base:1.8 pkgsrc-2009Q4:1.8.0.8 pkgsrc-2009Q4-base:1.8 pkgsrc-2009Q3:1.8.0.6 pkgsrc-2009Q3-base:1.8 pkgsrc-2009Q2:1.8.0.4 pkgsrc-2009Q2-base:1.8 pkgsrc-2009Q1:1.8.0.2 pkgsrc-2009Q1-base:1.8 pkgsrc-2008Q4:1.6.0.24 pkgsrc-2008Q4-base:1.6 pkgsrc-2008Q3:1.6.0.22 pkgsrc-2008Q3-base:1.6 cube-native-xorg:1.6.0.20 cube-native-xorg-base:1.6 pkgsrc-2008Q2:1.6.0.18 pkgsrc-2008Q2-base:1.6 cwrapper:1.6.0.16 pkgsrc-2008Q1:1.6.0.14 pkgsrc-2008Q1-base:1.6 pkgsrc-2007Q4:1.6.0.12 pkgsrc-2007Q4-base:1.6 pkgsrc-2007Q3:1.6.0.10 pkgsrc-2007Q3-base:1.6 pkgsrc-2007Q2:1.6.0.8 pkgsrc-2007Q2-base:1.6 pkgsrc-2007Q1:1.6.0.6 pkgsrc-2007Q1-base:1.6 pkgsrc-2006Q4:1.6.0.4 pkgsrc-2006Q4-base:1.6 pkgsrc-2006Q3:1.6.0.2 pkgsrc-2006Q3-base:1.6 pkgsrc-2006Q2:1.4.0.2 pkgsrc-2006Q2-base:1.4 pkgsrc-2006Q1:1.2.0.2 pkgsrc-2006Q1-base:1.2 pkgsrc-2005Q4:1.1.0.14 pkgsrc-2005Q4-base:1.1 pkgsrc-2005Q3:1.1.0.12 pkgsrc-2005Q3-base:1.1 pkgsrc-2005Q2:1.1.0.10 pkgsrc-2005Q2-base:1.1 pkgsrc-2005Q1:1.1.0.8 pkgsrc-2005Q1-base:1.1 pkgsrc-2004Q4:1.1.0.6 pkgsrc-2004Q4-base:1.1 pkgsrc-2004Q3:1.1.0.4 pkgsrc-2004Q3-base:1.1 pkgsrc-2004Q2:1.1.0.2 pkgsrc-2004Q2-base:1.1; locks; strict; comment @# @; 1.11 date 2018.01.07.13.04.38; author rillig; state Exp; branches; next 1.10; commitid dlppcM1x04atAWlA; 1.10 date 2012.05.07.01.54.08; author dholland; state Exp; branches; next 1.9; 1.9 date 2011.04.22.13.42.11; author obache; state Exp; branches; next 1.8; 1.8 date 2009.03.20.19.25.41; author joerg; state Exp; branches; next 1.7; 1.7 date 2009.03.19.16.20.52; author cube; state Exp; branches; next 1.6; 1.6 date 2006.07.08.23.11.14; author jlam; state Exp; branches; next 1.5; 1.5 date 2006.07.08.22.39.45; author jlam; state Exp; branches; next 1.4; 1.4 date 2006.04.12.10.27.41; author rillig; state Exp; branches; next 1.3; 1.3 date 2006.04.06.06.23.01; author reed; state Exp; branches; next 1.2; 1.2 date 2006.02.05.23.11.34; author joerg; state Exp; branches; next 1.1; 1.1 date 2004.04.25.07.05.42; author snj; state Exp; branches; next ; desc @@ 1.11 log @Fix indentation in buildlink3.mk files. The actual fix as been done by "pkglint -F */*/buildlink3.mk", and was reviewed manually. There are some .include lines that still are indented with zero spaces although the surrounding .if is indented. This is existing practice. @ text @# $NetBSD: buildlink3.mk,v 1.10 2012/05/07 01:54:08 dholland Exp $ BUILDLINK_TREE+= gtk+extra .if !defined(GTK_EXTRA_BUILDLINK3_MK) GTK_EXTRA_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.gtk+extra+= gtk+extra>=0.99.17nb2 BUILDLINK_ABI_DEPENDS.gtk+extra+= gtk+extra>=0.99.17nb6 BUILDLINK_PKGSRCDIR.gtk+extra?= ../../x11/gtk+extra .include "../../x11/gtk/buildlink3.mk" .endif # GTK_EXTRA_BUILDLINK3_MK BUILDLINK_TREE+= -gtk+extra @ 1.10 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.9 2011/04/22 13:42:11 obache Exp $ d10 1 a10 1 BUILDLINK_PKGSRCDIR.gtk+extra?= ../../x11/gtk+extra @ 1.9 log @recursive bump from gettext-lib shlib bump. @ text @d1 1 a1 1 # $NetBSD: buildlink3.mk,v 1.8 2009/03/20 19:25:41 joerg Exp $ d9 1 a9 1 BUILDLINK_ABI_DEPENDS.gtk+extra?= gtk+extra>=0.99.17nb6 @ 1.8 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.7 2009/03/19 16:20:52 cube Exp $ d9 1 a9 1 BUILDLINK_ABI_DEPENDS.gtk+extra?= gtk+extra>=0.99.17nb5 @ 1.7 log @Don't use + in variable names. It's asking for troubles. @ text @d1 1 a1 1 # $NetBSD: buildlink3.mk,v 1.6 2006/07/08 23:11:14 jlam Exp $ d3 1 a3 2 BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ GTK_EXTRA_BUILDLINK3_MK:= ${GTK+EXTRA_BUILDLINK3_MK}+ d5 2 a6 3 .if !empty(BUILDLINK_DEPTH:M+) BUILDLINK_DEPENDS+= gtk+extra .endif a7 5 BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ngtk+extra} BUILDLINK_PACKAGES+= gtk+extra BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}gtk+extra .if !empty(GTK_EXTRA_BUILDLINK3_MK:M+) a10 1 .endif # GTK_EXTRA_BUILDLINK3_MK d13 1 d15 1 a15 1 BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} @ 1.6 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.5 2006/07/08 22:39:45 jlam Exp $ d4 1 a4 1 GTK+EXTRA_BUILDLINK3_MK:= ${GTK+EXTRA_BUILDLINK3_MK}+ d14 1 a14 1 .if !empty(GTK+EXTRA_BUILDLINK3_MK:M+) d18 1 a18 1 .endif # GTK+EXTRA_BUILDLINK3_MK @ 1.5 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.4 2006/04/12 10:27:41 rillig Exp $ d12 1 a12 1 BUILDLINK_ORDER+= gtk+extra @ 1.4 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.3 2006/04/06 06:23:01 reed Exp $ d12 1 @ 1.3 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.2 2006/02/05 23:11:34 joerg Exp $ d21 1 a21 1 BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} @ 1.2 log @Recursive revision bump / recommended bump for gettext ABI change. @ text @d1 1 a1 1 # $NetBSD: buildlink3.mk,v 1.1 2004/04/25 07:05:42 snj Exp $ d14 2 a15 2 BUILDLINK_DEPENDS.gtk+extra+= gtk+extra>=0.99.17nb2 BUILDLINK_RECOMMENDED.gtk+extra?= gtk+extra>=0.99.17nb5 @ 1.1 log @Convert to buildlink3. @ text @d1 1 a1 1 # $NetBSD$ d15 1 @