Commit graph

21 commits

Author SHA1 Message Date
jlam
f6808df1ba Move more "patch"-related variables and targets out of bsd.pkg.mk and into
bsd.pkg.patch.mk.
2006-01-19 20:32:17 +00:00
rillig
e8a2b78e6c Removed redundant braces. Reindented the code. 2005-09-28 10:09:33 +00:00
rillig
b9a62f73c9 Tightened the code and improved the diagnostics. 2005-09-28 10:06:05 +00:00
rillig
a9eae300b4 Fixed a bug which prevented modified patches from stopping the build
process. In a pipe, each command may be executed as a child process.
Therefore variable assignments do not affect the parent process.
2005-09-22 18:21:00 +00:00
snj
3b32d21e19 Relax the glob in ${LOCALPATCHES}/${PKGPATH} to catch all files.
This is a return to the behavior that we had prior to revision 1.5.
2005-07-31 05:26:50 +00:00
jlam
bf9129c41e Drop distinction between PKGSRC_USE_TOOLS and USE_TOOLS by making
PKGSRC_USE_TOOLS go away.  There is now only a single USE_TOOLS variable
that specifies all of the tools we need to build/run the package.
2005-07-15 18:27:48 +00:00
jlam
55c85320ca Separate the message from the do-distribution-patch and do-pkgsrc-patch
targets so that if they're overridden in the package Makefile, the
message is still printed.
2005-06-12 03:59:42 +00:00
jlam
7969727e46 Rename "apply-distribution-patches" and "apply-pkgsrc-patches" targets
to "do-distribution-patch" and "do-pkgsrc-patch", respectively, and
allow them to be overridden by the package Makefile.  This allows for
more fine-grained overriding of the patch process.
2005-06-12 03:38:04 +00:00
jlam
c6f8fbdaa0 Print the full path to broken or modified patches that aren't applied.
This also fixes the problem where the names of broken local patches
(in ${LOCALPATCHES}) weren't printed correctly in the error message.
2005-06-08 17:52:50 +00:00
rillig
e3aa46eedc Added a leading underscore to the names of the *_COOKIE variables, as they
are not part of the public interface.
2005-06-04 20:56:47 +00:00
jlam
9f94b112f0 Remove the old tools framework and references to _USE_NEW_TOOLS. 2005-05-22 19:11:12 +00:00
jlam
2fdd3b1275 Make a bad patch cause a fatal error again. This fixes a bug introduced
in revision 1.5 and fixes PR pkg/30297.
2005-05-21 21:40:45 +00:00
jlam
d3bca7af85 Missed (harmless) rename of "fuzz" to "fuzz_flags". 2005-05-17 19:11:02 +00:00
jlam
9513935c48 Simplify by using a for loop instead of "set -- ...; while ... done".
Also, rename "fuzz" to "fuzz_flags" to clarify that it's a set of flags
and should be used unquoted.  Output from rilligd :)
2005-05-17 19:08:30 +00:00
jlam
62c3dfb798 Save the names of the patches applied during the patch phase into the
patch cookie file, one per line.  A package with no patches applied
will have a patch cookie file with no lines (zero bytes).
2005-05-17 06:31:00 +00:00
jlam
25dcb2dc7a We only need to run the apply-pkgsrc-patches target if the patches
directory or the local patches directory exist.  Also, emit the message
informing the user that pkgsrc patches are being applied that was lost
in the previous commit.
2005-05-17 05:00:06 +00:00
jlam
a546eb83fd Split up the do-patch target into two distinct targets --
apply-distribution-patches and apply-pkgsrc-patches.  Rewrite the
latter code to be more "whitespace-friendly" and to not need to invoke
${AWK} as many times.  Drop support for PKGSRC_SHOW_PATCH_ERRORMSG
and simply always show the error message.
2005-05-17 04:45:53 +00:00
jlam
380f32d155 We also need a patch tool if there are patches for the package in
${LOCALPATCHES}.
2005-05-14 22:32:59 +00:00
jlam
3d3f88a72e Add the *cat tools needed by the patch phase to output the contents of
distribution patches to stdout.
2005-05-14 22:31:04 +00:00
jlam
72de3f921e Document the variables and targets defined by bsd.pkg.patch.mk. 2005-05-14 22:12:01 +00:00
jlam
45e08b1210 Separate out the variables and targets for the "patch" phase into a
separate file pkgsrc/mk/bsd.pkg.patch.mk.  Also, include this file
ahead of the inclusion of bsd.tools.mk so that tools required to
patch are created by the tools framework.
2005-05-14 19:37:53 +00:00