pkgsrc-Changes-HG archive

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

[pkgsrc/trunk]: pkgsrc/mk/tools Teach replace.mk about replacements for SH (s...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/bc4b8f37ee87
branches:  trunk
changeset: 493089:bc4b8f37ee87
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Wed Apr 27 04:47:41 2005 +0000

description:
Teach replace.mk about replacements for SH (shells/pdksh) and SHLOCK
(pkgtools/shlock).

diffstat:

 mk/tools/replace.mk |  36 ++++++++++++++++++++++++++++++++++--
 1 files changed, 34 insertions(+), 2 deletions(-)

diffs (71 lines):

diff -r 84820d3cd3cb -r bc4b8f37ee87 mk/tools/replace.mk
--- a/mk/tools/replace.mk       Wed Apr 27 03:41:17 2005 +0000
+++ b/mk/tools/replace.mk       Wed Apr 27 04:47:41 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: replace.mk,v 1.31 2005/04/27 03:41:17 jlam Exp $
+# $NetBSD: replace.mk,v 1.32 2005/04/27 04:47:41 jlam Exp $
 #
 # This Makefile fragment handles "replacements" of system-supplied
 # tools with pkgsrc versions.  The replacements are placed under
@@ -52,7 +52,7 @@
 #
 _TOOLS_REPLACE_LIST=   bison cmp egrep fgrep file find gawk gm4 gmake  \
                        grep gsed gtar gunzip gzcat gzip lex patch pax  \
-                       perl tbl xargs yacc
+                       perl sh shlock tbl xargs yacc
 
 # "TOOL" variable names associated with each of the tools
 _TOOLS_VARNAME.bison=  YACC
@@ -74,6 +74,8 @@
 _TOOLS_VARNAME.patch=  PATCH
 _TOOLS_VARNAME.pax=    PAX
 _TOOLS_VARNAME.perl=   PERL5
+_TOOLS_VARNAME.sh=     SH
+_TOOLS_VARNAME.shlock= SHLOCK
 _TOOLS_VARNAME.tbl=    TBL
 _TOOLS_VARNAME.xargs=  XARGS
 _TOOLS_VARNAME.yacc=   YACC
@@ -123,6 +125,9 @@
                                Interix-*-* Linux-*-* NetBSD-*-*        \
                                OpenBSD-*-*
 _TOOLS_USE_PLATFORM.perl=      # This should always be empty.
+_TOOLS_USE_PLATFORM.sh=                *-*-*   # every platform has a Bourne shell
+_TOOLS_USE_PLATFORM.shlock=    AIX-*-* Darwin-*-* DragonFly-*-*        \
+                               FreeBSD-*-* NetBSD-*-*
 _TOOLS_USE_PLATFORM.tbl=       DragonFly-*-* FreeBSD-*-* NetBSD-*-*    \
                                OpenBSD-*-*
 _TOOLS_USE_PLATFORM.xargs=     ${_TOOLS_USE_PLATFORM.find}
@@ -427,6 +432,33 @@
 .  endif
 .endif
 
+.if !defined(TOOLS_IGNORE.sh) && !empty(USE_TOOLS:Msh)
+.  if !empty(PKGPATH:Mshells/pdksh)
+MAKEFLAGS+=                    TOOLS_IGNORE.sh=
+.  elif !empty(_TOOLS_USE_PKGSRC.sh:M[yY][eE][sS])
+${TOOLS_DEPENDS.sh}+=          pdksh>=5.2.14:../../shells/pdksh
+TOOLS_SYMLINK+=                        sh
+TOOLS_REAL_CMD.sh=             ${LOCALBASE}/bin/pdksh
+.    if exists(${TOOLS_REAL_CMD.sh})
+${_TOOLS_VARNAME.sh}=          ${TOOLS_REAL_CMD.sh}
+.    endif
+.  endif
+TOOLS_CMD.sh=                  ${TOOLS_DIR}/bin/sh
+.endif
+
+.if !defined(TOOLS_IGNORE.shlock) && !empty(USE_TOOLS:Mshlock)
+.  if !empty(PKGPATH:Mpkgtools/shlock)
+MAKEFLAGS+=                    TOOLS_IGNORE.shlock=
+.  elif !empty(_TOOLS_USE_PKGSRC.shlock:M[yY][eE][sS])
+${TOOLS_DEPENDS.shlock}+=      shlock>=20020114:../../pkgtools/shlock
+TOOLS_SYMLINK+=                        shlock
+TOOLS_REAL_CMD.shlock=         ${LOCALBASE}/bin/shlock
+.    if exists(${TOOLS_REAL_CMD.shlock})
+${_TOOLS_VARNAME.shlock}=      ${TOOLS_REAL_CMD.shlock}
+.    endif
+.  endif
+.endif
+
 .if !defined(TOOLS_IGNORE.tbl) && !empty(USE_TOOLS:Mtbl)
 .  if !empty(PKGPATH:Mtextproc/groff)
 MAKEFLAGS+=                    TOOLS_IGNORE.tbl=



Home | Main Index | Thread Index | Old Index