diff options
| author | agc <agc@pkgsrc.org> | 2001-05-24 13:58:18 +0000 |
|---|---|---|
| committer | agc <agc@pkgsrc.org> | 2001-05-24 13:58:18 +0000 |
| commit | c759c2faf44ed8de34843937b08232107d3ca99d (patch) | |
| tree | a472693644a03652e4bf90e11b4a9b3a2bde6d2d /mk | |
| parent | e8e5fab5c3b7085afba6de86951737cf74d40964 (diff) | |
| download | pkgsrc-c759c2faf44ed8de34843937b08232107d3ca99d.tar.gz | |
To check patches using the checkpatch target, a special version of
patch(1) is needed, which supports -C (which checks that the patches
would apply cleanly). As we use message digests to verify our
patches, and as we don't have a modified patch on NetBSD, Solaris and
Linux, remove the checkpatch target, and all references to the
PATCH_CHECK_ONLY definition.
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/bsd.pkg.mk | 17 |
1 files changed, 1 insertions, 16 deletions
diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk index e8158b8cc5f..95c799ea1d8 100644 --- a/mk/bsd.pkg.mk +++ b/mk/bsd.pkg.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.pkg.mk,v 1.747 2001/05/24 13:28:36 agc Exp $ +# $NetBSD: bsd.pkg.mk,v 1.748 2001/05/24 13:58:18 agc Exp $ # # This file is in the public domain. # @@ -344,11 +344,6 @@ PATCH_DIST_ARGS+= --batch .endif PATCH_FUZZ_FACTOR?= -F0 # Default to zero fuzz -.if defined(PATCH_CHECK_ONLY) -PATCH_ARGS+= -C -PATCH_DIST_ARGS+= -C -.endif - # If the distfile has a tar.bz2 suffix, use bzcat in preference to gzcat, # pulling in the "bzip2" package if necessary. [Note: this is only for # the benefit of pre 1.5 NetBSD systems. "gzcat" on newer systems happily @@ -1709,7 +1704,6 @@ _PORT_USE: .USE ${SCRIPTDIR}/${.TARGET:S/^real-/post-/}; \ fi .if !make(real-fetch) \ - && (!make(real-patch) || !defined(PATCH_CHECK_ONLY)) \ && (!make(real-package) || !defined(PACKAGE_NOINSTALL)) ${_PKG_SILENT}${_PKG_DEBUG} \ ${TOUCH} ${TOUCH_FLAGS} ${WRKDIR}/.${.TARGET:S/^real-//}_done @@ -2150,15 +2144,6 @@ post-${name}: .endfor -# Checkpatch -# -# Special target to verify patches - -.if !target(checkpatch) -checkpatch: - ${_PKG_SILENT}${_PKG_DEBUG}cd ${.CURDIR} && ${MAKE} ${MAKEFLAGS} PATCH_CHECK_ONLY=yes ${MAKEFLAGS} patch -.endif - # Reinstall # # Special target to re-run install |