head 1.24; access; symbols pkgsrc-2023Q4:1.23.0.36 pkgsrc-2023Q4-base:1.23 pkgsrc-2023Q3:1.23.0.34 pkgsrc-2023Q3-base:1.23 pkgsrc-2023Q2:1.23.0.32 pkgsrc-2023Q2-base:1.23 pkgsrc-2023Q1:1.23.0.30 pkgsrc-2023Q1-base:1.23 pkgsrc-2022Q4:1.23.0.28 pkgsrc-2022Q4-base:1.23 pkgsrc-2022Q3:1.23.0.26 pkgsrc-2022Q3-base:1.23 pkgsrc-2022Q2:1.23.0.24 pkgsrc-2022Q2-base:1.23 pkgsrc-2022Q1:1.23.0.22 pkgsrc-2022Q1-base:1.23 pkgsrc-2021Q4:1.23.0.20 pkgsrc-2021Q4-base:1.23 pkgsrc-2021Q3:1.23.0.18 pkgsrc-2021Q3-base:1.23 pkgsrc-2021Q2:1.23.0.16 pkgsrc-2021Q2-base:1.23 pkgsrc-2021Q1:1.23.0.14 pkgsrc-2021Q1-base:1.23 pkgsrc-2020Q4:1.23.0.12 pkgsrc-2020Q4-base:1.23 pkgsrc-2020Q3:1.23.0.10 pkgsrc-2020Q3-base:1.23 pkgsrc-2020Q2:1.23.0.8 pkgsrc-2020Q2-base:1.23 pkgsrc-2020Q1:1.23.0.4 pkgsrc-2020Q1-base:1.23 pkgsrc-2019Q4:1.23.0.6 pkgsrc-2019Q4-base:1.23 pkgsrc-2019Q3:1.23.0.2 pkgsrc-2019Q3-base:1.23 pkgsrc-2019Q2:1.21.0.12 pkgsrc-2019Q2-base:1.21 pkgsrc-2019Q1:1.21.0.10 pkgsrc-2019Q1-base:1.21 pkgsrc-2018Q4:1.21.0.8 pkgsrc-2018Q4-base:1.21 pkgsrc-2018Q3:1.21.0.6 pkgsrc-2018Q3-base:1.21 pkgsrc-2018Q2:1.21.0.4 pkgsrc-2018Q2-base:1.21 pkgsrc-2018Q1:1.21.0.2 pkgsrc-2018Q1-base:1.21 pkgsrc-2017Q4:1.20.0.34 pkgsrc-2017Q4-base:1.20 pkgsrc-2017Q3:1.20.0.32 pkgsrc-2017Q3-base:1.20 pkgsrc-2017Q2:1.20.0.28 pkgsrc-2017Q2-base:1.20 pkgsrc-2017Q1:1.20.0.26 pkgsrc-2017Q1-base:1.20 pkgsrc-2016Q4:1.20.0.24 pkgsrc-2016Q4-base:1.20 pkgsrc-2016Q3:1.20.0.22 pkgsrc-2016Q3-base:1.20 pkgsrc-2016Q2:1.20.0.20 pkgsrc-2016Q2-base:1.20 pkgsrc-2016Q1:1.20.0.18 pkgsrc-2016Q1-base:1.20 pkgsrc-2015Q4:1.20.0.16 pkgsrc-2015Q4-base:1.20 pkgsrc-2015Q3:1.20.0.14 pkgsrc-2015Q3-base:1.20 pkgsrc-2015Q2:1.20.0.12 pkgsrc-2015Q2-base:1.20 pkgsrc-2015Q1:1.20.0.10 pkgsrc-2015Q1-base:1.20 pkgsrc-2014Q4:1.20.0.8 pkgsrc-2014Q4-base:1.20 pkgsrc-2014Q3:1.20.0.6 pkgsrc-2014Q3-base:1.20 pkgsrc-2014Q2:1.20.0.4 pkgsrc-2014Q2-base:1.20 pkgsrc-2014Q1:1.20.0.2 pkgsrc-2014Q1-base:1.20 pkgsrc-2013Q4:1.19.0.6 pkgsrc-2013Q4-base:1.19 pkgsrc-2013Q3:1.19.0.4 pkgsrc-2013Q3-base:1.19 pkgsrc-2013Q2:1.19.0.2 pkgsrc-2013Q2-base:1.19 pkgsrc-2013Q1:1.18.0.10 pkgsrc-2013Q1-base:1.18 pkgsrc-2012Q4:1.18.0.8 pkgsrc-2012Q4-base:1.18 pkgsrc-2012Q3:1.18.0.6 pkgsrc-2012Q3-base:1.18 pkgsrc-2012Q2:1.18.0.4 pkgsrc-2012Q2-base:1.18 pkgsrc-2012Q1:1.18.0.2 pkgsrc-2012Q1-base:1.18 pkgsrc-2011Q4:1.17.0.24 pkgsrc-2011Q4-base:1.17 pkgsrc-2011Q3:1.17.0.22 pkgsrc-2011Q3-base:1.17 pkgsrc-2011Q2:1.17.0.20 pkgsrc-2011Q2-base:1.17 pkgsrc-2011Q1:1.17.0.18 pkgsrc-2011Q1-base:1.17 pkgsrc-2010Q4:1.17.0.16 pkgsrc-2010Q4-base:1.17 pkgsrc-2010Q3:1.17.0.14 pkgsrc-2010Q3-base:1.17 pkgsrc-2010Q2:1.17.0.12 pkgsrc-2010Q2-base:1.17 pkgsrc-2010Q1:1.17.0.10 pkgsrc-2010Q1-base:1.17 pkgsrc-2009Q4:1.17.0.8 pkgsrc-2009Q4-base:1.17 pkgsrc-2009Q3:1.17.0.6 pkgsrc-2009Q3-base:1.17 pkgsrc-2009Q2:1.17.0.4 pkgsrc-2009Q2-base:1.17 pkgsrc-2009Q1:1.17.0.2 pkgsrc-2009Q1-base:1.17 pkgsrc-2008Q4:1.15.0.2 pkgsrc-2008Q4-base:1.15 pkgsrc-2008Q3:1.14.0.24 pkgsrc-2008Q3-base:1.14 cube-native-xorg:1.14.0.22 cube-native-xorg-base:1.14 pkgsrc-2008Q2:1.14.0.20 pkgsrc-2008Q2-base:1.14 cwrapper:1.14.0.18 pkgsrc-2008Q1:1.14.0.16 pkgsrc-2008Q1-base:1.14 pkgsrc-2007Q4:1.14.0.14 pkgsrc-2007Q4-base:1.14 pkgsrc-2007Q3:1.14.0.12 pkgsrc-2007Q3-base:1.14 pkgsrc-2007Q2:1.14.0.10 pkgsrc-2007Q2-base:1.14 pkgsrc-2007Q1:1.14.0.8 pkgsrc-2007Q1-base:1.14 pkgsrc-2006Q4:1.14.0.6 pkgsrc-2006Q4-base:1.14 pkgsrc-2006Q3:1.14.0.4 pkgsrc-2006Q3-base:1.14 pkgsrc-2006Q2:1.14.0.2 pkgsrc-2006Q2-base:1.14 pkgsrc-2006Q1:1.12.0.2 pkgsrc-2006Q1-base:1.12 pkgsrc-2005Q4:1.11.0.4 pkgsrc-2005Q4-base:1.11 pkgsrc-2005Q3:1.11.0.2 pkgsrc-2005Q3-base:1.11 pkgsrc-2005Q2:1.10.0.2 pkgsrc-2005Q2-base:1.10 pkgsrc-2005Q1:1.4.0.8 pkgsrc-2005Q1-base:1.4 pkgsrc-2004Q4:1.4.0.6 pkgsrc-2004Q4-base:1.4 pkgsrc-2004Q3:1.4.0.4 pkgsrc-2004Q3-base:1.4 pkgsrc-2004Q2:1.4.0.2 pkgsrc-2004Q2-base:1.4 pkgsrc-2004Q1:1.3.0.2 pkgsrc-2004Q1-base:1.3; locks; strict; comment @# @; 1.24 date 2024.01.13.20.07.33; author riastradh; state Exp; branches; next 1.23; commitid tXCKNfIoMbcmkkUE; 1.23 date 2019.08.30.19.06.34; author nia; state Exp; branches; next 1.22; commitid rqBNKhyhkqvhj5BB; 1.22 date 2019.08.21.13.35.28; author nia; state Exp; branches; next 1.21; commitid QbuTYFguNT3eMTzB; 1.21 date 2018.01.14.14.58.38; author rillig; state Exp; branches; next 1.20; commitid kGVXnu3u3GOw0RmA; 1.20 date 2014.03.22.08.19.24; author jperkin; state Exp; branches; next 1.19; commitid EsCqTFkLbzEUBFtx; 1.19 date 2013.06.17.05.27.50; author dholland; state Exp; branches; next 1.18; commitid BhlK5CQQg6vwAVTw; 1.18 date 2012.03.19.12.34.13; author joerg; state Exp; branches; next 1.17; 1.17 date 2009.03.20.19.24.36; author joerg; state Exp; branches; next 1.16; 1.16 date 2009.02.03.08.35.13; author obache; state Exp; branches; next 1.15; 1.15 date 2008.10.05.21.36.35; author cube; state Exp; branches; next 1.14; 1.14 date 2006.04.06.06.22.00; author reed; state Exp; branches 1.14.22.1; next 1.13; 1.13 date 2006.03.30.18.06.17; author jlam; state Exp; branches; next 1.12; 1.12 date 2006.01.19.12.53.17; author adam; state Exp; branches; next 1.11; 1.11 date 2005.07.10.10.42.26; author grant; state Exp; branches; next 1.10; 1.10 date 2005.06.17.15.54.06; author jlam; state Exp; branches; next 1.9; 1.9 date 2005.06.03.19.12.49; author jlam; state Exp; branches; next 1.8; 1.8 date 2005.06.03.17.02.36; author jlam; state Exp; branches; next 1.7; 1.7 date 2005.06.03.16.03.09; author jlam; state Exp; branches; next 1.6; 1.6 date 2005.06.01.18.33.02; author jlam; state Exp; branches; next 1.5; 1.5 date 2005.06.01.18.02.54; author jlam; state Exp; branches; next 1.4; 1.4 date 2004.03.29.05.43.30; author jlam; state Exp; branches; next 1.3; 1.3 date 2004.03.15.17.38.10; author jlam; state Exp; branches; next 1.2; 1.2 date 2004.03.15.16.48.18; author jlam; state Exp; branches; next 1.1; 1.1 date 2004.03.10.17.57.14; author jlam; state Exp; branches; next ; 1.14.22.1 date 2008.09.26.19.59.46; author cube; state Exp; branches; next ; desc @@ 1.24 log @*/builtin.mk: Use ${_CROSS_DESTDIR:U} for build-time file checks. These are questions about the target system, whose files at build-time are all relative to ${_CROSS_DESTDIR} if it is defined, i.e., if USE_CROSS_COMPILE is set to yes. No change to native builds because ${_CROSS_DESTDIR:U} is empty in them. (Possible minor change by adding :Q to ${H_FOO} in command lines, but if this makes a difference it likely fixes problems.) @ text @# $NetBSD: builtin.mk,v 1.23 2019/08/30 19:06:34 nia Exp $ BUILTIN_PKG:= MesaLib BUILTIN_FIND_FILES_VAR:= H_MESALIB PC_GL BUILTIN_FIND_FILES.H_MESALIB= ${X11BASE}/include/GL/glx.h BUILTIN_FIND_FILES.PC_GL= ${X11BASE}/lib/pkgconfig/gl.pc BUILTIN_FIND_FILES.PC_GL+= ${X11BASE}/lib${LIBABISUFFIX}/pkgconfig/gl.pc .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.MesaLib) . if empty(PC_GL:M__nonexistent__) IS_BUILTIN.MesaLib= yes . elif empty(H_MESALIB:M__nonexistent__) IS_BUILTIN.MesaLib= yes . else IS_BUILTIN.MesaLib= no . endif .endif MAKEVARS+= IS_BUILTIN.MesaLib ### ### 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.MesaLib) && \ !empty(IS_BUILTIN.MesaLib:M[yY][eE][sS]) . if empty(PC_GL:M__nonexistent__) BUILTIN_VERSION.Mesa!= \ ${SED} -n -e 's/Version: //p' ${_CROSS_DESTDIR:U:Q}${PC_GL:Q} . elif empty(H_MESALIB:M__nonexistent__) . include "version.mk" . else # ? BUILTIN_VERSION.Mesa:= 0.something-weird-happened . endif BUILTIN_PKG.MesaLib= MesaLib-${BUILTIN_VERSION.Mesa} MAKEVARS+= BUILTIN_VERSION.Mesa .endif MAKEVARS+= BUILTIN_PKG.MesaLib ### ### Determine whether we should use the built-in implementation if it ### exists, and set USE_BUILTIN. appropriate ("yes" or "no"). ### .if !defined(USE_BUILTIN.MesaLib) . if ${PREFER.MesaLib} == "pkgsrc" USE_BUILTIN.MesaLib= no . else USE_BUILTIN.MesaLib= ${IS_BUILTIN.MesaLib} . if defined(BUILTIN_PKG.MesaLib) && \ !empty(IS_BUILTIN.MesaLib:M[yY][eE][sS]) USE_BUILTIN.MesaLib= yes . for dep in ${BUILDLINK_API_DEPENDS.MesaLib} . if !empty(USE_BUILTIN.MesaLib:M[yY][eE][sS]) USE_BUILTIN.MesaLib!= \ if ${PKG_ADMIN} pmatch ${dep:Q} ${BUILTIN_PKG.MesaLib}; then \ ${ECHO} yes; \ else \ ${ECHO} no; \ fi . endif . endfor . endif . endif # PREFER.MesaLib .endif MAKEVARS+= USE_BUILTIN.MesaLib ### ### The section below only applies if we are not including this file ### solely to determine whether a built-in implementation exists. ### CHECK_BUILTIN.MesaLib?= no .if !empty(CHECK_BUILTIN.MesaLib:M[nN][oO]) . if !empty(USE_BUILTIN.MesaLib:M[nN][oO]) . include "../../mk/pthread.buildlink3.mk" . include "../../mk/pthread.builtin.mk" BUILTIN_PKG:= MesaLib . endif . include "../../mk/x11.builtin.mk" .endif # CHECK_BUILTIN.MesaLib @ 1.23 log @Remove graphics/Mesa This metapackage isn't particularly useful for modern applications and is potentially misleading. Not everything needs glu for OpenGL support, and glut has increasingly fell out of favour, to the extent of being dropped from Mesa. It's mostly been replaced by e.g. SDL. Hopefully I've narrowed down everything pulling in the metapackage and switched everything to using only the individual libraries it needs. @ text @d1 1 a1 1 # $NetBSD: builtin.mk,v 1.22 2019/08/21 13:35:28 nia Exp $ d35 2 a36 1 BUILTIN_VERSION.Mesa!= ${SED} -n -e 's/Version: //p' ${PC_GL} @ 1.22 log @Move graphics/MesaLib18 to graphics/MesaLib. Move graphics/MesaLib to graphics/MesaLib11. @ text @d1 1 a1 1 # $NetBSD: builtin.mk,v 1.2 2019/08/21 12:21:28 nia Exp $ d37 1 a37 1 . include "../../graphics/Mesa/version.mk" @ 1.21 log @graphics/*: remove redundant :Q modifiers pkgsrc doesn't support PREFIX with spaces or other special characters. Therefore it is not necessary to add the :Q modifier to this variable and several others. @ text @d1 1 a1 1 # $NetBSD: builtin.mk,v 1.20 2014/03/22 08:19:24 jperkin Exp $ d25 1 d71 1 @ 1.20 log @Look for gl.pc in lib${LIBABISUFFIX}/pkgconfig too. Fixes some Linux dependencies. @ text @d1 1 a1 1 # $NetBSD: builtin.mk,v 1.19 2013/06/17 05:27:50 dholland Exp $ d60 1 a60 1 if ${PKG_ADMIN} pmatch ${dep:Q} ${BUILTIN_PKG.MesaLib:Q}; then \ @ 1.19 log @Fix the builtin version detection by checking the pkgconfig files if they exist. Now gets 7.8.2 on netbsd-current instead of 4.0.4. (!) @ text @d1 1 a1 1 # $NetBSD: builtin.mk,v 1.18 2012/03/19 12:34:13 joerg Exp $ d8 1 @ 1.18 log @Drop imake-check logic from X11 components' builtin.mk. Always use xorg-cf-files and imake from pkgsrc, replacing xpkgwedge. Always install man pages, not cat pages when using imake. Unify the various imake PLIST variables in preparation for dropping. Adjust xbattbar for the new expectations. @ text @d1 1 a1 1 # $NetBSD: builtin.mk,v 1.17 2009/03/20 19:24:36 joerg Exp $ d5 1 a5 1 BUILTIN_FIND_FILES_VAR:= H_MESALIB d7 1 d16 3 a18 1 . if empty(H_MESALIB:M__nonexistent__) d31 8 a38 3 !empty(IS_BUILTIN.MesaLib:M[yY][eE][sS]) && \ empty(H_MESALIB:M__nonexistent__) . include "../../graphics/Mesa/version.mk" d40 1 @ 1.17 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: builtin.mk,v 1.16 2009/02/03 08:35:13 obache Exp $ d15 3 a18 4 . if empty(H_MESALIB:M__nonexistent__) BUILTIN_IMAKE_CHECK:= MesaLib:BuildGLXLibrary . include "../../mk/buildlink3/imake-check.mk" IS_BUILTIN.MesaLib= ${BUILTIN_IMAKE_CHECK.MesaLib} @ 1.16 log @Reset BUILTIN_PKG after inclution of pthread.builtin.mk. workaround of PR 40254. @ text @d1 1 a1 1 # $NetBSD: builtin.mk,v 1.15 2008/10/05 21:36:35 cube Exp $ a70 1 BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ a72 1 BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} a75 1 BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ a76 1 BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} @ 1.15 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.14 2006/04/06 06:22:00 reed Exp $ d75 1 @ 1.14 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.13 2006/03/30 18:06:17 jlam Exp $ a76 2 . if !empty(USE_BUILTIN.MesaLib:M[yY][eE][sS]) BUILDLINK_PREFIX.MesaLib= ${X11BASE} d78 1 a78 2 . include "../../mk/x11.buildlink3.mk" . include "../../mk/x11.builtin.mk" a79 1 . endif @ 1.14.22.1 log @Adapt to new x11.builtin.mk. @ text @d1 1 a1 1 # $NetBSD: builtin.mk,v 1.14 2006/04/06 06:22:00 reed Exp $ d77 2 d80 2 a81 1 . include "../../mk/x11.builtin.mk" d83 1 @ 1.13 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.12 2006/01/19 12:53:17 adam Exp $ d48 1 a48 1 . for dep in ${BUILDLINK_DEPENDS.MesaLib} @ 1.12 log @Changes 6.4: New: - Added a fast XOR line drawing function in Xlib driver - Added support for GL_ARB_texture_mirrored_repeat to savage driver (supported only on Savage4 hardware). Changes: - Mesa now packaged in three parts: Library, Demos and GLUT Bug fixes: - GLX_X_RENDERABLE token wasn't accepted by glXChooseFBConfig - Some files were present multiple times in the 6.3.2 tarballs - r200_vtxtmp_x86.S file was missing from 6.3.2 tarball (bug 4207) - glxgears_fbconfig demo didn't work (bug 4237) - fixed bug when bilinear sampling 2d textures with borders - glXCreatePbuffer() could segfault instead of returning 0 (bug 4235) - fixed undefined frexp and rand in X.org libGLcore.a (bug 4242) - fixed a few problems with proxy color tables (bug 4270) - fixed precision problem in Z clearing (bug 4395) - glBitmap, glDraw/CopyPixels mistakenly generated selection hits - fixed potential segfault caused by reading pixels outside of renderbuffer bounds - glGetTexLevelParameter didn't accept GL_TEXTURE_DEPTH_SIZE_ARB - fixed memory corruption bug involving software alpha buffers - glReadPixels clipped by window bounds was sometimes broken - glDraw/CopyPixels of stencil data ignored the stencil write mask - glReadPixels from a texture bound to a framebuffer object didn't work - glIsRender/FramebufferEXT weren't totally correct - fixed a number of point size attenuation/fade bugs - fixed glFogCoord bug 4729 - GLX encoding for transpose matrix functions was broken - fixed broken fragment program KIL and SWZ instructions - fragment programs that wrote result.depth.z didn't work Changes 6.4.1: Bug fixes: - redefining a vertex program string didn't take effect in TNL module - fixed occasional segfault upon vertex/fragment parsing error - vertex program LIT instruction didn't handle 0^0=1 correctly - fragment program fog option didn't work with glDrawPixels, glBitmap - USE_MGL_NAMESPACE didn't work for x86-64 - OSMesa demos were missing from previous release tarballs - fixed problem with float->ushort conversion in glClear (bug 4992) - popping of GL_EYE_PLANE texgen state was broken (bug 4996) - popping of GL_SPOT_DIRECTION light state was broken (bug 5005) - fixed occasional triangle color interpolation problem on VMS - work around invalid free() call (bug 5131) - fixed BSD X server compilation problem by including stdint.h @ text @d1 1 a1 1 # $NetBSD: builtin.mk,v 1.11 2005/07/10 10:42:26 grant Exp $ d16 1 a16 1 . if exists(${H_MESALIB}) d30 1 a30 1 exists(${H_MESALIB}) @ 1.11 log @no need to force the latest version of MesaLib for pthread change where IGNORE_RECOMMENDED=YES. set BUILDLINK_RECOMMENDED>=6.2.1nb2. @ text @d1 1 a1 1 # $NetBSD: builtin.mk,v 1.10 2005/06/17 15:54:06 jlam Exp $ d48 1 a48 1 . for _dep_ in ${BUILDLINK_DEPENDS.MesaLib} d51 1 a51 1 if ${PKG_ADMIN} pmatch ${_dep_:Q} ${BUILTIN_PKG.MesaLib:Q}; then \ @ 1.10 log @Enable the pthread-based thread-safety code in pkgsrc MesaLib. Bump the PKGREVISION to 2. This fixes PR pkg/30537. @ text @d1 1 a1 1 # $NetBSD: builtin.mk,v 1.9 2005/06/03 19:12:49 jlam Exp $ a70 1 BUILDLINK_DEPENDS.MesaLib+= MesaLib>=6.2.1nb2 @ 1.9 log @Coalesce the common makefile code in the builtin.mk file that inspect the X11 distribution using imake into mk/buildlink3/imake-check.mk. imake-check.mk calls out to a helper shell script mk/buildlink3/imake-check that generates the required Imakefiles and runs imake. Remove the now extraneous builtin-imake.mk files as the builtin.mk files can now contain the name of the imake symbol to check. @ text @d1 1 a1 1 # $NetBSD: builtin.mk,v 1.8 2005/06/03 17:02:36 jlam Exp $ d71 5 a75 1 BUILDLINK_DEPENDS.MesaLib+= MesaLib>=6.0 @ 1.8 log @Only check for the existence of the first word of ${IMAKE} since it may contain a command plus arguments. We use the standard idiom to extract the first word of a list stored in a make variable: VAR_CMD= ${VAR:C/^/_asdf_/1:M_asdf_*:S/^_asdf_//} XXX This can be replaced with a more succinct use of variable modifiers XXX when we update the bootstrap bmake to match the latest NetBSD make XXX sources, i.e.: XXX XXX VAR_CMD= ${VAR:[1]} @ text @d1 1 a1 1 # $NetBSD: builtin.mk,v 1.7 2005/06/03 16:03:09 jlam Exp $ d17 3 a19 12 PKGSRC_USE_TOOLS+= imake # XXX IMAKE?= ${X11BASE}/bin/imake # XXX _BUILTIN_IMAKE_CMD= ${IMAKE:C/^/_asdf_/1:M_asdf_*:S/^_asdf_//} . if exists(${_BUILTIN_IMAKE_CMD}) IS_BUILTIN.MesaLib!= \ dir=`cd ${BUILDLINK_PKGSRCDIR.MesaLib} && ${PWD_CMD}`; \ cd ${TMPDIR:U/tmp:Q} && \ ${IMAKE} -DUseInstalled -I${X11BASE}/lib/X11/config \ -f $$dir/builtin-imake.mk -C builtin-imake.$$$$.c \ -s - | \ ${IMAKE_MAKE} -f - builtin-test . endif @ 1.7 log @Don't require a read-write pkgsrc tree when invoking imake. We avoid this requirement by using TMPDIR as the read-write location demanded by using imake. @ text @d1 1 a1 1 # $NetBSD: builtin.mk,v 1.6 2005/06/01 18:33:02 jlam Exp $ d19 2 a20 1 . if defined(IMAKE) && exists(${IMAKE}) @ 1.6 log @Use IMAKE_MAKE instead of MAKE to process the makefile generated by imake. @ text @d1 1 a1 1 # $NetBSD: builtin.mk,v 1.5 2005/06/01 18:02:54 jlam Exp $ d21 2 d24 1 a24 1 -f ${BUILDLINK_PKGSRCDIR.MesaLib}/builtin-imake.mk \ @ 1.5 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.2 2004/03/29 05:43:30 jlam Exp $ d24 1 a24 1 ${MAKE} -f - builtin-test @ 1.4 log @Match the template builtin.mk file in bsd.builtin.mk, and make the two packages that use builtin.mk files (graphics/xpm and pkgtools/x11-links) use the new format correctly. @ text @d1 1 a1 1 # $NetBSD: builtin.mk,v 1.3 2004/03/15 17:38:10 jlam Exp $ d3 1 a3 2 _GL_GLX_H= ${X11BASE}/include/GL/glx.h _X11_TMPL= ${X11BASE}/lib/X11/config/X11.tmpl d5 2 a6 2 .include "../../graphics/Mesa/version.mk" BUILDLINK_DEPENDS.MesaLib+= MesaLib>=${_MESA_REQD} d8 6 d16 4 a19 1 . if exists(${_GL_GLX_H}) && exists(${_X11_TMPL}) d21 4 a24 12 if ${GREP} -q BuildGLXLibrary ${_X11_TMPL}; then \ ${ECHO} "yes"; \ else \ ${ECHO} "no"; \ fi . if !empty(IS_BUILTIN.MesaLib:M[yY][eE][sS]) # # _MESA_VERSION is defined by Mesa/version.mk to be the version of the # Mesa software distributed with the built-in XFree86. # BUILTIN_PKG.MesaLib= MesaLib-${_MESA_VERSION} BUILDLINK_VARS+= BUILTIN_PKG.MesaLib d27 2 a28 2 BUILDLINK_VARS+= IS_BUILTIN.MesaLib .endif # IS_BUILTIN.MesaLib d30 16 d47 12 a58 9 USE_BUILTIN.MesaLib?= ${IS_BUILTIN.MesaLib} . if defined(BUILTIN_PKG.MesaLib) USE_BUILTIN.MesaLib= yes . for _depend_ in ${BUILDLINK_DEPENDS.MesaLib} . if !empty(USE_BUILTIN.MesaLib:M[yY][eE][sS]) USE_BUILTIN.MesaLib!= \ if ${PKG_ADMIN} pmatch '${_depend_}' ${BUILTIN_PKG.MesaLib}; then \ ${ECHO} "yes"; \ d60 1 a60 1 ${ECHO} "no"; \ d62 6 a67 4 . endif . endfor . endif .endif # USE_BUILTIN.MesaLib d69 4 d76 1 a76 1 .if !empty(USE_BUILTIN.MesaLib:M[nN][oO]) d78 1 a78 1 .endif d80 1 a80 1 .if !empty(USE_BUILTIN.MesaLib:M[yY][eE][sS]) d82 5 a86 3 USE_X11= yes _MESA_REQD= ${_MESA_VERSION} .endif @ 1.3 log @Move the definitions of MESA_REQD and _MESA_REQD to Mesa/version.mk and modify {MesaLib,glu}/{buildlink3,builtin}.mk accordingly. Also add the dependency on {MesaLib,glu}>=${_MESA_REQD} to the builtin.mk files so that we correctly check the built-in Mesa version against the dependency requirements. @ text @d1 1 a1 1 # $NetBSD: builtin.mk,v 1.2 2004/03/15 16:48:18 jlam Exp $ d24 1 a24 1 MAKEFLAGS+= BUILTIN_PKG.MesaLib=${BUILTIN_PKG.MesaLib} d27 2 a28 7 MAKEFLAGS+= IS_BUILTIN.MesaLib=${IS_BUILTIN.MesaLib} .endif CHECK_BUILTIN.MesaLib?= no .if !empty(CHECK_BUILTIN.MesaLib:M[yY][eE][sS]) USE_BUILTIN.MesaLib= yes .endif d48 3 d60 2 @ 1.2 log @Fix pasto: s/gcc/MesaLib/g. No functional change. @ text @d1 1 a1 1 # $NetBSD: builtin.mk,v 1.1 2004/03/10 17:57:14 jlam Exp $ d6 2 a7 25 # Distill the MESA_REQD list into a single _MESA_REQD value that is the # highest version of MESA required. # _MESA_STRICTEST_REQD?= none . for _version_ in ${MESA_REQD} . for _pkg_ in MesaLib-${_version_} . if ${_MESA_STRICTEST_REQD} == "none" _MESA_PKG_SATISFIES_DEP= yes . for _vers_ in ${MESA_REQD} . if !empty(_MESA_PKG_SATISFIES_DEP:M[yY][eE][sS]) _MESA_PKG_SATISFIES_DEP!= \ if ${PKG_ADMIN} pmatch 'MesaLib>=${_vers_}' ${_pkg_}; then \ ${ECHO} "yes"; \ else \ ${ECHO} "no"; \ fi . endif . endfor . if !empty(_MESA_PKG_SATISFIES_DEP:M[yY][eE][sS]) _MESA_STRICTEST_REQD= ${_version_} . endif . endif . endfor . endfor _MESA_REQD= ${_MESA_STRICTEST_REQD} d20 2 a21 4 # Create an appropriate package name for the built-in Mesa/GLX 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. a22 1 . include "../../graphics/Mesa/version.mk" d39 1 a39 1 USE_BUILTIN.MesaLib= yes @ 1.1 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$ d11 1 a11 1 . for _pkg_ in gcc-${_version_} d17 1 a17 1 if ${PKG_ADMIN} pmatch 'gcc>=${_vers_}' ${_pkg_}; then \ @