pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/mk/tools Teach the tools framework about "diff".
details: https://anonhg.NetBSD.org/pkgsrc/rev/3070cb9ee389
branches: trunk
changeset: 496154:3070cb9ee389
user: jlam <jlam%pkgsrc.org@localhost>
date: Thu Jun 23 20:39:39 2005 +0000
description:
Teach the tools framework about "diff".
diffstat:
mk/tools/defaults.mk | 4 +++-
mk/tools/replace.mk | 14 +++++++++++++-
2 files changed, 16 insertions(+), 2 deletions(-)
diffs (53 lines):
diff -r 5b659188560d -r 3070cb9ee389 mk/tools/defaults.mk
--- a/mk/tools/defaults.mk Thu Jun 23 20:37:23 2005 +0000
+++ b/mk/tools/defaults.mk Thu Jun 23 20:39:39 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: defaults.mk,v 1.30 2005/06/17 17:05:18 jlam Exp $
+# $NetBSD: defaults.mk,v 1.31 2005/06/23 20:39:39 jlam Exp $
#
# Copyright (c) 2005 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -64,6 +64,7 @@
_TOOLS_VARNAME.cp= CP
_TOOLS_VARNAME.cut= CUT
_TOOLS_VARNAME.date= DATE
+_TOOLS_VARNAME.diff= DIFF
_TOOLS_VARNAME.dirname= DIRNAME
_TOOLS_VARNAME.echo= ECHO
_TOOLS_VARNAME.egrep= EGREP
@@ -137,6 +138,7 @@
_TOOLS_VARNAME_GNU.chmod= CHMOD
_TOOLS_VARNAME_GNU.cmp= CMP
_TOOLS_VARNAME_GNU.cp= CP
+_TOOLS_VARNAME_GNU.diff= DIFF
_TOOLS_VARNAME_GNU.echo= ECHO ac_cv_path_ECHO
_TOOLS_VARNAME_GNU.egrep= EGREP ac_cv_path_EGREP
_TOOLS_VARNAME_GNU.env= SETENV ENV_PROG ac_cv_path_ENV
diff -r 5b659188560d -r 3070cb9ee389 mk/tools/replace.mk
--- a/mk/tools/replace.mk Thu Jun 23 20:37:23 2005 +0000
+++ b/mk/tools/replace.mk Thu Jun 23 20:39:39 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: replace.mk,v 1.101 2005/06/23 20:35:55 jlam Exp $
+# $NetBSD: replace.mk,v 1.102 2005/06/23 20:39:39 jlam Exp $
#
# Copyright (c) 2005 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -347,6 +347,18 @@
. endif
.endif
+.if !defined(TOOLS_IGNORE.diff) && !empty(_USE_TOOLS:Mdiff)
+. if !empty(PKGPATH:Mdevel/diffutils)
+MAKEFLAGS+= TOOLS_IGNORE.diff=
+. elif !empty(_TOOLS_USE_PKGSRC.diff:M[yY][eE][sS])
+TOOLS_DEPENDS.diff?= diffutils>=2.8.1:../../devel/diffutils
+TOOLS_CREATE+= diff
+TOOLS_FIND_PREFIX+= TOOLS_PREFIX.diff=diffutils
+TOOLS_REAL_CMD.diff= ${TOOLS_PREFIX.diff}/bin/${GNU_PROGRAM_PREFIX}diff
+TOOLS_${_TOOLS_VARNAME.diff}= ${TOOLS_REAL_CMD.diff}
+. endif
+.endif
+
.if !defined(TOOLS_IGNORE.dirname) && !empty(_USE_TOOLS:Mdirname)
. if !empty(PKGPATH:Msysutils/coreutils)
MAKEFLAGS+= TOOLS_IGNORE.dirname=
Home |
Main Index |
Thread Index |
Old Index