pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/pkgtools/pkgdiff pkgdiff: fix on macOS >= 13



details:   https://anonhg.NetBSD.org/pkgsrc/rev/0f27ca320a29
branches:  trunk
changeset: 387756:0f27ca320a29
user:      tnn <tnn%pkgsrc.org@localhost>
date:      Sun Nov 06 13:22:01 2022 +0000

description:
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:

 pkgtools/pkgdiff/Makefile |  9 ++++++---
 1 files changed, 6 insertions(+), 3 deletions(-)

diffs (25 lines):

diff -r af2cd2f56343 -r 0f27ca320a29 pkgtools/pkgdiff/Makefile
--- a/pkgtools/pkgdiff/Makefile Sun Nov 06 12:39:14 2022 +0000
+++ b/pkgtools/pkgdiff/Makefile Sun Nov 06 13:22:01 2022 +0000
@@ -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@localhost
@@ -21,7 +21,10 @@
 
 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



Home | Main Index | Thread Index | Old Index