head 1.11; access; symbols pkgsrc-2023Q4:1.11.0.34 pkgsrc-2023Q4-base:1.11 pkgsrc-2023Q3:1.11.0.32 pkgsrc-2023Q3-base:1.11 pkgsrc-2023Q2:1.11.0.30 pkgsrc-2023Q2-base:1.11 pkgsrc-2023Q1:1.11.0.28 pkgsrc-2023Q1-base:1.11 pkgsrc-2022Q4:1.11.0.26 pkgsrc-2022Q4-base:1.11 pkgsrc-2022Q3:1.11.0.24 pkgsrc-2022Q3-base:1.11 pkgsrc-2022Q2:1.11.0.22 pkgsrc-2022Q2-base:1.11 pkgsrc-2022Q1:1.11.0.20 pkgsrc-2022Q1-base:1.11 pkgsrc-2021Q4:1.11.0.18 pkgsrc-2021Q4-base:1.11 pkgsrc-2021Q3:1.11.0.16 pkgsrc-2021Q3-base:1.11 pkgsrc-2021Q2:1.11.0.14 pkgsrc-2021Q2-base:1.11 pkgsrc-2021Q1:1.11.0.12 pkgsrc-2021Q1-base:1.11 pkgsrc-2020Q4:1.11.0.10 pkgsrc-2020Q4-base:1.11 pkgsrc-2020Q3:1.11.0.8 pkgsrc-2020Q3-base:1.11 pkgsrc-2020Q2:1.11.0.6 pkgsrc-2020Q2-base:1.11 pkgsrc-2020Q1:1.11.0.2 pkgsrc-2020Q1-base:1.11 pkgsrc-2019Q4:1.11.0.4 pkgsrc-2019Q4-base:1.11 pkgsrc-2019Q3:1.10.0.50 pkgsrc-2019Q3-base:1.10 pkgsrc-2019Q2:1.10.0.48 pkgsrc-2019Q2-base:1.10 pkgsrc-2019Q1:1.10.0.46 pkgsrc-2019Q1-base:1.10 pkgsrc-2018Q4:1.10.0.44 pkgsrc-2018Q4-base:1.10 pkgsrc-2018Q3:1.10.0.42 pkgsrc-2018Q3-base:1.10 pkgsrc-2018Q2:1.10.0.40 pkgsrc-2018Q2-base:1.10 pkgsrc-2018Q1:1.10.0.38 pkgsrc-2018Q1-base:1.10 pkgsrc-2017Q4:1.10.0.36 pkgsrc-2017Q4-base:1.10 pkgsrc-2017Q3:1.10.0.34 pkgsrc-2017Q3-base:1.10 pkgsrc-2017Q2:1.10.0.30 pkgsrc-2017Q2-base:1.10 pkgsrc-2017Q1:1.10.0.28 pkgsrc-2017Q1-base:1.10 pkgsrc-2016Q4:1.10.0.26 pkgsrc-2016Q4-base:1.10 pkgsrc-2016Q3:1.10.0.24 pkgsrc-2016Q3-base:1.10 pkgsrc-2016Q2:1.10.0.22 pkgsrc-2016Q2-base:1.10 pkgsrc-2016Q1:1.10.0.20 pkgsrc-2016Q1-base:1.10 pkgsrc-2015Q4:1.10.0.18 pkgsrc-2015Q4-base:1.10 pkgsrc-2015Q3:1.10.0.16 pkgsrc-2015Q3-base:1.10 pkgsrc-2015Q2:1.10.0.14 pkgsrc-2015Q2-base:1.10 pkgsrc-2015Q1:1.10.0.12 pkgsrc-2015Q1-base:1.10 pkgsrc-2014Q4:1.10.0.10 pkgsrc-2014Q4-base:1.10 pkgsrc-2014Q3:1.10.0.8 pkgsrc-2014Q3-base:1.10 pkgsrc-2014Q2:1.10.0.6 pkgsrc-2014Q2-base:1.10 pkgsrc-2014Q1:1.10.0.4 pkgsrc-2014Q1-base:1.10 pkgsrc-2013Q4:1.10.0.2 pkgsrc-2013Q4-base:1.10 pkgsrc-2013Q3:1.9.0.64 pkgsrc-2013Q3-base:1.9 pkgsrc-2013Q2:1.9.0.62 pkgsrc-2013Q2-base:1.9 pkgsrc-2013Q1:1.9.0.60 pkgsrc-2013Q1-base:1.9 pkgsrc-2012Q4:1.9.0.58 pkgsrc-2012Q4-base:1.9 pkgsrc-2012Q3:1.9.0.56 pkgsrc-2012Q3-base:1.9 pkgsrc-2012Q2:1.9.0.54 pkgsrc-2012Q2-base:1.9 pkgsrc-2012Q1:1.9.0.52 pkgsrc-2012Q1-base:1.9 pkgsrc-2011Q4:1.9.0.50 pkgsrc-2011Q4-base:1.9 pkgsrc-2011Q3:1.9.0.48 pkgsrc-2011Q3-base:1.9 pkgsrc-2011Q2:1.9.0.46 pkgsrc-2011Q2-base:1.9 pkgsrc-2011Q1:1.9.0.44 pkgsrc-2011Q1-base:1.9 pkgsrc-2010Q4:1.9.0.42 pkgsrc-2010Q4-base:1.9 pkgsrc-2010Q3:1.9.0.40 pkgsrc-2010Q3-base:1.9 pkgsrc-2010Q2:1.9.0.38 pkgsrc-2010Q2-base:1.9 pkgsrc-2010Q1:1.9.0.36 pkgsrc-2010Q1-base:1.9 pkgsrc-2009Q4:1.9.0.34 pkgsrc-2009Q4-base:1.9 pkgsrc-2009Q3:1.9.0.32 pkgsrc-2009Q3-base:1.9 pkgsrc-2009Q2:1.9.0.30 pkgsrc-2009Q2-base:1.9 pkgsrc-2009Q1:1.9.0.28 pkgsrc-2009Q1-base:1.9 pkgsrc-2008Q4:1.9.0.26 pkgsrc-2008Q4-base:1.9 pkgsrc-2008Q3:1.9.0.24 pkgsrc-2008Q3-base:1.9 cube-native-xorg:1.9.0.22 cube-native-xorg-base:1.9 pkgsrc-2008Q2:1.9.0.20 pkgsrc-2008Q2-base:1.9 cwrapper:1.9.0.18 pkgsrc-2008Q1:1.9.0.16 pkgsrc-2008Q1-base:1.9 pkgsrc-2007Q4:1.9.0.14 pkgsrc-2007Q4-base:1.9 pkgsrc-2007Q3:1.9.0.12 pkgsrc-2007Q3-base:1.9 pkgsrc-2007Q2:1.9.0.10 pkgsrc-2007Q2-base:1.9 pkgsrc-2007Q1:1.9.0.8 pkgsrc-2007Q1-base:1.9 pkgsrc-2006Q4:1.9.0.6 pkgsrc-2006Q4-base:1.9 pkgsrc-2006Q3:1.9.0.4 pkgsrc-2006Q3-base:1.9 pkgsrc-2006Q2:1.9.0.2 pkgsrc-2006Q2-base:1.9 pkgsrc-2006Q1:1.7.0.8 pkgsrc-2006Q1-base:1.7 pkgsrc-2005Q4:1.7.0.6 pkgsrc-2005Q4-base:1.7 pkgsrc-2005Q3:1.7.0.4 pkgsrc-2005Q3-base:1.7 pkgsrc-2005Q2:1.7.0.2 pkgsrc-2005Q2-base:1.7 pkgsrc-2005Q1:1.5.0.4 pkgsrc-2005Q1-base:1.5 pkgsrc-2004Q4:1.5.0.2 pkgsrc-2004Q4-base:1.5 pkgsrc-2004Q3:1.1.0.2 pkgsrc-2004Q3-base:1.1; locks; strict; comment @# @; 1.11 date 2019.11.03.10.39.10; author rillig; state Exp; branches; next 1.10; commitid REW2CfrA7HdqqoJB; 1.10 date 2013.11.23.11.29.35; author obache; state Exp; branches; next 1.9; commitid KZJHraWFBPbjuoex; 1.9 date 2006.04.06.06.21.48; author reed; state Exp; branches; next 1.8; 1.8 date 2006.03.30.18.06.17; author jlam; state Exp; branches; next 1.7; 1.7 date 2005.06.01.20.35.41; author jlam; state Exp; branches; next 1.6; 1.6 date 2005.06.01.18.02.43; author jlam; state Exp; branches; next 1.5; 1.5 date 2004.12.05.07.01.19; author jlam; state Exp; branches; next 1.4; 1.4 date 2004.12.05.06.59.21; author jlam; state Exp; branches; next 1.3; 1.3 date 2004.11.28.05.44.34; author jlam; state Exp; branches; next 1.2; 1.2 date 2004.11.26.23.16.35; author jlam; state Exp; branches; next 1.1; 1.1 date 2004.07.18.09.35.08; author schmonz; state Exp; branches; next ; desc @@ 1.11 log @devel: align variable assignments pkglint -Wall -F --only aligned --only indent -r No manual corrections. @ text @# $NetBSD: builtin.mk,v 1.10 2013/11/23 11:29:35 obache Exp $ BUILTIN_PKG:= dlcompat BUILTIN_FIND_LIBS:= dl BUILTIN_FIND_HEADERS_VAR:= H_DLFCN BUILTIN_FIND_HEADERS.H_DLFCN= dlfcn.h .include "../../mk/buildlink3/bsd.builtin.mk" ### ### Determine if there is a built-in implementation of the package and ### set IS_BUILTIN. appropriately ("yes" or "no"). ### .if !defined(IS_BUILTIN.dlcompat) IS_BUILTIN.dlcompat= no . if empty(H_DLFCN:M__nonexistent__) && empty(H_DLFCN:M${LOCALBASE}/*) && \ !empty(BUILTIN_LIB_FOUND.dl:M[yY][eE][sS]) IS_BUILTIN.dlcompat= yes . endif .endif MAKEVARS+= IS_BUILTIN.dlcompat ### ### If there is a built-in implementation, then set BUILTIN_PKG. to ### a package name to represent the built-in package. ### .if !defined(BUILTIN_PKG.dlcompat) && \ !empty(IS_BUILTIN.dlcompat:M[yY][eE][sS]) # XXX # XXX Consider any built-in dlcompat to be from version 20030629. # XXX BUILTIN_PKG.dlcompat= dlcompat-20030629 .endif MAKEVARS+= BUILTIN_PKG.dlcompat ### ### Determine whether we should use the built-in implementation if it ### exists, and set USE_BUILTIN. appropriate ("yes" or "no"). ### .if !defined(USE_BUILTIN.dlcompat) . if ${PREFER.dlcompat} == "pkgsrc" USE_BUILTIN.dlcompat= no . else USE_BUILTIN.dlcompat= ${IS_BUILTIN.dlcompat} . if defined(BUILTIN_PKG.dlcompat) && \ !empty(IS_BUILTIN.dlcompat:M[yY][eE][sS]) USE_BUILTIN.dlcompat= yes . for _dep_ in ${BUILDLINK_API_DEPENDS.dlcompat} . if !empty(USE_BUILTIN.dlcompat:M[yY][eE][sS]) USE_BUILTIN.dlcompat!= \ if ${PKG_ADMIN} pmatch ${_dep_:Q} ${BUILTIN_PKG.dlcompat:Q}; then \ ${ECHO} yes; \ else \ ${ECHO} no; \ fi . endif . endfor . endif . endif # PREFER.dlcompat .endif MAKEVARS+= USE_BUILTIN.dlcompat @ 1.10 log @Use find-headers instead of find-files to detect builtin header files. @ text @d1 1 a1 1 # $NetBSD: builtin.mk,v 1.9 2006/04/06 06:21:48 reed Exp $ d22 1 a22 1 MAKEVARS+= IS_BUILTIN.dlcompat d35 1 a35 1 MAKEVARS+= BUILTIN_PKG.dlcompat d62 1 a62 1 MAKEVARS+= USE_BUILTIN.dlcompat @ 1.9 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: builtin.mk,v 1.8 2006/03/30 18:06:17 jlam Exp $ d6 2 a7 2 BUILTIN_FIND_FILES_VAR:= H_DLFCN BUILTIN_FIND_FILES.H_DLFCN= /usr/include/dlfcn.h @ 1.8 log @Avoid extra stat() calls by not repeatedly checking whether a file exists on the disk -- we can just check whether a variable defined by find-files.mk is "__nonexistent__" or not. @ text @d1 1 a1 1 # $NetBSD: builtin.mk,v 1.7 2005/06/01 20:35:41 jlam Exp $ d49 1 a49 1 . for _dep_ in ${BUILDLINK_DEPENDS.dlcompat} @ 1.7 log @Typo. @ text @d1 1 a1 1 # $NetBSD: builtin.mk,v 1.6 2005/06/01 18:02:43 jlam Exp $ d17 1 a17 1 . if empty(H_DLFCN:M${LOCALBASE}/*) && exists(${H_DLFCN}) && \ @ 1.6 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: builtin.mk,v 1.5 2004/12/05 07:01:19 jlam Exp $ d52 1 a52 1 if ${PKG_ADMIN} pmatch ${_dep_:Q}' ${BUILTIN_PKG.dlcompat:Q}; then \ @ 1.5 log @Rename some variables to be more dlcompat-specific, and remove a redundant conditional. @ text @d1 1 a1 1 # $NetBSD: builtin.mk,v 1.4 2004/12/05 06:59:21 jlam Exp $ d3 5 a7 14 .for _lib_ in dl . if !defined(_BLNK_LIB_FOUND.${_lib_}) _BLNK_LIB_FOUND.${_lib_}!= \ if ${TEST} "`${ECHO} /usr/lib/lib${_lib_}.*`" != "/usr/lib/lib${_lib_}.*"; then \ ${ECHO} "yes"; \ elif ${TEST} "`${ECHO} /lib/lib${_lib_}.*`" != "/lib/lib${_lib_}.*"; then \ ${ECHO} "yes"; \ else \ ${ECHO} "no"; \ fi BUILDLINK_VARS+= _BLNK_LIB_FOUND.${_lib_} . endif .endfor .undef _lib_ d9 1 a9 1 _DLFCN_H= /usr/include/dlfcn.h d11 4 d17 2 a18 1 . if !empty(_BLNK_LIB_FOUND.dl:M[yY][eE][sS]) && exists(${_DLFCN_H}) a19 3 _DLCOMPAT_VERSION= 20030629 BUILTIN_PKG.dlcompat= dlcompat-${_DLCOMPAT_VERSION} BUILDLINK_VARS+= BUILTIN_PKG.dlcompat d21 2 a22 2 BUILDLINK_VARS+= IS_BUILTIN.dlcompat .endif # IS_BUILTIN.dlcompat d24 17 d42 6 a47 4 USE_BUILTIN.dlcompat?= ${IS_BUILTIN.dlcompat} PREFER.dlcompat?= pkgsrc . if defined(BUILTIN_PKG.dlcompat) d49 2 a50 2 . for _depend_ in ${BUILDLINK_DEPENDS.dlcompat} . if !empty(USE_BUILTIN.dlcompat:M[yY][eE][sS]) d52 2 a53 2 if ${PKG_ADMIN} pmatch '${_depend_}' ${BUILTIN_PKG.dlcompat}; then \ ${ECHO} "yes"; \ d55 1 a55 1 ${ECHO} "no"; \ d57 6 a62 13 . endif . endfor . endif . if ${PREFER.dlcompat} == "native" USE_BUILTIN.dlcompat= yes . endif . if !empty(IS_BUILTIN.dlcompat:M[nN][oO]) || \ (${PREFER.dlcompat} == "pkgsrc") USE_BUILTIN.dlcompat= no . endif .endif # USE_BUILTIN.dlcompat @ 1.4 log @dlcompat is considered built-in only if both /usr/lib/libdl.* and /usr/include/dlfcn.h exist. Also, correct the setting of USE_BUILTIN.dlcompat in the loop. @ text @d1 1 a1 1 # $NetBSD: builtin.mk,v 1.3 2004/11/28 05:44:34 jlam Exp $ d18 1 a18 1 _DL_H= /usr/include/dlfcn.h d22 1 a22 1 . if !empty(_BLNK_LIB_FOUND.dl:M[yY][eE][sS]) && exists(${_DL_H}) d24 2 a25 3 . if !empty(IS_BUILTIN.dlcompat:M[yY][eE][sS]) _DL_VERSION= 20030629 BUILTIN_PKG.dlcompat= dlcompat-${_DL_VERSION} a26 1 . endif @ 1.3 log @Reverse the tests so that we actually check for the existence and not the non-existence of the library -- this more accurately reflects what we want to say. @ text @d1 1 a1 1 # $NetBSD: builtin.mk,v 1.2 2004/11/26 23:16:35 jlam Exp $ d22 1 a22 3 . if !empty(_BLNK_LIB_FOUND.dl:M[yY][eE][sS]) IS_BUILTIN.dlcompat= yes . elif exists(${_DL_H}) d40 1 a40 1 . if !empty(IS_BUILTIN.dlcompat:M[yY][eE][sS]) @ 1.2 log @Standardize how we search for libraries in builtin.mk files. We define _BLNK_LIB_FOUND. to "yes" or "no" depending on whether -l is found in the base system. @ text @d1 1 a1 1 # $NetBSD: builtin.mk,v 1.1 2004/07/18 09:35:08 schmonz Exp $ d6 5 a10 1 if ${TEST} "`${ECHO} /usr/lib/lib${_lib_}.*`" = "/usr/lib/lib${_lib_}.*"; then \ a11 4 elif ${TEST} "`${ECHO} /lib/lib${_lib_}.*`" = "/lib/lib${_lib_}.*"; then \ ${ECHO} "no"; \ else \ ${ECHO} "yes"; \ @ 1.1 log @dlcompat was added to OS X "Panther". Add a builtin.mk to detect its presence. Bump BUILDLINK_DEPENDS to the latest version. Evaluate the contents of buildlink3.mk only if we're on Darwin, which lets us simply .include "../../devel/dlcompat/buildlink3.mk" anywhere we might need it without affecting other platforms. @ text @d1 1 a1 1 # $NetBSD: builtin.mk,v 1.3 2004/03/29 05:43:30 jlam Exp $ d3 6 a8 3 .if !defined(_BLNK_LIBDL_FOUND) _BLNK_LIBDL_FOUND!= \ if [ "`${ECHO} /usr/lib/libdl.*`" = "/usr/lib/libdl.*" ]; then \ d13 4 a16 2 BUILDLINK_VARS+= _BLNK_LIBDL_FOUND .endif d22 1 a22 1 . if !empty(_BLNK_LIBDL_FOUND:M[yY][eE][sS]) @