CVS commit: pkgsrc/pkgtools/pkgdiff

["Amitai Schleier" <schmonz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   schmonz
Date:           Thu Nov 16 16:29:20 UTC 2023

Modified Files:
        pkgsrc/pkgtools/pkgdiff: Makefile

Log Message:
pkgdiff: adding diff to USE_TOOLS had broken gdiff selection. Fix.


To generate a diff of this commit:
cvs rdiff -u -r1.103 -r1.104 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.103 pkgsrc/pkgtools/pkgdiff/Makefile:1.104
--- pkgsrc/pkgtools/pkgdiff/Makefile:1.103      Wed Nov 15 16:15:47 2023
+++ pkgsrc/pkgtools/pkgdiff/Makefile    Thu Nov 16 16:29:20 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.103 2023/11/15 16:15:47 schmonz Exp $
+# $NetBSD: Makefile,v 1.104 2023/11/16 16:29:20 schmonz Exp $
 
 PKGNAME=       pkgdiff-1.11
 CATEGORIES=    pkgtools devel
@@ -12,7 +12,7 @@ NO_CONFIGURE= yes
 
 WRKSRC=                ${WRKDIR}
 USE_LANGUAGES= # empty
-USE_TOOLS+=    diff perl:run
+USE_TOOLS+=    diff:run perl:run
 
 MAKE_ENV+=     PKGSRCDIR=${_PKGSRCDIR:Q}
 
@@ -25,9 +25,9 @@ BUILD_DEFS+=  MANINSTALL
        ${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
+PKGDIFF_DIFF?= ${PREFIX}/bin/gdiff
 .else
-DIFF?=         diff
+PKGDIFF_DIFF?= ${DIFF}
 .endif
 
 INSTALLATION_DIRS=     bin
@@ -48,7 +48,7 @@ do-build:
                < ${FILESDIR}/${f}.pl                   \
                > ${WRKSRC}/${f}
 .endfor
-       ${SED} -e 's|@DIFF@|${DIFF}|g'                  \
+       ${SED} -e 's|@DIFF@|${PKGDIFF_DIFF}|g'          \
                -e 's|@SH@|${SH}|g'                     \
                < ${FILESDIR}/pkgdiff                   \
                > ${WRKSRC}/pkgdiff