head 1.7; access; symbols pkgsrc-2023Q4:1.7.0.130 pkgsrc-2023Q4-base:1.7 pkgsrc-2023Q3:1.7.0.128 pkgsrc-2023Q3-base:1.7 pkgsrc-2023Q2:1.7.0.126 pkgsrc-2023Q2-base:1.7 pkgsrc-2023Q1:1.7.0.124 pkgsrc-2023Q1-base:1.7 pkgsrc-2022Q4:1.7.0.122 pkgsrc-2022Q4-base:1.7 pkgsrc-2022Q3:1.7.0.120 pkgsrc-2022Q3-base:1.7 pkgsrc-2022Q2:1.7.0.118 pkgsrc-2022Q2-base:1.7 pkgsrc-2022Q1:1.7.0.116 pkgsrc-2022Q1-base:1.7 pkgsrc-2021Q4:1.7.0.114 pkgsrc-2021Q4-base:1.7 pkgsrc-2021Q3:1.7.0.112 pkgsrc-2021Q3-base:1.7 pkgsrc-2021Q2:1.7.0.110 pkgsrc-2021Q2-base:1.7 pkgsrc-2021Q1:1.7.0.108 pkgsrc-2021Q1-base:1.7 pkgsrc-2020Q4:1.7.0.106 pkgsrc-2020Q4-base:1.7 pkgsrc-2020Q3:1.7.0.104 pkgsrc-2020Q3-base:1.7 pkgsrc-2020Q2:1.7.0.100 pkgsrc-2020Q2-base:1.7 pkgsrc-2020Q1:1.7.0.80 pkgsrc-2020Q1-base:1.7 pkgsrc-2019Q4:1.7.0.102 pkgsrc-2019Q4-base:1.7 pkgsrc-2019Q3:1.7.0.98 pkgsrc-2019Q3-base:1.7 pkgsrc-2019Q2:1.7.0.96 pkgsrc-2019Q2-base:1.7 pkgsrc-2019Q1:1.7.0.94 pkgsrc-2019Q1-base:1.7 pkgsrc-2018Q4:1.7.0.92 pkgsrc-2018Q4-base:1.7 pkgsrc-2018Q3:1.7.0.90 pkgsrc-2018Q3-base:1.7 pkgsrc-2018Q2:1.7.0.88 pkgsrc-2018Q2-base:1.7 pkgsrc-2018Q1:1.7.0.86 pkgsrc-2018Q1-base:1.7 pkgsrc-2017Q4:1.7.0.84 pkgsrc-2017Q4-base:1.7 pkgsrc-2017Q3:1.7.0.82 pkgsrc-2017Q3-base:1.7 pkgsrc-2017Q2:1.7.0.78 pkgsrc-2017Q2-base:1.7 pkgsrc-2017Q1:1.7.0.76 pkgsrc-2017Q1-base:1.7 pkgsrc-2016Q4:1.7.0.74 pkgsrc-2016Q4-base:1.7 pkgsrc-2016Q3:1.7.0.72 pkgsrc-2016Q3-base:1.7 pkgsrc-2016Q2:1.7.0.70 pkgsrc-2016Q2-base:1.7 pkgsrc-2016Q1:1.7.0.68 pkgsrc-2016Q1-base:1.7 pkgsrc-2015Q4:1.7.0.66 pkgsrc-2015Q4-base:1.7 pkgsrc-2015Q3:1.7.0.64 pkgsrc-2015Q3-base:1.7 pkgsrc-2015Q2:1.7.0.62 pkgsrc-2015Q2-base:1.7 pkgsrc-2015Q1:1.7.0.60 pkgsrc-2015Q1-base:1.7 pkgsrc-2014Q4:1.7.0.58 pkgsrc-2014Q4-base:1.7 pkgsrc-2014Q3:1.7.0.56 pkgsrc-2014Q3-base:1.7 pkgsrc-2014Q2:1.7.0.54 pkgsrc-2014Q2-base:1.7 pkgsrc-2014Q1:1.7.0.52 pkgsrc-2014Q1-base:1.7 pkgsrc-2013Q4:1.7.0.50 pkgsrc-2013Q4-base:1.7 pkgsrc-2013Q3:1.7.0.48 pkgsrc-2013Q3-base:1.7 pkgsrc-2013Q2:1.7.0.46 pkgsrc-2013Q2-base:1.7 pkgsrc-2013Q1:1.7.0.44 pkgsrc-2013Q1-base:1.7 pkgsrc-2012Q4:1.7.0.42 pkgsrc-2012Q4-base:1.7 pkgsrc-2012Q3:1.7.0.40 pkgsrc-2012Q3-base:1.7 pkgsrc-2012Q2:1.7.0.38 pkgsrc-2012Q2-base:1.7 pkgsrc-2012Q1:1.7.0.36 pkgsrc-2012Q1-base:1.7 pkgsrc-2011Q4:1.7.0.34 pkgsrc-2011Q4-base:1.7 pkgsrc-2011Q3:1.7.0.32 pkgsrc-2011Q3-base:1.7 pkgsrc-2011Q2:1.7.0.30 pkgsrc-2011Q2-base:1.7 pkgsrc-2011Q1:1.7.0.28 pkgsrc-2011Q1-base:1.7 pkgsrc-2010Q4:1.7.0.26 pkgsrc-2010Q4-base:1.7 pkgsrc-2010Q3:1.7.0.24 pkgsrc-2010Q3-base:1.7 pkgsrc-2010Q2:1.7.0.22 pkgsrc-2010Q2-base:1.7 pkgsrc-2010Q1:1.7.0.20 pkgsrc-2010Q1-base:1.7 pkgsrc-2009Q4:1.7.0.18 pkgsrc-2009Q4-base:1.7 pkgsrc-2009Q3:1.7.0.16 pkgsrc-2009Q3-base:1.7 pkgsrc-2009Q2:1.7.0.14 pkgsrc-2009Q2-base:1.7 pkgsrc-2009Q1:1.7.0.12 pkgsrc-2009Q1-base:1.7 pkgsrc-2008Q4:1.7.0.10 pkgsrc-2008Q4-base:1.7 pkgsrc-2008Q3:1.7.0.8 pkgsrc-2008Q3-base:1.7 cube-native-xorg:1.7.0.6 cube-native-xorg-base:1.7 pkgsrc-2008Q2:1.7.0.4 pkgsrc-2008Q2-base:1.7 cwrapper:1.7.0.2 pkgsrc-2008Q1:1.6.0.6 pkgsrc-2008Q1-base:1.6 pkgsrc-2007Q4:1.6.0.4 pkgsrc-2007Q4-base:1.6 pkgsrc-2007Q3:1.6.0.2 pkgsrc-2007Q3-base:1.6 pkgsrc-2007Q2:1.4.0.2 pkgsrc-2007Q2-base:1.4 pkgsrc-2007Q1:1.3.0.8 pkgsrc-2007Q1-base:1.3 jlam-pkgviews:1.3.0.6 jlam-pkgviews-base:1.3 pkgsrc-2006Q4:1.3.0.4 pkgsrc-2006Q4-base:1.3 pkgsrc-2006Q3:1.3.0.2 pkgsrc-2006Q3-base:1.3 pkgsrc-2006Q2:1.2.0.2 pkgsrc-2006Q2-base:1.2; locks; strict; comment @# @; 1.7 date 2008.06.09.14.47.03; author sketch; state Exp; branches; next 1.6; 1.6 date 2007.08.16.16.29.27; author jlam; state Exp; branches; next 1.5; 1.5 date 2007.08.13.09.22.21; author rillig; state Exp; branches; next 1.4; 1.4 date 2007.05.25.14.21.32; author rillig; state Exp; branches; next 1.3; 1.3 date 2006.07.13.14.02.34; author jlam; state Exp; branches; next 1.2; 1.2 date 2006.06.06.15.28.52; author jlam; state Exp; branches; next 1.1; 1.1 date 2006.06.06.04.48.19; author jlam; state Exp; branches; next ; desc @@ 1.7 log @Wrap expansion of local patches inside LOCALPATCHES, given that it is undefined by default. Previous behaviour would try to echo / which leads to interesting behaviour when /net is an autofs map... Reduces runtime of mk/bulk/printdepends by 5.25 days on my test system. @ text @# $NetBSD: bsd.patch-vars.mk,v 1.6 2007/08/16 16:29:27 jlam Exp $ # # This Makefile fragment is included separately by bsd.pkg.mk and # defines some variables which must be defined earlier than where # bsd.patch.mk is included. # # Package-settable variables: # # PATCHFILES is a list of distribution patches relative to # ${_DISTDIR} that are applied first to the package. # # PATCHDIR is the location of the pkgsrc patches for the package. # This defaults to the "patches" subdirectory of the package # directory. # # User-settable variables: # # LOCALPATCHES is the location of local patches that are maintained # in a directory tree reflecting the same hierarchy as the pkgsrc # tree, e.g., local patches for www/apache would be found in # ${LOCALPATCHES}/www/apache. These patches are applied after # the patches in ${PATCHDIR}. # # The default PATCHDIR is currently set in bsd.prefs.mk #PATCHDIR?= ${.CURDIR}/patches PATCHFILES?= # none pkgsrc_patches= ${:!echo ${PATCHDIR}/patch-* ${PATCHDIR}/emul-*-patch-*!:N*\*} .if !empty(LOCALPATCHES) local_patches= ${:!echo ${LOCALPATCHES}/${PKGPATH}/*!:N*/CVS:N*/\*} .endif .if !empty(PATCHFILES) || !empty(pkgsrc_patches) || !empty(local_patches) USE_TOOLS+= patch .endif .if !empty(PATCHFILES) || !empty(pkgsrc_patches) USE_TOOLS+= digest:bootstrap .endif # These tools are used to output the contents of the distribution patches # to stdout. # .if !empty(PATCHFILES) USE_TOOLS+= cat . if !empty(PATCHFILES:M*.Z) || !empty(PATCHFILES:M*.gz) USE_TOOLS+= gzcat . endif . if !empty(PATCHFILES:M*.bz2) USE_TOOLS+= bzcat . endif .endif @ 1.6 log @Allow for emulation-specific patches for binary-only packages. The patches are named emul-${EMUL_PLATFORM}-patch-* and are located in ${PATCHDIR}. @ text @d1 1 a1 1 # $NetBSD: bsd.patch-vars.mk,v 1.5 2007/08/13 09:22:21 rillig Exp $ d31 1 d33 1 @ 1.5 log @Reworked the way the needed tools for the "patch" phase are determined. @ text @d1 1 a1 1 # $NetBSD: bsd.patch-vars.mk,v 1.4 2007/05/25 14:21:32 rillig Exp $ d30 1 a30 1 pkgsrc_patches= ${:!echo ${PATCHDIR}/patch-*!:N*\*} @ 1.4 log @When testing whether the patches/ directory exists or not, take into account that CVS usually leaves empty directories around. This fixes the bootstrapping after a "cvs update" without the -P option. The error message leading to it was: ===> running: (cd /home/p/src/devel/bmake && /home/p/pkg/bin/bmake -s -DPKG_PRESERVE MAKECONF=/home/p/work/mk.conf.example WRKOBJDIR=/home/p/work/pkgsrc bootstrap-register) ERROR: [resolve-dependencies] A package matching ``digest>=20010302'' should ERROR: be installed, but one cannot be found. Perhaps there is a ERROR: stale work directory for ../../pkgtools/digest? @ text @d1 1 a1 1 # $NetBSD: bsd.patch-vars.mk,v 1.3 2006/07/13 14:02:34 jlam Exp $ d7 1 a7 1 # The following variables may be set in a package Makefile: d16 1 a16 1 # The following variables may be set by the user: d28 6 a33 3 .if (defined(PATCHFILES) && !empty(PATCHFILES)) || \ (defined(PATCHDIR) && exists(${PATCHDIR})) || \ (defined(LOCALPATCHES) && exists(${LOCALPATCHES}/${PKGPATH})) d36 1 a36 10 # Just testing whether the directories exist or not is not enough. # There may be directories that are empty except for the CVS metafiles. # This complicated test is necessary to not record pkgtools/digest # as a dependency for devel/bmake. .if (defined(PATCHDIR) && exists(${PATCHDIR})) || \ (defined(LOCALPATCHES) && exists(${LOCALPATCHES}/${PKGPATH})) _patches!= echo ${PATCHDIR}/* ${LOCALPATCHES}/${PKGPATH}/* _patches:= ${_patches:N*/CVS:N*/\*} . if !empty(_patches) a37 1 . endif d43 1 a43 1 .if defined(PATCHFILES) @ 1.3 log @* Add a new stage "bootstrap-depends" that happens before all other stages, and that installs dependencies listed in BOOTSTRAP_DEPENDS. The bootstrap-depends step works just like the normal depends step and honors the value of DEPENDS_TARGET. It's now possible to add dependencies solely to facilitate fetching the distfiles, e.g. BOOTSTRAP_DEPENDS+= curl-[0-9]*:../../www/curl * Teach the tools framework about ":bootstrap" as a tools modifier which indicates the tool should be added as a dependency via BOOTSTRAP_DEPENDS. * Add "digest" to the tools framework. * Use USE_TOOLS+=digest:bootstrap to force pkgsrc to install digest before anything else. Get rid of unused "uptodate-digest" target and related digest version-checking code. * Finish the refactoring work: split checksum-related code out of bsd.pkg.mk and into pkgsrc/mk/checksum and replace the "checksum" target command list with a script that does all the real work. * Make DIGEST_ALGORITHMS and PATCH_DIGEST_ALGORITHM into private variables by prepending them with an underscore. Also, rename _PATCH_DIGEST_ALGORITHM to _PATCH_DIGEST_ALGORITHMS and adjust the makepatchsum target to allow that variable to contain a list of algorithms, all of which are used when creating the patch checksums for ${DISTINFO_FILE}. @ text @d1 1 a1 1 # $NetBSD: bsd.patch-vars.mk,v 1.2 2006/06/06 15:28:52 jlam Exp $ d34 4 d40 3 d44 1 @ 1.2 log @Move some variable definitions out of bsd.prefs.mk and back into bsd.pkg.mk. They didn't actually need to be defined in bsd.prefs.mk, just somewhere before the "main" bsd..mk files were included. This moves some conditional (?=) definitions back into bsd.pkg.mk so they won't conflict with any conditional definitions in package Makefiles. This should fix the "checksum" problems in lang/php-gd as noted here: http://mail-index.netbsd.org/pkgsrc-users/2006/06/05/0012.html where EXTRACT_SUFX had the wrong value due to the order in while *.mk files were included. @ text @d1 1 a1 1 # $NetBSD: bsd.patch-vars.mk,v 1.1 2006/06/06 04:48:19 jlam Exp $ d34 5 @ 1.1 log @Refactor "patch" code into correspondingly named subdirectory of pkgsrc/mk. Also get rid of the recursive make for the "patch" target. This basically merges the "patch" phase into the "tools" phase. There should eventually be a standalone script that can be used to verify checksums listed in distinfo that should be used instead of the roll-your-own code in the do-pkgsrc-patch target. @ text @d1 1 a1 1 # $NetBSD$ d3 3 a5 3 # This Makefile fragment is included to bsd.prefs.mk and defines some # variables which must be defined earlier than where bsd.patch.mk is # included. d25 2 a26 1 PATCHDIR?= ${.CURDIR}/patches @