head 1.17; access; symbols pkgsrc-2023Q4:1.17.0.64 pkgsrc-2023Q4-base:1.17 pkgsrc-2023Q3:1.17.0.62 pkgsrc-2023Q3-base:1.17 pkgsrc-2023Q2:1.17.0.60 pkgsrc-2023Q2-base:1.17 pkgsrc-2023Q1:1.17.0.58 pkgsrc-2023Q1-base:1.17 pkgsrc-2022Q4:1.17.0.56 pkgsrc-2022Q4-base:1.17 pkgsrc-2022Q3:1.17.0.54 pkgsrc-2022Q3-base:1.17 pkgsrc-2022Q2:1.17.0.52 pkgsrc-2022Q2-base:1.17 pkgsrc-2022Q1:1.17.0.50 pkgsrc-2022Q1-base:1.17 pkgsrc-2021Q4:1.17.0.48 pkgsrc-2021Q4-base:1.17 pkgsrc-2021Q3:1.17.0.46 pkgsrc-2021Q3-base:1.17 pkgsrc-2021Q2:1.17.0.44 pkgsrc-2021Q2-base:1.17 pkgsrc-2021Q1:1.17.0.42 pkgsrc-2021Q1-base:1.17 pkgsrc-2020Q4:1.17.0.40 pkgsrc-2020Q4-base:1.17 pkgsrc-2020Q3:1.17.0.38 pkgsrc-2020Q3-base:1.17 pkgsrc-2020Q2:1.17.0.34 pkgsrc-2020Q2-base:1.17 pkgsrc-2020Q1:1.17.0.14 pkgsrc-2020Q1-base:1.17 pkgsrc-2019Q4:1.17.0.36 pkgsrc-2019Q4-base:1.17 pkgsrc-2019Q3:1.17.0.32 pkgsrc-2019Q3-base:1.17 pkgsrc-2019Q2:1.17.0.30 pkgsrc-2019Q2-base:1.17 pkgsrc-2019Q1:1.17.0.28 pkgsrc-2019Q1-base:1.17 pkgsrc-2018Q4:1.17.0.26 pkgsrc-2018Q4-base:1.17 pkgsrc-2018Q3:1.17.0.24 pkgsrc-2018Q3-base:1.17 pkgsrc-2018Q2:1.17.0.22 pkgsrc-2018Q2-base:1.17 pkgsrc-2018Q1:1.17.0.20 pkgsrc-2018Q1-base:1.17 pkgsrc-2017Q4:1.17.0.18 pkgsrc-2017Q4-base:1.17 pkgsrc-2017Q3:1.17.0.16 pkgsrc-2017Q3-base:1.17 pkgsrc-2017Q2:1.17.0.12 pkgsrc-2017Q2-base:1.17 pkgsrc-2017Q1:1.17.0.10 pkgsrc-2017Q1-base:1.17 pkgsrc-2016Q4:1.17.0.8 pkgsrc-2016Q4-base:1.17 pkgsrc-2016Q3:1.17.0.6 pkgsrc-2016Q3-base:1.17 pkgsrc-2016Q2:1.17.0.4 pkgsrc-2016Q2-base:1.17 pkgsrc-2016Q1:1.17.0.2 pkgsrc-2016Q1-base:1.17 pkgsrc-2015Q4:1.16.0.24 pkgsrc-2015Q4-base:1.16 pkgsrc-2015Q3:1.16.0.22 pkgsrc-2015Q3-base:1.16 pkgsrc-2015Q2:1.16.0.20 pkgsrc-2015Q2-base:1.16 pkgsrc-2015Q1:1.16.0.18 pkgsrc-2015Q1-base:1.16 pkgsrc-2014Q4:1.16.0.16 pkgsrc-2014Q4-base:1.16 pkgsrc-2014Q3:1.16.0.14 pkgsrc-2014Q3-base:1.16 pkgsrc-2014Q2:1.16.0.12 pkgsrc-2014Q2-base:1.16 pkgsrc-2014Q1:1.16.0.10 pkgsrc-2014Q1-base:1.16 pkgsrc-2013Q4:1.16.0.8 pkgsrc-2013Q4-base:1.16 pkgsrc-2013Q3:1.16.0.6 pkgsrc-2013Q3-base:1.16 pkgsrc-2013Q2:1.16.0.4 pkgsrc-2013Q2-base:1.16 pkgsrc-2013Q1:1.16.0.2 pkgsrc-2013Q1-base:1.16 pkgsrc-2012Q4:1.15.0.6 pkgsrc-2012Q4-base:1.15 pkgsrc-2012Q3:1.15.0.4 pkgsrc-2012Q3-base:1.15 pkgsrc-2012Q2:1.15.0.2 pkgsrc-2012Q2-base:1.15 pkgsrc-2012Q1:1.14.0.26 pkgsrc-2012Q1-base:1.14 pkgsrc-2011Q4:1.14.0.24 pkgsrc-2011Q4-base:1.14 pkgsrc-2011Q3:1.14.0.22 pkgsrc-2011Q3-base:1.14 pkgsrc-2011Q2:1.14.0.20 pkgsrc-2011Q2-base:1.14 pkgsrc-2011Q1:1.14.0.18 pkgsrc-2011Q1-base:1.14 pkgsrc-2010Q4:1.14.0.16 pkgsrc-2010Q4-base:1.14 pkgsrc-2010Q3:1.14.0.14 pkgsrc-2010Q3-base:1.14 pkgsrc-2010Q2:1.14.0.12 pkgsrc-2010Q2-base:1.14 pkgsrc-2010Q1:1.14.0.10 pkgsrc-2010Q1-base:1.14 pkgsrc-2009Q4:1.14.0.8 pkgsrc-2009Q4-base:1.14 pkgsrc-2009Q3:1.14.0.6 pkgsrc-2009Q3-base:1.14 pkgsrc-2009Q2:1.14.0.4 pkgsrc-2009Q2-base:1.14 pkgsrc-2009Q1:1.14.0.2 pkgsrc-2009Q1-base:1.14 pkgsrc-2008Q4:1.13.0.12 pkgsrc-2008Q4-base:1.13 pkgsrc-2008Q3:1.13.0.10 pkgsrc-2008Q3-base:1.13 cube-native-xorg:1.13.0.8 cube-native-xorg-base:1.13 pkgsrc-2008Q2:1.13.0.6 pkgsrc-2008Q2-base:1.13 cwrapper:1.13.0.4 pkgsrc-2008Q1:1.13.0.2 pkgsrc-2008Q1-base:1.13 pkgsrc-2007Q4:1.12.0.2 pkgsrc-2007Q4-base:1.12 pkgsrc-2007Q3:1.11.0.6 pkgsrc-2007Q3-base:1.11 pkgsrc-2007Q2:1.11.0.4 pkgsrc-2007Q2-base:1.11 pkgsrc-2007Q1:1.11.0.2 pkgsrc-2007Q1-base:1.11 pkgsrc-2006Q4:1.10.0.2 pkgsrc-2006Q4-base:1.10 pkgsrc-2006Q3:1.9.0.2 pkgsrc-2006Q3-base:1.9 pkgsrc-2006Q2:1.7.0.2 pkgsrc-2006Q2-base:1.7 pkgsrc-2006Q1:1.5.0.2 pkgsrc-2006Q1-base:1.5 pkgsrc-2005Q4:1.4.0.6 pkgsrc-2005Q4-base:1.4 pkgsrc-2005Q3:1.4.0.4 pkgsrc-2005Q3-base:1.4 pkgsrc-2005Q2:1.4.0.2 pkgsrc-2005Q2-base:1.4 pkgsrc-2005Q1:1.3.0.4 pkgsrc-2005Q1-base:1.3 pkgsrc-2004Q4:1.3.0.2 pkgsrc-2004Q4-base:1.3 pkgsrc-2004Q3:1.2.0.2 pkgsrc-2004Q3-base:1.2 pkgsrc-2004Q2:1.1.0.2 pkgsrc-2004Q2-base:1.1; locks; strict; comment @# @; 1.17 date 2015.12.29.04.54.39; author dholland; state Exp; branches; next 1.16; commitid u8BGzIq28fJjGNOy; 1.16 date 2013.01.15.16.21.36; author morr; state Exp; branches; next 1.15; 1.15 date 2012.06.15.23.06.03; author dholland; state Exp; branches; next 1.14; 1.14 date 2009.03.20.19.25.48; author joerg; state Exp; branches; next 1.13; 1.13 date 2008.01.04.01.25.51; author rillig; state Exp; branches; next 1.12; 1.12 date 2007.12.24.18.57.49; author bjs; state Exp; branches; next 1.11; 1.11 date 2007.01.30.21.00.31; author joerg; state Exp; branches; next 1.10; 1.10 date 2006.12.12.21.52.38; author joerg; state Exp; branches; next 1.9; 1.9 date 2006.07.08.23.11.15; author jlam; state Exp; branches; next 1.8; 1.8 date 2006.07.08.22.39.46; author jlam; state Exp; branches; next 1.7; 1.7 date 2006.04.12.10.27.42; author rillig; state Exp; branches; next 1.6; 1.6 date 2006.04.06.06.23.02; author reed; state Exp; branches; next 1.5; 1.5 date 2006.02.05.23.11.40; author joerg; state Exp; branches; next 1.4; 1.4 date 2005.06.01.18.03.29; author jlam; state Exp; branches; next 1.3; 1.3 date 2004.10.03.00.18.36; author tv; state Exp; branches; next 1.2; 1.2 date 2004.08.27.18.53.58; author jlam; state Exp; branches; next 1.1; 1.1 date 2004.04.11.23.34.29; author xtraeme; state Exp; branches; next ; desc @@ 1.17 log @Whitespace. @ text @# $NetBSD: buildlink3.mk,v 1.16 2013/01/15 16:21:36 morr Exp $ BUILDLINK_TREE+= neXtaw .if !defined(NEXTAW_BUILDLINK3_MK) NEXTAW_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.neXtaw+= neXtaw>=0.15.1 BUILDLINK_ABI_DEPENDS.neXtaw+= neXtaw>=0.15.1nb2 BUILDLINK_PKGSRCDIR.neXtaw?= ../../x11/neXtaw BUILDLINK_TRANSFORM+= l:Xaw:neXtaw .include "../../mk/bsd.fast.prefs.mk" .if ${X11_TYPE} == "modular" .PHONY: buildlink-neXtaw-inc-hack buildlink-neXtaw-cookie: buildlink-neXtaw-inc-hack buildlink-neXtaw-inc-hack: buildlink-directories [ ! -h ${BUILDLINK_DIR}/include/X11/Xaw ] && \ ${MKDIR} ${BUILDLINK_DIR}/include/X11 && \ ${LN} -s neXtaw ${BUILDLINK_DIR}/include/X11/Xaw .endif .include "../../x11/libXext/buildlink3.mk" .include "../../x11/libXmu/buildlink3.mk" .include "../../x11/libXt/buildlink3.mk" .endif # NEXTAW_BUILDLINK3_MK BUILDLINK_TREE+= -neXtaw @ 1.16 log @Clean up libXaw handling. [1/2] - remove LIBXAW variable. It is handled by buildlink3.mk now - simplify patches and Makefile in packages using libXaw - in some cases force use of Xaw3d (won't build with Xaw) - replace some directly included of x11/Xaw3d with mk/xaw.buildlink3.mk In next part: - replace more includes with mk/xaw.buildlink3.mk @ text @d1 1 a1 1 # $NetBSD: buildlink3.mk,v 1.15 2012/06/15 23:06:03 dholland Exp $ d12 1 a12 1 BUILDLINK_TRANSFORM+= l:Xaw:neXtaw @ 1.15 log @Whitespace. (as whined about by pkglint) @ text @d1 1 a1 1 # $NetBSD: buildlink3.mk,v 1.14 2009/03/20 19:25:48 joerg Exp $ d12 2 a25 4 LIBXAW?= -L${BUILDLINK_PREFIX.neXtaw}/lib \ ${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.neXtaw}/lib \ -lneXtaw @ 1.14 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.13 2008/01/04 01:25:51 rillig Exp $ d14 1 a14 1 . if ${X11_TYPE} == "modular" d22 1 a22 1 . endif @ 1.13 log @Fixed pkglint warnings. @ text @d1 1 a1 1 # $NetBSD: buildlink3.mk,v 1.12 2007/12/24 18:57:49 bjs Exp $ d3 1 a3 2 BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ NEXTAW_BUILDLINK3_MK:= ${NEXTAW_BUILDLINK3_MK}+ d5 2 a6 3 .if !empty(BUILDLINK_DEPTH:M+) BUILDLINK_DEPENDS+= neXtaw .endif a7 5 BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:NneXtaw} BUILDLINK_PACKAGES+= neXtaw BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}neXtaw .if !empty(NEXTAW_BUILDLINK3_MK:M+) a27 2 .endif # NEXTAW_BUILDLINK3_MK d31 1 d33 1 a33 1 BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} @ 1.12 log @ Add logic gleefully ripped from x11/Xaw3d/buildlink3.mk to make these libraries work properly with xaw.buildlink3.mk. That's better! This was done so that X/Open Curses (pkgsrc-wip/pdcurses) could have a chance of using these libraries. ;) @ text @d1 1 a1 1 # $NetBSD: buildlink3.mk,v 1.11 2007/01/30 21:00:31 joerg Exp $ d21 1 a21 1 .if ${X11_TYPE} == "modular" d24 1 a24 1 d29 6 a34 1 .endif a36 2 .include "../../mk/bsd.fast.prefs.mk" a40 4 LIBXAW?= -L${BUILDLINK_PREFIX.neXtaw}/lib \ ${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.neXtaw}/lib \ -lneXtaw @ 1.11 log @Modular Xorg support. @ text @d1 1 a1 1 # $NetBSD: buildlink3.mk,v 1.10 2006/12/12 21:52:38 joerg Exp $ d18 12 @ 1.10 log @Replace mk/bsd.prefs.mk includes with bsd.fast.prefs.mk includes. The redundant parsing of bsd.prefs.mk is mostly avoided now and parse time e.g. for x11/kdebase3 gets reduced by up to 10%. @ text @d1 1 a1 1 # $NetBSD: buildlink3.mk,v 1.9 2006/07/08 23:11:15 jlam Exp $ d21 4 a24 1 .include "../../mk/x11.buildlink3.mk" @ 1.9 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.8 2006/07/08 22:39:46 jlam Exp $ d20 1 a20 1 .include "../../mk/bsd.prefs.mk" @ 1.8 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.7 2006/04/12 10:27:42 rillig Exp $ d12 1 a12 1 BUILDLINK_ORDER+= neXtaw @ 1.7 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.6 2006/04/06 06:23:02 reed Exp $ d12 1 @ 1.6 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.5 2006/02/05 23:11:40 joerg Exp $ d26 1 a26 1 BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} @ 1.5 log @Recursive revision bump / recommended bump for gettext ABI change. @ text @d1 1 a1 1 # $NetBSD: buildlink3.mk,v 1.4 2005/06/01 18:03:29 jlam Exp $ d14 2 a15 2 BUILDLINK_DEPENDS.neXtaw+= neXtaw>=0.15.1 BUILDLINK_RECOMMENDED.neXtaw+= neXtaw>=0.15.1nb2 @ 1.4 log @Massive cleanup of buildlink3.mk and builtin.mk files in pkgsrc. Several changes are involved since they are all interrelated. These changes affect about 1000 files. The first major change is rewriting bsd.builtin.mk as well as all of the builtin.mk files to follow the new example in bsd.builtin.mk. The loop to include all of the builtin.mk files needed by the package is moved from bsd.builtin.mk and into bsd.buildlink3.mk. bsd.builtin.mk is now included by each of the individual builtin.mk files and provides some common logic for all of the builtin.mk files. Currently, this includes the computation for whether the native or pkgsrc version of the package is preferred. This causes USE_BUILTIN.* to be correctly set when one builtin.mk file includes another. The second major change is teach the builtin.mk files to consider files under ${LOCALBASE} to be from pkgsrc-controlled packages. Most of the builtin.mk files test for the presence of built-in software by checking for the existence of certain files, e.g. , and we now assume that if that file is under ${LOCALBASE}, then it must be from pkgsrc. This modification is a nod toward LOCALBASE=/usr. The exceptions to this new check are the X11 distribution packages, which are handled specially as noted below. The third major change is providing builtin.mk and version.mk files for each of the X11 distribution packages in pkgsrc. The builtin.mk file can detect whether the native X11 distribution is the same as the one provided by pkgsrc, and the version.mk file computes the version of the X11 distribution package, whether it's built-in or not. The fourth major change is that the buildlink3.mk files for X11 packages that install parts which are part of X11 distribution packages, e.g. Xpm, Xcursor, etc., now use imake to query the X11 distribution for whether the software is already provided by the X11 distribution. This is more accurate than grepping for a symbol name in the imake config files. Using imake required sprinkling various builtin-imake.mk helper files into pkgsrc directories. These files are used as input to imake since imake can't use stdin for that purpose. The fifth major change is in how packages note that they use X11. Instead of setting USE_X11, package Makefiles should now include x11.buildlink3.mk instead. This causes the X11 package buildlink3 and builtin logic to be executed at the correct place for buildlink3.mk and builtin.mk files that previously set USE_X11, and fixes packages that relied on buildlink3.mk files to implicitly note that X11 is needed. Package buildlink3.mk should also include x11.buildlink3.mk when linking against the package libraries requires also linking against the X11 libraries. Where it was obvious, redundant inclusions of x11.buildlink3.mk have been removed. @ text @d1 1 a1 1 # $NetBSD: buildlink3.mk,v 1.3 2004/10/03 00:18:36 tv Exp $ d15 1 a15 1 BUILDLINK_RECOMMENDED.neXtaw+= neXtaw>=0.15.1nb1 @ 1.3 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.2 2004/08/27 18:53:58 jlam Exp $ d20 1 @ 1.2 log @Convert to use {COMPILER,LINKER}_RPATH_FLAG. @ text @d1 1 a1 1 # $NetBSD: buildlink3.mk,v 1.1 2004/04/11 23:34:29 xtraeme Exp $ d15 1 @ 1.1 log @bl3ify @ text @d1 1 a1 1 # $NetBSD$ d20 2 a21 2 LIBXAW?= -L${BUILDLINK_PREFIX.neXtaw}/lib \ ${_COMPILER_LD_FLAG}${_OPSYS_RPATH_NAME}${BUILDLINK_PREFIX.neXtaw}/lib \ @