CVS commit: pkgsrc/pkgtools/pkgdiff

["Tobias Nygren" <tnn%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   tnn
Date:           Sun Nov  6 13:22:01 UTC 2022

Modified Files:
        pkgsrc/pkgtools/pkgdiff: Makefile

Log Message:
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.


To generate a diff of this commit:
cvs rdiff -u -r1.101 -r1.102 pkgsrc/pkgtools/pkgdiff/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/pkgtools/pkgdiff/Makefile
diff -u pkgsrc/pkgtools/pkgdiff/Makefile:1.101 pkgsrc/pkgtools/pkgdiff/Makefile:1.102
--- pkgsrc/pkgtools/pkgdiff/Makefile:1.101      Tue Jun 28 11:35:25 2022
+++ pkgsrc/pkgtools/pkgdiff/Makefile    Sun Nov  6 13:22:01 2022
@@ -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 @@ 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