diff options
| author | jlam <jlam@pkgsrc.org> | 2005-05-14 22:32:59 +0000 |
|---|---|---|
| committer | jlam <jlam@pkgsrc.org> | 2005-05-14 22:32:59 +0000 |
| commit | 380f32d1554114a0659b48b6343c3dda24a2b629 (patch) | |
| tree | 95d7b3ec1196bf26344dd44d0b5c7a1ea67042ac /mk/bsd.pkg.patch.mk | |
| parent | 3d3f88a72eae56baa9fd04ab23b2d5cf5a812821 (diff) | |
| download | pkgsrc-380f32d1554114a0659b48b6343c3dda24a2b629.tar.gz | |
We also need a patch tool if there are patches for the package in
${LOCALPATCHES}.
Diffstat (limited to 'mk/bsd.pkg.patch.mk')
| -rw-r--r-- | mk/bsd.pkg.patch.mk | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/mk/bsd.pkg.patch.mk b/mk/bsd.pkg.patch.mk index 3038968f54d..418ae7a4c45 100644 --- a/mk/bsd.pkg.patch.mk +++ b/mk/bsd.pkg.patch.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.pkg.patch.mk,v 1.3 2005/05/14 22:31:04 jlam Exp $ +# $NetBSD: bsd.pkg.patch.mk,v 1.4 2005/05/14 22:32:59 jlam Exp $ # # This Makefile fragment is included by bsd.pkg.mk and defines the # relevant variables and targets for the "patch" phase. @@ -61,7 +61,8 @@ # .if (defined(PATCHFILES) && !empty(PATCHFILES)) || \ - (defined(PATCHDIR) && exists(${PATCHDIR})) + (defined(PATCHDIR) && exists(${PATCHDIR})) || \ + (defined(LOCALPATCHES) && exists(${LOCALPATCHES}/${PKGPATH})) . if empty(_USE_NEW_TOOLS:M[yY][eE][sS]) USE_GNU_TOOLS+= patch . else @@ -168,11 +169,6 @@ fi; exit 1 # Patch -# LOCALPATCHES contains the location of local patches to packages -# that are maintained in a directory tree reflecting the same -# hierarchy as the pkgsrc tree, i.e. local patches for www/apache -# would be found as ${LOCALPATCHES}/www/apache/*. -# .if defined(LOCALPATCHES) _DFLT_LOCALPATCHFILES= ${LOCALPATCHES}/${PKGPATH}/* _LOCALPATCHFILES= ${_DFLT_LOCALPATCHFILES} |