The NetBSD Project

CVS log for pkgsrc/mk/patch/bsd.patch-vars.mk

[BACK] Up to [cvs.NetBSD.org] / pkgsrc / mk / patch

Request diff between arbitrary revisions


Keyword substitution: kv
Default branch: MAIN


Revision 1.14: download - view: text, markup, annotated - select for diffs
Fri Jan 16 08:17:46 2026 UTC (9 months, 4 weeks ago) by wiz
Branches: MAIN
CVS tags: pkgsrc-2026Q3-base, pkgsrc-2026Q3, pkgsrc-2026Q2-base, pkgsrc-2026Q2, pkgsrc-2026Q1-base, pkgsrc-2026Q1, HEAD
Diff to: previous 1.13: preferred, colored
Changes since revision 1.13: +3 -9 lines
mk: get rid of two more unconditional forks

Assume that CVS users know about 'update -d' by now and do not have
empty patches/ directories lying around. Worst case if they don't:
they end up with an unnecessary 'patch' tool dependency, which is
installed by default on NetBSD.

Assume that LOCALPATCHES users do not have empty directories lying
around.  Worst case: see above.

Revision 1.13: download - view: text, markup, annotated - select for diffs
Sun Jan 11 16:12:49 2026 UTC (10 months ago) by wiz
Branches: MAIN
Diff to: previous 1.12: preferred, colored
Changes since revision 1.12: +2 -2 lines
mk: remove support for patches/emul-*-patch-*

No files matching this pattern exist in pkgsrc, and its point is not
documented.

Revision 1.12: download - view: text, markup, annotated - select for diffs
Sat Apr 12 11:35:13 2025 UTC (19 months ago) by nia
Branches: MAIN
CVS tags: pkgsrc-2025Q4-base, pkgsrc-2025Q4, pkgsrc-2025Q3-base, pkgsrc-2025Q3, pkgsrc-2025Q2-base, pkgsrc-2025Q2
Diff to: previous 1.11: preferred, colored
Changes since revision 1.11: +2 -1 lines
mk: Revert patch change. Unsuitable as long as pkgsrc uses CVS

Revision 1.11: download - view: text, markup, annotated - select for diffs
Sat Apr 12 08:48:21 2025 UTC (19 months ago) by nia
Branches: MAIN
Diff to: previous 1.10: preferred, colored
Changes since revision 1.10: +2 -3 lines
mk: Optimise patch checks.

Previously a shell was forked to see if there were patch-* files, and
due to logic inefficiencies this was actually called twice.  Instead,
just check for the existence of the patches directory.

via dreckly, original author jperkin@

Revision 1.10: download - view: text, markup, annotated - select for diffs
Wed Feb 19 09:44:57 2025 UTC (20 months, 3 weeks ago) by wiz
Branches: MAIN
CVS tags: pkgsrc-2025Q1-base, pkgsrc-2025Q1
Diff to: previous 1.9: preferred, colored
Changes since revision 1.9: +3 -2 lines
Revert previous

mk: Optimise patch checks.

on request by jperkin because it might cause problems in CVS checkouts.

Revision 1.9: download - view: text, markup, annotated - select for diffs
Tue Feb 18 15:26:11 2025 UTC (20 months, 3 weeks ago) by wiz
Branches: MAIN
Diff to: previous 1.8: preferred, colored
Changes since revision 1.8: +2 -3 lines
mk: Optimise patch checks.

Previously a shell was forked to see if there were patch-* files, and
due to logic inefficiencies this was actually called twice.  Instead,
just check for the existence of the patches directory.

From Jonathan Perkin <jperkin@smartos.org>
via drecklypkg commit 083ee75b06d730d9379b96217a0bdafc3429e081

Revision 1.8: download - view: text, markup, annotated - select for diffs
Fri Oct 11 12:53:13 2024 UTC (2 years, 1 month ago) by jperkin
Branches: MAIN
CVS tags: pkgsrc-2024Q4-base, pkgsrc-2024Q4
Diff to: previous 1.7: preferred, colored
Changes since revision 1.7: +3 -2 lines
mk: Add mktool support to digest.

mktool is an optional external tool, available from pkgtools/mktool or
"cargo install mktool", that provides a "mktool digest" command that is
compatible with pkgtools/digest.

After installing, set TOOLS_PLATFORM.mktool=/path/to/mktool to enable it.

The benefit of using mktool for the DIGEST tool is that it eliminates the
dependency on pkgtools/digest for almost every package.  This has a
particular impact in bulk builds, where dependencies are installed fresh for
every single package build.

Currently "mktool digest" only implements the algorithms that are actually
used (or have been used in the past) by pkgsrc, though adding support for
e.g. tiger and whirlpool would be trivial.

Revision 1.7: download - view: text, markup, annotated - select for diffs
Mon Jun 9 14:47:03 2008 UTC (18 years, 5 months ago) by sketch
Branches: MAIN
CVS tags: pkgsrc-2024Q3-base, pkgsrc-2024Q3, pkgsrc-2024Q2-base, pkgsrc-2024Q2, pkgsrc-2024Q1-base, pkgsrc-2024Q1, pkgsrc-2023Q4-base, pkgsrc-2023Q4, pkgsrc-2023Q3-base, pkgsrc-2023Q3, pkgsrc-2023Q2-base, pkgsrc-2023Q2, pkgsrc-2023Q1-base, pkgsrc-2023Q1, pkgsrc-2022Q4-base, pkgsrc-2022Q4, pkgsrc-2022Q3-base, pkgsrc-2022Q3, pkgsrc-2022Q2-base, pkgsrc-2022Q2, pkgsrc-2022Q1-base, pkgsrc-2022Q1, pkgsrc-2021Q4-base, pkgsrc-2021Q4, pkgsrc-2021Q3-base, pkgsrc-2021Q3, pkgsrc-2021Q2-base, pkgsrc-2021Q2, pkgsrc-2021Q1-base, pkgsrc-2021Q1, pkgsrc-2020Q4-base, pkgsrc-2020Q4, pkgsrc-2020Q3-base, pkgsrc-2020Q3, pkgsrc-2020Q2-base, pkgsrc-2020Q2, pkgsrc-2020Q1-base, pkgsrc-2020Q1, pkgsrc-2019Q4-base, pkgsrc-2019Q4, pkgsrc-2019Q3-base, pkgsrc-2019Q3, pkgsrc-2019Q2-base, pkgsrc-2019Q2, pkgsrc-2019Q1-base, pkgsrc-2019Q1, pkgsrc-2018Q4-base, pkgsrc-2018Q4, pkgsrc-2018Q3-base, pkgsrc-2018Q3, pkgsrc-2018Q2-base, pkgsrc-2018Q2, pkgsrc-2018Q1-base, pkgsrc-2018Q1, pkgsrc-2017Q4-base, pkgsrc-2017Q4, pkgsrc-2017Q3-base, pkgsrc-2017Q3, pkgsrc-2017Q2-base, pkgsrc-2017Q2, pkgsrc-2017Q1-base, pkgsrc-2017Q1, pkgsrc-2016Q4-base, pkgsrc-2016Q4, pkgsrc-2016Q3-base, pkgsrc-2016Q3, pkgsrc-2016Q2-base, pkgsrc-2016Q2, pkgsrc-2016Q1-base, pkgsrc-2016Q1, pkgsrc-2015Q4-base, pkgsrc-2015Q4, pkgsrc-2015Q3-base, pkgsrc-2015Q3, pkgsrc-2015Q2-base, pkgsrc-2015Q2, pkgsrc-2015Q1-base, pkgsrc-2015Q1, pkgsrc-2014Q4-base, pkgsrc-2014Q4, pkgsrc-2014Q3-base, pkgsrc-2014Q3, pkgsrc-2014Q2-base, pkgsrc-2014Q2, pkgsrc-2014Q1-base, pkgsrc-2014Q1, pkgsrc-2013Q4-base, pkgsrc-2013Q4, pkgsrc-2013Q3-base, pkgsrc-2013Q3, pkgsrc-2013Q2-base, pkgsrc-2013Q2, pkgsrc-2013Q1-base, pkgsrc-2013Q1, pkgsrc-2012Q4-base, pkgsrc-2012Q4, pkgsrc-2012Q3-base, pkgsrc-2012Q3, pkgsrc-2012Q2-base, pkgsrc-2012Q2, pkgsrc-2012Q1-base, pkgsrc-2012Q1, pkgsrc-2011Q4-base, pkgsrc-2011Q4, pkgsrc-2011Q3-base, pkgsrc-2011Q3, pkgsrc-2011Q2-base, pkgsrc-2011Q2, pkgsrc-2011Q1-base, pkgsrc-2011Q1, pkgsrc-2010Q4-base, pkgsrc-2010Q4, pkgsrc-2010Q3-base, pkgsrc-2010Q3, pkgsrc-2010Q2-base, pkgsrc-2010Q2, pkgsrc-2010Q1-base, pkgsrc-2010Q1, pkgsrc-2009Q4-base, pkgsrc-2009Q4, pkgsrc-2009Q3-base, pkgsrc-2009Q3, pkgsrc-2009Q2-base, pkgsrc-2009Q2, pkgsrc-2009Q1-base, pkgsrc-2009Q1, pkgsrc-2008Q4-base, pkgsrc-2008Q4, pkgsrc-2008Q3-base, pkgsrc-2008Q3, pkgsrc-2008Q2-base, pkgsrc-2008Q2, cwrapper, cube-native-xorg-base, cube-native-xorg
Diff to: previous 1.6: preferred, colored
Changes since revision 1.6: +3 -1 lines
Wrap expansion of local patches inside LOCALPATCHES, given that it is undefined
by default.  Previous behaviour would try to echo /<pkgpath> 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.

Revision 1.6: download - view: text, markup, annotated - select for diffs
Thu Aug 16 16:29:27 2007 UTC (19 years, 3 months ago) by jlam
Branches: MAIN
CVS tags: pkgsrc-2008Q1-base, pkgsrc-2008Q1, pkgsrc-2007Q4-base, pkgsrc-2007Q4, pkgsrc-2007Q3-base, pkgsrc-2007Q3
Diff to: previous 1.5: preferred, colored
Changes since revision 1.5: +2 -2 lines
Allow for emulation-specific patches for binary-only packages.  The
patches are named emul-${EMUL_PLATFORM}-patch-* and are located in
${PATCHDIR}.

Revision 1.5: download - view: text, markup, annotated - select for diffs
Mon Aug 13 09:22:21 2007 UTC (19 years, 3 months ago) by rillig
Branches: MAIN
Diff to: previous 1.4: preferred, colored
Changes since revision 1.4: +11 -18 lines
Reworked the way the needed tools for the "patch" phase are determined.

Revision 1.4: download - view: text, markup, annotated - select for diffs
Fri May 25 14:21:32 2007 UTC (19 years, 5 months ago) by rillig
Branches: MAIN
CVS tags: pkgsrc-2007Q2-base, pkgsrc-2007Q2
Diff to: previous 1.3: preferred, colored
Changes since revision 1.3: +9 -1 lines
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?

Revision 1.3: download - view: text, markup, annotated - select for diffs
Thu Jul 13 14:02:34 2006 UTC (20 years, 4 months ago) by jlam
Branches: MAIN
CVS tags: pkgsrc-2007Q1-base, pkgsrc-2007Q1, pkgsrc-2006Q4-base, pkgsrc-2006Q4, pkgsrc-2006Q3-base, pkgsrc-2006Q3, jlam-pkgviews-base, jlam-pkgviews
Diff to: previous 1.2: preferred, colored
Changes since revision 1.2: +6 -1 lines
* 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}.

Revision 1.2: download - view: text, markup, annotated - select for diffs
Tue Jun 6 15:28:52 2006 UTC (20 years, 5 months ago) by jlam
Branches: MAIN
CVS tags: pkgsrc-2006Q2-base, pkgsrc-2006Q2
Diff to: previous 1.1: preferred, colored
Changes since revision 1.1: +6 -5 lines
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.<phase>.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.

Revision 1.1: download - view: text, markup, annotated - select for diffs
Tue Jun 6 04:48:19 2006 UTC (20 years, 5 months ago) by jlam
Branches: MAIN
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.

Diff request

This form allows you to request diffs between any two revisions of a file. You may select a symbolic revision name using the selection box or you may type in a numeric name using the type-in text box.

Log view options

CVSweb <webmaster@jp.NetBSD.org>