head 1.11; access; symbols pkgsrc-2023Q4:1.10.0.34 pkgsrc-2023Q4-base:1.10 pkgsrc-2023Q3:1.10.0.32 pkgsrc-2023Q3-base:1.10 pkgsrc-2023Q2:1.10.0.30 pkgsrc-2023Q2-base:1.10 pkgsrc-2023Q1:1.10.0.28 pkgsrc-2023Q1-base:1.10 pkgsrc-2022Q4:1.10.0.26 pkgsrc-2022Q4-base:1.10 pkgsrc-2022Q3:1.10.0.24 pkgsrc-2022Q3-base:1.10 pkgsrc-2022Q2:1.10.0.22 pkgsrc-2022Q2-base:1.10 pkgsrc-2022Q1:1.10.0.20 pkgsrc-2022Q1-base:1.10 pkgsrc-2021Q4:1.10.0.18 pkgsrc-2021Q4-base:1.10 pkgsrc-2021Q3:1.10.0.16 pkgsrc-2021Q3-base:1.10 pkgsrc-2021Q2:1.10.0.14 pkgsrc-2021Q2-base:1.10 pkgsrc-2021Q1:1.10.0.12 pkgsrc-2021Q1-base:1.10 pkgsrc-2020Q4:1.10.0.10 pkgsrc-2020Q4-base:1.10 pkgsrc-2020Q3:1.10.0.8 pkgsrc-2020Q3-base:1.10 pkgsrc-2020Q2:1.10.0.6 pkgsrc-2020Q2-base:1.10 pkgsrc-2020Q1:1.10.0.2 pkgsrc-2020Q1-base:1.10 pkgsrc-2019Q4:1.10.0.4 pkgsrc-2019Q4-base:1.10 pkgsrc-2019Q3:1.9.0.50 pkgsrc-2019Q3-base:1.9 pkgsrc-2019Q2:1.9.0.48 pkgsrc-2019Q2-base:1.9 pkgsrc-2019Q1:1.9.0.46 pkgsrc-2019Q1-base:1.9 pkgsrc-2018Q4:1.9.0.44 pkgsrc-2018Q4-base:1.9 pkgsrc-2018Q3:1.9.0.42 pkgsrc-2018Q3-base:1.9 pkgsrc-2018Q2:1.9.0.40 pkgsrc-2018Q2-base:1.9 pkgsrc-2018Q1:1.9.0.38 pkgsrc-2018Q1-base:1.9 pkgsrc-2017Q4:1.9.0.36 pkgsrc-2017Q4-base:1.9 pkgsrc-2017Q3:1.9.0.34 pkgsrc-2017Q3-base:1.9 pkgsrc-2017Q2:1.9.0.30 pkgsrc-2017Q2-base:1.9 pkgsrc-2017Q1:1.9.0.28 pkgsrc-2017Q1-base:1.9 pkgsrc-2016Q4:1.9.0.26 pkgsrc-2016Q4-base:1.9 pkgsrc-2016Q3:1.9.0.24 pkgsrc-2016Q3-base:1.9 pkgsrc-2016Q2:1.9.0.22 pkgsrc-2016Q2-base:1.9 pkgsrc-2016Q1:1.9.0.20 pkgsrc-2016Q1-base:1.9 pkgsrc-2015Q4:1.9.0.18 pkgsrc-2015Q4-base:1.9 pkgsrc-2015Q3:1.9.0.16 pkgsrc-2015Q3-base:1.9 pkgsrc-2015Q2:1.9.0.14 pkgsrc-2015Q2-base:1.9 pkgsrc-2015Q1:1.9.0.12 pkgsrc-2015Q1-base:1.9 pkgsrc-2014Q4:1.9.0.10 pkgsrc-2014Q4-base:1.9 pkgsrc-2014Q3:1.9.0.8 pkgsrc-2014Q3-base:1.9 pkgsrc-2014Q2:1.9.0.6 pkgsrc-2014Q2-base:1.9 pkgsrc-2014Q1:1.9.0.4 pkgsrc-2014Q1-base:1.9 pkgsrc-2013Q4:1.9.0.2 pkgsrc-2013Q4-base:1.9 pkgsrc-2013Q3:1.8.0.26 pkgsrc-2013Q3-base:1.8 pkgsrc-2013Q2:1.8.0.24 pkgsrc-2013Q2-base:1.8 pkgsrc-2013Q1:1.8.0.22 pkgsrc-2013Q1-base:1.8 pkgsrc-2012Q4:1.8.0.20 pkgsrc-2012Q4-base:1.8 pkgsrc-2012Q3:1.8.0.18 pkgsrc-2012Q3-base:1.8 pkgsrc-2012Q2:1.8.0.16 pkgsrc-2012Q2-base:1.8 pkgsrc-2012Q1:1.8.0.14 pkgsrc-2012Q1-base:1.8 pkgsrc-2011Q4:1.8.0.12 pkgsrc-2011Q4-base:1.8 pkgsrc-2011Q3:1.8.0.10 pkgsrc-2011Q3-base:1.8 pkgsrc-2011Q2:1.8.0.8 pkgsrc-2011Q2-base:1.8 pkgsrc-2011Q1:1.8.0.6 pkgsrc-2011Q1-base:1.8 pkgsrc-2010Q4:1.8.0.4 pkgsrc-2010Q4-base:1.8 pkgsrc-2010Q3:1.8.0.2 pkgsrc-2010Q3-base:1.8 pkgsrc-2010Q2:1.7.0.36 pkgsrc-2010Q2-base:1.7 pkgsrc-2010Q1:1.7.0.34 pkgsrc-2010Q1-base:1.7 pkgsrc-2009Q4:1.7.0.32 pkgsrc-2009Q4-base:1.7 pkgsrc-2009Q3:1.7.0.30 pkgsrc-2009Q3-base:1.7 pkgsrc-2009Q2:1.7.0.28 pkgsrc-2009Q2-base:1.7 pkgsrc-2009Q1:1.7.0.26 pkgsrc-2009Q1-base:1.7 pkgsrc-2008Q4:1.7.0.24 pkgsrc-2008Q4-base:1.7 pkgsrc-2008Q3:1.7.0.22 pkgsrc-2008Q3-base:1.7 cube-native-xorg:1.7.0.20 cube-native-xorg-base:1.7 pkgsrc-2008Q2:1.7.0.18 pkgsrc-2008Q2-base:1.7 cwrapper:1.7.0.16 pkgsrc-2008Q1:1.7.0.14 pkgsrc-2008Q1-base:1.7 pkgsrc-2007Q4:1.7.0.12 pkgsrc-2007Q4-base:1.7 pkgsrc-2007Q3:1.7.0.10 pkgsrc-2007Q3-base:1.7 pkgsrc-2007Q2:1.7.0.8 pkgsrc-2007Q2-base:1.7 pkgsrc-2007Q1:1.7.0.6 pkgsrc-2007Q1-base:1.7 pkgsrc-2006Q4:1.7.0.4 pkgsrc-2006Q4-base:1.7 pkgsrc-2006Q3:1.7.0.2 pkgsrc-2006Q3-base:1.7 pkgsrc-2006Q2:1.6.0.2 pkgsrc-2006Q2-base:1.6 pkgsrc-2006Q1:1.4.0.6 pkgsrc-2006Q1-base:1.4 pkgsrc-2005Q4:1.4.0.4 pkgsrc-2005Q4-base:1.4 pkgsrc-2005Q3:1.4.0.2 pkgsrc-2005Q3-base:1.4 pkgsrc-2005Q2:1.3.0.2 pkgsrc-2005Q2-base:1.3 pkgsrc-2005Q1:1.2.0.8 pkgsrc-2005Q1-base:1.2 pkgsrc-2004Q4:1.2.0.6 pkgsrc-2004Q4-base:1.2 pkgsrc-2004Q3:1.2.0.4 pkgsrc-2004Q3-base:1.2 pkgsrc-2004Q2:1.2.0.2 pkgsrc-2004Q2-base:1.2 pkgsrc-2004Q1:1.1.0.2 pkgsrc-2004Q1-base:1.1; locks; strict; comment @# @; 1.11 date 2024.01.13.20.07.31; author riastradh; state Exp; branches; next 1.10; commitid tXCKNfIoMbcmkkUE; 1.10 date 2019.11.02.22.54.26; author rillig; state Exp; branches; next 1.9; commitid xi9jC6qL0JwEwkJB; 1.9 date 2013.11.23.10.51.09; author obache; state Exp; branches; next 1.8; commitid Mm2pq8HSrit7hoex; 1.8 date 2010.07.06.23.35.01; author obache; state Exp; branches; next 1.7; 1.7 date 2006.07.13.13.04.54; author heinz; state Exp; branches 1.7.36.1; next 1.6; 1.6 date 2006.04.06.06.21.32; author reed; state Exp; branches; next 1.5; 1.5 date 2006.03.30.18.06.17; author jlam; state Exp; branches; next 1.4; 1.4 date 2005.06.27.18.17.57; author minskim; state Exp; branches; next 1.3; 1.3 date 2005.06.01.18.02.37; author jlam; state Exp; branches; next 1.2; 1.2 date 2004.03.29.05.43.28; author jlam; state Exp; branches; next 1.1; 1.1 date 2004.03.10.17.57.14; author jlam; state Exp; branches; next ; 1.7.36.1 date 2010.09.22.18.04.23; author tron; state Exp; branches; next ; desc @@ 1.11 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.10 2019/11/02 22:54:26 rillig Exp $ BUILTIN_PKG:= bzip2 BUILTIN_FIND_HEADERS_VAR:= H_BZIP2 BUILTIN_FIND_HEADERS.H_BZIP2= bzlib.h BUILTIN_FIND_GREP.H_BZIP2= BZ2_ .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.bzip2) IS_BUILTIN.bzip2= no . if empty(H_BZIP2:M__nonexistent__) && empty(H_BZIP2:M${LOCALBASE}/*) IS_BUILTIN.bzip2= yes . endif .endif MAKEVARS+= IS_BUILTIN.bzip2 ### ### 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.bzip2) && \ !empty(IS_BUILTIN.bzip2:M[yY][eE][sS]) BUILTIN_VERSION.bzip2!= \ ${AWK} '/Copyright[ ]+\(C\).*rights[ ]+reserved/ { \ years=$$3; \ } \ /bzip2\/libbzip2[ ]+version[ ]+/ { \ vers=$$3; \ if ( vers == "1.0" ) { \ vers="1.0.1"; \ if ( years == "1996-2002" ) vers="1.0.2";\ if ( years == "1996-2005" ) vers="1.0.3";\ }; \ print vers; \ }; \ ' ${_CROSS_DESTDIR:U:Q}${H_BZIP2:Q} BUILTIN_PKG.bzip2= bzip2-${BUILTIN_VERSION.bzip2} .endif MAKEVARS+= BUILTIN_PKG.bzip2 ### ### Determine whether we should use the built-in implementation if it ### exists, and set USE_BUILTIN. appropriate ("yes" or "no"). ### .if !defined(USE_BUILTIN.bzip2) . if ${PREFER.bzip2} == "pkgsrc" USE_BUILTIN.bzip2= no . else USE_BUILTIN.bzip2= ${IS_BUILTIN.bzip2} . if defined(BUILTIN_PKG.bzip2) && \ !empty(IS_BUILTIN.bzip2:M[yY][eE][sS]) USE_BUILTIN.bzip2= yes . for _dep_ in ${BUILDLINK_API_DEPENDS.bzip2} . if !empty(USE_BUILTIN.bzip2:M[yY][eE][sS]) USE_BUILTIN.bzip2!= \ if ${PKG_ADMIN} pmatch ${_dep_:Q} ${BUILTIN_PKG.bzip2:Q}; then \ ${ECHO} yes; \ else \ ${ECHO} no; \ fi . endif . endfor . endif # # Some platforms don't have a bzip2 implementation that can replace # pkgsrc bzip2. # _INCOMPAT_BZIP2?= SunOS-5.[678]-* Darwin-[567].*-* . for _pattern_ in ${_INCOMPAT_BZIP2} ${INCOMPAT_BZIP2} . if !empty(MACHINE_PLATFORM:M${_pattern_}) USE_BUILTIN.bzip2= no . endif . endfor . endif # PREFER.bzip2 .endif MAKEVARS+= USE_BUILTIN.bzip2 # if USE_BZIP2 is defined, then force the use of a true bzip2 # implementation. # .if defined(USE_BZIP2) . if !empty(IS_BUILTIN.bzip2:M[nN][oO]) USE_BUILTIN.bzip2= no . endif .endif @ 1.10 log @archivers: align variable assignments pkglint -Wall -F --only aligned --only indent -r No manual corrections. @ text @d1 1 a1 1 # $NetBSD: builtin.mk,v 1.9 2013/11/23 10:51:09 obache Exp $ d42 1 a42 1 ' ${H_BZIP2:Q} @ 1.9 log @Use find-headers instead of find-files to detect builtin header files. @ text @d1 1 a1 1 # $NetBSD: builtin.mk,v 1.8 2010/07/06 23:35:01 obache Exp $ d21 1 a21 1 MAKEVARS+= IS_BUILTIN.bzip2 d46 1 a46 1 MAKEVARS+= BUILTIN_PKG.bzip2 d83 1 a83 1 MAKEVARS+= USE_BUILTIN.bzip2 @ 1.8 log @Tell Haiku's builtin bzip2. @ text @d1 1 a1 1 # $NetBSD: builtin.mk,v 1.7 2006/07/13 13:04:54 heinz Exp $ d5 2 a6 3 BUILTIN_FIND_FILES_VAR:= H_BZIP2 BUILTIN_FIND_FILES.H_BZIP2= /usr/include/bzlib.h \ /boot/common/include/bzlib.h @ 1.7 log @Added computation of version number for package bzip2 if there is a native version available in the system. The awk skript looks for the line in bzlib.h containing the version information. This works for versions < 1.0.0. For versions >= 1.0.0 the script additionally evaluates the copyright date. According to the change history, version 1.0 and 1.0.1 are identical except for a documentation update so we treat both as version 1.0.1 to avoid changing BUILDLINK_API_DEPENDS.bzip2 in buildlink3.mk. @ text @d1 1 a1 1 # $NetBSD: builtin.mk,v 1.6 2006/04/06 06:21:32 reed Exp $ d6 2 a7 1 BUILTIN_FIND_FILES.H_BZIP2= /usr/include/bzlib.h @ 1.7.36.1 log @Pullup ticket #3228 - requested by joerg archivers/bzip2: security update Revisions pulled up: - archivers/bzip2/Makefile 1.50 - archivers/bzip2/PLIST 1.4 - archivers/bzip2/files/CHANGES 1.3 - archivers/bzip2/files/README 1.3 - archivers/bzip2/files/bzdiff new file - archivers/bzip2/files/bzdiff.1 new file - archivers/bzip2/files/bzgrep new file - archivers/bzip2/files/bzgrep.1 new file - archivers/bzip2/files/decompress.c 1.3 --- Module Name: pkgsrc Committed By: joerg Date: Wed Sep 22 14:32:18 UTC 2010 Update of /cvsroot/pkgsrc/archivers/bzip2/files In directory ivanova.netbsd.org:/tmp/cvs-serv13227 Log Message: Import stripped down bzip2-1.0.6. --- Module Name: pkgsrc Committed By: joerg Date: Wed Sep 22 14:48:41 UTC 2010 Modified Files: pkgsrc/archivers/bzip2/files: CHANGES README decompress.c Log Message: Update to bzip2-1.0.6: Fix for CVE-2010-0405 --- Module Name: pkgsrc Committed By: joerg Date: Wed Sep 22 14:53:22 UTC 2010 Modified Files: pkgsrc/archivers/bzip2: Makefile PLIST Log Message: Update to bzip2-1.0.6: Fix for CVE-2010-0405. Also install various helper scripts. @ text @d1 1 a1 1 # $NetBSD$ d6 1 a6 2 BUILTIN_FIND_FILES.H_BZIP2= /usr/include/bzlib.h \ /boot/common/include/bzlib.h @ 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: builtin.mk,v 1.5 2006/03/30 18:06:17 jlam Exp $ d24 25 @ 1.5 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.4 2005/06/27 18:17:57 minskim Exp $ d35 1 a35 1 . for _dep_ in ${BUILDLINK_DEPENDS.bzip2} @ 1.4 log @Darwin>=8.0 has a dynamic library of bzip2. Exclude it from _INCOMPAT_BZIP2. @ text @d1 1 a1 1 # $NetBSD: builtin.mk,v 1.3 2005/06/01 18:02:37 jlam Exp $ d17 1 a17 1 . if empty(H_BZIP2:M${LOCALBASE}/*) && exists(${H_BZIP2}) @ 1.3 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:28 jlam Exp $ d50 1 a50 1 _INCOMPAT_BZIP2?= SunOS-5.[678]-* Darwin-*-* @ 1.2 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.1 2004/03/10 17:57:14 jlam Exp $ d3 12 d17 2 a18 7 . if exists(/usr/include/bzlib.h) IS_BUILTIN.bzip2!= \ if ${GREP} -q "BZ2_" /usr/include/bzlib.h; then \ ${ECHO} "yes"; \ else \ ${ECHO} "no"; \ fi d20 2 a21 2 BUILDLINK_VARS+= IS_BUILTIN.bzip2 .endif # IS_BUILTIN.bzip2 d23 4 d28 1 a28 6 USE_BUILTIN.bzip2?= ${IS_BUILTIN.bzip2} PREFER.bzip2?= pkgsrc . if defined(USE_BZIP2) . if !empty(IS_BUILTIN.bzip2:M[nN][oO]) || \ (${PREFER.bzip2} == "pkgsrc") d30 15 d46 13 a58 1 . endif d60 2 a61 2 # Solaris 9 has bzip2 1.0.1, build it on older versions. # Darwin only has a static libbz2.a. d63 2 a64 3 _INCOMPAT_BZIP2?= SunOS-5.[678]-* Darwin-* . for _pattern_ in ${_INCOMPAT_BZIP2} ${INCOMPAT_BZIP2} . if !empty(MACHINE_PLATFORM:M${_pattern_}) d66 2 a67 3 . endif . endfor .endif # USE_BUILTIN.bzip2 @ 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$ d13 2 a14 7 MAKEFLAGS+= IS_BUILTIN.bzip2=${IS_BUILTIN.bzip2} .endif CHECK_BUILTIN.bzip2?= no .if !empty(CHECK_BUILTIN.bzip2:M[yY][eE][sS]) USE_BUILTIN.bzip2= yes .endif @