head 1.24; access; symbols pkgsrc-2023Q4:1.24.0.120 pkgsrc-2023Q4-base:1.24 pkgsrc-2023Q3:1.24.0.118 pkgsrc-2023Q3-base:1.24 pkgsrc-2023Q2:1.24.0.116 pkgsrc-2023Q2-base:1.24 pkgsrc-2023Q1:1.24.0.114 pkgsrc-2023Q1-base:1.24 pkgsrc-2022Q4:1.24.0.112 pkgsrc-2022Q4-base:1.24 pkgsrc-2022Q3:1.24.0.110 pkgsrc-2022Q3-base:1.24 pkgsrc-2022Q2:1.24.0.108 pkgsrc-2022Q2-base:1.24 pkgsrc-2022Q1:1.24.0.106 pkgsrc-2022Q1-base:1.24 pkgsrc-2021Q4:1.24.0.104 pkgsrc-2021Q4-base:1.24 pkgsrc-2021Q3:1.24.0.102 pkgsrc-2021Q3-base:1.24 pkgsrc-2021Q2:1.24.0.100 pkgsrc-2021Q2-base:1.24 pkgsrc-2021Q1:1.24.0.98 pkgsrc-2021Q1-base:1.24 pkgsrc-2020Q4:1.24.0.96 pkgsrc-2020Q4-base:1.24 pkgsrc-2020Q3:1.24.0.94 pkgsrc-2020Q3-base:1.24 pkgsrc-2020Q2:1.24.0.90 pkgsrc-2020Q2-base:1.24 pkgsrc-2020Q1:1.24.0.70 pkgsrc-2020Q1-base:1.24 pkgsrc-2019Q4:1.24.0.92 pkgsrc-2019Q4-base:1.24 pkgsrc-2019Q3:1.24.0.88 pkgsrc-2019Q3-base:1.24 pkgsrc-2019Q2:1.24.0.86 pkgsrc-2019Q2-base:1.24 pkgsrc-2019Q1:1.24.0.84 pkgsrc-2019Q1-base:1.24 pkgsrc-2018Q4:1.24.0.82 pkgsrc-2018Q4-base:1.24 pkgsrc-2018Q3:1.24.0.80 pkgsrc-2018Q3-base:1.24 pkgsrc-2018Q2:1.24.0.78 pkgsrc-2018Q2-base:1.24 pkgsrc-2018Q1:1.24.0.76 pkgsrc-2018Q1-base:1.24 pkgsrc-2017Q4:1.24.0.74 pkgsrc-2017Q4-base:1.24 pkgsrc-2017Q3:1.24.0.72 pkgsrc-2017Q3-base:1.24 pkgsrc-2017Q2:1.24.0.68 pkgsrc-2017Q2-base:1.24 pkgsrc-2017Q1:1.24.0.66 pkgsrc-2017Q1-base:1.24 pkgsrc-2016Q4:1.24.0.64 pkgsrc-2016Q4-base:1.24 pkgsrc-2016Q3:1.24.0.62 pkgsrc-2016Q3-base:1.24 pkgsrc-2016Q2:1.24.0.60 pkgsrc-2016Q2-base:1.24 pkgsrc-2016Q1:1.24.0.58 pkgsrc-2016Q1-base:1.24 pkgsrc-2015Q4:1.24.0.56 pkgsrc-2015Q4-base:1.24 pkgsrc-2015Q3:1.24.0.54 pkgsrc-2015Q3-base:1.24 pkgsrc-2015Q2:1.24.0.52 pkgsrc-2015Q2-base:1.24 pkgsrc-2015Q1:1.24.0.50 pkgsrc-2015Q1-base:1.24 pkgsrc-2014Q4:1.24.0.48 pkgsrc-2014Q4-base:1.24 pkgsrc-2014Q3:1.24.0.46 pkgsrc-2014Q3-base:1.24 pkgsrc-2014Q2:1.24.0.44 pkgsrc-2014Q2-base:1.24 pkgsrc-2014Q1:1.24.0.42 pkgsrc-2014Q1-base:1.24 pkgsrc-2013Q4:1.24.0.40 pkgsrc-2013Q4-base:1.24 pkgsrc-2013Q3:1.24.0.38 pkgsrc-2013Q3-base:1.24 pkgsrc-2013Q2:1.24.0.36 pkgsrc-2013Q2-base:1.24 pkgsrc-2013Q1:1.24.0.34 pkgsrc-2013Q1-base:1.24 pkgsrc-2012Q4:1.24.0.32 pkgsrc-2012Q4-base:1.24 pkgsrc-2012Q3:1.24.0.30 pkgsrc-2012Q3-base:1.24 pkgsrc-2012Q2:1.24.0.28 pkgsrc-2012Q2-base:1.24 pkgsrc-2012Q1:1.24.0.26 pkgsrc-2012Q1-base:1.24 pkgsrc-2011Q4:1.24.0.24 pkgsrc-2011Q4-base:1.24 pkgsrc-2011Q3:1.24.0.22 pkgsrc-2011Q3-base:1.24 pkgsrc-2011Q2:1.24.0.20 pkgsrc-2011Q2-base:1.24 pkgsrc-2011Q1:1.24.0.18 pkgsrc-2011Q1-base:1.24 pkgsrc-2010Q4:1.24.0.16 pkgsrc-2010Q4-base:1.24 pkgsrc-2010Q3:1.24.0.14 pkgsrc-2010Q3-base:1.24 pkgsrc-2010Q2:1.24.0.12 pkgsrc-2010Q2-base:1.24 pkgsrc-2010Q1:1.24.0.10 pkgsrc-2010Q1-base:1.24 pkgsrc-2009Q4:1.24.0.8 pkgsrc-2009Q4-base:1.24 pkgsrc-2009Q3:1.24.0.6 pkgsrc-2009Q3-base:1.24 pkgsrc-2009Q2:1.24.0.4 pkgsrc-2009Q2-base:1.24 pkgsrc-2009Q1:1.24.0.2 pkgsrc-2009Q1-base:1.24 pkgsrc-2008Q4:1.23.0.22 pkgsrc-2008Q4-base:1.23 pkgsrc-2008Q3:1.23.0.20 pkgsrc-2008Q3-base:1.23 cube-native-xorg:1.23.0.18 cube-native-xorg-base:1.23 pkgsrc-2008Q2:1.23.0.16 pkgsrc-2008Q2-base:1.23 cwrapper:1.23.0.14 pkgsrc-2008Q1:1.23.0.12 pkgsrc-2008Q1-base:1.23 pkgsrc-2007Q4:1.23.0.10 pkgsrc-2007Q4-base:1.23 pkgsrc-2007Q3:1.23.0.8 pkgsrc-2007Q3-base:1.23 pkgsrc-2007Q2:1.23.0.6 pkgsrc-2007Q2-base:1.23 pkgsrc-2007Q1:1.23.0.4 pkgsrc-2007Q1-base:1.23 pkgsrc-2006Q4:1.23.0.2 pkgsrc-2006Q4-base:1.23 pkgsrc-2006Q3:1.21.0.2 pkgsrc-2006Q3-base:1.21 pkgsrc-2006Q2:1.17.0.2 pkgsrc-2006Q2-base:1.17 pkgsrc-2006Q1:1.16.0.2 pkgsrc-2006Q1-base:1.16 pkgsrc-2005Q4:1.15.0.6 pkgsrc-2005Q4-base:1.15 pkgsrc-2005Q3:1.15.0.4 pkgsrc-2005Q3-base:1.15 pkgsrc-2005Q2:1.15.0.2 pkgsrc-2005Q2-base:1.15 pkgsrc-2005Q1:1.14.0.4 pkgsrc-2005Q1-base:1.14 pkgsrc-2004Q4:1.14.0.2 pkgsrc-2004Q4-base:1.14 pkgsrc-2004Q3:1.13.0.6 pkgsrc-2004Q3-base:1.13 pkgsrc-2004Q2:1.13.0.4 pkgsrc-2004Q2-base:1.13 pkgsrc-2004Q1:1.13.0.2 pkgsrc-2004Q1-base:1.13 pkgsrc-base:1.1.1.1 TNF:1.1.1; locks; strict; comment @# @; 1.24 date 2009.03.20.19.25.52; author joerg; state Exp; branches; next 1.23; 1.23 date 2006.12.15.20.33.05; author joerg; state Exp; branches; next 1.22; 1.22 date 2006.12.12.21.52.38; author joerg; state Exp; branches; next 1.21; 1.21 date 2006.07.13.00.57.32; author joerg; state Exp; branches; next 1.20; 1.20 date 2006.07.11.14.42.04; author joerg; state Exp; branches; next 1.19; 1.19 date 2006.07.08.23.11.16; author jlam; state Exp; branches; next 1.18; 1.18 date 2006.07.08.22.39.48; author jlam; state Exp; branches; next 1.17; 1.17 date 2006.04.06.06.23.04; author reed; state Exp; branches; next 1.16; 1.16 date 2006.02.05.23.11.45; author joerg; state Exp; branches; next 1.15; 1.15 date 2005.06.01.18.03.32; author jlam; state Exp; branches; next 1.14; 1.14 date 2004.10.03.00.18.39; author tv; state Exp; branches; next 1.13; 1.13 date 2004.03.18.09.12.17; author jlam; state Exp; branches; next 1.12; 1.12 date 2004.03.10.17.57.15; author jlam; state Exp; branches; next 1.11; 1.11 date 2004.02.19.19.12.26; author jlam; state Exp; branches; next 1.10; 1.10 date 2004.02.19.18.51.01; author jlam; state Exp; branches; next 1.9; 1.9 date 2004.02.18.16.53.52; author jlam; state Exp; branches; next 1.8; 1.8 date 2004.02.18.16.35.27; author jlam; state Exp; branches; next 1.7; 1.7 date 2004.02.17.16.27.54; author jmmv; state Exp; branches; next 1.6; 1.6 date 2004.02.17.09.13.33; author jlam; state Exp; branches; next 1.5; 1.5 date 2004.02.16.23.16.02; author jlam; state Exp; branches; next 1.4; 1.4 date 2004.01.24.03.26.48; author jlam; state Exp; branches; next 1.3; 1.3 date 2004.01.05.11.05.47; author jlam; state Exp; branches; next 1.2; 1.2 date 2004.01.04.23.34.07; author jlam; state Exp; branches; next 1.1; 1.1 date 2003.12.16.08.51.42; author recht; state Exp; branches 1.1.1.1; next ; 1.1.1.1 date 2003.12.16.08.51.42; author recht; state Exp; branches; next ; desc @@ 1.24 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 @# $NetBSD: buildlink3.mk,v 1.23 2006/12/15 20:33:05 joerg Exp $ .include "../../mk/bsd.fast.prefs.mk" BUILDLINK_TREE+= xcursor .if !defined(XCURSOR_BUILDLINK3_MK) XCURSOR_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.xcursor+= xcursor>=1.0 BUILDLINK_ABI_DEPENDS.xcursor+= xcursor>=1.1.2nb1 BUILDLINK_PKGSRCDIR.xcursor?= ../../x11/xcursor .include "../../x11/libXfixes/buildlink3.mk" .include "../../x11/libXrender/buildlink3.mk" .endif # XCURSOR_BUILDLINK3_MK BUILDLINK_TREE+= -xcursor @ 1.23 log @Mechanically replace all includes of buildlink3.mk of the following packages with the modular Xorg equivalent. Those are falling back to the old location by default, so this commmit doesn't change dependencies. graphics/xpm ==> x11/libXpm fonts/Xft2 ==> x11/libXft x11/Xfixes ==> x11/libXfixes x11/xcursor ==> x11/libXcursor x11/Xrender ==> x11/libXrender x11/Xrandr ==> libXrandr @ text @d1 1 a1 1 # $NetBSD: buildlink3.mk,v 1.22 2006/12/12 21:52:38 joerg Exp $ d5 1 a5 2 BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ XCURSOR_BUILDLINK3_MK:= ${XCURSOR_BUILDLINK3_MK}+ d7 2 a8 7 .if !empty(BUILDLINK_DEPTH:M+) BUILDLINK_DEPENDS+= xcursor .endif BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nxcursor} BUILDLINK_PACKAGES+= xcursor BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}xcursor a9 1 .if !empty(XCURSOR_BUILDLINK3_MK:M+) a12 1 .endif # XCURSOR_BUILDLINK3_MK d16 1 d18 1 a18 1 BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} @ 1.22 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.21 2006/07/13 00:57:32 joerg Exp $ d22 2 a23 4 # Xfixes/buildlink3.mk is included by xcursor/builtin.mk #.include "../../x11/Xfixes/buildlink3.mk" .include "../../x11/Xrender/buildlink3.mk" @ 1.21 log @Backout last revision, it is not included in xorg-libs *sigh*. @ text @d1 1 a1 1 # $NetBSD: buildlink3.mk,v 1.20 2006/07/11 14:42:04 joerg Exp $ d3 1 a3 1 .include "../../mk/bsd.prefs.mk" @ 1.20 log @Don't use the builtin framework for the various Xorg components when X11_TYPE=xorg. Let them include x11.buildlink3.mk directly. Remove the manual USE_BUILTIN declarations from xorg-libs/b3.mk. This fixes a symmetry in the dependency list depending on whether xorg-libs is installed already or not. Discussed with jlam@@ @ text @d1 1 a1 1 # $NetBSD: buildlink3.mk,v 1.19 2006/07/08 23:11:16 jlam Exp $ a4 5 .if ${X11_TYPE} == "xorg" .include "../../mk/x11.buildlink3.mk" .else a27 2 .endif @ 1.19 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 8 a8 1 # $NetBSD: buildlink3.mk,v 1.18 2006/07/08 22:39:48 jlam Exp $ d33 2 @ 1.18 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.17 2006/04/06 06:23:04 reed Exp $ d12 1 a12 1 BUILDLINK_ORDER+= xcursor @ 1.17 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.16 2006/02/05 23:11:45 joerg Exp $ d12 1 @ 1.16 log @Recursive revision bump / recommended bump for gettext ABI change. @ text @d1 1 a1 1 # $NetBSD: buildlink3.mk,v 1.15 2005/06/01 18:03:32 jlam Exp $ d14 2 a15 2 BUILDLINK_DEPENDS.xcursor+= xcursor>=1.0 BUILDLINK_RECOMMENDED.xcursor+= xcursor>=1.1.2nb1 @ 1.15 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.14 2004/10/03 00:18:39 tv Exp $ d15 1 a15 1 BUILDLINK_RECOMMENDED.xcursor+= xcursor>=1.1.1nb2 @ 1.14 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.13 2004/03/18 09:12:17 jlam Exp $ a18 2 USE_X11= yes @ 1.13 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.12 2004/03/10 17:57:15 jlam Exp $ d15 1 @ 1.12 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.11 2004/02/19 19:12:26 jlam Exp $ d16 1 a24 2 .endif # XCURSOR_BUILDLINK3_MK @ 1.11 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.10 2004/02/19 18:51:01 jlam Exp $ d6 6 a11 1 .include "../../mk/bsd.prefs.mk" a13 1 BUILDLINK_PACKAGES+= xcursor a15 1 .endif # XCURSOR_BUILDLINK3_MK d17 1 a17 1 BUILDLINK_CHECK_BUILTIN.xcursor?= NO d19 2 a20 1 _X11_XCURSOR_XCURSOR_H= ${X11BASE}/include/X11/Xcursor/Xcursor.h d22 1 a22 42 .if !defined(BUILDLINK_IS_BUILTIN.xcursor) BUILDLINK_IS_BUILTIN.xcursor= NO . if exists(${_X11_XCURSOR_XCURSOR_H}) BUILDLINK_IS_BUILTIN.xcursor= YES . if !empty(BUILDLINK_CHECK_BUILTIN.xcursor:M[nN][oO]) # # Create an appropriate package name for the built-in Xcursor 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. # _XCURSOR_MAJOR!= \ ${AWK} '/\#define[ ]*XCURSOR_MAJOR/ { print $$3 }' \ ${_X11_XCURSOR_XCURSOR_H} _XCURSOR_MINOR!= \ ${AWK} '/\#define[ ]*XCURSOR_MINOR/ { print "."$$3 }' \ ${_X11_XCURSOR_XCURSOR_H} _XCURSOR_REVISION!= \ ${AWK} '/\#define[ ]*XCURSOR_MINOR/ { print "."$$3 }' \ ${_X11_XCURSOR_XCURSOR_H} _XCURSOR_VERSION= ${_XCURSOR_MAJOR}${_XCURSOR_MINOR}${_XCURSOR_REVISION} _XCURSOR_PKG= xcursor-${_XCURSOR_VERSION} BUILDLINK_IS_BUILTIN.xcursor?= YES . for _depend_ in ${BUILDLINK_DEPENDS.xcursor} . if !empty(BUILDLINK_IS_BUILTIN.xcursor:M[yY][eE][sS]) BUILDLINK_IS_BUILTIN.xcursor!= \ if ${PKG_ADMIN} pmatch '${_depend_}' ${_XCURSOR_PKG}; then \ ${ECHO} "YES"; \ else \ ${ECHO} "NO"; \ fi . endif . endfor . endif . endif MAKEFLAGS+= BUILDLINK_IS_BUILTIN.xcursor=${BUILDLINK_IS_BUILTIN.xcursor} .endif .if !empty(BUILDLINK_CHECK_BUILTIN.xcursor:M[yY][eE][sS]) BUILDLINK_USE_BUILTIN.xcursor= YES .endif a23 47 .if !defined(BUILDLINK_USE_BUILTIN.xcursor) . if !empty(BUILDLINK_IS_BUILTIN.xcursor:M[yY][eE][sS]) BUILDLINK_USE_BUILTIN.xcursor= YES . else BUILDLINK_USE_BUILTIN.xcursor= NO . endif . if !empty(PREFER_NATIVE:M[yY][eE][sS]) && \ !empty(BUILDLINK_IS_BUILTIN.xcursor:M[yY][eE][sS]) BUILDLINK_USE_BUILTIN.xcursor= YES . endif . if !empty(PREFER_PKGSRC:M[yY][eE][sS]) BUILDLINK_USE_BUILTIN.xcursor= NO . endif . if !empty(PREFER_NATIVE:Mxcursor) && \ !empty(BUILDLINK_IS_BUILTIN.xcursor:M[yY][eE][sS]) BUILDLINK_USE_BUILTIN.xcursor= YES . endif . if !empty(PREFER_PKGSRC:Mxcursor) BUILDLINK_USE_BUILTIN.xcursor= NO . endif .endif .if !empty(BUILDLINK_USE_BUILTIN.xcursor:M[nN][oO]) BUILDLINK_DEPENDS.xcursor+= xcursor>=1.1.1 BUILDLINK_DEPENDS.Xrender+= Xrender>=0.8 . if !empty(BUILDLINK_DEPTH:M+) BUILDLINK_DEPENDS+= xcursor . endif .endif .if !empty(BUILDLINK_USE_BUILTIN.xcursor:M[yY][eE][sS]) BUILDLINK_USE_BUILTIN.Xrender= yes .endif .if !empty(XCURSOR_BUILDLINK3_MK:M+) . if !empty(BUILDLINK_USE_BUILTIN.xcursor:M[yY][eE][sS]) BUILDLINK_PREFIX.xcursor= ${X11BASE} BUILDLINK_FILES.xcursor+= lib/pkgconfig/xcursor.pc . endif USE_X11= yes . if !empty(BUILDLINK_CHECK_BUILTIN.xcursor:M[nN][oO]) . if !empty(BUILDLINK_USE_BUILTIN.xcursor:M[nN][oO]) . include "../../x11/Xfixes/buildlink3.mk" . endif . include "../../x11/Xrender/buildlink3.mk" . endif @ 1.10 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.9 2004/02/18 16:53:52 jlam Exp $ d85 2 a96 1 BUILDLINK_DEPENDS.xcursor+= xcursor>=1.1.1 d101 1 a101 4 USE_X11= yes BUILDLINK_DEPENDS.Xrender+= Xrender>=0.8 @ 1.9 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.8 2004/02/18 16:35:27 jlam Exp $ d90 4 a98 1 BUILDLINK_USE_BUILTIN.Xrender= yes @ 1.8 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.7 2004/02/17 16:27:54 jmmv Exp $ d95 4 a98 2 . else . if !empty(BUILDLINK_CHECK_BUILTIN.xcursor:M[nN][oO]) d100 3 a103 1 . include "../../x11/Xrender/buildlink3.mk" d105 1 a106 1 USE_X11= yes @ 1.7 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.6 2004/02/17 09:13:33 jlam Exp $ d57 1 a57 1 .if !empty(BUILDLINK_IS_BUILTIN.xcursor:M[yY][eE][sS]) a58 2 .else BUILDLINK_USE_BUILTIN.xcursor= NO d61 2 a62 2 .if !empty(PREFER_NATIVE:M[yY][eE][sS]) && \ !empty(BUILDLINK_IS_BUILTIN.xcursor:M[yY][eE][sS]) d64 1 a64 2 .endif .if !empty(PREFER_PKGSRC:M[yY][eE][sS]) d66 4 a69 3 .endif .if !empty(PREFER_NATIVE:Mxcursor) && \ !empty(BUILDLINK_IS_BUILTIN.xcursor:M[yY][eE][sS]) d71 2 a72 2 .endif .if !empty(PREFER_PKGSRC:Mxcursor) d74 3 a76 3 .endif .if !empty(BUILDLINK_CHECK_BUILTIN.xcursor:M[yY][eE][sS]) d78 4 @ 1.6 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.5 2004/02/16 23:16:02 jlam Exp $ d92 1 @ 1.5 log @Check the version of the XFree86-provided Xcursor library. @ text @d1 1 a1 1 # $NetBSD: buildlink3.mk,v 1.1 2004/02/16 21:50:26 jlam Exp $ d93 1 d95 3 a97 2 . include "../../x11/Xfixes/buildlink3.mk" . include "../../x11/Xrender/buildlink3.mk" @ 1.4 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.3 2004/01/05 11:05:47 jlam Exp $ d6 78 a83 1 .if !empty(BUILDLINK_DEPTH:M+) d85 1 a87 2 BUILDLINK_IS_BUILTIN.xcursor?= no d90 8 a97 2 BUILDLINK_PKGSRCDIR.xcursor?= ../../x11/xcursor BUILDLINK_PACKAGES+= xcursor @ 1.3 log @Use S/+$// instead of C/\+$// to save a backslash. Very highly recommended by seb :) @ text @d1 1 a1 1 # $NetBSD: buildlink3.mk,v 1.2 2004/01/04 23:34:07 jlam Exp $ d13 1 a13 1 BUILDLINK_DEPENDS.xcursor?= xcursor>=1.1.1 @ 1.2 log @Re-arrange to match example buildlink3.mk file in bsd.buildlink3.mk. @ text @d1 1 a1 1 # $NetBSD: buildlink3.mk,v 1.1.1.1 2003/12/16 08:51:42 recht Exp $ d18 1 a18 1 BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:C/\+$//} @ 1.1 log @Initial revision @ text @d1 1 a1 1 # $NetBSD: buildlink3.mk,v 1.1.1.1 2003/12/04 14:40:40 recht Exp $ d6 5 a10 2 .if !empty(XCURSOR_BUILDLINK3_MK:M\+) . include "../../mk/bsd.prefs.mk" d12 1 a17 6 BUILDLINK_IS_BUILTIN.xcursor= NO .if !empty(BUILDLINK_DEPTH:M\+) BUILDLINK_DEPENDS+= xcursor .endif @ 1.1.1.1 log @initial import of xcursor 1.1.1 based upon the pkgsrc-wip pkg by xtraeme@@ This package, libXcursor, provides the client-side cursor loading library for X. This cursor management library is a simple library designed to help locate and load cursors (from files or memory). This is part of the X Libraries and Protocol Headers Project hosted at freedesktop.org. @ text @@