head 1.7; access; symbols pkgsrc-2023Q4:1.7.0.34 pkgsrc-2023Q4-base:1.7 pkgsrc-2023Q3:1.7.0.32 pkgsrc-2023Q3-base:1.7 pkgsrc-2023Q2:1.7.0.30 pkgsrc-2023Q2-base:1.7 pkgsrc-2023Q1:1.7.0.28 pkgsrc-2023Q1-base:1.7 pkgsrc-2022Q4:1.7.0.26 pkgsrc-2022Q4-base:1.7 pkgsrc-2022Q3:1.7.0.24 pkgsrc-2022Q3-base:1.7 pkgsrc-2022Q2:1.7.0.22 pkgsrc-2022Q2-base:1.7 pkgsrc-2022Q1:1.7.0.20 pkgsrc-2022Q1-base:1.7 pkgsrc-2021Q4:1.7.0.18 pkgsrc-2021Q4-base:1.7 pkgsrc-2021Q3:1.7.0.16 pkgsrc-2021Q3-base:1.7 pkgsrc-2021Q2:1.7.0.14 pkgsrc-2021Q2-base:1.7 pkgsrc-2021Q1:1.7.0.12 pkgsrc-2021Q1-base:1.7 pkgsrc-2020Q4:1.7.0.10 pkgsrc-2020Q4-base:1.7 pkgsrc-2020Q3:1.7.0.8 pkgsrc-2020Q3-base:1.7 pkgsrc-2020Q2:1.7.0.6 pkgsrc-2020Q2-base:1.7 pkgsrc-2020Q1:1.7.0.2 pkgsrc-2020Q1-base:1.7 pkgsrc-2019Q4:1.7.0.4 pkgsrc-2019Q4-base:1.7 pkgsrc-2019Q3:1.6.0.46 pkgsrc-2019Q3-base:1.6 pkgsrc-2019Q2:1.6.0.44 pkgsrc-2019Q2-base:1.6 pkgsrc-2019Q1:1.6.0.42 pkgsrc-2019Q1-base:1.6 pkgsrc-2018Q4:1.6.0.40 pkgsrc-2018Q4-base:1.6 pkgsrc-2018Q3:1.6.0.38 pkgsrc-2018Q3-base:1.6 pkgsrc-2018Q2:1.6.0.36 pkgsrc-2018Q2-base:1.6 pkgsrc-2018Q1:1.6.0.34 pkgsrc-2018Q1-base:1.6 pkgsrc-2017Q4:1.6.0.32 pkgsrc-2017Q4-base:1.6 pkgsrc-2017Q3:1.6.0.30 pkgsrc-2017Q3-base:1.6 pkgsrc-2017Q2:1.6.0.26 pkgsrc-2017Q2-base:1.6 pkgsrc-2017Q1:1.6.0.24 pkgsrc-2017Q1-base:1.6 pkgsrc-2016Q4:1.6.0.22 pkgsrc-2016Q4-base:1.6 pkgsrc-2016Q3:1.6.0.20 pkgsrc-2016Q3-base:1.6 pkgsrc-2016Q2:1.6.0.18 pkgsrc-2016Q2-base:1.6 pkgsrc-2016Q1:1.6.0.16 pkgsrc-2016Q1-base:1.6 pkgsrc-2015Q4:1.6.0.14 pkgsrc-2015Q4-base:1.6 pkgsrc-2015Q3:1.6.0.12 pkgsrc-2015Q3-base:1.6 pkgsrc-2015Q2:1.6.0.10 pkgsrc-2015Q2-base:1.6 pkgsrc-2015Q1:1.6.0.8 pkgsrc-2015Q1-base:1.6 pkgsrc-2014Q4:1.6.0.6 pkgsrc-2014Q4-base:1.6 pkgsrc-2014Q3:1.6.0.4 pkgsrc-2014Q3-base:1.6 pkgsrc-2014Q2:1.6.0.2 pkgsrc-2014Q2-base:1.6 pkgsrc-2014Q1:1.5.0.2 pkgsrc-2014Q1-base:1.5 pkgsrc-2013Q4:1.4.0.42 pkgsrc-2013Q4-base:1.4 pkgsrc-2013Q3:1.4.0.40 pkgsrc-2013Q3-base:1.4 pkgsrc-2013Q2:1.4.0.38 pkgsrc-2013Q2-base:1.4 pkgsrc-2013Q1:1.4.0.36 pkgsrc-2013Q1-base:1.4 pkgsrc-2012Q4:1.4.0.34 pkgsrc-2012Q4-base:1.4 pkgsrc-2012Q3:1.4.0.32 pkgsrc-2012Q3-base:1.4 pkgsrc-2012Q2:1.4.0.30 pkgsrc-2012Q2-base:1.4 pkgsrc-2012Q1:1.4.0.28 pkgsrc-2012Q1-base:1.4 pkgsrc-2011Q4:1.4.0.26 pkgsrc-2011Q4-base:1.4 pkgsrc-2011Q3:1.4.0.24 pkgsrc-2011Q3-base:1.4 pkgsrc-2011Q2:1.4.0.22 pkgsrc-2011Q2-base:1.4 pkgsrc-2011Q1:1.4.0.20 pkgsrc-2011Q1-base:1.4 pkgsrc-2010Q4:1.4.0.18 pkgsrc-2010Q4-base:1.4 pkgsrc-2010Q3:1.4.0.16 pkgsrc-2010Q3-base:1.4 pkgsrc-2010Q2:1.4.0.14 pkgsrc-2010Q2-base:1.4 pkgsrc-2010Q1:1.4.0.12 pkgsrc-2010Q1-base:1.4 pkgsrc-2009Q4:1.4.0.10 pkgsrc-2009Q4-base:1.4 pkgsrc-2009Q3:1.4.0.8 pkgsrc-2009Q3-base:1.4 pkgsrc-2009Q2:1.4.0.6 pkgsrc-2009Q2-base:1.4 pkgsrc-2009Q1:1.4.0.4 pkgsrc-2009Q1-base:1.4 pkgsrc-2008Q4:1.4.0.2 pkgsrc-2008Q4-base:1.4 pkgsrc-2008Q3:1.3.0.10 pkgsrc-2008Q3-base:1.3 cube-native-xorg:1.3.0.8 cube-native-xorg-base:1.3 pkgsrc-2008Q2:1.3.0.6 pkgsrc-2008Q2-base:1.3 cwrapper:1.3.0.4 pkgsrc-2008Q1:1.3.0.2 pkgsrc-2008Q1-base:1.3 pkgsrc-2007Q4:1.2.0.2 pkgsrc-2007Q4-base:1.2; locks; strict; comment @# @; 1.7 date 2019.11.03.09.14.10; author rillig; state Exp; branches; next 1.6; commitid nN7SqjIWSmrcXnJB; 1.6 date 2014.04.29.07.45.42; author obache; state Exp; branches; next 1.5; commitid cgnObcuAnXRwbyyx; 1.5 date 2014.03.10.11.05.52; author jperkin; state Exp; branches; next 1.4; commitid 0LV2u5ZFEIGpU8sx; 1.4 date 2008.10.05.21.36.33; author cube; state Exp; branches; next 1.3; 1.3 date 2008.04.01.13.46.13; author tron; state Exp; branches 1.3.8.1; next 1.2; 1.2 date 2007.12.15.15.26.15; author tron; state Exp; branches; next 1.1; 1.1 date 2007.12.15.15.21.53; author tron; state Exp; branches; next ; 1.3.8.1 date 2008.09.26.21.15.18; author cube; state Exp; branches; next ; desc @@ 1.7 log @x11: align variable assignments pkglint -Wall -F --only aligned --only indent -r No manual corrections. @ text @# $NetBSD: builtin.mk,v 1.6 2014/04/29 07:45:42 obache Exp $ BUILTIN_PKG:= libX11 PKGCONFIG_FILE.libX11= ${X11BASE}/lib/pkgconfig/x11.pc PKGCONFIG_FILE.libX11+= ${X11BASE}/lib${LIBABISUFFIX}/pkgconfig/x11.pc .include "../../mk/buildlink3/pkgconfig-builtin.mk" .include "../../mk/x11.builtin.mk" @ 1.6 log @Remove legacy builtin detection. This builtin.mk is only used with modular X (using pkgconfig files), and legacy detection prevent to detect sufficient version with *.pc file. @ text @d1 1 a1 1 # $NetBSD: builtin.mk,v 1.5 2014/03/10 11:05:52 jperkin Exp $ d3 3 a5 3 BUILTIN_PKG:= libX11 PKGCONFIG_FILE.libX11= ${X11BASE}/lib/pkgconfig/x11.pc PKGCONFIG_FILE.libX11+= ${X11BASE}/lib${LIBABISUFFIX}/pkgconfig/x11.pc @ 1.5 log @Search for pkgconfig files in lib${LIBABISUFFIX} and share directories as appropriate. This is required for X11_TYPE=native on Red Hat Linux. @ text @d1 1 a1 1 # $NetBSD: builtin.mk,v 1.4 2008/10/05 21:36:33 cube Exp $ a6 46 BUILTIN_FIND_FILES_VAR:= H_XLIB BUILTIN_FIND_FILES.H_XLIB= ${X11BASE}/include/X11/Xlib.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 ${X11BASE} == ${LOCALBASE} IS_BUILTIN.libX11= no .elif !defined(IS_BUILTIN.libX11) IS_BUILTIN.libX11= no . if empty(H_XLIB:M__nonexistent__) IS_BUILTIN.libX11= yes . endif .endif MAKEVARS+= IS_BUILTIN.libX11 ### ### Determine whether we should use the built-in implementation if it ### exists, and set USE_BUILTIN. appropriate ("yes" or "no"). ### .if !defined(USE_BUILTIN.libX11) . if ${PREFER.libX11} == "pkgsrc" USE_BUILTIN.libX11= no . else USE_BUILTIN.libX11= ${IS_BUILTIN.libX11} . if defined(BUILTIN_PKG.libX11) && \ !empty(IS_BUILTIN.libX11:M[yY][eE][sS]) USE_BUILTIN.libX11= yes . for _dep_ in ${BUILDLINK_API_DEPENDS.libX11} . if !empty(USE_BUILTIN.libX11:M[yY][eE][sS]) USE_BUILTIN.libX11!= \ if ${PKG_ADMIN} pmatch ${_dep_:Q} ${BUILTIN_PKG.libX11:Q}; then \ ${ECHO} yes; \ else \ ${ECHO} no; \ fi . endif . endfor . endif . endif # PREFER.libX11 .endif MAKEVARS+= USE_BUILTIN.libX11 @ 1.4 log @Merge cube-native-xorg, so that pkgsrc-current can be used with the native X.Org found in NetBSD-current. Thanks a lot to all who helped, especially Matthias Scheler who did repeated tests on Mac OS X and older versions of NetBSD to make sure the support for those platforms wouldn't be broken (or at least, not fatally, as I would still expect a few hiccups here and there, because there is only so much one can test in such limited time). On the infrastructure side, this branch brings pkgconfig-builtin.mk, in order to write very easily new builtin.mk files. It can actually handle more than just pkgconfig files, but it will provide a version if it finds such a file. x11.builtin.mk has also been made more useful and now all existing (and future!) native-X11-related builtin.mk files should include it. @ text @d1 1 a1 1 # $NetBSD: builtin.mk,v 1.3 2008/04/01 13:46:13 tron Exp $ d4 2 d53 1 @ 1.3 log @Initialize the prefix properly when we detect a builtin "libX11". @ text @d1 1 a1 1 # $NetBSD: builtin.mk,v 1.2 2007/12/15 15:26:15 tron Exp $ d51 1 a51 4 .if !empty(USE_BUILTIN.libX11:M[yY][eE][sS]) BUILDLINK_PREFIX.libX11= ${X11BASE} BUILDLINK_PASSTHRU_DIRS+= ${X11BASE}/include ${X11BASE}/lib .endif @ 1.3.8.1 log @Make all X11-related builtin.mk files include x11.builtin.mk to make sure all the necessary logic to use x11-links is included no matter what bl3 files a given pacakge includes. @ text @d1 1 a1 1 # $NetBSD: builtin.mk,v 1.3 2008/04/01 13:46:13 tron Exp $ d51 4 a54 1 .include "../../mk/x11.builtin.mk" @ 1.2 log @Rename variable to be consistent with other "builtin.mk" files. @ text @d1 1 a1 1 # $NetBSD: builtin.mk,v 1.1 2007/12/15 15:21:53 tron Exp $ d50 5 @ 1.1 log @Detect builtin "libX11" e.g. under Mac OS X Leopard. @ text @d1 1 a1 1 # $NetBSD: builtin.mk,v 1.3 2006/12/16 01:04:43 joerg Exp $ d5 2 a6 2 BUILTIN_FIND_FILES_VAR:= H_LIBX11 BUILTIN_FIND_FILES.H_LIBX11= ${X11BASE}/include/X11/Xlib.h d18 1 a18 1 . if empty(H_LIBX11:M__nonexistent__) @