pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/mk Convert "${ECHO} -n" to "${ECHO_N}", and introduce ...
details: https://anonhg.NetBSD.org/pkgsrc/rev/2a0a9ce7f1a9
branches: trunk
changeset: 472282:2a0a9ce7f1a9
user: tv <tv%pkgsrc.org@localhost>
date: Wed Apr 07 14:26:50 2004 +0000
description:
Convert "${ECHO} -n" to "${ECHO_N}", and introduce that into the defs.*
files. On most platforms this resolves back to "${ECHO} -n".
diffstat:
mk/bsd.pkg.mk | 58 +++++++++++++++++++++++++++---------------------------
mk/defs.AIX.mk | 3 +-
mk/defs.BSDOS.mk | 3 +-
mk/defs.Darwin.mk | 3 +-
mk/defs.FreeBSD.mk | 3 +-
mk/defs.IRIX.mk | 3 +-
mk/defs.Interix.mk | 3 +-
mk/defs.Linux.mk | 3 +-
mk/defs.NetBSD.mk | 3 +-
mk/defs.OpenBSD.mk | 3 +-
mk/defs.SunOS.mk | 3 +-
11 files changed, 49 insertions(+), 39 deletions(-)
diffs (298 lines):
diff -r ea774dd40ac4 -r 2a0a9ce7f1a9 mk/bsd.pkg.mk
--- a/mk/bsd.pkg.mk Wed Apr 07 14:25:41 2004 +0000
+++ b/mk/bsd.pkg.mk Wed Apr 07 14:26:50 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.pkg.mk,v 1.1437 2004/04/05 08:06:07 xtraeme Exp $
+# $NetBSD: bsd.pkg.mk,v 1.1438 2004/04/07 14:26:50 tv Exp $
#
# This file is in the public domain.
#
@@ -607,7 +607,7 @@
.endif
.if !defined(COMMENT)
-COMMENT!= (${CAT} ${PKGDIR}/COMMENT || ${ECHO} -n "(no description)") 2>/dev/null
+COMMENT!= (${CAT} ${PKGDIR}/COMMENT || ${ECHO_N} "(no description)") 2>/dev/null
.endif
DESCR= ${WRKDIR}/.DESCR
@@ -3345,7 +3345,7 @@
${PRE_ROOT_CMD}; \
fi; \
${ECHO_MSG} "${_PKGSRC_IN}> Becoming root@`${HOSTNAME_CMD}` to $$action ${PKGBASE}."; \
- ${ECHO_MSG} -n "`${ECHO} ${SU_CMD} | ${AWK} '{ print $$1 }'` ";\
+ ${ECHO_N} "`${ECHO} ${SU_CMD} | ${AWK} '{ print $$1 }'` ";\
${SU_CMD} "cd ${.CURDIR}; ${SETENV} PATH=$${PATH}:${SU_CMD_PATH_APPEND} ${MAKE} $$args ${MAKEFLAGS} $$realtarget $$realflags"; \
fi
@@ -3871,12 +3871,12 @@
newfile=${DISTINFO_FILE}.$$$$; \
if [ -f ${DISTINFO_FILE} ]; then \
${GREP} '^.NetBSD' ${DISTINFO_FILE} > $$newfile || \
- (${ECHO} -n "$$" > $$newfile && \
- ${ECHO} -n "NetBSD" >> $$newfile && \
+ (${ECHO_N} "$$" > $$newfile && \
+ ${ECHO_N} "NetBSD" >> $$newfile && \
${ECHO} "$$" >> $$newfile) \
else \
- ${ECHO} -n "$$" > $$newfile; \
- ${ECHO} -n "NetBSD" >> $$newfile; \
+ ${ECHO_N} "$$" > $$newfile; \
+ ${ECHO_N} "NetBSD" >> $$newfile; \
${ECHO} "$$" >> $$newfile; \
fi; \
${ECHO} "" >> $$newfile; \
@@ -3908,8 +3908,8 @@
if [ -f ${DISTINFO_FILE} ]; then \
${AWK} '$$2 !~ /\(patch-[a-z0-9]+\)/ { print $$0 }' < ${DISTINFO_FILE} >> $$newfile; \
else \
- ${ECHO} -n "$$" > $$newfile; \
- ${ECHO} -n "NetBSD" >> $$newfile; \
+ ${ECHO_N} "$$" > $$newfile; \
+ ${ECHO_N} "NetBSD" >> $$newfile; \
${ECHO} "$$" >> $$newfile; \
${ECHO} "" >> $$newfile; \
fi; \
@@ -4270,34 +4270,34 @@
.PHONY: describe
.if !target(describe)
describe:
- @${ECHO} -n "${PKGNAME}|${.CURDIR}|"; \
- ${ECHO} -n "${PREFIX}|"; \
- ${ECHO} -n ${COMMENT:Q}; \
+ @${ECHO_N} "${PKGNAME}|${.CURDIR}|"; \
+ ${ECHO_N} "${PREFIX}|"; \
+ ${ECHO_N} ${COMMENT:Q}; \
if [ -f ${DESCR_SRC} ]; then \
- ${ECHO} -n "|${DESCR_SRC}"; \
+ ${ECHO_N} "|${DESCR_SRC}"; \
else \
- ${ECHO} -n "|/dev/null"; \
+ ${ECHO_N} "|/dev/null"; \
fi; \
- ${ECHO} -n "|${MAINTAINER}|${CATEGORIES}|"; \
+ ${ECHO_N} "|${MAINTAINER}|${CATEGORIES}|"; \
case "A${BUILD_DEPENDS}B${DEPENDS}C" in \
ABC) ;; \
- *) cd ${.CURDIR} && ${ECHO} -n `${MAKE} ${MAKEFLAGS} build-depends-list | ${SORT} -u`;; \
+ *) cd ${.CURDIR} && ${ECHO_N} `${MAKE} ${MAKEFLAGS} build-depends-list | ${SORT} -u`;; \
esac; \
- ${ECHO} -n "|"; \
- if [ "${DEPENDS}" != "" ]; then \
- cd ${.CURDIR} && ${ECHO} -n `${MAKE} ${MAKEFLAGS} run-depends-list | ${SORT} -u`; \
+ ${ECHO_N} "|"; \
+ if [ "${DEPENDS}" != "" ]; then \
+ cd ${.CURDIR} && ${ECHO_N} `${MAKE} ${MAKEFLAGS} run-depends-list | ${SORT} -u`; \
fi; \
- ${ECHO} -n "|"; \
+ ${ECHO_N} "|"; \
if [ "${ONLY_FOR_ARCHS}" = "" ]; then \
- ${ECHO} -n "any"; \
+ ${ECHO_N} "any"; \
else \
- ${ECHO} -n "${ONLY_FOR_ARCHS}"; \
+ ${ECHO_N} "${ONLY_FOR_ARCHS}"; \
fi; \
- ${ECHO} -n "|"; \
+ ${ECHO_N} "|"; \
if [ "${NOT_FOR_OPSYS}" = "" ]; then \
- ${ECHO} -n "any"; \
+ ${ECHO_N} "any"; \
else \
- ${ECHO} -n "not ${NOT_FOR_OPSYS}"; \
+ ${ECHO_N} "not ${NOT_FOR_OPSYS}"; \
fi; \
${ECHO} ""
.endif
@@ -4416,8 +4416,8 @@
.if !target(print-build-depends-list)
print-build-depends-list:
. if defined(BUILD_DEPENDS) || defined(DEPENDS)
- @${ECHO} -n 'This package requires package(s) "'
- @${ECHO} -n `${MAKE} ${MAKEFLAGS} build-depends-list | ${SORT} -u`
+ @${ECHO_N} 'This package requires package(s) "'
+ @${ECHO_N} `${MAKE} ${MAKEFLAGS} build-depends-list | ${SORT} -u`
@${ECHO} '" to build.'
. endif
.endif
@@ -4426,8 +4426,8 @@
.if !target(print-run-depends-list)
print-run-depends-list:
. if defined(DEPENDS)
- @${ECHO} -n 'This package requires package(s) "'
- @${ECHO} -n `${MAKE} ${MAKEFLAGS} run-depends-list | ${SORT} -u`
+ @${ECHO_N} 'This package requires package(s) "'
+ @${ECHO_N} `${MAKE} ${MAKEFLAGS} run-depends-list | ${SORT} -u`
@${ECHO} '" to run.'
. endif
.endif
diff -r ea774dd40ac4 -r 2a0a9ce7f1a9 mk/defs.AIX.mk
--- a/mk/defs.AIX.mk Wed Apr 07 14:25:41 2004 +0000
+++ b/mk/defs.AIX.mk Wed Apr 07 14:26:50 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: defs.AIX.mk,v 1.5 2004/03/11 22:57:22 agc Exp $
+# $NetBSD: defs.AIX.mk,v 1.6 2004/04/07 14:26:51 tv Exp $
#
# Variable definitions for the AIX operating system.
@@ -16,6 +16,7 @@
DC?= /usr/bin/dc
DIRNAME?= /usr/bin/dirname
ECHO?= echo # Shell builtin
+ECHO_N?= ${ECHO} -n
.if exists(${LOCALBASE}/bin/egrep)
EGREP?= ${LOCALBASE}/bin/egrep
.else
diff -r ea774dd40ac4 -r 2a0a9ce7f1a9 mk/defs.BSDOS.mk
--- a/mk/defs.BSDOS.mk Wed Apr 07 14:25:41 2004 +0000
+++ b/mk/defs.BSDOS.mk Wed Apr 07 14:26:50 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: defs.BSDOS.mk,v 1.6 2004/03/11 22:57:22 agc Exp $
+# $NetBSD: defs.BSDOS.mk,v 1.7 2004/04/07 14:26:51 tv Exp $
#
# Variable definitions for the BSD/OS operating system.
@@ -20,6 +20,7 @@
DC?= /usr/bin/dc
DIRNAME?= /usr/bin/dirname
ECHO?= echo # Shell builtin
+ECHO_N?= ${ECHO} -n
EGREP?= /bin/egrep
EXPR?= /bin/expr
FALSE?= false # Shell builtin
diff -r ea774dd40ac4 -r 2a0a9ce7f1a9 mk/defs.Darwin.mk
--- a/mk/defs.Darwin.mk Wed Apr 07 14:25:41 2004 +0000
+++ b/mk/defs.Darwin.mk Wed Apr 07 14:26:50 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: defs.Darwin.mk,v 1.68 2004/04/01 03:04:13 danw Exp $
+# $NetBSD: defs.Darwin.mk,v 1.69 2004/04/07 14:26:51 tv Exp $
#
# Variable definitions for the Darwin operating system.
@@ -15,6 +15,7 @@
DC?= /usr/bin/dc
DIRNAME?= /usr/bin/dirname
ECHO?= echo # Shell builtin
+ECHO_N?= ${ECHO} -n
EGREP?= /usr/bin/egrep
EXPR?= /bin/expr
FALSE?= false # Shell builtin
diff -r ea774dd40ac4 -r 2a0a9ce7f1a9 mk/defs.FreeBSD.mk
--- a/mk/defs.FreeBSD.mk Wed Apr 07 14:25:41 2004 +0000
+++ b/mk/defs.FreeBSD.mk Wed Apr 07 14:26:50 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: defs.FreeBSD.mk,v 1.33 2004/03/11 22:57:22 agc Exp $
+# $NetBSD: defs.FreeBSD.mk,v 1.34 2004/04/07 14:26:51 tv Exp $
#
# Variable definitions for the FreeBSD operating system.
@@ -15,6 +15,7 @@
DC?= /usr/bin/dc
DIRNAME?= /usr/bin/dirname
ECHO?= echo # Shell builtin
+ECHO?= ${ECHO} -n
EGREP?= /usr/bin/egrep
EXPR?= /bin/expr
FALSE?= false # Shell builtin
diff -r ea774dd40ac4 -r 2a0a9ce7f1a9 mk/defs.IRIX.mk
--- a/mk/defs.IRIX.mk Wed Apr 07 14:25:41 2004 +0000
+++ b/mk/defs.IRIX.mk Wed Apr 07 14:26:50 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: defs.IRIX.mk,v 1.41 2004/03/11 22:57:22 agc Exp $
+# $NetBSD: defs.IRIX.mk,v 1.42 2004/04/07 14:26:51 tv Exp $
#
# Variable definitions for the IRIX operating system.
@@ -15,6 +15,7 @@
DC?= /usr/bin/dc
DIRNAME?= /usr/bin/dirname
ECHO?= /sbin/echo
+ECHO_N?= ${ECHO} -n
EGREP?= /bin/grep
EXPR?= /bin/expr
FALSE?= /usr/bin/false
diff -r ea774dd40ac4 -r 2a0a9ce7f1a9 mk/defs.Interix.mk
--- a/mk/defs.Interix.mk Wed Apr 07 14:25:41 2004 +0000
+++ b/mk/defs.Interix.mk Wed Apr 07 14:26:50 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: defs.Interix.mk,v 1.8 2004/03/30 15:29:26 tv Exp $
+# $NetBSD: defs.Interix.mk,v 1.9 2004/04/07 14:26:51 tv Exp $
#
# Variable definitions for the Interix operating system.
@@ -15,6 +15,7 @@
DC?= /bin/dc
DIRNAME?= /bin/dirname
ECHO?= echo # Shell builtin
+ECHO_N?= /bin/printf %s # does not support "echo -n"
EGREP?= /bin/egrep
EXPR?= /bin/expr
FALSE?= false # Shell builtin
diff -r ea774dd40ac4 -r 2a0a9ce7f1a9 mk/defs.Linux.mk
--- a/mk/defs.Linux.mk Wed Apr 07 14:25:41 2004 +0000
+++ b/mk/defs.Linux.mk Wed Apr 07 14:26:50 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: defs.Linux.mk,v 1.66 2004/03/11 22:57:22 agc Exp $
+# $NetBSD: defs.Linux.mk,v 1.67 2004/04/07 14:26:51 tv Exp $
#
# Variable definitions for the Linux operating system.
@@ -23,6 +23,7 @@
DC?= /usr/bin/dc
DIRNAME?= /usr/bin/dirname
ECHO?= /bin/echo
+ECHO_N?= ${ECHO} -n
.if exists(/bin/egrep)
EGREP?= /bin/egrep
.elif exists(/usr/bin/egrep)
diff -r ea774dd40ac4 -r 2a0a9ce7f1a9 mk/defs.NetBSD.mk
--- a/mk/defs.NetBSD.mk Wed Apr 07 14:25:41 2004 +0000
+++ b/mk/defs.NetBSD.mk Wed Apr 07 14:26:50 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: defs.NetBSD.mk,v 1.61 2004/03/11 22:57:22 agc Exp $
+# $NetBSD: defs.NetBSD.mk,v 1.62 2004/04/07 14:26:51 tv Exp $
#
# Variable definitions for the NetBSD operating system.
@@ -19,6 +19,7 @@
DC?= /usr/bin/dc
DIRNAME?= /usr/bin/dirname
ECHO?= echo # Shell builtin
+ECHO_N?= ${ECHO} -n
EGREP?= /usr/bin/egrep
EXPR?= /bin/expr
FALSE?= false # Shell builtin
diff -r ea774dd40ac4 -r 2a0a9ce7f1a9 mk/defs.OpenBSD.mk
--- a/mk/defs.OpenBSD.mk Wed Apr 07 14:25:41 2004 +0000
+++ b/mk/defs.OpenBSD.mk Wed Apr 07 14:26:50 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: defs.OpenBSD.mk,v 1.29 2004/03/11 22:57:22 agc Exp $
+# $NetBSD: defs.OpenBSD.mk,v 1.30 2004/04/07 14:26:51 tv Exp $
#
# Variable definitions for the OpenBSD operating system.
@@ -15,6 +15,7 @@
DC?= /usr/bin/dc
DIRNAME?= /usr/bin/dirname
ECHO?= echo # Shell builtin
+ECHO_N?= ${ECHO} -n
EGREP?= /usr/bin/egrep
EXPR?= /bin/expr
FGREP?= /usr/bin/fgrep
diff -r ea774dd40ac4 -r 2a0a9ce7f1a9 mk/defs.SunOS.mk
--- a/mk/defs.SunOS.mk Wed Apr 07 14:25:41 2004 +0000
+++ b/mk/defs.SunOS.mk Wed Apr 07 14:26:50 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: defs.SunOS.mk,v 1.82 2004/03/27 08:04:48 grant Exp $
+# $NetBSD: defs.SunOS.mk,v 1.83 2004/04/07 14:26:51 tv Exp $
#
# Variable definitions for the SunOS/Solaris operating system.
@@ -15,6 +15,7 @@
DC?= /usr/bin/dc
DIRNAME?= /usr/bin/dirname
ECHO?= /usr/ucb/echo
+ECHO_N?= ${ECHO} -n
EGREP?= /usr/xpg4/bin/grep -E
EXPR?= /usr/xpg4/bin/expr
FALSE?= /usr/bin/false
Home |
Main Index |
Thread Index |
Old Index