[pkgsrc/trunk]: pkgsrc/mk/tools Teach the tools framework about "flex" so tha...

[jlam <jlam%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/418a59881e2d
branches:  trunk
changeset: 494311:418a59881e2d
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Mon May 23 01:20:50 2005 +0000

description:
Teach the tools framework about "flex" so that packages can specify
that they require flex instead of any old lex.

diffstat:

 mk/tools/replace.mk         |  24 +++++++++++++++++++++++-
 mk/tools/tools.Darwin.mk    |   3 ++-
 mk/tools/tools.DragonFly.mk |   3 ++-
 mk/tools/tools.FreeBSD.mk   |   3 ++-
 mk/tools/tools.NetBSD.mk    |   3 ++-
 mk/tools/tools.OpenBSD.mk   |   3 ++-
 6 files changed, 33 insertions(+), 6 deletions(-)

diffs (130 lines):

diff -r 6a4805bc16ec -r 418a59881e2d mk/tools/replace.mk
--- a/mk/tools/replace.mk       Mon May 23 00:10:42 2005 +0000
+++ b/mk/tools/replace.mk       Mon May 23 01:20:50 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: replace.mk,v 1.93 2005/05/22 21:04:42 jlam Exp $
+# $NetBSD: replace.mk,v 1.94 2005/05/23 01:20:50 jlam Exp $
 #
 # Copyright (c) 2005 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -113,6 +113,9 @@
 .  if !empty(USE_TOOLS:Mbison-yacc)    # bison-yacc > yacc
 _USE_TOOLS:=   ${_USE_TOOLS:Nyacc}
 .  endif
+.  if !empty(USE_TOOLS:Mflex)          # flex > lex
+_USE_TOOLS:=   ${_USE_TOOLS:Nlex}
+.  endif
 .  if !empty(USE_TOOLS:Mgawk)          # gawk > awk
 _USE_TOOLS:=   ${_USE_TOOLS:Nawk}
 .  endif
@@ -435,6 +438,25 @@
 .  endif
 .endif
 
+.if !defined(TOOLS_IGNORE.flex) && !empty(_USE_TOOLS:Mflex)
+.  if !empty(PKGPATH:Mdevel/flex)
+MAKEFLAGS+=                    TOOLS_IGNORE.flex=
+.  elif !empty(_TOOLS_USE_PKGSRC.flex:M[yY][eE][sS])
+.    include "../../devel/flex/buildlink3.mk"
+_TOOLS_DEPENDS.flex=           # empty
+.      for _dep_ in ${BUILDLINK_DEPENDS.flex}
+_TOOLS_DEPENDS.flex+=          ${_dep_}:${BUILDLINK_PKGSRCDIR.flex}
+.      endfor
+.      undef _dep_
+TOOLS_DEPENDS.flex?=           ${_TOOLS_DEPENDS.flex}
+TOOLS_CREATE+=                 flex
+TOOLS_FIND_PREFIX+=            TOOLS_PREFIX.flex=flex
+TOOLS_REAL_CMD.flex=           ${TOOLS_PREFIX.flex}/bin/flex
+TOOLS_${_TOOLS_VARNAME.flex}=  ${TOOLS_REAL_CMD.flex}
+.  endif
+TOOLS_ALIASES.flex=            lex
+.endif
+
 .if !defined(TOOLS_IGNORE.gawk) && !empty(_USE_TOOLS:Mgawk)
 .  if !empty(PKGPATH:Mlang/gawk)
 MAKEFLAGS+=                    TOOLS_IGNORE.gawk=
diff -r 6a4805bc16ec -r 418a59881e2d mk/tools/tools.Darwin.mk
--- a/mk/tools/tools.Darwin.mk  Mon May 23 00:10:42 2005 +0000
+++ b/mk/tools/tools.Darwin.mk  Mon May 23 01:20:50 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: tools.Darwin.mk,v 1.10 2005/05/14 21:15:07 jlam Exp $
+# $NetBSD: tools.Darwin.mk,v 1.11 2005/05/23 01:20:50 jlam Exp $
 #
 # System-supplied tools for the Darwin (Mac OS X) operating system.
 
@@ -22,6 +22,7 @@
 TOOLS_PLATFORM.fgrep?=         /usr/bin/fgrep
 TOOLS_PLATFORM.file?=          /usr/bin/file
 TOOLS_PLATFORM.find?=          /usr/bin/find
+TOOLS_PLATFORM.flex?=          /usr/bin/lex
 TOOLS_PLATFORM.gmake?=         /usr/bin/gnumake
 TOOLS_PLATFORM.grep?=          /usr/bin/grep
 TOOLS_PLATFORM.gtar?=          /usr/bin/gnutar
diff -r 6a4805bc16ec -r 418a59881e2d mk/tools/tools.DragonFly.mk
--- a/mk/tools/tools.DragonFly.mk       Mon May 23 00:10:42 2005 +0000
+++ b/mk/tools/tools.DragonFly.mk       Mon May 23 01:20:50 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: tools.DragonFly.mk,v 1.12 2005/05/16 03:07:38 jlam Exp $
+# $NetBSD: tools.DragonFly.mk,v 1.13 2005/05/23 01:20:50 jlam Exp $
 #
 # System-supplied tools for the DragonFly operating system.
 
@@ -23,6 +23,7 @@
 TOOLS_PLATFORM.fgrep?=         /usr/bin/fgrep
 TOOLS_PLATFORM.file?=          /usr/bin/file
 TOOLS_PLATFORM.find?=          /usr/bin/find
+TOOLS_PLATFORM.flex?=          /usr/bin/lex
 TOOLS_PLATFORM.grep?=          /usr/bin/grep
 TOOLS_PLATFORM.gunzip?=                /usr/bin/gunzip -f
 TOOLS_PLATFORM.gzcat?=         /usr/bin/gzcat
diff -r 6a4805bc16ec -r 418a59881e2d mk/tools/tools.FreeBSD.mk
--- a/mk/tools/tools.FreeBSD.mk Mon May 23 00:10:42 2005 +0000
+++ b/mk/tools/tools.FreeBSD.mk Mon May 23 01:20:50 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: tools.FreeBSD.mk,v 1.12 2005/05/16 03:07:38 jlam Exp $
+# $NetBSD: tools.FreeBSD.mk,v 1.13 2005/05/23 01:20:50 jlam Exp $
 #
 # System-supplied tools for the FreeBSD operating system.
 
@@ -25,6 +25,7 @@
 TOOLS_PLATFORM.fgrep?=         /usr/bin/fgrep
 TOOLS_PLATFORM.file?=          /usr/bin/file
 TOOLS_PLATFORM.find?=          /usr/bin/find
+TOOLS_PLATFORM.flex?=          /usr/bin/lex
 TOOLS_PLATFORM.grep?=          /usr/bin/grep
 TOOLS_PLATFORM.gunzip?=                /usr/bin/gunzip -f
 TOOLS_PLATFORM.gzcat?=         /usr/bin/gzcat
diff -r 6a4805bc16ec -r 418a59881e2d mk/tools/tools.NetBSD.mk
--- a/mk/tools/tools.NetBSD.mk  Mon May 23 00:10:42 2005 +0000
+++ b/mk/tools/tools.NetBSD.mk  Mon May 23 01:20:50 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: tools.NetBSD.mk,v 1.13 2005/05/16 03:07:38 jlam Exp $
+# $NetBSD: tools.NetBSD.mk,v 1.14 2005/05/23 01:20:50 jlam Exp $
 #
 # System-supplied tools for the NetBSD operating system.
 
@@ -25,6 +25,7 @@
 TOOLS_PLATFORM.fgrep?=         /usr/bin/fgrep
 TOOLS_PLATFORM.file?=          /usr/bin/file
 TOOLS_PLATFORM.find?=          /usr/bin/find
+TOOLS_PLATFORM.flex?=          /usr/bin/lex
 .if !empty(MACHINE_PLATFORM:MNetBSD-1.[0-6]*-*)
 TOOLS_PLATFORM.gawk?=          ${TOOLS_PLATFORM.awk}
 .endif
diff -r 6a4805bc16ec -r 418a59881e2d mk/tools/tools.OpenBSD.mk
--- a/mk/tools/tools.OpenBSD.mk Mon May 23 00:10:42 2005 +0000
+++ b/mk/tools/tools.OpenBSD.mk Mon May 23 01:20:50 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: tools.OpenBSD.mk,v 1.11 2005/05/16 03:07:38 jlam Exp $
+# $NetBSD: tools.OpenBSD.mk,v 1.12 2005/05/23 01:20:50 jlam Exp $
 #
 # System-supplied tools for the OpenBSD operating system.
 
@@ -22,6 +22,7 @@
 TOOLS_PLATFORM.fgrep?=         /usr/bin/fgrep
 TOOLS_PLATFORM.file?=          /usr/bin/file
 TOOLS_PLATFORM.find?=          /usr/bin/find
+TOOLS_PLATFORM.flex?=          /usr/bin/lex
 TOOLS_PLATFORM.grep?=          /usr/bin/grep
 TOOLS_PLATFORM.gunzip?=                /usr/bin/gunzip -f
 TOOLS_PLATFORM.gzcat?=         /usr/bin/gzcat