summaryrefslogtreecommitdiff
path: root/mk/package
diff options
context:
space:
mode:
authorjlam <jlam@pkgsrc.org>2006-06-05 22:49:44 +0000
committerjlam <jlam@pkgsrc.org>2006-06-05 22:49:44 +0000
commit3fbe129b6907d6614ddfd6614d913a2f8e24fa7f (patch)
tree61326011858d5a7f2615f5cdc8a6b305565b83fb /mk/package
parent870c059e4b770f46324fa56ec78a67e1b3583e46 (diff)
downloadpkgsrc-3fbe129b6907d6614ddfd6614d913a2f8e24fa7f.tar.gz
Use PHASE_MSG, STEP_MSG, WARNING_MSG, and ERROR_MSG in place of ECHO_MSG
in various places.
Diffstat (limited to 'mk/package')
-rw-r--r--mk/package/bsd.package.mk4
-rw-r--r--mk/package/package.mk18
2 files changed, 11 insertions, 11 deletions
diff --git a/mk/package/bsd.package.mk b/mk/package/bsd.package.mk
index 6d631010daf..53a40221ec0 100644
--- a/mk/package/bsd.package.mk
+++ b/mk/package/bsd.package.mk
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.package.mk,v 1.2 2006/06/05 17:41:11 jlam Exp $
+# $NetBSD: bsd.package.mk,v 1.3 2006/06/05 22:49:44 jlam Exp $
#
# This Makefile fragment is included by bsd.pkg.mk and provides all
# variables and targets related to binary packages.
@@ -22,7 +22,7 @@ package: install
. if defined(SKIP_SILENT)
@${DO_NADA}
. else
- @${ECHO_MSG} "${_PKGSRC_IN}> ${PKGNAME} may not be packaged: "${NO_PACKAGE:Q}"."
+ @${PHASE_MSG} "${PKGNAME} may not be packaged: "${NO_PACKAGE:Q}"."
. endif
. endif
.else
diff --git a/mk/package/package.mk b/mk/package/package.mk
index b22a77eefe1..9d72558fb67 100644
--- a/mk/package/package.mk
+++ b/mk/package/package.mk
@@ -1,4 +1,4 @@
-# $NetBSD: package.mk,v 1.2 2006/06/05 17:41:11 jlam Exp $
+# $NetBSD: package.mk,v 1.3 2006/06/05 22:49:44 jlam Exp $
_PACKAGE_COOKIE= ${WRKDIR}/.package_done
@@ -36,7 +36,7 @@ real-package: package-message package-all package-cookie
.PHONY: package-message
package-message:
- @${ECHO_MSG} "${_PKGSRC_IN}> Building binary package for ${PKGNAME}"
+ @${PHASE_MSG} "Building binary package for ${PKGNAME}"
######################################################################
### package-cookie (PRIVATE)
@@ -97,15 +97,15 @@ package-create:
.PHONY: package-warnings
package-warnings:
.if defined(NO_BIN_ON_CDROM)
- @${ECHO_MSG} "${_PKGSRC_IN}> Warning: ${PKGNAME} may not be put on a CD-ROM:"
- @${ECHO_MSG} "${_PKGSRC_IN}> " ${NO_BIN_ON_CDROM:Q}
+ @${WARNING_MSG} "Warning: ${PKGNAME} may not be put on a CD-ROM:"
+ @${wARN_MSG} " " ${NO_BIN_ON_CDROM:Q}
.endif
.if defined(NO_BIN_ON_FTP)
- @${ECHO_MSG} "${_PKGSRC_IN}> Warning: ${PKGNAME} may not be made available through FTP:"
- @${ECHO_MSG} "${_PKGSRC_IN}> " ${NO_BIN_ON_FTP:Q}
+ @${WARNING_MSG} "Warning: ${PKGNAME} may not be made available through FTP:"
+ @${WARNING_MSG} " " ${NO_BIN_ON_FTP:Q}
.endif
.if defined(ABI_DEPENDS) && !empty(USE_ABI_DEPENDS:M[Nn][Oo])
- @${ECHO_MSG} "${_PKGSRC_IN}> Warning: ABI dependency recommendations are being ignored!"
- @${ECHO_MSG} "${_PKGSRC_IN}> ${PKGNAME} should not be uploaded nor"
- @${ECHO_MSG} "${_PKGSRC_IN}> otherwise be used as a binary package!"
+ @${WARNING_MSG} "Warning: ABI dependency recommendations are being ignored!"
+ @${WARNING_MSG} " ${PKGNAME} should not be uploaded nor"
+ @${WARNING_MSG} " otherwise be used as a binary package!"
.endif