diff options
| author | tnn <tnn@pkgsrc.org> | 2022-11-06 13:22:01 +0000 |
|---|---|---|
| committer | tnn <tnn@pkgsrc.org> | 2022-11-06 13:22:01 +0000 |
| commit | 853939af39b294edde10a7b2eadd0f8100eee294 (patch) | |
| tree | 7b90f52e3a619e90c8e9e00e2e19b210be4e52ff /pkgtools | |
| parent | 6e6a77c853686f897136dde56d4450e227c26023 (diff) | |
| download | pkgsrc-853939af39b294edde10a7b2eadd0f8100eee294.tar.gz | |
pkgdiff: fix on macOS >= 13
Apple switched from GNU diff to their own diff.
It does not support combining -q with -U so depend on GNU diff from pkgsrc.
Diffstat (limited to 'pkgtools')
| -rw-r--r-- | pkgtools/pkgdiff/Makefile | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/pkgtools/pkgdiff/Makefile b/pkgtools/pkgdiff/Makefile index 208dabeaf50..0c964d04793 100644 --- a/pkgtools/pkgdiff/Makefile +++ b/pkgtools/pkgdiff/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.101 2022/06/28 11:35:25 wiz Exp $ +# $NetBSD: Makefile,v 1.102 2022/11/06 13:22:01 tnn Exp $ PKGNAME= pkgdiff-1.10 -PKGREVISION= 1 +PKGREVISION= 2 CATEGORIES= pkgtools devel MAINTAINER= wiz@NetBSD.org @@ -21,7 +21,10 @@ MAKE_ENV+= PKGSRCDIR=${_PKGSRCDIR:Q} BUILD_DEFS+= MANINSTALL -.if ${OPSYS} == "SunOS" || ${OPSYS} == "OSF1" +.if \ + ${OPSYS} == "SunOS" || \ + ${OPSYS} == "OSF1" || \ + ${OPSYS} == "Darwin" && empty(OSX_VERSION:M[0-9].*) && empty(OSX_VERSION:M1[0-2].*) DEPENDS+= diffutils-[0-9]*:../../devel/diffutils DIFF?= ${PREFIX}/bin/gdiff .else |