summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--mk/bsd.pkg.mk58
-rw-r--r--mk/defs.AIX.mk3
-rw-r--r--mk/defs.BSDOS.mk3
-rw-r--r--mk/defs.Darwin.mk3
-rw-r--r--mk/defs.FreeBSD.mk3
-rw-r--r--mk/defs.IRIX.mk3
-rw-r--r--mk/defs.Interix.mk3
-rw-r--r--mk/defs.Linux.mk3
-rw-r--r--mk/defs.NetBSD.mk3
-rw-r--r--mk/defs.OpenBSD.mk3
-rw-r--r--mk/defs.SunOS.mk3
11 files changed, 49 insertions, 39 deletions
diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk
index 64cf34504c7..0d55f53f5bb 100644
--- a/mk/bsd.pkg.mk
+++ b/mk/bsd.pkg.mk
@@ -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 @@ SCRIPTS_ENV+= ${INSTALL_MACROS}
.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 @@ _SU_TARGET= \
${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 @@ makesum: fetch uptodate-digest
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 @@ makepatchsum mps: uptodate-digest
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 @@ binpkg-list:
.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 @@ show-vars:
.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 @@ print-build-depends-list:
.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 --git a/mk/defs.AIX.mk b/mk/defs.AIX.mk
index 77271f926a2..9c7216622a0 100644
--- a/mk/defs.AIX.mk
+++ b/mk/defs.AIX.mk
@@ -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 @@ DATE?= /bin/date
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 --git a/mk/defs.BSDOS.mk b/mk/defs.BSDOS.mk
index 287d03fcc9a..2bae4bd9364 100644
--- a/mk/defs.BSDOS.mk
+++ b/mk/defs.BSDOS.mk
@@ -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 @@ DATE?= /bin/date
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 --git a/mk/defs.Darwin.mk b/mk/defs.Darwin.mk
index ea759cdd768..6e3cdff584b 100644
--- a/mk/defs.Darwin.mk
+++ b/mk/defs.Darwin.mk
@@ -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 @@ DATE?= /bin/date
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 --git a/mk/defs.FreeBSD.mk b/mk/defs.FreeBSD.mk
index 2e20eda822f..fb9c9f8c0a5 100644
--- a/mk/defs.FreeBSD.mk
+++ b/mk/defs.FreeBSD.mk
@@ -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 @@ DATE?= /bin/date
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 --git a/mk/defs.IRIX.mk b/mk/defs.IRIX.mk
index f2ece5a9212..3901cea55be 100644
--- a/mk/defs.IRIX.mk
+++ b/mk/defs.IRIX.mk
@@ -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 @@ DATE?= /sbin/date
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 --git a/mk/defs.Interix.mk b/mk/defs.Interix.mk
index 2bd50810c83..18099cdd992 100644
--- a/mk/defs.Interix.mk
+++ b/mk/defs.Interix.mk
@@ -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 @@ DATE?= /bin/date
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 --git a/mk/defs.Linux.mk b/mk/defs.Linux.mk
index 61a44466a23..fb3d6ed5e34 100644
--- a/mk/defs.Linux.mk
+++ b/mk/defs.Linux.mk
@@ -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 @@ DATE?= /bin/date
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 --git a/mk/defs.NetBSD.mk b/mk/defs.NetBSD.mk
index b41abd519a6..bf9f30432d2 100644
--- a/mk/defs.NetBSD.mk
+++ b/mk/defs.NetBSD.mk
@@ -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 @@ DATE?= /bin/date
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 --git a/mk/defs.OpenBSD.mk b/mk/defs.OpenBSD.mk
index 7107d31b4ae..766dc1ba624 100644
--- a/mk/defs.OpenBSD.mk
+++ b/mk/defs.OpenBSD.mk
@@ -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 @@ DATE?= /bin/date
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 --git a/mk/defs.SunOS.mk b/mk/defs.SunOS.mk
index 7ddec445a2f..7c1945a2ad3 100644
--- a/mk/defs.SunOS.mk
+++ b/mk/defs.SunOS.mk
@@ -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 @@ DATE?= /usr/xpg4/bin/date
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
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-10 19:00:42 +0000