Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 19 Jul 2006 19:20:48 +0200 (CEST)
From:      Gabor Kovesdan <gabor@FreeBSD.org>
To:        FreeBSD-gnats-submit@FreeBSD.org
Cc:        Gabor Kovesdan <gabor@t-hosting.hu>
Subject:   ports/100556: [patch] bsd.port.mk - proper using of ECHO_CMD and ECHO_MSG
Message-ID:  <20060719172048.86978289D74@catv-50635cb6.catv.broadband.hu>
Resent-Message-ID: <200607191730.k6JHUHDS079717@freefall.freebsd.org>

next in thread | raw e-mail | index | archive | help

>Number:         100556
>Category:       ports
>Synopsis:       [patch] bsd.port.mk - proper using of ECHO_CMD and ECHO_MSG
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Wed Jul 19 17:30:16 GMT 2006
>Closed-Date:
>Last-Modified:
>Originator:     Gabor Kovesdan
>Release:        FreeBSD 6.1-STABLE i386
>Organization:
n/a
>Environment:
System: FreeBSD spitfire 6.1-STABLE FreeBSD 6.1-STABLE #0: Sun Jul 2 19:31:12 CEST 2006 gabor@spitfire:/usr/src/sys/i386/compile/SPITFIRE i386

>Description:

We have both ECHO_CMD and ECHO_MSG in bsd.port.mk.  ECHO_CMD is the echo shell built-in
at default, while ECHO_MSG is ECHO_CMD at the default, but they are for different
purposes.  ECHO_MSG is for printing output, which is relevant for the end-user, while
ECHO_CMD is mostly for internal use, e.g. command-line pipelining, like
	@${ECHO_CMD} "@cwd ${PREFIX}" >> ${TMPPLIST}.
Accordingly, one might want to override ECHO_MSG so that one get a colorful output, or
use a wrapper for these messages.  Currently, in bsd.port.mk ECHO_CMD is also used for
printing user output.  The attached patch substitutes these occurrences to ECHO_MSG.

>How-To-Repeat:
>Fix:

--- bpm_echo.diff begins here ---
--- bsd.port.mk.orig	Wed Jul 19 18:50:46 2006
+++ bsd.port.mk	Wed Jul 19 19:03:41 2006
@@ -1001,7 +1001,7 @@
 
 .if defined(_PREMKINCLUDED)
 check-makefile::
-	@${ECHO_CMD} "${PKGNAME}: Makefile error: you cannot include bsd.port[.pre].mk twice"
+	@${ECHO_MSG} "${PKGNAME}: Makefile error: you cannot include bsd.port[.pre].mk twice"
 	@${FALSE}
 .endif
 
@@ -1228,9 +1228,9 @@
 # check for old, crufty, makefile types, part 1:
 .if !defined(PORTNAME) || !( defined(PORTVERSION) || defined (DISTVERSION) ) || defined(PKGNAME)
 check-makefile::
-	@${ECHO_CMD} "Makefile error: you need to define PORTNAME and PORTVERSION instead of PKGNAME."
-	@${ECHO_CMD} "(This port is too old for your bsd.port.mk, please update it to match"
-	@${ECHO_CMD} " your bsd.port.mk.)"
+	@${ECHO_MSG} "Makefile error: you need to define PORTNAME and PORTVERSION instead of PKGNAME."
+	@${ECHO_MSG} "(This port is too old for your bsd.port.mk, please update it to match"
+	@${ECHO_MSG} " your bsd.port.mk.)"
 	@${FALSE}
 .endif
 
@@ -1293,7 +1293,7 @@
 .if (!defined(PKGDIR) && exists(${MASTERDIR}/pkg/DESCR)) || \
 	(!defined(MD5_FILE) && exists(${MASTERDIR}/files/md5))
 check-makefile::
-	@${ECHO_CMD} "Makefile error: your port uses an old layout.  Please update it to match this bsd.port.mk.  If you have updated your ports collection via cvsup and are still getting this error, see Q12 and Q13 in the cvsup FAQ on http://www.polstra.com for further information."
+	@${ECHO_MSG} "Makefile error: your port uses an old layout.  Please update it to match this bsd.port.mk.  If you have updated your ports collection via cvsup and are still getting this error, see Q12 and Q13 in the cvsup FAQ on http://www.polstra.com for further information."
 	@${FALSE}
 .endif
 PATCHDIR?=		${MASTERDIR}/files
@@ -1478,7 +1478,7 @@
 
 .if defined(_POSTMKINCLUDED)
 check-makefile::
-	@${ECHO_CMD} "${PKGNAME}: Makefile error: you cannot include bsd.port[.post].mk twice"
+	@${ECHO_MSG} "${PKGNAME}: Makefile error: you cannot include bsd.port[.post].mk twice"
 	@${FALSE}
 .endif
 
@@ -1529,7 +1529,7 @@
 .if ${MANCOMPRESSED} != yes && ${MANCOMPRESSED} != no && \
 	${MANCOMPRESSED} != maybe
 check-makevars::
-	@${ECHO_CMD} "${PKGNAME}: Makefile error: value of MANCOMPRESSED (is \"${MANCOMPRESSED}\") can only be \"yes\", \"no\" or \"maybe\"".
+	@${ECHO_MSG} "${PKGNAME}: Makefile error: value of MANCOMPRESSED (is \"${MANCOMPRESSED}\") can only be \"yes\", \"no\" or \"maybe\"".
 	@${FALSE}
 .endif
 .endif
@@ -2232,16 +2232,16 @@
 # The final simpler patch will come afterwards
 .if !defined(COMMENT)
 check-makevars::
-		@${ECHO_CMD} 'Makefile error: there is no COMMENT variable defined'
-		@${ECHO_CMD} 'for this port. Please, rectify this.'
+		@${ECHO_MSG} 'Makefile error: there is no COMMENT variable defined'
+		@${ECHO_MSG} 'for this port. Please, rectify this.'
 		@${FALSE}
 .else
 .if exists(${COMMENTFILE})
 check-makevars::
-		@${ECHO_CMD} 'Makefile error: There is a COMMENTFILE in this port.'
-		@${ECHO_CMD} 'COMMENTFILEs have been deprecated in'
-		@${ECHO_CMD} 'favor of COMMENT variables.'
-		@${ECHO_CMD} 'Please, rectify this.'
+		@${ECHO_MSG} 'Makefile error: There is a COMMENTFILE in this port.'
+		@${ECHO_MSG} 'COMMENTFILEs have been deprecated in'
+		@${ECHO_MSG} 'favor of COMMENT variables.'
+		@${ECHO_MSG} 'Please, rectify this.'
 		@${FALSE}
 .endif
 .endif
@@ -2266,8 +2266,8 @@
 _G_TEMP=	${_group}
 .			if ${_G_TEMP} == all || ${_G_TEMP} == ALL || ${_G_TEMP} == default
 check-makevars::
-				@${ECHO_CMD} "Makefile error: the words all, ALL and default are reserved and cannot be"
-				@${ECHO_CMD} "used in group definitions. Please fix your MASTER_SITES"
+				@${ECHO_MSG} "Makefile error: the words all, ALL and default are reserved and cannot be"
+				@${ECHO_MSG} "used in group definitions. Please fix your MASTER_SITES"
 				@${FALSE}
 .			endif
 _MASTER_SITES_${_group}+=	${_S:C@^(.*/):[^/:]+$@\1@}
@@ -2283,8 +2283,8 @@
 _G_TEMP=	${_group}
 .			if ${_G_TEMP} == all || ${_G_TEMP} == ALL || ${_G_TEMP} == default
 check-makevars::
-				@${ECHO_CMD} "The words all, ALL and default are reserved and cannot be"
-				@${ECHO_CMD} "used in group definitions. Please fix your PATCH_SITES"
+				@${ECHO_MSG} "The words all, ALL and default are reserved and cannot be"
+				@${ECHO_MSG} "used in group definitions. Please fix your PATCH_SITES"
 				@${FALSE}
 .			endif
 _PATCH_SITES_${_group}+=	${_S:C@^(.*/):[^/:]+$@\1@}
@@ -2305,8 +2305,8 @@
 _G_TEMP=	${_group}
 .			if ${_G_TEMP} == all || ${_G_TEMP} == ALL || ${_G_TEMP} == default
 check-makevars::
-				@${ECHO_CMD} "Makefile error: the words all, ALL and default are reserved and cannot be"
-				@${ECHO_CMD} "used in group definitions. Please fix your MASTER_SITE_SUBDIR"
+				@${ECHO_MSG} "Makefile error: the words all, ALL and default are reserved and cannot be"
+				@${ECHO_MSG} "used in group definitions. Please fix your MASTER_SITE_SUBDIR"
 				@${FALSE}
 .			endif
 .			if defined(_MASTER_SITES_${_group})
@@ -2326,8 +2326,8 @@
 _G_TEMP=	${_group}
 .			if ${_G_TEMP} == all || ${_G_TEMP} == ALL || ${_G_TEMP} == default
 check-makevars::
-				@${ECHO_CMD} "Makefile error: the words all, ALL and default are reserved and cannot be"
-				@${ECHO_CMD} "used in group definitions. Please fix your PATCH_SITE_SUBDIR"
+				@${ECHO_MSG} "Makefile error: the words all, ALL and default are reserved and cannot be"
+				@${ECHO_MSG} "used in group definitions. Please fix your PATCH_SITE_SUBDIR"
 				@${FALSE}
 .			endif
 .			if defined(_PATCH_SITES_${_group})
@@ -2659,7 +2659,7 @@
 
 .if !defined(CATEGORIES)
 check-categories:
-	@${ECHO_CMD} "${PKGNAME}: Makefile error: CATEGORIES is mandatory."
+	@${ECHO_MSG} "${PKGNAME}: Makefile error: CATEGORIES is mandatory."
 	@${FALSE}
 .else
 
@@ -2683,7 +2683,7 @@
 	@if ${ECHO_CMD} ${VALID_CATEGORIES} | ${GREP} -wq ${cat}; then \
 		${TRUE}; \
 	else \
-		${ECHO_CMD} "${PKGNAME}: Makefile error: category ${cat} not in list of valid categories."; \
+		${ECHO_MSG} "${PKGNAME}: Makefile error: category ${cat} not in list of valid categories."; \
 		${FALSE}; \
 	fi
 .endfor
@@ -2781,7 +2781,7 @@
   }' | ${SED} -e 's \([^/ ][^ ]*\.\(.\)[^. ]*\) $${MAN\2PREFIX}/$$$$$$$${__lang}/man\2/\1${MANEXT}g' -e 's/ //g' -e 's/MANlPREFIX/MANLPREFIX/g' -e 's/MANnPREFIX/MANNPREFIX/g'
 .if ${__pmlinks:Mbroken} == "broken"
 check-makevars::
-	@${ECHO_CMD} "${PKGNAME}: Makefile error: unable to parse MLINKS."
+	@${ECHO_MSG} "${PKGNAME}: Makefile error: unable to parse MLINKS."
 	@${FALSE}
 .endif
 _MLINKS=	${_MLINKS_PREPEND}
@@ -3444,7 +3444,7 @@
 	    INSTALL_PROGRAM="${INSTALL_PROGRAM}" \
 	    INSTALL_SCRIPT="${INSTALL_SCRIPT}" \
 	    ${CONFIGURE_ENV} ./${CONFIGURE_SCRIPT} ${CONFIGURE_ARGS}; then \
-			 ${ECHO_CMD} "===>  Script \"${CONFIGURE_SCRIPT}\" failed unexpectedly."; \
+			 ${ECHO_MSG} "===>  Script \"${CONFIGURE_SCRIPT}\" failed unexpectedly."; \
 			 (${ECHO_CMD} ${CONFIGURE_FAIL_MESSAGE}) | ${FMT} 75 79 ; \
 			 ${FALSE}; \
 		fi)
@@ -3645,15 +3645,15 @@
 		fi; \
 		if [ -d ${PKG_DBDIR}/${PKGNAME} -o -n "$${found_package}" ]; then \
 				if [ -d ${PKG_DBDIR}/${PKGNAME} ]; then \
-						${ECHO_CMD} "===>   ${PKGNAME} is already installed"; \
+						${ECHO_MSG} "===>   ${PKGNAME} is already installed"; \
 				else \
-						${ECHO_CMD} "===>   An older version of ${PKGORIGIN} is already installed ($${found_package})"; \
+						${ECHO_MSG} "===>   An older version of ${PKGORIGIN} is already installed ($${found_package})"; \
 				fi; \
-				${ECHO_CMD} "      You may wish to \`\`make deinstall'' and install this port again"; \
-				${ECHO_CMD} "      by \`\`make reinstall'' to upgrade it properly."; \
-				${ECHO_CMD} "      If you really wish to overwrite the old port of ${PKGORIGIN}"; \
-				${ECHO_CMD} "      without deleting it first, set the variable \"FORCE_PKG_REGISTER\""; \
-				${ECHO_CMD} "      in your environment or the \"make install\" command line."; \
+				${ECHO_MSG} "      You may wish to \`\`make deinstall'' and install this port again"; \
+				${ECHO_MSG} "      by \`\`make reinstall'' to upgrade it properly."; \
+				${ECHO_MSG} "      If you really wish to overwrite the old port of ${PKGORIGIN}"; \
+				${ECHO_MSG} "      without deleting it first, set the variable \"FORCE_PKG_REGISTER\""; \
+				${ECHO_MSG} "      in your environment or the \"make install\" command line."; \
 				exit 1; \
 		fi
 .else
@@ -3684,8 +3684,8 @@
 .if !defined(NO_MTREE)
 	@if [ `${ID} -u` = 0 ]; then \
 		if [ ! -f ${MTREE_FILE} ]; then \
-			${ECHO_CMD} "Error: mtree file \"${MTREE_FILE}\" is missing."; \
-			${ECHO_CMD} "Copy it from a suitable location (e.g., /usr/src/etc/mtree) and try again."; \
+			${ECHO_MSG} "Error: mtree file \"${MTREE_FILE}\" is missing."; \
+			${ECHO_MSG} "Copy it from a suitable location (e.g., /usr/src/etc/mtree) and try again."; \
 			exit 1; \
 		else \
 			${MTREE_CMD} ${MTREE_ARGS} ${PREFIX}/ >/dev/null; \
@@ -3826,7 +3826,7 @@
 					> ${WRKDIR}/.PLIST.stupid; \
 				if [ -n "`${EGREP} ' (accept|recvfrom)$$' ${WRKDIR}/.PLIST.objdump`" ] ; then \
 					if [ -s ${WRKDIR}/.PLIST.stupid ]; then \
-						${ECHO_CMD} -n "${PREFIX}/$$i (USES POSSIBLY INSECURE FUNCTIONS:" >> ${WRKDIR}/.PLIST.network; \
+						${ECHO_MSG} -n "${PREFIX}/$$i (USES POSSIBLY INSECURE FUNCTIONS:" >> ${WRKDIR}/.PLIST.network; \
 						${CAT} ${WRKDIR}/.PLIST.stupid >> ${WRKDIR}/.PLIST.network; \
 						${ECHO_CMD} ")" >> ${WRKDIR}/.PLIST.network; \
 					else \
@@ -3836,7 +3836,7 @@
 			fi; \
 			if [ -n "`${FIND} ${PREFIX}/$$i -prune \( -perm -4000 -o -perm -2000 \) \( -perm -0010 -o -perm -0001 \) 2>/dev/null`" ]; then \
 				if [ -s ${WRKDIR}/.PLIST.stupid ]; then \
-					${ECHO_CMD} -n "${PREFIX}/$$i (USES POSSIBLY INSECURE FUNCTIONS:" >> ${WRKDIR}/.PLIST.setuid; \
+					${ECHO_MSG} -n "${PREFIX}/$$i (USES POSSIBLY INSECURE FUNCTIONS:" >> ${WRKDIR}/.PLIST.setuid; \
 					${CAT} ${WRKDIR}/.PLIST.stupid >> ${WRKDIR}/.PLIST.setuid; \
 					${ECHO_CMD} ")" >> ${WRKDIR}/.PLIST.setuid; \
 				else \
@@ -4059,9 +4059,9 @@
 pretty-print-www-site:
 	@www_site=$$(cd ${.CURDIR} && ${MAKE} ${__softMAKEFLAGS} www-site); \
 	if [ -n "$${www_site}" ]; then \
-		${ECHO_CMD} -n " and/or visit the "; \
-		${ECHO_CMD} -n "<a href=\"$${www_site}\">web site</a>"; \
-		${ECHO_CMD} " for futher informations"; \
+		${ECHO_MSG} -n " and/or visit the "; \
+		${ECHO_MSG} -n "<a href=\"$${www_site}\">web site</a>"; \
+		${ECHO_MSG} " for futher informations"; \
 	fi
 .endif
 
@@ -4258,7 +4258,7 @@
 				esac; \
 				${ECHO_CMD} -n ${SETENV} ${FETCH_ENV} ${FETCH_CMD} ${FETCH_BEFORE_ARGS} $${args} "${FETCH_AFTER_ARGS}" '|| ' ; \
 			done; \
-			${ECHO_CMD} "${ECHO_CMD} $${file} not fetched" ; \
+			${ECHO_MSG} "${ECHO_CMD} $${file} not fetched" ; \
 		fi \
 	done)
 .if defined(PATCHFILES)
@@ -4290,7 +4290,7 @@
 				esac; \
 				${ECHO_CMD} -n ${SETENV} ${FETCH_ENV} ${FETCH_CMD} ${FETCH_BEFORE_ARGS} $${args} "${FETCH_AFTER_ARGS}" '|| ' ; \
 			done; \
-			${ECHO_CMD} "${ECHO_CMD} $${file} not fetched" ; \
+			${ECHO_MSG} "${ECHO_CMD} $${file} not fetched" ; \
 		fi \
 	 done)
 .endif
@@ -4318,8 +4318,8 @@
 	for alg in ${CHECKSUM_ALGORITHMS:U}; do \
 		eval alg_executable=\$$$$alg; \
 		if [ -z "$$alg_executable" ]; then \
-			${ECHO_CMD} "Checksum algorithm $$alg: Couldn't find the executable."; \
-			${ECHO_CMD} "Set $$alg=/path/to/$$alg in /etc/make.conf and try again."; \
+			${ECHO_MSG} "Checksum algorithm $$alg: Couldn't find the executable."; \
+			${ECHO_MSG} "Set $$alg=/path/to/$$alg in /etc/make.conf and try again."; \
 			exit 1; \
 		fi; \
 	done; \
@@ -5056,13 +5056,13 @@
 
 _PRETTY_PRINT_DEPENDS_LIST=\
 	if [ ! -r ${INDEXDIR}/${INDEXFILE} ] ; then \
-		${ECHO_CMD} "${.TARGET} requires an INDEX file (${INDEXFILE}). Please run make index or make fetchindex."; \
+		${ECHO_MSG} "${.TARGET} requires an INDEX file (${INDEXFILE}). Please run make index or make fetchindex."; \
 	else \
 		target=${.TARGET:C/pretty-print-(.*)-depends-list/\1/} ; \
 		if [ "$$target" = "build" ] ; then fldnum=8 ; else fldnum=9 ; fi ; \
-		${ECHO_CMD} -n 'This port requires package(s) "' ; \
-		${ECHO_CMD} -n `${AWK} -F\| "\\$$1 ~ /^${PKGNAME}/ {print \\$$$${fldnum};}" ${INDEXDIR}/${INDEXFILE}` ; \
-		${ECHO_CMD} "\" to $$target."; \
+		${ECHO_MSG} -n 'This port requires package(s) "' ; \
+		${ECHO_MSG} -n `${AWK} -F\| "\\$$1 ~ /^${PKGNAME}/ {print \\$$$${fldnum};}" ${INDEXDIR}/${INDEXFILE}` ; \
+		${ECHO_MSG} "\" to $$target."; \
 	fi;
 
 
@@ -5089,7 +5089,7 @@
 .if defined(SUB_FILES)
 .for file in ${SUB_FILES}
 .if !exists(${FILESDIR}/${file}.in)
-	@${ECHO_CMD} "** Missing ${FILESDIR}/${file}.in for ${PKGNAME}."; exit 1
+	@${ECHO_MSG} "** Missing ${FILESDIR}/${file}.in for ${PKGNAME}."; exit 1
 .else
 	@${SED} ${_SUB_LIST_TEMP} -e '/^@comment /d' ${FILESDIR}/${file}.in > ${WRKDIR}/${file}
 .endif
@@ -5109,7 +5109,7 @@
 generate-plist:
 	@${ECHO_MSG} "===>   Generating temporary packing list"
 	@${MKDIR} `${DIRNAME} ${TMPPLIST}`
-	@if [ ! -f ${DESCR} ]; then ${ECHO_CMD} "** Missing pkg-descr for ${PKGNAME}."; exit 1; fi
+	@if [ ! -f ${DESCR} ]; then ${ECHO_MSG} "** Missing pkg-descr for ${PKGNAME}."; exit 1; fi
 	@>${TMPPLIST}
 	@for file in ${PLIST_FILES}; do \
 		${ECHO_CMD} $${file} | ${SED} ${PLIST_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} >> ${TMPPLIST}; \
@@ -5248,7 +5248,7 @@
 install-rc-script:
 .if defined(USE_RCORDER) || defined(USE_RC_SUBR) && ${USE_RC_SUBR:U} != "YES"
 .if defined(USE_RCORDER)
-	@${ECHO_CMD} "===> Installing early rc.d startup script(s)"
+	@${ECHO_MSG} "===> Installing early rc.d startup script(s)"
 	@${ECHO_CMD} "@cwd /" >> ${TMPPLIST}
 	@for i in ${USE_RCORDER}; do \
 		${INSTALL_SCRIPT} ${WRKDIR}/$${i} /etc/rc.d/$${i%.sh}; \
@@ -5257,7 +5257,7 @@
 	@${ECHO_CMD} "@cwd ${PREFIX}" >> ${TMPPLIST}
 .endif
 .if defined(USE_RC_SUBR) && ${USE_RC_SUBR:U} != "YES"
-	@${ECHO_CMD} "===> Installing rc.d startup script(s)"
+	@${ECHO_MSG} "===> Installing rc.d startup script(s)"
 	@${ECHO_CMD} "@cwd ${PREFIX}" >> ${TMPPLIST}
 .if (${OSVERSION} >= 700007 || ( ${OSVERSION} < 700000 && ${OSVERSION} >= 600101 ))
 	@for i in ${USE_RC_SUBR}; do \
@@ -5629,7 +5629,7 @@
 .if defined(DESKTOP_ENTRIES)
 	@set ${DESKTOP_ENTRIES} XXX; \
 	if [ `${EXPR} \( $$# - 1 \) % 6` -ne 0 ]; then \
-		${ECHO_CMD} "${PKGNAME}: Makefile error: the DESKTOP_ENTRIES list must contain one or more groups of 6 elements"; \
+		${ECHO_MSG} "${PKGNAME}: Makefile error: the DESKTOP_ENTRIES list must contain one or more groups of 6 elements"; \
 		exit 1; \
 	fi; \
 	num=1; \
@@ -5641,11 +5641,11 @@
 			entry="$$entry ($$1)"; \
 		fi; \
 		if [ -z "$$1" ]; then \
-			${ECHO_CMD} "${PKGNAME}: Makefile error: in desktop entry $$entry: field 1 (Name) is empty"; \
+			${ECHO_MSG} "${PKGNAME}: Makefile error: in desktop entry $$entry: field 1 (Name) is empty"; \
 			exit 1; \
 		fi; \
 		if [ -z "$$4" ]; then \
-			${ECHO_CMD} "${PKGNAME}: Makefile error: in desktop entry $$entry: field 4 (Exec) is empty"; \
+			${ECHO_MSG} "${PKGNAME}: Makefile error: in desktop entry $$entry: field 4 (Exec) is empty"; \
 			exit 1; \
 		fi; \
 		if [ -n "$$5" ]; then \
@@ -5656,21 +5656,21 @@
 				fi; \
 			done; \
 			if ! ${ECHO_CMD} "$$5" | ${GREP} -q ';$$'; then \
-				${ECHO_CMD} "${PKGNAME}: Makefile error: in desktop entry $$entry: field 5 (Categories) does not end with a semicolon"; \
+				${ECHO_MSG} "${PKGNAME}: Makefile error: in desktop entry $$entry: field 5 (Categories) does not end with a semicolon"; \
 				exit 1; \
 			fi; \
 		else \
 			if [ -z "`cd ${.CURDIR} && ${MAKE} ${__softMAKEFLAGS} desktop-categories`" ]; then \
-				${ECHO_CMD} "${PKGNAME}: Makefile error: in desktop entry $$entry: field 5 (Categories) is empty and could not be deduced from the CATEGORIES variable"; \
+				${ECHO_MSG} "${PKGNAME}: Makefile error: in desktop entry $$entry: field 5 (Categories) is empty and could not be deduced from the CATEGORIES variable"; \
 				exit 1; \
 			fi; \
 		fi; \
 		if [ -z "$$6" ]; then \
-			${ECHO_CMD} "${PKGNAME}: Makefile error: in desktop entry $$entry: field 6 (StartupNotify) is empty"; \
+			${ECHO_MSG} "${PKGNAME}: Makefile error: in desktop entry $$entry: field 6 (StartupNotify) is empty"; \
 			exit 1; \
 		fi; \
 		if [ "x$$6" != "xtrue" ] && [ "x$$6" != "xfalse" ]; then \
-			${ECHO_CMD} "${PKGNAME}: Makefile error: in desktop entry $$entry: field 6 (StartupNotify) is not \"true\" or \"false\""; \
+			${ECHO_MSG} "${PKGNAME}: Makefile error: in desktop entry $$entry: field 6 (StartupNotify) is not \"true\" or \"false\""; \
 			exit 1; \
 		fi; \
 		shift 6; \
--- bpm_echo.diff ends here ---


>Release-Note:
>Audit-Trail:
>Unformatted:



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20060719172048.86978289D74>